diff --git a/src/api/management/author.js b/src/api/management/author.js
index c844787d1..f1ab5456f 100644
--- a/src/api/management/author.js
+++ b/src/api/management/author.js
@@ -10,14 +10,6 @@ export function getLessonPermissonPageList(params) {
 	});
 }
 
-// 根据ID获取权限数据
-// export function getLessonPermissonDetail(id) {
-// 	return request({
-// 		url: `/api/permission/${id}`,
-// 		method: 'get'
-// 	});
-// }
-
 /** 创建课程权限*/
 export function createLessonPermisson(data) {
 	return request({
@@ -26,10 +18,19 @@ export function createLessonPermisson(data) {
 		data: data
 	});
 }
+
+/** 获取权限详情*/
+export function getPermissonDetail(id) {
+	return request({
+		url: `/api/permission/${id}/package`,
+		method: 'get'
+	});
+}
+
 /** 获取用户某课程某段时间内可用的权限数量*/
 export function getTotalRemains(params) {
 	return request({
-		url: '/api/permission/totalRemains',
+		url: '/api/userPermission/totalRemains',
 		method: 'get',
 		params: params
 	});
@@ -37,7 +38,7 @@ export function getTotalRemains(params) {
 /** 设置权限失效或有效*/
 export function setLessonPermisson(data) {
 	return request({
-		url: `/api/permission/${data.id}/status`,
+		url: `/api/userPermission/${data.id}/status`,
 		method: 'put',
 		data: data
 	});
@@ -48,7 +49,7 @@ export function setLessonPermisson(data) {
  */
 export function queryPermissionSimulation(data) {
 	return request({
-		url: `/api/permission/${data.mapId}/${data.prdCode}/simulation`,
+		url: `/api/userPermission/${data.mapId}/${data.prdCode}/simulation`,
 		method: 'get'
 	});
 }
@@ -56,38 +57,28 @@ export function queryPermissionSimulation(data) {
 /** 获取大屏权限列表*/
 export function queryPermissionScreen() {
 	return request({
-		url: `/api/permission/bigScreen`,
+		url: `/api/userPermission/bigScreen`,
 		method: 'get'
 	});
 }
 
-/** 更新课程权限*/
-/*
-export function updateLessonPermisson(data) {
-	return request({
-		url: '/api/permission',
-		method: 'put',
-		data: data
-	});
-}
-*/
-
-/** 删除课程权限*/
-/*
-export function deleteLessonPermisson(id) {
-	return request({
-		url: '/api/permission/' + id,
-		method: 'delete'
-	});
-}
-*/
-
 /**
  * 用户权限列表
  */
+export function listPermision(params) {
+	return request({
+		url: `/api/userPermission`,
+		method: 'get',
+		params: params
+	});
+}
+
+/**
+ * 个人权限列表
+ */
 export function listUserPermision(params) {
 	return request({
-		url: `/api/permission/my`,
+		url: `/api/userPermission/my`,
 		method: 'get',
 		params: params
 	});
@@ -101,10 +92,10 @@ export function getDistribute(id) {
 	});
 }
 
-/** 用户权限列表 */
+/** 设置权限所有者 */
 export function putPermissionOwner(data) {
 	return request({
-		url: `/api/permission/${data.id}/owner`,
+		url: `/api/userPermission/${data.id}/owner`,
 		method: 'put',
 		data: data.owner
 	});
diff --git a/src/api/management/distribute.js b/src/api/management/distribute.js
index f7424bbbc..5d68f8bbc 100644
--- a/src/api/management/distribute.js
+++ b/src/api/management/distribute.js
@@ -1,6 +1,6 @@
 import request from '@/utils/request';
 
-/** 上课权限获取*/
+/** 权限转增*/
 export function getLessons(data) {
 	return request({
 		url: '/api/distribute/getLessons',
@@ -9,15 +9,41 @@ export function getLessons(data) {
 	});
 }
 
-/** 上课权限分发*/
+/** 权限分发*/
 export function giveLessons(data) {
 	return request({
-		url: '/api/distribute/givePermission',
+		url: '/api/distribute/distribute',
 		method: 'post',
 		data: data
 	});
 }
 
+/** 权限转增*/
+export function permissionTurnAdd(data) {
+	return request({
+		url: '/api/distribute/transfer',
+		method: 'post',
+		data: data
+	});
+}
+
+/** 从订单分发权限(获取二维码)*/
+export function postDistribute(data) {
+	return request({
+		url: `/api/distribute/${data.code}/distribute`,
+		method: 'post',
+		data: data
+	});
+}
+
+/** 权限获取*/
+export function getPermission(state) {
+	return request({
+		url: `/api/distribute/getPermission?state=${state}`,
+		method: 'get'
+	});
+}
+
 /** 接收课程权限*/
 export function receiveLessons(data) {
 	return request({
diff --git a/src/api/management/goods.js b/src/api/management/goods.js
index 5e9b6fd59..7c87f2e5a 100644
--- a/src/api/management/goods.js
+++ b/src/api/management/goods.js
@@ -66,7 +66,7 @@ export function getCommodityDetailById(id) {
  */
 export function updataCommodityList(data) {
 	return request({
-		url: `/api/goods`,
+		url: `/api/goods/${data.id}`,
 		method: 'put',
 		data: data
 	});
diff --git a/src/api/runplan.js b/src/api/runplan.js
index 229c57b1d..8876c8220 100644
--- a/src/api/runplan.js
+++ b/src/api/runplan.js
@@ -277,20 +277,14 @@ export function deleteRunPlanTemplate(planId) {
 }
 
 /** 生成通用每日运行图*/
-export function generateCommonRunPlanEveryDay(planId) {
+export function generateCommonRunPlanEveryDay(planId, params) {
 	return request({
 		url: `/api/runPlan/template/generate/${planId}`,
-		method: 'post'
+		method: 'post',
+		params
 	});
 }
 
-/** 生成用户每日运行图*/
-export function generateUserRunPlanEveryDay(planId, group) {
-	return request({
-		url: `/api/runPlan/daily/privilege/${planId}?group=${group}`,
-		method: 'post'
-	});
-}
 /** 获取运行计划每日列表*/
 export function runPlanEveryDayList(params) {
 	return request({
@@ -309,20 +303,12 @@ export function deleteRunPlanEveryDay(planId) {
 }
 
 /** 获取地图运行图的车次号*/
-export function getPublishMapTrainNos(skinCode) {
-	return request({
-		url: `/api/runPlan/daily/${skinCode}/trainNos`,
-		method: 'get'
-	});
-}
-
-/** 获取服务号、车组号*/
-export function getPublishMapTrainServerNos(skinCode) {
-	return request({
-		url: `/api/runPlan/daily/${skinCode}/serverNos`,
-		method: 'get'
-	});
-}
+// export function getPublishMapTrainNos(skinCode) {
+// 	return request({
+// 		url: `/api/runPlan/daily/${skinCode}/trainNos`,
+// 		method: 'get'
+// 	});
+// }
 
 /** 分页查询加载计划*/
 export function getRunPlanLoadList(params) {
@@ -374,3 +360,11 @@ export function queryRunPlanDaily(planId) {
 		method: 'get'
 	});
 }
+
+/** 获取模板运行图列表*/
+export function listAllTempLateRunPlan() {
+	return request({
+		url: `/api/runPlan/template/all`,
+		method: 'get'
+	});
+}
diff --git a/src/api/scheduling.js b/src/api/scheduling.js
new file mode 100644
index 000000000..253dd304c
--- /dev/null
+++ b/src/api/scheduling.js
@@ -0,0 +1,46 @@
+import request from '@/utils/request';
+
+export function querySecheduling(group, params) {
+	return request({
+		url: `/api/scheduling/${group}/day`,
+		method: 'get',
+		params
+	});
+}
+
+export function generateScheduling(group, params) {
+	return request({
+		url: `/api/scheduling/${group}/generate`,
+		method: 'post',
+		params
+	});
+}
+
+export function getSchedulingAllTrains(group) {
+	return request({
+		url: `/api/scheduling/${group}/train/all`,
+		method: 'get'
+	});
+}
+
+export function checkScheduling(group) {
+	return request({
+		url: `/api/scheduling/${group}/check`,
+		method: 'post'
+	});
+}
+
+export function saveScheduling(group, data) {
+	return request({
+		url: `/api/scheduling/${group}/save`,
+		method: 'post',
+		data
+	});
+}
+
+export function generateSchedulingAgain(group) {
+	return request({
+		url: `/api/scheduling/${group}/rebuild`,
+		method: 'delete'
+	});
+}
diff --git a/src/api/simulation.js b/src/api/simulation.js
index 60e1053b1..b8161a02d 100644
--- a/src/api/simulation.js
+++ b/src/api/simulation.js
@@ -160,14 +160,6 @@ export function getEveryDayRunPlanData(group) {
 	});
 }
 
-/** 生成手机同步仿真二维码*/
-// export function getSimulationQrCodeUrl(group) {
-// 	return request({
-// 		url: `/api/simulation/${group}/qrCode`,
-// 		method: 'post'
-// 	});
-// }
-
 /** 录制脚本仿真*/
 export function scriptRecordNotify(scriptId) {
 	return request({
@@ -239,7 +231,7 @@ export function selectScriptMembers(group, data) {
 export function modifyScriptMemberSex(group, playerId, data) {
 	return request({
 		url: `/api/simulation/${group}/scriptWrite/player/${playerId}?gender=${data.gender}`,
-		method: 'put',
+		method: 'put'
 	});
 }
 
@@ -293,85 +285,6 @@ export function modifyScriptAction(group, actionId, data) {
 	});
 }
 
-// /** 根据成员角色查询设备列表*/
-// export function getDevicesByRole(group, params) {
-// 	return request({
-// 		url: `/api/simulation/${group}/role/devices`,
-// 		method: 'get',
-// 		params
-// 	});
-// }
-// /** 获取任务录制的成员角色列表 */
-// export function getMembersByGroup(group) {
-// 	return request({
-// 		url: `/api/simulation/${group}/questRecord/members`,
-// 		method: 'get'
-// 	});
-// }
-
-// /** 添加任务角色成员 */
-// export function postQuestMember(group, data) {
-// 	return request({
-// 		url: `/api/simulation/${group}/questRecord/member`,
-// 		method: 'post',
-// 		data
-// 	});
-// }
-
-// /** 删除任务角色成员 */
-// export function deleteQuestMember(group, memberId) {
-// 	return request({
-// 		url: `/api/simulation/${group}/questRecord/member/${memberId}`,
-// 		method: 'delete'
-// 	});
-// }
-
-// // /** 添加/修改任务角色行为 */
-// export function postMemberBehavior(group, memberId, data) {
-// 	return request({
-// 		url: `/api/simulation/${group}/questRecord/${memberId}/behavior`,
-// 		method: 'post',
-// 		data
-// 	});
-// }
-// /** 删除任务角色行为 */
-// export function deleteMemberBehavior(group, memberId, behaviorId) {
-// 	return request({
-// 		url: `/api/simulation/${group}/questRecord/${memberId}/behavior/${behaviorId}`,
-// 		method: 'delete'
-// 	});
-// }
-// /** 删除任务角色行为动作 */
-// export function deleteMemberBehaviorAction(group, memberId, behaviorId, actionId) {
-// 	return request({
-// 		url: `/api/simulation/${group}/questRecord/${memberId}/behavior/${behaviorId}/action/${actionId}`,
-// 		method: 'delete'
-// 	});
-// }
-// /** 添加/修改任务角色行为动作 */
-// export function postMemberBehaviorAction(group, memberId, behaviorId, data) {
-// 	return request({
-// 		url: `/api/simulation/${group}/questRecord/${memberId}/behavior/${behaviorId}/action`,
-// 		method: 'post',
-// 		data
-// 	});
-// }
-// /** 添加/修改任务目标条件*/
-// export function postTargetConditionAction(group, data) {
-// 	return request({
-// 		url: `/api/simulation/${group}/questRecord/targetCondition`,
-// 		method: 'post',
-// 		data
-// 	});
-// }
-// /** 删除任务目标条件*/
-// export function deleteTargetConditionAction(group, tcId) {
-// 	return request({
-// 		url: `/api/simulation/${group}/questRecord/targetCondition/${tcId}`,
-// 		method: 'delete'
-// 	});
-// }
-
 /** 分页查询存在的仿真 */
 export function getExistingSimulation(params) {
 	return request({
@@ -396,14 +309,6 @@ export function getDeviceCodeByDeviceType(group, params) {
 		params
 	});
 }
-// /** 根据设备类型获取设备条件列表 */
-// export function getDeviceCoditionByDeviceType(params) {
-// 	return request({
-// 		url: `/api/simulation/deviceType/conditions`,
-// 		method: 'get',
-// 		params
-// 	});
-// }
 
 /** 获取任务录制的数据 */
 export function getScriptRecord(group) {
@@ -486,3 +391,20 @@ export function executeScript(group) {
 		method: 'post'
 	});
 }
+
+/** 生成用户自己的当日运行图*/
+export function generateDayRunPlan(planId, group) {
+	return request({
+		url: `/api/simulation/${group}/loadRunPlan/${planId}`,
+		method: 'post'
+	});
+}
+
+/** 创建排班计划仿真*/
+export function schedulingNotify(params) {
+	return request({
+		url: `/api/scheduling/simulation`,
+		method: 'post',
+		params
+	});
+}
diff --git a/src/assets/ibp_images/appendage_box.png b/src/assets/ibp_images/appendage_box.png
new file mode 100644
index 000000000..5d26ada38
Binary files /dev/null and b/src/assets/ibp_images/appendage_box.png differ
diff --git a/src/assets/ibp_images/ibp_bg.png b/src/assets/ibp_images/ibp_bg.png
index ba2d03cbf..47bb6eb6a 100644
Binary files a/src/assets/ibp_images/ibp_bg.png and b/src/assets/ibp_images/ibp_bg.png differ
diff --git a/src/assets/ibp_images/key.png b/src/assets/ibp_images/key.png
new file mode 100644
index 000000000..ce2edd5ca
Binary files /dev/null and b/src/assets/ibp_images/key.png differ
diff --git a/src/assets/ibp_images/key_on.png b/src/assets/ibp_images/key_on.png
new file mode 100644
index 000000000..7ab133914
Binary files /dev/null and b/src/assets/ibp_images/key_on.png differ
diff --git a/src/assets/ibp_images/keyhole.png b/src/assets/ibp_images/keyhole.png
new file mode 100644
index 000000000..b31e041f2
Binary files /dev/null and b/src/assets/ibp_images/keyhole.png differ
diff --git a/src/assets/ibp_images/telephone_terminal.png b/src/assets/ibp_images/telephone_terminal.png
index 0f9462ca8..2916add46 100644
Binary files a/src/assets/ibp_images/telephone_terminal.png and b/src/assets/ibp_images/telephone_terminal.png differ
diff --git a/src/components/QueryListPage/QueryListPage.vue b/src/components/QueryListPage/QueryListPage.vue
index ea6077051..05f0fbf74 100644
--- a/src/components/QueryListPage/QueryListPage.vue
+++ b/src/components/QueryListPage/QueryListPage.vue
@@ -63,8 +63,7 @@
             :sortable="column.sortable"
           >
             <template slot-scope="scope">
-              <el-tag :type="column.tagType(scope.row, scope.$index)">{{ column.columnValue(scope.row,
-                                                                                            scope.$index) }}</el-tag>
+              <el-tag v-if="column.columnValue(scope.row, scope.$index)" :type="column.tagType(scope.row, scope.$index)">{{ column.columnValue(scope.row, scope.$index) }}</el-tag>
             </template>
           </el-table-column>
           <el-table-column
diff --git a/src/i18n/langs/en/router.js b/src/i18n/langs/en/router.js
index bf68857ba..fa74379f1 100644
--- a/src/i18n/langs/en/router.js
+++ b/src/i18n/langs/en/router.js
@@ -13,7 +13,7 @@ export default {
 	trainingRule: 'Training rules',
 	trainingManage: 'Training management',
 	taskManage: 'Task management',
-	scriptManage: 'Script management',
+	scriptManage: 'Script',
 
 	teachSystem: 'Teaching',
 
@@ -28,13 +28,14 @@ export default {
 	replayManage: 'Playback',
 
 	permissionManage: 'Permission',
+	selfPermission: 'My Permission',
 
 	pulishManage: 'Publication',
 	publishMapManage: 'Publishing map management',
 	productStateManage: 'Product state management',
 	publishLessonManage: 'Publishing lesson management',
 	runPlanTemplateManage: 'Template plan management',
-	runPlanCommonManage: 'General plan management',
+	runPlanCommonManage: 'Loading Plan Managemen',
 	runPlanEveryDayManage: 'Daily plan Management',
 	examRuleManage: 'Management of examination rules',
 
@@ -43,6 +44,7 @@ export default {
 	orderManage: 'Order management',
 	authorityManage: 'authority management',
 	authorityTransferManage: 'Privilege distribution management',
+	userRulesManage: 'User Rights Statistics',
 	addCommodity: 'Adding goods',
 	addOrder: 'Adding orders',
 	addCoursePermissions: 'Adding course permissions',
diff --git a/src/i18n/langs/zh/orderAuthor.js b/src/i18n/langs/zh/orderAuthor.js
index e0012e7fd..60c07602c 100644
--- a/src/i18n/langs/zh/orderAuthor.js
+++ b/src/i18n/langs/zh/orderAuthor.js
@@ -46,7 +46,7 @@ export default {
 	renew: '续费',
 	productName: '产品名称',
 	recovery: '回收',
-	permissionPack: '权限包',
+	permissionPack: '包权限',
 	privilegeTransferQRCode: '权限转赠二维码',
 	generatingQRCode: '生成二维码',
 	transferQRCode: '转赠二维码',
diff --git a/src/i18n/langs/zh/permission.js b/src/i18n/langs/zh/permission.js
index 3e99db472..5e2f60423 100644
--- a/src/i18n/langs/zh/permission.js
+++ b/src/i18n/langs/zh/permission.js
@@ -10,7 +10,7 @@ export default {
 	permissionStatus: '权限状态',
 	permissionUseType: '公用/专用',
 	permissionTotal: '权限总数',
-	permissionRemains: '生于权限',
+	permissionRemains: '剩余权限',
 	isForever: '是否永久',
 	startTime: '开始时间',
 	endTime: '结束时间',
diff --git a/src/i18n/langs/zh/router.js b/src/i18n/langs/zh/router.js
index b6cac578e..fc18a0c13 100644
--- a/src/i18n/langs/zh/router.js
+++ b/src/i18n/langs/zh/router.js
@@ -28,13 +28,14 @@ export default {
 	replayManage: '回放管理',
 
 	permissionManage: '权限管理',
+	selfPermission: '我的权限',
 
 	pulishManage: '发布内容管理',
 	publishMapManage: '发布地图管理',
 	productStateManage: '产品状态管理',
 	publishLessonManage: '发布课程管理',
 	runPlanTemplateManage: '模板运行图管理',
-	runPlanCommonManage: '通用运行图管理',
+	runPlanCommonManage: '加载计划运行图管理',
 	runPlanEveryDayManage: '每日运行图管理',
 	examRuleManage: '试题规则管理',
 
@@ -43,6 +44,7 @@ export default {
 	orderManage: '订单管理',
 	authorityManage: '权限管理',
 	authorityTransferManage: '权限分发管理',
+	userRulesManage: '用户权限统计',
 	addCommodity: '添加商品',
 	addOrder: '添加订单',
 	addCoursePermissions: '添加课程权限',
@@ -51,9 +53,9 @@ export default {
 	dataDictionary: '数据字典',
 	dataDictionaryDetails: '数据字典明细',
 	userManage: '用户管理',
-	userTrainingManage: '用户实训管理',
-	userExamManage: '用户考试管理',
-	userSimulationManage: '用户仿真管理',
+	userTrainingManage: '用户实训统计',
+	userExamManage: '用户考试统计',
+	userSimulationManage: '用户仿真统计',
 	existingSimulation: '存在仿真管理',
 
 	ibpDraw: 'Ibp盘绘制'
diff --git a/src/ibp/constant/deviceRender.js b/src/ibp/constant/deviceRender.js
index ef76c84d6..fe16c8772 100644
--- a/src/ibp/constant/deviceRender.js
+++ b/src/ibp/constant/deviceRender.js
@@ -4,31 +4,31 @@ const deviceRender = {};
 
 /** IbpText渲染配置*/
 deviceRender[deviceType.IbpText] = {
-	zlevel: 1
+	zlevel: 2
 };
 
 /** SquareButton渲染配置*/
 deviceRender[deviceType.SquareButton] = {
-	zlevel: 1
+	zlevel: 2
 };
 
 /** WarnButton渲染配置*/
 deviceRender[deviceType.WarnButton] = {
-	zlevel: 1
+	zlevel: 2
 };
 
 /** Arrow渲染配置*/
 deviceRender[deviceType.Arrow] = {
-	zlevel: 1
+	zlevel: 2
 };
 
 /** RotatingButton渲染配置*/
 deviceRender[deviceType.RotatingButton] = {
-	zlevel: 1
+	zlevel: 2
 };
 
-/** Tip渲染配置*/
-deviceRender[deviceType.Tip] = {
+/** TipBox渲染配置*/
+deviceRender[deviceType.TipBox] = {
 	zlevel: 1
 };
 
@@ -39,6 +39,32 @@ deviceRender[deviceType.Background] = {
 
 /** CircularLamp渲染配置 */
 deviceRender[deviceType.CircularLamp] = {
+	zlevel: 2
+};
+
+/** AppendageBox渲染配置 */
+deviceRender[deviceType.AppendageBox] = {
 	zlevel: 1
 };
+
+/** IbpLine渲染配置 */
+deviceRender[deviceType.IbpLine] = {
+	zlevel: 2
+};
+
+/** Elevator 渲染配置 */
+deviceRender[deviceType.Elevator] = {
+	zlevel: 2
+};
+
+/** Key 渲染配置 */
+deviceRender[deviceType.Key] = {
+	zlevel: 3
+};
+
+/** TeleTerminal 渲染配置 */
+deviceRender[deviceType.TeleTerminal] = {
+	zlevel: 2
+};
+
 export default deviceRender;
diff --git a/src/ibp/constant/deviceType.js b/src/ibp/constant/deviceType.js
index 90d429fc8..c5de331b8 100644
--- a/src/ibp/constant/deviceType.js
+++ b/src/ibp/constant/deviceType.js
@@ -1,12 +1,17 @@
 const deviceType = {
 	IbpText: 'IbpText',
 	SquareButton: 'SquareButton',
-	WarnButton: 'WarnButton',
 	Arrow: 'Arrow',
 	RotatingButton: 'RotatingButton',
-	Tip: 'Tip',
+	TipBox: 'TipBox',
 	Background: 'Background',
-	CircularLamp: 'CircularLamp'
+	CircularLamp: 'CircularLamp',
+	IbpLine: 'IbpLine',
+	AppendageBox: 'AppendageBox',
+	Alarm: 'Alarm',
+	Elevator: 'Elevator',
+	Key: 'Key',
+	TeleTerminal: 'TeleTerminal'
 };
 
 export default deviceType;
diff --git a/src/ibp/constant/ibpData.js b/src/ibp/constant/ibpData.js
index 656fc75cc..a737e661f 100644
--- a/src/ibp/constant/ibpData.js
+++ b/src/ibp/constant/ibpData.js
@@ -1,51 +1,3 @@
-
-const ibpData = {
-	background: {
-		type: 'Background',
-		code: 'bg_0000'
-	},
-	arrowList: [
-		{
-			type: 'Arrow',
-			code: '1111_arrow',
-			point: {
-				x: 510,
-				y: 400
-			},
-			length: 488,
-			stroke: '#0000CD',
-			fill: '#0000CD',
-			lineWidth: 1,
-			direction: '上行',
-			stationstandDirection: '三桥方向'
-		},
-		{
-			type: 'Arrow',
-			code: '1222_arrow',
-			point: {
-				x: 510,
-				y: 200
-			},
-			length: 488,
-			stroke: '#0000CD',
-			fill: '#0000CD',
-			lineWidth: 1,
-			direction: '下行',
-			stationstandDirection: '车辆段方向'
-		}
-	],
-	circularLampList: [
-		{
-			type: 'CircularLamp',
-			code: '1333_lamp',
-			point: {
-				x: 600,
-				y: 600
-			},
-			r: 40,
-			fillColor: '#332C22'
-		}
-	]
-};
+const ibpData = {"background":{"type":"Background","code":"bg_0000","width":800,"height":600,"_type":"Background","zlevel":0},"arrowList":[{"zlevel":2,"z":1,"point":{"x":518,"y":273},"_type":"Arrow","code":"arrow_0001","orientation":"left","fill":"#0000CD","width":10,"length":488,"lineWidth":1},{"zlevel":2,"z":1,"point":{"x":518,"y":377},"_type":"Arrow","code":"arrow_0002","orientation":"right","fill":"#0000CD","width":10,"length":488,"lineWidth":1},{"zlevel":2,"z":1,"point":{"x":2974,"y":255},"_type":"Arrow","code":"arrow_4175812644734","orientation":"left","fill":"#0000CD","width":10,"length":172,"lineWidth":1},{"zlevel":2,"z":1,"point":{"x":2977,"y":381},"_type":"Arrow","code":"arrow_4175975962338","orientation":"right","fill":"#0000CD","width":10,"length":172,"lineWidth":1},{"zlevel":2,"z":1,"point":{"x":3632,"y":256},"_type":"Arrow","code":"arrow_41839558767141","orientation":"left","fill":"#0000CD","width":10,"length":414,"lineWidth":1},{"zlevel":2,"z":1,"point":{"x":3633,"y":380},"_type":"Arrow","code":"arrow_4184617987898","orientation":"right","fill":"#0000CD","width":10,"length":414,"lineWidth":1}],"circularLampList":[{"zlevel":2,"z":1,"point":{"x":549,"y":500},"_type":"CircularLamp","code":"lamp_4131658685771","r":8,"fillColor":"#332C22"},{"zlevel":2,"z":1,"point":{"x":646,"y":499},"_type":"CircularLamp","code":"lamp_41318382693510","r":8,"fillColor":"#332C22"},{"zlevel":2,"z":1,"point":{"x":1888,"y":110},"_type":"CircularLamp","code":"lamp_41642384928515","r":8,"fillColor":"#332C22"},{"zlevel":2,"z":1,"point":{"x":1962,"y":109},"_type":"CircularLamp","code":"lamp_41642491326562","r":8,"fillColor":"#332C22"},{"zlevel":2,"z":1,"point":{"x":2039,"y":110},"_type":"CircularLamp","code":"lamp_41642549077834","r":8,"fillColor":"#332C22"},{"zlevel":2,"z":1,"point":{"x":2109,"y":109},"_type":"CircularLamp","code":"lamp_4164317797683","r":8,"fillColor":"#332C22"},{"zlevel":2,"z":1,"point":{"x":2182,"y":110},"_type":"CircularLamp","code":"lamp_41643164927195","r":8,"fillColor":"#332C22"},{"zlevel":2,"z":1,"point":{"x":1986,"y":476},"_type":"CircularLamp","code":"lamp_41715522921607","r":8,"fillColor":"#332C22"},{"zlevel":2,"z":1,"point":{"x":2864,"y":183},"_type":"CircularLamp","code":"lamp_41754266926174","r":8,"fillColor":"#332C22"},{"zlevel":2,"z":1,"point":{"x":2938,"y":183},"_type":"CircularLamp","code":"lamp_41754403732853","r":8,"fillColor":"#332C22"},{"zlevel":2,"z":1,"point":{"x":2864,"y":427},"_type":"CircularLamp","code":"lamp_41885246733","r":8,"fillColor":"#332C22"},{"zlevel":2,"z":1,"point":{"x":2937,"y":426},"_type":"CircularLamp","code":"lamp_4189474357636","r":8,"fillColor":"#332C22"},{"zlevel":2,"z":1,"point":{"x":3621,"y":181},"_type":"CircularLamp","code":"lamp_4193379315744","r":8,"fillColor":"#332C22"},{"zlevel":2,"z":1,"point":{"x":3524,"y":281},"_type":"CircularLamp","code":"lamp_590451103611","r":8,"fillColor":"#332C22"},{"zlevel":2,"z":1,"point":{"x":3621,"y":427},"_type":"CircularLamp","code":"lamp_591242466193","r":8,"fillColor":"#332C22"},{"zlevel":2,"z":1,"point":{"x":2670,"y":355},"_type":"CircularLamp","code":"lamp_51533188773658","r":8,"fillColor":"#332C22"}],"textList":[{"code":"text_0001","context":"隧 道 紧 急 通 风","fontFamily":"consolas","fontSize":38,"fontWeight":900,"point":{"x":442,"y":30},"textFill":"#000","z":1,"zlevel":2,"_type":"IbpText"},{"zlevel":2,"z":1,"point":{"x":40,"y":243},"code":"text_0002","_type":"IbpText","context":"车 辆 段 方 向","textFill":"#000","fontSize":22,"fontWeight":700,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":41,"y":287},"code":"text_0003","_type":"IbpText","context":"下 行","textFill":"#000","fontSize":22,"fontWeight":700,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":943,"y":349},"code":"text_0004","_type":"IbpText","context":"上 行","textFill":"#000","fontSize":22,"fontWeight":700,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":874,"y":389},"code":"text_0005","_type":"IbpText","context":"三 桥 方 向","textFill":"#000","fontSize":22,"fontWeight":700,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":87,"y":201},"code":"text_0006","_type":"IbpText","context":"   DH14\n入段线车头","textFill":"#000","fontSize":8,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":138,"y":202},"code":"text_0008","_type":"IbpText","context":"   DH15\n入段线车尾","textFill":"#000","fontSize":8,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":186,"y":200},"code":"text_0009","_type":"IbpText","context":"   DH16\n入段线车中\n  进洞口\n疏散同行车","textFill":"#000","fontSize":8,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":235,"y":200},"code":"text_4101339933514","_type":"IbpText","context":"   DH17\n入段线车中\n  进洞口\n疏散逆行车","textFill":"#000","fontSize":8,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":281,"y":200},"code":"text_41015558239831","_type":"IbpText","context":"   DH18\n入段线车中\n  近站端\n疏散逆行车","textFill":"#000","fontSize":8,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":333,"y":200},"code":"text_4101817285946","_type":"IbpText","context":"   DH19\n入段线车中\n  进站端\n疏散同行车","textFill":"#000","fontSize":8,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":417,"y":201},"code":"text_41022504805842","_type":"IbpText","context":"HS20\n车头","textFill":"#000","fontSize":8,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":467,"y":199},"code":"text_41023582961187","_type":"IbpText","context":"HS21\n车尾","textFill":"#000","fontSize":8,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":505,"y":199},"code":"text_41024357034066","_type":"IbpText","context":"  HS22\n  车中\n 近后卫寨\n疏散同行车","textFill":"#000","fontSize":8,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":556,"y":199},"code":"text_41025561198680","_type":"IbpText","context":"  HS23\n  车中\n 近后卫寨\n疏散逆行车","textFill":"#000","fontSize":8,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":604,"y":199},"code":"text_4103078481189","_type":"IbpText","context":"  HS24\n  车中\n 近风井\n疏散逆行车","textFill":"#000","fontSize":8,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":654,"y":199},"code":"text_41031425832992","_type":"IbpText","context":"  HS25\n  车中\n 近风井\n疏散同行车","textFill":"#000","fontSize":8,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":734,"y":200},"code":"text_41036487831793","_type":"IbpText","context":"HS26\n车头","textFill":"#000","fontSize":8,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":784,"y":200},"code":"text_41037448007888","_type":"IbpText","context":"HS27\n车尾","textFill":"#000","fontSize":8,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":823,"y":198},"code":"text_41038349206672","_type":"IbpText","context":"  HS28\n  车中\n 近风井\n疏散同行车","textFill":"#000","fontSize":8,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":872,"y":199},"code":"text_41042449209958","_type":"IbpText","context":"  HS29\n  车中\n 近风井\n疏散逆行车","textFill":"#000","fontSize":8,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":922,"y":199},"code":"text_41044376818284","_type":"IbpText","context":"  HS30\n  车中\n 近三桥\n疏散逆行车","textFill":"#000","fontSize":8,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":969,"y":199},"code":"text_4104658711371","_type":"IbpText","context":"  HS31\n  车中\n 近三桥\n疏散同行车","textFill":"#000","fontSize":8,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":89,"y":446},"code":"text_41115231045004","_type":"IbpText","context":"   DH08\n出线段车头","textFill":"#000","fontSize":8,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":136,"y":447},"code":"text_41116273364907","_type":"IbpText","context":"   DH09\n出线段车尾","textFill":"#000","fontSize":8,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":187,"y":447},"code":"text_41117234729714","_type":"IbpText","context":"  DH10\n出线段车中\n  近洞口\n疏散同行车","textFill":"#000","fontSize":8,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":235,"y":447},"code":"text_41118537682079","_type":"IbpText","context":"   DH11\n出线段车中\n  近洞口\n疏散逆行车","textFill":"#000","fontSize":8,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":288,"y":446},"code":"text_41122462638800","_type":"IbpText","context":"  DH12\n出线段车中\n 近站端\n疏散逆行车","textFill":"#000","fontSize":8,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":338,"y":447},"code":"text_4112461757268","_type":"IbpText","context":"  DH13\n出线段车中\n 近站端\n疏散同行车","textFill":"#000","fontSize":8,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":416,"y":445},"code":"text_41125556167293","_type":"IbpText","context":"HS08\n车头","textFill":"#000","fontSize":8,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":465,"y":445},"code":"text_41126347113903","_type":"IbpText","context":"HS09\n车尾","textFill":"#000","fontSize":8,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":507,"y":446},"code":"text_41127161832649","_type":"IbpText","context":"  HS10\n  车中\n 近后卫寨\n疏散逆行车","textFill":"#000","fontSize":8,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":555,"y":447},"code":"text_41128408327201","_type":"IbpText","context":"  HS11\n  车中\n 近后卫寨\n疏散同行车","textFill":"#000","fontSize":8,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":604,"y":446},"code":"text_4125942461520","_type":"IbpText","context":"  HS12\n  车中\n 近风井\n疏散同行车","textFill":"#000","fontSize":8,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":652,"y":447},"code":"text_4131124852381","_type":"IbpText","context":"  HS13\n  车中\n 近风井\n疏散逆行车","textFill":"#000","fontSize":8,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":736,"y":446},"code":"text_4132384456747","_type":"IbpText","context":"HS14\n车头","textFill":"#000","fontSize":8,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":784,"y":444},"code":"text_4133296692590","_type":"IbpText","context":"HS15\n车尾","textFill":"#000","fontSize":8,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":822,"y":446},"code":"text_4134332217879","_type":"IbpText","context":"  HS16\n  车中\n 近风井\n疏散同行车","textFill":"#000","fontSize":8,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":872,"y":445},"code":"text_4135391402165","_type":"IbpText","context":"  HS17\n  车中\n 近风井\n疏散逆行车","textFill":"#000","fontSize":8,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":920,"y":444},"code":"text_413734316654","_type":"IbpText","context":"  HS18\n  车中\n 近三桥\n疏散逆行车","textFill":"#000","fontSize":8,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":971,"y":444},"code":"text_413882776642","_type":"IbpText","context":"  HS19\n  车中\n 近三桥\n疏散同行车","textFill":"#000","fontSize":8,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":282,"y":526},"code":"text_41310125966053","_type":"IbpText","context":"IBP试灯","textFill":"#000","fontSize":12,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":332,"y":495},"code":"text_41311121817148","_type":"IbpText","context":"专业人员定期\n按压、检查","textFill":"#000","fontSize":10,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":524,"y":518},"code":"text_41317486621504","_type":"IbpText","context":"自动状态","textFill":"#000","fontSize":12,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":623,"y":520},"code":"text_4131916129","_type":"IbpText","context":"手动状态","textFill":"#000","fontSize":12,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":681,"y":493},"code":"text_4131748422577","_type":"IbpText","context":"正常位为\n“自动”位：\n根据环调\n指令，如需\n人工操作时\n转至手动位\n按压上方对\n应按钮","textFill":"#000","fontSize":10,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":769,"y":504},"code":"text_4148249096842","_type":"IbpText","context":"自动","textFill":"#000","fontSize":12,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":734,"y":531},"code":"text_4141181575325","_type":"IbpText","context":"手动","textFill":"#000","fontSize":12,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":829,"y":524},"code":"text_41412426926359","_type":"IbpText","context":"复位","textFill":"#000","fontSize":12,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":1054,"y":200},"code":"text_415356693561","_type":"IbpText","context":"     XA04\n通风空调电控室\n    灭火时\n","textFill":"#000","fontSize":8,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":1137,"y":200},"code":"text_4155316378988","_type":"IbpText","context":"   XA06\n通信电源室\n  灭火时","textFill":"#000","fontSize":8,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":1210,"y":201},"code":"text_4156432128042","_type":"IbpText","context":"   XA08\n通信设备室\n  灭火时","textFill":"#000","fontSize":8,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":1067,"y":275},"code":"text_4158217804290","_type":"IbpText","context":"  XA10\n蓄电池室\n 灭火时","textFill":"#000","fontSize":8,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":1142,"y":276},"code":"text_4159166523947","_type":"IbpText","context":"  XA12\n信号电源室\n 灭火时","textFill":"#000","fontSize":8,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":1214,"y":275},"code":"text_415954685476","_type":"IbpText","context":"  XA14\n信号设备室\n 灭火时","textFill":"#000","fontSize":8,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":1067,"y":347},"code":"text_4151159093828","_type":"IbpText","context":"  XA16\n综合监控室\n 灭火时","textFill":"#000","fontSize":8,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":1135,"y":347},"code":"text_41511476379556","_type":"IbpText","context":"   XA18\n屏蔽门控制室\n  灭火时","textFill":"#000","fontSize":8,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":1205,"y":347},"code":"text_41512491889718","_type":"IbpText","context":"    XA20\n民用通信设备室\n   灭火时","textFill":"#000","fontSize":8,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":1062,"y":422},"code":"text_41513423648140","_type":"IbpText","context":"   XA22\n站厅防烟分区1\n车控站长、AFC、\n值班会议、更衣","textFill":"#000","fontSize":8,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":1131,"y":421},"code":"text_41517561655340","_type":"IbpText","context":"    XA23\n站厅防烟分区2\n    走道","textFill":"#000","fontSize":8,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":1209,"y":420},"code":"text_41519343254392","_type":"IbpText","context":"   XA24\n站厅防烟分区3\n通风空调机房","textFill":"#000","fontSize":8,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":1061,"y":495},"code":"text_41520423096113","_type":"IbpText","context":"   XA25\n气瓶、照明配、\n备品、保洁、电\n井、乘务员室等","textFill":"#000","fontSize":8,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":1311,"y":200},"code":"text_41534145981544","_type":"IbpText","context":"  DW05\n站厅公共区","textFill":"#000","fontSize":8,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":1310,"y":275},"code":"text_41534554285116","_type":"IbpText","context":"  DW06\n站台公共区","textFill":"#000","fontSize":8,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":1311,"y":349},"code":"text_4153529603395","_type":"IbpText","context":"  DW07\n上行轨行区","textFill":"#000","fontSize":8,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":1311,"y":423},"code":"text_41537305253717","_type":"IbpText","context":"  DW08\n下行轨行区","textFill":"#000","fontSize":8,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":1118,"y":132},"code":"text_4153858164985","_type":"IbpText","context":"A端 小 系 统","textFill":"#000","fontSize":12,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":1303,"y":133},"code":"text_41539324608403","_type":"IbpText","context":"大 系 统","textFill":"#000","fontSize":12,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":1462,"y":133},"code":"text_41540394521279","_type":"IbpText","context":"B端 小 系 统","textFill":"#000","fontSize":12,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":1401,"y":200},"code":"text_4155017189648","_type":"IbpText","context":"    XB04\n0.4KV开关柜室\n   灭火时","textFill":"#000","fontSize":8,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":1471,"y":201},"code":"text_4155130909534","_type":"IbpText","context":"    XB06\n35KV开关柜室\n   灭火时","textFill":"#000","fontSize":8,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":1546,"y":200},"code":"text_41552448283016","_type":"IbpText","context":"    XB08\n直流开关柜室\n   灭火时","textFill":"#000","fontSize":8,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":1403,"y":275},"code":"text_41554135973266","_type":"IbpText","context":"   XB10\n整流变压器室\n   灭火时","textFill":"#000","fontSize":8,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":1473,"y":276},"code":"text_41555434523453","_type":"IbpText","context":"    XB12\n照明配电盖蓄电\n  池室灭火时","textFill":"#000","fontSize":8,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":1546,"y":276},"code":"text_41559125721130","_type":"IbpText","context":"    XB14\n冷水机房电控室\n   灭火时","textFill":"#000","fontSize":8,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":1400,"y":346},"code":"text_4160221004491","_type":"IbpText","context":"    XB16\n通风空调电控室\n    灭火时","textFill":"#000","fontSize":8,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":1487,"y":346},"code":"text_41612760997","_type":"IbpText","context":" XB18\n控制室\n灭火时","textFill":"#000","fontSize":8,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":1560,"y":347},"code":"text_4162343487602","_type":"IbpText","context":" XB20\n警务机房\n灭火时","textFill":"#000","fontSize":8,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":1399,"y":419},"code":"text_4163345005659","_type":"IbpText","context":"    XB22\n站厅防烟分区1\n    走道","textFill":"#000","fontSize":8,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":1476,"y":420},"code":"text_41643697261","_type":"IbpText","context":"   XB23\n站厅防烟分区2\n通风空调机房","textFill":"#000","fontSize":8,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":1551,"y":419},"code":"text_416627561308","_type":"IbpText","context":"   XB24\n站厅防烟分区3\n  冷水机房","textFill":"#000","fontSize":8,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":1399,"y":493},"code":"text_4167203645771","_type":"IbpText","context":"    XB25\n气瓶、照明配、保\n洁、电井、警务、工\n务、检修等等","textFill":"#000","fontSize":8,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":1630,"y":131},"code":"text_41619184366041","_type":"IbpText","context":"C端 小 系 统","textFill":"#000","fontSize":12,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":1731,"y":134},"code":"text_4162029006925","_type":"IbpText","context":"D端 小 系 统","textFill":"#000","fontSize":12,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":1653,"y":201},"code":"text_41621103168861","_type":"IbpText","context":"  XC03\n区间跟随所\n  灭火时","textFill":"#000","fontSize":8,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":1660,"y":275},"code":"text_4162244286898","_type":"IbpText","context":"XC05\n气瓶间","textFill":"#000","fontSize":8,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":1750,"y":200},"code":"text_41622377178344","_type":"IbpText","context":"  XD02\n区间跟随所\n  灭火时","textFill":"#000","fontSize":8,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":1759,"y":276},"code":"text_4162334129751","_type":"IbpText","context":"XD04\n气瓶间","textFill":"#000","fontSize":8,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":1937,"y":35},"code":"text_41639459086866","_type":"IbpText","context":"消 防 栓 水 泵","textFill":"#000","fontSize":28,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":1866,"y":124},"code":"text_41644191955711","_type":"IbpText","context":"1#消火栓\n水泵运行","textFill":"#000","fontSize":12,"fontWeight":700,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":1935,"y":124},"code":"text_41645348369894","_type":"IbpText","context":"1#消火栓\n水泵故障","textFill":"#000","fontSize":12,"fontWeight":700,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":2015,"y":126},"code":"text_41646129085761","_type":"IbpText","context":"2#消火栓\n水泵运行","textFill":"#000","fontSize":12,"fontWeight":700,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":2083,"y":126},"code":"text_41647262125941","_type":"IbpText","context":"2#消火栓\n水泵故障","textFill":"#000","fontSize":12,"fontWeight":700,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":2153,"y":125},"code":"text_41648198367714","_type":"IbpText","context":"消火栓水泵\n处于故障状态","textFill":"#000","fontSize":12,"fontWeight":700,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":1929,"y":205},"code":"text_41652204763377","_type":"IbpText","context":"消火栓水泵启动","textFill":"#000","fontSize":10,"fontWeight":600,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":2079,"y":204},"code":"text_41653445085428","_type":"IbpText","context":"消火栓水泵禁止","textFill":"#000","fontSize":10,"fontWeight":600,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":1959,"y":273},"code":"text_41655128361097","_type":"IbpText","context":"A F C 闸 机","textFill":"#000","fontSize":28,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":1860,"y":350},"code":"text_417259565354","_type":"IbpText","context":"紧急释放状态","textFill":"#000","fontSize":10,"fontWeight":600,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":1994,"y":350},"code":"text_4172447724209","_type":"IbpText","context":"紧急释放","textFill":"#000","fontSize":10,"fontWeight":600,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":2184,"y":327},"code":"text_4176256119241","_type":"IbpText","context":"联动允许","textFill":"#000","fontSize":10,"fontWeight":600,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":2138,"y":360},"code":"text_4177254929769","_type":"IbpText","context":"联动禁止","textFill":"#000","fontSize":10,"fontWeight":600,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":2126,"y":377},"code":"text_4178314368413","_type":"IbpText","context":"  正常位为：\n“联动禁止”位","textFill":"#000","fontSize":10,"fontWeight":500,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":1977,"y":367},"code":"text_417111045260","_type":"IbpText","context":"紧急情况下，直接按压\n“紧急释放”，紧急释\n放状态灯亮，即执行成功","textFill":"#000","fontSize":8,"fontWeight":600,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":1986,"y":434},"code":"text_4171565003604","_type":"IbpText","context":"门  禁","textFill":"#000","fontSize":28,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":1957,"y":499},"code":"text_41716594045146","_type":"IbpText","context":"紧急开门状态","textFill":"#000","fontSize":10,"fontWeight":600,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":2067,"y":501},"code":"text_4171731125729","_type":"IbpText","context":"紧急开门","textFill":"#000","fontSize":10,"fontWeight":600,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":2124,"y":435},"code":"text_4171879969696","_type":"IbpText","context":"应急情况下按\n压，“紧急开门\n状态”灯亮，即\n执行成功，所有\n门禁将释放，恢\n复时需要专业\n操作。","textFill":"#000","fontSize":10,"fontWeight":500,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":2255,"y":10},"code":"text_41740466362992","_type":"IbpText","context":"后卫寨站","textFill":"#000","fontSize":50,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":2430,"y":103},"code":"text_41747109004314","_type":"IbpText","context":"自 动 扶 梯","textFill":"#000","fontSize":28,"fontWeight":600,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":2913,"y":110},"code":"text_41753238285971","_type":"IbpText","context":"屏 蔽 门","textFill":"#000","fontSize":28,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":2836,"y":204},"code":"text_4175695956261","_type":"IbpText","context":"门关闭且锁紧","textFill":"#000","fontSize":10,"fontWeight":700,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":2920,"y":204},"code":"text_41756474911594","_type":"IbpText","context":"开门状态","textFill":"#000","fontSize":10,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":3001,"y":204},"code":"text_41757201559908","_type":"IbpText","context":"开门","textFill":"#000","fontSize":10,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":3095,"y":357},"code":"text_4187272432554","_type":"IbpText","context":"上 行","textFill":"#000","fontSize":18,"fontWeight":600,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":2812,"y":266},"code":"text_4187569317011","_type":"IbpText","context":"下 行","textFill":"#000","fontSize":18,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":2836,"y":451},"code":"text_4181134351083","_type":"IbpText","context":"门关闭且锁紧","textFill":"#000","fontSize":10,"fontWeight":600,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":2917,"y":451},"code":"text_4181147163926","_type":"IbpText","context":"开门状态","textFill":"#000","fontSize":10,"fontWeight":600,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":3000,"y":451},"code":"text_4181225179602","_type":"IbpText","context":"开门","textFill":"#000","fontSize":10,"fontWeight":600,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":3111,"y":179},"code":"text_41815382847533","_type":"IbpText","context":"禁止","textFill":"#000","fontSize":10,"fontWeight":600,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":3075,"y":213},"code":"text_41815593003205","_type":"IbpText","context":"允许","textFill":"#000","fontSize":10,"fontWeight":600,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":3110,"y":423},"code":"text_41816238362630","_type":"IbpText","context":"禁止","textFill":"#000","fontSize":10,"fontWeight":600,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":3075,"y":458},"code":"text_41816528125864","_type":"IbpText","context":"允许","textFill":"#000","fontSize":10,"fontWeight":600,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":2822,"y":152},"code":"text_41819316437589","_type":"IbpText","context":"屏蔽门关闭且锁紧，信号正\n常时，“关闭且锁紧”灯亮","textFill":"#000","fontSize":6,"fontWeight":550,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":2905,"y":152},"code":"text_41826117008612","_type":"IbpText","context":"屏蔽门打开时，信号正常\n时，“开门状态”灯亮","textFill":"#000","fontSize":6,"fontWeight":550,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":3056,"y":156},"code":"text_4183225871334","_type":"IbpText","context":"正常位位“禁止”位","textFill":"#000","fontSize":8,"fontWeight":600,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":3055,"y":275},"code":"text_41833377567007","_type":"IbpText","context":"钥匙转至“允许”位，再\n按压“开门”按钮，乘客\n上下完毕后转至“禁止”\n位，现场方可使用PLS钥\n匙关门或打互锁解除发车","textFill":"#000","fontSize":8,"fontWeight":600,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":3588,"y":43},"code":"text_41847255246397","_type":"IbpText","context":"信  号","textFill":"#000","fontSize":28,"fontWeight":600,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":3221,"y":228},"code":"text_41850174913674","_type":"IbpText","context":"车 辆 段 方 向","textFill":"#000","fontSize":18,"fontWeight":600,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":3222,"y":272},"code":"text_41851168674074","_type":"IbpText","context":"下 行","textFill":"#000","fontSize":18,"fontWeight":600,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":4003,"y":352},"code":"text_4185288836353","_type":"IbpText","context":"上 行","textFill":"#000","fontSize":18,"fontWeight":600,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":3945,"y":397},"code":"text_418523436504","_type":"IbpText","context":"三 桥 方 向","textFill":"#000","fontSize":18,"fontWeight":600,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":3269,"y":151},"code":"text_5915382632462","_type":"IbpText","context":"G1116","textFill":"#000","fontSize":10,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":3317,"y":151},"code":"text_5916408706415","_type":"IbpText","context":"G1118","textFill":"#000","fontSize":10,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":3367,"y":151},"code":"text_5917207509333","_type":"IbpText","context":"G1120","textFill":"#000","fontSize":10,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":3415,"y":152},"code":"text_5917524544029","_type":"IbpText","context":"G1122","textFill":"#000","fontSize":10,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":3219,"y":201},"code":"text_5918376936934","_type":"IbpText","context":"DG1124","textFill":"#000","fontSize":10,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":3269,"y":201},"code":"text_591917986","_type":"IbpText","context":"DG1126","textFill":"#000","fontSize":10,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":3317,"y":200},"code":"text_5919432625338","_type":"IbpText","context":"G1102","textFill":"#000","fontSize":10,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":3366,"y":200},"code":"text_5920119423643","_type":"IbpText","context":"DG1104","textFill":"#000","fontSize":10,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":3415,"y":200},"code":"text_5920471822286","_type":"IbpText","context":"G1106","textFill":"#000","fontSize":10,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":3506,"y":202},"code":"text_5921262388204","_type":"IbpText","context":"X扣车","textFill":"#000","fontSize":10,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":3605,"y":201},"code":"text_5921539743621","_type":"IbpText","context":"X扣车","textFill":"#000","fontSize":10,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":3694,"y":202},"code":"text_5922244535209","_type":"IbpText","context":"x终止扣车","textFill":"#000","fontSize":10,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":3805,"y":154},"code":"text_592320785014","_type":"IbpText","context":"DG1108","textFill":"#000","fontSize":10,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":3853,"y":154},"code":"text_5924125989003","_type":"IbpText","context":"G1110","textFill":"#000","fontSize":10,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":3902,"y":154},"code":"text_59244330439","_type":"IbpText","context":"G1202","textFill":"#000","fontSize":10,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":3950,"y":155},"code":"text_5925341667016","_type":"IbpText","context":"G1204","textFill":"#000","fontSize":10,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":3349,"y":352},"code":"text_5926325668147","_type":"IbpText","context":"计轴预复零","textFill":"#000","fontSize":10,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":3505,"y":301},"code":"text_5927422707726","_type":"IbpText","context":"紧急停车","textFill":"#000","fontSize":10,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":3504,"y":353},"code":"text_5928174782973","_type":"IbpText","context":"紧急停车","textFill":"#000","fontSize":10,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":3602,"y":353},"code":"text_592963424015","_type":"IbpText","context":"取消紧停","textFill":"#000","fontSize":10,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":3698,"y":298},"code":"text_5930122945783","_type":"IbpText","context":"紧停报警","textFill":"#000","fontSize":10,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":3220,"y":449},"code":"text_5931423181905","_type":"IbpText","context":"G1111","textFill":"#000","fontSize":10,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":3269,"y":448},"code":"text_593284629497","_type":"IbpText","context":"G1113","textFill":"#000","fontSize":10,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":3317,"y":448},"code":"text_5932412541025","_type":"IbpText","context":"G1115","textFill":"#000","fontSize":10,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":3366,"y":448},"code":"text_593335387711","_type":"IbpText","context":"G1117","textFill":"#000","fontSize":10,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":3415,"y":448},"code":"text_59342863929","_type":"IbpText","context":"DG1119","textFill":"#000","fontSize":10,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":3269,"y":497},"code":"text_593521437162","_type":"IbpText","context":"DG1121","textFill":"#000","fontSize":10,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":3318,"y":497},"code":"text_5935267983522","_type":"IbpText","context":"G1101","textFill":"#000","fontSize":10,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":3366,"y":497},"code":"text_5935573662933","_type":"IbpText","context":"DG1103","textFill":"#000","fontSize":10,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":3417,"y":497},"code":"text_5936306548978","_type":"IbpText","context":"G1105","textFill":"#000","fontSize":10,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":3508,"y":451},"code":"text_5937107825346","_type":"IbpText","context":"S扣车","textFill":"#000","fontSize":10,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":3605,"y":450},"code":"text_5937487749902","_type":"IbpText","context":"S扣车","textFill":"#000","fontSize":10,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":3693,"y":451},"code":"text_5938423278075","_type":"IbpText","context":"S终止扣车","textFill":"#000","fontSize":10,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":3805,"y":448},"code":"text_593916228964","_type":"IbpText","context":"DG1107","textFill":"#000","fontSize":10,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":3854,"y":448},"code":"text_5939429423622","_type":"IbpText","context":"G1201","textFill":"#000","fontSize":10,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":3901,"y":448},"code":"text_5940294947504","_type":"IbpText","context":"G1203","textFill":"#000","fontSize":10,"fontWeight":800,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":3495,"y":96},"code":"text_5945243988109","_type":"IbpText","context":"下行。按压后，\n表示灯亮，\nATS/LOW机界\n面下行站台旁\n出现'H，即执\n行成功。","textFill":"#000","fontSize":10,"fontWeight":500,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":3684,"y":98},"code":"text_5950224139408","_type":"IbpText","context":"下行。按压，待扣\n车表示灯熄灭后，\nATS/LOW机下行\n站台旁圆点与字\n符消失，即执行\n成功。","textFill":"#000","fontSize":10,"fontWeight":500,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":3295,"y":288},"code":"text_5954411745214","_type":"IbpText","context":"确认计轴区段后，\n与计轴预复零按\n钮同时按压，待\n轨道区段按钮表\n示灯点亮，即执\n行成功。","textFill":"#000","fontSize":9,"fontWeight":500,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":3426,"y":277},"code":"text_5958143342352","_type":"IbpText","context":"按压后，表示灯亮，\n蜂鸣器持续响（可\n按压报警切除进行\n消音），ATS/LOW\n机站台中央出现红\n色菱形，即执行\n成功。","textFill":"#000","fontSize":9,"fontWeight":500,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":3580,"y":264},"code":"text_5101473349554","_type":"IbpText","context":"按压后，表示灯熄灭蜂\n鸣器持续响（可按压报\n警切除进行消音），\nATS/LOW机站台中\n央红色菱形消失，即\n执行成功。","textFill":"#000","fontSize":8,"fontWeight":550,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":3491,"y":474},"code":"text_510716302814","_type":"IbpText","context":"上行。按压后，\n表示灯亮，\nATS/LOW机界\n面上行站台旁\n出现'H，即执\n行成功。","textFill":"#000","fontSize":10,"fontWeight":500,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":3682,"y":474},"code":"text_5109366545936","_type":"IbpText","context":"上行。按压，待扣\n车表示灯熄灭后，\nATS/LOW机上行\n站台旁圆点与字\n符消失，即执行\n成功。","textFill":"#000","fontSize":10,"fontWeight":500,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":3699,"y":351},"code":"text_51026543111242","_type":"IbpText","context":"报警切除","textFill":"#000","fontSize":10,"fontWeight":600,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":3757,"y":323},"code":"text_51027375826525","_type":"IbpText","context":"按压后蜂鸣器静\n音，即执行成功","textFill":"#000","fontSize":10,"fontWeight":500,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":2664,"y":371},"code":"text_51534464299805","_type":"IbpText","context":"扶梯盖板\n非正常打开","textFill":"#000","fontSize":10,"fontWeight":600,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":10,"y":10},"code":"","_type":"IbpText","context":"","textFill":"","fontSize":"","fontWeight":"","fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":2717,"y":180},"code":"text_51536055991","_type":"IbpText","context":"地面","textFill":"#000","fontSize":10,"fontWeight":600,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":2716,"y":301},"code":"text_51536333416355","_type":"IbpText","context":"站厅","textFill":"#000","fontSize":10,"fontWeight":600,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":2718,"y":422},"code":"text_51537159657167","_type":"IbpText","context":"站台","textFill":"#000","fontSize":10,"fontWeight":600,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":2318,"y":299},"code":"text_51538187899953","_type":"IbpText","context":"E0111/03(K1) E0111/04(K2) E0111/05(K3) E0111/06(K4)","textFill":"#000","fontSize":10,"fontWeight":600,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":2350,"y":419},"code":"text_5154024180892","_type":"IbpText","context":"E0111/01(N) E0111/02(N)","textFill":"#000","fontSize":10,"fontWeight":600,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":2367,"y":256},"code":"text_51542363412784","_type":"IbpText","context":"急停","textFill":"#000","fontSize":10,"fontWeight":600,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":2441,"y":255},"code":"text_51543258299554","_type":"IbpText","context":"急停","textFill":"#000","fontSize":10,"fontWeight":600,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":2514,"y":254},"code":"text_5154426299197","_type":"IbpText","context":"急停","textFill":"#000","fontSize":10,"fontWeight":600,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":2586,"y":255},"code":"text_51544384294017","_type":"IbpText","context":"急停","textFill":"#000","fontSize":10,"fontWeight":600,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":2391,"y":379},"code":"text_5154577973006","_type":"IbpText","context":"急停","textFill":"#000","fontSize":10,"fontWeight":600,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":2465,"y":379},"code":"text_51545329418685","_type":"IbpText","context":"急停","textFill":"#000","fontSize":10,"fontWeight":600,"fontFamily":"consolas"},{"zlevel":2,"z":1,"point":{"x":3981,"y":495},"code":"text_5166547667596","_type":"IbpText","context":"电话端子","textFill":"#000","fontSize":10,"fontWeight":600,"fontFamily":"consolas"}],"squareButtonList":[{"zlevel":2,"z":1,"point":{"x":96,"y":168},"_type":"SquareButton","code":"button_0001","color":"red","status":"off","width":25,"height":30},{"zlevel":2,"z":1,"point":{"x":145,"y":169},"_type":"SquareButton","code":"button_0002","color":"red","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":195,"y":168},"_type":"SquareButton","code":"button_0003","color":"red","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":243,"y":169},"_type":"SquareButton","code":"button_0004","color":"red","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":292,"y":168},"_type":"SquareButton","code":"button_0005","color":"red","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":341,"y":169},"_type":"SquareButton","code":"button_0006","color":"red","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":413,"y":168},"_type":"SquareButton","code":"sButton_4102066234674","color":"red","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":462,"y":167},"_type":"SquareButton","code":"sButton_41021142802731","color":"red","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":511,"y":168},"_type":"SquareButton","code":"sButton_41021261282904","color":"red","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":560,"y":169},"_type":"SquareButton","code":"sButton_41021372727639","color":"red","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":609,"y":169},"_type":"SquareButton","code":"sButton_410222879556","color":"red","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":658,"y":168},"_type":"SquareButton","code":"sButton_41022225682818","color":"red","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":730,"y":168},"_type":"SquareButton","code":"sButton_41034167834942","color":"red","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":779,"y":169},"_type":"SquareButton","code":"sButton_41034458409859","color":"red","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":828,"y":168},"_type":"SquareButton","code":"sButton_41034586872393","color":"red","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":877,"y":168},"_type":"SquareButton","code":"sButton_41035117756343","color":"red","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":926,"y":169},"_type":"SquareButton","code":"sButton_41035211524212","color":"red","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":975,"y":169},"_type":"SquareButton","code":"sButton_41035352001528","color":"red","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":97,"y":416},"_type":"SquareButton","code":"sButton_41054552164071","color":"red","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":145,"y":415},"_type":"SquareButton","code":"sButton_41055138482599","color":"red","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":194,"y":415},"_type":"SquareButton","code":"sButton_41055293124518","color":"red","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":292,"y":415},"_type":"SquareButton","code":"sButton_4105540974333","color":"red","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":243,"y":415},"_type":"SquareButton","code":"sButton_41055571289361","color":"red","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":341,"y":415},"_type":"SquareButton","code":"sButton_4116164588527","color":"red","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":413,"y":415},"_type":"SquareButton","code":"sButton_4117401914880","color":"red","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":462,"y":415},"_type":"SquareButton","code":"sButton_411802155297","color":"red","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":511,"y":415},"_type":"SquareButton","code":"sButton_4118165201356","color":"red","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":560,"y":415},"_type":"SquareButton","code":"sButton_41183348571","color":"red","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":609,"y":415},"_type":"SquareButton","code":"sButton_4118451602012","color":"red","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":657,"y":415},"_type":"SquareButton","code":"sButton_4111174482634","color":"red","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":731,"y":414},"_type":"SquareButton","code":"sButton_4111132407854","color":"red","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":779,"y":414},"_type":"SquareButton","code":"sButton_41111469846478","color":"red","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":829,"y":414},"_type":"SquareButton","code":"sButton_411120568399","color":"red","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":877,"y":413},"_type":"SquareButton","code":"sButton_41114173755674","color":"red","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":925,"y":413},"_type":"SquareButton","code":"sButton_41114272551551","color":"red","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":975,"y":413},"_type":"SquareButton","code":"sButton_41114398395159","color":"red","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":292,"y":488},"_type":"SquareButton","code":"sButton_41394129318","color":"yellow","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":828,"y":486},"_type":"SquareButton","code":"sButton_4141218684010","color":"green","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":1073,"y":170},"_type":"SquareButton","code":"sButton_41430292761901","color":"red","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":1145,"y":170},"_type":"SquareButton","code":"sButton_41430568369705","color":"red","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":1218,"y":170},"_type":"SquareButton","code":"sButton_414318884722","color":"red","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":1073,"y":244},"_type":"SquareButton","code":"sButton_4143519249051","color":"red","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":1146,"y":245},"_type":"SquareButton","code":"sButton_41435247085059","color":"red","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":1219,"y":244},"_type":"SquareButton","code":"sButton_4143537405349","color":"red","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":1072,"y":317},"_type":"SquareButton","code":"sButton_41435495483958","color":"red","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":1145,"y":317},"_type":"SquareButton","code":"sButton_414365484870","color":"red","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":1219,"y":316},"_type":"SquareButton","code":"sButton_4143619420649","color":"red","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":1072,"y":391},"_type":"SquareButton","code":"sButton_41436335325302","color":"red","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":1145,"y":390},"_type":"SquareButton","code":"sButton_414365985566","color":"red","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":1219,"y":390},"_type":"SquareButton","code":"sButton_41437157979886","color":"red","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":1073,"y":464},"_type":"SquareButton","code":"sButton_41437246219504","color":"red","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":1316,"y":171},"_type":"SquareButton","code":"sButton_41525455488026","color":"red","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":1559,"y":318},"_type":"SquareButton","code":"sButton_41527396609835","color":"red","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":1316,"y":244},"_type":"SquareButton","code":"sButton_4152829453371","color":"red","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":1316,"y":391},"_type":"SquareButton","code":"sButton_41529367729656","color":"red","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":1560,"y":169},"_type":"SquareButton","code":"sButton_41543306289510","color":"red","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":1559,"y":244},"_type":"SquareButton","code":"sButton_41543378924491","color":"red","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":1486,"y":316},"_type":"SquareButton","code":"sButton_4154419403287","color":"red","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":1316,"y":318},"_type":"SquareButton","code":"sButton_41544103967385","color":"red","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":1560,"y":390},"_type":"SquareButton","code":"sButton_4154423137871","color":"red","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":1487,"y":390},"_type":"SquareButton","code":"sButton_41544377013009","color":"red","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":1414,"y":462},"_type":"SquareButton","code":"sButton_41544484844591","color":"red","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":1413,"y":390},"_type":"SquareButton","code":"sButton_41544562848923","color":"red","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":1414,"y":316},"_type":"SquareButton","code":"sButton_4154551569736","color":"red","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":1413,"y":244},"_type":"SquareButton","code":"sButton_41545133883604","color":"red","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":1413,"y":170},"_type":"SquareButton","code":"sButton_41545206212162","color":"red","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":1486,"y":170},"_type":"SquareButton","code":"sButton_41545303323996","color":"red","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":1487,"y":245},"_type":"SquareButton","code":"sButton_41545426847471","color":"red","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":1756,"y":170},"_type":"SquareButton","code":"sButton_41612415341796","color":"red","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":1658,"y":243},"_type":"SquareButton","code":"sButton_41612486602946","color":"red","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":1757,"y":244},"_type":"SquareButton","code":"sButton_4161256929830","color":"red","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":1658,"y":170},"_type":"SquareButton","code":"sButton_4161329561451","color":"red","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":1949,"y":169},"_type":"SquareButton","code":"sButton_41650552361820","color":"green","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":2096,"y":169},"_type":"SquareButton","code":"sButton_4165141871209","color":"red","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":2001,"y":316},"_type":"SquareButton","code":"sButton_41656443649289","color":"red","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":2072,"y":464},"_type":"SquareButton","code":"sButton_41716138843053","color":"red","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":2510,"y":219},"_type":"SquareButton","code":"sButton_4175012276948","color":"red","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":2583,"y":219},"_type":"SquareButton","code":"sButton_41750223316796","color":"red","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":2388,"y":342},"_type":"SquareButton","code":"sButton_41750321799217","color":"red","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":2462,"y":342},"_type":"SquareButton","code":"sButton_4175039605366","color":"red","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":2365,"y":219},"_type":"SquareButton","code":"sButton_41752339637523","color":"red","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":2437,"y":220},"_type":"SquareButton","code":"sButton_417530124476","color":"red","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":2998,"y":171},"_type":"SquareButton","code":"sButton_4175598209979","color":"red","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":2998,"y":415},"_type":"SquareButton","code":"sButton_41810156446450","color":"red","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":3268,"y":118},"_type":"SquareButton","code":"sButton_41853327072814","color":"gray","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":3315,"y":118},"_type":"SquareButton","code":"sButton_4185437871566","color":"gray","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":3364,"y":118},"_type":"SquareButton","code":"sButton_41854384757478","color":"gray","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":3413,"y":119},"_type":"SquareButton","code":"sButton_41854552912531","color":"gray","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":3217,"y":166},"_type":"SquareButton","code":"sButton_41855146592759","color":"gray","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":3267,"y":167},"_type":"SquareButton","code":"sButton_41855248593080","color":"gray","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":3315,"y":167},"_type":"SquareButton","code":"sButton_41855371632786","color":"gray","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":3364,"y":167},"_type":"SquareButton","code":"sButton_41855465795347","color":"gray","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":3414,"y":166},"_type":"SquareButton","code":"sButton_4185603875332","color":"gray","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":3509,"y":166},"_type":"SquareButton","code":"sButton_41858403003346","color":"yellow","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":3707,"y":167},"_type":"SquareButton","code":"sButton_419149351938","color":"green","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":3804,"y":120},"_type":"SquareButton","code":"sButton_4196579878265","color":"gray","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":3850,"y":121},"_type":"SquareButton","code":"sButton_4198379728039","color":"gray","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":3900,"y":122},"_type":"SquareButton","code":"sButton_4198544114734","color":"gray","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":3946,"y":122},"_type":"SquareButton","code":"sButton_419977078481","color":"gray","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":3364,"y":317},"_type":"SquareButton","code":"sButton_585251543479","color":"red","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":3510,"y":316},"_type":"SquareButton","code":"sButton_5853389821378","color":"red","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":3608,"y":317},"_type":"SquareButton","code":"sButton_585433829492","color":"yellow","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":3217,"y":415},"_type":"SquareButton","code":"sButton_5855266304306","color":"gray","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":3266,"y":414},"_type":"SquareButton","code":"sButton_5855455988433","color":"gray","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":3315,"y":414},"_type":"SquareButton","code":"sButton_5856189426498","color":"gray","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":3364,"y":414},"_type":"SquareButton","code":"sButton_5856319511385","color":"gray","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":3412,"y":414},"_type":"SquareButton","code":"sButton_58572793406","color":"gray","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":3267,"y":463},"_type":"SquareButton","code":"sButton_5857132953525","color":"gray","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":3315,"y":463},"_type":"SquareButton","code":"sButton_5857285271469","color":"gray","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":3364,"y":463},"_type":"SquareButton","code":"sButton_5857399835349","color":"gray","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":3412,"y":462},"_type":"SquareButton","code":"sButton_5857569912421","color":"gray","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":3510,"y":414},"_type":"SquareButton","code":"sButton_5858506468093","color":"yellow","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":3704,"y":414},"_type":"SquareButton","code":"sButton_5859243822042","color":"green","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":3803,"y":415},"_type":"SquareButton","code":"sButton_5859518063071","color":"gray","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":3852,"y":414},"_type":"SquareButton","code":"sButton_5901566937","color":"gray","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":3900,"y":414},"_type":"SquareButton","code":"sButton_590135987337","color":"gray","status":"off","width":25,"height":1},{"zlevel":2,"z":1,"point":{"x":3705,"y":317},"_type":"SquareButton","code":"sButton_5102544143660","color":"blue","status":"off","width":25,"height":1}],"tipBoxList":[{"zlevel":1,"z":1,"point":{"x":325,"y":489},"code":"tipBox_4131207904875","_type":"TipBox","width":75,"height":28,"fillColor":"#CE950F"},{"zlevel":1,"z":1,"point":{"x":679,"y":484},"code":"tipBox_41323422529661","_type":"TipBox","width":54,"height":100,"fillColor":"#CE950F"},{"zlevel":1,"z":1,"point":{"x":2120,"y":372},"code":"tipBox_4179311892930","_type":"TipBox","width":75,"height":25,"fillColor":"#CE950F"},{"zlevel":1,"z":1,"point":{"x":1969,"y":363},"code":"tipBox_41713195488258","_type":"TipBox","width":100,"height":30,"fillColor":"#CE950F"},{"zlevel":1,"z":1,"point":{"x":2121,"y":432},"code":"tipBox_41732408877171","_type":"TipBox","width":75,"height":80,"fillColor":"#CE950F"},{"zlevel":1,"z":1,"point":{"x":2820,"y":148},"code":"tipBox_41823194731832","_type":"TipBox","width":80,"height":20,"fillColor":"#CE950F"},{"zlevel":1,"z":1,"point":{"x":2903,"y":147},"code":"tipBox_4182947526663","_type":"TipBox","width":70,"height":20,"fillColor":"#CE950F"},{"zlevel":1,"z":1,"point":{"x":3050,"y":146},"code":"tipBox_41837191712348","_type":"TipBox","width":80,"height":25,"fillColor":"#CE950F"},{"zlevel":1,"z":1,"point":{"x":3047,"y":270},"code":"tipBox_41837572193649","_type":"TipBox","width":100,"height":50,"fillColor":"#CE950F"},{"zlevel":1,"z":1,"point":{"x":3491,"y":88},"code":"tipBox_5101251023030","_type":"TipBox","width":70,"height":70,"fillColor":"#CE950F"},{"zlevel":1,"z":1,"point":{"x":3676,"y":92},"code":"tipBox_51012286706118","_type":"TipBox","width":90,"height":70,"fillColor":"#CE950F"},{"zlevel":1,"z":1,"point":{"x":3289,"y":279},"code":"tipBox_51013152783750","_type":"TipBox","width":75,"height":70,"fillColor":"#CE950F"},{"zlevel":1,"z":1,"point":{"x":3422,"y":272},"code":"tipBox_5101427107104","_type":"TipBox","width":80,"height":70,"fillColor":"#CE950F"},{"zlevel":1,"z":1,"point":{"x":3575,"y":262},"code":"tipBox_51014343012273","_type":"TipBox","width":90,"height":50,"fillColor":"#CE950F"},{"zlevel":1,"z":1,"point":{"x":3487,"y":469},"code":"tipBox_51014567027956","_type":"TipBox","width":70,"height":70,"fillColor":"#CE950F"},{"zlevel":1,"z":1,"point":{"x":3677,"y":468},"code":"tipBox_51016129828839","_type":"TipBox","width":90,"height":70,"fillColor":"#CE950F"},{"zlevel":1,"z":1,"point":{"x":3752,"y":317},"code":"tipBox_51028494865468","_type":"TipBox","width":80,"height":30,"fillColor":"#CE950F"}],"rotatingButtonList":[{"zlevel":2,"z":1,"point":{"x":736,"y":498},"draggable":true,"_type":"RotatingButton","code":"rButton_41344417412052","width":20,"height":20},{"zlevel":2,"z":1,"point":{"x":2146,"y":318},"draggable":true,"_type":"RotatingButton","code":"rButton_41658147562730","width":25,"height":25},{"zlevel":2,"z":1,"point":{"x":3073,"y":172},"draggable":true,"_type":"RotatingButton","code":"rButton_41755475633812","width":25,"height":25},{"zlevel":2,"z":1,"point":{"x":3072,"y":415},"draggable":true,"_type":"RotatingButton","code":"rButton_41810343886103","width":25,"height":25}],"ibpLineList":[{"zlevel":2,"z":1,"point1":{"x":754,"y":508},"point2":{"x":764,"y":508},"direction":"transverse","code":"line_4147304287066","_type":"IbpLine","lineWidth":3,"fillColor":"#000"},{"zlevel":2,"z":1,"point1":{"x":746,"y":515},"point2":{"x":746,"y":525},"direction":"vertical","code":"line_4147585973070","_type":"IbpLine","lineWidth":3,"fillColor":"#000"},{"zlevel":2,"z":1,"point1":{"x":1045,"y":157},"point2":{"x":1045,"y":532},"direction":"vertical","code":"line_4142172603445","_type":"IbpLine","lineWidth":2,"fillColor":"#0000CD"},{"zlevel":2,"z":1,"point1":{"x":1269,"y":157},"point2":{"x":1269,"y":532},"direction":"vertical","code":"line_41423256845316","_type":"IbpLine","lineWidth":2,"fillColor":"#0000CD"},{"zlevel":2,"z":1,"point1":{"x":1044,"y":157},"point2":{"x":1269,"y":157},"direction":"transverse","code":"line_4151484455902","_type":"IbpLine","lineWidth":2,"fillColor":"#0000CD"},{"zlevel":2,"z":1,"point1":{"x":1045,"y":532},"point2":{"x":1270,"y":532},"direction":"transverse","code":"line_415213806180","_type":"IbpLine","lineWidth":2,"fillColor":"#0000CD"},{"zlevel":2,"z":1,"point1":{"x":1301,"y":157},"point2":{"x":1301,"y":532},"direction":"vertical","code":"line_41530950878","_type":"IbpLine","lineWidth":2,"fillColor":"#0000CD"},{"zlevel":2,"z":1,"point1":{"x":1300,"y":156},"point2":{"x":1360,"y":156},"direction":"transverse","code":"line_41532361001859","_type":"IbpLine","lineWidth":2,"fillColor":"#0000CD"},{"zlevel":2,"z":1,"point1":{"x":1300,"y":532},"point2":{"x":1360,"y":532},"direction":"transverse","code":"line_4153351167000","_type":"IbpLine","lineWidth":2,"fillColor":"#0000CD"},{"zlevel":2,"z":1,"point1":{"x":1359,"y":156},"point2":{"x":1359,"y":531},"direction":"vertical","code":"line_41533308921524","_type":"IbpLine","lineWidth":2,"fillColor":"#0000CD"},{"zlevel":2,"z":1,"point1":{"x":1389,"y":155},"point2":{"x":1389,"y":530},"direction":"vertical","code":"line_41541367969158","_type":"IbpLine","lineWidth":2,"fillColor":"#0000CD"},{"zlevel":2,"z":1,"point1":{"x":1612,"y":154},"point2":{"x":1612,"y":529},"direction":"vertical","code":"line_41541546841867","_type":"IbpLine","lineWidth":2,"fillColor":"#0000CD"},{"zlevel":2,"z":1,"point1":{"x":1388,"y":530},"point2":{"x":1613,"y":530},"direction":"transverse","code":"line_41542278124761","_type":"IbpLine","lineWidth":2,"fillColor":"#0000CD"},{"zlevel":2,"z":1,"point1":{"x":1388,"y":155},"point2":{"x":1613,"y":155},"direction":"transverse","code":"line_4154245138867","_type":"IbpLine","lineWidth":2,"fillColor":"#0000CD"},{"zlevel":2,"z":1,"point1":{"x":1639,"y":156},"point2":{"x":1699,"y":156},"direction":"transverse","code":"line_4169578701349","_type":"IbpLine","lineWidth":2,"fillColor":"#0000CD"},{"zlevel":2,"z":1,"point1":{"x":1737,"y":530},"point2":{"x":1797,"y":530},"direction":"transverse","code":"line_41610143487536","_type":"IbpLine","lineWidth":2,"fillColor":"#0000CD"},{"zlevel":2,"z":1,"point1":{"x":1639,"y":530},"point2":{"x":1699,"y":530},"direction":"transverse","code":"line_41610314288535","_type":"IbpLine","lineWidth":2,"fillColor":"#0000CD"},{"zlevel":2,"z":1,"point1":{"x":1737,"y":156},"point2":{"x":1797,"y":156},"direction":"transverse","code":"line_4161050606325","_type":"IbpLine","lineWidth":2,"fillColor":"#0000CD"},{"zlevel":2,"z":1,"point1":{"x":1738,"y":155},"point2":{"x":1738,"y":530},"direction":"vertical","code":"line_416116219732","_type":"IbpLine","lineWidth":2,"fillColor":"#0000CD"},{"zlevel":2,"z":1,"point1":{"x":1640,"y":155},"point2":{"x":1640,"y":530},"direction":"vertical","code":"line_41611253166269","_type":"IbpLine","lineWidth":2,"fillColor":"#0000CD"},{"zlevel":2,"z":1,"point1":{"x":1698,"y":155},"point2":{"x":1698,"y":530},"direction":"vertical","code":"line_4161145281664","_type":"IbpLine","lineWidth":2,"fillColor":"#0000CD"},{"zlevel":2,"z":1,"point1":{"x":1796,"y":156},"point2":{"x":1796,"y":531},"direction":"vertical","code":"line_4161248923530","_type":"IbpLine","lineWidth":2,"fillColor":"#0000CD"},{"zlevel":2,"z":1,"point1":{"x":2240,"y":0},"point2":{"x":2240,"y":1024},"direction":"vertical","code":"line_4162565004919","_type":"IbpLine","lineWidth":5,"fillColor":"#3A3A36"},{"zlevel":2,"z":1,"point1":{"x":1841,"y":1},"point2":{"x":1841,"y":1025},"direction":"vertical","code":"line_41626187083180","_type":"IbpLine","lineWidth":5,"fillColor":"#3A3A36"},{"zlevel":2,"z":1,"point1":{"x":1841,"y":405},"point2":{"x":2241,"y":405},"direction":"transverse","code":"line_4163649268911","_type":"IbpLine","lineWidth":5,"fillColor":"#3A3A36"},{"zlevel":2,"z":1,"point1":{"x":1841,"y":254},"point2":{"x":2241,"y":254},"direction":"transverse","code":"line_41637136446994","_type":"IbpLine","lineWidth":5,"fillColor":"#3A3A36"},{"zlevel":2,"z":1,"point1":{"x":2171,"y":330},"point2":{"x":2181,"y":330},"direction":"transverse","code":"line_417459403934","_type":"IbpLine","lineWidth":3,"fillColor":"#000"},{"zlevel":2,"z":1,"point1":{"x":2158,"y":344},"point2":{"x":2158,"y":354},"direction":"vertical","code":"line_4175593558037","_type":"IbpLine","lineWidth":3,"fillColor":"#000"},{"zlevel":2,"z":1,"point1":{"x":3180,"y":-3},"point2":{"x":3180,"y":1021},"direction":"vertical","code":"line_41814331538253","_type":"IbpLine","lineWidth":5,"fillColor":"#3A3A36"},{"zlevel":2,"z":1,"point1":{"x":3097,"y":184},"point2":{"x":3107,"y":184},"direction":"transverse","code":"line_41817198046655","_type":"IbpLine","lineWidth":3,"fillColor":"#000"},{"zlevel":2,"z":1,"point1":{"x":3085,"y":197},"point2":{"x":3085,"y":207},"direction":"vertical","code":"line_4181743772122","_type":"IbpLine","lineWidth":3,"fillColor":"#000"},{"zlevel":2,"z":1,"point1":{"x":3096,"y":427},"point2":{"x":3106,"y":427},"direction":"transverse","code":"line_4181889162471","_type":"IbpLine","lineWidth":3,"fillColor":"#000"},{"zlevel":2,"z":1,"point1":{"x":3085,"y":440},"point2":{"x":3085,"y":450},"direction":"vertical","code":"line_4181846432328","_type":"IbpLine","lineWidth":3,"fillColor":"#000"}],"appendageBoxList":[{"zlevel":1,"z":1,"point":{"x":2284,"y":151},"_type":"AppendageBox","code":"aBox41745264751296","width":475,"height":310}],"alarmList":[{"zlevel":2,"z":1,"point":{"x":3711,"y":272},"code":"alarm_591507021609","_type":"Alarm","width":35,"height":35},{"zlevel":2,"z":1,"point":{"x":2683,"y":343},"code":"alarm_51531302525872","_type":"Alarm","width":40}],"keyList":[{"zlevel":3,"z":1,"point":{"x":731,"y":497},"draggable":true,"_type":"Key","code":"key_5145349642093","width":25,"height":75,"status":"off"},{"zlevel":3,"z":1,"point":{"x":2144,"y":317},"draggable":true,"_type":"Key","code":"key_514551676531","width":25,"height":75,"status":"off"},{"zlevel":3,"z":1,"point":{"x":3070,"y":173},"draggable":true,"_type":"Key","code":"key_51455586131122","width":25,"height":75,"status":"on"}],"teleTerminalList":[{"zlevel":2,"z":1,"point":{"x":3980,"y":471},"draggable":true,"_type":"TeleTerminal","code":"terminal5163486449281","width":15},{"zlevel":2,"z":1,"point":{"x":4004,"y":471},"draggable":true,"_type":"TeleTerminal","code":"terminal51663374196","width":15}]};
 
 export default ibpData;
diff --git a/src/ibp/ibpPan.js b/src/ibp/ibpPan.js
index dd357bdc2..4000daf5f 100644
--- a/src/ibp/ibpPan.js
+++ b/src/ibp/ibpPan.js
@@ -7,6 +7,7 @@ import Painter from './painter';
 import deviceState from '../jmap/constant/deviceState';
 import deviceType from './constant/deviceType';
 import {calculateDCenter, createBoundingRect, modelFactory} from './utils/parser';
+import { updateIbpData } from './utils/parser';
 
 const renderer = 'canvas';
 const devicePixelRatio = 1;
@@ -122,15 +123,16 @@ class IbpPan {
 	}
 
 	render(list) {
-		console.log('-*-*-*-*-', list);
 		(list || []).forEach(elem => {
 			const code = elem.code;
 			const type = elem._type;
+			updateIbpData(elem);
 			const oDevice = this.ibpDevice[code] || {instance: null, event: null, model: modelFactory(type, elem)};
-			const nDevice = Object.assign(oDevice.model || {}, elem);
+			const nDevice = {instance: null, event: null, model: Object.assign(oDevice.model || {}, elem)};
 			this.$painter.delete(oDevice);
 			if (!elem._dispose) {
 				this.ibpDevice[code] = nDevice;
+				console.log('--3', nDevice);
 				this.$painter.add(nDevice);
 			}
 		});
@@ -221,6 +223,7 @@ class IbpPan {
 	}
 
 	resize(opt) {
+	    console.log('----------',this.$ibpZr);
 		this.$ibpZr.resize(opt);
 		this.$painter.updateZrSize(opt);
 	}
diff --git a/src/ibp/painter.js b/src/ibp/painter.js
index edcb09bf0..6522894b9 100644
--- a/src/ibp/painter.js
+++ b/src/ibp/painter.js
@@ -61,8 +61,10 @@ class Painter {
 	add(device) {
 		device = Object.assign(device, { event: this.$ibp.$mouseController });
 		const instance = shapefactory(device, this.$ibp);
+		console.log('--4', instance);
 		if (instance) {
 			device.instance = instance;
+			instance.setDraggable();
 			this.$transformHandle.transformView(instance);
 			this.ibpInstanceLevel[device.model._type].add(instance);
 		}
diff --git a/src/ibp/shape/alarm.js b/src/ibp/shape/alarm.js
index 00a1a3cf2..824204dc4 100644
--- a/src/ibp/shape/alarm.js
+++ b/src/ibp/shape/alarm.js
@@ -1,13 +1,18 @@
 import Group from 'zrender/src/container/Group';
 import Image from 'zrender/src/graphic/Image';
 import alarmpic from '@/assets/ibp_images/alarm.png';
+import store from '@/store';
 
 export default class alarm extends Group {
 
 	constructor(device) {
 		super();
 		this.model = device.model;
+		this.event = device.event;
 		this.zlevel = device.model.zlevel;
+		this.offsetX = 0;
+		this.offsetY = 0;
+		this.dragging = false;
 		this.create();
 	}
 
@@ -20,14 +25,13 @@ export default class alarm extends Group {
 				image: alarmpic,
 				x: model.point.x,
 				y: model.point.y,
-				width: 71,
-				height: 74
+				width: model.width,
+				height: model.width/71*74
 			}
 		});
 		this.add(this.imageBg);
 		this.transformScale();
 	}
-
 	/** 缩放按钮 */
 	transformScale() {
 		this.imageBg.origin = [this.model.point.x, this.model.point.y];
@@ -36,7 +40,7 @@ export default class alarm extends Group {
 	}
 
 	setDraggable() {
-		this.arrow.attr('draggable', true);
+		this.imageBg.attr('draggable', true);
 		this.createMouseEvent();
 	}
 	createMouseEvent() {
@@ -47,6 +51,12 @@ export default class alarm extends Group {
 
 	mousedown(e) {
 		this.event.disable();
+		if (e.which == 3) {
+			store.dispatch('ibp/setUpdateDeviceData', this.model);
+		}
+		this.offsetX = e.offsetX;
+		this.offsetY = e.offsetY;
+		this.dragging = true;
 	}
 
 	mousemove(e) {
@@ -54,7 +64,11 @@ export default class alarm extends Group {
 
 	mouseup(e) {
 		this.event.enable();
-		this.model.point.x = this.model.point.x + e.offsetX;
-		this.model.point.y = this.model.point.y + e.offsetY;
+		if (this.dragging) {
+			this.model.point.x = this.model.point.x + (e.offsetX - this.offsetX);
+			this.model.point.y = this.model.point.y + (e.offsetY - this.offsetY);
+			this.draggable = false;
+		}
+
 	}
 }
diff --git a/src/ibp/shape/appendageBox.js b/src/ibp/shape/appendageBox.js
new file mode 100644
index 000000000..12a4fac61
--- /dev/null
+++ b/src/ibp/shape/appendageBox.js
@@ -0,0 +1,63 @@
+import Group from 'zrender/src/container/Group';
+import Image from 'zrender/src/graphic/Image';
+import AppendageBoxImage from '@/assets/ibp_images/appendage_box.png';
+import store from '@/store';
+
+export default class AppendageBox extends Group {
+	constructor(device) {
+		super();
+		this.model = device.model;
+		this.event = device.event;
+		this.zlevel = device.model.zlevel;
+		this.z = device.model.z;
+		this.offsetX = 0;
+		this.offsetY = 0;
+		this.dragging = false;
+		this.create();
+	}
+
+	create() {
+		this.appendageBox = new Image({
+			zlevel: this.zlevel,
+			z: this.z,
+			draggable: false,
+			style: {
+				image: AppendageBoxImage,
+				x: this.model.point.x,
+				y: this.model.point.y,
+				width: this.model.width,
+				height: this.model.height
+			}
+		});
+		this.add(this.appendageBox);
+	}
+
+	setDraggable() {
+		this.appendageBox.attr('draggable', true);
+		this.createMouseEvent();
+	}
+	createMouseEvent() {
+		this.on('mousedown', this.mousedown, this);
+		this.on('mousemove', this.mousemove, this);
+		this.on('mouseup', this.mouseup, this);
+	}
+	mousedown(e) {
+		this.event.disable();
+		if (e.which == 3) {
+			store.dispatch('ibp/setUpdateDeviceData', this.model);
+		}
+		this.offsetX = e.offsetX;
+		this.offsetY = e.offsetY;
+		this.dragging = true;
+	}
+	mousemove() {
+	}
+	mouseup(e) {
+		this.event.enable();
+		if (this.dragging) {
+			this.model.point.x = this.model.point.x + (e.offsetX - this.offsetX);
+			this.model.point.y = this.model.point.y + (e.offsetY - this.offsetY);
+		}
+
+	}
+}
diff --git a/src/ibp/shape/arrow.js b/src/ibp/shape/arrow.js
index 166bc364b..98ddb42f7 100644
--- a/src/ibp/shape/arrow.js
+++ b/src/ibp/shape/arrow.js
@@ -2,12 +2,16 @@ import Polygon from 'zrender/src/graphic/shape/Polygon';
 import Group from 'zrender/src/container/Group';
 import {arrow} from '@/jmap/shape/utils/ShapePoints';
 // import { updateIbpData } from '@/ibp/utils/parser';
+import store from '@/store';
 
 class Arrow extends Group {
 	constructor(device) {
 		super();
 		this.event = device.event;
 		this.model = device.model;
+		this.offsetX = 0;
+		this.offsetY = 0;
+		this.dragging = false;
 		this.create();
 	}
 
@@ -16,13 +20,12 @@ class Arrow extends Group {
 		this.arrow = new Polygon({
 			zlevel: model.zlevel,
 			z: model.z,
-			draggable: model.draggable || false,
+			draggable: false,
 			shape: {
-				points: arrow(this.model.point.x, this.model.point.y, this.model.length, 10)
+				points: arrow(this.model.point.x, this.model.point.y, this.model.length, this.model.width)
 			},
 			style: {
 				stroke: model.stroke,
-				lineWidth: model.lineWidth,
 				fill: model.fill
 			}
 		});
@@ -36,6 +39,14 @@ class Arrow extends Group {
 			this.transformRotation(0);
 			break;
 		}
+		case 'top': {
+			this.transformRotation(90);
+			break;
+		}
+		case 'bottom': {
+			this.transformRotation(270);
+			break;
+		}
 		case 'right': {
 			this.transformRotation(180);
 			break;
@@ -63,18 +74,23 @@ class Arrow extends Group {
 		this.on('mousemove', this.mousemove, this);
 		this.on('mouseup', this.mouseup, this);
 	}
-	mousedown() {
+	mousedown(e) {
 		this.event.disable();
-		console.log('鼠标按下');
+		if (e.which == 3) {
+			store.dispatch('ibp/setUpdateDeviceData', this.model);
+		}
+		this.offsetX = e.offsetX;
+		this.offsetY = e.offsetY;
+		this.dragging = true;
 	}
 	mousemove() {
-		console.log('鼠标移动');
 	}
 	mouseup(e) {
 		this.event.enable();
-		this.model.point.x = this.model.point.x + e.offsetX;
-		this.model.point.y = this.model.point.y + e.offsetY;
-		console.log('鼠标抬起', this.model);
+		if (this.dragging) {
+			this.model.point.x = this.model.point.x + (e.offsetX - this.offsetX);
+			this.model.point.y = this.model.point.y + (e.offsetY - this.offsetY);
+		}
 	}
 }
 
diff --git a/src/ibp/shape/background.js b/src/ibp/shape/background.js
index 3e2708ad3..312c42a4e 100644
--- a/src/ibp/shape/background.js
+++ b/src/ibp/shape/background.js
@@ -12,7 +12,7 @@ export default class background extends Group {
 		this.create();
 	}
 	create() {
-		this.imageBg = new Image({
+		this.imageBg1 = new Image({
 			zlevel: this.zlevel,
 			z: this.z,
 			style: {
@@ -23,6 +23,17 @@ export default class background extends Group {
 				height: 1024
 			}
 		});
+		this.imageBg2 = new Image({
+			zlevel: this.zlevel,
+			z: this.z,
+			style: {
+				x: 2048,
+				y: 0,
+				image: ibpBg,
+				width: 2048,
+				height: 1024
+			}
+		});
 		this.tailorRect = new Rect({
 			zlevel: this.zlevel,
 			z: this.z,
@@ -37,15 +48,8 @@ export default class background extends Group {
 	}
 	tailorBgImage() {
 		// this.imageBg.setClipPath(this.tailorRect);
-		this.add(this.imageBg);
-	}
-	setInitialPosition(opt) {
-		const x = this.imageBg.style.x;
-		const y = this.imageBg.style.y;
-		this.imageBg.setStyle('x', x-opt.offsetX);
-		this.imageBg.setStyle('y', y-opt.offsetY);
-		this.tailorRect.setShape('x', x-opt.offsetX);
-		this.tailorRect.setShape('y', y-opt.offsetY);
+		this.add(this.imageBg1);
+		this.add(this.imageBg2);
 	}
 	setDraggable() {
 	}
diff --git a/src/ibp/shape/button.js b/src/ibp/shape/button.js
index 58be97077..a6dbd31e4 100644
--- a/src/ibp/shape/button.js
+++ b/src/ibp/shape/button.js
@@ -10,6 +10,7 @@ import yellowButtonPic from '@/assets/ibp_images/yellow_button.png';
 import yellowButtonPicOn from '@/assets/ibp_images/yellow_button_on.png';
 import grayButtonPic from '@/assets/ibp_images/gray_button.png';
 import grayButtonPicOn from '@/assets/ibp_images/gray_button_on.png';
+import store from '@/store';
 
 export default class button extends Group {
 	static colors = new Map([
@@ -29,6 +30,10 @@ export default class button extends Group {
 		this.event = device.event;
 		this.model = device.model;
 		this.zlevel = device.model.zlevel;
+		this.event = device.event;
+		this.offsetX = 0;
+		this.offsetY = 0;
+		this.dragging = false;
 		this.create();
 	}
 	create() {
@@ -74,17 +79,17 @@ export default class button extends Group {
 	setState(model) {
 		switch (model.status) {
 		case 'on': {
-			// 关闭
-			this.close();
+			// 开放
+			this.open();
 			this.model.status='on';
 			break;
 		}
 		case 'off': {
-			// 开放
-			this.open();
+			// 关闭
+			this.close();
 			this.model.status='off';
 			break;
-		}				
+		}
 		}
 	}
 
@@ -105,17 +110,24 @@ export default class button extends Group {
 		}
 	}
 
-	mousedown() {
+	mousedown(e) {
 		this.event.disable();
-		console.log('鼠标按下');
+		if (e.which == 3) {
+			store.dispatch('ibp/setUpdateDeviceData', this.model);
+		}
+		this.offsetX = e.offsetX;
+		this.offsetY = e.offsetY;
+		this.dragging = true;
 	}
 	mousemove() {
 	}
 	mouseup(e) {
 		this.event.enable();
-		this.model.point.x = this.model.point.x + e.offsetX;
-		this.model.point.y = this.model.point.y + e.offsetY;
-		console.log('鼠标抬起', this.model);
+		if (this.dragging) {
+			this.model.point.x = this.model.point.x + (e.offsetX - this.offsetX);
+			this.model.point.y = this.model.point.y + (e.offsetY - this.offsetY);
+		}
+
 	}
 	// 关闭
 	close() {
diff --git a/src/ibp/shape/circularLamp.js b/src/ibp/shape/circularLamp.js
index de3f8e6c0..0d2bcdc46 100644
--- a/src/ibp/shape/circularLamp.js
+++ b/src/ibp/shape/circularLamp.js
@@ -1,5 +1,6 @@
 import Group from 'zrender/src/container/Group';
 import Circle from 'zrender/src/graphic/shape/Circle';
+import store from '@/store';
 
 export default class CircularLamp extends Group {
 	constructor(device) {
@@ -8,6 +9,9 @@ export default class CircularLamp extends Group {
 		this.event = device.event;
 		this.zlevel = device.model.zlevel;
 		this.z = device.model.z;
+		this.offsetX = 0;
+		this.offsetY = 0;
+		this.dragging = false;
 		this.create();
 	}
 
@@ -15,7 +19,7 @@ export default class CircularLamp extends Group {
 		this.lamp = new Circle({
 			zlevel: this.zlevel,
 			z: this.z,
-			draggable: this.model.draggable||false,
+			draggable: false,
 			shape: {
 				cx: this.model.point.x,
 				cy: this.model.point.y,
@@ -40,15 +44,22 @@ export default class CircularLamp extends Group {
 		this.on('mousemove', this.mousemove, this);
 		this.on('mouseup', this.mouseup, this);
 	}
-	mousedown() {
+	mousedown(e) {
 		this.event.disable();
-		console.log('鼠标按下');
+		if (e.which == 3) {
+			store.dispatch('ibp/setUpdateDeviceData', this.model);
+		}
+		this.offsetX = e.offsetX;
+		this.offsetY = e.offsetY;
+		this.dragging = true;
 	}
 	mousemove() {
-		console.log('鼠标移动');
 	}
-	mouseup() {
+	mouseup(e) {
 		this.event.enable();
-		console.log('鼠标抬起');
+		if (this.dragging) {
+			this.model.point.x = this.model.point.x + (e.offsetX - this.offsetX);
+			this.model.point.y = this.model.point.y + (e.offsetY - this.offsetY);
+		}
 	}
 }
diff --git a/src/ibp/shape/elevator.js b/src/ibp/shape/elevator.js
new file mode 100644
index 000000000..27c590b5e
--- /dev/null
+++ b/src/ibp/shape/elevator.js
@@ -0,0 +1,128 @@
+import Group from 'zrender/src/container/Group';
+import ElevatorBack from './elevatorBack';
+import ElevatorArrow from './elevatorArrow';
+import store from '@/store';
+
+export default class elevator extends Group {
+
+	constructor(device) {
+		super();
+		this.event = device.event;
+		this.model = device.model;
+		this.create();
+	}
+
+	create() {
+		const model = this.model;
+
+		this.grouper=new Group({
+			id: '111',
+			// width: model.width,
+			// height: model.height,
+			position: [model.point.x, model.point.y],
+			draggable: model.draggable || false
+		});
+
+		this.elevatorBack = new ElevatorBack({model: {
+			zlevel: model.zlevel,
+			z: model.z,
+			// model.draggable ||
+			draggable: false,
+			point: {
+				x: model.point.x,
+				y: model.point.y
+			},
+			width: model.width,
+			height: model.height,
+			fillColor: model.fillColor ||'#313131',
+			stroke: model.fillColor ||'#313131',
+			lineWidth: 0
+		}
+		});
+
+		this.elevatorArrowTop=new ElevatorArrow({model: {
+			zlevel: model.zlevel,
+			z: model.z,
+			draggable: false,
+			point: {
+				x: model.width/6*4.7,
+				y: model.height/8*0.1
+			},
+			width: model.width/6*0.8,
+			status: this.getStatus('top'),
+			orientation: 'top'
+		}});
+
+		this.elevatorArrowBottom=new ElevatorArrow({model: {
+			zlevel: model.zlevel,
+			z: model.z,
+			draggable: false,
+			point: {
+				x: model.width/6*1.3,
+				y: model.height/8*7.9
+			},
+			width: model.width/6*0.8,
+			status: this.getStatus('bottom'),
+			orientation: 'bottom'
+		}});
+
+		this.grouper.add(this.elevatorBack);
+		this.grouper.add(this.elevatorArrowTop);
+		this.grouper.add(this.elevatorArrowBottom);
+		this.add(this.grouper);
+	}
+
+	getStatus(status) {
+		if (this.model.direction=='none') {
+			return 'off';
+		} else {
+			return status==this.model.direction? 'on':'off';
+		}
+	}
+
+	setStatus(model) {
+		if (model.direction=='none') {
+			this.elevatorArrowBottom.setStatus('off');
+			this.elevatorArrowTop.setStatus('off');
+		} else if (model.direction=='top') {
+			this.elevatorArrowBottom.setStatus('off');
+			this.elevatorArrowTop.setStatus('on');
+		} else if (model.direction=='bottom') {
+			this.elevatorArrowBottom.setStatus('on');
+			this.elevatorArrowTop.setStatus('off');
+		}
+	}
+
+	setDraggable() {
+		this.grouper.attr('draggable', true);
+		this.createMouseEvent();
+	}
+
+	createMouseEvent() {
+		this.on('mousedown', this.mousedown, this);
+		this.on('mousemove', this.mousemove, this);
+		this.on('mouseup', this.mouseup, this);
+	}
+
+	mousedown(e) {
+		this.event.disable();
+		if (e.which == 3) {
+			store.dispatch('ibp/setUpdateDeviceData', this.model);
+		}
+		this.draggroup =this.grouper;
+		this.deltPostion =[e.event.zrX-this.draggroup.position[0], e.event.zrY-this.draggroup.position[1]];
+	}
+
+	mousemove(e) {
+		if (this.draggroup !=null) {
+			var new_pos =[e.event.zrX, e.event.zrY];
+			this.draggroup.position=[new_pos[0]-this.deltPostion[0], new_pos[1]-this.deltPostion[1]];
+			this.draggroup.dirty();
+		}
+	}
+
+	mouseup(e) {
+		this.event.enable();
+		this.draggroup=null;
+	}
+}
diff --git a/src/ibp/shape/elevatorArrow.js b/src/ibp/shape/elevatorArrow.js
index 5c9c9ad2b..acdcedb69 100644
--- a/src/ibp/shape/elevatorArrow.js
+++ b/src/ibp/shape/elevatorArrow.js
@@ -16,7 +16,8 @@ export default class elevatorArrow extends Group {
 		const model = this.model;
 		this.imageBg = new Image({
 			zlevel: this.zlevel,
-			draggable: model.draggable || false,
+			z: model.z,
+			draggable: false,
 			style: {
 				image: this.getStatus(),
 				x: model.point.x,
@@ -25,10 +26,12 @@ export default class elevatorArrow extends Group {
 				height: 60
 			}
 		});
+		// debugger;
 		this.add(this.imageBg);
 		this.getOrientate();
+		this.transformScale();
 	}
-    
+
 	getOrientate() {
 		switch (this.model.orientation) {
 		case 'top': {
@@ -49,13 +52,13 @@ export default class elevatorArrow extends Group {
 		this.imageBg.dirty();
 	}
 
-	// /** 缩放按钮 */
-	// transformScale() {
-	// 	this.imageBg.origin = [this.model.point.x, this.model.point.y];
-	// 	this.imageBg.scale =[this.model.width/68, this.model.width/68];
-	// 	this.imageBg.dirty();
-	// }
-    
+	/** 缩放按钮 */
+	transformScale() {
+		this.imageBg.origin = [this.model.point.x, this.model.point.y];
+		this.imageBg.scale =[this.model.width/31, this.model.width/31];
+		this.imageBg.dirty();
+	}
+
 	getStatus() {
 		if (this.model.status) {
 			switch (this.model.status) {
@@ -71,26 +74,41 @@ export default class elevatorArrow extends Group {
 		}
 	}
 
-	setDraggable() {
-		this.arrow.attr('draggable', true);
-		this.createMouseEvent();
-	}
-	createMouseEvent() {
-		this.on('mousedown', this.mousedown, this);
-		this.on('mousemove', this.mousemove, this);
-		this.on('mouseup', this.mouseup, this);
+	setStatus(data) {
+		let imageBack;
+		switch (data) {
+		case 'on': {
+			imageBack=elevatorArrowPicOn;
+			break;
+		}
+		case 'off': {
+			imageBack=elevatorArrowPic;
+			break;
+		}
+		}
+		this.imageBg.setStyle({image: imageBack});
 	}
 
-	mousedown(e) {
-		this.event.disable();
-	}
+	// setDraggable() {
+	// 	this.arrow.attr('draggable', true);
+	// 	this.createMouseEvent();
+	// }
+	// createMouseEvent() {
+	// 	this.on('mousedown', this.mousedown, this);
+	// 	this.on('mousemove', this.mousemove, this);
+	// 	this.on('mouseup', this.mouseup, this);
+	// }
 
-	mousemove(e) {
-	}
+	// mousedown(e) {
+	// 	this.event.disable();
+	// }
 
-	mouseup(e) {
-		this.event.enable();
-		this.model.point.x = this.model.point.x + e.offsetX;
-		this.model.point.y = this.model.point.y + e.offsetY;
-	}
+	// mousemove(e) {
+	// }
+
+	// mouseup(e) {
+	// 	this.event.enable();
+	// 	this.model.point.x = this.model.point.x + e.offsetX;
+	// 	this.model.point.y = this.model.point.y + e.offsetY;
+	// }
 }
diff --git a/src/ibp/shape/elevatorBack.js b/src/ibp/shape/elevatorBack.js
index 18c439881..3b7bd3bd0 100644
--- a/src/ibp/shape/elevatorBack.js
+++ b/src/ibp/shape/elevatorBack.js
@@ -1,5 +1,4 @@
-import Circle from 'zrender/src/graphic/shape/Circle';
-import Polygon from 'zrender/src/graphic/shape/Polygon';
+import * as toolpath from 'zrender/src/tool/path';
 import Group from 'zrender/src/container/Group';
 
 export default class elevatorBack extends Group {
@@ -12,58 +11,24 @@ export default class elevatorBack extends Group {
 	}
 
 	create() {
+		// debugger;
 		const model = this.model;
-		this.arrowCircle = new Circle({
+		const tempString='M'+model.width/6+' '+model.height/8*6+' L'+model.width/6*4+
+		' 0 L'+model.width/6*5+' 0 A '+model.width/6+' '+model.width/6+' 0 0 1 '+
+		model.width/6*5+' '+model.height/4+'L '+model.width/3+' '+model.height+' L'+model.width/6+
+		' '+model.height+' '+'A'+model.width/6+' '+model.width/6+' 0 0 1 '+model.width/6+' '+model.height/8*6;
+		this.elevatorBack = toolpath.createFromString(tempString, {
 			zlevel: model.zlevel,
 			z: model.z,
-			// path: 'M 0 0 Q -70 -50 0 -100 0 -100 L 150 -400 L 200 -400 Q 270 -350 200 -300 200 -300 L 50 0',
-			// draggable: model.draggable || false,
-			shape: {
-				cx: model.point.x + model.width/6*5,
-				cy: model.point.y + model.height/8,
-				r: model.width/6
-			},
+			draggable: false,
 			style: {
-				fill: this.model.fillColor || '#adadad'
+				x: model.point.x,
+        		y: model.point.y,
+				brushType: 'fill',
+				fill: this.model.fillColor || '#313131',
+				lineWidth: 0
 			}
 		});
-
-		this.arrowPoly = new Polygon({
-			zlevel: model.zlevel,
-			z: model.z,
-			// draggable: model.draggable || false,
-			shape: {
-				points: [ [model.point.x+model.width/6, model.point.y + model.height], [model.point.x+model.width/6*2, model.point.y + model.height],
-					[model.point.x+model.width/6*5, model.point.y + model.height/8*2],
-					[model.point.x+model.width/6*5, model.point.y],
-					[model.point.x+model.width/6*4, model.point.y],
-					[model.point.x+model.width/6, model.point.y + model.height/8*6]
-				]
-			},
-			style: {
-				stroke: model.stroke || '#adadad',
-				lineWidth: model.lineWidth,
-				fill: model.fill || '#adadad'
-			}
-		});
-        
-		this.arrowCircleRight = new Circle({
-			zlevel: model.zlevel,
-			z: model.z,
-			// path: 'M 0 0 Q -70 -50 0 -100 0 -100 L 150 -400 L 200 -400 Q 270 -350 200 -300 200 -300 L 50 0',
-			// draggable: model.draggable || false,
-			shape: {
-				cx: model.point.x + model.width/6,
-				cy: model.point.y + model.height/8*7,
-				r: model.width/6
-			},
-			style: {
-				fill: this.model.fillColor || '#adadad'
-			}
-		});
-        
-		this.add(this.arrowPoly);
-		this.add(this.arrowCircle);
-		this.add(this.arrowCircleRight);
+		this.add(this.elevatorBack);
 	}
-}
\ No newline at end of file
+}
diff --git a/src/ibp/shape/factory.js b/src/ibp/shape/factory.js
index ad469c01f..1ac62b449 100644
--- a/src/ibp/shape/factory.js
+++ b/src/ibp/shape/factory.js
@@ -3,12 +3,30 @@ import deviceType from '../constant/deviceType';
 import Background from './background';
 import CircularLamp from './circularLamp';
 import IbpText from './ibpText';
+import Alarm from './alarm';
+import IbpLine from './ibpLine';
+import Button from './button';
+import TipBox from './ibpTipBox';
+import AppendageBox from './appendageBox';
+import RotatingButton from './rotatingButton';
+import Elevator from './elevator';
+import Key from './key';
+import TeleTerminal from './teleTerminal';
 
 const ibpShape = {};
 ibpShape[deviceType.Arrow] = Arrow;
 ibpShape[deviceType.Background] = Background;
 ibpShape[deviceType.CircularLamp] = CircularLamp;
 ibpShape[deviceType.IbpText] = IbpText;
+ibpShape[deviceType.Alarm] = Alarm;
+ibpShape[deviceType.IbpLine] = IbpLine;
+ibpShape[deviceType.SquareButton] = Button;
+ibpShape[deviceType.TipBox] = TipBox;
+ibpShape[deviceType.AppendageBox] = AppendageBox;
+ibpShape[deviceType.RotatingButton] = RotatingButton;
+ibpShape[deviceType.Elevator] = Elevator;
+ibpShape[deviceType.Key] = Key;
+ibpShape[deviceType.TeleTerminal] = TeleTerminal;
 
 function shapefactory(device, ibp) {
 	const type = device.model._type;
diff --git a/src/ibp/shape/ibpLine.js b/src/ibp/shape/ibpLine.js
new file mode 100644
index 000000000..9e8d92782
--- /dev/null
+++ b/src/ibp/shape/ibpLine.js
@@ -0,0 +1,65 @@
+import Group from 'zrender/src/container/Group';
+import Line from 'zrender/src/graphic/shape/Line';
+import store from '@/store';
+
+export default class ibpLine extends Group {
+	constructor(device) {
+		super();
+		this.model = device.model;
+		this.event = device.event;
+		this.zlevel = device.model.zlevel;
+		this.z = device.model.z;
+		this.offsetX = 0;
+		this.offsetY = 0;
+		this.dragging = false;
+		this.create();
+	}
+	create() {
+		const model = this.model;
+		this.ibpLine = new Line({
+			zlevel: model.zlevel,
+			z: model.z,
+			draggable: false,
+			shape: {
+				x1: this.model.point1.x,
+				y1: this.model.point1.y,
+				x2: this.model.point2.x,
+				y2: this.model.point2.y
+			},
+			style: {
+				lineWidth: this.model.lineWidth,
+				stroke: this.model.fillColor
+			}
+		});
+		this.add(this.ibpLine);
+	}
+	setDraggable() {
+		this.ibpLine.attr('draggable', true);
+		this.createMouseEvent();
+	}
+	createMouseEvent() {
+		this.on('mousedown', this.mousedown, this);
+		this.on('mousemove', this.mousemove, this);
+		this.on('mouseup', this.mouseup, this);
+	}
+	mousedown(e) {
+		this.event.disable();
+		if (e.which == 3) {
+			store.dispatch('ibp/setUpdateDeviceData', this.model);
+		}
+		this.offsetX = e.offsetX;
+		this.offsetY = e.offsetY;
+		this.dragging = true;
+	}
+	mousemove() {
+	}
+	mouseup(e) {
+		this.event.enable();
+		if (this.dragging) {
+			this.model.point1.x = this.model.point1.x - this.offsetX + e.offsetX;
+			this.model.point1.y = this.model.point1.y - this.offsetY + e.offsetY;
+			this.model.point2.x = this.model.point2.x - this.offsetX + e.offsetX;
+			this.model.point2.y = this.model.point2.y - this.offsetY + e.offsetY;
+		}
+	}
+}
diff --git a/src/ibp/shape/ibpText.js b/src/ibp/shape/ibpText.js
index 3322bce34..7ac8091da 100644
--- a/src/ibp/shape/ibpText.js
+++ b/src/ibp/shape/ibpText.js
@@ -1,14 +1,17 @@
 import Group from 'zrender/src/container/Group';
 import Text from 'zrender/src/graphic/Text';
-import { updateIbpData } from '@/ibp/utils/parser';
+import store from '@/store';
 
-export default class button extends Group {
+export default class ibpText extends Group {
 	constructor(device) {
 		super();
 		this.model = device.model;
 		this.event = device.event;
 		this.zlevel = device.model.zlevel;
 		this.z = device.model.z;
+		this.offsetX = 0;
+		this.offsetY = 0;
+		this.dragging = false;
 		this.create();
 	}
 	create() {
@@ -19,8 +22,8 @@ export default class button extends Group {
 			silent: model.silent || false,
 			draggable: model.draggable || false,
 			style: {
-				x: model.x,
-				y: model.y,
+				x: model.point.x,
+				y: model.point.y,
 				fontWeight: model.fontWeight,
 				fontSize: model.fontSize,
 				fontFamily: model.fontFamily,
@@ -29,7 +32,8 @@ export default class button extends Group {
 				textFill: model.textFill,
 				textAlign: model.textAlign,
 				textPosition: model.textPosition || 'inside',
-				textVerticalAlign: model.textVerticalAlign || null
+				textVerticalAlign: model.textVerticalAlign || null,
+				textLineHeight: model.fontSize
 			}
 		});
 		this.add(this.textName);
@@ -43,18 +47,22 @@ export default class button extends Group {
 		this.on('mousemove', this.mousemove, this);
 		this.on('mouseup', this.mouseup, this);
 	}
-	mousedown() {
+	mousedown(e) {
 		this.event.disable();
-		console.log('鼠标按下');
+		if (e.which == 3) {
+			store.dispatch('ibp/setUpdateDeviceData', this.model);
+		}
+		this.offsetX = e.offsetX;
+		this.offsetY = e.offsetY;
+		this.dragging = true;
 	}
 	mousemove() {
-		console.log('鼠标移动');
 	}
 	mouseup(e) {
 		this.event.enable();
-		this.model.x = this.model.x + e.offsetX;
-		this.model.y = this.model.y + e.offsetY;
-		console.log('鼠标抬起', this.model);
-		updateIbpData(this.model, 'update');
+		if (this.dragging) {
+			this.model.point.x = this.model.point.x + (e.offsetX - this.offsetX);
+			this.model.point.y = this.model.point.y + (e.offsetY - this.offsetY);
+		}
 	}
 }
diff --git a/src/ibp/shape/ibpTipBox.js b/src/ibp/shape/ibpTipBox.js
new file mode 100644
index 000000000..eb8f12098
--- /dev/null
+++ b/src/ibp/shape/ibpTipBox.js
@@ -0,0 +1,62 @@
+import Group from 'zrender/src/container/Group';
+import Rect from 'zrender/src/graphic/shape/Rect';
+import store from '@/store';
+
+export default class ibpTipBox extends Group {
+	constructor(device) {
+		super();
+		this.model = device.model;
+		this.event = device.event;
+		this.zlevel = device.model.zlevel;
+		this.z = device.model.z;
+		this.offsetX = 0;
+		this.offsetY = 0;
+		this.dragging = false;
+		this.create();
+	}
+	create() {
+		const model = this.model;
+		this.tipBox = new Rect({
+			zlevel: model.zlevel,
+			z: model.z,
+			draggable: false,
+			shape: {
+				x: this.model.point.x,
+				y: this.model.point.y,
+				width: this.model.width,
+				height: this.model.height
+			},
+			style: {
+				fill: this.model.fillColor
+			}
+		});
+		this.add(this.tipBox);
+	}
+	setDraggable() {
+		this.tipBox.attr('draggable', true);
+		this.createMouseEvent();
+	}
+	createMouseEvent() {
+		this.on('mousedown', this.mousedown, this);
+		this.on('mousemove', this.mousemove, this);
+		this.on('mouseup', this.mouseup, this);
+	}
+	mousedown(e) {
+		this.event.disable();
+		if (e.which == 3) {
+			store.dispatch('ibp/setUpdateDeviceData', this.model);
+		}
+		this.offsetX = e.offsetX;
+		this.offsetY = e.offsetY;
+		this.dragging = true;
+	}
+	mousemove() {
+	}
+	mouseup(e) {
+		this.event.enable();
+		if (this.dragging) {
+			this.model.point.x = this.model.point.x + (e.offsetX - this.offsetX);
+			this.model.point.y = this.model.point.y + (e.offsetY - this.offsetY);
+		}
+	}
+}
diff --git a/src/ibp/shape/key.js b/src/ibp/shape/key.js
new file mode 100644
index 000000000..cb329be7c
--- /dev/null
+++ b/src/ibp/shape/key.js
@@ -0,0 +1,103 @@
+import Group from 'zrender/src/container/Group';
+import Image from 'zrender/src/graphic/Image';
+import keyPic from '@/assets/ibp_images/key.png';
+import keyPicOn from '@/assets/ibp_images/key_on.png';
+import store from '@/store';
+
+export default class key extends Group {
+
+	constructor(device) {
+		super();
+		this.model = device.model;
+		this.zlevel = device.model.zlevel;
+		this.event = device.event;
+		this.offsetX = 0;
+		this.offsetY = 0;
+		this.create();
+	}
+
+	create() {
+		const model = this.model;
+		this.imageBg = new Image({
+			zlevel: this.zlevel,
+			z: model.z,
+			draggable: model.draggable || false,
+			style: {
+				image: this.getRotateColor(),
+				x: model.point.x,
+				y: model.point.y,
+				width: 314,
+				height: 932
+			}
+		});
+		this.add(this.imageBg);
+		this.transformScale();
+	}
+
+	/** 缩放按钮 */
+	transformScale() {
+		this.imageBg.origin = [this.model.point.x, this.model.point.y];
+		this.imageBg.scale =[this.model.width/314, this.model.width/314];
+		this.imageBg.dirty();
+	}
+
+	getRotateColor() {
+		if (this.model.status) {
+			switch (this.model.status) {
+			case 'on': {
+				return keyPicOn;
+			}
+			case 'off': {
+				return keyPic;
+			}
+			}
+		} else {
+			return keyPic;
+		}
+	}
+
+	setStatus(model) {
+		switch (model.status) {
+		case 'on': {
+			// 开放
+			this.imageBg.setStyle({image: keyPicOn});
+			this.model.status='on';
+			break;
+		}
+		case 'off': {
+			// 关闭
+			this.imageBg.setStyle({image: keyPic});
+			this.model.status='off';
+			break;
+		}
+		}
+	}
+
+	setDraggable() {
+		this.imageBg.attr('draggable', true);
+		this.createMouseEvent();
+	}
+	createMouseEvent() {
+		this.on('mousedown', this.mousedown, this);
+		this.on('mousemove', this.mousemove, this);
+		this.on('mouseup', this.mouseup, this);
+	}
+
+	mousedown(e) {
+		this.event.disable();
+		if (e.which == 3) {
+			store.dispatch('ibp/setUpdateDeviceData', this.model);
+		}
+		this.offsetX = e.offsetX;
+		this.offsetY = e.offsetY;
+	}
+
+	mousemove(e) {
+	}
+
+	mouseup(e) {
+		this.event.enable();
+		this.model.point.x = this.model.point.x + (e.offsetX - this.offsetX);
+		this.model.point.y = this.model.point.y + (e.offsetY - this.offsetY);
+	}
+}
diff --git a/src/ibp/shape/rotateTip.js b/src/ibp/shape/rotateTip.js
index 5855fece6..736bab9a8 100644
--- a/src/ibp/shape/rotateTip.js
+++ b/src/ibp/shape/rotateTip.js
@@ -2,6 +2,7 @@ import Group from 'zrender/src/container/Group';
 import Image from 'zrender/src/graphic/Image';
 import rotateBlack from '@/assets/ibp_images/rotate_black.png';
 import rotateRed from '@/assets/ibp_images/rotate_red.png';
+import store from '@/store';
 
 export default class rotateTip extends Group {
 
@@ -9,6 +10,10 @@ export default class rotateTip extends Group {
 		super();
 		this.model = device.model;
 		this.zlevel = device.model.zlevel;
+		this.event = device.event;
+		this.offsetX = 0;
+		this.offsetY = 0;
+		this.dragging = false;
 		this.create();
 	}
 
@@ -35,7 +40,7 @@ export default class rotateTip extends Group {
 		this.imageBg.scale =[this.model.width/68, this.model.width/68];
 		this.imageBg.dirty();
 	}
-    
+
 	getRotateColor() {
 		if (this.model.color) {
 			switch (this.model.color) {
@@ -63,6 +68,12 @@ export default class rotateTip extends Group {
 
 	mousedown(e) {
 		this.event.disable();
+		if (e.which == 3) {
+			store.dispatch('ibp/setUpdateDeviceData', this.model);
+		}
+		this.offsetX = e.offsetX;
+		this.offsetY = e.offsetY;
+		this.dragging = true;
 	}
 
 	mousemove(e) {
@@ -70,7 +81,9 @@ export default class rotateTip extends Group {
 
 	mouseup(e) {
 		this.event.enable();
-		this.model.point.x = this.model.point.x + e.offsetX;
-		this.model.point.y = this.model.point.y + e.offsetY;
+		if (this.dragging) {
+			this.model.point.x = this.model.point.x + (e.offsetX - this.offsetX);
+			this.model.point.y = this.model.point.y + (e.offsetY - this.offsetY);
+		}
 	}
 }
diff --git a/src/ibp/shape/rotatingButton.js b/src/ibp/shape/rotatingButton.js
new file mode 100644
index 000000000..f7667dccb
--- /dev/null
+++ b/src/ibp/shape/rotatingButton.js
@@ -0,0 +1,62 @@
+import Group from 'zrender/src/container/Group';
+import Image from 'zrender/src/graphic/Image';
+import Keyhole from '@/assets/ibp_images/keyhole.png';
+import store from '@/store';
+
+export default class RotatingButton extends Group {
+	constructor(device) {
+		super();
+		this.model = device.model;
+		this.event = device.event;
+		this.zlevel = device.model.zlevel;
+		this.z = device.model.z;
+		this.offsetX = 0;
+		this.offsetY = 0;
+		this.dragging = false;
+		this.create();
+	}
+
+	create() {
+		this.rotatingButton = new Image({
+			zlevel: this.zlevel,
+			z: this.z,
+			draggable: false,
+			style: {
+				image: Keyhole,
+				x: this.model.point.x,
+				y: this.model.point.y,
+				width: this.model.width,
+				height: this.model.width/434*381
+			}
+		});
+		this.add(this.rotatingButton);
+	}
+
+	setDraggable() {
+		this.rotatingButton.attr('draggable', true);
+		this.createMouseEvent();
+	}
+	createMouseEvent() {
+		this.on('mousedown', this.mousedown, this);
+		this.on('mousemove', this.mousemove, this);
+		this.on('mouseup', this.mouseup, this);
+	}
+	mousedown(e) {
+		this.event.disable();
+		if (e.which == 3) {
+			store.dispatch('ibp/setUpdateDeviceData', this.model);
+		}
+		this.offsetX = e.offsetX;
+		this.offsetY = e.offsetY;
+		this.dragging = true;
+	}
+	mousemove() {
+	}
+	mouseup(e) {
+		this.event.enable();
+		if (this.dragging) {
+			this.model.point.x = this.model.point.x + (e.offsetX - this.offsetX);
+			this.model.point.y = this.model.point.y + (e.offsetY - this.offsetY);
+		}
+	}
+}
diff --git a/src/ibp/shape/teleTerminal.js b/src/ibp/shape/teleTerminal.js
index c4626aa91..2dc109bf7 100644
--- a/src/ibp/shape/teleTerminal.js
+++ b/src/ibp/shape/teleTerminal.js
@@ -1,13 +1,18 @@
 import Group from 'zrender/src/container/Group';
 import Image from 'zrender/src/graphic/Image';
 import teleTerminalPic from '@/assets/ibp_images/telephone_terminal.png';
+import store from '@/store';
 
 export default class alarm extends Group {
 
 	constructor(device) {
 		super();
+		this.event = device.event;
 		this.model = device.model;
 		this.zlevel = device.model.zlevel;
+		this.offsetX = 0;
+		this.offsetY = 0;
+		this.dragging = false;
 		this.create();
 	}
 
@@ -20,8 +25,8 @@ export default class alarm extends Group {
 				image: teleTerminalPic,
 				x: model.point.x,
 				y: model.point.y,
-				width: 64,
-				height: 56
+				width: 150,
+				height: 150
 			}
 		});
 		this.add(this.imageBg);
@@ -31,12 +36,12 @@ export default class alarm extends Group {
 	/** 缩放按钮 */
 	transformScale() {
 		this.imageBg.origin = [this.model.point.x, this.model.point.y];
-		this.imageBg.scale =[this.model.width/64, this.model.width/64];
+		this.imageBg.scale =[this.model.width/150, this.model.width/150];
 		this.imageBg.dirty();
 	}
 
 	setDraggable() {
-		this.arrow.attr('draggable', true);
+		this.imageBg.attr('draggable', true);
 		this.createMouseEvent();
 	}
 	createMouseEvent() {
@@ -47,6 +52,12 @@ export default class alarm extends Group {
 
 	mousedown(e) {
 		this.event.disable();
+		if (e.which == 3) {
+			store.dispatch('ibp/setUpdateDeviceData', this.model);
+		}
+		this.offsetX = e.offsetX;
+		this.offsetY = e.offsetY;
+		this.dragging = true;
 	}
 
 	mousemove(e) {
@@ -54,7 +65,9 @@ export default class alarm extends Group {
 
 	mouseup(e) {
 		this.event.enable();
-		this.model.point.x = this.model.point.x + e.offsetX;
-		this.model.point.y = this.model.point.y + e.offsetY;
+        if (this.dragging) {
+            this.model.point.x = this.model.point.x + (e.offsetX - this.offsetX);
+            this.model.point.y = this.model.point.y + (e.offsetY - this.offsetY);
+        }
 	}
 }
diff --git a/src/ibp/utils/parser.js b/src/ibp/utils/parser.js
index 7f3aa3ee4..29a173ead 100644
--- a/src/ibp/utils/parser.js
+++ b/src/ibp/utils/parser.js
@@ -2,6 +2,7 @@ import * as zrUtil from 'zrender/src/core/util';
 import * as matrix from 'zrender/src/core/matrix';
 import deviceType from '../constant/deviceType';
 import deviceRender from '../constant/deviceRender';
+import store from '@/store';
 
 export function createTransform(opts) {
 	let transform = matrix.create();
@@ -57,8 +58,8 @@ export function parser(data, config) {
 			ibpDevice[elem.code] = createModel(deviceType.CircularLamp, elem, propConvert);
 		}, this);
 
-		zrUtil.each(data.warnButtonList || [], elem => {
-			ibpDevice[elem.code] = createModel(deviceType.WarnButton, elem, propConvert);
+		zrUtil.each(data.alarmList || [], elem => {
+			ibpDevice[elem.code] = createModel(deviceType.Alarm, elem, propConvert);
 		}, this);
 
 		zrUtil.each(data.arrowList || [], elem => {
@@ -69,10 +70,246 @@ export function parser(data, config) {
 			ibpDevice[elem.code] = createModel(deviceType.RotatingButton, elem, propConvert);
 		}, this);
 
-		zrUtil.each(data.tipList || [], elem => {
-			ibpDevice[elem.code] = createModel(deviceType.Tip, elem, propConvert);
+		zrUtil.each(data.tipBoxList || [], elem => {
+			ibpDevice[elem.code] = createModel(deviceType.TipBox, elem, propConvert);
 		}, this);
+
+		zrUtil.each(data.ibpLineList || [], elem => {
+			ibpDevice[elem.code] = createModel(deviceType.IbpLine, elem, propConvert);
+		}, this);
+
+		zrUtil.each(data.appendageBoxList || [], elem => {
+			ibpDevice[elem.code] = createModel(deviceType.AppendageBox, elem, propConvert);
+		}, this);
+
+		zrUtil.each(data.elevatorList || [], elem => {
+			ibpDevice[elem.code] = createModel(deviceType.Elevator, elem, propConvert);
+		}, this);
+
+		zrUtil.each(data.keyList || [], elem => {
+			ibpDevice[elem.code] = createModel(deviceType.Key, elem, propConvert);
+		}, this);
+
+		zrUtil.each(data.teleTerminalList || [], elem => {
+			ibpDevice[elem.code] = createModel(deviceType.TeleTerminal, elem, propConvert);
+		}, this);
+
 	}
 
 	return ibpDevice;
 }
+export function updateIbpData(device) {
+	const ibpData = store.getters['ibp/ibp'];
+	switch (device._type) {
+	case deviceType.Background : {
+		ibpData.background = device;
+		break;
+	}
+	case deviceType.IbpText : {
+		if (ibpData.textList && ibpData.textList.length > 0) {
+			let newDevice = true;
+			for (let i=0; i<ibpData.textList.length; i++) {
+				if (device.code === ibpData.textList[i].code) {
+					device.dispose ? ibpData.textList.splice(i, 1) :ibpData.textList[i] = device;
+					newDevice = false;
+				}
+			}
+			if (newDevice) {
+				ibpData.textList.push(device);
+			}
+		} else {
+			ibpData.textList = [device];
+		}
+		break;
+	}
+	case deviceType.SquareButton : {
+		if (ibpData.squareButtonList && ibpData.squareButtonList.length > 0) {
+			let newDevice = true;
+			for (let i=0; i<ibpData.squareButtonList.length; i++) {
+				if (device.code === ibpData.squareButtonList[i].code) {
+					device.dispose ? ibpData.squareButtonList.splice(i, 1):ibpData.squareButtonList[i] = device;
+					newDevice = false;
+				}
+			}
+			if (newDevice) {
+				ibpData.squareButtonList.push(device);
+			}
+		} else {
+			ibpData.squareButtonList = [device];
+		}
+		break;
+	}
+	case deviceType.Arrow : {
+		if (ibpData.arrowList && ibpData.arrowList.length > 0) {
+			let newDevice = true;
+			for (let i=0; i<ibpData.arrowList.length; i++) {
+				if (device.code === ibpData.arrowList[i].code) {
+					device.dispose ? ibpData.arrowList.splice(i, 1):ibpData.arrowList[i] = device;
+					newDevice = false;
+				}
+			}
+			if (newDevice) {
+				ibpData.arrowList.push(device);
+			}
+		} else {
+			ibpData.arrowList = [device];
+		}
+		break;
+	}
+	case deviceType.RotatingButton : {
+		if (ibpData.rotatingButtonList && ibpData.rotatingButtonList.length > 0) {
+			let newDevice = true;
+			for (let i=0; i<ibpData.rotatingButtonList.length; i++) {
+				if (device.code === ibpData.rotatingButtonList[i].code) {
+					device.dispose ? ibpData.rotatingButtonList.splice(i, 1):ibpData.rotatingButtonList[i] = device;
+					newDevice = false;
+				}
+			}
+			if (newDevice) {
+				ibpData.rotatingButtonList.push(device);
+			}
+		} else {
+			ibpData.rotatingButtonList = [device];
+		}
+		break;
+	}
+	case deviceType.TipBox : {
+		if (ibpData.tipBoxList && ibpData.tipBoxList.length > 0) {
+			let newDevice = true;
+			for (let i=0; i<ibpData.tipBoxList.length; i++) {
+				if (device.code === ibpData.tipBoxList[i].code) {
+					device.dispose ? ibpData.tipBoxList.splice(i, 1):ibpData.tipBoxList[i] = device;
+					newDevice = false;
+				}
+			}
+			if (newDevice) {
+				ibpData.tipBoxList.push(device);
+			}
+		} else {
+			ibpData.tipBoxList = [device];
+		}
+		break;
+	}
+	case deviceType.CircularLamp : {
+		if (ibpData.circularLampList && ibpData.circularLampList.length > 0) {
+			let newDevice = true;
+			for (let i=0; i<ibpData.circularLampList.length; i++) {
+				if (device.code === ibpData.circularLampList[i].code) {
+					device.dispose ? ibpData.circularLampList.splice(i, 1):ibpData.circularLampList[i] = device;
+					newDevice = false;
+				}
+			}
+			if (newDevice) {
+				ibpData.circularLampList.push(device);
+			}
+		} else {
+			ibpData.circularLampList = [device];
+		}
+		break;
+	}
+	case deviceType.IbpLine : {
+		if (ibpData.ibpLineList && ibpData.ibpLineList.length > 0) {
+			let newDevice = true;
+			for (let i=0; i<ibpData.ibpLineList.length; i++) {
+				if (device.code === ibpData.ibpLineList[i].code) {
+					device.dispose ? ibpData.ibpLineList.splice(i, 1):ibpData.ibpLineList[i] = device;
+					newDevice = false;
+				}
+			}
+			if (newDevice) {
+				ibpData.ibpLineList.push(device);
+			}
+		} else {
+			ibpData.ibpLineList = [device];
+		}
+		break;
+	}
+	case deviceType.AppendageBox : {
+		if (ibpData.appendageBoxList && ibpData.appendageBoxList.length > 0) {
+			let newDevice = true;
+			for (let i=0; i<ibpData.appendageBoxList.length; i++) {
+				if (device.code === ibpData.appendageBoxList[i].code) {
+					device.dispose ? ibpData.appendageBoxList.splice(i, 1):ibpData.appendageBoxList[i] = device;
+					newDevice = false;
+				}
+			}
+			if (newDevice) {
+				ibpData.appendageBoxList.push(device);
+			}
+		} else {
+			ibpData.appendageBoxList = [device];
+		}
+		break;
+	}
+	case deviceType.Alarm : {
+		if (ibpData.alarmList && ibpData.alarmList.length > 0) {
+			let newDevice = true;
+			for (let i=0; i<ibpData.alarmList.length; i++) {
+				if (device.code === ibpData.alarmList[i].code) {
+					device.dispose ? ibpData.alarmList.splice(i, 1):ibpData.alarmList[i] = device;
+					newDevice = false;
+				}
+			}
+			if (newDevice) {
+				ibpData.alarmList.push(device);
+			}
+		} else {
+			ibpData.alarmList = [device];
+		}
+		break;
+	}
+	case deviceType.Elevator : {
+		if (ibpData.elevatorList && ibpData.elevatorList.length > 0) {
+			let newDevice = true;
+			for (let i=0; i<ibpData.elevatorList.length; i++) {
+				if (device.code === ibpData.elevatorList[i].code) {
+					device.dispose ? ibpData.elevatorList.splice(i, 1):ibpData.elevatorList[i] = device;
+					newDevice = false;
+				}
+			}
+			if (newDevice) {
+				ibpData.elevatorList.push(device);
+			}
+		} else {
+			ibpData.elevatorList = [device];
+		}
+		break;
+	}
+	case deviceType.Key : {
+		if (ibpData.keyList && ibpData.keyList.length > 0) {
+			let newDevice = true;
+			for (let i=0; i<ibpData.keyList.length; i++) {
+				if (device.code === ibpData.keyList[i].code) {
+					device.dispose ? ibpData.keyList.splice(i, 1):ibpData.keyList[i] = device;
+					newDevice = false;
+				}
+			}
+			if (newDevice) {
+				ibpData.keyList.push(device);
+			}
+		} else {
+			ibpData.keyList = [device];
+		}
+		break;
+	}
+	case deviceType.TeleTerminal : {
+		if (ibpData.teleTerminalList && ibpData.teleTerminalList.length > 0) {
+			let newDevice = true;
+			for (let i=0; i<ibpData.teleTerminalList.length; i++) {
+				if (device.code === ibpData.teleTerminalList[i].code) {
+					device.dispose ? ibpData.teleTerminalList.splice(i, 1):ibpData.teleTerminalList[i] = device;
+					newDevice = false;
+				}
+			}
+			if (newDevice) {
+				ibpData.teleTerminalList.push(device);
+			}
+		} else {
+			ibpData.teleTerminalList = [device];
+		}
+		break;
+	}
+
+	}
+	store.dispatch('ibp/setIbpData', ibpData);
+}
diff --git a/src/jlmap3d/jl3ddrive/jl3ddrive.js b/src/jlmap3d/jl3ddrive/jl3ddrive.js
index cf301566e..a9146d58b 100644
--- a/src/jlmap3d/jl3ddrive/jl3ddrive.js
+++ b/src/jlmap3d/jl3ddrive/jl3ddrive.js
@@ -50,18 +50,21 @@ export function JLmapDriving(dom, data, skinCode) {
 	renderer.domElement.style.top = '0';
 
 	var renderercctv = new THREE.WebGLRenderer();
-  renderercctv.setSize(dom.offsetWidth*0.2, dom.offsetHeight*0.2);
+	renderercctv.setSize(dom.offsetWidth*0.2, dom.offsetHeight*0.2);
 	renderercctv.domElement.style.position = 'absolute';
 	renderercctv.domElement.style.top = '0';
 
 	document.getElementById('jlsimulation').appendChild(renderer.domElement);
 	document.getElementById('jlcctv').appendChild(renderercctv.domElement);
 	// 定义相机
+<<<<<<< HEAD
 	//let camera = SetCamera(dom);
+=======
+	// let camera = SetCamera(dom);
+>>>>>>> 327bf6f32b24ee9862ae9627615dc63ceccd3c9f
 	// 定义场景(渲染容器)
 	const scene = SetScene();
 
-
 	const speed = 0;
 
 	let drivingcode = null;
@@ -104,8 +107,13 @@ export function JLmapDriving(dom, data, skinCode) {
 	controls3.enabled = true;
 	scene.add(controls3.getObject());
 
+<<<<<<< HEAD
 	let cameracctv = new THREE.PerspectiveCamera(70, dom.clientWidth/dom.clientHeight, 1, 150);
 	cameracctv.position.set( 5, -3,27 );
+=======
+	const cameracctv = new THREE.PerspectiveCamera(70, dom.clientWidth/dom.clientHeight, 1, 150);
+	cameracctv.position.set( 5, -3, 27 );
+>>>>>>> 327bf6f32b24ee9862ae9627615dc63ceccd3c9f
 
 	cameracctv.rotation.y = Math.PI/5*3;
 	camera.add(cameracctv);
@@ -136,7 +144,11 @@ export function JLmapDriving(dom, data, skinCode) {
 		if (scope.animateswitch == true) {
 			// 根据相机渲染场景
 			renderer.render(scene, camera);
+<<<<<<< HEAD
 			renderercctv.render(scene,cameracctv);
+=======
+			renderercctv.render(scene, cameracctv);
+>>>>>>> 327bf6f32b24ee9862ae9627615dc63ceccd3c9f
   	  // updatcontrols();
 			// renderercctv
 			controls3.update();
@@ -192,7 +204,7 @@ export function JLmapDriving(dom, data, skinCode) {
 	this.updatestoptime = function(stime) {
 		scope.stime = stime;
 	};
-	this.updatedrivedata = function(drivedata){
+	this.updatedrivedata = function(drivedata) {
 		scope.drivecount += 1;
 		scope.drivedata = drivedata;
 	};
diff --git a/src/jlmap3d/main/loaders/AssetLoader.js b/src/jlmap3d/main/loaders/AssetLoader.js
index b7a674d38..d952e6d79 100644
--- a/src/jlmap3d/main/loaders/AssetLoader.js
+++ b/src/jlmap3d/main/loaders/AssetLoader.js
@@ -18,7 +18,7 @@ let defaulttrain = {
   deviceType:"train",
   type:"num4",
   picUrl:"",
-  assetUrl:"https://test.joylink.club/oss/models/train/train.FBX"
+  assetUrl:"https://joylink.club/oss/models/train/train.FBX"
 }
 
 
@@ -56,7 +56,7 @@ let defaultsuidao = {
   deviceType:"suidao",
   type:"suidao",
   picUrl:"",
-  assetUrl:"https://test.joylink.club/oss/models/suidao/suidao.FBX"
+  assetUrl:"https://joylink.club/oss/models/suidao/suidao.FBX"
 }//https://joylink.club/oss/models/suidao/suidao.FBX
 //../../static/model/
 
diff --git a/src/jlmap3d/main/loaders/FBXLoader.js b/src/jlmap3d/main/loaders/FBXLoader.js
index a376e99a1..256198c3a 100644
--- a/src/jlmap3d/main/loaders/FBXLoader.js
+++ b/src/jlmap3d/main/loaders/FBXLoader.js
@@ -551,7 +551,15 @@ THREE.FBXLoader = ( function () {
 
 			if ( materialNode.EmissiveFactor ) {
 
-				parameters.emissiveIntensity = parseFloat( materialNode.EmissiveFactor.value );
+        if(materialNode.Opacity.value<1 && materialNode.Opacity.value>0.9){
+					parameters.side = THREE.DoubleSide;
+					parameters.transparent = true;
+					parameters.alphaTest = 0.7;
+					parameters.opacity = 1;
+
+				}else{
+					parameters.opacity = parseFloat( materialNode.Opacity.value );
+				}
 
 			}
 
diff --git a/src/jmap/config/skinCode/bejing_01.js b/src/jmap/config/skinCode/bejing_01.js
index 2777d73a8..bf0e09d05 100644
--- a/src/jmap/config/skinCode/bejing_01.js
+++ b/src/jmap/config/skinCode/bejing_01.js
@@ -304,9 +304,9 @@ class SkinCode extends defaultStyle {
 		};
 
 		this[deviceType.Station] = {
-			text: {
-				show: true											// 公里标名称显示
-			},
+			// text: {
+			// 	show: true											// 公里标名称显示
+			// },
 			kmPostShow: true,										// 公里标显示
 			kilometerPosition: 'down', 							 	// 公里标位置
 			fontWeight: 'bold'										// 文字错细
diff --git a/src/jmap/config/skinCode/chengdu_03.js b/src/jmap/config/skinCode/chengdu_03.js
index 3c1474c90..caecf92b4 100644
--- a/src/jmap/config/skinCode/chengdu_03.js
+++ b/src/jmap/config/skinCode/chengdu_03.js
@@ -300,9 +300,9 @@ class SkinCode extends defaultStyle {
 		};
 
 		this[deviceType.Station] = {
-			text: {
-				show: true									// 公里标名称显示
-			},
+			// text: {
+			// 	show: true									// 公里标名称显示
+			// },
 			kmPostShow: false,										// 公里标显示
 			kilometerPosition: 'up'							// 公里标朝向
 		};
diff --git a/src/jmap/config/skinCode/chengdu_04.js b/src/jmap/config/skinCode/chengdu_04.js
index 4705e4417..7fad28b82 100644
--- a/src/jmap/config/skinCode/chengdu_04.js
+++ b/src/jmap/config/skinCode/chengdu_04.js
@@ -297,9 +297,9 @@ class SkinCode extends defaultStyle {
 		};
 
 		this[deviceType.Station] = {
-			text: {
-				show: true											// 公里标名称显示
-			},
+			// text: {
+			// 	show: true											// 公里标名称显示
+			// },
 			kmPostShow: false,										// 公里标显示
 			kilometerPosition: 'up'							// 公里标朝向
 		};
diff --git a/src/jmap/config/skinCode/fuzhou_01.js b/src/jmap/config/skinCode/fuzhou_01.js
index acae1a23b..e96d5cc30 100644
--- a/src/jmap/config/skinCode/fuzhou_01.js
+++ b/src/jmap/config/skinCode/fuzhou_01.js
@@ -279,9 +279,9 @@ class SkinCode extends defaultStyle {
 		};
 
 		this[deviceType.Station] = {
-			text: {
-				show: true											// 公里标名称显示
-			},
+			// text: {
+			// 	show: true											// 公里标名称显示
+			// },
 			kmPostShow: true,										// 公里标显示
 			kilometerPosition: 'up'									// 公里标朝向
 		};
diff --git a/src/jmap/map.js b/src/jmap/map.js
index 966b7771a..47d7e3833 100644
--- a/src/jmap/map.js
+++ b/src/jmap/map.js
@@ -20,9 +20,6 @@ class Jlmap {
 		// 鼠标事件
 		this.events = { __Pan: 'pan', __Zoom: 'zoom', Selected: 'selected', Contextmenu: 'contextmenu', DataZoom: 'dataZoom'};
 
-		// 原始数据
-		this.data = {};
-
 		// 皮肤参数
 		this.skinCode = '';
 
@@ -83,12 +80,10 @@ class Jlmap {
 			this.$options.scaleRate = map.skinVO.scaling || 1;
 			this.$options.offsetX = map.skinVO.origin ? map.skinVO.origin.x : 0;
 			this.$options.offsetY = map.skinVO.origin ? map.skinVO.origin.y : 0;
+			// 更新视图大小
 			this.$painter.updateTransform({ scaleRate: this.$options.scaleRate, offsetX: this.$options.offsetX, offsetY: this.$options.offsetY });
 		}
 
-		// 保存原始数据
-		this.data = map;
-
 		// 解析地图数据
 		this.mapDevice = mapDevice;
 
@@ -103,7 +98,6 @@ class Jlmap {
 
 		// 视图加载完成 回调
 		if (this.methods.viewLoaded instanceof Function) { this.methods.viewLoaded(this.mapDevice); }
-
 	}
 
 	setDefaultState() {
@@ -158,7 +152,6 @@ class Jlmap {
 			const type = elem._type;
 			const oDevice = this.mapDevice[code] || deviceFactory(type, elem);
 			const nDevice = Object.assign(oDevice || {}, elem);
-			this.dataSync(nDevice);
 			this.$painter.delete(oDevice);
 			if (!elem._dispose) {
 				this.mapDevice[code] = nDevice;
@@ -275,52 +268,6 @@ class Jlmap {
 		return payload || {};
 	}
 
-	dataSync(model) {
-		var prop = null;
-		var type = model._type;
-		var code = model.code;
-
-		switch (type) {
-		case deviceType.Link: prop = 'linkList'; break;
-		case deviceType.Section: prop = 'sectionList'; break;
-		case deviceType.Switch: prop = 'switchList'; break;
-		case deviceType.Signal: prop = 'signalList'; break;
-		case deviceType.Station: prop = 'stationList'; break;
-		case deviceType.StationStand: prop = 'stationStandList'; break;
-		case deviceType.StationControl: prop = 'stationControlList'; break;
-		case deviceType.StationCounter: prop = 'stationCounterList'; break;
-		case deviceType.ZcControl: prop = 'zcControlList'; break;
-		case deviceType.StationDelayUnlock: prop = 'stationDelayUnlockList'; break;
-		case deviceType.LcControl: prop = 'lcControlList'; break;
-		case deviceType.ButtonControl: prop = 'buttonList'; break;
-		case deviceType.LimitControl: prop = 'tempSpeedLimitList'; break;
-		case deviceType.ImageControl: prop = 'imageControl'; break;
-		case deviceType.Train: prop = 'trainList'; break;
-		case deviceType.TrainWindow: prop = 'trainWindowList'; break;
-		case deviceType.Line: prop = 'lineList'; break;
-		case deviceType.Text: prop = 'textList'; break;
-		}
-
-		const list = this.data[prop] || [];
-		const idex = list.findIndex(elem => { return elem.code == code; });
-		if (list) {
-			if (model._dispose) {
-				idex >= 0 && list.splice(idex, 1);
-			} else {
-				const elem = list[idex];
-				if (elem) {
-					Object.keys(model).forEach(key => {
-						if (key != 'instance') {
-							elem[key] = model[key];
-						}
-					});
-				} else {
-					list.push(Object.assign({}, model));
-				}
-			}
-		}
-	}
-
 	getZr() {
 		return this.$zr;
 	}
diff --git a/src/jmap/shape/Section/EMouse.js b/src/jmap/shape/Section/EMouse.js
index d97f5eb11..40e2166ec 100644
--- a/src/jmap/shape/Section/EMouse.js
+++ b/src/jmap/shape/Section/EMouse.js
@@ -99,8 +99,8 @@ class EMouse extends Group {
 			this.sectionTextBorder && this.sectionTextBorder.show();
 			this.lineBorder && this.lineBorder.show();
 			const instance = this.getInstanceByCode(this.device.model.trainWindowCode);
-			if (instance && instance.mouseEnter) {
-				instance.mouseEnter(e);
+			if (instance && instance.mouseEvent && instance.mouseEvent.mouseEnter) {
+				instance.mouseEvent.mouseEnter(e);
 			}
 		}
 	}
@@ -118,8 +118,8 @@ class EMouse extends Group {
 				this.sectionTextBorder && this.sectionTextBorder.hide();
 				this.lineBorder && this.lineBorder.hide();
 				const instance = this.getInstanceByCode(this.device.model.trainWindowCode);
-				if (instance && instance.mouseLeave) {
-					instance.mouseLeave(e);
+				if (instance && instance.mouseEvent && instance.mouseEvent.mouseLeave) {
+					instance.mouseEvent.mouseLeave(e);
 				}
 			}
 		}
diff --git a/src/jmap/shape/Station/index.js b/src/jmap/shape/Station/index.js
index 642962ef8..152d34e4d 100644
--- a/src/jmap/shape/Station/index.js
+++ b/src/jmap/shape/Station/index.js
@@ -21,7 +21,7 @@ export default class Station extends Group {
 		const model = this.model;
 		const style = this.style;
 
-		if (style.Station.text.show) {
+		if (model.visible) {
 			// 公里标名称是否显示
 			this.stationText = new ETextName({
 				zlevel: this.zlevel,
@@ -38,29 +38,29 @@ export default class Station extends Group {
 				textFill: model.nameFontColor
 			});
 			this.add(this.stationText);
-		}
-
-		if (style.Station.kmPostShow) {
+			const path = window.location.href;
+			if (style.Station.kmPostShow || path.includes('/map/draw')) {
 			// 公里标是否显示
-			let direction = 1;
-			if (this.style.Station.kilometerPosition == 'up') {
-				direction = -1;
+				let direction = 1;
+				if (this.style.Station.kilometerPosition == 'up') {
+					direction = -1;
+				}
+				this.mileageText = new ETextName({
+					zlevel: this.zlevel,
+					z: this.z,
+					position: [0, 0],
+					x: model.position.x,
+					y: model.position.y + ((parseInt(model.nameFont) + 2) * direction),
+					fontWeight: model.fontWeight,
+					fontSize: model.kmPostFont || 18,
+					fontFamily: style.fontFamily,
+					text: model.kmPost,
+					textAlign: 'middle',
+					textVerticalAlign: 'top',
+					textFill: model.kmPostFontColor
+				});
+				this.add(this.mileageText);
 			}
-			this.mileageText = new ETextName({
-				zlevel: this.zlevel,
-				z: this.z,
-				position: [0, 0],
-				x: model.position.x,
-				y: model.position.y + ((parseInt(model.nameFont) + 2) * direction),
-				fontWeight: model.fontWeight,
-				fontSize: model.kmPostFont || 18,
-				fontFamily: style.fontFamily,
-				text: model.kmPost,
-				textAlign: 'middle',
-				textVerticalAlign: 'top',
-				textFill: model.kmPostFontColor
-			});
-			this.add(this.mileageText);
 		}
 	}
 
diff --git a/src/jmap/shape/Switch/EMouse.js b/src/jmap/shape/Switch/EMouse.js
index 89b6e57fa..5ae837984 100644
--- a/src/jmap/shape/Switch/EMouse.js
+++ b/src/jmap/shape/Switch/EMouse.js
@@ -42,9 +42,9 @@ class EMouse extends Group {
 
 	// 创建道岔边框
 	craeteSwitchBorder() {
-		const sectionA = this.device.model.sectionAInstance.instance;
-		const sectionB = this.device.model.sectionBInstance.instance;
-		const sectionC = this.device.model.sectionCInstance.instance;
+		const sectionA = this.getInstanceByCode(this.device.model.sectionACode);
+		const sectionB = this.getInstanceByCode(this.device.model.sectionBCode);
+		const sectionC = this.getInstanceByCode(this.device.model.sectionCCode);
 		const rect = this.device.getBoundingRect();
 
 		sectionA && rect.union(sectionA.getBoundingRect());
@@ -83,8 +83,8 @@ class EMouse extends Group {
 			const section = store.getters['map/getDeviceByCode'](this.device.model.sectionACode) || {};
 			const parentSection = store.getters['map/getDeviceByCode'](section.parentCode) || {};
 			const instance = this.getInstanceByCode(parentSection.trainWindowCode);
-			if (instance && instance.mouseLeave) {
-				instance.mouseLeave(e);
+			if (instance && instance.mouseEvent && instance.mouseEvent.mouseLeave) {
+				instance.mouseEvent.mouseLeave(e);
 			}
 		}
 	}
@@ -101,8 +101,8 @@ class EMouse extends Group {
 		const section = store.getters['map/getDeviceByCode'](this.device.model.sectionACode) || {};
 		const parentSection = store.getters['map/getDeviceByCode'](section.parentCode) || {};
 		const instance = this.getInstanceByCode(parentSection.trainWindowCode);
-		if (instance && instance.mouseEnter) {
-			instance.mouseEnter(e);
+		if (instance && instance.mouseEvent && instance.mouseEvent.mouseEnter) {
+			instance.mouseEvent.mouseEnter(e);
 		}
 	}
 
diff --git a/src/jmap/shape/TrainWindow/EMouse.js b/src/jmap/shape/TrainWindow/EMouse.js
new file mode 100644
index 000000000..d059089c0
--- /dev/null
+++ b/src/jmap/shape/TrainWindow/EMouse.js
@@ -0,0 +1,37 @@
+export default class EMouse {
+	constructor(device) {
+		this.device = device;
+	}
+
+	mouseover(e) {
+		if (this.device.prdType) {
+			this.device.setVisible(true);
+			const instance = this.device.getInstanceByCode(this.device.model.sectionCode);
+			if (instance && instance.mouseEvent && instance.mouseEvent.mouseover) {
+				instance.mouseEvent.mouseEnter(e);
+			}
+		}
+	}
+
+	mouseout(e) {
+		if (this.device.prdType) {
+			this.device.setVisible(false || this.device.model.trainWindowShow);
+			const instance = this.device.getInstanceByCode(this.device.model.sectionCode);
+			if (instance && instance.mouseEvent && instance.mouseEvent.mouseout) {
+				instance.mouseEvent.mouseLeave(e);
+			}
+		}
+	}
+
+	mouseEnter(e) {
+		if (this.device.prdType) {
+			this.device.setVisible(true);
+		}
+	}
+
+	mouseLeave(e) {
+		if (this.device.prdType ) {
+			this.device.setVisible(false);
+		}
+	}
+}
diff --git a/src/jmap/shape/TrainWindow/index.js b/src/jmap/shape/TrainWindow/index.js
index 1315f9c9a..e0ec9d383 100644
--- a/src/jmap/shape/TrainWindow/index.js
+++ b/src/jmap/shape/TrainWindow/index.js
@@ -1,6 +1,7 @@
 /* 车次窗*/
 import Polygon from 'zrender/src/graphic/shape/Polygon';
 import Group from 'zrender/src/container/Group';
+import EMouse from './EMouse';
 import store from '@/store';
 
 class TrainWindow extends Group {
@@ -14,6 +15,7 @@ class TrainWindow extends Group {
 		this.z = 9;
 		this.prdType = store.state.training.prdType;
 		this.create(model);
+		this.createMouseEvent();
 		this.setState(model);
 	}
 	create(model) {
@@ -22,6 +24,12 @@ class TrainWindow extends Group {
 		}
 	}
 
+	createMouseEvent() {
+		this.mouseEvent = new EMouse(this);
+		this.on('mouseout', (e) => { this.mouseEvent.mouseout(e); });
+		this.on('mouseover', (e) => { this.mouseEvent.mouseover(e); });
+	}
+
 	/** 创建车次窗*/
 	createTrainWindow() {
 		const model = this.model;
@@ -44,9 +52,7 @@ class TrainWindow extends Group {
 				lineWidth: this.style.TrainWindow.lineWidth,
 				stroke: this.style.TrainWindow.lineColor,
 				fill: this.style.transparentColor
-			},
-			onmouseover: (e) => { this.mouseover(e); },
-			onmouseout: (e) => { this.mouseout(e); }
+			}
 		});
 		this.add(this.trainRect);
 	}
@@ -72,38 +78,6 @@ class TrainWindow extends Group {
 	getInstanceByCode(code) {
 		return (store.getters['map/getDeviceByCode'](code) || {}).instance;
 	}
-
-	mouseout(e) {
-		if (this.prdType) {
-			this.setVisible(false);
-			const instance = this.getInstanceByCode(this.model.sectionCode);
-			if (instance && instance.mouseEvent && instance.mouseEvent.mouseout) {
-				instance.mouseEvent.mouseLeave(e);
-			}
-		}
-	}
-
-	mouseover(e) {
-		if (this.prdType) {
-			this.setVisible(true);
-			const instance = this.getInstanceByCode(this.model.sectionCode);
-			if (instance && instance.mouseEvent && instance.mouseEvent.mouseover) {
-				instance.mouseEvent.mouseEnter(e);
-			}
-		}
-	}
-
-	mouseEnter(e) {
-		if (this.prdType) {
-			this.setVisible(true);
-		}
-	}
-
-	mouseLeave(e) {
-		if (this.prdType ) {
-			this.setVisible(false);
-		}
-	}
 }
 
 export default TrainWindow;
diff --git a/src/jmap/theme/batong_01/menus/dialog/trainControl.vue b/src/jmap/theme/batong_01/menus/dialog/trainControl.vue
index ab8584424..14842059e 100644
--- a/src/jmap/theme/batong_01/menus/dialog/trainControl.vue
+++ b/src/jmap/theme/batong_01/menus/dialog/trainControl.vue
@@ -1,423 +1,464 @@
 <template>
-    <el-dialog class="fuzhou_01 train-control" :title="title" :visible.sync="show" width="320px" :before-close="doClose"
-        :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
-        <el-form size="small" label-width="90px" :model="formModel" :rules="rules" ref="form">
-            <el-form-item label="车 组 号:" prop="trainNumber">
-                <el-select v-model="formModel.trainNumber" :id="domIdTrainNumber" filterable
-                    :disabled="trainNumberIsDisabled" @change="trainNumberChange">
-                    <el-option v-for="train in trainList" :key="train.groupNumber" :label="train.groupNumber"
-                        :value="train.groupNumber">
-                    </el-option>
-                </el-select>
-            </el-form-item>
-            <el-form-item prop="trainType" label-width='0px'>
-                <el-radio-group v-model="formModel.trainType" :id="domIdTrainType" style="margin-left: 15px;"
-                    :disabled="trainTypeIsDisabled" @change="trainTypeChange">
-                    <el-radio :label="'01'">计划车</el-radio>
-                    <el-radio :label="'02'">头码车</el-radio>
-                    <el-radio :label="'03'">人工车</el-radio>
-                </el-radio-group>
-            </el-form-item>
-            <el-form-item prop="serverNo">
-                <span slot="label">表&emsp;&emsp;号</span>
-                <el-input v-model="formModel.serverNo" :id="domIdServerNo" :disabled="serverNoIsDisabled"
-                    @change="serverNoChange">
-                </el-input>
-            </el-form-item>
-            <el-form-item label="车 次 号:" prop="trainNo">
-                <el-input v-model="formModel.trainNo" :id="domIdTrainNo" :disabled="trainNoIsDisabled"
-                    @change="trainNoChange"></el-input>
-            </el-form-item>
-            <el-form-item label="目的地号:" prop="targetCode">
-                <el-input v-model="formModel.targetCode" :id="domIdTargetCode" :disabled="targetCodeIsDisabled"
-                    @change="targetCodeChange">
-                </el-input>
-            </el-form-item>
-        </el-form>
-        <el-row justify="center" class="button-group">
-            <el-col :span="10" :offset="2">
-                <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
-            </el-col>
-            <el-col :span="8" :offset="4">
-                <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
-            </el-col>
-        </el-row>
-        <confirm-train ref="confirmTrain"></confirm-train>
-        <notice-info ref="noticeInfo"></notice-info>
-    </el-dialog>
+  <el-dialog
+    v-dialogDrag
+    class="fuzhou_01 train-control"
+    :title="title"
+    :visible.sync="show"
+    width="320px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <el-form ref="form" size="small" label-width="90px" :model="formModel" :rules="rules">
+      <el-form-item label="车 组 号:" prop="trainNumber">
+        <el-select
+          :id="domIdTrainNumber"
+          v-model="formModel.trainNumber"
+          filterable
+          :disabled="trainNumberIsDisabled"
+          @change="trainNumberChange"
+        >
+          <el-option
+            v-for="train in trainList"
+            :key="train.groupNumber"
+            :label="train.groupNumber"
+            :value="train.groupNumber"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item prop="trainType" label-width="0px">
+        <el-radio-group
+          :id="domIdTrainType"
+          v-model="formModel.trainType"
+          style="margin-left: 15px;"
+          :disabled="trainTypeIsDisabled"
+          @change="trainTypeChange"
+        >
+          <el-radio :label="'01'">计划车</el-radio>
+          <el-radio :label="'02'">头码车</el-radio>
+          <el-radio :label="'03'">人工车</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item prop="serverNo">
+        <span slot="label">表&emsp;&emsp;号</span>
+        <el-input
+          :id="domIdServerNo"
+          v-model="formModel.serverNo"
+          :disabled="serverNoIsDisabled"
+          @change="serverNoChange"
+        />
+      </el-form-item>
+      <el-form-item label="车 次 号:" prop="trainNo">
+        <el-input
+          :id="domIdTrainNo"
+          v-model="formModel.trainNo"
+          :disabled="trainNoIsDisabled"
+          @change="trainNoChange"
+        />
+      </el-form-item>
+      <el-form-item label="目的地号:" prop="targetCode">
+        <el-input
+          :id="domIdTargetCode"
+          v-model="formModel.targetCode"
+          :disabled="targetCodeIsDisabled"
+          @change="targetCodeChange"
+        />
+      </el-form-item>
+    </el-form>
+    <el-row justify="center" class="button-group">
+      <el-col :span="10" :offset="2">
+        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
+      </el-col>
+      <el-col :span="8" :offset="4">
+        <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
+      </el-col>
+    </el-row>
+    <confirm-train ref="confirmTrain" />
+    <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 ConfirmTrain from './childDialog/confirmTrain';
-    import NoticeInfo from './childDialog/childDialog/noticeInfo'
+import { mapGetters } from 'vuex';
+import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { getPublishTrainList } from '@/api/jmap/map';
+import ConfirmTrain from './childDialog/confirmTrain';
+import NoticeInfo from './childDialog/childDialog/noticeInfo';
 
-    export default {
-        name: 'TrainControl',
-        components: {
-            ConfirmTrain,
-            NoticeInfo
-        },
-        data() {
-            return {
-                trainList: [],
-                formModel: {
-                    trainNo: '',
-                    trainNumber: '',
-                    trainType: '01',
-                    serverNo: '',
-                    targetCode: '',
-                },
+export default {
+	name: 'TrainControl',
+	components: {
+		ConfirmTrain,
+		NoticeInfo
+	},
+	data() {
+		return {
+			trainList: [],
+			formModel: {
+				trainNo: '',
+				trainNumber: '',
+				trainType: '01',
+				serverNo: '',
+				targetCode: ''
+			},
 
-                rules: {
-                    trainNumber: [
-                        { required: true, message: '请选择车组号', trigger: 'change' }
-                    ],
-                    trainType: [
-                        { required: true, message: '请选择一个列车类型', trigger: 'change' }
-                    ],
-                    serverNo: [
-                        { required: true, message: '请输入表号', trigger: 'blur' }
-                    ],
-                    trainNo: [
-                        { required: true, message: '请输入车次号', trigger: 'blur' }
-                    ],
-                    targetCode: [
-                        { required: true, message: '请输入目的地号', trigger: 'blur' }
-                    ]
-                },
-                operation: null,
-                dialogShow: false,
-                loading: false,
-                direction: 0
-            }
-        },
-        computed: {
-            ...mapGetters('map', [
-                'map'
-            ]),
-            trainNoIsDisabled() {
-                return false;
-            },
-            serverNoIsDisabled() {
-                return false;
-            },
-            targetCodeIsDisabled() {
-                return false;
-            },
-            trainNumberIsDisabled() {
-                if (this.operation != OperationEvent.Train.addTrainId.menu.operation) {
-                    return true;
-                }
-            },
-            trainTypeIsDisabled() {
-                if (this.operation != OperationEvent.Train.addTrainId.menu.operation) {
-                    return true;
-                }
-            },
-            show() {
-                return this.dialogShow && !this.$store.state.menuOperation.break;
-            },
-            domIdTrainNumber() {
-                if (this.dialogShow) {
-                    if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
-                        /** 添加列车识别号*/
-                        return OperationEvent.Train.addTrainId.trainNumberChange.domId;
-                    } else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
-                        /** 修改列车识别号*/
-                        return OperationEvent.Train.editTrainId.trainNumberChange.domId;
-                    }
-                }
-            },
-            domIdTrainNo() {
-                if (this.dialogShow) {
-                    if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
-                        /** 添加列车识别号*/
-                        return OperationEvent.Train.addTrainId.trainNoChange.domId;
-                    } else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
-                        /** 修改列车识别号*/
-                        return OperationEvent.Train.editTrainId.trainNoChange.domId;
-                    }
-                }
-            },
-            domIdTrainType() {
-                if (this.dialogShow) {
-                    if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
-                        /** 添加列车识别号*/
-                        return OperationEvent.Train.addTrainId.trainTypeChange.domId;
-                    } else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
-                        /** 修改列车识别号*/
-                        return OperationEvent.Train.editTrainId.trainTypeChange.domId;
-                    }
-                }
-            },
-            domIdServerNo() {
-                if (this.dialogShow) {
-                    if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
-                        /** 添加列车识别号*/
-                        return OperationEvent.Train.addTrainId.serverNoChange.domId;
-                    } else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
-                        /** 修改列车识别号*/
-                        return OperationEvent.Train.editTrainId.serverNoChange.domId;
-                    }
-                }
-            },
-            domIdTargetCode() {
-                if (this.dialogShow) {
-                    if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
-                        /** 添加列车识别号*/
-                        return OperationEvent.Train.addTrainId.targetCodeChange.domId;
-                    } else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
-                        /** 修改列车识别号*/
-                        return OperationEvent.Train.editTrainId.targetCodeChange.domId;
-                    }
-                }
-            },
-            domIdConfirm() {
-                if (this.dialogShow) {
-                    if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
-                        /** 添加列车识别号*/
-                        return OperationEvent.Train.addTrainId.menu.domId;
-                    } else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
-                        /** 修改列车识别号*/
-                        return OperationEvent.Train.editTrainId.menu.domId;
-                    }
-                }
-            },
-            domIdCancel() {
-                return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-            },
-            title() {
-                if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
-                    return '添加列车识别号';
-                } else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
-                    return '修改列车识别号';
-                }
-            }
-        },
-        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) {
-                //如果不是断点激活，则需要对初始值进行初始化
-                if (!this.dialogShow) {
-                    this.operation = operate.operation;
-                }
+			rules: {
+				trainNumber: [
+					{ required: true, message: '请选择车组号', trigger: 'change' }
+				],
+				trainType: [
+					{ required: true, message: '请选择一个列车类型', trigger: 'change' }
+				],
+				serverNo: [
+					{ required: true, message: '请输入表号', trigger: 'blur' }
+				],
+				trainNo: [
+					{ required: true, message: '请输入车次号', trigger: 'blur' }
+				],
+				targetCode: [
+					{ required: true, message: '请输入目的地号', trigger: 'blur' }
+				]
+			},
+			operation: null,
+			dialogShow: false,
+			loading: false,
+			direction: 0
+		};
+	},
+	computed: {
+		...mapGetters('map', [
+			'map'
+		]),
+		trainNoIsDisabled() {
+			return false;
+		},
+		serverNoIsDisabled() {
+			return false;
+		},
+		targetCodeIsDisabled() {
+			return false;
+		},
+		trainNumberIsDisabled() {
+			if (this.operation != OperationEvent.Train.addTrainId.menu.operation) {
+				return true;
+			}
+			return false;
+		},
+		trainTypeIsDisabled() {
+			if (this.operation != OperationEvent.Train.addTrainId.menu.operation) {
+				return true;
+			}
+			return false;
+		},
+		show() {
+			return this.dialogShow && !this.$store.state.menuOperation.break;
+		},
+		domIdTrainNumber() {
+			if (this.dialogShow) {
+				if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
+					/** 添加列车识别号*/
+					return OperationEvent.Train.addTrainId.trainNumberChange.domId;
+				} else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
+					/** 修改列车识别号*/
+					return OperationEvent.Train.editTrainId.trainNumberChange.domId;
+				}
+			}
+			return null;
+		},
+		domIdTrainNo() {
+			if (this.dialogShow) {
+				if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
+					/** 添加列车识别号*/
+					return OperationEvent.Train.addTrainId.trainNoChange.domId;
+				} else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
+					/** 修改列车识别号*/
+					return OperationEvent.Train.editTrainId.trainNoChange.domId;
+				}
+			}
+			return null;
+		},
+		domIdTrainType() {
+			if (this.dialogShow) {
+				if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
+					/** 添加列车识别号*/
+					return OperationEvent.Train.addTrainId.trainTypeChange.domId;
+				} else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
+					/** 修改列车识别号*/
+					return OperationEvent.Train.editTrainId.trainTypeChange.domId;
+				}
+			}
+			return null;
+		},
+		domIdServerNo() {
+			if (this.dialogShow) {
+				if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
+					/** 添加列车识别号*/
+					return OperationEvent.Train.addTrainId.serverNoChange.domId;
+				} else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
+					/** 修改列车识别号*/
+					return OperationEvent.Train.editTrainId.serverNoChange.domId;
+				}
+			}
+			return null;
+		},
+		domIdTargetCode() {
+			if (this.dialogShow) {
+				if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
+					/** 添加列车识别号*/
+					return OperationEvent.Train.addTrainId.targetCodeChange.domId;
+				} else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
+					/** 修改列车识别号*/
+					return OperationEvent.Train.editTrainId.targetCodeChange.domId;
+				}
+			}
+			return null;
+		},
+		domIdConfirm() {
+			if (this.dialogShow) {
+				if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
+					/** 添加列车识别号*/
+					return OperationEvent.Train.addTrainId.menu.domId;
+				} else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
+					/** 修改列车识别号*/
+					return OperationEvent.Train.editTrainId.menu.domId;
+				}
+			}
+			return null;
+		},
+		domIdCancel() {
+			return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+		},
+		title() {
+			if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
+				return '添加列车识别号';
+			} else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
+				return '修改列车识别号';
+			}
+			return '';
+		}
+	},
+	mounted() {
+		this.$nextTick(() => {
+			this.$store.dispatch('training/tipReload');
+		});
+	},
+	methods: {
+		loadInitData(map) {
+			if (map) {
+				getPublishTrainList(map.skinCode).then(resp => {
+					this.trainList = resp.data;
+				}).catch(() => {
+					this.$messageBox(`获取列车车组号失败`);
+				});
+			}
+		},
+		doShow(operate, selected) {
+			// 如果不是断点激活，则需要对初始值进行初始化
+			if (!this.dialogShow) {
+				this.operation = operate.operation;
+			}
 
-                this.formModel = {
-                    trainNumber: selected.trainNumber,
-                    trainNo: selected.trainNo,
-                    trainType: '01',
-                    serverNo: selected.serverNo,
-                    targetCode: selected.targetCode,
-                };
+			this.formModel = {
+				trainNumber: selected.trainNumber,
+				trainNo: selected.trainNo,
+				trainType: '01',
+				serverNo: selected.serverNo,
+				targetCode: selected.targetCode
+			};
 
-                /** 加载列车数据*/
-                this.loadInitData(this.map);
-                this.dialogShow = true;
-                this.$nextTick(function () {
-                    this.$store.dispatch('training/emitTipFresh');
-                });
-            },
-            doClose() {
-                this.loading = false;
-                this.dialogShow = false;
-                this.$store.dispatch('training/emitTipFresh');
-                this.$store.dispatch('map/setTrainWindowShow', false);
-            },
-            trainNumberChange(trainNumber) {
-                let operate = {
-                    type: MapDeviceType.Train.type,
-                    val: `${trainNumber}`,
-                    operation: ''
-                }
+			/** 加载列车数据*/
+			this.loadInitData(this.map);
+			this.dialogShow = true;
+			this.$nextTick(function () {
+				this.$store.dispatch('training/emitTipFresh');
+			});
+		},
+		doClose() {
+			this.loading = false;
+			this.dialogShow = false;
+			this.$store.dispatch('training/emitTipFresh');
+			this.$store.dispatch('map/setTrainWindowShow', false);
+		},
+		trainNumberChange(trainNumber) {
+			const operate = {
+				type: MapDeviceType.Train.type,
+				val: `${trainNumber}`,
+				operation: ''
+			};
 
-                if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
-                    operate.operation = OperationEvent.Train.addTrainId.trainNumberChange.operation;
-                } else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
-                    operate.operation = OperationEvent.Train.editTrainId.trainNumberChange.operation;
-                }
+			if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
+				operate.operation = OperationEvent.Train.addTrainId.trainNumberChange.operation;
+			} else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
+				operate.operation = OperationEvent.Train.editTrainId.trainNumberChange.operation;
+			}
 
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    }
-                })
-            },
-            trainTypeChange(trainType) {
-                let operate = {
-                    type: MapDeviceType.Train.type,
-                    val: `${trainType}`,
-                    operation: ''
-                }
+			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+				if (valid) {
+					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+				}
+			});
+		},
+		trainTypeChange(trainType) {
+			const operate = {
+				type: MapDeviceType.Train.type,
+				val: `${trainType}`,
+				operation: ''
+			};
 
-                if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
-                    operate.operation = OperationEvent.Train.addTrainId.trainTypeChange.operation;
-                } else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
-                    operate.operation = OperationEvent.Train.editTrainId.trainTypeChange.operation;
-                }
+			if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
+				operate.operation = OperationEvent.Train.addTrainId.trainTypeChange.operation;
+			} else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
+				operate.operation = OperationEvent.Train.editTrainId.trainTypeChange.operation;
+			}
 
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    }
-                })
-            },
-            serverNoChange(serverNo) {
-                let operate = {
-                    type: MapDeviceType.Train.type,
-                    val: `${serverNo}`,
-                    operation: ''
-                }
+			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+				if (valid) {
+					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+				}
+			});
+		},
+		serverNoChange(serverNo) {
+			const operate = {
+				type: MapDeviceType.Train.type,
+				val: `${serverNo}`,
+				operation: ''
+			};
 
-                if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
-                    operate.operation = OperationEvent.Train.addTrainId.serverNoChange.operation;
-                } else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
-                    operate.operation = OperationEvent.Train.editTrainId.serverNoChange.operation;
-                }
+			if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
+				operate.operation = OperationEvent.Train.addTrainId.serverNoChange.operation;
+			} else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
+				operate.operation = OperationEvent.Train.editTrainId.serverNoChange.operation;
+			}
 
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    }
-                })
-            },
-            trainNoChange(trainNo) {
-                let operate = {
-                    type: MapDeviceType.Train.type,
-                    val: `${trainNo}`,
-                    operation: ''
-                }
+			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+				if (valid) {
+					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+				}
+			});
+		},
+		trainNoChange(trainNo) {
+			const operate = {
+				type: MapDeviceType.Train.type,
+				val: `${trainNo}`,
+				operation: ''
+			};
 
-                if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
-                    operate.operation = OperationEvent.Train.addTrainId.trainNoChange.operation;
-                } else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
-                    operate.operation = OperationEvent.Train.editTrainId.trainNoChange.operation;
-                }
+			if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
+				operate.operation = OperationEvent.Train.addTrainId.trainNoChange.operation;
+			} else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
+				operate.operation = OperationEvent.Train.editTrainId.trainNoChange.operation;
+			}
 
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    }
-                })
-            },
-            targetCodeChange(targetCode) {
-                let operate = {
-                    type: MapDeviceType.Train.type,
-                    val: `${targetCode}`,
-                    operation: ''
-                }
+			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+				if (valid) {
+					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+				}
+			});
+		},
+		targetCodeChange(targetCode) {
+			const operate = {
+				type: MapDeviceType.Train.type,
+				val: `${targetCode}`,
+				operation: ''
+			};
 
-                if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
-                    operate.operation = OperationEvent.Train.addTrainId.targetCodeChange.operation;
-                } else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
-                    operate.operation = OperationEvent.Train.editTrainId.targetCodeChange.operation;
-                }
+			if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
+				operate.operation = OperationEvent.Train.addTrainId.targetCodeChange.operation;
+			} else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
+				operate.operation = OperationEvent.Train.editTrainId.targetCodeChange.operation;
+			}
 
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    }
-                })
-            },
-            commit() {
-                if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
-                    /** 增加列车识别号*/
-                    this.addTrainId();
-                } else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
-                    /** 修改列车识别号*/
-                    this.editTrainId();
-                }
-            },
-            //增加列车识别号
-            addTrainId() {
-                this.$refs['form'].validate((valid) => {
-                    if (valid) {
-                        let model = this.formModel;
-                        let operate = {
-                            send: true,
-                            type: MapDeviceType.Train.type,
-                            operation: OperationEvent.Train.addTrainId.menu.operation,
-                            messages: [`添加列车识别号：成功`],
-                            val: `${model.trainNumber}::${model.trainType}::${model.serverNo}::${model.trainNo}::${model.targetCode}`,
-                        }
+			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+				if (valid) {
+					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+				}
+			});
+		},
+		commit() {
+			if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
+				/** 增加列车识别号*/
+				this.addTrainId();
+			} else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
+				/** 修改列车识别号*/
+				this.editTrainId();
+			}
+		},
+		// 增加列车识别号
+		addTrainId() {
+			this.$refs['form'].validate((valid) => {
+				if (valid) {
+					const model = this.formModel;
+					const operate = {
+						send: true,
+						type: MapDeviceType.Train.type,
+						operation: OperationEvent.Train.addTrainId.menu.operation,
+						messages: [`添加列车识别号：成功`],
+						val: `${model.trainNumber}::${model.trainType}::${model.serverNo}::${model.trainNo}::${model.targetCode}`
+					};
 
-                        this.loading = true;
-                        this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                            this.loading = false;
-                            if (valid) {
-                                this.doClose();
-                                this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                                this.$refs.confirmTrain.doShow(operate);
-                            }
-                        }).catch(error => {
-                            this.loading = false;
-                            this.doClose();
-                            this.$refs.noticeInfo.doShow(operate);
-                        })
-                    } else {
-                        return false;
-                    }
-                });
-            },
-            //修改列车识别号
-            editTrainId() {
-                this.$refs['form'].validate((valid) => {
-                    if (valid) {
-                        let operate = {
-                            send: true,
-                            type: MapDeviceType.Train.type,
-                            operation: OperationEvent.Train.editTrainId.menu.operation,
-                            messages: [`修改列车识别号：成功`],
-                            val: this.formModel.trainNo,
-                        }
+					this.loading = true;
+					this.$store.dispatch('training/next', operate).then(({ valid }) => {
+						this.loading = false;
+						if (valid) {
+							this.doClose();
+							this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+							this.$refs.confirmTrain.doShow(operate);
+						}
+					}).catch(() => {
+						this.loading = false;
+						this.doClose();
+						this.$refs.noticeInfo.doShow(operate);
+					});
+				} else {
+					return false;
+				}
+			});
+		},
+		// 修改列车识别号
+		editTrainId() {
+			this.$refs['form'].validate((valid) => {
+				if (valid) {
+					const operate = {
+						send: true,
+						type: MapDeviceType.Train.type,
+						operation: OperationEvent.Train.editTrainId.menu.operation,
+						messages: [`修改列车识别号：成功`],
+						val: this.formModel.trainNo
+					};
 
-                        this.loading = true;
-                        this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                            this.loading = false;
-                            if (valid) {
-                                this.doClose();
-                                this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                                this.$refs.confirmTrain.doShow(operate);
-                            }
-                        }).catch(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();
+							this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+							this.$refs.confirmTrain.doShow(operate);
+						}
+					}).catch(() => {
+						this.loading = false;
+						this.doClose();
+						this.$refs.noticeInfo.doShow(operate);
+					});
+				} else {
+					return false;
+				}
+			});
+		},
+		cancel() {
+			const operate = {
+				type: MapDeviceType.Train.type,
+				operation: OperationEvent.Command.cancel.menu.operation
+			};
 
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.doClose();
-                    }
-                }).catch(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/batong_01/menus/dialog/trainDelete.vue b/src/jmap/theme/batong_01/menus/dialog/trainDelete.vue
index 003ce2e1f..643df3baa 100644
--- a/src/jmap/theme/batong_01/menus/dialog/trainDelete.vue
+++ b/src/jmap/theme/batong_01/menus/dialog/trainDelete.vue
@@ -1,156 +1,165 @@
 <template>
-    <el-dialog class="fuzhou_01 stand-stop-time" :title="title" :visible.sync="show" width="320px"
-        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
-        <el-form size="small" label-width="90px" :model="formModel" :rules="rules" ref="form">
-            <el-form-item label="车 组 号:" prop="trainNumber">
-                <el-input :id="domIdTrainNumber" v-model="formModel.trainNumber" @change="trainNumberChange"></el-input>
-            </el-form-item>
-        </el-form>
-        <el-row justify="center" class="button-group">
-            <el-col :span="10" :offset="2">
-                <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
-            </el-col>
-            <el-col :span="8" :offset="4">
-                <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
-            </el-col>
-        </el-row>
-        <confirm-control ref="confirmControl"></confirm-control>
-        <notice-info ref="noticeInfo"></notice-info>
-    </el-dialog>
+  <el-dialog
+    v-dialogDrag
+    class="fuzhou_01 stand-stop-time"
+    :title="title"
+    :visible.sync="show"
+    width="320px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <el-form ref="form" size="small" label-width="90px" :model="formModel" :rules="rules">
+      <el-form-item label="车 组 号:" prop="trainNumber">
+        <el-input :id="domIdTrainNumber" v-model="formModel.trainNumber" @change="trainNumberChange" />
+      </el-form-item>
+    </el-form>
+    <el-row justify="center" class="button-group">
+      <el-col :span="10" :offset="2">
+        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
+      </el-col>
+      <el-col :span="8" :offset="4">
+        <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
+      </el-col>
+    </el-row>
+    <confirm-control ref="confirmControl" />
+    <notice-info ref="noticeInfo" />
+  </el-dialog>
 </template>
 
 <script>
-    import { mapGetters } from 'vuex';
-    import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
-    import { getPublishMapTrainNos } from '@/api/runplan';
-    import ConfirmControl from './childDialog/confirmControl';
-    import NoticeInfo from './childDialog/childDialog/noticeInfo'
+import { mapGetters } from 'vuex';
+import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+// import { getPublishMapTrainNos } from '@/api/runplan';
+import ConfirmControl from './childDialog/confirmControl';
+import NoticeInfo from './childDialog/childDialog/noticeInfo';
 
-    export default {
-        name: 'TrainDelete',
-        components: {
-            ConfirmControl,
-            NoticeInfo
-        },
-        data() {
-            return {
-                trainNoList: [],
-                formModel: {
-                    trainNumber: '',
-                },
+export default {
+	name: 'TrainDelete',
+	components: {
+		ConfirmControl,
+		NoticeInfo
+	},
+	data() {
+		return {
+			trainNoList: [],
+			formModel: {
+				trainNumber: ''
+			},
 
-                rules: {
-                    trainNumber: [
-                        { required: true, message: '请输入车组号', trigger: 'blur' }
-                    ],
-                },
-                operation: null,
-                dialogShow: false,
-                loading: false,
-            }
-        },
-        computed: {
-            ...mapGetters('map', [
-                'map'
-            ]),
-            show() {
-                return this.dialogShow && !this.$store.state.menuOperation.break;
-            },
-            domIdCancel() {
-                return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-            },
-            domIdConfirm() {
-                return this.dialogShow ? OperationEvent.Train.delTrainId.menu.domId : '';
-            },
-            domIdTrainNumber() {
-                return this.dialogShow ? OperationEvent.Train.delTrainId.trainNumberChange.domId : '';
-            },
-            title() {
-                return '删除列车识别号'
-            }
-        },
-        mounted() {
-            this.$nextTick(() => {
-                this.$store.dispatch('training/tipReload');
-            })
-        },
-        methods: {
-            loadInitData(map) {
-                if (map) {
-                    getPublishMapTrainNos(map.skinCode).then(response => {
-                        this.trainNoList = response.data;
-                    }).catch(error => {
-                        this.$messageBox(`获取列车车组号失败`);
-                    });
-                }
-            },
-            doShow(operate, selected) {
-                //如果不是断点激活，则需要对初始值进行初始化
-                if (!this.dialogShow) {
-                    this.operation = operate.operation;
-                }
-                this.dialogShow = true;
-                this.$nextTick(function () {
-                    this.$store.dispatch('training/emitTipFresh');
-                });
-            },
-            doClose() {
-                this.loading = false;
-                this.dialogShow = false;
-                this.$store.dispatch('training/emitTipFresh');
-                this.$store.dispatch('map/setTrainWindowShow', false);
-            },
-            trainNumberChange() {
-                let operate = {
-                    type: MapDeviceType.Train.type,
-                    val: `${trainNumber}`,
-                    operation: OperationEvent.Train.delTrainId.trainNumberChange.operation
-                }
+			rules: {
+				trainNumber: [
+					{ required: true, message: '请输入车组号', trigger: 'blur' }
+				]
+			},
+			operation: null,
+			dialogShow: false,
+			loading: false
+		};
+	},
+	computed: {
+		...mapGetters('map', [
+			'map'
+		]),
+		show() {
+			return this.dialogShow && !this.$store.state.menuOperation.break;
+		},
+		domIdCancel() {
+			return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+		},
+		domIdConfirm() {
+			return this.dialogShow ? OperationEvent.Train.delTrainId.menu.domId : '';
+		},
+		domIdTrainNumber() {
+			return this.dialogShow ? OperationEvent.Train.delTrainId.trainNumberChange.domId : '';
+		},
+		title() {
+			return '删除列车识别号';
+		}
+	},
+	mounted() {
+		this.$nextTick(() => {
+			this.$store.dispatch('training/tipReload');
+		});
+	},
+	methods: {
+		loadInitData(map) {
+			if (map) {
+				// getPublishMapTrainNos(map.skinCode).then(response => {
+				// 	this.trainNoList = response.data;
+				// }).catch(() => {
+				// 	this.$messageBox(`获取列车车组号失败`);
+				// });
+			}
+		},
+		doShow(operate, selected) {
+			// 如果不是断点激活，则需要对初始值进行初始化
+			if (!this.dialogShow) {
+				this.operation = operate.operation;
+			}
+			this.dialogShow = true;
+			this.$nextTick(function () {
+				this.$store.dispatch('training/emitTipFresh');
+			});
+		},
+		doClose() {
+			this.loading = false;
+			this.dialogShow = false;
+			this.$store.dispatch('training/emitTipFresh');
+			this.$store.dispatch('map/setTrainWindowShow', false);
+		},
+		trainNumberChange() {
+			const operate = {
+				type: MapDeviceType.Train.type,
+				val: `${this.formModel.trainNumber}`,
+				operation: OperationEvent.Train.delTrainId.trainNumberChange.operation
+			};
 
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    }
-                })
-            },
-            commit() {
-                this.$refs['form'].validate((valid) => {
-                    if (valid) {
-                        let operate = {
-                            send: true,
-                            type: MapDeviceType.Train.type,
-                            operation: OperationEvent.Train.delTrainId.menu.operation,
-                            val: this.formModel.trainNumber
-                        }
+			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+				if (valid) {
+					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+				}
+			});
+		},
+		commit() {
+			this.$refs['form'].validate((valid) => {
+				if (valid) {
+					const operate = {
+						send: true,
+						type: MapDeviceType.Train.type,
+						operation: OperationEvent.Train.delTrainId.menu.operation,
+						val: this.formModel.trainNumber
+					};
 
-                        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();
+						this.$refs.noticeInfo.doShow(operate);
+					});
+				} else {
+					return false;
+				}
+			});
+		},
+		cancel() {
+			const operate = {
+				type: MapDeviceType.Train.type,
+				operation: OperationEvent.Command.cancel.menu.operation
+			};
 
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.doClose();
-                    }
-                }).catch(error => { this.doClose(); });
-            }
-        }
-    }
-</script>
\ 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/batong_01/menus/menuTrain.vue b/src/jmap/theme/batong_01/menus/menuTrain.vue
index eadcd4d12..05a582a36 100644
--- a/src/jmap/theme/batong_01/menus/menuTrain.vue
+++ b/src/jmap/theme/batong_01/menus/menuTrain.vue
@@ -1,318 +1,321 @@
 <template>
-    <div>
-        <pop-menu ref="popMenu" :menu="menu"></pop-menu>
-        <notice-info ref="noticeInfo"></notice-info>
-        <train-control ref="trainControl"></train-control>
-        <train-delete ref="trainDelete"></train-delete>
-        <train-move ref="trainMove"></train-move>
-        <train-switch ref="trainSwitch"></train-switch>
-        <train-edit-number ref="trainEditNumber"></train-edit-number>
-    </div>
+  <div>
+    <pop-menu ref="popMenu" :menu="menu" />
+    <notice-info ref="noticeInfo" />
+    <train-control ref="trainControl" />
+    <train-delete ref="trainDelete" />
+    <train-move ref="trainMove" />
+    <train-switch ref="trainSwitch" />
+    <train-edit-number ref="trainEditNumber" />
+  </div>
 </template>
 
 <script>
-    import PopMenu from '@/components/PopMenu';
-    import NoticeInfo from './dialog/childDialog/childDialog/noticeInfo'
-    import { mapGetters } from 'vuex';
-    import { TrainingMode, OperateMode } from '@/scripts/ConstDic';
-    import { MapDeviceType, OperationEvent, DeviceMenu } from '@/scripts/ConstDic';
-    import { MenuDisabledState, menuConvert, trainMenuFiltration } from './utils/menuItemStatus';
-    import TrainControl from './dialog/trainControl';
-    import TrainDelete from './dialog/trainDelete';
-    import TrainMove from './dialog/trainMove';
-    import TrainSwitch from './dialog/trainSwitch';
-    import TrainEditNumber from './dialog/trainEditNumber';
+import PopMenu from '@/components/PopMenu';
+import NoticeInfo from './dialog/childDialog/childDialog/noticeInfo';
+import { mapGetters } from 'vuex';
+import { OperateMode } from '@/scripts/ConstDic';
+import { MapDeviceType, OperationEvent, DeviceMenu } from '@/scripts/ConstDic';
+import { MenuDisabledState, menuConvert, trainMenuFiltration } from './utils/menuItemStatus';
+import TrainControl from './dialog/trainControl';
+import TrainDelete from './dialog/trainDelete';
+import TrainMove from './dialog/trainMove';
+import TrainSwitch from './dialog/trainSwitch';
+import TrainEditNumber from './dialog/trainEditNumber';
 
-    export default {
-        name: 'menuTrain',
-        props: {
-            selected: {
-                type: Object
-            }
-        },
-        components: {
-            PopMenu,
-            NoticeInfo,
-            TrainControl,
-            TrainDelete,
-            TrainMove,
-            TrainSwitch,
-            TrainEditNumber
-        },
-        data() {
-            return {
-                menu: [],
-                menuNormal: {
-                    local: [],
-                    central: [
-                        {
-                            label: '添加列车识别号',
-                            handler: this.addTrainId,
-                            disabledCallback: MenuDisabledState.Train.addTrainId,
-                            auth: { station: true, center: true }
-                        },
-                        {
-                            label: '删除列车识别号',
-                            handler: this.delTrainId,
-                            disabledCallback: MenuDisabledState.Train.delTrainId,
-                            auth: { station: true, center: true }
-                        },
-                        {
-                            label: '修改列车识别号',
-                            handler: this.editTrainId,
-                            disabledCallback: MenuDisabledState.Train.editTrainId,
-                            auth: { station: true, center: true }
-                        },
-                        {
-                            label: '修改车组号',
-                            handler: this.editTrainNo,
-                            disabledCallback: MenuDisabledState.Train.editTrainNo,
-                            auth: { station: true, center: true }
-                        },
-                        {
-                            label: '移动列车识别号',
-                            handler: this.moveTrainId,
-                            disabledCallback: MenuDisabledState.Train.moveTrainId,
-                            auth: { station: true, center: true }
-                        },
-                        {
-                            label: '交换列车识别号',
-                            handler: this.switchTrainId,
-                            disabledCallback: MenuDisabledState.Train.switchTrainId,
-                            auth: { station: true, center: true }
-                        }
-                    ]
-                },
-                menuForce: [
-                    {
-                        label: '设置通信故障',
-                        handler: this.setStoppage,
-                        disabledCallback: MenuDisabledState.Train.setStoppage
-                    },
-                    {
-                        label: '取消通信故障',
-                        handler: this.cancelStoppage,
-                        disabledCallback: MenuDisabledState.Train.cancelStoppage
-                    }
-                ],
-                menuSpeed: [
-                    {
-                        label: '确认运行至前方站',
-                        handler: this.limitSpeed,
-                        disabledCallback: MenuDisabledState.Train.limitSpeed
-                    }
-                ]
-            }
-        },
-        watch: {
-            '$store.state.menuOperation.menuCount': function () {
-                if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.Train) && !this.buttonOperation) {
-                    this.doShow(this.$store.state.menuOperation.menuPosition);
-                } else {
-                    this.doClose();
-                }
-            }
-        },
-        computed: {
-            ...mapGetters('training', [
-                'mode',
-                'operatemode'
-            ]),
-            ...mapGetters('menuOperation', [
-                'buttonOperation'
-            ])
-        },
-        methods: {
-            clickEvent() {
-                let self = this;
-                window.onclick = function (e) {
-                    self.doClose();
-                }
-            },
-            initMenu() {
-                //编辑模式菜单列表
-                this.menu = trainMenuFiltration(this.menuNormal);
-                if (this.operatemode === OperateMode.ADMIN) {
-                    this.menu = [...this.menu, ...this.menuForce, ...this.menuSpeed]
-                }
+export default {
+	name: 'MenuTrain',
+	components: {
+		PopMenu,
+		NoticeInfo,
+		TrainControl,
+		TrainDelete,
+		TrainMove,
+		TrainSwitch,
+		TrainEditNumber
+	},
+	props: {
+		selected: {
+			type: Object,
+			default() {
+				return null;
+			}
+		}
+	},
+	data() {
+		return {
+			menu: [],
+			menuNormal: {
+				local: [],
+				central: [
+					{
+						label: '添加列车识别号',
+						handler: this.addTrainId,
+						disabledCallback: MenuDisabledState.Train.addTrainId,
+						auth: { station: true, center: true }
+					},
+					{
+						label: '删除列车识别号',
+						handler: this.delTrainId,
+						disabledCallback: MenuDisabledState.Train.delTrainId,
+						auth: { station: true, center: true }
+					},
+					{
+						label: '修改列车识别号',
+						handler: this.editTrainId,
+						disabledCallback: MenuDisabledState.Train.editTrainId,
+						auth: { station: true, center: true }
+					},
+					{
+						label: '修改车组号',
+						handler: this.editTrainNo,
+						disabledCallback: MenuDisabledState.Train.editTrainNo,
+						auth: { station: true, center: true }
+					},
+					{
+						label: '移动列车识别号',
+						handler: this.moveTrainId,
+						disabledCallback: MenuDisabledState.Train.moveTrainId,
+						auth: { station: true, center: true }
+					},
+					{
+						label: '交换列车识别号',
+						handler: this.switchTrainId,
+						disabledCallback: MenuDisabledState.Train.switchTrainId,
+						auth: { station: true, center: true }
+					}
+				]
+			},
+			menuForce: [
+				{
+					label: '设置通信故障',
+					handler: this.setStoppage,
+					disabledCallback: MenuDisabledState.Train.setStoppage
+				},
+				{
+					label: '取消通信故障',
+					handler: this.cancelStoppage,
+					disabledCallback: MenuDisabledState.Train.cancelStoppage
+				}
+			],
+			menuSpeed: [
+				{
+					label: '确认运行至前方站',
+					handler: this.limitSpeed,
+					disabledCallback: MenuDisabledState.Train.limitSpeed
+				}
+			]
+		};
+	},
+	computed: {
+		...mapGetters('training', [
+			'mode',
+			'operatemode'
+		]),
+		...mapGetters('menuOperation', [
+			'buttonOperation'
+		])
+	},
+	watch: {
+		'$store.state.menuOperation.menuCount': function () {
+			if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.Train) && !this.buttonOperation) {
+				this.doShow(this.$store.state.menuOperation.menuPosition);
+			} else {
+				this.doClose();
+			}
+		}
+	},
+	methods: {
+		clickEvent() {
+			const self = this;
+			window.onclick = function (e) {
+				self.doClose();
+			};
+		},
+		initMenu() {
+			// 编辑模式菜单列表
+			this.menu = trainMenuFiltration(this.menuNormal);
+			if (this.operatemode === OperateMode.ADMIN) {
+				this.menu = [...this.menu, ...this.menuForce, ...this.menuSpeed];
+			}
 
-                //故障模式菜单列表
-                if (this.operatemode === OperateMode.FAULT) {
-                    this.menu = [...this.menuForce, ...this.menuSpeed]
-                }
+			// 故障模式菜单列表
+			if (this.operatemode === OperateMode.FAULT) {
+				this.menu = [...this.menuForce, ...this.menuSpeed];
+			}
 
-                this.menu = menuConvert(this.menu);
-            },
-            doShow(point) {
-                this.clickEvent();
-                this.initMenu();
+			this.menu = menuConvert(this.menu);
+		},
+		doShow(point) {
+			this.clickEvent();
+			this.initMenu();
 
-                if (this.$refs && this.$refs.popMenu && this.menu && this.menu.length) {
-                    this.$refs.popMenu.resetShowPosition(point);
-                }
-            },
-            doClose() {
-                if (this.$refs && this.$refs.popMenu) {
-                    this.$refs.popMenu.close();
-                    // this.$store.dispatch('map/setTrainWindowShow', false);
-                }
-            },
-            //设置故障
-            setStoppage() {
-                let operate = {
-                    start: true,
-                    send: true,
-                    code: this.selected.code,
-                    type: MapDeviceType.Train.type,
-                    label: MapDeviceType.Train.label,
-                    operation: OperationEvent.Train.stoppage.menu.operation
-                };
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    } else {
-                        this.$refs.noticeInfo.doShow(operate);
-                    }
-                }).catch(error => {
-                    this.$refs.noticeInfo.doShow(operate);
-                })
-            },
-            //取消故障
-            cancelStoppage() {
-                let operate = {
-                    start: true,
-                    send: true,
-                    code: this.selected.code,
-                    type: MapDeviceType.Train.type,
-                    label: MapDeviceType.Train.label,
-                    operation: OperationEvent.Train.cancelStoppage.menu.operation
-                };
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    } else {
-                        this.$refs.noticeInfo.doShow(operate);
-                    }
-                }).catch(error => {
-                    this.$refs.noticeInfo.doShow(operate);
-                })
-            },
-            //限速行驶
-            limitSpeed() {
-                let operate = {
-                    start: true,
-                    send: true,
-                    code: this.selected.code,
-                    type: MapDeviceType.Train.type,
-                    label: MapDeviceType.Train.label,
-                    operation: OperationEvent.Train.limitSpeed.menu.operation
-                };
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    } else {
-                        this.$refs.noticeInfo.doShow(operate);
-                    }
-                }).catch(error => {
-                    this.$refs.noticeInfo.doShow(operate);
-                })
-            },
-            //添加列车识别号
-            addTrainId() {
-                let operate = {
-                    start: true,
-                    code: this.selected.code,
-                    type: MapDeviceType.Train.type,
-                    label: MapDeviceType.Train.label,
-                    operation: OperationEvent.Train.addTrainId.menu.operation
-                };
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                        this.$refs.trainControl.doShow(operate, this.selected);
-                    }
-                });
-            },
-            //删除列车识别号
-            delTrainId() {
-                let operate = {
-                    start: true,
-                    code: this.selected.code,
-                    type: MapDeviceType.Train.type,
-                    label: MapDeviceType.Train.label,
-                    operation: OperationEvent.Train.delTrainId.menu.operation
-                };
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                        this.$refs.trainDelete.doShow(operate, this.selected);
-                    }
-                });
-            },
-            //修改列车识别号
-            editTrainId() {
-                let operate = {
-                    start: true,
-                    code: this.selected.code,
-                    type: MapDeviceType.Train.type,
-                    label: MapDeviceType.Train.label,
-                    operation: OperationEvent.Train.editTrainId.menu.operation
-                };
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                        this.$refs.trainControl.doShow(operate, this.selected);
-                    }
-                });
-            },
-            //修改车组号
-            editTrainNo() {
-                let operate = {
-                    start: true,
-                    code: this.selected.code,
-                    type: MapDeviceType.Train.type,
-                    label: MapDeviceType.Train.label,
-                    operation: OperationEvent.Train.editTrainNo.menu.operation
-                };
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                        this.$refs.trainEditNumber.doShow(operate, this.selected);
-                    }
-                });
-            },
-            //移动列车识别号
-            moveTrainId() {
-                let operate = {
-                    start: true,
-                    code: this.selected.code,
-                    type: MapDeviceType.Train.type,
-                    label: MapDeviceType.Train.label,
-                    operation: OperationEvent.Train.moveTrainId.menu.operation
-                };
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                        this.$refs.trainMove.doShow(operate, this.selected);
-                    }
-                });
-            },
-            //交换列车识别号
-            switchTrainId() {
-                let operate = {
-                    start: true,
-                    code: this.selected.code,
-                    type: MapDeviceType.Train.type,
-                    label: MapDeviceType.Train.label,
-                    operation: OperationEvent.Train.switchTrainId.menu.operation
-                };
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                        this.$refs.trainSwitch.doShow(operate, this.selected);
-                    }
-                });
-            }
-        }
-    }
-</script>
\ No newline at end of file
+			if (this.$refs && this.$refs.popMenu && this.menu && this.menu.length) {
+				this.$refs.popMenu.resetShowPosition(point);
+			}
+		},
+		doClose() {
+			if (this.$refs && this.$refs.popMenu) {
+				this.$refs.popMenu.close();
+				// this.$store.dispatch('map/setTrainWindowShow', false);
+			}
+		},
+		// 设置故障
+		setStoppage() {
+			const operate = {
+				start: true,
+				send: true,
+				code: this.selected.code,
+				type: MapDeviceType.Train.type,
+				label: MapDeviceType.Train.label,
+				operation: OperationEvent.Train.stoppage.menu.operation
+			};
+			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+				if (valid) {
+					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+				} else {
+					this.$refs.noticeInfo.doShow(operate);
+				}
+			}).catch(() => {
+				this.$refs.noticeInfo.doShow(operate);
+			});
+		},
+		// 取消故障
+		cancelStoppage() {
+			const operate = {
+				start: true,
+				send: true,
+				code: this.selected.code,
+				type: MapDeviceType.Train.type,
+				label: MapDeviceType.Train.label,
+				operation: OperationEvent.Train.cancelStoppage.menu.operation
+			};
+			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+				if (valid) {
+					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+				} else {
+					this.$refs.noticeInfo.doShow(operate);
+				}
+			}).catch(() => {
+				this.$refs.noticeInfo.doShow(operate);
+			});
+		},
+		// 限速行驶
+		limitSpeed() {
+			const operate = {
+				start: true,
+				send: true,
+				code: this.selected.code,
+				type: MapDeviceType.Train.type,
+				label: MapDeviceType.Train.label,
+				operation: OperationEvent.Train.limitSpeed.menu.operation
+			};
+			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+				if (valid) {
+					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+				} else {
+					this.$refs.noticeInfo.doShow(operate);
+				}
+			}).catch(() => {
+				this.$refs.noticeInfo.doShow(operate);
+			});
+		},
+		// 添加列车识别号
+		addTrainId() {
+			const operate = {
+				start: true,
+				code: this.selected.code,
+				type: MapDeviceType.Train.type,
+				label: MapDeviceType.Train.label,
+				operation: OperationEvent.Train.addTrainId.menu.operation
+			};
+			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+				if (valid) {
+					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+					this.$refs.trainControl.doShow(operate, this.selected);
+				}
+			});
+		},
+		// 删除列车识别号
+		delTrainId() {
+			const operate = {
+				start: true,
+				code: this.selected.code,
+				type: MapDeviceType.Train.type,
+				label: MapDeviceType.Train.label,
+				operation: OperationEvent.Train.delTrainId.menu.operation
+			};
+			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+				if (valid) {
+					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+					this.$refs.trainDelete.doShow(operate, this.selected);
+				}
+			});
+		},
+		// 修改列车识别号
+		editTrainId() {
+			const operate = {
+				start: true,
+				code: this.selected.code,
+				type: MapDeviceType.Train.type,
+				label: MapDeviceType.Train.label,
+				operation: OperationEvent.Train.editTrainId.menu.operation
+			};
+			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+				if (valid) {
+					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+					this.$refs.trainControl.doShow(operate, this.selected);
+				}
+			});
+		},
+		// 修改车组号
+		editTrainNo() {
+			const operate = {
+				start: true,
+				code: this.selected.code,
+				type: MapDeviceType.Train.type,
+				label: MapDeviceType.Train.label,
+				operation: OperationEvent.Train.editTrainNo.menu.operation
+			};
+			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+				if (valid) {
+					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+					this.$refs.trainEditNumber.doShow(operate, this.selected);
+				}
+			});
+		},
+		// 移动列车识别号
+		moveTrainId() {
+			const operate = {
+				start: true,
+				code: this.selected.code,
+				type: MapDeviceType.Train.type,
+				label: MapDeviceType.Train.label,
+				operation: OperationEvent.Train.moveTrainId.menu.operation
+			};
+			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+				if (valid) {
+					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+					this.$refs.trainMove.doShow(operate, this.selected);
+				}
+			});
+		},
+		// 交换列车识别号
+		switchTrainId() {
+			const operate = {
+				start: true,
+				code: this.selected.code,
+				type: MapDeviceType.Train.type,
+				label: MapDeviceType.Train.label,
+				operation: OperationEvent.Train.switchTrainId.menu.operation
+			};
+			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+				if (valid) {
+					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+					this.$refs.trainSwitch.doShow(operate, this.selected);
+				}
+			});
+		}
+	}
+};
+</script>
diff --git a/src/jmap/theme/beijing_01/menus/dialog/trainDelete.vue b/src/jmap/theme/beijing_01/menus/dialog/trainDelete.vue
index 70225067f..155e29ee3 100644
--- a/src/jmap/theme/beijing_01/menus/dialog/trainDelete.vue
+++ b/src/jmap/theme/beijing_01/menus/dialog/trainDelete.vue
@@ -1,160 +1,169 @@
 <template>
-    <el-dialog class="beijing-01__systerm stand-stop-time" :title="title" :visible.sync="show" width="320px"
-        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
-        <el-form size="small" label-width="90px" :model="addModel" :rules="rules" ref="form">
-            <el-form-item label="车 组 号:" prop="groupNumber">
-                <el-input v-model="addModel.groupNumber" @change="inputGroupNumber" :id="domIdInput"></el-input>
-            </el-form-item>
-        </el-form>
-        <el-row justify="center" class="button-group">
-            <el-col :span="10" :offset="2">
-                <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
-            </el-col>
-            <el-col :span="8" :offset="4">
-                <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
-            </el-col>
-        </el-row>
-        <confirm-control ref="confirmControl"></confirm-control>
-        <notice-info ref="noticeInfo"></notice-info>
-    </el-dialog>
+  <el-dialog
+    v-dialogDrag
+    class="beijing-01__systerm stand-stop-time"
+    :title="title"
+    :visible.sync="show"
+    width="320px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <el-form ref="form" size="small" label-width="90px" :model="addModel" :rules="rules">
+      <el-form-item label="车 组 号:" prop="groupNumber">
+        <el-input :id="domIdInput" v-model="addModel.groupNumber" @change="inputGroupNumber" />
+      </el-form-item>
+    </el-form>
+    <el-row justify="center" class="button-group">
+      <el-col :span="10" :offset="2">
+        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</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>
 </template>
 
 <script>
-    import { mapGetters } from 'vuex';
-    import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
-    import { getPublishMapTrainNos } from '@/api/runplan';
-    import { mouseCancelState } from '../utils/menuItemStatus';
-    import ConfirmControl from './childDialog/confirmControl';
-    import NoticeInfo from './childDialog/childDialog/noticeInfo'
+import { mapGetters } from 'vuex';
+import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+// import { getPublishMapTrainNos } from '@/api/runplan';
+import { mouseCancelState } from '../utils/menuItemStatus';
+import ConfirmControl from './childDialog/confirmControl';
+import NoticeInfo from './childDialog/childDialog/noticeInfo';
 
-    export default {
-        name: 'TrainDelete',
-        components: {
-            ConfirmControl,
-            NoticeInfo
-        },
-        data() {
-            return {
-                trainNoList: [],
-                selected: null,
-                addModel: {
-                    groupNumber: '',
-                },
+export default {
+	name: 'TrainDelete',
+	components: {
+		ConfirmControl,
+		NoticeInfo
+	},
+	data() {
+		return {
+			trainNoList: [],
+			selected: null,
+			addModel: {
+				groupNumber: ''
+			},
 
-                rules: {
-                    groupNumber: [
-                        { required: true, message: '请输入车组号', trigger: 'blur' }
-                    ],
-                },
-                operation: null,
-                dialogShow: false,
-                loading: false,
-            }
-        },
-        computed: {
-            ...mapGetters('map', [
-                'map'
-            ]),
-            show() {
-                return this.dialogShow && !this.$store.state.menuOperation.break;
-            },
-            domIdInput() {
-                return this.dialogShow ? OperationEvent.Train.delTrainId.input.domId : '';
-            },
-            domIdCancel() {
-                return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-            },
-            domIdConfirm() {
-                return this.dialogShow ? OperationEvent.Train.delTrainId.menu.domId : '';
-            },
-            title() {
-                return '删除车组号'
-            }
-        },
-        mounted() {
-            this.$nextTick(() => {
-                this.$store.dispatch('training/tipReload');
-            })
-        },
-        methods: {
-            loadInitData(map) {
-                if (map) {
-                    getPublishMapTrainNos(map.skinCode).then(response => {
-                        this.trainNoList = response.data;
-                    }).catch(error => {
-                        this.$messageBox(`获取列车车组号失败`);
-                    });
-                }
-            },
-            doShow(operate, selected) {
-                this.selected = selected;
-                //如果不是断点激活，则需要对初始值进行初始化
-                if (!this.dialogShow) {
-                    this.operation = operate.operation;
-                }
-                this.dialogShow = true;
-                this.$nextTick(function () {
-                    this.$store.dispatch('training/emitTipFresh');
-                });
-            },
-            doClose() {
-                this.loading = false;
-                this.dialogShow = false;
-                this.$store.dispatch('training/emitTipFresh');
-                this.$store.dispatch('map/setTrainWindowShow', false);
-                mouseCancelState(this.selected);
-            },
-            inputGroupNumber() {
-                let operate = {
-                    type: MapDeviceType.Train.type,
-                    operation: OperationEvent.Train.delTrainId.input.operation,
-                    val: this.addModel.groupNumber
-                }
+			rules: {
+				groupNumber: [
+					{ required: true, message: '请输入车组号', trigger: 'blur' }
+				]
+			},
+			operation: null,
+			dialogShow: false,
+			loading: false
+		};
+	},
+	computed: {
+		...mapGetters('map', [
+			'map'
+		]),
+		show() {
+			return this.dialogShow && !this.$store.state.menuOperation.break;
+		},
+		domIdInput() {
+			return this.dialogShow ? OperationEvent.Train.delTrainId.input.domId : '';
+		},
+		domIdCancel() {
+			return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+		},
+		domIdConfirm() {
+			return this.dialogShow ? OperationEvent.Train.delTrainId.menu.domId : '';
+		},
+		title() {
+			return '删除车组号';
+		}
+	},
+	mounted() {
+		this.$nextTick(() => {
+			this.$store.dispatch('training/tipReload');
+		});
+	},
+	methods: {
+		loadInitData(map) {
+			if (map) {
+				// getPublishMapTrainNos(map.skinCode).then(response => {
+				// 	this.trainNoList = response.data;
+				// }).catch(() => {
+				// 	this.$messageBox(`获取列车车组号失败`);
+				// });
+			}
+		},
+		doShow(operate, selected) {
+			this.selected = selected;
+			// 如果不是断点激活，则需要对初始值进行初始化
+			if (!this.dialogShow) {
+				this.operation = operate.operation;
+			}
+			this.dialogShow = true;
+			this.$nextTick(function () {
+				this.$store.dispatch('training/emitTipFresh');
+			});
+		},
+		doClose() {
+			this.loading = false;
+			this.dialogShow = false;
+			this.$store.dispatch('training/emitTipFresh');
+			this.$store.dispatch('map/setTrainWindowShow', false);
+			mouseCancelState(this.selected);
+		},
+		inputGroupNumber() {
+			const operate = {
+				type: MapDeviceType.Train.type,
+				operation: OperationEvent.Train.delTrainId.input.operation,
+				val: this.addModel.groupNumber
+			};
 
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    }
-                })
-            },
-            commit() {
-                this.$refs['form'].validate((valid) => {
-                    if (valid) {
-                        let operate = {
-                            send: true,
-                            type: MapDeviceType.Train.type,
-                            operation: OperationEvent.Train.delTrainId.menu.operation,
-                            val: this.addModel.groupNumber
-                        }
+			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+				if (valid) {
+					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+				}
+			});
+		},
+		commit() {
+			this.$refs['form'].validate((valid) => {
+				if (valid) {
+					const operate = {
+						send: true,
+						type: MapDeviceType.Train.type,
+						operation: OperationEvent.Train.delTrainId.menu.operation,
+						val: this.addModel.groupNumber
+					};
 
-                        this.loading = true;
-                        this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                            this.loading = false;
-                            if (valid) {
-                                this.doClose();
-                            }
-                        }).catch(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();
+						this.$refs.noticeInfo.doShow(operate);
+					});
+				} else {
+					return false;
+				}
+			});
+		},
+		cancel() {
+			const operate = {
+				type: MapDeviceType.Train.type,
+				operation: OperationEvent.Command.cancel.menu.operation
+			};
 
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.doClose();
-                    }
-                }).catch(error => { this.doClose(); });
-            }
-        }
-    }
-</script>
\ 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/beijing_01/menus/menuTrain.vue b/src/jmap/theme/beijing_01/menus/menuTrain.vue
index 03cd655b6..a37eb1d68 100644
--- a/src/jmap/theme/beijing_01/menus/menuTrain.vue
+++ b/src/jmap/theme/beijing_01/menus/menuTrain.vue
@@ -279,15 +279,6 @@ export default {
 			]
 		};
 	},
-	watch: {
-		'$store.state.menuOperation.menuCount': function () {
-			if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.Train) && !this.buttonOperation) {
-				this.doShow(this.$store.state.menuOperation.menuPosition);
-			} else {
-				this.doClose();
-			}
-		}
-	},
 	computed: {
 		...mapGetters('training', [
 			'mode',
@@ -297,6 +288,15 @@ export default {
 			'buttonOperation'
 		])
 	},
+	watch: {
+		'$store.state.menuOperation.menuCount': function () {
+			if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.Train) && !this.buttonOperation) {
+				this.doShow(this.$store.state.menuOperation.menuPosition);
+			} else {
+				this.doClose();
+			}
+		}
+	},
 	methods: {
 		clickEvent() {
 			const self = this;
diff --git a/src/jmap/theme/beijing_01/menusPlan/addTask.vue b/src/jmap/theme/beijing_01/menusPlan/addTask.vue
index 10a8fd228..009c19f02 100644
--- a/src/jmap/theme/beijing_01/menusPlan/addTask.vue
+++ b/src/jmap/theme/beijing_01/menusPlan/addTask.vue
@@ -1,150 +1,162 @@
 <template>
-    <el-dialog class="beijing-01__schedule add-task" :title="title" :visible.sync="dialogShow" width="800px"
-        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
-        <div style="margin: 10px">
-            <el-row>
-                <el-col :span="3">
-                    <el-radio v-model="model.type" label="1">加在最前</el-radio>
-                </el-col>
-                <el-col :span="2" :offset="1">
-                    <span>车次号：</span>
-                </el-col>
-                <el-col :span="5">
-                    <el-select v-model="model.tripNumber" placeholder="请选择">
-                        <el-option v-for="item in tripNumberList" :key="item.value" :label="item.label"
-                            :value="item.value">
-                        </el-option>
-                    </el-select>
-                </el-col>
-                <el-col :span="3" :offset="1">
-                    <span>开始时间：</span>
-                </el-col>
-                <el-col :span="5">
-                    <el-select v-model="model.startTime" placeholder="请选择">
-                        <el-option v-for="item in tripNumberList" :key="item.value" :label="item.label"
-                            :value="item.value">
-                        </el-option>
-                    </el-select>
-                </el-col>
-            </el-row>
-            <el-row>
-                <el-col :span="3">
-                    <el-radio v-model="model.type" label="2">加在最后</el-radio>
-                </el-col>
-                <el-col :span="2" :offset="1">
-                    <span>车次号：</span>
-                </el-col>
-                <el-col :span="5">
-                    <el-select v-model="model.tripNumber" placeholder="请选择">
-                        <el-option v-for="item in tripNumberList" :key="item.value" :label="item.label"
-                            :value="item.value">
-                        </el-option>
-                    </el-select>
-                </el-col>
-                <el-col :span="3" :offset="1">
-                    <span>开始时间：</span>
-                </el-col>
-                <el-col :span="5">
-                    <el-select v-model="model.startTime" placeholder="请选择">
-                        <el-option v-for="item in tripNumberList" :key="item.value" :label="item.label"
-                            :value="item.value">
-                        </el-option>
-                    </el-select>
-                </el-col>
+  <el-dialog
+    v-dialogDrag
+    class="beijing-01__schedule add-task"
+    :title="title"
+    :visible.sync="dialogShow"
+    width="800px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <div style="margin: 10px">
+      <el-row>
+        <el-col :span="3">
+          <el-radio v-model="model.type" label="1">加在最前</el-radio>
+        </el-col>
+        <el-col :span="2" :offset="1">
+          <span>车次号：</span>
+        </el-col>
+        <el-col :span="5">
+          <el-select v-model="model.tripNumber" placeholder="请选择">
+            <el-option
+              v-for="item in tripNumberList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-col>
+        <el-col :span="3" :offset="1">
+          <span>开始时间：</span>
+        </el-col>
+        <el-col :span="5">
+          <el-select v-model="model.startTime" placeholder="请选择">
+            <el-option
+              v-for="item in tripNumberList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="3">
+          <el-radio v-model="model.type" label="2">加在最后</el-radio>
+        </el-col>
+        <el-col :span="2" :offset="1">
+          <span>车次号：</span>
+        </el-col>
+        <el-col :span="5">
+          <el-select v-model="model.tripNumber" placeholder="请选择">
+            <el-option
+              v-for="item in tripNumberList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-col>
+        <el-col :span="3" :offset="1">
+          <span>开始时间：</span>
+        </el-col>
+        <el-col :span="5">
+          <el-select v-model="model.startTime" placeholder="请选择">
+            <el-option
+              v-for="item in tripNumberList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-col>
 
-            </el-row>
-            <el-row style="margin-bottom: 5px;">
-                交路：
-            </el-row>
-            <el-row>
-                <el-table :data="model.route" border :height="180">
-                    <el-table-column prop="date" label="日期" width="180">
-                    </el-table-column>
-                    <el-table-column prop="name" label="姓名" width="180">
-                    </el-table-column>
-                    <el-table-column prop="address" label="地址">
-                    </el-table-column>
-                    <el-table-column width="20">
-                    </el-table-column>
-                </el-table>
-            </el-row>
-            <el-row style=" margin-bottom: 5px;margin-top: 10px;">
-                详情：
-            </el-row>
-            <el-row>
-                <el-table :data="model.detail" border :height="180">
-                    <el-table-column prop="date" label="日期" width="180">
-                    </el-table-column>
-                    <el-table-column prop="name" label="姓名" width="180">
-                    </el-table-column>
-                    <el-table-column prop="address" label="地址">
-                    </el-table-column>
-                    <el-table-column width="20">
-                    </el-table-column>
-                </el-table>
-            </el-row>
-            <el-row>
-                <el-col :offset="16">
-                    <el-checkbox v-model="model.default">显示默认停站时间和运行等级</el-checkbox>
-                </el-col>
-            </el-row>
-        </div>
-        <el-row type="flex" justify="center" class="button-group">
-            <el-button @click="handleCommit">确 定</el-button>
-            <el-button @click="doClose">取 消</el-button>
-        </el-row>
-    </el-dialog>
+      </el-row>
+      <el-row style="margin-bottom: 5px;">
+        交路：
+      </el-row>
+      <el-row>
+        <el-table :data="model.route" border :height="180">
+          <el-table-column prop="date" label="日期" width="180" />
+          <el-table-column prop="name" label="姓名" width="180" />
+          <el-table-column prop="address" label="地址" />
+          <el-table-column width="20" />
+        </el-table>
+      </el-row>
+      <el-row style=" margin-bottom: 5px;margin-top: 10px;">
+        详情：
+      </el-row>
+      <el-row>
+        <el-table :data="model.detail" border :height="180">
+          <el-table-column prop="date" label="日期" width="180" />
+          <el-table-column prop="name" label="姓名" width="180" />
+          <el-table-column prop="address" label="地址" />
+          <el-table-column width="20" />
+        </el-table>
+      </el-row>
+      <el-row>
+        <el-col :offset="16">
+          <el-checkbox v-model="model.default">显示默认停站时间和运行等级</el-checkbox>
+        </el-col>
+      </el-row>
+    </div>
+    <el-row type="flex" justify="center" class="button-group">
+      <el-button @click="handleCommit">确 定</el-button>
+      <el-button @click="doClose">取 消</el-button>
+    </el-row>
+  </el-dialog>
 </template>
 
 <script>
 
-    export default {
-        name: 'AddTask',
-        components: {
-        },
-        data() {
-            return {
-                dialogShow: false,
-                loading: false,
-                model: {
-                    type: '1',
-                    serviceNumber: '',
-                    tripNumber: '',
-                    startTime: '',
-                    default: false,
-                    route: [],
-                    detail: []
-                },
-                tripNumberList: [],
-            }
-        },
-        computed: {
-            title() {
-                return '添加任务'
-            }
-        },
-        mounted() {
-        },
-        methods: {
-            doShow(params) {
-                this.model.serviceNumber = params.serviceNumber;
-                this.model.tripNumber = params.tripNumber;
-                this.dialogShow = true;
-            },
-            doClose() {
-                this.loading = false;
-                this.dialogShow = false;
-            },
-            handleCommit() {
-                this.doClose();
-            }
-        }
-    }
+export default {
+	name: 'AddTask',
+	components: {
+	},
+	data() {
+		return {
+			dialogShow: false,
+			loading: false,
+			model: {
+				type: '1',
+				serviceNumber: '',
+				tripNumber: '',
+				startTime: '',
+				default: false,
+				route: [],
+				detail: []
+			},
+			tripNumberList: []
+		};
+	},
+	computed: {
+		title() {
+			return '添加任务';
+		}
+	},
+	mounted() {
+	},
+	methods: {
+		doShow(params) {
+			this.model.serviceNumber = params.serviceNumber;
+			this.model.tripNumber = params.tripNumber;
+			this.dialogShow = true;
+		},
+		doClose() {
+			this.loading = false;
+			this.dialogShow = false;
+		},
+		handleCommit() {
+			this.doClose();
+		}
+	}
+};
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
     @import "src/styles/mixin.scss";
 
-
     /deep/ {
         .el-button {
             margin-left: 40px !important;
@@ -160,4 +172,4 @@
             line-height: 20px !important;
         }
     }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/jmap/theme/beijing_01/menusPlan/createTodayPlan.vue b/src/jmap/theme/beijing_01/menusPlan/createTodayPlan.vue
index af08e8157..f9b4ff067 100644
--- a/src/jmap/theme/beijing_01/menusPlan/createTodayPlan.vue
+++ b/src/jmap/theme/beijing_01/menusPlan/createTodayPlan.vue
@@ -18,9 +18,9 @@
 </template>
 
 <script>
-import { runPlanTemplateList, generateUserRunPlanEveryDay } from '@/api/runplan';
+import { runPlanTemplateList } from '@/api/runplan';
 import { getStationListBySkinCode } from '@/api/runplan';
-import { getEveryDayRunPlanData } from '@/api/simulation';
+import { getEveryDayRunPlanData, generateDayRunPlan } from '@/api/simulation';
 import { getSkinCodeList } from '@/api/management/mapskin';
 
 export default {
@@ -100,7 +100,7 @@ export default {
 				const choose = this.$refs.pageRules.currentChoose();
 				if (choose && choose.id) {
 					this.loading = true;
-					generateUserRunPlanEveryDay(choose.id, this.$route.query.group).then(response => {
+					generateDayRunPlan(choose.id, this.$route.query.group).then(response => {
 						this.loading = false;
 						this.reloadTable();
 						this.loadRunData();
diff --git a/src/jmap/theme/beijing_01/menusPlan/createWeekPlan.vue b/src/jmap/theme/beijing_01/menusPlan/createWeekPlan.vue
index c6f6f74b7..2eabc8044 100644
--- a/src/jmap/theme/beijing_01/menusPlan/createWeekPlan.vue
+++ b/src/jmap/theme/beijing_01/menusPlan/createWeekPlan.vue
@@ -1,116 +1,126 @@
 <template>
-    <el-dialog class="beijing-01__schedule create-week-plan" :title="title" :visible.sync="dialogShow" width="800px"
-        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
-        <el-row>
-            <el-form ref="form" :model="model" :rules="rules" label-width="140px" size="small">
-                <el-form-item label="运行图名称:" prop="planId">
-                    <el-row>
-                        <el-col :span="19">
-                            <el-input v-model="model.planName" :readonly="true"></el-input>
-                        </el-col>
-                        <el-col :span="4" :offset="1">
-                            <el-button @click="handleChoose">选择 </el-button>
-                        </el-col>
-                    </el-row>
-                </el-form-item>
-                <el-form-item label="计划日期范围:" prop="dateList">
-                    <el-row>
-                        <el-date-picker type="dates" v-model="model.dateList" :clearable="false" placeholder="选择一个或多个日期"
-                            value-format="yyyy-MM-dd">
-                        </el-date-picker>
-                    </el-row>
-                </el-form-item>
-            </el-form>
-        </el-row>
-        <el-row type="flex" justify="center" class="button-group">
-            <el-button @click="create">确 定</el-button>
-            <el-button @click="doClose">取 消</el-button>
-        </el-row>
-        <choose-template-plan ref="choose" @chooseConfirm="chooseConfirm"></choose-template-plan>
-    </el-dialog>
+  <el-dialog
+    v-dialogDrag
+    class="beijing-01__schedule create-week-plan"
+    :title="title"
+    :visible.sync="dialogShow"
+    width="800px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <el-row>
+      <el-form ref="form" :model="model" :rules="rules" label-width="140px" size="small">
+        <el-form-item label="运行图名称:" prop="planId">
+          <el-row>
+            <el-col :span="19">
+              <el-input v-model="model.planName" :readonly="true" />
+            </el-col>
+            <el-col :span="4" :offset="1">
+              <el-button @click="handleChoose">选择 </el-button>
+            </el-col>
+          </el-row>
+        </el-form-item>
+        <el-form-item label="计划日期范围:" prop="dateList">
+          <el-row>
+            <el-date-picker
+              v-model="model.dateList"
+              type="dates"
+              :clearable="false"
+              placeholder="选择一个或多个日期"
+              value-format="yyyy-MM-dd"
+            />
+          </el-row>
+        </el-form-item>
+      </el-form>
+    </el-row>
+    <el-row type="flex" justify="center" class="button-group">
+      <el-button @click="create">确 定</el-button>
+      <el-button @click="doClose">取 消</el-button>
+    </el-row>
+    <choose-template-plan ref="choose" @chooseConfirm="chooseConfirm" />
+  </el-dialog>
 </template>
 
 <script>
-    import { createRunPlanLoad } from '@/api/runplan';
-    import ChooseTemplatePlan from './chooseTemplatePlan';
+import { createRunPlanLoad } from '@/api/runplan';
+import ChooseTemplatePlan from './chooseTemplatePlan';
 
-    export default {
-        name: 'CreateWeekPlan',
-        components: {
-            ChooseTemplatePlan
-        },
-        data() {
-            return {
-                dialogShow: false,
-                loading: false,
-                model: {
-                    planId: '',
-                    planName: '',
-                    dateList: [],
-                }
-            }
-        },
-        computed: {
-            title() {
-                return '创建一周计划'
-            },
-            rules() {
-                let rules = {
-                    planId: [
-                        { required: true, message: '请选择模板运行图', trigger: 'blur' }
-                    ],
-                    dateList: [
-                        { required: true, message: '请选择计划日期范围', trigger: 'change' }
-                    ]
-                }
+export default {
+	name: 'CreateWeekPlan',
+	components: {
+		ChooseTemplatePlan
+	},
+	data() {
+		return {
+			dialogShow: false,
+			loading: false,
+			model: {
+				planId: '',
+				planName: '',
+				dateList: []
+			}
+		};
+	},
+	computed: {
+		title() {
+			return '创建一周计划';
+		},
+		rules() {
+			const rules = {
+				planId: [
+					{ required: true, message: '请选择模板运行图', trigger: 'blur' }
+				],
+				dateList: [
+					{ required: true, message: '请选择计划日期范围', trigger: 'change' }
+				]
+			};
 
-                return rules;
-            }
-        },
-        mounted() {
-        },
-        methods: {
-            doShow(params) {
-                this.dialogShow = true;
-            },
-            doClose() {
-                this.loading = false;
-                this.dialogShow = false;
-            },
-            handleChoose() {
-                this.$refs.choose.doShow();
-            },
-            chooseConfirm(choose) {
-                if (choose) {
-                    this.model.planId = choose.id;
-                    this.model.planName = choose.name;
-                }
-            },
-            buildModel() {
-                return this.model.dateList.map(date => {
-                    return {
-                        loadTime: date,
-                        mapId: this.$route.query.mapId,
-                        templatePlanId: this.model.planId
-                    }
-                });
-            },
-            create() {
-                this.$refs['form'].validate((valid) => {
-                    if (valid) {
-                        createRunPlanLoad(this.buildModel()).then(response => {
-                            this.$message.success('创建运行图计划成功');
-                            this.$emit('reloadTable', { name: 'managePlanList' });
-                            this.doClose();
-                        }).catch(error => {
-                            this.doClose();
-                            this.$messageBox('创建运行图计划失败');
-                        })
-                    }
-                });
-            }
-        }
-    }
+			return rules;
+		}
+	},
+	mounted() {
+	},
+	methods: {
+		doShow(params) {
+			this.dialogShow = true;
+		},
+		doClose() {
+			this.loading = false;
+			this.dialogShow = false;
+		},
+		handleChoose() {
+			this.$refs.choose.doShow();
+		},
+		chooseConfirm(choose) {
+			if (choose) {
+				this.model.planId = choose.id;
+				this.model.planName = choose.name;
+			}
+		},
+		buildModel() {
+			return {
+				planDateList: this.model.dateList,
+				mapId: this.$route.query.mapId,
+				templatePlanId: this.model.planId
+			};
+		},
+		create() {
+			this.$refs['form'].validate((valid) => {
+				if (valid) {
+					createRunPlanLoad(this.buildModel()).then(response => {
+						this.$message.success('创建运行图计划成功');
+						this.doClose();
+					}).catch(() => {
+						this.doClose();
+						this.$messageBox('创建运行图计划失败');
+					});
+				}
+			});
+		}
+	}
+};
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
     @import "src/styles/mixin.scss";
@@ -124,4 +134,4 @@
             margin: 10px;
         }
     }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/jmap/theme/beijing_01/menusPlan/deleteTask.vue b/src/jmap/theme/beijing_01/menusPlan/deleteTask.vue
index b661ed20e..cd79c305f 100644
--- a/src/jmap/theme/beijing_01/menusPlan/deleteTask.vue
+++ b/src/jmap/theme/beijing_01/menusPlan/deleteTask.vue
@@ -1,57 +1,66 @@
 <template>
-    <el-dialog class="beijing-01__schedule delete-task" :title="title" :visible.sync="dialogShow" width="400px"
-        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
-        <el-row>
-            <el-radio v-model="type" :label="1">删除以前所有任务（包含本任务）</el-radio>
-        </el-row>
-        <el-row>
-            <el-radio v-model="type" :label="2">删除以后所有任务（包含本任务）</el-radio>
-        </el-row>
-        <el-row type="flex" justify="center" class="button-group">
-            <el-button @click="handleCommit">确 定</el-button>
-            <el-button @click="doClose">取 消</el-button>
-        </el-row>
-    </el-dialog>
+  <el-dialog
+    v-dialogDrag
+    class="beijing-01__schedule delete-task"
+    :title="title"
+    :visible.sync="dialogShow"
+    width="400px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <el-row>
+      <el-radio v-model="type" :label="1">删除以前所有任务（包含本任务）</el-radio>
+    </el-row>
+    <el-row>
+      <el-radio v-model="type" :label="2">删除以后所有任务（包含本任务）</el-radio>
+    </el-row>
+    <el-row type="flex" justify="center" class="button-group">
+      <el-button @click="handleCommit">确 定</el-button>
+      <el-button @click="doClose">取 消</el-button>
+    </el-row>
+  </el-dialog>
 </template>
 
 <script>
 
-    export default {
-        name: 'DeleteTask',
-        components: {
-        },
-        data() {
-            return {
-                dialogShow: false,
-                loading: false,
-                tripNumber: '',
-                serviceNumber: '',
-                type: '1',
-            }
-        },
-        computed: {
-            title() {
-                return '删除任务'
-            }
-        },
-        mounted() {
-        },
-        methods: {
-            doShow(params) {
-                this.tripNumber = params.tripNumber;
-                this.serviceNumber = params.serviceNumber;
-                this.dialogShow = true;
-            },
-            doClose() {
-                this.loading = false;
-                this.dialogShow = false;
-            },
-            handleCommit() {
-                // this.tripNumber
-                this.doClose();
-            }
-        }
-    }
+export default {
+	name: 'DeleteTask',
+	components: {
+	},
+	data() {
+		return {
+			dialogShow: false,
+			loading: false,
+			tripNumber: '',
+			serviceNumber: '',
+			type: '1'
+		};
+	},
+	computed: {
+		title() {
+			return '删除任务';
+		}
+	},
+	mounted() {
+	},
+	methods: {
+		doShow(params) {
+			this.tripNumber = params.tripNumber;
+			this.serviceNumber = params.serviceNumber;
+			this.dialogShow = true;
+		},
+		doClose() {
+			this.loading = false;
+			this.dialogShow = false;
+		},
+		handleCommit() {
+			// this.tripNumber
+			this.doClose();
+		}
+	}
+};
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
     @import "src/styles/mixin.scss";
@@ -61,4 +70,4 @@
             margin: 10px;
         }
     }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/jmap/theme/beijing_01/menusPlan/deleteTodayPlan.vue b/src/jmap/theme/beijing_01/menusPlan/deleteTodayPlan.vue
index 284028f97..2e22a7c64 100644
--- a/src/jmap/theme/beijing_01/menusPlan/deleteTodayPlan.vue
+++ b/src/jmap/theme/beijing_01/menusPlan/deleteTodayPlan.vue
@@ -1,46 +1,55 @@
 <template>
-    <el-dialog class="beijing-01__schedule create-week-plan" :title="title" :visible.sync="dialogShow" width="400px"
-        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
-        <el-row type="flex" justify="center" class="button-group">
-            <el-button @click="handleCommit">确 定</el-button>
-            <el-button @click="doClose">取 消</el-button>
-        </el-row>
-    </el-dialog>
+  <el-dialog
+    v-dialogDrag
+    class="beijing-01__schedule create-week-plan"
+    :title="title"
+    :visible.sync="dialogShow"
+    width="400px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <el-row type="flex" justify="center" class="button-group">
+      <el-button @click="handleCommit">确 定</el-button>
+      <el-button @click="doClose">取 消</el-button>
+    </el-row>
+  </el-dialog>
 </template>
 
 <script>
 
-    export default {
-        name: 'DeleteTodayPlan',
-        components: {
-        },
-        data() {
-            return {
-                dialogShow: false,
-                loading: false
-            }
-        },
-        computed: {
-            title() {
-                return '删除当天计划'
-            }
-        },
-        mounted() {
-        },
-        methods: {
-            doShow(params) {
-                this.dialogShow = true;
-            },
-            doClose() {
-                this.loading = false;
-                this.dialogShow = false;
-            },
-            handleCommit() {
-                // this.tripNumber
-                this.doClose();
-            }
-        }
-    }
+export default {
+	name: 'DeleteTodayPlan',
+	components: {
+	},
+	data() {
+		return {
+			dialogShow: false,
+			loading: false
+		};
+	},
+	computed: {
+		title() {
+			return '删除当天计划';
+		}
+	},
+	mounted() {
+	},
+	methods: {
+		doShow(params) {
+			this.dialogShow = true;
+		},
+		doClose() {
+			this.loading = false;
+			this.dialogShow = false;
+		},
+		handleCommit() {
+			// this.tripNumber
+			this.doClose();
+		}
+	}
+};
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
     @import "src/styles/mixin.scss";
@@ -50,4 +59,4 @@
             margin: 10px;
         }
     }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/jmap/theme/beijing_01/menusPlan/managePlanList.vue b/src/jmap/theme/beijing_01/menusPlan/managePlanList.vue
index b4ae47a4b..288ad3381 100644
--- a/src/jmap/theme/beijing_01/menusPlan/managePlanList.vue
+++ b/src/jmap/theme/beijing_01/menusPlan/managePlanList.vue
@@ -1,122 +1,143 @@
 <template>
-    <el-dialog class="beijing-01__schedule manage-plan-list" :title="title" :visible.sync="dialogShow" width="80%"
-        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
-        <QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList">
-        </QueryListPage>
-    </el-dialog>
+  <el-dialog
+    v-dialogDrag
+    class="beijing-01__schedule manage-plan-list"
+    :title="title"
+    :visible.sync="dialogShow"
+    width="80%"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
+  </el-dialog>
 </template>
 
 <script>
-    import { getRunPlanLoadList, deleteRunPlanLoad } from '@/api/runplan';
+import { getRunPlanLoadList, deleteRunPlanLoad, listAllTempLateRunPlan } from '@/api/runplan';
+import { listPublishMap } from '@/api/jmap/map';
 
-    export default {
-        name: 'ManagePlanList',
-        data() {
-            return {
-                dialogShow: false,
-                loading: false,
-                pagerConfig: {
-                    pageSize: 'pageSize',
-                    pageIndex: 'pageNum'
-                },
-                queryForm: {
-                    labelWidth: '140px',
-                    reset: true,
-                    queryObject: {
-                        runPlanName: {
-                            type: 'text',
-                            label: '运行图名称'
-                        }
-                    }
-                },
-                queryList: {
-                    query: this.queryFunction,
-                    selectCheckShow: false,
-                    indexShow: true,
-                    columns: [
-                        {
-                            title: '地图名称',
-                            prop: 'mapName'
-                        },
-                        {
-                            title: '运行图名称',
-                            prop: 'runPlanName',
-                        },
-                        {
-                            title: '加载日期',
-                            prop: 'loadTime'
-                        },
-                        {
-                            type: 'button',
-                            title: '操作',
-                            width: '100',
-                            buttons: [
-                                {
-                                    name: '删除',
-                                    handleClick: this.handleDelete,
-                                    type: 'danger'
-                                }
-                            ]
-                        }
-                    ],
-                    actions: [
-                        { text: '创建', btnCode: 'employee_insert', handler: this.handleCreateRunPlan },
-                    ]
-                },
+export default {
+	name: 'ManagePlanList',
+	data() {
+		return {
+			dialogShow: false,
+			loading: false,
+			pagerConfig: {
+				pageSize: 'pageSize',
+				pageIndex: 'pageNum'
+			},
+			queryForm: {
+				labelWidth: '140px',
+				reset: true
+			},
+			queryList: {
+				query: this.queryFunction,
+				selectCheckShow: false,
+				indexShow: true,
+				columns: [
+					{
+						title: this.$t('publish.mapName'),
+						prop: 'mapId',
+						type: 'tag',
+						columnValue: (row) => { return this.$convertField(row.mapId, this.mapList, ['id', 'name']); },
+						tagType: (row) => { return ''; }
+					},
+					{
+						title: this.$t('publish.runPlanName'),
+						prop: 'templatePlanId',
+						type: 'tag',
+						columnValue: (row) => { return this.$convertField(row.templatePlanId, this.templatePlanList, ['id', 'name']); },
+						tagType: (row) => { return 'success'; }
+					},
+					{
+						title: '加载日期',
+						prop: 'loadTime'
+					},
+					{
+						type: 'button',
+						title: '操作',
+						width: '100',
+						buttons: [
+							{
+								name: '删除',
+								handleClick: this.handleDelete,
+								type: 'danger'
+							}
+						]
+					}
+				],
+				actions: [
+					{ text: '创建', btnCode: 'employee_insert', handler: this.handleCreateRunPlan }
+				]
+			},
 
-                currentModel: {}
-            }
-        },
-        computed: {
-            title() {
-                return '运行图计划表'
-            }
-        },
-        created() {
-        },
-        methods: {
-            queryFunction(params) {
-                if (this.$route.query.mapId) {
-                    params['mapId'] = this.$route.query.mapId;
-                }
+			currentModel: {}
+		};
+	},
+	computed: {
+		title() {
+			return '运行图计划表';
+		}
+	},
+	mounted() {
+		this.loadPageData();
+	},
+	methods: {
+		loadPageData() {
+			this.mapList = [];
+			listPublishMap().then(resp => {
+				this.mapList = resp.data;
+			});
+			this.templatePlanList = [];
+			listAllTempLateRunPlan().then(resp => {
+				this.templatePlanList = resp.data;
+			});
+		},
+		queryFunction(params) {
+			if (this.$route.query.mapId) {
+				params['mapId'] = this.$route.query.mapId;
+			}
 
-                if (this.$store.state.user.id) {
-                    params['userId'] = this.$store.state.user.id;
-                }
+			if (this.$store.state.user.id) {
+				params['userId'] = this.$store.state.user.id;
+			}
 
-                return getRunPlanLoadList(params);
-            },
-            handleDelete(index, row) {
-                this.$confirm('此操作将删除次日加载的运行图, 是否继续?', '提示', {
-                    confirmButtonText: '确定',
-                    cancelButtonText: '取消',
-                    type: 'warning'
-                }).then(() => {
-                    deleteRunPlanLoad(row.id).then(response => {
-                        this.$message.success('删除成功')
-                        this.reloadTable()
-                    }).catch(error => {
-                        this.reloadTable()
-                        this.$messageBox('删除失败')
-                    })
-                }).catch(() => { })
-            },
-            handleCreateRunPlan() {
-                this.$emit('dispatchDialog', { name: 'createWeekPlan' });
-            },
-            doShow() {
-                this.dialogShow = true;
-            },
-            doClose() {
-                this.loading = false;
-                this.dialogShow = false;
-            },
-            reloadTable() {
-                this.queryList.reload()
-            }
-        }
-    }
+			return getRunPlanLoadList(params);
+		},
+		handleDelete(index, row) {
+			this.$confirm('此操作将删除次日加载的运行图, 是否继续?', '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning'
+			}).then(() => {
+				deleteRunPlanLoad(row.id).then(response => {
+					this.$message.success('删除成功');
+					this.reloadTable();
+				}).catch(() => {
+					this.reloadTable();
+					this.$messageBox('删除失败');
+				});
+			}).catch(() => { });
+		},
+		handleCreateRunPlan() {
+			this.$emit('dispatchDialog', { name: 'createWeekPlan' });
+		},
+		doShow() {
+			this.dialogShow = true;
+			this.$nextTick(()=> { this.reloadTable(); });
+		},
+		doClose() {
+			this.loading = false;
+			this.dialogShow = false;
+		},
+		reloadTable() {
+			this.queryList.reload();
+		}
+	}
+};
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
     @import "src/styles/mixin.scss";
-</style>
\ No newline at end of file
+</style>
diff --git a/src/jmap/theme/chengdu_03/menus/dialog/trainDelete.vue b/src/jmap/theme/chengdu_03/menus/dialog/trainDelete.vue
index ca1df1743..109e1c918 100644
--- a/src/jmap/theme/chengdu_03/menus/dialog/trainDelete.vue
+++ b/src/jmap/theme/chengdu_03/menus/dialog/trainDelete.vue
@@ -1,143 +1,152 @@
 <template>
-    <el-dialog class="chengdou-03__systerm stand-stop-time" :title="title" :visible.sync="show" width="320px"
-        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
-        <el-form size="small" label-width="90px" :model="addModel" :rules="rules" ref="form">
-            <el-form-item label="车 组 号:" prop="groupNumber">
-                <el-input v-model="addModel.groupNumber"></el-input>
-            </el-form-item>
-        </el-form>
-        <el-row justify="center" class="button-group">
-            <el-col :span="10" :offset="2">
-                <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
-            </el-col>
-            <el-col :span="8" :offset="4">
-                <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
-            </el-col>
-        </el-row>
-        <confirm-control ref="confirmControl"></confirm-control>
-        <notice-info ref="noticeInfo"></notice-info>
-    </el-dialog>
+  <el-dialog
+    v-dialogDrag
+    class="chengdou-03__systerm stand-stop-time"
+    :title="title"
+    :visible.sync="show"
+    width="320px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <el-form ref="form" size="small" label-width="90px" :model="addModel" :rules="rules">
+      <el-form-item label="车 组 号:" prop="groupNumber">
+        <el-input v-model="addModel.groupNumber" />
+      </el-form-item>
+    </el-form>
+    <el-row justify="center" class="button-group">
+      <el-col :span="10" :offset="2">
+        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
+      </el-col>
+      <el-col :span="8" :offset="4">
+        <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
+      </el-col>
+    </el-row>
+    <confirm-control ref="confirmControl" />
+    <notice-info ref="noticeInfo" />
+  </el-dialog>
 </template>
 
 <script>
-    import { mapGetters } from 'vuex';
-    import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
-    import { getPublishMapTrainNos } from '@/api/runplan';
-    import { mouseCancelState } from '../utils/menuItemStatus';
-    import ConfirmControl from './childDialog/confirmControl';
-    import NoticeInfo from './childDialog/childDialog/noticeInfo'
+import { mapGetters } from 'vuex';
+import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+// import { getPublishMapTrainNos } from '@/api/runplan';
+import { mouseCancelState } from '../utils/menuItemStatus';
+import ConfirmControl from './childDialog/confirmControl';
+import NoticeInfo from './childDialog/childDialog/noticeInfo';
 
-    export default {
-        name: 'TrainDelete',
-        components: {
-            ConfirmControl,
-            NoticeInfo
-        },
-        data() {
-            return {
-                trainNoList: [],
-                selected: null,
-                addModel: {
-                    groupNumber: '',
-                },
+export default {
+	name: 'TrainDelete',
+	components: {
+		ConfirmControl,
+		NoticeInfo
+	},
+	data() {
+		return {
+			trainNoList: [],
+			selected: null,
+			addModel: {
+				groupNumber: ''
+			},
 
-                rules: {
-                    groupNumber: [
-                        { required: true, message: '请输入车组号', trigger: 'blur' }
-                    ],
-                },
-                operation: null,
-                dialogShow: false,
-                loading: false,
-            }
-        },
-        computed: {
-            ...mapGetters('map', [
-                'map'
-            ]),
-            show() {
-                return this.dialogShow && !this.$store.state.menuOperation.break;
-            },
-            domIdCancel() {
-                return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-            },
-            domIdConfirm() {
-                return this.dialogShow ? OperationEvent.Train.delTrainId.menu.domId : '';
-            },
-            title() {
-                return '删除列车识别号'
-            }
-        },
-        mounted() {
-            this.$nextTick(() => {
-                this.$store.dispatch('training/tipReload');
-            })
-        },
-        methods: {
-            loadInitData(map) {
-                if (map) {
-                    getPublishMapTrainNos(map.skinCode).then(response => {
-                        this.trainNoList = response.data;
-                    }).catch(error => {
-                        this.$messageBox(`获取列车车组号失败`);
-                    });
-                }
-            },
-            doShow(operate, selected) {
-                this.selected = selected;
-                //如果不是断点激活，则需要对初始值进行初始化
-                if (!this.dialogShow) {
-                    this.operation = operate.operation;
-                }
-                this.dialogShow = true;
-                this.$nextTick(function () {
-                    this.$store.dispatch('training/emitTipFresh');
-                });
-            },
-            doClose() {
-                this.loading = false;
-                this.dialogShow = false;
-                this.$store.dispatch('training/emitTipFresh');
-                this.$store.dispatch('map/setTrainWindowShow', false);
-                mouseCancelState(this.selected);
-            },
-            commit() {
-                this.$refs['form'].validate((valid) => {
-                    if (valid) {
-                        let operate = {
-                            send: true,
-                            type: MapDeviceType.Train.type,
-                            operation: OperationEvent.Train.delTrainId.menu.operation,
-                        }
+			rules: {
+				groupNumber: [
+					{ required: true, message: '请输入车组号', trigger: 'blur' }
+				]
+			},
+			operation: null,
+			dialogShow: false,
+			loading: false
+		};
+	},
+	computed: {
+		...mapGetters('map', [
+			'map'
+		]),
+		show() {
+			return this.dialogShow && !this.$store.state.menuOperation.break;
+		},
+		domIdCancel() {
+			return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+		},
+		domIdConfirm() {
+			return this.dialogShow ? OperationEvent.Train.delTrainId.menu.domId : '';
+		},
+		title() {
+			return '删除列车识别号';
+		}
+	},
+	mounted() {
+		this.$nextTick(() => {
+			this.$store.dispatch('training/tipReload');
+		});
+	},
+	methods: {
+		loadInitData(map) {
+			if (map) {
+				// getPublishMapTrainNos(map.skinCode).then(response => {
+				// 	this.trainNoList = response.data;
+				// }).catch(() => {
+				// 	this.$messageBox(`获取列车车组号失败`);
+				// });
+			}
+		},
+		doShow(operate, selected) {
+			this.selected = selected;
+			// 如果不是断点激活，则需要对初始值进行初始化
+			if (!this.dialogShow) {
+				this.operation = operate.operation;
+			}
+			this.dialogShow = true;
+			this.$nextTick(function () {
+				this.$store.dispatch('training/emitTipFresh');
+			});
+		},
+		doClose() {
+			this.loading = false;
+			this.dialogShow = false;
+			this.$store.dispatch('training/emitTipFresh');
+			this.$store.dispatch('map/setTrainWindowShow', false);
+			mouseCancelState(this.selected);
+		},
+		commit() {
+			this.$refs['form'].validate((valid) => {
+				if (valid) {
+					const operate = {
+						send: true,
+						type: MapDeviceType.Train.type,
+						operation: OperationEvent.Train.delTrainId.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();
+						this.$refs.noticeInfo.doShow(operate);
+					});
+				} else {
+					return false;
+				}
+			});
+		},
+		cancel() {
+			const operate = {
+				type: MapDeviceType.Train.type,
+				operation: OperationEvent.Command.cancel.menu.operation
+			};
 
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.doClose();
-                    }
-                }).catch(error => { this.doClose(); });
-            }
-        }
-    }
-</script>
\ 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/menuBar.vue b/src/jmap/theme/chengdu_03/menus/menuBar.vue
index eb025a093..c6631e746 100644
--- a/src/jmap/theme/chengdu_03/menus/menuBar.vue
+++ b/src/jmap/theme/chengdu_03/menus/menuBar.vue
@@ -755,9 +755,11 @@ export default {
 		},
 		initMenu(menu) {
 			this.menu = menuBarConvert(this.menuNormal[SystemType[this.$store.state.training.prdType]], this.$store.state.training.operatemode);
-			this.menu[2].children = this.initStationList();
-			this.clickEvent();
-			this.closeMenu(true);
+			if (this.menu.length) {
+				this.menu[2].children = this.initStationList();
+				this.clickEvent();
+				this.closeMenu(true);
+			}
 		},
 		clickEvent() {
 			const self = this;
diff --git a/src/jmap/theme/chengdu_03/menus/menuTrain.vue b/src/jmap/theme/chengdu_03/menus/menuTrain.vue
index 4f5e7d38b..29d2509ce 100644
--- a/src/jmap/theme/chengdu_03/menus/menuTrain.vue
+++ b/src/jmap/theme/chengdu_03/menus/menuTrain.vue
@@ -1,488 +1,491 @@
 <template>
-    <div>
-        <pop-menu ref="popMenu" :menu="menu"></pop-menu>
-        <notice-info ref="noticeInfo"></notice-info>
-        <train-control ref="trainControl"></train-control>
-        <train-delete ref="trainDelete"></train-delete>
-        <train-move ref="trainMove"></train-move>
-        <train-switch ref="trainSwitch"></train-switch>
-        <train-edit-number ref="trainEditNumber"></train-edit-number>
-        <train-create-number ref="trainCreateNumber"></train-create-number>
-        <train-move-number ref="trainMoveNumber"></train-move-number>
-        <train-delete-number ref="trainDeleteNumber"></train-delete-number>
-        <train-detail-info ref="trainDetailInfo"></train-detail-info>
-    </div>
+  <div>
+    <pop-menu ref="popMenu" :menu="menu" />
+    <notice-info ref="noticeInfo" />
+    <train-control ref="trainControl" />
+    <train-delete ref="trainDelete" />
+    <train-move ref="trainMove" />
+    <train-switch ref="trainSwitch" />
+    <train-edit-number ref="trainEditNumber" />
+    <train-create-number ref="trainCreateNumber" />
+    <train-move-number ref="trainMoveNumber" />
+    <train-delete-number ref="trainDeleteNumber" />
+    <train-detail-info ref="trainDetailInfo" />
+  </div>
 </template>
 
 <script>
-    import PopMenu from '@/components/PopMenu';
-    import NoticeInfo from './dialog/childDialog/childDialog/noticeInfo'
-    import { mapGetters } from 'vuex';
-    import { TrainingMode, OperateMode } from '@/scripts/ConstDic';
-    import { MapDeviceType, OperationEvent, DeviceMenu } from '@/scripts/ConstDic';
-    import { MenuDisabledState, menuConvert, trainMenuFiltration } from './utils/menuItemStatus';
-    import TrainControl from './dialog/trainControl';
-    import TrainDelete from './dialog/trainDelete';
-    import TrainMove from './dialog/trainMove';
-    import TrainSwitch from './dialog/trainSwitch';
-    import TrainEditNumber from './dialog/trainEditNumber';
-    import TrainMoveNumber from './dialog/trainMoveNumber';
-    import TrainCreateNumber from './dialog/trainCreateNumber';
-    import TrainDeleteNumber from './dialog/trainDeleteNumber';
-    import TrainDetailInfo from './dialog/trainDetailInfo';
-    import { mouseCancelState } from './utils/menuItemStatus';
+import PopMenu from '@/components/PopMenu';
+import NoticeInfo from './dialog/childDialog/childDialog/noticeInfo';
+import { mapGetters } from 'vuex';
+import { OperateMode } from '@/scripts/ConstDic';
+import { MapDeviceType, OperationEvent, DeviceMenu } from '@/scripts/ConstDic';
+import { MenuDisabledState, menuConvert, trainMenuFiltration } from './utils/menuItemStatus';
+import TrainControl from './dialog/trainControl';
+import TrainDelete from './dialog/trainDelete';
+import TrainMove from './dialog/trainMove';
+import TrainSwitch from './dialog/trainSwitch';
+import TrainEditNumber from './dialog/trainEditNumber';
+import TrainMoveNumber from './dialog/trainMoveNumber';
+import TrainCreateNumber from './dialog/trainCreateNumber';
+import TrainDeleteNumber from './dialog/trainDeleteNumber';
+import TrainDetailInfo from './dialog/trainDetailInfo';
+import { mouseCancelState } from './utils/menuItemStatus';
 
-    export default {
-        name: 'menuTrain',
-        props: {
-            selected: {
-                type: Object
-            }
-        },
-        components: {
-            PopMenu,
-            NoticeInfo,
-            TrainControl,
-            TrainDelete,
-            TrainMove,
-            TrainSwitch,
-            TrainEditNumber,
-            TrainMoveNumber,
-            TrainCreateNumber,
-            TrainDeleteNumber,
-            TrainDetailInfo,
-        },
-        data() {
-            return {
-                menu: [],
-                menuNormal: {
-                    local: [],
-                    central: [
-                        {
-                            label: '新建车组号',
-                            handler: this.createTrainNo,
-                            disabledCallback: MenuDisabledState.Train.createTrainNo,
-                            auth: { station: true, center: true }
-                        },
-                        {
-                            label: '移动车组号',
-                            handler: this.moveTrainNo,
-                            disabledCallback: MenuDisabledState.Train.moveTrainNo,
-                            auth: { station: true, center: true }
-                        },
-                        {
-                            label: '删除车组号',
-                            handler: this.deleteTrainNo,
-                            disabledCallback: MenuDisabledState.Train.deleteTrainNo,
-                            auth: { station: true, center: true }
-                        },
-                        {
-                            label: '修改车组号',
-                            handler: this.editTrainNo,
-                            disabledCallback: MenuDisabledState.Train.editTrainNo,
-                            auth: { station: true, center: true }
-                        },
-                        {
-                            label: '设计划车',
-                            handler: this.setPlanTrainId,
-                            disabledCallback: MenuDisabledState.Train.setPlanTrainId,
-                            auth: { station: true, center: true }
-                        },
-                        {
-                            label: '设目的地',
-                            handler: this.destinationTrainId,
-                            disabledCallback: MenuDisabledState.Train.destinationTrainId,
-                            auth: { station: true, center: true }
-                        },
-                        {
-                            label: '设人工车',
-                            handler: this.artificialTrainId,
-                            disabledCallback: MenuDisabledState.Train.artificialTrainId,
-                            auth: { station: true, center: true }
-                        },
-                        {
-                            label: '设特殊人工车',
-                            handler: this.undeveloped,
-                            disabledCallback: MenuDisabledState.Train.moveTrainId,
-                            auth: { station: true, center: true}
-                        },
-                        {
-                            label: '详细列车信息',
-                            handler: this.detailTrainInfo,
-                            disabledCallback: MenuDisabledState.Train.detailTrainInfo,
-                            auth: { station: true, center: true}
-                        },
-                        {
-                            label: '属性',
-                            handler: this.undeveloped,
-                            disabledCallback: MenuDisabledState.Train.moveTrainId,
-                            auth: { station: true, center: true}
-                        }
+export default {
+	name: 'MenuTrain',
+	components: {
+		PopMenu,
+		NoticeInfo,
+		TrainControl,
+		TrainDelete,
+		TrainMove,
+		TrainSwitch,
+		TrainEditNumber,
+		TrainMoveNumber,
+		TrainCreateNumber,
+		TrainDeleteNumber,
+		TrainDetailInfo
+	},
+	props: {
+		selected: {
+			type: Object,
+			default() {
+				return null;
+			}
+		}
+	},
+	data() {
+		return {
+			menu: [],
+			menuNormal: {
+				local: [],
+				central: [
+					{
+						label: '新建车组号',
+						handler: this.createTrainNo,
+						disabledCallback: MenuDisabledState.Train.createTrainNo,
+						auth: { station: true, center: true }
+					},
+					{
+						label: '移动车组号',
+						handler: this.moveTrainNo,
+						disabledCallback: MenuDisabledState.Train.moveTrainNo,
+						auth: { station: true, center: true }
+					},
+					{
+						label: '删除车组号',
+						handler: this.deleteTrainNo,
+						disabledCallback: MenuDisabledState.Train.deleteTrainNo,
+						auth: { station: true, center: true }
+					},
+					{
+						label: '修改车组号',
+						handler: this.editTrainNo,
+						disabledCallback: MenuDisabledState.Train.editTrainNo,
+						auth: { station: true, center: true }
+					},
+					{
+						label: '设计划车',
+						handler: this.setPlanTrainId,
+						disabledCallback: MenuDisabledState.Train.setPlanTrainId,
+						auth: { station: true, center: true }
+					},
+					{
+						label: '设目的地',
+						handler: this.destinationTrainId,
+						disabledCallback: MenuDisabledState.Train.destinationTrainId,
+						auth: { station: true, center: true }
+					},
+					{
+						label: '设人工车',
+						handler: this.artificialTrainId,
+						disabledCallback: MenuDisabledState.Train.artificialTrainId,
+						auth: { station: true, center: true }
+					},
+					{
+						label: '设特殊人工车',
+						handler: this.undeveloped,
+						disabledCallback: MenuDisabledState.Train.moveTrainId,
+						auth: { station: true, center: true}
+					},
+					{
+						label: '详细列车信息',
+						handler: this.detailTrainInfo,
+						disabledCallback: MenuDisabledState.Train.detailTrainInfo,
+						auth: { station: true, center: true}
+					},
+					{
+						label: '属性',
+						handler: this.undeveloped,
+						disabledCallback: MenuDisabledState.Train.moveTrainId,
+						auth: { station: true, center: true}
+					}
 
-                    ]
-                },
-                menuForce: [
-                    {
-                        label: '设置通信故障',
-                        handler: this.setStoppage,
-                        disabledCallback: MenuDisabledState.Train.setStoppage
-                    },
-                    {
-                        label: '取消通信故障',
-                        handler: this.cancelStoppage,
-                        disabledCallback: MenuDisabledState.Train.cancelStoppage
-                    }
-                ],
-                menuSpeed: [
-                    {
-                        label: '确认运行至前方站',
-                        handler: this.limitSpeed,
-                        disabledCallback: MenuDisabledState.Train.limitSpeed
-                    }
-                ]
-            }
-        },
-        watch: {
-            '$store.state.menuOperation.menuCount': function () {
-                if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.Train) && !this.buttonOperation) {
-                    this.doShow(this.$store.state.menuOperation.menuPosition);
-                } else {
-                    this.doClose();
-                }
-            }
-        },
-        computed: {
-            ...mapGetters('training', [
-                'mode',
-                'operatemode'
-            ]),
-            ...mapGetters('menuOperation', [
-                'buttonOperation'
-            ])
-        },
-        methods: {
-            clickEvent() {
-                let self = this;
-                window.onclick = function (e) {
-                    self.doClose();
-                }
-            },
-            initMenu() {
-                //编辑模式菜单列表
-                this.menu = trainMenuFiltration(this.menuNormal);
-                if (this.operatemode === OperateMode.ADMIN) {
-                    this.menu = [...this.menu, ...this.menuForce, ...this.menuSpeed]
-                }
+				]
+			},
+			menuForce: [
+				{
+					label: '设置通信故障',
+					handler: this.setStoppage,
+					disabledCallback: MenuDisabledState.Train.setStoppage
+				},
+				{
+					label: '取消通信故障',
+					handler: this.cancelStoppage,
+					disabledCallback: MenuDisabledState.Train.cancelStoppage
+				}
+			],
+			menuSpeed: [
+				{
+					label: '确认运行至前方站',
+					handler: this.limitSpeed,
+					disabledCallback: MenuDisabledState.Train.limitSpeed
+				}
+			]
+		};
+	},
+	computed: {
+		...mapGetters('training', [
+			'mode',
+			'operatemode'
+		]),
+		...mapGetters('menuOperation', [
+			'buttonOperation'
+		])
+	},
+	watch: {
+		'$store.state.menuOperation.menuCount': function () {
+			if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.Train) && !this.buttonOperation) {
+				this.doShow(this.$store.state.menuOperation.menuPosition);
+			} else {
+				this.doClose();
+			}
+		}
+	},
+	methods: {
+		clickEvent() {
+			const self = this;
+			window.onclick = function (e) {
+				self.doClose();
+			};
+		},
+		initMenu() {
+			// 编辑模式菜单列表
+			this.menu = trainMenuFiltration(this.menuNormal);
+			if (this.operatemode === OperateMode.ADMIN) {
+				this.menu = [...this.menu, ...this.menuForce, ...this.menuSpeed];
+			}
 
-                //故障模式菜单列表
-                if (this.operatemode === OperateMode.FAULT) {
-                    this.menu = [...this.menuForce, ...this.menuSpeed]
-                }
+			// 故障模式菜单列表
+			if (this.operatemode === OperateMode.FAULT) {
+				this.menu = [...this.menuForce, ...this.menuSpeed];
+			}
 
-                this.menu = menuConvert(this.menu);
-            },
-            doShow(point) {
-                this.clickEvent();
-                this.initMenu();
+			this.menu = menuConvert(this.menu);
+		},
+		doShow(point) {
+			this.clickEvent();
+			this.initMenu();
 
-                if (this.$refs && this.$refs.popMenu && this.menu && this.menu.length) {
-                    this.$refs.popMenu.resetShowPosition(point);
-                }
-            },
-            doClose() {
-                if (this.$refs && this.$refs.popMenu) {
-                    this.$refs.popMenu.close();
-                    // this.$store.dispatch('map/setTrainWindowShow', false);
-                }
-            },
-            //设置故障
-            setStoppage() {
-                let operate = {
-                    start: true,
-                    send: true,
-                    code: this.selected.code,
-                    type: MapDeviceType.Train.type,
-                    label: MapDeviceType.Train.label,
-                    operation: OperationEvent.Train.stoppage.menu.operation
-                };
+			if (this.$refs && this.$refs.popMenu && this.menu && this.menu.length) {
+				this.$refs.popMenu.resetShowPosition(point);
+			}
+		},
+		doClose() {
+			if (this.$refs && this.$refs.popMenu) {
+				this.$refs.popMenu.close();
+				// this.$store.dispatch('map/setTrainWindowShow', false);
+			}
+		},
+		// 设置故障
+		setStoppage() {
+			const operate = {
+				start: true,
+				send: true,
+				code: this.selected.code,
+				type: MapDeviceType.Train.type,
+				label: MapDeviceType.Train.label,
+				operation: OperationEvent.Train.stoppage.menu.operation
+			};
 
-                mouseCancelState(this.selected);
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    } else {
-                        this.$refs.noticeInfo.doShow(operate);
-                    }
-                }).catch(error => {
-                    this.$refs.noticeInfo.doShow(operate);
-                })
-            },
-            //取消故障
-            cancelStoppage() {
-                let operate = {
-                    start: true,
-                    send: true,
-                    code: this.selected.code,
-                    type: MapDeviceType.Train.type,
-                    label: MapDeviceType.Train.label,
-                    operation: OperationEvent.Train.cancelStoppage.menu.operation
-                };
+			mouseCancelState(this.selected);
+			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+				if (valid) {
+					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+				} else {
+					this.$refs.noticeInfo.doShow(operate);
+				}
+			}).catch(() => {
+				this.$refs.noticeInfo.doShow(operate);
+			});
+		},
+		// 取消故障
+		cancelStoppage() {
+			const operate = {
+				start: true,
+				send: true,
+				code: this.selected.code,
+				type: MapDeviceType.Train.type,
+				label: MapDeviceType.Train.label,
+				operation: OperationEvent.Train.cancelStoppage.menu.operation
+			};
 
-                mouseCancelState(this.selected);
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    } else {
-                        this.$refs.noticeInfo.doShow(operate);
-                    }
-                }).catch(error => {
-                    this.$refs.noticeInfo.doShow(operate);
-                })
-            },
-            //限速行驶
-            limitSpeed() {
-                let operate = {
-                    start: true,
-                    send: true,
-                    code: this.selected.code,
-                    type: MapDeviceType.Train.type,
-                    label: MapDeviceType.Train.label,
-                    operation: OperationEvent.Train.limitSpeed.menu.operation
-                };
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    } else {
-                        this.$refs.noticeInfo.doShow(operate);
-                    }
-                }).catch(error => {
-                    this.$refs.noticeInfo.doShow(operate);
-                })
-            },
-            //设计划车
-            setPlanTrainId() {
-                let operate = {
-                    start: true,
-                    code: this.selected.code,
-                    type: MapDeviceType.Train.type,
-                    label: MapDeviceType.Train.label,
-                    operation: OperationEvent.Train.setPlanTrainId.menu.operation
-                };
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                        this.$refs.trainControl.doShow(operate, this.selected);
-                    }  else {
-                        this.$refs.noticeInfo.doShow(operate);
-                    }
-                })
-            },
-            //设目的地车
-            destinationTrainId() {
-                let operate = {
-                    start: true,
-                    code: this.selected.code,
-                    type: MapDeviceType.Train.type,
-                    label: MapDeviceType.Train.label,
-                    operation: OperationEvent.Train.destinationTrainId.menu.operation
-                };
-                this.$store.dispatch('training/next',operate).then(({ valid }) => {
-                    if (valid) {
-                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                        this.$refs.trainControl.doShow(operate, this.selected);
-                    }  else {
-                        this.$refs.noticeInfo.doShow(operate);
-                    }
-                })
-            },
-            //设人工车
-            artificialTrainId() {
-                let operate = {
-                    start: true,
-                    code: this.selected.code,
-                    type: MapDeviceType.Train.type,
-                    label: MapDeviceType.Train.label,
-                    operation: OperationEvent.Train.artificialTrainId.menu.operation
-                };
-                this.$store.dispatch('training/next',operate).then(({ valid }) => {
-                    if(valid) {
-                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                        this.$refs.trainControl.doShow(operate, this.selected);
-                    } else {
-                        this.$refs.noticeInfo.doShow(operate);
-                    }
-                })
-            },
-            //详细列车信息
-            detailTrainInfo() {
-                let operate = {
-                    start: true,
-                    code: this.selected.code,
-                    type: MapDeviceType.Train.type,
-                    label: MapDeviceType.Train.label,
-                    operation: OperationEvent.Train.detailTrainInfo.menu.operation
-                };
-                this.$store.dispatch('training/next',operate).then(({ valid }) => {
-                    if (valid){
-                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                        this.$refs.trainDetailInfo.doShow(operate, this.selected);
-                    } else {
-                        this.$refs.noticeInfo.doShow(operate);
-                    }
-                })
-            },
-            undeveloped() {
-                this.doClose();
-                this.$alert('实现中......', '提示', {
-                    confirmButtonText: '确定',
-                    callback: action => {
-                    }
-                });
-            },
-            //添加列车识别号
-            addTrainId() {
-                let operate = {
-                    start: true,
-                    code: this.selected.code,
-                    type: MapDeviceType.Train.type,
-                    label: MapDeviceType.Train.label,
-                    operation: OperationEvent.Train.addTrainId.menu.operation
-                };
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                        this.$refs.trainControl.doShow(operate, this.selected);
-                    }
-                });
-            },
-            //创建车组号
-            createTrainNo() {
-                let operate = {
-                    start: true,
-                    code: this.selected.code,
-                    type: MapDeviceType.Train.type,
-                    label:  MapDeviceType.Train.label,
-                    operation: OperationEvent.Train.createTrainNo.menu.operation
-                };
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                        this.$refs.trainCreateNumber.doShow(operate, this.selected);
-                    }
-                });
-            },
-            //删除列车识别号
-            delTrainId() {
-                let operate = {
-                    start: true,
-                    code: this.selected.code,
-                    type: MapDeviceType.Train.type,
-                    label: MapDeviceType.Train.label,
-                    operation: OperationEvent.Train.delTrainId.menu.operation
-                };
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                        this.$refs.trainDelete.doShow(operate, this.selected);
-                    }
-                });
-            },
-            //删除车组号
-            deleteTrainNo() {
-                let operate = {
-                    start: true,
-                    code: this.selected.code,
-                    type: MapDeviceType.Train.type,
-                    label: MapDeviceType.Train.label,
-                    operation: OperationEvent.Train.deleteTrainNo.menu.operation
-                };
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                        this.$refs.trainDeleteNumber.doShow(operate, this.selected);
-                    }
-                });
-            },
-            //修改列车识别号
-            editTrainId() {
-                let operate = {
-                    start: true,
-                    code: this.selected.code,
-                    type: MapDeviceType.Train.type,
-                    label: MapDeviceType.Train.label,
-                    operation: OperationEvent.Train.editTrainId.menu.operation
-                };
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                        this.$refs.trainControl.doShow(operate, this.selected);
-                    }
-                });
-            },
-            //修改车组号
-            editTrainNo() {
-                let operate = {
-                    start: true,
-                    code: this.selected.code,
-                    type: MapDeviceType.Train.type,
-                    label: MapDeviceType.Train.label,
-                    operation: OperationEvent.Train.editTrainNo.menu.operation
-                };
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                        this.$refs.trainEditNumber.doShow(operate, this.selected);
-                    }
-                });
-            },
-            //移动车组号
-            moveTrainNo() {
-                let operate = {
-                    start: true,
-                    code: this.selected.code,
-                    type: MapDeviceType.Train.type,
-                    label:  MapDeviceType.Train.label,
-                    operation: OperationEvent.Train.moveTrainNo.menu.operation
-                };
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                        this.$refs.trainMoveNumber.doShow(operate, this.selected);
-                    }
-                });
-            },
-            //移动列车识别号
-            moveTrainId() {
-                let operate = {
-                    start: true,
-                    code: this.selected.code,
-                    type: MapDeviceType.Train.type,
-                    label: MapDeviceType.Train.label,
-                    operation: OperationEvent.Train.moveTrainId.menu.operation
-                };
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                        this.$refs.trainMove.doShow(operate, this.selected);
-                    }
-                });
-            },
-            //交换列车识别号
-            switchTrainId() {
-                let operate = {
-                    start: true,
-                    code: this.selected.code,
-                    type: MapDeviceType.Train.type,
-                    label: MapDeviceType.Train.label,
-                    operation: OperationEvent.Train.switchTrainId.menu.operation
-                };
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                        this.$refs.trainSwitch.doShow(operate, this.selected);
-                    }
-                });
-            }
-        }
-    }
+			mouseCancelState(this.selected);
+			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+				if (valid) {
+					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+				} else {
+					this.$refs.noticeInfo.doShow(operate);
+				}
+			}).catch(() => {
+				this.$refs.noticeInfo.doShow(operate);
+			});
+		},
+		// 限速行驶
+		limitSpeed() {
+			const operate = {
+				start: true,
+				send: true,
+				code: this.selected.code,
+				type: MapDeviceType.Train.type,
+				label: MapDeviceType.Train.label,
+				operation: OperationEvent.Train.limitSpeed.menu.operation
+			};
+			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+				if (valid) {
+					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+				} else {
+					this.$refs.noticeInfo.doShow(operate);
+				}
+			}).catch(() => {
+				this.$refs.noticeInfo.doShow(operate);
+			});
+		},
+		// 设计划车
+		setPlanTrainId() {
+			const operate = {
+				start: true,
+				code: this.selected.code,
+				type: MapDeviceType.Train.type,
+				label: MapDeviceType.Train.label,
+				operation: OperationEvent.Train.setPlanTrainId.menu.operation
+			};
+			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+				if (valid) {
+					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+					this.$refs.trainControl.doShow(operate, this.selected);
+				} else {
+					this.$refs.noticeInfo.doShow(operate);
+				}
+			});
+		},
+		// 设目的地车
+		destinationTrainId() {
+			const operate = {
+				start: true,
+				code: this.selected.code,
+				type: MapDeviceType.Train.type,
+				label: MapDeviceType.Train.label,
+				operation: OperationEvent.Train.destinationTrainId.menu.operation
+			};
+			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+				if (valid) {
+					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+					this.$refs.trainControl.doShow(operate, this.selected);
+				} else {
+					this.$refs.noticeInfo.doShow(operate);
+				}
+			});
+		},
+		// 设人工车
+		artificialTrainId() {
+			const operate = {
+				start: true,
+				code: this.selected.code,
+				type: MapDeviceType.Train.type,
+				label: MapDeviceType.Train.label,
+				operation: OperationEvent.Train.artificialTrainId.menu.operation
+			};
+			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+				if (valid) {
+					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+					this.$refs.trainControl.doShow(operate, this.selected);
+				} else {
+					this.$refs.noticeInfo.doShow(operate);
+				}
+			});
+		},
+		// 详细列车信息
+		detailTrainInfo() {
+			const operate = {
+				start: true,
+				code: this.selected.code,
+				type: MapDeviceType.Train.type,
+				label: MapDeviceType.Train.label,
+				operation: OperationEvent.Train.detailTrainInfo.menu.operation
+			};
+			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+				if (valid) {
+					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+					this.$refs.trainDetailInfo.doShow(operate, this.selected);
+				} else {
+					this.$refs.noticeInfo.doShow(operate);
+				}
+			});
+		},
+		undeveloped() {
+			this.doClose();
+			this.$alert('实现中......', '提示', {
+				confirmButtonText: '确定',
+				callback: action => {
+				}
+			});
+		},
+		// 添加列车识别号
+		addTrainId() {
+			const operate = {
+				start: true,
+				code: this.selected.code,
+				type: MapDeviceType.Train.type,
+				label: MapDeviceType.Train.label,
+				operation: OperationEvent.Train.addTrainId.menu.operation
+			};
+			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+				if (valid) {
+					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+					this.$refs.trainControl.doShow(operate, this.selected);
+				}
+			});
+		},
+		// 创建车组号
+		createTrainNo() {
+			const operate = {
+				start: true,
+				code: this.selected.code,
+				type: MapDeviceType.Train.type,
+				label: MapDeviceType.Train.label,
+				operation: OperationEvent.Train.createTrainNo.menu.operation
+			};
+			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+				if (valid) {
+					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+					this.$refs.trainCreateNumber.doShow(operate, this.selected);
+				}
+			});
+		},
+		// 删除列车识别号
+		delTrainId() {
+			const operate = {
+				start: true,
+				code: this.selected.code,
+				type: MapDeviceType.Train.type,
+				label: MapDeviceType.Train.label,
+				operation: OperationEvent.Train.delTrainId.menu.operation
+			};
+			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+				if (valid) {
+					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+					this.$refs.trainDelete.doShow(operate, this.selected);
+				}
+			});
+		},
+		// 删除车组号
+		deleteTrainNo() {
+			const operate = {
+				start: true,
+				code: this.selected.code,
+				type: MapDeviceType.Train.type,
+				label: MapDeviceType.Train.label,
+				operation: OperationEvent.Train.deleteTrainNo.menu.operation
+			};
+			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+				if (valid) {
+					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+					this.$refs.trainDeleteNumber.doShow(operate, this.selected);
+				}
+			});
+		},
+		// 修改列车识别号
+		editTrainId() {
+			const operate = {
+				start: true,
+				code: this.selected.code,
+				type: MapDeviceType.Train.type,
+				label: MapDeviceType.Train.label,
+				operation: OperationEvent.Train.editTrainId.menu.operation
+			};
+			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+				if (valid) {
+					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+					this.$refs.trainControl.doShow(operate, this.selected);
+				}
+			});
+		},
+		// 修改车组号
+		editTrainNo() {
+			const operate = {
+				start: true,
+				code: this.selected.code,
+				type: MapDeviceType.Train.type,
+				label: MapDeviceType.Train.label,
+				operation: OperationEvent.Train.editTrainNo.menu.operation
+			};
+			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+				if (valid) {
+					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+					this.$refs.trainEditNumber.doShow(operate, this.selected);
+				}
+			});
+		},
+		// 移动车组号
+		moveTrainNo() {
+			const operate = {
+				start: true,
+				code: this.selected.code,
+				type: MapDeviceType.Train.type,
+				label: MapDeviceType.Train.label,
+				operation: OperationEvent.Train.moveTrainNo.menu.operation
+			};
+			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+				if (valid) {
+					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+					this.$refs.trainMoveNumber.doShow(operate, this.selected);
+				}
+			});
+		},
+		// 移动列车识别号
+		moveTrainId() {
+			const operate = {
+				start: true,
+				code: this.selected.code,
+				type: MapDeviceType.Train.type,
+				label: MapDeviceType.Train.label,
+				operation: OperationEvent.Train.moveTrainId.menu.operation
+			};
+			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+				if (valid) {
+					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+					this.$refs.trainMove.doShow(operate, this.selected);
+				}
+			});
+		},
+		// 交换列车识别号
+		switchTrainId() {
+			const operate = {
+				start: true,
+				code: this.selected.code,
+				type: MapDeviceType.Train.type,
+				label: MapDeviceType.Train.label,
+				operation: OperationEvent.Train.switchTrainId.menu.operation
+			};
+			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+				if (valid) {
+					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+					this.$refs.trainSwitch.doShow(operate, this.selected);
+				}
+			});
+		}
+	}
+};
 </script>
diff --git a/src/jmap/theme/chengdu_03/menusPlan/addTask.vue b/src/jmap/theme/chengdu_03/menusPlan/addTask.vue
index 10a8fd228..009c19f02 100644
--- a/src/jmap/theme/chengdu_03/menusPlan/addTask.vue
+++ b/src/jmap/theme/chengdu_03/menusPlan/addTask.vue
@@ -1,150 +1,162 @@
 <template>
-    <el-dialog class="beijing-01__schedule add-task" :title="title" :visible.sync="dialogShow" width="800px"
-        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
-        <div style="margin: 10px">
-            <el-row>
-                <el-col :span="3">
-                    <el-radio v-model="model.type" label="1">加在最前</el-radio>
-                </el-col>
-                <el-col :span="2" :offset="1">
-                    <span>车次号：</span>
-                </el-col>
-                <el-col :span="5">
-                    <el-select v-model="model.tripNumber" placeholder="请选择">
-                        <el-option v-for="item in tripNumberList" :key="item.value" :label="item.label"
-                            :value="item.value">
-                        </el-option>
-                    </el-select>
-                </el-col>
-                <el-col :span="3" :offset="1">
-                    <span>开始时间：</span>
-                </el-col>
-                <el-col :span="5">
-                    <el-select v-model="model.startTime" placeholder="请选择">
-                        <el-option v-for="item in tripNumberList" :key="item.value" :label="item.label"
-                            :value="item.value">
-                        </el-option>
-                    </el-select>
-                </el-col>
-            </el-row>
-            <el-row>
-                <el-col :span="3">
-                    <el-radio v-model="model.type" label="2">加在最后</el-radio>
-                </el-col>
-                <el-col :span="2" :offset="1">
-                    <span>车次号：</span>
-                </el-col>
-                <el-col :span="5">
-                    <el-select v-model="model.tripNumber" placeholder="请选择">
-                        <el-option v-for="item in tripNumberList" :key="item.value" :label="item.label"
-                            :value="item.value">
-                        </el-option>
-                    </el-select>
-                </el-col>
-                <el-col :span="3" :offset="1">
-                    <span>开始时间：</span>
-                </el-col>
-                <el-col :span="5">
-                    <el-select v-model="model.startTime" placeholder="请选择">
-                        <el-option v-for="item in tripNumberList" :key="item.value" :label="item.label"
-                            :value="item.value">
-                        </el-option>
-                    </el-select>
-                </el-col>
+  <el-dialog
+    v-dialogDrag
+    class="beijing-01__schedule add-task"
+    :title="title"
+    :visible.sync="dialogShow"
+    width="800px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <div style="margin: 10px">
+      <el-row>
+        <el-col :span="3">
+          <el-radio v-model="model.type" label="1">加在最前</el-radio>
+        </el-col>
+        <el-col :span="2" :offset="1">
+          <span>车次号：</span>
+        </el-col>
+        <el-col :span="5">
+          <el-select v-model="model.tripNumber" placeholder="请选择">
+            <el-option
+              v-for="item in tripNumberList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-col>
+        <el-col :span="3" :offset="1">
+          <span>开始时间：</span>
+        </el-col>
+        <el-col :span="5">
+          <el-select v-model="model.startTime" placeholder="请选择">
+            <el-option
+              v-for="item in tripNumberList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="3">
+          <el-radio v-model="model.type" label="2">加在最后</el-radio>
+        </el-col>
+        <el-col :span="2" :offset="1">
+          <span>车次号：</span>
+        </el-col>
+        <el-col :span="5">
+          <el-select v-model="model.tripNumber" placeholder="请选择">
+            <el-option
+              v-for="item in tripNumberList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-col>
+        <el-col :span="3" :offset="1">
+          <span>开始时间：</span>
+        </el-col>
+        <el-col :span="5">
+          <el-select v-model="model.startTime" placeholder="请选择">
+            <el-option
+              v-for="item in tripNumberList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-col>
 
-            </el-row>
-            <el-row style="margin-bottom: 5px;">
-                交路：
-            </el-row>
-            <el-row>
-                <el-table :data="model.route" border :height="180">
-                    <el-table-column prop="date" label="日期" width="180">
-                    </el-table-column>
-                    <el-table-column prop="name" label="姓名" width="180">
-                    </el-table-column>
-                    <el-table-column prop="address" label="地址">
-                    </el-table-column>
-                    <el-table-column width="20">
-                    </el-table-column>
-                </el-table>
-            </el-row>
-            <el-row style=" margin-bottom: 5px;margin-top: 10px;">
-                详情：
-            </el-row>
-            <el-row>
-                <el-table :data="model.detail" border :height="180">
-                    <el-table-column prop="date" label="日期" width="180">
-                    </el-table-column>
-                    <el-table-column prop="name" label="姓名" width="180">
-                    </el-table-column>
-                    <el-table-column prop="address" label="地址">
-                    </el-table-column>
-                    <el-table-column width="20">
-                    </el-table-column>
-                </el-table>
-            </el-row>
-            <el-row>
-                <el-col :offset="16">
-                    <el-checkbox v-model="model.default">显示默认停站时间和运行等级</el-checkbox>
-                </el-col>
-            </el-row>
-        </div>
-        <el-row type="flex" justify="center" class="button-group">
-            <el-button @click="handleCommit">确 定</el-button>
-            <el-button @click="doClose">取 消</el-button>
-        </el-row>
-    </el-dialog>
+      </el-row>
+      <el-row style="margin-bottom: 5px;">
+        交路：
+      </el-row>
+      <el-row>
+        <el-table :data="model.route" border :height="180">
+          <el-table-column prop="date" label="日期" width="180" />
+          <el-table-column prop="name" label="姓名" width="180" />
+          <el-table-column prop="address" label="地址" />
+          <el-table-column width="20" />
+        </el-table>
+      </el-row>
+      <el-row style=" margin-bottom: 5px;margin-top: 10px;">
+        详情：
+      </el-row>
+      <el-row>
+        <el-table :data="model.detail" border :height="180">
+          <el-table-column prop="date" label="日期" width="180" />
+          <el-table-column prop="name" label="姓名" width="180" />
+          <el-table-column prop="address" label="地址" />
+          <el-table-column width="20" />
+        </el-table>
+      </el-row>
+      <el-row>
+        <el-col :offset="16">
+          <el-checkbox v-model="model.default">显示默认停站时间和运行等级</el-checkbox>
+        </el-col>
+      </el-row>
+    </div>
+    <el-row type="flex" justify="center" class="button-group">
+      <el-button @click="handleCommit">确 定</el-button>
+      <el-button @click="doClose">取 消</el-button>
+    </el-row>
+  </el-dialog>
 </template>
 
 <script>
 
-    export default {
-        name: 'AddTask',
-        components: {
-        },
-        data() {
-            return {
-                dialogShow: false,
-                loading: false,
-                model: {
-                    type: '1',
-                    serviceNumber: '',
-                    tripNumber: '',
-                    startTime: '',
-                    default: false,
-                    route: [],
-                    detail: []
-                },
-                tripNumberList: [],
-            }
-        },
-        computed: {
-            title() {
-                return '添加任务'
-            }
-        },
-        mounted() {
-        },
-        methods: {
-            doShow(params) {
-                this.model.serviceNumber = params.serviceNumber;
-                this.model.tripNumber = params.tripNumber;
-                this.dialogShow = true;
-            },
-            doClose() {
-                this.loading = false;
-                this.dialogShow = false;
-            },
-            handleCommit() {
-                this.doClose();
-            }
-        }
-    }
+export default {
+	name: 'AddTask',
+	components: {
+	},
+	data() {
+		return {
+			dialogShow: false,
+			loading: false,
+			model: {
+				type: '1',
+				serviceNumber: '',
+				tripNumber: '',
+				startTime: '',
+				default: false,
+				route: [],
+				detail: []
+			},
+			tripNumberList: []
+		};
+	},
+	computed: {
+		title() {
+			return '添加任务';
+		}
+	},
+	mounted() {
+	},
+	methods: {
+		doShow(params) {
+			this.model.serviceNumber = params.serviceNumber;
+			this.model.tripNumber = params.tripNumber;
+			this.dialogShow = true;
+		},
+		doClose() {
+			this.loading = false;
+			this.dialogShow = false;
+		},
+		handleCommit() {
+			this.doClose();
+		}
+	}
+};
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
     @import "src/styles/mixin.scss";
 
-
     /deep/ {
         .el-button {
             margin-left: 40px !important;
@@ -160,4 +172,4 @@
             line-height: 20px !important;
         }
     }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/jmap/theme/chengdu_03/menusPlan/chooseTemplatePlan.vue b/src/jmap/theme/chengdu_03/menusPlan/chooseTemplatePlan.vue
index 747a38d6b..591ed34cc 100644
--- a/src/jmap/theme/chengdu_03/menusPlan/chooseTemplatePlan.vue
+++ b/src/jmap/theme/chengdu_03/menusPlan/chooseTemplatePlan.vue
@@ -1,10 +1,10 @@
 <template>
   <el-dialog
-    :title="title"
     v-dialogDrag
+    :title="title"
     class="beijing-01__schedule choose-plan-template"
     :visible.sync="dialogShow"
-    width="80%"
+    width="70%"
     :before-close="doClose"
     :modal="false"
     :close-on-click-modal="false"
diff --git a/src/jmap/theme/chengdu_03/menusPlan/createTodayPlan.vue b/src/jmap/theme/chengdu_03/menusPlan/createTodayPlan.vue
index 85406230f..1eaccb114 100644
--- a/src/jmap/theme/chengdu_03/menusPlan/createTodayPlan.vue
+++ b/src/jmap/theme/chengdu_03/menusPlan/createTodayPlan.vue
@@ -18,10 +18,9 @@
 </template>
 
 <script>
-// import { listPublishMap } from '@/api/jmap/mapdraft';
-import { runPlanTemplateList, generateUserRunPlanEveryDay } from '@/api/runplan';
+import { runPlanTemplateList } from '@/api/runplan';
 import { getStationListBySkinCode } from '@/api/runplan';
-import { getEveryDayRunPlanData } from '@/api/simulation';
+import { getEveryDayRunPlanData, generateDayRunPlan } from '@/api/simulation';
 import { getSkinCodeList } from '@/api/management/mapskin';
 
 export default {
@@ -101,7 +100,7 @@ export default {
 				const choose = this.$refs.pageRules.currentChoose();
 				if (choose && choose.id) {
 					this.loading = true;
-					generateUserRunPlanEveryDay(choose.id, this.$route.query.group).then(response => {
+					generateDayRunPlan(choose.id, this.$route.query.group).then(response => {
 						this.loading = false;
 						this.reloadTable();
 						this.loadRunData();
diff --git a/src/jmap/theme/chengdu_03/menusPlan/createWeekPlan.vue b/src/jmap/theme/chengdu_03/menusPlan/createWeekPlan.vue
index c6f6f74b7..2eabc8044 100644
--- a/src/jmap/theme/chengdu_03/menusPlan/createWeekPlan.vue
+++ b/src/jmap/theme/chengdu_03/menusPlan/createWeekPlan.vue
@@ -1,116 +1,126 @@
 <template>
-    <el-dialog class="beijing-01__schedule create-week-plan" :title="title" :visible.sync="dialogShow" width="800px"
-        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
-        <el-row>
-            <el-form ref="form" :model="model" :rules="rules" label-width="140px" size="small">
-                <el-form-item label="运行图名称:" prop="planId">
-                    <el-row>
-                        <el-col :span="19">
-                            <el-input v-model="model.planName" :readonly="true"></el-input>
-                        </el-col>
-                        <el-col :span="4" :offset="1">
-                            <el-button @click="handleChoose">选择 </el-button>
-                        </el-col>
-                    </el-row>
-                </el-form-item>
-                <el-form-item label="计划日期范围:" prop="dateList">
-                    <el-row>
-                        <el-date-picker type="dates" v-model="model.dateList" :clearable="false" placeholder="选择一个或多个日期"
-                            value-format="yyyy-MM-dd">
-                        </el-date-picker>
-                    </el-row>
-                </el-form-item>
-            </el-form>
-        </el-row>
-        <el-row type="flex" justify="center" class="button-group">
-            <el-button @click="create">确 定</el-button>
-            <el-button @click="doClose">取 消</el-button>
-        </el-row>
-        <choose-template-plan ref="choose" @chooseConfirm="chooseConfirm"></choose-template-plan>
-    </el-dialog>
+  <el-dialog
+    v-dialogDrag
+    class="beijing-01__schedule create-week-plan"
+    :title="title"
+    :visible.sync="dialogShow"
+    width="800px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <el-row>
+      <el-form ref="form" :model="model" :rules="rules" label-width="140px" size="small">
+        <el-form-item label="运行图名称:" prop="planId">
+          <el-row>
+            <el-col :span="19">
+              <el-input v-model="model.planName" :readonly="true" />
+            </el-col>
+            <el-col :span="4" :offset="1">
+              <el-button @click="handleChoose">选择 </el-button>
+            </el-col>
+          </el-row>
+        </el-form-item>
+        <el-form-item label="计划日期范围:" prop="dateList">
+          <el-row>
+            <el-date-picker
+              v-model="model.dateList"
+              type="dates"
+              :clearable="false"
+              placeholder="选择一个或多个日期"
+              value-format="yyyy-MM-dd"
+            />
+          </el-row>
+        </el-form-item>
+      </el-form>
+    </el-row>
+    <el-row type="flex" justify="center" class="button-group">
+      <el-button @click="create">确 定</el-button>
+      <el-button @click="doClose">取 消</el-button>
+    </el-row>
+    <choose-template-plan ref="choose" @chooseConfirm="chooseConfirm" />
+  </el-dialog>
 </template>
 
 <script>
-    import { createRunPlanLoad } from '@/api/runplan';
-    import ChooseTemplatePlan from './chooseTemplatePlan';
+import { createRunPlanLoad } from '@/api/runplan';
+import ChooseTemplatePlan from './chooseTemplatePlan';
 
-    export default {
-        name: 'CreateWeekPlan',
-        components: {
-            ChooseTemplatePlan
-        },
-        data() {
-            return {
-                dialogShow: false,
-                loading: false,
-                model: {
-                    planId: '',
-                    planName: '',
-                    dateList: [],
-                }
-            }
-        },
-        computed: {
-            title() {
-                return '创建一周计划'
-            },
-            rules() {
-                let rules = {
-                    planId: [
-                        { required: true, message: '请选择模板运行图', trigger: 'blur' }
-                    ],
-                    dateList: [
-                        { required: true, message: '请选择计划日期范围', trigger: 'change' }
-                    ]
-                }
+export default {
+	name: 'CreateWeekPlan',
+	components: {
+		ChooseTemplatePlan
+	},
+	data() {
+		return {
+			dialogShow: false,
+			loading: false,
+			model: {
+				planId: '',
+				planName: '',
+				dateList: []
+			}
+		};
+	},
+	computed: {
+		title() {
+			return '创建一周计划';
+		},
+		rules() {
+			const rules = {
+				planId: [
+					{ required: true, message: '请选择模板运行图', trigger: 'blur' }
+				],
+				dateList: [
+					{ required: true, message: '请选择计划日期范围', trigger: 'change' }
+				]
+			};
 
-                return rules;
-            }
-        },
-        mounted() {
-        },
-        methods: {
-            doShow(params) {
-                this.dialogShow = true;
-            },
-            doClose() {
-                this.loading = false;
-                this.dialogShow = false;
-            },
-            handleChoose() {
-                this.$refs.choose.doShow();
-            },
-            chooseConfirm(choose) {
-                if (choose) {
-                    this.model.planId = choose.id;
-                    this.model.planName = choose.name;
-                }
-            },
-            buildModel() {
-                return this.model.dateList.map(date => {
-                    return {
-                        loadTime: date,
-                        mapId: this.$route.query.mapId,
-                        templatePlanId: this.model.planId
-                    }
-                });
-            },
-            create() {
-                this.$refs['form'].validate((valid) => {
-                    if (valid) {
-                        createRunPlanLoad(this.buildModel()).then(response => {
-                            this.$message.success('创建运行图计划成功');
-                            this.$emit('reloadTable', { name: 'managePlanList' });
-                            this.doClose();
-                        }).catch(error => {
-                            this.doClose();
-                            this.$messageBox('创建运行图计划失败');
-                        })
-                    }
-                });
-            }
-        }
-    }
+			return rules;
+		}
+	},
+	mounted() {
+	},
+	methods: {
+		doShow(params) {
+			this.dialogShow = true;
+		},
+		doClose() {
+			this.loading = false;
+			this.dialogShow = false;
+		},
+		handleChoose() {
+			this.$refs.choose.doShow();
+		},
+		chooseConfirm(choose) {
+			if (choose) {
+				this.model.planId = choose.id;
+				this.model.planName = choose.name;
+			}
+		},
+		buildModel() {
+			return {
+				planDateList: this.model.dateList,
+				mapId: this.$route.query.mapId,
+				templatePlanId: this.model.planId
+			};
+		},
+		create() {
+			this.$refs['form'].validate((valid) => {
+				if (valid) {
+					createRunPlanLoad(this.buildModel()).then(response => {
+						this.$message.success('创建运行图计划成功');
+						this.doClose();
+					}).catch(() => {
+						this.doClose();
+						this.$messageBox('创建运行图计划失败');
+					});
+				}
+			});
+		}
+	}
+};
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
     @import "src/styles/mixin.scss";
@@ -124,4 +134,4 @@
             margin: 10px;
         }
     }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/jmap/theme/chengdu_03/menusPlan/deleteTask.vue b/src/jmap/theme/chengdu_03/menusPlan/deleteTask.vue
index b661ed20e..cd79c305f 100644
--- a/src/jmap/theme/chengdu_03/menusPlan/deleteTask.vue
+++ b/src/jmap/theme/chengdu_03/menusPlan/deleteTask.vue
@@ -1,57 +1,66 @@
 <template>
-    <el-dialog class="beijing-01__schedule delete-task" :title="title" :visible.sync="dialogShow" width="400px"
-        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
-        <el-row>
-            <el-radio v-model="type" :label="1">删除以前所有任务（包含本任务）</el-radio>
-        </el-row>
-        <el-row>
-            <el-radio v-model="type" :label="2">删除以后所有任务（包含本任务）</el-radio>
-        </el-row>
-        <el-row type="flex" justify="center" class="button-group">
-            <el-button @click="handleCommit">确 定</el-button>
-            <el-button @click="doClose">取 消</el-button>
-        </el-row>
-    </el-dialog>
+  <el-dialog
+    v-dialogDrag
+    class="beijing-01__schedule delete-task"
+    :title="title"
+    :visible.sync="dialogShow"
+    width="400px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <el-row>
+      <el-radio v-model="type" :label="1">删除以前所有任务（包含本任务）</el-radio>
+    </el-row>
+    <el-row>
+      <el-radio v-model="type" :label="2">删除以后所有任务（包含本任务）</el-radio>
+    </el-row>
+    <el-row type="flex" justify="center" class="button-group">
+      <el-button @click="handleCommit">确 定</el-button>
+      <el-button @click="doClose">取 消</el-button>
+    </el-row>
+  </el-dialog>
 </template>
 
 <script>
 
-    export default {
-        name: 'DeleteTask',
-        components: {
-        },
-        data() {
-            return {
-                dialogShow: false,
-                loading: false,
-                tripNumber: '',
-                serviceNumber: '',
-                type: '1',
-            }
-        },
-        computed: {
-            title() {
-                return '删除任务'
-            }
-        },
-        mounted() {
-        },
-        methods: {
-            doShow(params) {
-                this.tripNumber = params.tripNumber;
-                this.serviceNumber = params.serviceNumber;
-                this.dialogShow = true;
-            },
-            doClose() {
-                this.loading = false;
-                this.dialogShow = false;
-            },
-            handleCommit() {
-                // this.tripNumber
-                this.doClose();
-            }
-        }
-    }
+export default {
+	name: 'DeleteTask',
+	components: {
+	},
+	data() {
+		return {
+			dialogShow: false,
+			loading: false,
+			tripNumber: '',
+			serviceNumber: '',
+			type: '1'
+		};
+	},
+	computed: {
+		title() {
+			return '删除任务';
+		}
+	},
+	mounted() {
+	},
+	methods: {
+		doShow(params) {
+			this.tripNumber = params.tripNumber;
+			this.serviceNumber = params.serviceNumber;
+			this.dialogShow = true;
+		},
+		doClose() {
+			this.loading = false;
+			this.dialogShow = false;
+		},
+		handleCommit() {
+			// this.tripNumber
+			this.doClose();
+		}
+	}
+};
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
     @import "src/styles/mixin.scss";
@@ -61,4 +70,4 @@
             margin: 10px;
         }
     }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/jmap/theme/chengdu_03/menusPlan/deleteTodayPlan.vue b/src/jmap/theme/chengdu_03/menusPlan/deleteTodayPlan.vue
index 284028f97..2e22a7c64 100644
--- a/src/jmap/theme/chengdu_03/menusPlan/deleteTodayPlan.vue
+++ b/src/jmap/theme/chengdu_03/menusPlan/deleteTodayPlan.vue
@@ -1,46 +1,55 @@
 <template>
-    <el-dialog class="beijing-01__schedule create-week-plan" :title="title" :visible.sync="dialogShow" width="400px"
-        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
-        <el-row type="flex" justify="center" class="button-group">
-            <el-button @click="handleCommit">确 定</el-button>
-            <el-button @click="doClose">取 消</el-button>
-        </el-row>
-    </el-dialog>
+  <el-dialog
+    v-dialogDrag
+    class="beijing-01__schedule create-week-plan"
+    :title="title"
+    :visible.sync="dialogShow"
+    width="400px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <el-row type="flex" justify="center" class="button-group">
+      <el-button @click="handleCommit">确 定</el-button>
+      <el-button @click="doClose">取 消</el-button>
+    </el-row>
+  </el-dialog>
 </template>
 
 <script>
 
-    export default {
-        name: 'DeleteTodayPlan',
-        components: {
-        },
-        data() {
-            return {
-                dialogShow: false,
-                loading: false
-            }
-        },
-        computed: {
-            title() {
-                return '删除当天计划'
-            }
-        },
-        mounted() {
-        },
-        methods: {
-            doShow(params) {
-                this.dialogShow = true;
-            },
-            doClose() {
-                this.loading = false;
-                this.dialogShow = false;
-            },
-            handleCommit() {
-                // this.tripNumber
-                this.doClose();
-            }
-        }
-    }
+export default {
+	name: 'DeleteTodayPlan',
+	components: {
+	},
+	data() {
+		return {
+			dialogShow: false,
+			loading: false
+		};
+	},
+	computed: {
+		title() {
+			return '删除当天计划';
+		}
+	},
+	mounted() {
+	},
+	methods: {
+		doShow(params) {
+			this.dialogShow = true;
+		},
+		doClose() {
+			this.loading = false;
+			this.dialogShow = false;
+		},
+		handleCommit() {
+			// this.tripNumber
+			this.doClose();
+		}
+	}
+};
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
     @import "src/styles/mixin.scss";
@@ -50,4 +59,4 @@
             margin: 10px;
         }
     }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/jmap/theme/chengdu_03/menusPlan/managePlanList.vue b/src/jmap/theme/chengdu_03/menusPlan/managePlanList.vue
index b4ae47a4b..288ad3381 100644
--- a/src/jmap/theme/chengdu_03/menusPlan/managePlanList.vue
+++ b/src/jmap/theme/chengdu_03/menusPlan/managePlanList.vue
@@ -1,122 +1,143 @@
 <template>
-    <el-dialog class="beijing-01__schedule manage-plan-list" :title="title" :visible.sync="dialogShow" width="80%"
-        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
-        <QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList">
-        </QueryListPage>
-    </el-dialog>
+  <el-dialog
+    v-dialogDrag
+    class="beijing-01__schedule manage-plan-list"
+    :title="title"
+    :visible.sync="dialogShow"
+    width="80%"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
+  </el-dialog>
 </template>
 
 <script>
-    import { getRunPlanLoadList, deleteRunPlanLoad } from '@/api/runplan';
+import { getRunPlanLoadList, deleteRunPlanLoad, listAllTempLateRunPlan } from '@/api/runplan';
+import { listPublishMap } from '@/api/jmap/map';
 
-    export default {
-        name: 'ManagePlanList',
-        data() {
-            return {
-                dialogShow: false,
-                loading: false,
-                pagerConfig: {
-                    pageSize: 'pageSize',
-                    pageIndex: 'pageNum'
-                },
-                queryForm: {
-                    labelWidth: '140px',
-                    reset: true,
-                    queryObject: {
-                        runPlanName: {
-                            type: 'text',
-                            label: '运行图名称'
-                        }
-                    }
-                },
-                queryList: {
-                    query: this.queryFunction,
-                    selectCheckShow: false,
-                    indexShow: true,
-                    columns: [
-                        {
-                            title: '地图名称',
-                            prop: 'mapName'
-                        },
-                        {
-                            title: '运行图名称',
-                            prop: 'runPlanName',
-                        },
-                        {
-                            title: '加载日期',
-                            prop: 'loadTime'
-                        },
-                        {
-                            type: 'button',
-                            title: '操作',
-                            width: '100',
-                            buttons: [
-                                {
-                                    name: '删除',
-                                    handleClick: this.handleDelete,
-                                    type: 'danger'
-                                }
-                            ]
-                        }
-                    ],
-                    actions: [
-                        { text: '创建', btnCode: 'employee_insert', handler: this.handleCreateRunPlan },
-                    ]
-                },
+export default {
+	name: 'ManagePlanList',
+	data() {
+		return {
+			dialogShow: false,
+			loading: false,
+			pagerConfig: {
+				pageSize: 'pageSize',
+				pageIndex: 'pageNum'
+			},
+			queryForm: {
+				labelWidth: '140px',
+				reset: true
+			},
+			queryList: {
+				query: this.queryFunction,
+				selectCheckShow: false,
+				indexShow: true,
+				columns: [
+					{
+						title: this.$t('publish.mapName'),
+						prop: 'mapId',
+						type: 'tag',
+						columnValue: (row) => { return this.$convertField(row.mapId, this.mapList, ['id', 'name']); },
+						tagType: (row) => { return ''; }
+					},
+					{
+						title: this.$t('publish.runPlanName'),
+						prop: 'templatePlanId',
+						type: 'tag',
+						columnValue: (row) => { return this.$convertField(row.templatePlanId, this.templatePlanList, ['id', 'name']); },
+						tagType: (row) => { return 'success'; }
+					},
+					{
+						title: '加载日期',
+						prop: 'loadTime'
+					},
+					{
+						type: 'button',
+						title: '操作',
+						width: '100',
+						buttons: [
+							{
+								name: '删除',
+								handleClick: this.handleDelete,
+								type: 'danger'
+							}
+						]
+					}
+				],
+				actions: [
+					{ text: '创建', btnCode: 'employee_insert', handler: this.handleCreateRunPlan }
+				]
+			},
 
-                currentModel: {}
-            }
-        },
-        computed: {
-            title() {
-                return '运行图计划表'
-            }
-        },
-        created() {
-        },
-        methods: {
-            queryFunction(params) {
-                if (this.$route.query.mapId) {
-                    params['mapId'] = this.$route.query.mapId;
-                }
+			currentModel: {}
+		};
+	},
+	computed: {
+		title() {
+			return '运行图计划表';
+		}
+	},
+	mounted() {
+		this.loadPageData();
+	},
+	methods: {
+		loadPageData() {
+			this.mapList = [];
+			listPublishMap().then(resp => {
+				this.mapList = resp.data;
+			});
+			this.templatePlanList = [];
+			listAllTempLateRunPlan().then(resp => {
+				this.templatePlanList = resp.data;
+			});
+		},
+		queryFunction(params) {
+			if (this.$route.query.mapId) {
+				params['mapId'] = this.$route.query.mapId;
+			}
 
-                if (this.$store.state.user.id) {
-                    params['userId'] = this.$store.state.user.id;
-                }
+			if (this.$store.state.user.id) {
+				params['userId'] = this.$store.state.user.id;
+			}
 
-                return getRunPlanLoadList(params);
-            },
-            handleDelete(index, row) {
-                this.$confirm('此操作将删除次日加载的运行图, 是否继续?', '提示', {
-                    confirmButtonText: '确定',
-                    cancelButtonText: '取消',
-                    type: 'warning'
-                }).then(() => {
-                    deleteRunPlanLoad(row.id).then(response => {
-                        this.$message.success('删除成功')
-                        this.reloadTable()
-                    }).catch(error => {
-                        this.reloadTable()
-                        this.$messageBox('删除失败')
-                    })
-                }).catch(() => { })
-            },
-            handleCreateRunPlan() {
-                this.$emit('dispatchDialog', { name: 'createWeekPlan' });
-            },
-            doShow() {
-                this.dialogShow = true;
-            },
-            doClose() {
-                this.loading = false;
-                this.dialogShow = false;
-            },
-            reloadTable() {
-                this.queryList.reload()
-            }
-        }
-    }
+			return getRunPlanLoadList(params);
+		},
+		handleDelete(index, row) {
+			this.$confirm('此操作将删除次日加载的运行图, 是否继续?', '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning'
+			}).then(() => {
+				deleteRunPlanLoad(row.id).then(response => {
+					this.$message.success('删除成功');
+					this.reloadTable();
+				}).catch(() => {
+					this.reloadTable();
+					this.$messageBox('删除失败');
+				});
+			}).catch(() => { });
+		},
+		handleCreateRunPlan() {
+			this.$emit('dispatchDialog', { name: 'createWeekPlan' });
+		},
+		doShow() {
+			this.dialogShow = true;
+			this.$nextTick(()=> { this.reloadTable(); });
+		},
+		doClose() {
+			this.loading = false;
+			this.dialogShow = false;
+		},
+		reloadTable() {
+			this.queryList.reload();
+		}
+	}
+};
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
     @import "src/styles/mixin.scss";
-</style>
\ No newline at end of file
+</style>
diff --git a/src/jmap/theme/chengdu_03/menusPlan/modifyingPlan.vue b/src/jmap/theme/chengdu_03/menusPlan/modifyingPlan.vue
index c9b645b7c..1d2b31102 100644
--- a/src/jmap/theme/chengdu_03/menusPlan/modifyingPlan.vue
+++ b/src/jmap/theme/chengdu_03/menusPlan/modifyingPlan.vue
@@ -1,152 +1,152 @@
 <template>
-    <el-dialog class="beijing-01__schedule edit-planning-train" :title="title" :visible.sync="dialogShow" width="800px"
-        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
-        <el-row>
-            <el-col :offset="10">列车线路</el-col>
-        </el-row>
-        <el-row>
-            <el-col :span="17">
-                <el-table :data="serviceData" border style="width: 100%" height="160">
-                    <el-table-column prop="startStationCode" label="起点站">
-                    </el-table-column>
-                    <el-table-column prop="startStationStandCode" label="起点站台">
-                    </el-table-column>
-                    <el-table-column prop="endStationCode" label="终点站">
-                    </el-table-column>
-                    <el-table-column prop="endStationStandCode" label="终点站台">
-                    </el-table-column>
-                </el-table>
-            </el-col>
-            <el-col :span="6" :offset="1">
-                <el-row type="flex" justify="center">
-                    <el-button class="view-button" @click="handleAddTask">加任务</el-button>
-                </el-row>
-                <el-row type="flex" justify="center">
-                    <el-button class="view-button" @click="handleReplace">替&ensp;&ensp;换</el-button>
-                </el-row>
-                <el-row type="flex" justify="center">
-                    <el-button class="view-button" @click="handleDeleteTask">删任务</el-button>
-                </el-row>
-                <div class="view-box">
-                    <el-row type="flex" justify="center">
-                        <el-radio-group v-model="storeInOut">
-                            <el-radio :label="1">进库</el-radio>
-                            <el-radio :label="2">出库</el-radio>
-                        </el-radio-group>
-                    </el-row>
-                </div>
-            </el-col>
-        </el-row>
-        <el-row class="view-box">
-            <el-col :span="9" style="padding-left: 10px">
-                <el-input v-model="oldServiceNumber" size="small" :disabled="true"></el-input>
-            </el-col>
-            <el-col :span="9" style="padding-left: 20px">
-                <el-input v-model="newServiceNumber" size="small"></el-input>
-            </el-col>
-            <el-col :span="5" style="padding-left: 20px">
-                <el-button @click="handleModifyingTripNumber" style="width: 150px;">改车次号</el-button>
-            </el-col>
-        </el-row>
-        <el-row style="margin-top: 10px">
-            <el-col :span="4"><span class="view-label">线路开始时间</span></el-col>
-            <el-col :span="8">
-                <el-time-select v-model="serviceStartTime" size="small"></el-time-select>
-            </el-col>
-            <el-col :span="4"><span class="view-label">线路结束时间</span></el-col>
-            <el-col :span="8">
-                <el-time-select v-model="serviceEndTime" size="small"></el-time-select>
-            </el-col>
-        </el-row>
-        <el-row style="margin-top: 20px">
-            <el-col :offset="10">线路详细信息</el-col>
-        </el-row>
-        <el-row>
-            <el-table :data="tripData" border style="width: 100%" height="200">
-                <el-table-column prop="arriveTime" label="到站时间">
-                </el-table-column>
-                <el-table-column prop="stationCode" label="车站">
-                </el-table-column>
-                <el-table-column prop="stationStandCode" label="站台">
-                </el-table-column>
-                <el-table-column prop="stopTime" label="停站时间">
-                </el-table-column>
-                <el-table-column prop="level" label="运行等级">
-                </el-table-column>
-            </el-table>
-        </el-row>
-        <el-row style="margin-top: 20px">
-            <el-checkbox v-model="effect">影响后续任务</el-checkbox>
+  <el-dialog
+    v-dialogDrag
+    class="beijing-01__schedule edit-planning-train"
+    :title="title"
+    :visible.sync="dialogShow"
+    width="800px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <el-row>
+      <el-col :offset="10">列车线路</el-col>
+    </el-row>
+    <el-row>
+      <el-col :span="17">
+        <el-table :data="serviceData" border style="width: 100%" height="160">
+          <el-table-column prop="startStationCode" label="起点站" />
+          <el-table-column prop="startStationStandCode" label="起点站台" />
+          <el-table-column prop="endStationCode" label="终点站" />
+          <el-table-column prop="endStationStandCode" label="终点站台" />
+        </el-table>
+      </el-col>
+      <el-col :span="6" :offset="1">
+        <el-row type="flex" justify="center">
+          <el-button class="view-button" @click="handleAddTask">加任务</el-button>
         </el-row>
         <el-row type="flex" justify="center">
-            <el-button @click="handleCommit">确 定</el-button>
-            <el-button @click="doClose">取 消</el-button>
+          <el-button class="view-button" @click="handleReplace">替&ensp;&ensp;换</el-button>
         </el-row>
-    </el-dialog>
+        <el-row type="flex" justify="center">
+          <el-button class="view-button" @click="handleDeleteTask">删任务</el-button>
+        </el-row>
+        <div class="view-box">
+          <el-row type="flex" justify="center">
+            <el-radio-group v-model="storeInOut">
+              <el-radio :label="1">进库</el-radio>
+              <el-radio :label="2">出库</el-radio>
+            </el-radio-group>
+          </el-row>
+        </div>
+      </el-col>
+    </el-row>
+    <el-row class="view-box">
+      <el-col :span="9" style="padding-left: 10px">
+        <el-input v-model="oldServiceNumber" size="small" :disabled="true" />
+      </el-col>
+      <el-col :span="9" style="padding-left: 20px">
+        <el-input v-model="newServiceNumber" size="small" />
+      </el-col>
+      <el-col :span="5" style="padding-left: 20px">
+        <el-button style="width: 150px;" @click="handleModifyingTripNumber">改车次号</el-button>
+      </el-col>
+    </el-row>
+    <el-row style="margin-top: 10px">
+      <el-col :span="4"><span class="view-label">线路开始时间</span></el-col>
+      <el-col :span="8">
+        <el-time-select v-model="serviceStartTime" size="small" />
+      </el-col>
+      <el-col :span="4"><span class="view-label">线路结束时间</span></el-col>
+      <el-col :span="8">
+        <el-time-select v-model="serviceEndTime" size="small" />
+      </el-col>
+    </el-row>
+    <el-row style="margin-top: 20px">
+      <el-col :offset="10">线路详细信息</el-col>
+    </el-row>
+    <el-row>
+      <el-table :data="tripData" border style="width: 100%" height="200">
+        <el-table-column prop="arriveTime" label="到站时间" />
+        <el-table-column prop="stationCode" label="车站" />
+        <el-table-column prop="stationStandCode" label="站台" />
+        <el-table-column prop="stopTime" label="停站时间" />
+        <el-table-column prop="level" label="运行等级" />
+      </el-table>
+    </el-row>
+    <el-row style="margin-top: 20px">
+      <el-checkbox v-model="effect">影响后续任务</el-checkbox>
+    </el-row>
+    <el-row type="flex" justify="center">
+      <el-button @click="handleCommit">确 定</el-button>
+      <el-button @click="doClose">取 消</el-button>
+    </el-row>
+  </el-dialog>
 </template>
 
 <script>
-    import { formatTime, formatName } from '@/utils/runPlan';
+import { formatTime, formatName } from '@/utils/runPlan';
 
-    export default {
-        name: 'modifyingPlan',
-        data() {
-            return {
-                dialogShow: false,
-                loading: false,
-                effect: false,
-                storeInOut: '1',
-                oldServiceNumber: '',
-                newServiceNumber: '',
-                serviceStartTime: '',
-                serviceEndTime: '',
-                serviceData: [],
-                tripData: [],
-            }
-        },
-        computed: {
-            title() {
-                return '修改'
-            }
-        },
-        mounted() {
-        },
-        methods: {
-            formatTime(time) {
-                return formatTime(time);
-            },
-            formatName(code) {
-                return formatName(code);
-            },
-            doShow() {
-                this.dialogShow = true;
-            },
-            doClose() {
-                this.loading = false;
-                this.dialogShow = false;
-            },
-            // 加任务
-            handleAddTask() {
-                this.$emit('dispatchDialog', { name: 'addTask', params: {} })
-            },
-            // 替换
-            handleReplace() {
-                this.$emit('dispatchDialog', { name: 'modifyingTask', params: {} })
-            },
-            // 删任务
-            handleDeleteTask() {
-                this.$emit('dispatchDialog', { name: 'deleteTask', params: {} })
-            },
-            // 改车次号
-            handleModifyingTripNumber() {
-                this.$emit('dispatchDialog', { name: 'modifyingTripNumber', params: {} })
-            },
-            // 确定修改
-            handleCommit() {
-                this.doClose();
-            }
-        }
-    }
+export default {
+	name: 'ModifyingPlan',
+	data() {
+		return {
+			dialogShow: false,
+			loading: false,
+			effect: false,
+			storeInOut: '1',
+			oldServiceNumber: '',
+			newServiceNumber: '',
+			serviceStartTime: '',
+			serviceEndTime: '',
+			serviceData: [],
+			tripData: []
+		};
+	},
+	computed: {
+		title() {
+			return '修改';
+		}
+	},
+	mounted() {
+	},
+	methods: {
+		formatTime(time) {
+			return formatTime(time);
+		},
+		formatName(code) {
+			return formatName(code);
+		},
+		doShow() {
+			this.dialogShow = true;
+		},
+		doClose() {
+			this.loading = false;
+			this.dialogShow = false;
+		},
+		// 加任务
+		handleAddTask() {
+			this.$emit('dispatchDialog', { name: 'addTask', params: {} });
+		},
+		// 替换
+		handleReplace() {
+			this.$emit('dispatchDialog', { name: 'modifyingTask', params: {} });
+		},
+		// 删任务
+		handleDeleteTask() {
+			this.$emit('dispatchDialog', { name: 'deleteTask', params: {} });
+		},
+		// 改车次号
+		handleModifyingTripNumber() {
+			this.$emit('dispatchDialog', { name: 'modifyingTripNumber', params: {} });
+		},
+		// 确定修改
+		handleCommit() {
+			this.doClose();
+		}
+	}
+};
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
     @import "src/styles/mixin.scss";
@@ -157,13 +157,11 @@
         margin-left: 0px;
     }
 
-
     .view-label {
         height: 32px;
         line-height: 32px;
     }
 
-
     .view-box {
         padding: 10px 0px;
         border: 1px inset gray;
@@ -176,4 +174,4 @@
             margin: 5px 20px;
         }
     }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/jmap/theme/chengdu_03/menusPlan/modifyingTask.vue b/src/jmap/theme/chengdu_03/menusPlan/modifyingTask.vue
index 5f197a1ff..4679c003e 100644
--- a/src/jmap/theme/chengdu_03/menusPlan/modifyingTask.vue
+++ b/src/jmap/theme/chengdu_03/menusPlan/modifyingTask.vue
@@ -1,298 +1,309 @@
 <template>
-    <el-dialog class="beijing-01__schedule add-task" :title="title" :visible.sync="dialogShow" width="1000px"
-        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
-        <div style="margin: 10px">
-            <el-row>
-                <el-col :span="4">
-                    <el-row>
-                        <el-col :span="9">
-                            <span>车次号：</span>
-                        </el-col>
-                        <el-col :span="15">
-                            <el-select style="display: inline-black" v-model="model.tripNumber" placeholder="请选择">
-                                <el-option v-for="item in tripNumberList" :key="item.value" :label="item.label"
-                                    :value="item.value">
-                                </el-option>
-                            </el-select>
-                        </el-col>
-                    </el-row>
-                </el-col>
-                <el-col :span="2">
-                    <el-row>
-                        <el-col :offset="4">
-                            <el-checkbox v-model="model.trainManual">手工</el-checkbox>
-                        </el-col>
-                    </el-row>
-                </el-col>
-                <el-col :span="5">
-                    <el-row>
-                        <el-col :span="12">
-                            <span>缺省停站时间：</span>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-select style="display: inline-black" v-model="model.time" placeholder="请选择">
-                                <el-option v-for="item in timeList" :key="item.value" :label="item.label"
-                                    :value="item.value">
-                                </el-option>
-                            </el-select>
-                        </el-col>
-                    </el-row>
-                </el-col>
-                <el-col :span="5">
-                    <el-row>
-                        <el-col :span="9" :offset="2">
-                            <span>表号：</span>
-                        </el-col>
-                        <el-col :span="13">
-                            <el-input v-model="model.serviceNumber"></el-input>
-                        </el-col>
-                    </el-row>
+  <el-dialog
+    v-dialogDrag
+    class="beijing-01__schedule add-task"
+    :title="title"
+    :visible.sync="dialogShow"
+    width="1000px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <div style="margin: 10px">
+      <el-row>
+        <el-col :span="4">
+          <el-row>
+            <el-col :span="9">
+              <span>车次号：</span>
+            </el-col>
+            <el-col :span="15">
+              <el-select v-model="model.tripNumber" style="display: inline-black" placeholder="请选择">
+                <el-option
+                  v-for="item in tripNumberList"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-col>
+          </el-row>
+        </el-col>
+        <el-col :span="2">
+          <el-row>
+            <el-col :offset="4">
+              <el-checkbox v-model="model.trainManual">手工</el-checkbox>
+            </el-col>
+          </el-row>
+        </el-col>
+        <el-col :span="5">
+          <el-row>
+            <el-col :span="12">
+              <span>缺省停站时间：</span>
+            </el-col>
+            <el-col :span="12">
+              <el-select v-model="model.time" style="display: inline-black" placeholder="请选择">
+                <el-option
+                  v-for="item in timeList"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-col>
+          </el-row>
+        </el-col>
+        <el-col :span="5">
+          <el-row>
+            <el-col :span="9" :offset="2">
+              <span>表号：</span>
+            </el-col>
+            <el-col :span="13">
+              <el-input v-model="model.serviceNumber" />
+            </el-col>
+          </el-row>
+        </el-col>
+        <el-col :span="8">
+          <el-row>
+            <el-col :span="22" :offset="2">
+              <el-row>
+                <el-col :span="6">
+                  <el-checkbox v-model="model.clearGuest">清客</el-checkbox>
                 </el-col>
                 <el-col :span="8">
-                    <el-row>
-                        <el-col :span="22" :offset="2">
-                            <el-row>
-                                <el-col :span="6">
-                                    <el-checkbox v-model="model.clearGuest">清客</el-checkbox>
-                                </el-col>
-                                <el-col :span="8">
-                                    <el-checkbox v-model="model.continuationPlan">延续计划</el-checkbox>
-                                </el-col>
-                                <el-col :span="6">
-                                    <el-checkbox v-model="model.firstTrain">首班车</el-checkbox>
-                                </el-col>
-                            </el-row>
-                        </el-col>
-                    </el-row>
+                  <el-checkbox v-model="model.continuationPlan">延续计划</el-checkbox>
                 </el-col>
-            </el-row>
-            <el-row>
-                <el-col :span="4">
-                    <el-row>
-                        <el-col :span="9">
-                            <span>序列号：</span>
-                        </el-col>
-                        <el-col :span="15">
-                            <el-select style="display: inline-black" v-model="model.serialNumber" placeholder="请选择">
-                                <el-option v-for="item in serialNumberList" :key="item.value" :label="item.label"
-                                    :value="model.value">
-                                </el-option>
-                            </el-select>
-                        </el-col>
-                    </el-row>
+                <el-col :span="6">
+                  <el-checkbox v-model="model.firstTrain">首班车</el-checkbox>
                 </el-col>
-                <el-col :span="2">
-                    <el-row>
-                        <el-col :offset="4">
-                            <el-checkbox v-model="model.serialManual">手工</el-checkbox>
-                        </el-col>
-                    </el-row>
-                </el-col>
-                <el-col :span="5">
-                    <el-row>
-                        <el-col :span="12">
-                            <span>缺省运行等级：</span>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-select style="display: inline-black" v-model="model.level" placeholder="请选择">
-                                <el-option v-for="item in levelList" :key="item.value" :label="item.label"
-                                    :value="item.value">
-                                </el-option>
-                            </el-select>
-                        </el-col>
-                    </el-row>
-                </el-col>
-                <el-col :span="5">
-                    <el-row>
-                        <el-col :span="9" :offset="2">
-                            <span>开始时间：</span>
-                        </el-col>
-                        <el-col :span="13">
-                            <el-time-select v-model="model.startTime" placeholder="选择时间" :clearable="false">
-                            </el-time-select>
-                        </el-col>
-                    </el-row>
+              </el-row>
+            </el-col>
+          </el-row>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="4">
+          <el-row>
+            <el-col :span="9">
+              <span>序列号：</span>
+            </el-col>
+            <el-col :span="15">
+              <el-select v-model="model.serialNumber" style="display: inline-black" placeholder="请选择">
+                <el-option
+                  v-for="item in serialNumberList"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="model.value"
+                />
+              </el-select>
+            </el-col>
+          </el-row>
+        </el-col>
+        <el-col :span="2">
+          <el-row>
+            <el-col :offset="4">
+              <el-checkbox v-model="model.serialManual">手工</el-checkbox>
+            </el-col>
+          </el-row>
+        </el-col>
+        <el-col :span="5">
+          <el-row>
+            <el-col :span="12">
+              <span>缺省运行等级：</span>
+            </el-col>
+            <el-col :span="12">
+              <el-select v-model="model.level" style="display: inline-black" placeholder="请选择">
+                <el-option
+                  v-for="item in levelList"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-col>
+          </el-row>
+        </el-col>
+        <el-col :span="5">
+          <el-row>
+            <el-col :span="9" :offset="2">
+              <span>开始时间：</span>
+            </el-col>
+            <el-col :span="13">
+              <el-time-select v-model="model.startTime" placeholder="选择时间" :clearable="false" />
+            </el-col>
+          </el-row>
+        </el-col>
+        <el-col :span="8">
+          <el-row>
+            <el-col :span="22" :offset="2">
+              <el-row>
+                <el-col :span="6">
+                  <el-checkbox v-model="model.inStock">入库</el-checkbox>
                 </el-col>
                 <el-col :span="8">
-                    <el-row>
-                        <el-col :span="22" :offset="2">
-                            <el-row>
-                                <el-col :span="6">
-                                    <el-checkbox v-model="model.inStock">入库</el-checkbox>
-                                </el-col>
-                                <el-col :span="8">
-                                    <el-checkbox v-model="model.outStock">出库</el-checkbox>
-                                </el-col>
-                                <el-col :span="6">
-                                    <el-checkbox v-model="model.lastTrain">末班车</el-checkbox>
-                                </el-col>
-                            </el-row>
-                        </el-col>
-                    </el-row>
+                  <el-checkbox v-model="model.outStock">出库</el-checkbox>
                 </el-col>
-            </el-row>
-            <el-row style="margin-bottom: 5px;">
-                交路：
-            </el-row>
-            <el-row>
-                <el-table :data="model.route" border :height="140">
-                    <el-table-column prop="beginStationCode" label="起始站">
-                        <template slot-scope="scope">
-                            {{ formatName(scope.row.beginStationCode) }}
-                        </template>
-                    </el-table-column>
-                    <el-table-column prop="beginStationStandCode" label="起始站台">
-                    </el-table-column>
-                    <el-table-column prop="endStationCode" label="终到站">
-                        <template slot-scope="scope">
-                            {{ formatName(scope.row.endStationCode) }}
-                        </template>
-                    </el-table-column>
-                    <el-table-column prop="endStationStandCode" label="终到站台">
-                    </el-table-column>
-                    <el-table-column prop="describe" label="描述" :width="280">
-                    </el-table-column>
-                    <el-table-column :width="40">
-                    </el-table-column>
-                </el-table>
-            </el-row>
-            <el-row style=" margin-bottom: 5px;margin-top: 10px;">
-                详情：
-            </el-row>
-            <el-row>
-                <el-table :data="model.detail" border :height="140">
-                    <el-table-column prop="stationCode" label="站台" :width="160">
-                        <template slot-scope="scope">
-                            {{ formatName(scope.row.stationCode) }}
-                        </template>
-                    </el-table-column>
-                    <el-table-column prop="startTime" label="到点">
-                        <template slot-scope="scope">
-                            {{ formatTime(scope.row.startTime) }}
-                        </template>
-                    </el-table-column>
-                    <el-table-column prop="stopTime" label="停站时间">
-                        <template slot-scope="scope">
-                            {{ formatTime(scope.row.stopTime) }}
-                        </template>
-                    </el-table-column>
-                    <el-table-column prop="endTime" label="发点">
-                        <template slot-scope="scope">
-                            {{ formatTime(scope.row.endTime) }}
-                        </template>
-                    </el-table-column>
-                    <el-table-column prop="level" label="运行等级">
-                    </el-table-column>
-                    <el-table-column width="280">
-                    </el-table-column>
-                </el-table>
-            </el-row>
-            <el-row>
-                <el-col :offset="16">
-                    <el-checkbox v-model="model.default">显示默认停站时间和运行等级</el-checkbox>
+                <el-col :span="6">
+                  <el-checkbox v-model="model.lastTrain">末班车</el-checkbox>
                 </el-col>
-            </el-row>
-        </div>
-        <el-row type="flex" justify="center" class="button-group">
-            <el-button @click="handleCommit">确 定</el-button>
-            <el-button @click="doClose">取 消</el-button>
-        </el-row>
-    </el-dialog>
+              </el-row>
+            </el-col>
+          </el-row>
+        </el-col>
+      </el-row>
+      <el-row style="margin-bottom: 5px;">
+        交路：
+      </el-row>
+      <el-row>
+        <el-table :data="model.route" border :height="140">
+          <el-table-column prop="beginStationCode" label="起始站">
+            <template slot-scope="scope">
+              {{ formatName(scope.row.beginStationCode) }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="beginStationStandCode" label="起始站台" />
+          <el-table-column prop="endStationCode" label="终到站">
+            <template slot-scope="scope">
+              {{ formatName(scope.row.endStationCode) }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="endStationStandCode" label="终到站台" />
+          <el-table-column prop="describe" label="描述" :width="280" />
+          <el-table-column :width="40" />
+        </el-table>
+      </el-row>
+      <el-row style=" margin-bottom: 5px;margin-top: 10px;">
+        详情：
+      </el-row>
+      <el-row>
+        <el-table :data="model.detail" border :height="140">
+          <el-table-column prop="stationCode" label="站台" :width="160">
+            <template slot-scope="scope">
+              {{ formatName(scope.row.stationCode) }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="startTime" label="到点">
+            <template slot-scope="scope">
+              {{ formatTime(scope.row.startTime) }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="stopTime" label="停站时间">
+            <template slot-scope="scope">
+              {{ formatTime(scope.row.stopTime) }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="endTime" label="发点">
+            <template slot-scope="scope">
+              {{ formatTime(scope.row.endTime) }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="level" label="运行等级" />
+          <el-table-column width="280" />
+        </el-table>
+      </el-row>
+      <el-row>
+        <el-col :offset="16">
+          <el-checkbox v-model="model.default">显示默认停站时间和运行等级</el-checkbox>
+        </el-col>
+      </el-row>
+    </div>
+    <el-row type="flex" justify="center" class="button-group">
+      <el-button @click="handleCommit">确 定</el-button>
+      <el-button @click="doClose">取 消</el-button>
+    </el-row>
+  </el-dialog>
 </template>
 
 <script>
-    import { formatTime, formatName } from '@/utils/runPlan';
+import { formatTime, formatName } from '@/utils/runPlan';
 
-    export default {
-        name: 'ModifyingTask',
-        components: {
-        },
-        data() {
-            return {
-                dialogShow: false,
-                loading: false,
-                model: {
-                    tripNumber: '',
-                    serialNumber: '',
-                    trainManual: false,
-                    serialManual: false,
-                    clearGuest: false,
-                    continuationPlan: false,
-                    firstTrain: false,
-                    lastTrain: false,
-                    inStock: false,
-                    outStock: false,
-                    startTime: '',
-                    route: [],
-                    detail: []
-                },
-                timeList: [],
-                levelList: [],
-                tripNumberList: [],
-                serialNumberList: [],
-            }
-        },
-        computed: {
-            title() {
-                return '修改任务'
-            }
-        },
-        mounted() {
-        },
-        methods: {
-            formatTime(time) {
-                return formatTime(time);
-            },
-            formatName(code) {
-                return formatName(code);
-            },
-            loadInitData(params) {
-                this.model.tripNumber = params.tripNumber;
-                this.model.serviceNumber = params.serviceNumber;
-                let editData = this.$store.state.runPlan.editData[params.serviceNumber]
-                if (editData) {
-                    let tripNumberList = Object.keys(editData.trainMap).sort((a, b) => { return editData.trainMap[a].oldIndex - editData.trainMap[b].oldIndex });
-                    let trainInfo = editData.trainMap[params.tripNumber];
-                    let lastIndex = trainInfo.stationTimeList.length - 1;
-                    let taskObj = {
-                        tripNumber: params.tripNumber,
-                        beginStationCode: trainInfo.stationTimeList[0].stationCode,
-                        beginStationStandCode: '',
-                        endStationCode: trainInfo.stationTimeList[lastIndex].stationCode,
-                        endStationStandCode: ''
-                    }
-                    this.model.route.push(taskObj);
+export default {
+	name: 'ModifyingTask',
+	components: {
+	},
+	data() {
+		return {
+			dialogShow: false,
+			loading: false,
+			model: {
+				tripNumber: '',
+				serialNumber: '',
+				trainManual: false,
+				serialManual: false,
+				clearGuest: false,
+				continuationPlan: false,
+				firstTrain: false,
+				lastTrain: false,
+				inStock: false,
+				outStock: false,
+				startTime: '',
+				route: [],
+				detail: []
+			},
+			timeList: [],
+			levelList: [],
+			tripNumberList: [],
+			serialNumberList: []
+		};
+	},
+	computed: {
+		title() {
+			return '修改任务';
+		}
+	},
+	mounted() {
+	},
+	methods: {
+		formatTime(time) {
+			return formatTime(time);
+		},
+		formatName(code) {
+			return formatName(code);
+		},
+		loadInitData(params) {
+			this.model.tripNumber = params.tripNumber;
+			this.model.serviceNumber = params.serviceNumber;
+			const editData = this.$store.state.runPlan.editData[params.serviceNumber];
+			if (editData) {
+				const trainInfo = editData.trainMap[params.tripNumber];
+				const lastIndex = trainInfo.stationTimeList.length - 1;
+				const taskObj = {
+					tripNumber: params.tripNumber,
+					beginStationCode: trainInfo.stationTimeList[0].stationCode,
+					beginStationStandCode: '',
+					endStationCode: trainInfo.stationTimeList[lastIndex].stationCode,
+					endStationStandCode: ''
+				};
+				this.model.route.push(taskObj);
 
-                    trainInfo.stationTimeList.forEach((elem, index) => {
-                        let stationObj = {
-                            stationCode: elem.stationCode,
-                            startTime: index == 0 ? null : trainInfo.stationTimeList[index - 1].secondTime,
-                            stopTime: index == 0 ? null : elem.secondTime - trainInfo.stationTimeList[index - 1].secondTime,
-                            endTime: elem.secondTime,
-                            level: '',
-                        }
-                        this.model.detail.push(stationObj);
-                    })
-                }
-            },
-            doShow(params) {
-                this.loadInitData(params);
-                this.dialogShow = true;
-            },
-            doClose() {
-                this.loading = false;
-                this.dialogShow = false;
-            },
-            handleCommit() {
-            }
-        }
-    }
+				trainInfo.stationTimeList.forEach((elem, index) => {
+					const stationObj = {
+						stationCode: elem.stationCode,
+						startTime: index == 0 ? null : trainInfo.stationTimeList[index - 1].secondTime,
+						stopTime: index == 0 ? null : elem.secondTime - trainInfo.stationTimeList[index - 1].secondTime,
+						endTime: elem.secondTime,
+						level: ''
+					};
+					this.model.detail.push(stationObj);
+				});
+			}
+		},
+		doShow(params) {
+			this.loadInitData(params);
+			this.dialogShow = true;
+		},
+		doClose() {
+			this.loading = false;
+			this.dialogShow = false;
+		},
+		handleCommit() {
+		}
+	}
+};
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
     @import "src/styles/mixin.scss";
 
-
-
     /deep/ {
         .el-button {
             margin-left: 40px !important;
@@ -312,4 +323,4 @@
             width: 110px !important;
         }
     }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/jmap/theme/chengdu_04/menus/menuTrain.vue b/src/jmap/theme/chengdu_04/menus/menuTrain.vue
index cc1f69691..989ceb08e 100644
--- a/src/jmap/theme/chengdu_04/menus/menuTrain.vue
+++ b/src/jmap/theme/chengdu_04/menus/menuTrain.vue
@@ -12,7 +12,10 @@ export default {
 	},
 	props: {
 		selected: {
-			type: Object
+			type: Object,
+			default() {
+				return null;
+			}
 		}
 	},
 	data() {
diff --git a/src/jmap/theme/chengdu_04/menusPlan/addTask.vue b/src/jmap/theme/chengdu_04/menusPlan/addTask.vue
index 10a8fd228..009c19f02 100644
--- a/src/jmap/theme/chengdu_04/menusPlan/addTask.vue
+++ b/src/jmap/theme/chengdu_04/menusPlan/addTask.vue
@@ -1,150 +1,162 @@
 <template>
-    <el-dialog class="beijing-01__schedule add-task" :title="title" :visible.sync="dialogShow" width="800px"
-        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
-        <div style="margin: 10px">
-            <el-row>
-                <el-col :span="3">
-                    <el-radio v-model="model.type" label="1">加在最前</el-radio>
-                </el-col>
-                <el-col :span="2" :offset="1">
-                    <span>车次号：</span>
-                </el-col>
-                <el-col :span="5">
-                    <el-select v-model="model.tripNumber" placeholder="请选择">
-                        <el-option v-for="item in tripNumberList" :key="item.value" :label="item.label"
-                            :value="item.value">
-                        </el-option>
-                    </el-select>
-                </el-col>
-                <el-col :span="3" :offset="1">
-                    <span>开始时间：</span>
-                </el-col>
-                <el-col :span="5">
-                    <el-select v-model="model.startTime" placeholder="请选择">
-                        <el-option v-for="item in tripNumberList" :key="item.value" :label="item.label"
-                            :value="item.value">
-                        </el-option>
-                    </el-select>
-                </el-col>
-            </el-row>
-            <el-row>
-                <el-col :span="3">
-                    <el-radio v-model="model.type" label="2">加在最后</el-radio>
-                </el-col>
-                <el-col :span="2" :offset="1">
-                    <span>车次号：</span>
-                </el-col>
-                <el-col :span="5">
-                    <el-select v-model="model.tripNumber" placeholder="请选择">
-                        <el-option v-for="item in tripNumberList" :key="item.value" :label="item.label"
-                            :value="item.value">
-                        </el-option>
-                    </el-select>
-                </el-col>
-                <el-col :span="3" :offset="1">
-                    <span>开始时间：</span>
-                </el-col>
-                <el-col :span="5">
-                    <el-select v-model="model.startTime" placeholder="请选择">
-                        <el-option v-for="item in tripNumberList" :key="item.value" :label="item.label"
-                            :value="item.value">
-                        </el-option>
-                    </el-select>
-                </el-col>
+  <el-dialog
+    v-dialogDrag
+    class="beijing-01__schedule add-task"
+    :title="title"
+    :visible.sync="dialogShow"
+    width="800px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <div style="margin: 10px">
+      <el-row>
+        <el-col :span="3">
+          <el-radio v-model="model.type" label="1">加在最前</el-radio>
+        </el-col>
+        <el-col :span="2" :offset="1">
+          <span>车次号：</span>
+        </el-col>
+        <el-col :span="5">
+          <el-select v-model="model.tripNumber" placeholder="请选择">
+            <el-option
+              v-for="item in tripNumberList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-col>
+        <el-col :span="3" :offset="1">
+          <span>开始时间：</span>
+        </el-col>
+        <el-col :span="5">
+          <el-select v-model="model.startTime" placeholder="请选择">
+            <el-option
+              v-for="item in tripNumberList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="3">
+          <el-radio v-model="model.type" label="2">加在最后</el-radio>
+        </el-col>
+        <el-col :span="2" :offset="1">
+          <span>车次号：</span>
+        </el-col>
+        <el-col :span="5">
+          <el-select v-model="model.tripNumber" placeholder="请选择">
+            <el-option
+              v-for="item in tripNumberList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-col>
+        <el-col :span="3" :offset="1">
+          <span>开始时间：</span>
+        </el-col>
+        <el-col :span="5">
+          <el-select v-model="model.startTime" placeholder="请选择">
+            <el-option
+              v-for="item in tripNumberList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-col>
 
-            </el-row>
-            <el-row style="margin-bottom: 5px;">
-                交路：
-            </el-row>
-            <el-row>
-                <el-table :data="model.route" border :height="180">
-                    <el-table-column prop="date" label="日期" width="180">
-                    </el-table-column>
-                    <el-table-column prop="name" label="姓名" width="180">
-                    </el-table-column>
-                    <el-table-column prop="address" label="地址">
-                    </el-table-column>
-                    <el-table-column width="20">
-                    </el-table-column>
-                </el-table>
-            </el-row>
-            <el-row style=" margin-bottom: 5px;margin-top: 10px;">
-                详情：
-            </el-row>
-            <el-row>
-                <el-table :data="model.detail" border :height="180">
-                    <el-table-column prop="date" label="日期" width="180">
-                    </el-table-column>
-                    <el-table-column prop="name" label="姓名" width="180">
-                    </el-table-column>
-                    <el-table-column prop="address" label="地址">
-                    </el-table-column>
-                    <el-table-column width="20">
-                    </el-table-column>
-                </el-table>
-            </el-row>
-            <el-row>
-                <el-col :offset="16">
-                    <el-checkbox v-model="model.default">显示默认停站时间和运行等级</el-checkbox>
-                </el-col>
-            </el-row>
-        </div>
-        <el-row type="flex" justify="center" class="button-group">
-            <el-button @click="handleCommit">确 定</el-button>
-            <el-button @click="doClose">取 消</el-button>
-        </el-row>
-    </el-dialog>
+      </el-row>
+      <el-row style="margin-bottom: 5px;">
+        交路：
+      </el-row>
+      <el-row>
+        <el-table :data="model.route" border :height="180">
+          <el-table-column prop="date" label="日期" width="180" />
+          <el-table-column prop="name" label="姓名" width="180" />
+          <el-table-column prop="address" label="地址" />
+          <el-table-column width="20" />
+        </el-table>
+      </el-row>
+      <el-row style=" margin-bottom: 5px;margin-top: 10px;">
+        详情：
+      </el-row>
+      <el-row>
+        <el-table :data="model.detail" border :height="180">
+          <el-table-column prop="date" label="日期" width="180" />
+          <el-table-column prop="name" label="姓名" width="180" />
+          <el-table-column prop="address" label="地址" />
+          <el-table-column width="20" />
+        </el-table>
+      </el-row>
+      <el-row>
+        <el-col :offset="16">
+          <el-checkbox v-model="model.default">显示默认停站时间和运行等级</el-checkbox>
+        </el-col>
+      </el-row>
+    </div>
+    <el-row type="flex" justify="center" class="button-group">
+      <el-button @click="handleCommit">确 定</el-button>
+      <el-button @click="doClose">取 消</el-button>
+    </el-row>
+  </el-dialog>
 </template>
 
 <script>
 
-    export default {
-        name: 'AddTask',
-        components: {
-        },
-        data() {
-            return {
-                dialogShow: false,
-                loading: false,
-                model: {
-                    type: '1',
-                    serviceNumber: '',
-                    tripNumber: '',
-                    startTime: '',
-                    default: false,
-                    route: [],
-                    detail: []
-                },
-                tripNumberList: [],
-            }
-        },
-        computed: {
-            title() {
-                return '添加任务'
-            }
-        },
-        mounted() {
-        },
-        methods: {
-            doShow(params) {
-                this.model.serviceNumber = params.serviceNumber;
-                this.model.tripNumber = params.tripNumber;
-                this.dialogShow = true;
-            },
-            doClose() {
-                this.loading = false;
-                this.dialogShow = false;
-            },
-            handleCommit() {
-                this.doClose();
-            }
-        }
-    }
+export default {
+	name: 'AddTask',
+	components: {
+	},
+	data() {
+		return {
+			dialogShow: false,
+			loading: false,
+			model: {
+				type: '1',
+				serviceNumber: '',
+				tripNumber: '',
+				startTime: '',
+				default: false,
+				route: [],
+				detail: []
+			},
+			tripNumberList: []
+		};
+	},
+	computed: {
+		title() {
+			return '添加任务';
+		}
+	},
+	mounted() {
+	},
+	methods: {
+		doShow(params) {
+			this.model.serviceNumber = params.serviceNumber;
+			this.model.tripNumber = params.tripNumber;
+			this.dialogShow = true;
+		},
+		doClose() {
+			this.loading = false;
+			this.dialogShow = false;
+		},
+		handleCommit() {
+			this.doClose();
+		}
+	}
+};
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
     @import "src/styles/mixin.scss";
 
-
     /deep/ {
         .el-button {
             margin-left: 40px !important;
@@ -160,4 +172,4 @@
             line-height: 20px !important;
         }
     }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/jmap/theme/chengdu_04/menusPlan/chooseTemplatePlan.vue b/src/jmap/theme/chengdu_04/menusPlan/chooseTemplatePlan.vue
index 5f95a8e18..591ed34cc 100644
--- a/src/jmap/theme/chengdu_04/menusPlan/chooseTemplatePlan.vue
+++ b/src/jmap/theme/chengdu_04/menusPlan/chooseTemplatePlan.vue
@@ -1,13 +1,13 @@
 <template>
   <el-dialog
+    v-dialogDrag
     :title="title"
     class="beijing-01__schedule choose-plan-template"
     :visible.sync="dialogShow"
-    v-dialogDrag
-    width="80%"
+    width="70%"
     :before-close="doClose"
     :modal="false"
-:close-on-click-modal="false"
+    :close-on-click-modal="false"
   >
     <QueryListPage ref="pageRules" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
     <el-row type="flex" justify="center" class="button-group">
diff --git a/src/jmap/theme/chengdu_04/menusPlan/createTodayPlan.vue b/src/jmap/theme/chengdu_04/menusPlan/createTodayPlan.vue
index 3df161516..f9b4ff067 100644
--- a/src/jmap/theme/chengdu_04/menusPlan/createTodayPlan.vue
+++ b/src/jmap/theme/chengdu_04/menusPlan/createTodayPlan.vue
@@ -1,140 +1,147 @@
 <template>
-    <el-dialog :title="title" class="beijing-01__schedule reload-today-plan" :visible.sync="dialogShow" width="80%"
-        :before-close="doClose" :modal="false" :close-on-click-modal="false" v-dialogDrag>
-        <QueryListPage ref="pageRules" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList">
-        </QueryListPage>
-        <el-row type="flex" justify="center" class="button-group">
-            <el-button type="primary" @click="handleConfirm" :loading="loading">加 载</el-button>
-            <el-button @click="dialogShow = false">取 消</el-button>
-        </el-row>
-    </el-dialog>
+  <el-dialog
+    v-dialogDrag
+    :title="title"
+    class="beijing-01__schedule reload-today-plan"
+    :visible.sync="dialogShow"
+    width="80%"
+    :before-close="doClose"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <QueryListPage ref="pageRules" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
+    <el-row type="flex" justify="center" class="button-group">
+      <el-button type="primary" :loading="loading" @click="handleConfirm">加 载</el-button>
+      <el-button @click="dialogShow = false">取 消</el-button>
+    </el-row>
+  </el-dialog>
 </template>
 
 <script>
-    import { runPlanTemplateList, generateUserRunPlanEveryDay } from '@/api/runplan';
-    import { getStationListBySkinCode } from '@/api/runplan';
-    import { getEveryDayRunPlanData } from '@/api/simulation';
-    import { getSkinCodeList } from '@/api/management/mapskin'
+import { runPlanTemplateList } from '@/api/runplan';
+import { getStationListBySkinCode } from '@/api/runplan';
+import { getEveryDayRunPlanData, generateDayRunPlan } from '@/api/simulation';
+import { getSkinCodeList } from '@/api/management/mapskin';
 
-    export default {
-        name: 'ReloadTodayPlan',
-        data() {
-            return {
-                dialogShow: false,
-                loading: false,
-                skinCodeList: [],
-                pagerConfig: {
-                    pageSize: 'pageSize',
-                    pageIndex: 'pageNum'
-                },
-                queryForm: {
-                    reset: true,
-                    labelWidth: '100px',
-                    queryObject: {
-                        name: {
-                            type: 'text',
-                            label: '运行图名称'
-                        }
-                    }
-                },
-                queryList: {
-                    query: this.queryFunction,
-                    selectCheckShow: false,
-                    radioShow: true,
-                    columns: [
-                        {
-                            title: '运行图名称',
-                            prop: 'name'
-                        },
-                        {
-                            title: '皮肤类型',
-                            prop: 'skinCode',
-                            type: 'tag',
-                            columnValue: (row) => {
-                                return this.$convertField(row.skinCode, this.skinCodeList, ['code', 'name'])
-                            },
-                            tagType: (row) => { return 'success' }
-                        }
-                    ]
-                },
+export default {
+	name: 'ReloadTodayPlan',
+	data() {
+		return {
+			dialogShow: false,
+			loading: false,
+			skinCodeList: [],
+			pagerConfig: {
+				pageSize: 'pageSize',
+				pageIndex: 'pageNum'
+			},
+			queryForm: {
+				reset: true,
+				labelWidth: '100px',
+				queryObject: {
+					name: {
+						type: 'text',
+						label: '运行图名称'
+					}
+				}
+			},
+			queryList: {
+				query: this.queryFunction,
+				selectCheckShow: false,
+				radioShow: true,
+				columns: [
+					{
+						title: '运行图名称',
+						prop: 'name'
+					},
+					{
+						title: '皮肤类型',
+						prop: 'skinCode',
+						type: 'tag',
+						columnValue: (row) => {
+							return this.$convertField(row.skinCode, this.skinCodeList, ['code', 'name']);
+						},
+						tagType: (row) => { return 'success'; }
+					}
+				]
+			},
 
-                currentModel: {}
-            }
-        },
-        computed: {
-            title() {
-                return '加载当天计划'
-            }
-        },
-        methods: {
-            loadInitData() {
-                this.skinCodeList = [];
-                getSkinCodeList().then(response => {
-                    this.skinCodeList = response.data;
-                })
-            },
-            doShow() {
-                this.loading = false;
-                this.dialogShow = true;
-                this.loadInitData();
-            },
-            doClose() {
-                this.dialogShow = false;
-            },
-            queryFunction(params) {
-                if (this.$store.state.map && this.$store.state.map.map) {
-                    params['skinCode'] = this.$store.getters['map/skinCode'];
-                }
-                return runPlanTemplateList(params);
-            },
-            // 生成每日运行图
-            handleConfirm() {
-                if (this.$refs && this.$refs.pageRules) {
-                    const choose = this.$refs.pageRules.currentChoose();
-                    if (choose && choose.id) {
-                        this.loading = true;
-                        generateUserRunPlanEveryDay(choose.id, this.$route.query.group).then(response => {
-                            this.loading = false;
-                            this.reloadTable()
-                            this.loadRunData();
-                            this.doClose();
-                            this.$message.success(`生成用户每日运行图成功`);
-                        }).catch(error => {
-                            this.loading = false;
-                            this.reloadTable()
-                            this.$messageBox(`生成用户每日运行图失败`);
-                        })
-                    } else {
-                        this.$messageBox(`请选择需要加载的运行图`);
-                    }
-                }
-            },
-            loadRunData() {
-                let skinCode = this.$route.query.skinCode;
-                this.$store.dispatch('runPlan/clear');
-                if (skinCode) {
-                    getStationListBySkinCode(skinCode).then(response => {
-                        let stations = response.data;
-                        this.PlanConvert = this.$theme.loadPlanConvert(skinCode);
-                        this.$store.dispatch('runPlan/setStations', stations).then(() => {
-                            getEveryDayRunPlanData(this.$route.query.group).then(resp => {
-                                this.$store.dispatch('runPlan/setPlanData', resp.data);
-                            }).catch(error => {
-                                this.$store.dispatch('runPlan/setPlanData', []);
-                                this.$messageBox(`获取运行图数据失败`);
-                            })
-                        })
-                    }).catch(error => {
-                        this.$messageBox(`获取车站列表失败`);
-                    });
-                }
-            },
-            reloadTable() {
-                this.queryList.reload()
-            }
-        }
-    }
+			currentModel: {}
+		};
+	},
+	computed: {
+		title() {
+			return '加载当天计划';
+		}
+	},
+	methods: {
+		loadInitData() {
+			this.skinCodeList = [];
+			getSkinCodeList().then(response => {
+				this.skinCodeList = response.data;
+			});
+		},
+		doShow() {
+			this.loading = false;
+			this.dialogShow = true;
+			this.loadInitData();
+		},
+		doClose() {
+			this.dialogShow = false;
+		},
+		queryFunction(params) {
+			if (this.$store.state.map && this.$store.state.map.map) {
+				params['skinCode'] = this.$store.getters['map/skinCode'];
+			}
+			return runPlanTemplateList(params);
+		},
+		// 生成每日运行图
+		handleConfirm() {
+			if (this.$refs && this.$refs.pageRules) {
+				const choose = this.$refs.pageRules.currentChoose();
+				if (choose && choose.id) {
+					this.loading = true;
+					generateDayRunPlan(choose.id, this.$route.query.group).then(response => {
+						this.loading = false;
+						this.reloadTable();
+						this.loadRunData();
+						this.doClose();
+						this.$message.success(`生成用户每日运行图成功`);
+					}).catch(() => {
+						this.loading = false;
+						this.reloadTable();
+						this.$messageBox(`生成用户每日运行图失败`);
+					});
+				} else {
+					this.$messageBox(`请选择需要加载的运行图`);
+				}
+			}
+		},
+		loadRunData() {
+			const skinCode = this.$route.query.skinCode;
+			this.$store.dispatch('runPlan/clear');
+			if (skinCode) {
+				getStationListBySkinCode(skinCode).then(response => {
+					const stations = response.data;
+					this.PlanConvert = this.$theme.loadPlanConvert(skinCode);
+					this.$store.dispatch('runPlan/setStations', stations).then(() => {
+						getEveryDayRunPlanData(this.$route.query.group).then(resp => {
+							this.$store.dispatch('runPlan/setPlanData', resp.data);
+						}).catch(() => {
+							this.$store.dispatch('runPlan/setPlanData', []);
+							this.$messageBox(`获取运行图数据失败`);
+						});
+					});
+				}).catch(() => {
+					this.$messageBox(`获取车站列表失败`);
+				});
+			}
+		},
+		reloadTable() {
+			this.queryList.reload();
+		}
+	}
+};
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
     @import "src/styles/mixin.scss";
-</style>
\ No newline at end of file
+</style>
diff --git a/src/jmap/theme/chengdu_04/menusPlan/createWeekPlan.vue b/src/jmap/theme/chengdu_04/menusPlan/createWeekPlan.vue
index c6f6f74b7..2eabc8044 100644
--- a/src/jmap/theme/chengdu_04/menusPlan/createWeekPlan.vue
+++ b/src/jmap/theme/chengdu_04/menusPlan/createWeekPlan.vue
@@ -1,116 +1,126 @@
 <template>
-    <el-dialog class="beijing-01__schedule create-week-plan" :title="title" :visible.sync="dialogShow" width="800px"
-        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
-        <el-row>
-            <el-form ref="form" :model="model" :rules="rules" label-width="140px" size="small">
-                <el-form-item label="运行图名称:" prop="planId">
-                    <el-row>
-                        <el-col :span="19">
-                            <el-input v-model="model.planName" :readonly="true"></el-input>
-                        </el-col>
-                        <el-col :span="4" :offset="1">
-                            <el-button @click="handleChoose">选择 </el-button>
-                        </el-col>
-                    </el-row>
-                </el-form-item>
-                <el-form-item label="计划日期范围:" prop="dateList">
-                    <el-row>
-                        <el-date-picker type="dates" v-model="model.dateList" :clearable="false" placeholder="选择一个或多个日期"
-                            value-format="yyyy-MM-dd">
-                        </el-date-picker>
-                    </el-row>
-                </el-form-item>
-            </el-form>
-        </el-row>
-        <el-row type="flex" justify="center" class="button-group">
-            <el-button @click="create">确 定</el-button>
-            <el-button @click="doClose">取 消</el-button>
-        </el-row>
-        <choose-template-plan ref="choose" @chooseConfirm="chooseConfirm"></choose-template-plan>
-    </el-dialog>
+  <el-dialog
+    v-dialogDrag
+    class="beijing-01__schedule create-week-plan"
+    :title="title"
+    :visible.sync="dialogShow"
+    width="800px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <el-row>
+      <el-form ref="form" :model="model" :rules="rules" label-width="140px" size="small">
+        <el-form-item label="运行图名称:" prop="planId">
+          <el-row>
+            <el-col :span="19">
+              <el-input v-model="model.planName" :readonly="true" />
+            </el-col>
+            <el-col :span="4" :offset="1">
+              <el-button @click="handleChoose">选择 </el-button>
+            </el-col>
+          </el-row>
+        </el-form-item>
+        <el-form-item label="计划日期范围:" prop="dateList">
+          <el-row>
+            <el-date-picker
+              v-model="model.dateList"
+              type="dates"
+              :clearable="false"
+              placeholder="选择一个或多个日期"
+              value-format="yyyy-MM-dd"
+            />
+          </el-row>
+        </el-form-item>
+      </el-form>
+    </el-row>
+    <el-row type="flex" justify="center" class="button-group">
+      <el-button @click="create">确 定</el-button>
+      <el-button @click="doClose">取 消</el-button>
+    </el-row>
+    <choose-template-plan ref="choose" @chooseConfirm="chooseConfirm" />
+  </el-dialog>
 </template>
 
 <script>
-    import { createRunPlanLoad } from '@/api/runplan';
-    import ChooseTemplatePlan from './chooseTemplatePlan';
+import { createRunPlanLoad } from '@/api/runplan';
+import ChooseTemplatePlan from './chooseTemplatePlan';
 
-    export default {
-        name: 'CreateWeekPlan',
-        components: {
-            ChooseTemplatePlan
-        },
-        data() {
-            return {
-                dialogShow: false,
-                loading: false,
-                model: {
-                    planId: '',
-                    planName: '',
-                    dateList: [],
-                }
-            }
-        },
-        computed: {
-            title() {
-                return '创建一周计划'
-            },
-            rules() {
-                let rules = {
-                    planId: [
-                        { required: true, message: '请选择模板运行图', trigger: 'blur' }
-                    ],
-                    dateList: [
-                        { required: true, message: '请选择计划日期范围', trigger: 'change' }
-                    ]
-                }
+export default {
+	name: 'CreateWeekPlan',
+	components: {
+		ChooseTemplatePlan
+	},
+	data() {
+		return {
+			dialogShow: false,
+			loading: false,
+			model: {
+				planId: '',
+				planName: '',
+				dateList: []
+			}
+		};
+	},
+	computed: {
+		title() {
+			return '创建一周计划';
+		},
+		rules() {
+			const rules = {
+				planId: [
+					{ required: true, message: '请选择模板运行图', trigger: 'blur' }
+				],
+				dateList: [
+					{ required: true, message: '请选择计划日期范围', trigger: 'change' }
+				]
+			};
 
-                return rules;
-            }
-        },
-        mounted() {
-        },
-        methods: {
-            doShow(params) {
-                this.dialogShow = true;
-            },
-            doClose() {
-                this.loading = false;
-                this.dialogShow = false;
-            },
-            handleChoose() {
-                this.$refs.choose.doShow();
-            },
-            chooseConfirm(choose) {
-                if (choose) {
-                    this.model.planId = choose.id;
-                    this.model.planName = choose.name;
-                }
-            },
-            buildModel() {
-                return this.model.dateList.map(date => {
-                    return {
-                        loadTime: date,
-                        mapId: this.$route.query.mapId,
-                        templatePlanId: this.model.planId
-                    }
-                });
-            },
-            create() {
-                this.$refs['form'].validate((valid) => {
-                    if (valid) {
-                        createRunPlanLoad(this.buildModel()).then(response => {
-                            this.$message.success('创建运行图计划成功');
-                            this.$emit('reloadTable', { name: 'managePlanList' });
-                            this.doClose();
-                        }).catch(error => {
-                            this.doClose();
-                            this.$messageBox('创建运行图计划失败');
-                        })
-                    }
-                });
-            }
-        }
-    }
+			return rules;
+		}
+	},
+	mounted() {
+	},
+	methods: {
+		doShow(params) {
+			this.dialogShow = true;
+		},
+		doClose() {
+			this.loading = false;
+			this.dialogShow = false;
+		},
+		handleChoose() {
+			this.$refs.choose.doShow();
+		},
+		chooseConfirm(choose) {
+			if (choose) {
+				this.model.planId = choose.id;
+				this.model.planName = choose.name;
+			}
+		},
+		buildModel() {
+			return {
+				planDateList: this.model.dateList,
+				mapId: this.$route.query.mapId,
+				templatePlanId: this.model.planId
+			};
+		},
+		create() {
+			this.$refs['form'].validate((valid) => {
+				if (valid) {
+					createRunPlanLoad(this.buildModel()).then(response => {
+						this.$message.success('创建运行图计划成功');
+						this.doClose();
+					}).catch(() => {
+						this.doClose();
+						this.$messageBox('创建运行图计划失败');
+					});
+				}
+			});
+		}
+	}
+};
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
     @import "src/styles/mixin.scss";
@@ -124,4 +134,4 @@
             margin: 10px;
         }
     }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/jmap/theme/chengdu_04/menusPlan/deleteTask.vue b/src/jmap/theme/chengdu_04/menusPlan/deleteTask.vue
index b661ed20e..cd79c305f 100644
--- a/src/jmap/theme/chengdu_04/menusPlan/deleteTask.vue
+++ b/src/jmap/theme/chengdu_04/menusPlan/deleteTask.vue
@@ -1,57 +1,66 @@
 <template>
-    <el-dialog class="beijing-01__schedule delete-task" :title="title" :visible.sync="dialogShow" width="400px"
-        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
-        <el-row>
-            <el-radio v-model="type" :label="1">删除以前所有任务（包含本任务）</el-radio>
-        </el-row>
-        <el-row>
-            <el-radio v-model="type" :label="2">删除以后所有任务（包含本任务）</el-radio>
-        </el-row>
-        <el-row type="flex" justify="center" class="button-group">
-            <el-button @click="handleCommit">确 定</el-button>
-            <el-button @click="doClose">取 消</el-button>
-        </el-row>
-    </el-dialog>
+  <el-dialog
+    v-dialogDrag
+    class="beijing-01__schedule delete-task"
+    :title="title"
+    :visible.sync="dialogShow"
+    width="400px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <el-row>
+      <el-radio v-model="type" :label="1">删除以前所有任务（包含本任务）</el-radio>
+    </el-row>
+    <el-row>
+      <el-radio v-model="type" :label="2">删除以后所有任务（包含本任务）</el-radio>
+    </el-row>
+    <el-row type="flex" justify="center" class="button-group">
+      <el-button @click="handleCommit">确 定</el-button>
+      <el-button @click="doClose">取 消</el-button>
+    </el-row>
+  </el-dialog>
 </template>
 
 <script>
 
-    export default {
-        name: 'DeleteTask',
-        components: {
-        },
-        data() {
-            return {
-                dialogShow: false,
-                loading: false,
-                tripNumber: '',
-                serviceNumber: '',
-                type: '1',
-            }
-        },
-        computed: {
-            title() {
-                return '删除任务'
-            }
-        },
-        mounted() {
-        },
-        methods: {
-            doShow(params) {
-                this.tripNumber = params.tripNumber;
-                this.serviceNumber = params.serviceNumber;
-                this.dialogShow = true;
-            },
-            doClose() {
-                this.loading = false;
-                this.dialogShow = false;
-            },
-            handleCommit() {
-                // this.tripNumber
-                this.doClose();
-            }
-        }
-    }
+export default {
+	name: 'DeleteTask',
+	components: {
+	},
+	data() {
+		return {
+			dialogShow: false,
+			loading: false,
+			tripNumber: '',
+			serviceNumber: '',
+			type: '1'
+		};
+	},
+	computed: {
+		title() {
+			return '删除任务';
+		}
+	},
+	mounted() {
+	},
+	methods: {
+		doShow(params) {
+			this.tripNumber = params.tripNumber;
+			this.serviceNumber = params.serviceNumber;
+			this.dialogShow = true;
+		},
+		doClose() {
+			this.loading = false;
+			this.dialogShow = false;
+		},
+		handleCommit() {
+			// this.tripNumber
+			this.doClose();
+		}
+	}
+};
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
     @import "src/styles/mixin.scss";
@@ -61,4 +70,4 @@
             margin: 10px;
         }
     }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/jmap/theme/chengdu_04/menusPlan/deleteTodayPlan.vue b/src/jmap/theme/chengdu_04/menusPlan/deleteTodayPlan.vue
index 284028f97..2e22a7c64 100644
--- a/src/jmap/theme/chengdu_04/menusPlan/deleteTodayPlan.vue
+++ b/src/jmap/theme/chengdu_04/menusPlan/deleteTodayPlan.vue
@@ -1,46 +1,55 @@
 <template>
-    <el-dialog class="beijing-01__schedule create-week-plan" :title="title" :visible.sync="dialogShow" width="400px"
-        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
-        <el-row type="flex" justify="center" class="button-group">
-            <el-button @click="handleCommit">确 定</el-button>
-            <el-button @click="doClose">取 消</el-button>
-        </el-row>
-    </el-dialog>
+  <el-dialog
+    v-dialogDrag
+    class="beijing-01__schedule create-week-plan"
+    :title="title"
+    :visible.sync="dialogShow"
+    width="400px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <el-row type="flex" justify="center" class="button-group">
+      <el-button @click="handleCommit">确 定</el-button>
+      <el-button @click="doClose">取 消</el-button>
+    </el-row>
+  </el-dialog>
 </template>
 
 <script>
 
-    export default {
-        name: 'DeleteTodayPlan',
-        components: {
-        },
-        data() {
-            return {
-                dialogShow: false,
-                loading: false
-            }
-        },
-        computed: {
-            title() {
-                return '删除当天计划'
-            }
-        },
-        mounted() {
-        },
-        methods: {
-            doShow(params) {
-                this.dialogShow = true;
-            },
-            doClose() {
-                this.loading = false;
-                this.dialogShow = false;
-            },
-            handleCommit() {
-                // this.tripNumber
-                this.doClose();
-            }
-        }
-    }
+export default {
+	name: 'DeleteTodayPlan',
+	components: {
+	},
+	data() {
+		return {
+			dialogShow: false,
+			loading: false
+		};
+	},
+	computed: {
+		title() {
+			return '删除当天计划';
+		}
+	},
+	mounted() {
+	},
+	methods: {
+		doShow(params) {
+			this.dialogShow = true;
+		},
+		doClose() {
+			this.loading = false;
+			this.dialogShow = false;
+		},
+		handleCommit() {
+			// this.tripNumber
+			this.doClose();
+		}
+	}
+};
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
     @import "src/styles/mixin.scss";
@@ -50,4 +59,4 @@
             margin: 10px;
         }
     }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/jmap/theme/chengdu_04/menusPlan/managePlanList.vue b/src/jmap/theme/chengdu_04/menusPlan/managePlanList.vue
index b4ae47a4b..288ad3381 100644
--- a/src/jmap/theme/chengdu_04/menusPlan/managePlanList.vue
+++ b/src/jmap/theme/chengdu_04/menusPlan/managePlanList.vue
@@ -1,122 +1,143 @@
 <template>
-    <el-dialog class="beijing-01__schedule manage-plan-list" :title="title" :visible.sync="dialogShow" width="80%"
-        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
-        <QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList">
-        </QueryListPage>
-    </el-dialog>
+  <el-dialog
+    v-dialogDrag
+    class="beijing-01__schedule manage-plan-list"
+    :title="title"
+    :visible.sync="dialogShow"
+    width="80%"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
+  </el-dialog>
 </template>
 
 <script>
-    import { getRunPlanLoadList, deleteRunPlanLoad } from '@/api/runplan';
+import { getRunPlanLoadList, deleteRunPlanLoad, listAllTempLateRunPlan } from '@/api/runplan';
+import { listPublishMap } from '@/api/jmap/map';
 
-    export default {
-        name: 'ManagePlanList',
-        data() {
-            return {
-                dialogShow: false,
-                loading: false,
-                pagerConfig: {
-                    pageSize: 'pageSize',
-                    pageIndex: 'pageNum'
-                },
-                queryForm: {
-                    labelWidth: '140px',
-                    reset: true,
-                    queryObject: {
-                        runPlanName: {
-                            type: 'text',
-                            label: '运行图名称'
-                        }
-                    }
-                },
-                queryList: {
-                    query: this.queryFunction,
-                    selectCheckShow: false,
-                    indexShow: true,
-                    columns: [
-                        {
-                            title: '地图名称',
-                            prop: 'mapName'
-                        },
-                        {
-                            title: '运行图名称',
-                            prop: 'runPlanName',
-                        },
-                        {
-                            title: '加载日期',
-                            prop: 'loadTime'
-                        },
-                        {
-                            type: 'button',
-                            title: '操作',
-                            width: '100',
-                            buttons: [
-                                {
-                                    name: '删除',
-                                    handleClick: this.handleDelete,
-                                    type: 'danger'
-                                }
-                            ]
-                        }
-                    ],
-                    actions: [
-                        { text: '创建', btnCode: 'employee_insert', handler: this.handleCreateRunPlan },
-                    ]
-                },
+export default {
+	name: 'ManagePlanList',
+	data() {
+		return {
+			dialogShow: false,
+			loading: false,
+			pagerConfig: {
+				pageSize: 'pageSize',
+				pageIndex: 'pageNum'
+			},
+			queryForm: {
+				labelWidth: '140px',
+				reset: true
+			},
+			queryList: {
+				query: this.queryFunction,
+				selectCheckShow: false,
+				indexShow: true,
+				columns: [
+					{
+						title: this.$t('publish.mapName'),
+						prop: 'mapId',
+						type: 'tag',
+						columnValue: (row) => { return this.$convertField(row.mapId, this.mapList, ['id', 'name']); },
+						tagType: (row) => { return ''; }
+					},
+					{
+						title: this.$t('publish.runPlanName'),
+						prop: 'templatePlanId',
+						type: 'tag',
+						columnValue: (row) => { return this.$convertField(row.templatePlanId, this.templatePlanList, ['id', 'name']); },
+						tagType: (row) => { return 'success'; }
+					},
+					{
+						title: '加载日期',
+						prop: 'loadTime'
+					},
+					{
+						type: 'button',
+						title: '操作',
+						width: '100',
+						buttons: [
+							{
+								name: '删除',
+								handleClick: this.handleDelete,
+								type: 'danger'
+							}
+						]
+					}
+				],
+				actions: [
+					{ text: '创建', btnCode: 'employee_insert', handler: this.handleCreateRunPlan }
+				]
+			},
 
-                currentModel: {}
-            }
-        },
-        computed: {
-            title() {
-                return '运行图计划表'
-            }
-        },
-        created() {
-        },
-        methods: {
-            queryFunction(params) {
-                if (this.$route.query.mapId) {
-                    params['mapId'] = this.$route.query.mapId;
-                }
+			currentModel: {}
+		};
+	},
+	computed: {
+		title() {
+			return '运行图计划表';
+		}
+	},
+	mounted() {
+		this.loadPageData();
+	},
+	methods: {
+		loadPageData() {
+			this.mapList = [];
+			listPublishMap().then(resp => {
+				this.mapList = resp.data;
+			});
+			this.templatePlanList = [];
+			listAllTempLateRunPlan().then(resp => {
+				this.templatePlanList = resp.data;
+			});
+		},
+		queryFunction(params) {
+			if (this.$route.query.mapId) {
+				params['mapId'] = this.$route.query.mapId;
+			}
 
-                if (this.$store.state.user.id) {
-                    params['userId'] = this.$store.state.user.id;
-                }
+			if (this.$store.state.user.id) {
+				params['userId'] = this.$store.state.user.id;
+			}
 
-                return getRunPlanLoadList(params);
-            },
-            handleDelete(index, row) {
-                this.$confirm('此操作将删除次日加载的运行图, 是否继续?', '提示', {
-                    confirmButtonText: '确定',
-                    cancelButtonText: '取消',
-                    type: 'warning'
-                }).then(() => {
-                    deleteRunPlanLoad(row.id).then(response => {
-                        this.$message.success('删除成功')
-                        this.reloadTable()
-                    }).catch(error => {
-                        this.reloadTable()
-                        this.$messageBox('删除失败')
-                    })
-                }).catch(() => { })
-            },
-            handleCreateRunPlan() {
-                this.$emit('dispatchDialog', { name: 'createWeekPlan' });
-            },
-            doShow() {
-                this.dialogShow = true;
-            },
-            doClose() {
-                this.loading = false;
-                this.dialogShow = false;
-            },
-            reloadTable() {
-                this.queryList.reload()
-            }
-        }
-    }
+			return getRunPlanLoadList(params);
+		},
+		handleDelete(index, row) {
+			this.$confirm('此操作将删除次日加载的运行图, 是否继续?', '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning'
+			}).then(() => {
+				deleteRunPlanLoad(row.id).then(response => {
+					this.$message.success('删除成功');
+					this.reloadTable();
+				}).catch(() => {
+					this.reloadTable();
+					this.$messageBox('删除失败');
+				});
+			}).catch(() => { });
+		},
+		handleCreateRunPlan() {
+			this.$emit('dispatchDialog', { name: 'createWeekPlan' });
+		},
+		doShow() {
+			this.dialogShow = true;
+			this.$nextTick(()=> { this.reloadTable(); });
+		},
+		doClose() {
+			this.loading = false;
+			this.dialogShow = false;
+		},
+		reloadTable() {
+			this.queryList.reload();
+		}
+	}
+};
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
     @import "src/styles/mixin.scss";
-</style>
\ No newline at end of file
+</style>
diff --git a/src/jmap/theme/chengdu_04/menusPlan/modifyingPlan.vue b/src/jmap/theme/chengdu_04/menusPlan/modifyingPlan.vue
index c9b645b7c..1d2b31102 100644
--- a/src/jmap/theme/chengdu_04/menusPlan/modifyingPlan.vue
+++ b/src/jmap/theme/chengdu_04/menusPlan/modifyingPlan.vue
@@ -1,152 +1,152 @@
 <template>
-    <el-dialog class="beijing-01__schedule edit-planning-train" :title="title" :visible.sync="dialogShow" width="800px"
-        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
-        <el-row>
-            <el-col :offset="10">列车线路</el-col>
-        </el-row>
-        <el-row>
-            <el-col :span="17">
-                <el-table :data="serviceData" border style="width: 100%" height="160">
-                    <el-table-column prop="startStationCode" label="起点站">
-                    </el-table-column>
-                    <el-table-column prop="startStationStandCode" label="起点站台">
-                    </el-table-column>
-                    <el-table-column prop="endStationCode" label="终点站">
-                    </el-table-column>
-                    <el-table-column prop="endStationStandCode" label="终点站台">
-                    </el-table-column>
-                </el-table>
-            </el-col>
-            <el-col :span="6" :offset="1">
-                <el-row type="flex" justify="center">
-                    <el-button class="view-button" @click="handleAddTask">加任务</el-button>
-                </el-row>
-                <el-row type="flex" justify="center">
-                    <el-button class="view-button" @click="handleReplace">替&ensp;&ensp;换</el-button>
-                </el-row>
-                <el-row type="flex" justify="center">
-                    <el-button class="view-button" @click="handleDeleteTask">删任务</el-button>
-                </el-row>
-                <div class="view-box">
-                    <el-row type="flex" justify="center">
-                        <el-radio-group v-model="storeInOut">
-                            <el-radio :label="1">进库</el-radio>
-                            <el-radio :label="2">出库</el-radio>
-                        </el-radio-group>
-                    </el-row>
-                </div>
-            </el-col>
-        </el-row>
-        <el-row class="view-box">
-            <el-col :span="9" style="padding-left: 10px">
-                <el-input v-model="oldServiceNumber" size="small" :disabled="true"></el-input>
-            </el-col>
-            <el-col :span="9" style="padding-left: 20px">
-                <el-input v-model="newServiceNumber" size="small"></el-input>
-            </el-col>
-            <el-col :span="5" style="padding-left: 20px">
-                <el-button @click="handleModifyingTripNumber" style="width: 150px;">改车次号</el-button>
-            </el-col>
-        </el-row>
-        <el-row style="margin-top: 10px">
-            <el-col :span="4"><span class="view-label">线路开始时间</span></el-col>
-            <el-col :span="8">
-                <el-time-select v-model="serviceStartTime" size="small"></el-time-select>
-            </el-col>
-            <el-col :span="4"><span class="view-label">线路结束时间</span></el-col>
-            <el-col :span="8">
-                <el-time-select v-model="serviceEndTime" size="small"></el-time-select>
-            </el-col>
-        </el-row>
-        <el-row style="margin-top: 20px">
-            <el-col :offset="10">线路详细信息</el-col>
-        </el-row>
-        <el-row>
-            <el-table :data="tripData" border style="width: 100%" height="200">
-                <el-table-column prop="arriveTime" label="到站时间">
-                </el-table-column>
-                <el-table-column prop="stationCode" label="车站">
-                </el-table-column>
-                <el-table-column prop="stationStandCode" label="站台">
-                </el-table-column>
-                <el-table-column prop="stopTime" label="停站时间">
-                </el-table-column>
-                <el-table-column prop="level" label="运行等级">
-                </el-table-column>
-            </el-table>
-        </el-row>
-        <el-row style="margin-top: 20px">
-            <el-checkbox v-model="effect">影响后续任务</el-checkbox>
+  <el-dialog
+    v-dialogDrag
+    class="beijing-01__schedule edit-planning-train"
+    :title="title"
+    :visible.sync="dialogShow"
+    width="800px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <el-row>
+      <el-col :offset="10">列车线路</el-col>
+    </el-row>
+    <el-row>
+      <el-col :span="17">
+        <el-table :data="serviceData" border style="width: 100%" height="160">
+          <el-table-column prop="startStationCode" label="起点站" />
+          <el-table-column prop="startStationStandCode" label="起点站台" />
+          <el-table-column prop="endStationCode" label="终点站" />
+          <el-table-column prop="endStationStandCode" label="终点站台" />
+        </el-table>
+      </el-col>
+      <el-col :span="6" :offset="1">
+        <el-row type="flex" justify="center">
+          <el-button class="view-button" @click="handleAddTask">加任务</el-button>
         </el-row>
         <el-row type="flex" justify="center">
-            <el-button @click="handleCommit">确 定</el-button>
-            <el-button @click="doClose">取 消</el-button>
+          <el-button class="view-button" @click="handleReplace">替&ensp;&ensp;换</el-button>
         </el-row>
-    </el-dialog>
+        <el-row type="flex" justify="center">
+          <el-button class="view-button" @click="handleDeleteTask">删任务</el-button>
+        </el-row>
+        <div class="view-box">
+          <el-row type="flex" justify="center">
+            <el-radio-group v-model="storeInOut">
+              <el-radio :label="1">进库</el-radio>
+              <el-radio :label="2">出库</el-radio>
+            </el-radio-group>
+          </el-row>
+        </div>
+      </el-col>
+    </el-row>
+    <el-row class="view-box">
+      <el-col :span="9" style="padding-left: 10px">
+        <el-input v-model="oldServiceNumber" size="small" :disabled="true" />
+      </el-col>
+      <el-col :span="9" style="padding-left: 20px">
+        <el-input v-model="newServiceNumber" size="small" />
+      </el-col>
+      <el-col :span="5" style="padding-left: 20px">
+        <el-button style="width: 150px;" @click="handleModifyingTripNumber">改车次号</el-button>
+      </el-col>
+    </el-row>
+    <el-row style="margin-top: 10px">
+      <el-col :span="4"><span class="view-label">线路开始时间</span></el-col>
+      <el-col :span="8">
+        <el-time-select v-model="serviceStartTime" size="small" />
+      </el-col>
+      <el-col :span="4"><span class="view-label">线路结束时间</span></el-col>
+      <el-col :span="8">
+        <el-time-select v-model="serviceEndTime" size="small" />
+      </el-col>
+    </el-row>
+    <el-row style="margin-top: 20px">
+      <el-col :offset="10">线路详细信息</el-col>
+    </el-row>
+    <el-row>
+      <el-table :data="tripData" border style="width: 100%" height="200">
+        <el-table-column prop="arriveTime" label="到站时间" />
+        <el-table-column prop="stationCode" label="车站" />
+        <el-table-column prop="stationStandCode" label="站台" />
+        <el-table-column prop="stopTime" label="停站时间" />
+        <el-table-column prop="level" label="运行等级" />
+      </el-table>
+    </el-row>
+    <el-row style="margin-top: 20px">
+      <el-checkbox v-model="effect">影响后续任务</el-checkbox>
+    </el-row>
+    <el-row type="flex" justify="center">
+      <el-button @click="handleCommit">确 定</el-button>
+      <el-button @click="doClose">取 消</el-button>
+    </el-row>
+  </el-dialog>
 </template>
 
 <script>
-    import { formatTime, formatName } from '@/utils/runPlan';
+import { formatTime, formatName } from '@/utils/runPlan';
 
-    export default {
-        name: 'modifyingPlan',
-        data() {
-            return {
-                dialogShow: false,
-                loading: false,
-                effect: false,
-                storeInOut: '1',
-                oldServiceNumber: '',
-                newServiceNumber: '',
-                serviceStartTime: '',
-                serviceEndTime: '',
-                serviceData: [],
-                tripData: [],
-            }
-        },
-        computed: {
-            title() {
-                return '修改'
-            }
-        },
-        mounted() {
-        },
-        methods: {
-            formatTime(time) {
-                return formatTime(time);
-            },
-            formatName(code) {
-                return formatName(code);
-            },
-            doShow() {
-                this.dialogShow = true;
-            },
-            doClose() {
-                this.loading = false;
-                this.dialogShow = false;
-            },
-            // 加任务
-            handleAddTask() {
-                this.$emit('dispatchDialog', { name: 'addTask', params: {} })
-            },
-            // 替换
-            handleReplace() {
-                this.$emit('dispatchDialog', { name: 'modifyingTask', params: {} })
-            },
-            // 删任务
-            handleDeleteTask() {
-                this.$emit('dispatchDialog', { name: 'deleteTask', params: {} })
-            },
-            // 改车次号
-            handleModifyingTripNumber() {
-                this.$emit('dispatchDialog', { name: 'modifyingTripNumber', params: {} })
-            },
-            // 确定修改
-            handleCommit() {
-                this.doClose();
-            }
-        }
-    }
+export default {
+	name: 'ModifyingPlan',
+	data() {
+		return {
+			dialogShow: false,
+			loading: false,
+			effect: false,
+			storeInOut: '1',
+			oldServiceNumber: '',
+			newServiceNumber: '',
+			serviceStartTime: '',
+			serviceEndTime: '',
+			serviceData: [],
+			tripData: []
+		};
+	},
+	computed: {
+		title() {
+			return '修改';
+		}
+	},
+	mounted() {
+	},
+	methods: {
+		formatTime(time) {
+			return formatTime(time);
+		},
+		formatName(code) {
+			return formatName(code);
+		},
+		doShow() {
+			this.dialogShow = true;
+		},
+		doClose() {
+			this.loading = false;
+			this.dialogShow = false;
+		},
+		// 加任务
+		handleAddTask() {
+			this.$emit('dispatchDialog', { name: 'addTask', params: {} });
+		},
+		// 替换
+		handleReplace() {
+			this.$emit('dispatchDialog', { name: 'modifyingTask', params: {} });
+		},
+		// 删任务
+		handleDeleteTask() {
+			this.$emit('dispatchDialog', { name: 'deleteTask', params: {} });
+		},
+		// 改车次号
+		handleModifyingTripNumber() {
+			this.$emit('dispatchDialog', { name: 'modifyingTripNumber', params: {} });
+		},
+		// 确定修改
+		handleCommit() {
+			this.doClose();
+		}
+	}
+};
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
     @import "src/styles/mixin.scss";
@@ -157,13 +157,11 @@
         margin-left: 0px;
     }
 
-
     .view-label {
         height: 32px;
         line-height: 32px;
     }
 
-
     .view-box {
         padding: 10px 0px;
         border: 1px inset gray;
@@ -176,4 +174,4 @@
             margin: 5px 20px;
         }
     }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/jmap/theme/chengdu_04/menusPlan/modifyingTask.vue b/src/jmap/theme/chengdu_04/menusPlan/modifyingTask.vue
index 5f197a1ff..4679c003e 100644
--- a/src/jmap/theme/chengdu_04/menusPlan/modifyingTask.vue
+++ b/src/jmap/theme/chengdu_04/menusPlan/modifyingTask.vue
@@ -1,298 +1,309 @@
 <template>
-    <el-dialog class="beijing-01__schedule add-task" :title="title" :visible.sync="dialogShow" width="1000px"
-        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
-        <div style="margin: 10px">
-            <el-row>
-                <el-col :span="4">
-                    <el-row>
-                        <el-col :span="9">
-                            <span>车次号：</span>
-                        </el-col>
-                        <el-col :span="15">
-                            <el-select style="display: inline-black" v-model="model.tripNumber" placeholder="请选择">
-                                <el-option v-for="item in tripNumberList" :key="item.value" :label="item.label"
-                                    :value="item.value">
-                                </el-option>
-                            </el-select>
-                        </el-col>
-                    </el-row>
-                </el-col>
-                <el-col :span="2">
-                    <el-row>
-                        <el-col :offset="4">
-                            <el-checkbox v-model="model.trainManual">手工</el-checkbox>
-                        </el-col>
-                    </el-row>
-                </el-col>
-                <el-col :span="5">
-                    <el-row>
-                        <el-col :span="12">
-                            <span>缺省停站时间：</span>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-select style="display: inline-black" v-model="model.time" placeholder="请选择">
-                                <el-option v-for="item in timeList" :key="item.value" :label="item.label"
-                                    :value="item.value">
-                                </el-option>
-                            </el-select>
-                        </el-col>
-                    </el-row>
-                </el-col>
-                <el-col :span="5">
-                    <el-row>
-                        <el-col :span="9" :offset="2">
-                            <span>表号：</span>
-                        </el-col>
-                        <el-col :span="13">
-                            <el-input v-model="model.serviceNumber"></el-input>
-                        </el-col>
-                    </el-row>
+  <el-dialog
+    v-dialogDrag
+    class="beijing-01__schedule add-task"
+    :title="title"
+    :visible.sync="dialogShow"
+    width="1000px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <div style="margin: 10px">
+      <el-row>
+        <el-col :span="4">
+          <el-row>
+            <el-col :span="9">
+              <span>车次号：</span>
+            </el-col>
+            <el-col :span="15">
+              <el-select v-model="model.tripNumber" style="display: inline-black" placeholder="请选择">
+                <el-option
+                  v-for="item in tripNumberList"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-col>
+          </el-row>
+        </el-col>
+        <el-col :span="2">
+          <el-row>
+            <el-col :offset="4">
+              <el-checkbox v-model="model.trainManual">手工</el-checkbox>
+            </el-col>
+          </el-row>
+        </el-col>
+        <el-col :span="5">
+          <el-row>
+            <el-col :span="12">
+              <span>缺省停站时间：</span>
+            </el-col>
+            <el-col :span="12">
+              <el-select v-model="model.time" style="display: inline-black" placeholder="请选择">
+                <el-option
+                  v-for="item in timeList"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-col>
+          </el-row>
+        </el-col>
+        <el-col :span="5">
+          <el-row>
+            <el-col :span="9" :offset="2">
+              <span>表号：</span>
+            </el-col>
+            <el-col :span="13">
+              <el-input v-model="model.serviceNumber" />
+            </el-col>
+          </el-row>
+        </el-col>
+        <el-col :span="8">
+          <el-row>
+            <el-col :span="22" :offset="2">
+              <el-row>
+                <el-col :span="6">
+                  <el-checkbox v-model="model.clearGuest">清客</el-checkbox>
                 </el-col>
                 <el-col :span="8">
-                    <el-row>
-                        <el-col :span="22" :offset="2">
-                            <el-row>
-                                <el-col :span="6">
-                                    <el-checkbox v-model="model.clearGuest">清客</el-checkbox>
-                                </el-col>
-                                <el-col :span="8">
-                                    <el-checkbox v-model="model.continuationPlan">延续计划</el-checkbox>
-                                </el-col>
-                                <el-col :span="6">
-                                    <el-checkbox v-model="model.firstTrain">首班车</el-checkbox>
-                                </el-col>
-                            </el-row>
-                        </el-col>
-                    </el-row>
+                  <el-checkbox v-model="model.continuationPlan">延续计划</el-checkbox>
                 </el-col>
-            </el-row>
-            <el-row>
-                <el-col :span="4">
-                    <el-row>
-                        <el-col :span="9">
-                            <span>序列号：</span>
-                        </el-col>
-                        <el-col :span="15">
-                            <el-select style="display: inline-black" v-model="model.serialNumber" placeholder="请选择">
-                                <el-option v-for="item in serialNumberList" :key="item.value" :label="item.label"
-                                    :value="model.value">
-                                </el-option>
-                            </el-select>
-                        </el-col>
-                    </el-row>
+                <el-col :span="6">
+                  <el-checkbox v-model="model.firstTrain">首班车</el-checkbox>
                 </el-col>
-                <el-col :span="2">
-                    <el-row>
-                        <el-col :offset="4">
-                            <el-checkbox v-model="model.serialManual">手工</el-checkbox>
-                        </el-col>
-                    </el-row>
-                </el-col>
-                <el-col :span="5">
-                    <el-row>
-                        <el-col :span="12">
-                            <span>缺省运行等级：</span>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-select style="display: inline-black" v-model="model.level" placeholder="请选择">
-                                <el-option v-for="item in levelList" :key="item.value" :label="item.label"
-                                    :value="item.value">
-                                </el-option>
-                            </el-select>
-                        </el-col>
-                    </el-row>
-                </el-col>
-                <el-col :span="5">
-                    <el-row>
-                        <el-col :span="9" :offset="2">
-                            <span>开始时间：</span>
-                        </el-col>
-                        <el-col :span="13">
-                            <el-time-select v-model="model.startTime" placeholder="选择时间" :clearable="false">
-                            </el-time-select>
-                        </el-col>
-                    </el-row>
+              </el-row>
+            </el-col>
+          </el-row>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="4">
+          <el-row>
+            <el-col :span="9">
+              <span>序列号：</span>
+            </el-col>
+            <el-col :span="15">
+              <el-select v-model="model.serialNumber" style="display: inline-black" placeholder="请选择">
+                <el-option
+                  v-for="item in serialNumberList"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="model.value"
+                />
+              </el-select>
+            </el-col>
+          </el-row>
+        </el-col>
+        <el-col :span="2">
+          <el-row>
+            <el-col :offset="4">
+              <el-checkbox v-model="model.serialManual">手工</el-checkbox>
+            </el-col>
+          </el-row>
+        </el-col>
+        <el-col :span="5">
+          <el-row>
+            <el-col :span="12">
+              <span>缺省运行等级：</span>
+            </el-col>
+            <el-col :span="12">
+              <el-select v-model="model.level" style="display: inline-black" placeholder="请选择">
+                <el-option
+                  v-for="item in levelList"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-col>
+          </el-row>
+        </el-col>
+        <el-col :span="5">
+          <el-row>
+            <el-col :span="9" :offset="2">
+              <span>开始时间：</span>
+            </el-col>
+            <el-col :span="13">
+              <el-time-select v-model="model.startTime" placeholder="选择时间" :clearable="false" />
+            </el-col>
+          </el-row>
+        </el-col>
+        <el-col :span="8">
+          <el-row>
+            <el-col :span="22" :offset="2">
+              <el-row>
+                <el-col :span="6">
+                  <el-checkbox v-model="model.inStock">入库</el-checkbox>
                 </el-col>
                 <el-col :span="8">
-                    <el-row>
-                        <el-col :span="22" :offset="2">
-                            <el-row>
-                                <el-col :span="6">
-                                    <el-checkbox v-model="model.inStock">入库</el-checkbox>
-                                </el-col>
-                                <el-col :span="8">
-                                    <el-checkbox v-model="model.outStock">出库</el-checkbox>
-                                </el-col>
-                                <el-col :span="6">
-                                    <el-checkbox v-model="model.lastTrain">末班车</el-checkbox>
-                                </el-col>
-                            </el-row>
-                        </el-col>
-                    </el-row>
+                  <el-checkbox v-model="model.outStock">出库</el-checkbox>
                 </el-col>
-            </el-row>
-            <el-row style="margin-bottom: 5px;">
-                交路：
-            </el-row>
-            <el-row>
-                <el-table :data="model.route" border :height="140">
-                    <el-table-column prop="beginStationCode" label="起始站">
-                        <template slot-scope="scope">
-                            {{ formatName(scope.row.beginStationCode) }}
-                        </template>
-                    </el-table-column>
-                    <el-table-column prop="beginStationStandCode" label="起始站台">
-                    </el-table-column>
-                    <el-table-column prop="endStationCode" label="终到站">
-                        <template slot-scope="scope">
-                            {{ formatName(scope.row.endStationCode) }}
-                        </template>
-                    </el-table-column>
-                    <el-table-column prop="endStationStandCode" label="终到站台">
-                    </el-table-column>
-                    <el-table-column prop="describe" label="描述" :width="280">
-                    </el-table-column>
-                    <el-table-column :width="40">
-                    </el-table-column>
-                </el-table>
-            </el-row>
-            <el-row style=" margin-bottom: 5px;margin-top: 10px;">
-                详情：
-            </el-row>
-            <el-row>
-                <el-table :data="model.detail" border :height="140">
-                    <el-table-column prop="stationCode" label="站台" :width="160">
-                        <template slot-scope="scope">
-                            {{ formatName(scope.row.stationCode) }}
-                        </template>
-                    </el-table-column>
-                    <el-table-column prop="startTime" label="到点">
-                        <template slot-scope="scope">
-                            {{ formatTime(scope.row.startTime) }}
-                        </template>
-                    </el-table-column>
-                    <el-table-column prop="stopTime" label="停站时间">
-                        <template slot-scope="scope">
-                            {{ formatTime(scope.row.stopTime) }}
-                        </template>
-                    </el-table-column>
-                    <el-table-column prop="endTime" label="发点">
-                        <template slot-scope="scope">
-                            {{ formatTime(scope.row.endTime) }}
-                        </template>
-                    </el-table-column>
-                    <el-table-column prop="level" label="运行等级">
-                    </el-table-column>
-                    <el-table-column width="280">
-                    </el-table-column>
-                </el-table>
-            </el-row>
-            <el-row>
-                <el-col :offset="16">
-                    <el-checkbox v-model="model.default">显示默认停站时间和运行等级</el-checkbox>
+                <el-col :span="6">
+                  <el-checkbox v-model="model.lastTrain">末班车</el-checkbox>
                 </el-col>
-            </el-row>
-        </div>
-        <el-row type="flex" justify="center" class="button-group">
-            <el-button @click="handleCommit">确 定</el-button>
-            <el-button @click="doClose">取 消</el-button>
-        </el-row>
-    </el-dialog>
+              </el-row>
+            </el-col>
+          </el-row>
+        </el-col>
+      </el-row>
+      <el-row style="margin-bottom: 5px;">
+        交路：
+      </el-row>
+      <el-row>
+        <el-table :data="model.route" border :height="140">
+          <el-table-column prop="beginStationCode" label="起始站">
+            <template slot-scope="scope">
+              {{ formatName(scope.row.beginStationCode) }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="beginStationStandCode" label="起始站台" />
+          <el-table-column prop="endStationCode" label="终到站">
+            <template slot-scope="scope">
+              {{ formatName(scope.row.endStationCode) }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="endStationStandCode" label="终到站台" />
+          <el-table-column prop="describe" label="描述" :width="280" />
+          <el-table-column :width="40" />
+        </el-table>
+      </el-row>
+      <el-row style=" margin-bottom: 5px;margin-top: 10px;">
+        详情：
+      </el-row>
+      <el-row>
+        <el-table :data="model.detail" border :height="140">
+          <el-table-column prop="stationCode" label="站台" :width="160">
+            <template slot-scope="scope">
+              {{ formatName(scope.row.stationCode) }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="startTime" label="到点">
+            <template slot-scope="scope">
+              {{ formatTime(scope.row.startTime) }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="stopTime" label="停站时间">
+            <template slot-scope="scope">
+              {{ formatTime(scope.row.stopTime) }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="endTime" label="发点">
+            <template slot-scope="scope">
+              {{ formatTime(scope.row.endTime) }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="level" label="运行等级" />
+          <el-table-column width="280" />
+        </el-table>
+      </el-row>
+      <el-row>
+        <el-col :offset="16">
+          <el-checkbox v-model="model.default">显示默认停站时间和运行等级</el-checkbox>
+        </el-col>
+      </el-row>
+    </div>
+    <el-row type="flex" justify="center" class="button-group">
+      <el-button @click="handleCommit">确 定</el-button>
+      <el-button @click="doClose">取 消</el-button>
+    </el-row>
+  </el-dialog>
 </template>
 
 <script>
-    import { formatTime, formatName } from '@/utils/runPlan';
+import { formatTime, formatName } from '@/utils/runPlan';
 
-    export default {
-        name: 'ModifyingTask',
-        components: {
-        },
-        data() {
-            return {
-                dialogShow: false,
-                loading: false,
-                model: {
-                    tripNumber: '',
-                    serialNumber: '',
-                    trainManual: false,
-                    serialManual: false,
-                    clearGuest: false,
-                    continuationPlan: false,
-                    firstTrain: false,
-                    lastTrain: false,
-                    inStock: false,
-                    outStock: false,
-                    startTime: '',
-                    route: [],
-                    detail: []
-                },
-                timeList: [],
-                levelList: [],
-                tripNumberList: [],
-                serialNumberList: [],
-            }
-        },
-        computed: {
-            title() {
-                return '修改任务'
-            }
-        },
-        mounted() {
-        },
-        methods: {
-            formatTime(time) {
-                return formatTime(time);
-            },
-            formatName(code) {
-                return formatName(code);
-            },
-            loadInitData(params) {
-                this.model.tripNumber = params.tripNumber;
-                this.model.serviceNumber = params.serviceNumber;
-                let editData = this.$store.state.runPlan.editData[params.serviceNumber]
-                if (editData) {
-                    let tripNumberList = Object.keys(editData.trainMap).sort((a, b) => { return editData.trainMap[a].oldIndex - editData.trainMap[b].oldIndex });
-                    let trainInfo = editData.trainMap[params.tripNumber];
-                    let lastIndex = trainInfo.stationTimeList.length - 1;
-                    let taskObj = {
-                        tripNumber: params.tripNumber,
-                        beginStationCode: trainInfo.stationTimeList[0].stationCode,
-                        beginStationStandCode: '',
-                        endStationCode: trainInfo.stationTimeList[lastIndex].stationCode,
-                        endStationStandCode: ''
-                    }
-                    this.model.route.push(taskObj);
+export default {
+	name: 'ModifyingTask',
+	components: {
+	},
+	data() {
+		return {
+			dialogShow: false,
+			loading: false,
+			model: {
+				tripNumber: '',
+				serialNumber: '',
+				trainManual: false,
+				serialManual: false,
+				clearGuest: false,
+				continuationPlan: false,
+				firstTrain: false,
+				lastTrain: false,
+				inStock: false,
+				outStock: false,
+				startTime: '',
+				route: [],
+				detail: []
+			},
+			timeList: [],
+			levelList: [],
+			tripNumberList: [],
+			serialNumberList: []
+		};
+	},
+	computed: {
+		title() {
+			return '修改任务';
+		}
+	},
+	mounted() {
+	},
+	methods: {
+		formatTime(time) {
+			return formatTime(time);
+		},
+		formatName(code) {
+			return formatName(code);
+		},
+		loadInitData(params) {
+			this.model.tripNumber = params.tripNumber;
+			this.model.serviceNumber = params.serviceNumber;
+			const editData = this.$store.state.runPlan.editData[params.serviceNumber];
+			if (editData) {
+				const trainInfo = editData.trainMap[params.tripNumber];
+				const lastIndex = trainInfo.stationTimeList.length - 1;
+				const taskObj = {
+					tripNumber: params.tripNumber,
+					beginStationCode: trainInfo.stationTimeList[0].stationCode,
+					beginStationStandCode: '',
+					endStationCode: trainInfo.stationTimeList[lastIndex].stationCode,
+					endStationStandCode: ''
+				};
+				this.model.route.push(taskObj);
 
-                    trainInfo.stationTimeList.forEach((elem, index) => {
-                        let stationObj = {
-                            stationCode: elem.stationCode,
-                            startTime: index == 0 ? null : trainInfo.stationTimeList[index - 1].secondTime,
-                            stopTime: index == 0 ? null : elem.secondTime - trainInfo.stationTimeList[index - 1].secondTime,
-                            endTime: elem.secondTime,
-                            level: '',
-                        }
-                        this.model.detail.push(stationObj);
-                    })
-                }
-            },
-            doShow(params) {
-                this.loadInitData(params);
-                this.dialogShow = true;
-            },
-            doClose() {
-                this.loading = false;
-                this.dialogShow = false;
-            },
-            handleCommit() {
-            }
-        }
-    }
+				trainInfo.stationTimeList.forEach((elem, index) => {
+					const stationObj = {
+						stationCode: elem.stationCode,
+						startTime: index == 0 ? null : trainInfo.stationTimeList[index - 1].secondTime,
+						stopTime: index == 0 ? null : elem.secondTime - trainInfo.stationTimeList[index - 1].secondTime,
+						endTime: elem.secondTime,
+						level: ''
+					};
+					this.model.detail.push(stationObj);
+				});
+			}
+		},
+		doShow(params) {
+			this.loadInitData(params);
+			this.dialogShow = true;
+		},
+		doClose() {
+			this.loading = false;
+			this.dialogShow = false;
+		},
+		handleCommit() {
+		}
+	}
+};
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
     @import "src/styles/mixin.scss";
 
-
-
     /deep/ {
         .el-button {
             margin-left: 40px !important;
@@ -312,4 +323,4 @@
             width: 110px !important;
         }
     }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/jmap/theme/fuzhou_01/menus/dialog/trainControl.vue b/src/jmap/theme/fuzhou_01/menus/dialog/trainControl.vue
index f3ed9b146..9d89da799 100644
--- a/src/jmap/theme/fuzhou_01/menus/dialog/trainControl.vue
+++ b/src/jmap/theme/fuzhou_01/menus/dialog/trainControl.vue
@@ -1,423 +1,464 @@
 <template>
-    <el-dialog class="fuzhou-01__systerm train-control" :title="title" :visible.sync="show" width="320px"
-        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
-        <el-form size="small" label-width="90px" :model="formModel" :rules="rules" ref="form">
-            <el-form-item label="车 组 号:" prop="groupNumber">
-                <el-select v-model="formModel.groupNumber" :id="domIdTrainNumber" filterable
-                    :disabled="trainNumberIsDisabled" @change="trainNumberChange">
-                    <el-option v-for="train in trainList" :key="train.groupNumber" :label="train.groupNumber"
-                        :value="train.groupNumber">
-                    </el-option>
-                </el-select>
-            </el-form-item>
-            <el-form-item prop="trainType" label-width='0px'>
-                <el-radio-group v-model="formModel.trainType" :id="domIdTrainType" style="margin-left: 15px;"
-                    :disabled="trainTypeIsDisabled" @change="trainTypeChange">
-                    <el-radio :label="'01'">计划车</el-radio>
-                    <el-radio :label="'02'">头码车</el-radio>
-                    <el-radio :label="'03'">人工车</el-radio>
-                </el-radio-group>
-            </el-form-item>
-            <el-form-item prop="serviceNumber">
-                <span slot="label">表&emsp;&emsp;号</span>
-                <el-input v-model="formModel.serviceNumber" :id="domIdServerNo" :disabled="serverNoIsDisabled"
-                    @change="serverNoChange">
-                </el-input>
-            </el-form-item>
-            <el-form-item label="车 次 号:" prop="tripNumber">
-                <el-input v-model="formModel.tripNumber" :id="domIdTrainNo" :disabled="trainNoIsDisabled"
-                    @change="trainNoChange"></el-input>
-            </el-form-item>
-            <el-form-item label="目的地号:" prop="targetCode">
-                <el-input v-model="formModel.targetCode" :id="domIdTargetCode" :disabled="targetCodeIsDisabled"
-                    @change="targetCodeChange">
-                </el-input>
-            </el-form-item>
-        </el-form>
-        <el-row justify="center" class="button-group">
-            <el-col :span="10" :offset="2">
-                <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
-            </el-col>
-            <el-col :span="8" :offset="4">
-                <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
-            </el-col>
-        </el-row>
-        <confirm-train ref="confirmTrain"></confirm-train>
-        <notice-info ref="noticeInfo"></notice-info>
-    </el-dialog>
+  <el-dialog
+    v-dialogDrag
+    class="fuzhou-01__systerm train-control"
+    :title="title"
+    :visible.sync="show"
+    width="320px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <el-form ref="form" size="small" label-width="90px" :model="formModel" :rules="rules">
+      <el-form-item label="车 组 号:" prop="groupNumber">
+        <el-select
+          :id="domIdTrainNumber"
+          v-model="formModel.groupNumber"
+          filterable
+          :disabled="trainNumberIsDisabled"
+          @change="trainNumberChange"
+        >
+          <el-option
+            v-for="train in trainList"
+            :key="train.groupNumber"
+            :label="train.groupNumber"
+            :value="train.groupNumber"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item prop="trainType" label-width="0px">
+        <el-radio-group
+          :id="domIdTrainType"
+          v-model="formModel.trainType"
+          style="margin-left: 15px;"
+          :disabled="trainTypeIsDisabled"
+          @change="trainTypeChange"
+        >
+          <el-radio :label="'01'">计划车</el-radio>
+          <el-radio :label="'02'">头码车</el-radio>
+          <el-radio :label="'03'">人工车</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item prop="serviceNumber">
+        <span slot="label">表&emsp;&emsp;号</span>
+        <el-input
+          :id="domIdServerNo"
+          v-model="formModel.serviceNumber"
+          :disabled="serverNoIsDisabled"
+          @change="serverNoChange"
+        />
+      </el-form-item>
+      <el-form-item label="车 次 号:" prop="tripNumber">
+        <el-input
+          :id="domIdTrainNo"
+          v-model="formModel.tripNumber"
+          :disabled="trainNoIsDisabled"
+          @change="trainNoChange"
+        />
+      </el-form-item>
+      <el-form-item label="目的地号:" prop="targetCode">
+        <el-input
+          :id="domIdTargetCode"
+          v-model="formModel.targetCode"
+          :disabled="targetCodeIsDisabled"
+          @change="targetCodeChange"
+        />
+      </el-form-item>
+    </el-form>
+    <el-row justify="center" class="button-group">
+      <el-col :span="10" :offset="2">
+        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
+      </el-col>
+      <el-col :span="8" :offset="4">
+        <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
+      </el-col>
+    </el-row>
+    <confirm-train ref="confirmTrain" />
+    <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 ConfirmTrain from './childDialog/confirmTrain';
-    import NoticeInfo from './childDialog/childDialog/noticeInfo';
+import { mapGetters } from 'vuex';
+import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { getPublishTrainList } from '@/api/jmap/map';
+import ConfirmTrain from './childDialog/confirmTrain';
+import NoticeInfo from './childDialog/childDialog/noticeInfo';
 
-    export default {
-        name: 'TrainControl',
-        components: {
-            ConfirmTrain,
-            NoticeInfo
-        },
-        data() {
-            return {
-                trainList: [],
-                formModel: {
-                    tripNumber: '',
-                    groupNumber: '',
-                    trainType: '01',
-                    serviceNumber: '',
-                    targetCode: '',
-                },
+export default {
+	name: 'TrainControl',
+	components: {
+		ConfirmTrain,
+		NoticeInfo
+	},
+	data() {
+		return {
+			trainList: [],
+			formModel: {
+				tripNumber: '',
+				groupNumber: '',
+				trainType: '01',
+				serviceNumber: '',
+				targetCode: ''
+			},
 
-                rules: {
-                    groupNumber: [
-                        { required: true, message: '请选择车组号', trigger: 'change' }
-                    ],
-                    trainType: [
-                        { required: true, message: '请选择一个列车类型', trigger: 'change' }
-                    ],
-                    serviceNumber: [
-                        { required: true, message: '请输入表号', trigger: 'blur' }
-                    ],
-                    tripNumber: [
-                        { required: true, message: '请输入车次号', trigger: 'blur' }
-                    ],
-                    targetCode: [
-                        { required: true, message: '请输入目的地号', trigger: 'blur' }
-                    ]
-                },
-                operation: null,
-                dialogShow: false,
-                loading: false,
-                direction: 0
-            }
-        },
-        computed: {
-            ...mapGetters('map', [
-                'map'
-            ]),
-            trainNoIsDisabled() {
-                return false;
-            },
-            serverNoIsDisabled() {
-                return false;
-            },
-            targetCodeIsDisabled() {
-                return false;
-            },
-            trainNumberIsDisabled() {
-                if (this.operation != OperationEvent.Train.addTrainId.menu.operation) {
-                    return true;
-                }
-            },
-            trainTypeIsDisabled() {
-                if (this.operation != OperationEvent.Train.addTrainId.menu.operation) {
-                    return true;
-                }
-            },
-            show() {
-                return this.dialogShow && !this.$store.state.menuOperation.break;
-            },
-            domIdTrainNumber() {
-                if (this.dialogShow) {
-                    if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
-                        /** 添加列车识别号*/
-                        return OperationEvent.Train.addTrainId.trainNumberChange.domId;
-                    } else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
-                        /** 修改列车识别号*/
-                        return OperationEvent.Train.editTrainId.trainNumberChange.domId;
-                    }
-                }
-            },
-            domIdTrainNo() {
-                if (this.dialogShow) {
-                    if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
-                        /** 添加列车识别号*/
-                        return OperationEvent.Train.addTrainId.trainNoChange.domId;
-                    } else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
-                        /** 修改列车识别号*/
-                        return OperationEvent.Train.editTrainId.trainNoChange.domId;
-                    }
-                }
-            },
-            domIdTrainType() {
-                if (this.dialogShow) {
-                    if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
-                        /** 添加列车识别号*/
-                        return OperationEvent.Train.addTrainId.trainTypeChange.domId;
-                    } else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
-                        /** 修改列车识别号*/
-                        return OperationEvent.Train.editTrainId.trainTypeChange.domId;
-                    }
-                }
-            },
-            domIdServerNo() {
-                if (this.dialogShow) {
-                    if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
-                        /** 添加列车识别号*/
-                        return OperationEvent.Train.addTrainId.serverNoChange.domId;
-                    } else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
-                        /** 修改列车识别号*/
-                        return OperationEvent.Train.editTrainId.serverNoChange.domId;
-                    }
-                }
-            },
-            domIdTargetCode() {
-                if (this.dialogShow) {
-                    if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
-                        /** 添加列车识别号*/
-                        return OperationEvent.Train.addTrainId.targetCodeChange.domId;
-                    } else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
-                        /** 修改列车识别号*/
-                        return OperationEvent.Train.editTrainId.targetCodeChange.domId;
-                    }
-                }
-            },
-            domIdConfirm() {
-                if (this.dialogShow) {
-                    if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
-                        /** 添加列车识别号*/
-                        return OperationEvent.Train.addTrainId.menu.domId;
-                    } else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
-                        /** 修改列车识别号*/
-                        return OperationEvent.Train.editTrainId.menu.domId;
-                    }
-                }
-            },
-            domIdCancel() {
-                return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-            },
-            title() {
-                if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
-                    return '添加列车识别号';
-                } else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
-                    return '修改列车识别号';
-                }
-            }
-        },
-        mounted() {
-            this.$nextTick(() => {
-                this.$store.dispatch('training/tipReload');
-            })
-        },
-        methods: {
-            loadInitData(map) {
-                if (map.skinCode) {
-                    getPublishTrainList(map.skinCode).then(resp => {
-                        this.trainList = resp.data;
-                    }).catch(error => {
-                        this.$messageBox(`获取列车车组号失败`);
-                    });
-                }
-            },
-            doShow(operate, selected) {
-                //如果不是断点激活，则需要对初始值进行初始化
-                if (!this.dialogShow) {
-                    this.operation = operate.operation;
-                }
-                let model = this.$store.getters['map/getDeviceByCode'](selected.code);
-                this.formModel = {
-                    groupNumber: model.groupNumber,
-                    tripNumber: model.tripNumber,
-                    trainType: '01',
-                    serviceNumber: model.serviceNumber,
-                    targetCode: model.targetCode,
-                };
+			rules: {
+				groupNumber: [
+					{ required: true, message: '请选择车组号', trigger: 'change' }
+				],
+				trainType: [
+					{ required: true, message: '请选择一个列车类型', trigger: 'change' }
+				],
+				serviceNumber: [
+					{ required: true, message: '请输入表号', trigger: 'blur' }
+				],
+				tripNumber: [
+					{ required: true, message: '请输入车次号', trigger: 'blur' }
+				],
+				targetCode: [
+					{ required: true, message: '请输入目的地号', trigger: 'blur' }
+				]
+			},
+			operation: null,
+			dialogShow: false,
+			loading: false,
+			direction: 0
+		};
+	},
+	computed: {
+		...mapGetters('map', [
+			'map'
+		]),
+		trainNoIsDisabled() {
+			return false;
+		},
+		serverNoIsDisabled() {
+			return false;
+		},
+		targetCodeIsDisabled() {
+			return false;
+		},
+		trainNumberIsDisabled() {
+			if (this.operation != OperationEvent.Train.addTrainId.menu.operation) {
+				return true;
+			}
+			return '';
+		},
+		trainTypeIsDisabled() {
+			if (this.operation != OperationEvent.Train.addTrainId.menu.operation) {
+				return true;
+			}
+			return '';
+		},
+		show() {
+			return this.dialogShow && !this.$store.state.menuOperation.break;
+		},
+		domIdTrainNumber() {
+			if (this.dialogShow) {
+				if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
+					/** 添加列车识别号*/
+					return OperationEvent.Train.addTrainId.trainNumberChange.domId;
+				} else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
+					/** 修改列车识别号*/
+					return OperationEvent.Train.editTrainId.trainNumberChange.domId;
+				}
+			}
+			return '';
+		},
+		domIdTrainNo() {
+			if (this.dialogShow) {
+				if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
+					/** 添加列车识别号*/
+					return OperationEvent.Train.addTrainId.trainNoChange.domId;
+				} else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
+					/** 修改列车识别号*/
+					return OperationEvent.Train.editTrainId.trainNoChange.domId;
+				}
+			}
+			return '';
+		},
+		domIdTrainType() {
+			if (this.dialogShow) {
+				if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
+					/** 添加列车识别号*/
+					return OperationEvent.Train.addTrainId.trainTypeChange.domId;
+				} else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
+					/** 修改列车识别号*/
+					return OperationEvent.Train.editTrainId.trainTypeChange.domId;
+				}
+			}
+			return '';
+		},
+		domIdServerNo() {
+			if (this.dialogShow) {
+				if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
+					/** 添加列车识别号*/
+					return OperationEvent.Train.addTrainId.serverNoChange.domId;
+				} else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
+					/** 修改列车识别号*/
+					return OperationEvent.Train.editTrainId.serverNoChange.domId;
+				}
+			}
+			return '';
+		},
+		domIdTargetCode() {
+			if (this.dialogShow) {
+				if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
+					/** 添加列车识别号*/
+					return OperationEvent.Train.addTrainId.targetCodeChange.domId;
+				} else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
+					/** 修改列车识别号*/
+					return OperationEvent.Train.editTrainId.targetCodeChange.domId;
+				}
+			}
+			return '';
+		},
+		domIdConfirm() {
+			if (this.dialogShow) {
+				if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
+					/** 添加列车识别号*/
+					return OperationEvent.Train.addTrainId.menu.domId;
+				} else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
+					/** 修改列车识别号*/
+					return OperationEvent.Train.editTrainId.menu.domId;
+				}
+			}
+			return '';
+		},
+		domIdCancel() {
+			return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+		},
+		title() {
+			if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
+				return '添加列车识别号';
+			} else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
+				return '修改列车识别号';
+			}
+			return '';
+		}
+	},
+	mounted() {
+		this.$nextTick(() => {
+			this.$store.dispatch('training/tipReload');
+		});
+	},
+	methods: {
+		loadInitData(map) {
+			if (map.skinCode) {
+				getPublishTrainList(map.skinCode).then(resp => {
+					this.trainList = resp.data;
+				}).catch(() => {
+					this.$messageBox(`获取列车车组号失败`);
+				});
+			}
+		},
+		doShow(operate, selected) {
+			// 如果不是断点激活，则需要对初始值进行初始化
+			if (!this.dialogShow) {
+				this.operation = operate.operation;
+			}
+			const model = this.$store.getters['map/getDeviceByCode'](selected.code);
+			this.formModel = {
+				groupNumber: model.groupNumber,
+				tripNumber: model.tripNumber,
+				trainType: '01',
+				serviceNumber: model.serviceNumber,
+				targetCode: model.targetCode
+			};
 
-                /** 加载列车数据*/
-                this.loadInitData(this.map);
-                this.dialogShow = true;
-                this.$nextTick(function () {
-                    this.$store.dispatch('training/emitTipFresh');
-                });
-            },
-            doClose() {
-                this.loading = false;
-                this.dialogShow = false;
-                this.$store.dispatch('training/emitTipFresh');
-                this.$store.dispatch('map/setTrainWindowShow', false);
-            },
-            trainNumberChange(groupNumber) {
-                let operate = {
-                    type: MapDeviceType.Train.type,
-                    val: `${groupNumber}`,
-                    operation: ''
-                }
+			/** 加载列车数据*/
+			this.loadInitData(this.map);
+			this.dialogShow = true;
+			this.$nextTick(function () {
+				this.$store.dispatch('training/emitTipFresh');
+			});
+		},
+		doClose() {
+			this.loading = false;
+			this.dialogShow = false;
+			this.$store.dispatch('training/emitTipFresh');
+			this.$store.dispatch('map/setTrainWindowShow', false);
+		},
+		trainNumberChange(groupNumber) {
+			const operate = {
+				type: MapDeviceType.Train.type,
+				val: `${groupNumber}`,
+				operation: ''
+			};
 
-                if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
-                    operate.operation = OperationEvent.Train.addTrainId.trainNumberChange.operation;
-                } else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
-                    operate.operation = OperationEvent.Train.editTrainId.trainNumberChange.operation;
-                }
+			if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
+				operate.operation = OperationEvent.Train.addTrainId.trainNumberChange.operation;
+			} else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
+				operate.operation = OperationEvent.Train.editTrainId.trainNumberChange.operation;
+			}
 
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    }
-                })
-            },
-            trainTypeChange(trainType) {
-                let operate = {
-                    type: MapDeviceType.Train.type,
-                    val: `${trainType}`,
-                    operation: ''
-                }
+			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+				if (valid) {
+					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+				}
+			});
+		},
+		trainTypeChange(trainType) {
+			const operate = {
+				type: MapDeviceType.Train.type,
+				val: `${trainType}`,
+				operation: ''
+			};
 
-                if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
-                    operate.operation = OperationEvent.Train.addTrainId.trainTypeChange.operation;
-                } else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
-                    operate.operation = OperationEvent.Train.editTrainId.trainTypeChange.operation;
-                }
+			if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
+				operate.operation = OperationEvent.Train.addTrainId.trainTypeChange.operation;
+			} else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
+				operate.operation = OperationEvent.Train.editTrainId.trainTypeChange.operation;
+			}
 
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    }
-                })
-            },
-            serverNoChange(serviceNumber) {
-                let operate = {
-                    type: MapDeviceType.Train.type,
-                    val: `${serviceNumber}`,
-                    operation: ''
-                }
+			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+				if (valid) {
+					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+				}
+			});
+		},
+		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;
-                }
+			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) {
-                let operate = {
-                    type: MapDeviceType.Train.type,
-                    val: `${tripNumber}`,
-                    operation: ''
-                }
+			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+				if (valid) {
+					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+				}
+			});
+		},
+		trainNoChange(tripNumber) {
+			const operate = {
+				type: MapDeviceType.Train.type,
+				val: `${tripNumber}`,
+				operation: ''
+			};
 
-                if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
-                    operate.operation = OperationEvent.Train.addTrainId.trainNoChange.operation;
-                } else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
-                    operate.operation = OperationEvent.Train.editTrainId.trainNoChange.operation;
-                }
+			if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
+				operate.operation = OperationEvent.Train.addTrainId.trainNoChange.operation;
+			} else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
+				operate.operation = OperationEvent.Train.editTrainId.trainNoChange.operation;
+			}
 
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    }
-                })
-            },
-            targetCodeChange(targetCode) {
-                let operate = {
-                    type: MapDeviceType.Train.type,
-                    val: `${targetCode}`,
-                    operation: ''
-                }
+			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+				if (valid) {
+					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+				}
+			});
+		},
+		targetCodeChange(targetCode) {
+			const operate = {
+				type: MapDeviceType.Train.type,
+				val: `${targetCode}`,
+				operation: ''
+			};
 
-                if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
-                    operate.operation = OperationEvent.Train.addTrainId.targetCodeChange.operation;
-                } else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
-                    operate.operation = OperationEvent.Train.editTrainId.targetCodeChange.operation;
-                }
+			if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
+				operate.operation = OperationEvent.Train.addTrainId.targetCodeChange.operation;
+			} else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
+				operate.operation = OperationEvent.Train.editTrainId.targetCodeChange.operation;
+			}
 
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    }
-                })
-            },
-            commit() {
-                if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
-                    /** 增加列车识别号*/
-                    this.addTrainId();
-                } else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
-                    /** 修改列车识别号*/
-                    this.editTrainId();
-                }
-            },
-            //增加列车识别号
-            addTrainId() {
-                this.$refs['form'].validate((valid) => {
-                    if (valid) {
-                        let model = this.formModel;
-                        let operate = {
-                            send: true,
-                            type: MapDeviceType.Train.type,
-                            operation: OperationEvent.Train.addTrainId.menu.operation,
-                            messages: [`添加列车识别号：成功`],
-                            val: `${model.groupNumber}::${model.trainType}::${model.serviceNumber}::${model.tripNumber}::${model.targetCode}`,
-                        }
+			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+				if (valid) {
+					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+				}
+			});
+		},
+		commit() {
+			if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
+				/** 增加列车识别号*/
+				this.addTrainId();
+			} else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
+				/** 修改列车识别号*/
+				this.editTrainId();
+			}
+		},
+		// 增加列车识别号
+		addTrainId() {
+			this.$refs['form'].validate((valid) => {
+				if (valid) {
+					const model = this.formModel;
+					const operate = {
+						send: true,
+						type: MapDeviceType.Train.type,
+						operation: OperationEvent.Train.addTrainId.menu.operation,
+						messages: [`添加列车识别号：成功`],
+						val: `${model.groupNumber}::${model.trainType}::${model.serviceNumber}::${model.tripNumber}::${model.targetCode}`
+					};
 
-                        this.loading = true;
-                        this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                            this.loading = false;
-                            if (valid) {
-                                this.doClose();
-                                this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                                this.$refs.confirmTrain.doShow(operate);
-                            }
-                        }).catch(error => {
-                            this.loading = false;
-                            this.doClose();
-                            this.$refs.noticeInfo.doShow(operate);
-                        })
-                    } else {
-                        return false;
-                    }
-                });
-            },
-            //修改列车识别号
-            editTrainId() {
-                this.$refs['form'].validate((valid) => {
-                    if (valid) {
-                        let operate = {
-                            send: true,
-                            type: MapDeviceType.Train.type,
-                            operation: OperationEvent.Train.editTrainId.menu.operation,
-                            messages: [`修改列车识别号：成功`],
-                            val: this.formModel.tripNumber,
-                        }
+					this.loading = true;
+					this.$store.dispatch('training/next', operate).then(({ valid }) => {
+						this.loading = false;
+						if (valid) {
+							this.doClose();
+							this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+							this.$refs.confirmTrain.doShow(operate);
+						}
+					}).catch(() => {
+						this.loading = false;
+						this.doClose();
+						this.$refs.noticeInfo.doShow(operate);
+					});
+				} else {
+					return false;
+				}
+			});
+		},
+		// 修改列车识别号
+		editTrainId() {
+			this.$refs['form'].validate((valid) => {
+				if (valid) {
+					const operate = {
+						send: true,
+						type: MapDeviceType.Train.type,
+						operation: OperationEvent.Train.editTrainId.menu.operation,
+						messages: [`修改列车识别号：成功`],
+						val: this.formModel.tripNumber
+					};
 
-                        this.loading = true;
-                        this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                            this.loading = false;
-                            if (valid) {
-                                this.doClose();
-                                this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                                this.$refs.confirmTrain.doShow(operate);
-                            }
-                        }).catch(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();
+							this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+							this.$refs.confirmTrain.doShow(operate);
+						}
+					}).catch(() => {
+						this.loading = false;
+						this.doClose();
+						this.$refs.noticeInfo.doShow(operate);
+					});
+				} else {
+					return false;
+				}
+			});
+		},
+		cancel() {
+			const operate = {
+				type: MapDeviceType.Train.type,
+				operation: OperationEvent.Command.cancel.menu.operation
+			};
 
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.doClose();
-                    }
-                }).catch(error => {
-                    this.doClose();
-                });
-            }
-        }
-    }
+			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+				if (valid) {
+					this.doClose();
+				}
+			}).catch(() => {
+				this.doClose();
+			});
+		}
+	}
+};
 </script>
diff --git a/src/jmap/theme/fuzhou_01/menus/dialog/trainDelete.vue b/src/jmap/theme/fuzhou_01/menus/dialog/trainDelete.vue
index d0d8ef36c..07a528669 100644
--- a/src/jmap/theme/fuzhou_01/menus/dialog/trainDelete.vue
+++ b/src/jmap/theme/fuzhou_01/menus/dialog/trainDelete.vue
@@ -1,156 +1,165 @@
 <template>
-    <el-dialog class="fuzhou-01__systerm stand-stop-time" :title="title" :visible.sync="show" width="320px"
-        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
-        <el-form size="small" label-width="90px" :model="formModel" :rules="rules" ref="form">
-            <el-form-item label="车 组 号:" prop="groupNumber">
-                <el-input :id="domIdTrainNumber" v-model="formModel.groupNumber" @change="trainNumberChange"></el-input>
-            </el-form-item>
-        </el-form>
-        <el-row justify="center" class="button-group">
-            <el-col :span="10" :offset="2">
-                <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
-            </el-col>
-            <el-col :span="8" :offset="4">
-                <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
-            </el-col>
-        </el-row>
-        <confirm-control ref="confirmControl"></confirm-control>
-        <notice-info ref="noticeInfo"></notice-info>
-    </el-dialog>
+  <el-dialog
+    v-dialogDrag
+    class="fuzhou-01__systerm stand-stop-time"
+    :title="title"
+    :visible.sync="show"
+    width="320px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <el-form ref="form" size="small" label-width="90px" :model="formModel" :rules="rules">
+      <el-form-item label="车 组 号:" prop="groupNumber">
+        <el-input :id="domIdTrainNumber" v-model="formModel.groupNumber" @change="trainNumberChange" />
+      </el-form-item>
+    </el-form>
+    <el-row justify="center" class="button-group">
+      <el-col :span="10" :offset="2">
+        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
+      </el-col>
+      <el-col :span="8" :offset="4">
+        <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
+      </el-col>
+    </el-row>
+    <confirm-control ref="confirmControl" />
+    <notice-info ref="noticeInfo" />
+  </el-dialog>
 </template>
 
 <script>
-    import { mapGetters } from 'vuex';
-    import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
-    import { getPublishMapTrainNos } from '@/api/runplan';
-    import ConfirmControl from './childDialog/confirmControl';
-    import NoticeInfo from './childDialog/childDialog/noticeInfo'
+import { mapGetters } from 'vuex';
+import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+// import { getPublishMapTrainNos } from '@/api/runplan';
+import ConfirmControl from './childDialog/confirmControl';
+import NoticeInfo from './childDialog/childDialog/noticeInfo';
 
-    export default {
-        name: 'TrainDelete',
-        components: {
-            ConfirmControl,
-            NoticeInfo
-        },
-        data() {
-            return {
-                trainNoList: [],
-                formModel: {
-                    groupNumber: '',
-                },
+export default {
+	name: 'TrainDelete',
+	components: {
+		ConfirmControl,
+		NoticeInfo
+	},
+	data() {
+		return {
+			trainNoList: [],
+			formModel: {
+				groupNumber: ''
+			},
 
-                rules: {
-                    groupNumber: [
-                        { required: true, message: '请输入车组号', trigger: 'blur' }
-                    ],
-                },
-                operation: null,
-                dialogShow: false,
-                loading: false,
-            }
-        },
-        computed: {
-            ...mapGetters('map', [
-                'map'
-            ]),
-            show() {
-                return this.dialogShow && !this.$store.state.menuOperation.break;
-            },
-            domIdCancel() {
-                return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-            },
-            domIdConfirm() {
-                return this.dialogShow ? OperationEvent.Train.delTrainId.menu.domId : '';
-            },
-            domIdTrainNumber() {
-                return this.dialogShow ? OperationEvent.Train.delTrainId.trainNumberChange.domId : '';
-            },
-            title() {
-                return '删除列车识别号'
-            }
-        },
-        mounted() {
-            this.$nextTick(() => {
-                this.$store.dispatch('training/tipReload');
-            })
-        },
-        methods: {
-            loadInitData(map) {
-                if (map) {
-                    getPublishMapTrainNos(map.skinCode).then(response => {
-                        this.trainNoList = response.data;
-                    }).catch(error => {
-                        this.$messageBox(`获取列车车组号失败`);
-                    });
-                }
-            },
-            doShow(operate, selected) {
-                //如果不是断点激活，则需要对初始值进行初始化
-                if (!this.dialogShow) {
-                    this.operation = operate.operation;
-                }
-                this.dialogShow = true;
-                this.$nextTick(function () {
-                    this.$store.dispatch('training/emitTipFresh');
-                });
-            },
-            doClose() {
-                this.loading = false;
-                this.dialogShow = false;
-                this.$store.dispatch('training/emitTipFresh');
-                this.$store.dispatch('map/setTrainWindowShow', false);
-            },
-            trainNumberChange() {
-                let operate = {
-                    type: MapDeviceType.Train.type,
-                    val: `${groupNumber}`,
-                    operation: OperationEvent.Train.delTrainId.trainNumberChange.operation
-                }
+			rules: {
+				groupNumber: [
+					{ required: true, message: '请输入车组号', trigger: 'blur' }
+				]
+			},
+			operation: null,
+			dialogShow: false,
+			loading: false
+		};
+	},
+	computed: {
+		...mapGetters('map', [
+			'map'
+		]),
+		show() {
+			return this.dialogShow && !this.$store.state.menuOperation.break;
+		},
+		domIdCancel() {
+			return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+		},
+		domIdConfirm() {
+			return this.dialogShow ? OperationEvent.Train.delTrainId.menu.domId : '';
+		},
+		domIdTrainNumber() {
+			return this.dialogShow ? OperationEvent.Train.delTrainId.trainNumberChange.domId : '';
+		},
+		title() {
+			return '删除列车识别号';
+		}
+	},
+	mounted() {
+		this.$nextTick(() => {
+			this.$store.dispatch('training/tipReload');
+		});
+	},
+	methods: {
+		loadInitData(map) {
+			if (map) {
+				// getPublishMapTrainNos(map.skinCode).then(response => {
+				// 	this.trainNoList = response.data;
+				// }).catch(() => {
+				// 	this.$messageBox(`获取列车车组号失败`);
+				// });
+			}
+		},
+		doShow(operate, selected) {
+			// 如果不是断点激活，则需要对初始值进行初始化
+			if (!this.dialogShow) {
+				this.operation = operate.operation;
+			}
+			this.dialogShow = true;
+			this.$nextTick(function () {
+				this.$store.dispatch('training/emitTipFresh');
+			});
+		},
+		doClose() {
+			this.loading = false;
+			this.dialogShow = false;
+			this.$store.dispatch('training/emitTipFresh');
+			this.$store.dispatch('map/setTrainWindowShow', false);
+		},
+		trainNumberChange() {
+			const operate = {
+				type: MapDeviceType.Train.type,
+				val: `${this.formModel.groupNumber}`,
+				operation: OperationEvent.Train.delTrainId.trainNumberChange.operation
+			};
 
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    }
-                })
-            },
-            commit() {
-                this.$refs['form'].validate((valid) => {
-                    if (valid) {
-                        let operate = {
-                            send: true,
-                            type: MapDeviceType.Train.type,
-                            operation: OperationEvent.Train.delTrainId.menu.operation,
-                            val: this.formModel.groupNumber
-                        }
+			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+				if (valid) {
+					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+				}
+			});
+		},
+		commit() {
+			this.$refs['form'].validate((valid) => {
+				if (valid) {
+					const operate = {
+						send: true,
+						type: MapDeviceType.Train.type,
+						operation: OperationEvent.Train.delTrainId.menu.operation,
+						val: this.formModel.groupNumber
+					};
 
-                        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();
+						this.$refs.noticeInfo.doShow(operate);
+					});
+				} else {
+					return false;
+				}
+			});
+		},
+		cancel() {
+			const operate = {
+				type: MapDeviceType.Train.type,
+				operation: OperationEvent.Command.cancel.menu.operation
+			};
 
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.doClose();
-                    }
-                }).catch(error => { this.doClose(); });
-            }
-        }
-    }
-</script>
\ 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/fuzhou_01/menus/menuTrain.vue b/src/jmap/theme/fuzhou_01/menus/menuTrain.vue
index eadcd4d12..05a582a36 100644
--- a/src/jmap/theme/fuzhou_01/menus/menuTrain.vue
+++ b/src/jmap/theme/fuzhou_01/menus/menuTrain.vue
@@ -1,318 +1,321 @@
 <template>
-    <div>
-        <pop-menu ref="popMenu" :menu="menu"></pop-menu>
-        <notice-info ref="noticeInfo"></notice-info>
-        <train-control ref="trainControl"></train-control>
-        <train-delete ref="trainDelete"></train-delete>
-        <train-move ref="trainMove"></train-move>
-        <train-switch ref="trainSwitch"></train-switch>
-        <train-edit-number ref="trainEditNumber"></train-edit-number>
-    </div>
+  <div>
+    <pop-menu ref="popMenu" :menu="menu" />
+    <notice-info ref="noticeInfo" />
+    <train-control ref="trainControl" />
+    <train-delete ref="trainDelete" />
+    <train-move ref="trainMove" />
+    <train-switch ref="trainSwitch" />
+    <train-edit-number ref="trainEditNumber" />
+  </div>
 </template>
 
 <script>
-    import PopMenu from '@/components/PopMenu';
-    import NoticeInfo from './dialog/childDialog/childDialog/noticeInfo'
-    import { mapGetters } from 'vuex';
-    import { TrainingMode, OperateMode } from '@/scripts/ConstDic';
-    import { MapDeviceType, OperationEvent, DeviceMenu } from '@/scripts/ConstDic';
-    import { MenuDisabledState, menuConvert, trainMenuFiltration } from './utils/menuItemStatus';
-    import TrainControl from './dialog/trainControl';
-    import TrainDelete from './dialog/trainDelete';
-    import TrainMove from './dialog/trainMove';
-    import TrainSwitch from './dialog/trainSwitch';
-    import TrainEditNumber from './dialog/trainEditNumber';
+import PopMenu from '@/components/PopMenu';
+import NoticeInfo from './dialog/childDialog/childDialog/noticeInfo';
+import { mapGetters } from 'vuex';
+import { OperateMode } from '@/scripts/ConstDic';
+import { MapDeviceType, OperationEvent, DeviceMenu } from '@/scripts/ConstDic';
+import { MenuDisabledState, menuConvert, trainMenuFiltration } from './utils/menuItemStatus';
+import TrainControl from './dialog/trainControl';
+import TrainDelete from './dialog/trainDelete';
+import TrainMove from './dialog/trainMove';
+import TrainSwitch from './dialog/trainSwitch';
+import TrainEditNumber from './dialog/trainEditNumber';
 
-    export default {
-        name: 'menuTrain',
-        props: {
-            selected: {
-                type: Object
-            }
-        },
-        components: {
-            PopMenu,
-            NoticeInfo,
-            TrainControl,
-            TrainDelete,
-            TrainMove,
-            TrainSwitch,
-            TrainEditNumber
-        },
-        data() {
-            return {
-                menu: [],
-                menuNormal: {
-                    local: [],
-                    central: [
-                        {
-                            label: '添加列车识别号',
-                            handler: this.addTrainId,
-                            disabledCallback: MenuDisabledState.Train.addTrainId,
-                            auth: { station: true, center: true }
-                        },
-                        {
-                            label: '删除列车识别号',
-                            handler: this.delTrainId,
-                            disabledCallback: MenuDisabledState.Train.delTrainId,
-                            auth: { station: true, center: true }
-                        },
-                        {
-                            label: '修改列车识别号',
-                            handler: this.editTrainId,
-                            disabledCallback: MenuDisabledState.Train.editTrainId,
-                            auth: { station: true, center: true }
-                        },
-                        {
-                            label: '修改车组号',
-                            handler: this.editTrainNo,
-                            disabledCallback: MenuDisabledState.Train.editTrainNo,
-                            auth: { station: true, center: true }
-                        },
-                        {
-                            label: '移动列车识别号',
-                            handler: this.moveTrainId,
-                            disabledCallback: MenuDisabledState.Train.moveTrainId,
-                            auth: { station: true, center: true }
-                        },
-                        {
-                            label: '交换列车识别号',
-                            handler: this.switchTrainId,
-                            disabledCallback: MenuDisabledState.Train.switchTrainId,
-                            auth: { station: true, center: true }
-                        }
-                    ]
-                },
-                menuForce: [
-                    {
-                        label: '设置通信故障',
-                        handler: this.setStoppage,
-                        disabledCallback: MenuDisabledState.Train.setStoppage
-                    },
-                    {
-                        label: '取消通信故障',
-                        handler: this.cancelStoppage,
-                        disabledCallback: MenuDisabledState.Train.cancelStoppage
-                    }
-                ],
-                menuSpeed: [
-                    {
-                        label: '确认运行至前方站',
-                        handler: this.limitSpeed,
-                        disabledCallback: MenuDisabledState.Train.limitSpeed
-                    }
-                ]
-            }
-        },
-        watch: {
-            '$store.state.menuOperation.menuCount': function () {
-                if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.Train) && !this.buttonOperation) {
-                    this.doShow(this.$store.state.menuOperation.menuPosition);
-                } else {
-                    this.doClose();
-                }
-            }
-        },
-        computed: {
-            ...mapGetters('training', [
-                'mode',
-                'operatemode'
-            ]),
-            ...mapGetters('menuOperation', [
-                'buttonOperation'
-            ])
-        },
-        methods: {
-            clickEvent() {
-                let self = this;
-                window.onclick = function (e) {
-                    self.doClose();
-                }
-            },
-            initMenu() {
-                //编辑模式菜单列表
-                this.menu = trainMenuFiltration(this.menuNormal);
-                if (this.operatemode === OperateMode.ADMIN) {
-                    this.menu = [...this.menu, ...this.menuForce, ...this.menuSpeed]
-                }
+export default {
+	name: 'MenuTrain',
+	components: {
+		PopMenu,
+		NoticeInfo,
+		TrainControl,
+		TrainDelete,
+		TrainMove,
+		TrainSwitch,
+		TrainEditNumber
+	},
+	props: {
+		selected: {
+			type: Object,
+			default() {
+				return null;
+			}
+		}
+	},
+	data() {
+		return {
+			menu: [],
+			menuNormal: {
+				local: [],
+				central: [
+					{
+						label: '添加列车识别号',
+						handler: this.addTrainId,
+						disabledCallback: MenuDisabledState.Train.addTrainId,
+						auth: { station: true, center: true }
+					},
+					{
+						label: '删除列车识别号',
+						handler: this.delTrainId,
+						disabledCallback: MenuDisabledState.Train.delTrainId,
+						auth: { station: true, center: true }
+					},
+					{
+						label: '修改列车识别号',
+						handler: this.editTrainId,
+						disabledCallback: MenuDisabledState.Train.editTrainId,
+						auth: { station: true, center: true }
+					},
+					{
+						label: '修改车组号',
+						handler: this.editTrainNo,
+						disabledCallback: MenuDisabledState.Train.editTrainNo,
+						auth: { station: true, center: true }
+					},
+					{
+						label: '移动列车识别号',
+						handler: this.moveTrainId,
+						disabledCallback: MenuDisabledState.Train.moveTrainId,
+						auth: { station: true, center: true }
+					},
+					{
+						label: '交换列车识别号',
+						handler: this.switchTrainId,
+						disabledCallback: MenuDisabledState.Train.switchTrainId,
+						auth: { station: true, center: true }
+					}
+				]
+			},
+			menuForce: [
+				{
+					label: '设置通信故障',
+					handler: this.setStoppage,
+					disabledCallback: MenuDisabledState.Train.setStoppage
+				},
+				{
+					label: '取消通信故障',
+					handler: this.cancelStoppage,
+					disabledCallback: MenuDisabledState.Train.cancelStoppage
+				}
+			],
+			menuSpeed: [
+				{
+					label: '确认运行至前方站',
+					handler: this.limitSpeed,
+					disabledCallback: MenuDisabledState.Train.limitSpeed
+				}
+			]
+		};
+	},
+	computed: {
+		...mapGetters('training', [
+			'mode',
+			'operatemode'
+		]),
+		...mapGetters('menuOperation', [
+			'buttonOperation'
+		])
+	},
+	watch: {
+		'$store.state.menuOperation.menuCount': function () {
+			if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.Train) && !this.buttonOperation) {
+				this.doShow(this.$store.state.menuOperation.menuPosition);
+			} else {
+				this.doClose();
+			}
+		}
+	},
+	methods: {
+		clickEvent() {
+			const self = this;
+			window.onclick = function (e) {
+				self.doClose();
+			};
+		},
+		initMenu() {
+			// 编辑模式菜单列表
+			this.menu = trainMenuFiltration(this.menuNormal);
+			if (this.operatemode === OperateMode.ADMIN) {
+				this.menu = [...this.menu, ...this.menuForce, ...this.menuSpeed];
+			}
 
-                //故障模式菜单列表
-                if (this.operatemode === OperateMode.FAULT) {
-                    this.menu = [...this.menuForce, ...this.menuSpeed]
-                }
+			// 故障模式菜单列表
+			if (this.operatemode === OperateMode.FAULT) {
+				this.menu = [...this.menuForce, ...this.menuSpeed];
+			}
 
-                this.menu = menuConvert(this.menu);
-            },
-            doShow(point) {
-                this.clickEvent();
-                this.initMenu();
+			this.menu = menuConvert(this.menu);
+		},
+		doShow(point) {
+			this.clickEvent();
+			this.initMenu();
 
-                if (this.$refs && this.$refs.popMenu && this.menu && this.menu.length) {
-                    this.$refs.popMenu.resetShowPosition(point);
-                }
-            },
-            doClose() {
-                if (this.$refs && this.$refs.popMenu) {
-                    this.$refs.popMenu.close();
-                    // this.$store.dispatch('map/setTrainWindowShow', false);
-                }
-            },
-            //设置故障
-            setStoppage() {
-                let operate = {
-                    start: true,
-                    send: true,
-                    code: this.selected.code,
-                    type: MapDeviceType.Train.type,
-                    label: MapDeviceType.Train.label,
-                    operation: OperationEvent.Train.stoppage.menu.operation
-                };
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    } else {
-                        this.$refs.noticeInfo.doShow(operate);
-                    }
-                }).catch(error => {
-                    this.$refs.noticeInfo.doShow(operate);
-                })
-            },
-            //取消故障
-            cancelStoppage() {
-                let operate = {
-                    start: true,
-                    send: true,
-                    code: this.selected.code,
-                    type: MapDeviceType.Train.type,
-                    label: MapDeviceType.Train.label,
-                    operation: OperationEvent.Train.cancelStoppage.menu.operation
-                };
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    } else {
-                        this.$refs.noticeInfo.doShow(operate);
-                    }
-                }).catch(error => {
-                    this.$refs.noticeInfo.doShow(operate);
-                })
-            },
-            //限速行驶
-            limitSpeed() {
-                let operate = {
-                    start: true,
-                    send: true,
-                    code: this.selected.code,
-                    type: MapDeviceType.Train.type,
-                    label: MapDeviceType.Train.label,
-                    operation: OperationEvent.Train.limitSpeed.menu.operation
-                };
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    } else {
-                        this.$refs.noticeInfo.doShow(operate);
-                    }
-                }).catch(error => {
-                    this.$refs.noticeInfo.doShow(operate);
-                })
-            },
-            //添加列车识别号
-            addTrainId() {
-                let operate = {
-                    start: true,
-                    code: this.selected.code,
-                    type: MapDeviceType.Train.type,
-                    label: MapDeviceType.Train.label,
-                    operation: OperationEvent.Train.addTrainId.menu.operation
-                };
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                        this.$refs.trainControl.doShow(operate, this.selected);
-                    }
-                });
-            },
-            //删除列车识别号
-            delTrainId() {
-                let operate = {
-                    start: true,
-                    code: this.selected.code,
-                    type: MapDeviceType.Train.type,
-                    label: MapDeviceType.Train.label,
-                    operation: OperationEvent.Train.delTrainId.menu.operation
-                };
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                        this.$refs.trainDelete.doShow(operate, this.selected);
-                    }
-                });
-            },
-            //修改列车识别号
-            editTrainId() {
-                let operate = {
-                    start: true,
-                    code: this.selected.code,
-                    type: MapDeviceType.Train.type,
-                    label: MapDeviceType.Train.label,
-                    operation: OperationEvent.Train.editTrainId.menu.operation
-                };
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                        this.$refs.trainControl.doShow(operate, this.selected);
-                    }
-                });
-            },
-            //修改车组号
-            editTrainNo() {
-                let operate = {
-                    start: true,
-                    code: this.selected.code,
-                    type: MapDeviceType.Train.type,
-                    label: MapDeviceType.Train.label,
-                    operation: OperationEvent.Train.editTrainNo.menu.operation
-                };
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                        this.$refs.trainEditNumber.doShow(operate, this.selected);
-                    }
-                });
-            },
-            //移动列车识别号
-            moveTrainId() {
-                let operate = {
-                    start: true,
-                    code: this.selected.code,
-                    type: MapDeviceType.Train.type,
-                    label: MapDeviceType.Train.label,
-                    operation: OperationEvent.Train.moveTrainId.menu.operation
-                };
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                        this.$refs.trainMove.doShow(operate, this.selected);
-                    }
-                });
-            },
-            //交换列车识别号
-            switchTrainId() {
-                let operate = {
-                    start: true,
-                    code: this.selected.code,
-                    type: MapDeviceType.Train.type,
-                    label: MapDeviceType.Train.label,
-                    operation: OperationEvent.Train.switchTrainId.menu.operation
-                };
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                        this.$refs.trainSwitch.doShow(operate, this.selected);
-                    }
-                });
-            }
-        }
-    }
-</script>
\ No newline at end of file
+			if (this.$refs && this.$refs.popMenu && this.menu && this.menu.length) {
+				this.$refs.popMenu.resetShowPosition(point);
+			}
+		},
+		doClose() {
+			if (this.$refs && this.$refs.popMenu) {
+				this.$refs.popMenu.close();
+				// this.$store.dispatch('map/setTrainWindowShow', false);
+			}
+		},
+		// 设置故障
+		setStoppage() {
+			const operate = {
+				start: true,
+				send: true,
+				code: this.selected.code,
+				type: MapDeviceType.Train.type,
+				label: MapDeviceType.Train.label,
+				operation: OperationEvent.Train.stoppage.menu.operation
+			};
+			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+				if (valid) {
+					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+				} else {
+					this.$refs.noticeInfo.doShow(operate);
+				}
+			}).catch(() => {
+				this.$refs.noticeInfo.doShow(operate);
+			});
+		},
+		// 取消故障
+		cancelStoppage() {
+			const operate = {
+				start: true,
+				send: true,
+				code: this.selected.code,
+				type: MapDeviceType.Train.type,
+				label: MapDeviceType.Train.label,
+				operation: OperationEvent.Train.cancelStoppage.menu.operation
+			};
+			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+				if (valid) {
+					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+				} else {
+					this.$refs.noticeInfo.doShow(operate);
+				}
+			}).catch(() => {
+				this.$refs.noticeInfo.doShow(operate);
+			});
+		},
+		// 限速行驶
+		limitSpeed() {
+			const operate = {
+				start: true,
+				send: true,
+				code: this.selected.code,
+				type: MapDeviceType.Train.type,
+				label: MapDeviceType.Train.label,
+				operation: OperationEvent.Train.limitSpeed.menu.operation
+			};
+			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+				if (valid) {
+					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+				} else {
+					this.$refs.noticeInfo.doShow(operate);
+				}
+			}).catch(() => {
+				this.$refs.noticeInfo.doShow(operate);
+			});
+		},
+		// 添加列车识别号
+		addTrainId() {
+			const operate = {
+				start: true,
+				code: this.selected.code,
+				type: MapDeviceType.Train.type,
+				label: MapDeviceType.Train.label,
+				operation: OperationEvent.Train.addTrainId.menu.operation
+			};
+			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+				if (valid) {
+					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+					this.$refs.trainControl.doShow(operate, this.selected);
+				}
+			});
+		},
+		// 删除列车识别号
+		delTrainId() {
+			const operate = {
+				start: true,
+				code: this.selected.code,
+				type: MapDeviceType.Train.type,
+				label: MapDeviceType.Train.label,
+				operation: OperationEvent.Train.delTrainId.menu.operation
+			};
+			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+				if (valid) {
+					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+					this.$refs.trainDelete.doShow(operate, this.selected);
+				}
+			});
+		},
+		// 修改列车识别号
+		editTrainId() {
+			const operate = {
+				start: true,
+				code: this.selected.code,
+				type: MapDeviceType.Train.type,
+				label: MapDeviceType.Train.label,
+				operation: OperationEvent.Train.editTrainId.menu.operation
+			};
+			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+				if (valid) {
+					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+					this.$refs.trainControl.doShow(operate, this.selected);
+				}
+			});
+		},
+		// 修改车组号
+		editTrainNo() {
+			const operate = {
+				start: true,
+				code: this.selected.code,
+				type: MapDeviceType.Train.type,
+				label: MapDeviceType.Train.label,
+				operation: OperationEvent.Train.editTrainNo.menu.operation
+			};
+			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+				if (valid) {
+					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+					this.$refs.trainEditNumber.doShow(operate, this.selected);
+				}
+			});
+		},
+		// 移动列车识别号
+		moveTrainId() {
+			const operate = {
+				start: true,
+				code: this.selected.code,
+				type: MapDeviceType.Train.type,
+				label: MapDeviceType.Train.label,
+				operation: OperationEvent.Train.moveTrainId.menu.operation
+			};
+			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+				if (valid) {
+					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+					this.$refs.trainMove.doShow(operate, this.selected);
+				}
+			});
+		},
+		// 交换列车识别号
+		switchTrainId() {
+			const operate = {
+				start: true,
+				code: this.selected.code,
+				type: MapDeviceType.Train.type,
+				label: MapDeviceType.Train.label,
+				operation: OperationEvent.Train.switchTrainId.menu.operation
+			};
+			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+				if (valid) {
+					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+					this.$refs.trainSwitch.doShow(operate, this.selected);
+				}
+			});
+		}
+	}
+};
+</script>
diff --git a/src/jmap/theme/fuzhou_01/menusPlan/addTask.vue b/src/jmap/theme/fuzhou_01/menusPlan/addTask.vue
index 64c594845..0e720a0c5 100644
--- a/src/jmap/theme/fuzhou_01/menusPlan/addTask.vue
+++ b/src/jmap/theme/fuzhou_01/menusPlan/addTask.vue
@@ -1,150 +1,162 @@
 <template>
-    <el-dialog class="fuzhou-01__schedule add-task" :title="title" :visible.sync="dialogShow" width="800px"
-        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
-        <div style="margin: 10px">
-            <el-row>
-                <el-col :span="3">
-                    <el-radio v-model="model.type" label="1">加在最前</el-radio>
-                </el-col>
-                <el-col :span="2" :offset="1">
-                    <span>车次号：</span>
-                </el-col>
-                <el-col :span="5">
-                    <el-select v-model="model.tripNumber" placeholder="请选择">
-                        <el-option v-for="item in tripNumberList" :key="item.value" :label="item.label"
-                            :value="item.value">
-                        </el-option>
-                    </el-select>
-                </el-col>
-                <el-col :span="3" :offset="1">
-                    <span>开始时间：</span>
-                </el-col>
-                <el-col :span="5">
-                    <el-select v-model="model.startTime" placeholder="请选择">
-                        <el-option v-for="item in tripNumberList" :key="item.value" :label="item.label"
-                            :value="item.value">
-                        </el-option>
-                    </el-select>
-                </el-col>
-            </el-row>
-            <el-row>
-                <el-col :span="3">
-                    <el-radio v-model="model.type" label="2">加在最后</el-radio>
-                </el-col>
-                <el-col :span="2" :offset="1">
-                    <span>车次号：</span>
-                </el-col>
-                <el-col :span="5">
-                    <el-select v-model="model.tripNumber" placeholder="请选择">
-                        <el-option v-for="item in tripNumberList" :key="item.value" :label="item.label"
-                            :value="item.value">
-                        </el-option>
-                    </el-select>
-                </el-col>
-                <el-col :span="3" :offset="1">
-                    <span>开始时间：</span>
-                </el-col>
-                <el-col :span="5">
-                    <el-select v-model="model.startTime" placeholder="请选择">
-                        <el-option v-for="item in tripNumberList" :key="item.value" :label="item.label"
-                            :value="item.value">
-                        </el-option>
-                    </el-select>
-                </el-col>
+  <el-dialog
+    v-dialogDrag
+    class="fuzhou-01__schedule add-task"
+    :title="title"
+    :visible.sync="dialogShow"
+    width="800px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <div style="margin: 10px">
+      <el-row>
+        <el-col :span="3">
+          <el-radio v-model="model.type" label="1">加在最前</el-radio>
+        </el-col>
+        <el-col :span="2" :offset="1">
+          <span>车次号：</span>
+        </el-col>
+        <el-col :span="5">
+          <el-select v-model="model.tripNumber" placeholder="请选择">
+            <el-option
+              v-for="item in tripNumberList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-col>
+        <el-col :span="3" :offset="1">
+          <span>开始时间：</span>
+        </el-col>
+        <el-col :span="5">
+          <el-select v-model="model.startTime" placeholder="请选择">
+            <el-option
+              v-for="item in tripNumberList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="3">
+          <el-radio v-model="model.type" label="2">加在最后</el-radio>
+        </el-col>
+        <el-col :span="2" :offset="1">
+          <span>车次号：</span>
+        </el-col>
+        <el-col :span="5">
+          <el-select v-model="model.tripNumber" placeholder="请选择">
+            <el-option
+              v-for="item in tripNumberList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-col>
+        <el-col :span="3" :offset="1">
+          <span>开始时间：</span>
+        </el-col>
+        <el-col :span="5">
+          <el-select v-model="model.startTime" placeholder="请选择">
+            <el-option
+              v-for="item in tripNumberList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-col>
 
-            </el-row>
-            <el-row style="margin-bottom: 5px;">
-                交路：
-            </el-row>
-            <el-row>
-                <el-table :data="model.route" border :height="180">
-                    <el-table-column prop="date" label="日期" width="180">
-                    </el-table-column>
-                    <el-table-column prop="name" label="姓名" width="180">
-                    </el-table-column>
-                    <el-table-column prop="address" label="地址">
-                    </el-table-column>
-                    <el-table-column width="20">
-                    </el-table-column>
-                </el-table>
-            </el-row>
-            <el-row style=" margin-bottom: 5px;margin-top: 10px;">
-                详情：
-            </el-row>
-            <el-row>
-                <el-table :data="model.detail" border :height="180">
-                    <el-table-column prop="date" label="日期" width="180">
-                    </el-table-column>
-                    <el-table-column prop="name" label="姓名" width="180">
-                    </el-table-column>
-                    <el-table-column prop="address" label="地址">
-                    </el-table-column>
-                    <el-table-column width="20">
-                    </el-table-column>
-                </el-table>
-            </el-row>
-            <el-row>
-                <el-col :offset="16">
-                    <el-checkbox v-model="model.default">显示默认停站时间和运行等级</el-checkbox>
-                </el-col>
-            </el-row>
-        </div>
-        <el-row type="flex" justify="center" class="button-group">
-            <el-button @click="commit">确 定</el-button>
-            <el-button @click="doClose">取 消</el-button>
-        </el-row>
-    </el-dialog>
+      </el-row>
+      <el-row style="margin-bottom: 5px;">
+        交路：
+      </el-row>
+      <el-row>
+        <el-table :data="model.route" border :height="180">
+          <el-table-column prop="date" label="日期" width="180" />
+          <el-table-column prop="name" label="姓名" width="180" />
+          <el-table-column prop="address" label="地址" />
+          <el-table-column width="20" />
+        </el-table>
+      </el-row>
+      <el-row style=" margin-bottom: 5px;margin-top: 10px;">
+        详情：
+      </el-row>
+      <el-row>
+        <el-table :data="model.detail" border :height="180">
+          <el-table-column prop="date" label="日期" width="180" />
+          <el-table-column prop="name" label="姓名" width="180" />
+          <el-table-column prop="address" label="地址" />
+          <el-table-column width="20" />
+        </el-table>
+      </el-row>
+      <el-row>
+        <el-col :offset="16">
+          <el-checkbox v-model="model.default">显示默认停站时间和运行等级</el-checkbox>
+        </el-col>
+      </el-row>
+    </div>
+    <el-row type="flex" justify="center" class="button-group">
+      <el-button @click="commit">确 定</el-button>
+      <el-button @click="doClose">取 消</el-button>
+    </el-row>
+  </el-dialog>
 </template>
 
 <script>
 
-    export default {
-        name: 'AddTask',
-        components: {
-        },
-        data() {
-            return {
-                dialogShow: false,
-                loading: false,
-                model: {
-                    type: '1',
-                    serviceNumber: '',
-                    tripNumber: '',
-                    startTime: '',
-                    default: false,
-                    route: [],
-                    detail: []
-                },
-                tripNumberList: [],
-            }
-        },
-        computed: {
-            title() {
-                return '添加任务'
-            }
-        },
-        mounted() {
-        },
-        methods: {
-            doShow(params) {
-                this.model.serviceNumber = params.serviceNumber;
-                this.model.tripNumber = params.tripNumber;
-                this.dialogShow = true;
-            },
-            doClose() {
-                this.loading = false;
-                this.dialogShow = false;
-            },
-            commit() {
-                this.doClose();
-            }
-        }
-    }
+export default {
+	name: 'AddTask',
+	components: {
+	},
+	data() {
+		return {
+			dialogShow: false,
+			loading: false,
+			model: {
+				type: '1',
+				serviceNumber: '',
+				tripNumber: '',
+				startTime: '',
+				default: false,
+				route: [],
+				detail: []
+			},
+			tripNumberList: []
+		};
+	},
+	computed: {
+		title() {
+			return '添加任务';
+		}
+	},
+	mounted() {
+	},
+	methods: {
+		doShow(params) {
+			this.model.serviceNumber = params.serviceNumber;
+			this.model.tripNumber = params.tripNumber;
+			this.dialogShow = true;
+		},
+		doClose() {
+			this.loading = false;
+			this.dialogShow = false;
+		},
+		commit() {
+			this.doClose();
+		}
+	}
+};
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
     @import "src/styles/mixin.scss";
 
-
     /deep/ {
         .el-button {
             margin-left: 40px !important;
@@ -160,4 +172,4 @@
             line-height: 20px !important;
         }
     }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/jmap/theme/fuzhou_01/menusPlan/chooseTemplatePlan.vue b/src/jmap/theme/fuzhou_01/menusPlan/chooseTemplatePlan.vue
index 31783f019..2dbf053be 100644
--- a/src/jmap/theme/fuzhou_01/menusPlan/chooseTemplatePlan.vue
+++ b/src/jmap/theme/fuzhou_01/menusPlan/chooseTemplatePlan.vue
@@ -4,7 +4,7 @@
     :title="title"
     class="fuzhou-01__schedule choose-plan-template"
     :visible.sync="dialogShow"
-    width="80%"
+    width="70%"
     :before-close="doClose"
     :modal="false"
     :close-on-click-modal="false"
@@ -93,11 +93,11 @@ export default {
 			return runPlanTemplateList(params);
 		},
 		handleConfirm() {
-			this.doClose();
 			if (this.$refs && this.$refs.pageRules) {
 				const choose = this.$refs.pageRules.currentChoose();
 				if (choose) {
 					this.$emit('chooseConfirm', choose);
+					this.doClose();
 				} else {
 					this.$messageBox(`请选择模板运行图`);
 				}
diff --git a/src/jmap/theme/fuzhou_01/menusPlan/createTodayPlan.vue b/src/jmap/theme/fuzhou_01/menusPlan/createTodayPlan.vue
index b15420cdd..5b813183a 100644
--- a/src/jmap/theme/fuzhou_01/menusPlan/createTodayPlan.vue
+++ b/src/jmap/theme/fuzhou_01/menusPlan/createTodayPlan.vue
@@ -18,9 +18,9 @@
 </template>
 
 <script>
-import { runPlanTemplateList, generateUserRunPlanEveryDay } from '@/api/runplan';
+import { runPlanTemplateList } from '@/api/runplan';
 import { getStationListBySkinCode } from '@/api/runplan';
-import { getEveryDayRunPlanData } from '@/api/simulation';
+import { getEveryDayRunPlanData, generateDayRunPlan } from '@/api/simulation';
 import { getSkinCodeList } from '@/api/management/mapskin';
 
 export default {
@@ -100,7 +100,7 @@ export default {
 				const choose = this.$refs.pageRules.currentChoose();
 				if (choose && choose.id) {
 					this.loading = true;
-					generateUserRunPlanEveryDay(choose.id, this.$route.query.group).then(response => {
+					generateDayRunPlan(choose.id, this.$route.query.group).then(response => {
 						this.loading = false;
 						this.reloadTable();
 						this.loadRunData();
diff --git a/src/jmap/theme/fuzhou_01/menusPlan/createWeekPlan.vue b/src/jmap/theme/fuzhou_01/menusPlan/createWeekPlan.vue
index 1381ca79e..7a7071d58 100644
--- a/src/jmap/theme/fuzhou_01/menusPlan/createWeekPlan.vue
+++ b/src/jmap/theme/fuzhou_01/menusPlan/createWeekPlan.vue
@@ -1,116 +1,126 @@
 <template>
-    <el-dialog class="fuzhou-01__schedule create-week-plan" :title="title" :visible.sync="dialogShow" width="800px"
-        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
-        <el-row>
-            <el-form ref="form" :model="model" :rules="rules" label-width="140px" size="small">
-                <el-form-item label="运行图名称:" prop="planId">
-                    <el-row>
-                        <el-col :span="19">
-                            <el-input v-model="model.planName" :readonly="true"></el-input>
-                        </el-col>
-                        <el-col :span="4" :offset="1">
-                            <el-button @click="handleChoose">选择 </el-button>
-                        </el-col>
-                    </el-row>
-                </el-form-item>
-                <el-form-item label="计划日期范围:" prop="dateList">
-                    <el-row>
-                        <el-date-picker type="dates" v-model="model.dateList" :clearable="false" placeholder="选择一个或多个日期"
-                            value-format="yyyy-MM-dd">
-                        </el-date-picker>
-                    </el-row>
-                </el-form-item>
-            </el-form>
-        </el-row>
-        <el-row type="flex" justify="center" class="button-group">
-            <el-button @click="create">确 定</el-button>
-            <el-button @click="doClose">取 消</el-button>
-        </el-row>
-        <choose-template-plan ref="choose" @chooseConfirm="chooseConfirm"></choose-template-plan>
-    </el-dialog>
+  <el-dialog
+    v-dialogDrag
+    class="fuzhou-01__schedule create-week-plan"
+    :title="title"
+    :visible.sync="dialogShow"
+    width="800px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <el-row>
+      <el-form ref="form" :model="model" :rules="rules" label-width="140px" size="small">
+        <el-form-item label="运行图名称:" prop="planId">
+          <el-row>
+            <el-col :span="19">
+              <el-input v-model="model.planName" :readonly="true" />
+            </el-col>
+            <el-col :span="4" :offset="1">
+              <el-button @click="handleChoose">选择 </el-button>
+            </el-col>
+          </el-row>
+        </el-form-item>
+        <el-form-item label="计划日期范围:" prop="dateList">
+          <el-row>
+            <el-date-picker
+              v-model="model.dateList"
+              type="dates"
+              :clearable="false"
+              placeholder="选择一个或多个日期"
+              value-format="yyyy-MM-dd"
+            />
+          </el-row>
+        </el-form-item>
+      </el-form>
+    </el-row>
+    <el-row type="flex" justify="center" class="button-group">
+      <el-button @click="create">确 定</el-button>
+      <el-button @click="doClose">取 消</el-button>
+    </el-row>
+    <choose-template-plan ref="choose" @chooseConfirm="chooseConfirm" />
+  </el-dialog>
 </template>
 
 <script>
-    import { createRunPlanLoad } from '@/api/runplan';
-    import ChooseTemplatePlan from './chooseTemplatePlan';
+import { createRunPlanLoad } from '@/api/runplan';
+import ChooseTemplatePlan from './chooseTemplatePlan';
 
-    export default {
-        name: 'CreateWeekPlan',
-        components: {
-            ChooseTemplatePlan
-        },
-        data() {
-            return {
-                dialogShow: false,
-                loading: false,
-                model: {
-                    planId: '',
-                    planName: '',
-                    dateList: [],
-                }
-            }
-        },
-        computed: {
-            title() {
-                return '创建一周计划'
-            },
-            rules() {
-                let rules = {
-                    planId: [
-                        { required: true, message: '请选择模板运行图', trigger: 'blur' }
-                    ],
-                    dateList: [
-                        { required: true, message: '请选择计划日期范围', trigger: 'change' }
-                    ]
-                }
+export default {
+	name: 'CreateWeekPlan',
+	components: {
+		ChooseTemplatePlan
+	},
+	data() {
+		return {
+			dialogShow: false,
+			loading: false,
+			model: {
+				planId: '',
+				planName: '',
+				dateList: []
+			}
+		};
+	},
+	computed: {
+		title() {
+			return '创建一周计划';
+		},
+		rules() {
+			const rules = {
+				planId: [
+					{ required: true, message: '请选择模板运行图', trigger: 'blur' }
+				],
+				dateList: [
+					{ required: true, message: '请选择计划日期范围', trigger: 'change' }
+				]
+			};
 
-                return rules;
-            }
-        },
-        mounted() {
-        },
-        methods: {
-            doShow(params) {
-                this.dialogShow = true;
-            },
-            doClose() {
-                this.loading = false;
-                this.dialogShow = false;
-            },
-            handleChoose() {
-                this.$refs.choose.doShow();
-            },
-            chooseConfirm(choose) {
-                if (choose) {
-                    this.model.planId = choose.id;
-                    this.model.planName = choose.name;
-                }
-            },
-            buildModel() {
-                return this.model.dateList.map(date => {
-                    return {
-                        loadTime: date,
-                        mapId: this.$route.query.mapId,
-                        templatePlanId: this.model.planId
-                    }
-                });
-            },
-            create() {
-                this.$refs['form'].validate((valid) => {
-                    if (valid) {
-                        createRunPlanLoad(this.buildModel()).then(response => {
-                            this.$message.success('创建运行图计划成功');
-                            this.$emit('reloadTable', { name: 'managePlanList' });
-                            this.doClose();
-                        }).catch(error => {
-                            this.doClose();
-                            this.$messageBox('创建运行图计划失败');
-                        })
-                    }
-                });
-            }
-        }
-    }
+			return rules;
+		}
+	},
+	mounted() {
+	},
+	methods: {
+		doShow(params) {
+			this.dialogShow = true;
+		},
+		doClose() {
+			this.loading = false;
+			this.dialogShow = false;
+		},
+		handleChoose() {
+			this.$refs.choose.doShow();
+		},
+		chooseConfirm(choose) {
+			if (choose) {
+				this.model.planId = choose.id;
+				this.model.planName = choose.name;
+			}
+		},
+		buildModel() {
+			return {
+				planDateList: this.model.dateList,
+				mapId: this.$route.query.mapId,
+				templatePlanId: this.model.planId
+			};
+		},
+		create() {
+			this.$refs['form'].validate((valid) => {
+				if (valid) {
+					createRunPlanLoad(this.buildModel()).then(response => {
+						this.$message.success('创建运行图计划成功');
+						this.doClose();
+					}).catch(() => {
+						this.doClose();
+						this.$messageBox('创建运行图计划失败');
+					});
+				}
+			});
+		}
+	}
+};
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
     @import "src/styles/mixin.scss";
@@ -124,4 +134,4 @@
             margin: 10px;
         }
     }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/jmap/theme/fuzhou_01/menusPlan/deleteTask.vue b/src/jmap/theme/fuzhou_01/menusPlan/deleteTask.vue
index a6b886196..4d6f216da 100644
--- a/src/jmap/theme/fuzhou_01/menusPlan/deleteTask.vue
+++ b/src/jmap/theme/fuzhou_01/menusPlan/deleteTask.vue
@@ -1,57 +1,66 @@
 <template>
-    <el-dialog class="fuzhou-01__schedule delete-task" :title="title" :visible.sync="dialogShow" width="400px"
-        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
-        <el-row>
-            <el-radio v-model="type" :label="1">删除以前所有任务（包含本任务）</el-radio>
-        </el-row>
-        <el-row>
-            <el-radio v-model="type" :label="2">删除以后所有任务（包含本任务）</el-radio>
-        </el-row>
-        <el-row type="flex" justify="center" class="button-group">
-            <el-button @click="commit">确 定</el-button>
-            <el-button @click="doClose">取 消</el-button>
-        </el-row>
-    </el-dialog>
+  <el-dialog
+    v-dialogDrag
+    class="fuzhou-01__schedule delete-task"
+    :title="title"
+    :visible.sync="dialogShow"
+    width="400px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <el-row>
+      <el-radio v-model="type" :label="1">删除以前所有任务（包含本任务）</el-radio>
+    </el-row>
+    <el-row>
+      <el-radio v-model="type" :label="2">删除以后所有任务（包含本任务）</el-radio>
+    </el-row>
+    <el-row type="flex" justify="center" class="button-group">
+      <el-button @click="commit">确 定</el-button>
+      <el-button @click="doClose">取 消</el-button>
+    </el-row>
+  </el-dialog>
 </template>
 
 <script>
 
-    export default {
-        name: 'DeleteTask',
-        components: {
-        },
-        data() {
-            return {
-                dialogShow: false,
-                loading: false,
-                tripNumber: '',
-                serviceNumber: '',
-                type: '1',
-            }
-        },
-        computed: {
-            title() {
-                return '删除任务'
-            }
-        },
-        mounted() {
-        },
-        methods: {
-            doShow(params) {
-                this.tripNumber = params.tripNumber;
-                this.serviceNumber = params.serviceNumber;
-                this.dialogShow = true;
-            },
-            doClose() {
-                this.loading = false;
-                this.dialogShow = false;
-            },
-            commit() {
-                // this.tripNumber
-                this.doClose();
-            }
-        }
-    }
+export default {
+	name: 'DeleteTask',
+	components: {
+	},
+	data() {
+		return {
+			dialogShow: false,
+			loading: false,
+			tripNumber: '',
+			serviceNumber: '',
+			type: '1'
+		};
+	},
+	computed: {
+		title() {
+			return '删除任务';
+		}
+	},
+	mounted() {
+	},
+	methods: {
+		doShow(params) {
+			this.tripNumber = params.tripNumber;
+			this.serviceNumber = params.serviceNumber;
+			this.dialogShow = true;
+		},
+		doClose() {
+			this.loading = false;
+			this.dialogShow = false;
+		},
+		commit() {
+			// this.tripNumber
+			this.doClose();
+		}
+	}
+};
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
     @import "src/styles/mixin.scss";
@@ -61,4 +70,4 @@
             margin: 10px;
         }
     }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/jmap/theme/fuzhou_01/menusPlan/deleteTodayPlan.vue b/src/jmap/theme/fuzhou_01/menusPlan/deleteTodayPlan.vue
index 543f171e5..295030d42 100644
--- a/src/jmap/theme/fuzhou_01/menusPlan/deleteTodayPlan.vue
+++ b/src/jmap/theme/fuzhou_01/menusPlan/deleteTodayPlan.vue
@@ -1,46 +1,55 @@
 <template>
-    <el-dialog class="fuzhou-01__schedule create-week-plan" :title="title" :visible.sync="dialogShow" width="400px"
-        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
-        <el-row type="flex" justify="center" class="button-group">
-            <el-button @click="commit">确 定</el-button>
-            <el-button @click="doClose">取 消</el-button>
-        </el-row>
-    </el-dialog>
+  <el-dialog
+    v-dialogDrag
+    class="fuzhou-01__schedule create-week-plan"
+    :title="title"
+    :visible.sync="dialogShow"
+    width="400px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <el-row type="flex" justify="center" class="button-group">
+      <el-button @click="commit">确 定</el-button>
+      <el-button @click="doClose">取 消</el-button>
+    </el-row>
+  </el-dialog>
 </template>
 
 <script>
 
-    export default {
-        name: 'DeleteTodayPlan',
-        components: {
-        },
-        data() {
-            return {
-                dialogShow: false,
-                loading: false
-            }
-        },
-        computed: {
-            title() {
-                return '删除当天计划'
-            }
-        },
-        mounted() {
-        },
-        methods: {
-            doShow(params) {
-                this.dialogShow = true;
-            },
-            doClose() {
-                this.loading = false;
-                this.dialogShow = false;
-            },
-            commit() {
-                // this.tripNumber
-                this.doClose();
-            }
-        }
-    }
+export default {
+	name: 'DeleteTodayPlan',
+	components: {
+	},
+	data() {
+		return {
+			dialogShow: false,
+			loading: false
+		};
+	},
+	computed: {
+		title() {
+			return '删除当天计划';
+		}
+	},
+	mounted() {
+	},
+	methods: {
+		doShow(params) {
+			this.dialogShow = true;
+		},
+		doClose() {
+			this.loading = false;
+			this.dialogShow = false;
+		},
+		commit() {
+			// this.tripNumber
+			this.doClose();
+		}
+	}
+};
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
     @import "src/styles/mixin.scss";
@@ -50,4 +59,4 @@
             margin: 10px;
         }
     }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/jmap/theme/fuzhou_01/menusPlan/managePlanList.vue b/src/jmap/theme/fuzhou_01/menusPlan/managePlanList.vue
index 11b2df481..0c93359ff 100644
--- a/src/jmap/theme/fuzhou_01/menusPlan/managePlanList.vue
+++ b/src/jmap/theme/fuzhou_01/menusPlan/managePlanList.vue
@@ -1,122 +1,143 @@
 <template>
-    <el-dialog class="fuzhou-01__schedule manage-plan-list" :title="title" :visible.sync="dialogShow" width="80%"
-        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
-        <QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList">
-        </QueryListPage>
-    </el-dialog>
+  <el-dialog
+    v-dialogDrag
+    class="fuzhou-01__schedule manage-plan-list"
+    :title="title"
+    :visible.sync="dialogShow"
+    width="80%"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
+  </el-dialog>
 </template>
 
 <script>
-    import { getRunPlanLoadList, deleteRunPlanLoad } from '@/api/runplan';
+import { getRunPlanLoadList, deleteRunPlanLoad, listAllTempLateRunPlan } from '@/api/runplan';
+import { listPublishMap } from '@/api/jmap/map';
 
-    export default {
-        name: 'ManagePlanList',
-        data() {
-            return {
-                dialogShow: false,
-                loading: false,
-                pagerConfig: {
-                    pageSize: 'pageSize',
-                    pageIndex: 'pageNum'
-                },
-                queryForm: {
-                    labelWidth: '140px',
-                    reset: true,
-                    queryObject: {
-                        runPlanName: {
-                            type: 'text',
-                            label: '运行图名称'
-                        }
-                    }
-                },
-                queryList: {
-                    query: this.queryFunction,
-                    selectCheckShow: false,
-                    indexShow: true,
-                    columns: [
-                        {
-                            title: '地图名称',
-                            prop: 'mapName'
-                        },
-                        {
-                            title: '运行图名称',
-                            prop: 'runPlanName',
-                        },
-                        {
-                            title: '加载日期',
-                            prop: 'loadTime'
-                        },
-                        {
-                            type: 'button',
-                            title: '操作',
-                            width: '100',
-                            buttons: [
-                                {
-                                    name: '删除',
-                                    handleClick: this.handleDelete,
-                                    type: 'danger'
-                                }
-                            ]
-                        }
-                    ],
-                    actions: [
-                        { text: '创建', btnCode: 'employee_insert', handler: this.handleCreateRunPlan },
-                    ]
-                },
+export default {
+	name: 'ManagePlanList',
+	data() {
+		return {
+			dialogShow: false,
+			loading: false,
+			pagerConfig: {
+				pageSize: 'pageSize',
+				pageIndex: 'pageNum'
+			},
+			queryForm: {
+				labelWidth: '140px',
+				reset: true
+			},
+			queryList: {
+				query: this.queryFunction,
+				selectCheckShow: false,
+				indexShow: true,
+				columns: [
+					{
+						title: this.$t('publish.mapName'),
+						prop: 'mapId',
+						type: 'tag',
+						columnValue: (row) => { return this.$convertField(row.mapId, this.mapList, ['id', 'name']); },
+						tagType: (row) => { return ''; }
+					},
+					{
+						title: this.$t('publish.runPlanName'),
+						prop: 'templatePlanId',
+						type: 'tag',
+						columnValue: (row) => { return this.$convertField(row.templatePlanId, this.templatePlanList, ['id', 'name']); },
+						tagType: (row) => { return 'success'; }
+					},
+					{
+						title: '加载日期',
+						prop: 'loadTime'
+					},
+					{
+						type: 'button',
+						title: '操作',
+						width: '100',
+						buttons: [
+							{
+								name: '删除',
+								handleClick: this.handleDelete,
+								type: 'danger'
+							}
+						]
+					}
+				],
+				actions: [
+					{ text: '创建', btnCode: 'employee_insert', handler: this.handleCreateRunPlan }
+				]
+			},
 
-                currentModel: {}
-            }
-        },
-        computed: {
-            title() {
-                return '运行图计划表'
-            }
-        },
-        created() {
-        },
-        methods: {
-            queryFunction(params) {
-                if (this.$route.query.mapId) {
-                    params['mapId'] = this.$route.query.mapId;
-                }
+			currentModel: {}
+		};
+	},
+	computed: {
+		title() {
+			return '运行图计划表';
+		}
+	},
+	mounted() {
+		this.loadPageData();
+	},
+	methods: {
+		loadPageData() {
+			this.mapList = [];
+			listPublishMap().then(resp => {
+				this.mapList = resp.data;
+			});
+			this.templatePlanList = [];
+			listAllTempLateRunPlan().then(resp => {
+				this.templatePlanList = resp.data;
+			});
+		},
+		queryFunction(params) {
+			if (this.$route.query.mapId) {
+				params['mapId'] = this.$route.query.mapId;
+			}
 
-                if (this.$store.state.user.id) {
-                    params['userId'] = this.$store.state.user.id;
-                }
+			if (this.$store.state.user.id) {
+				params['userId'] = this.$store.state.user.id;
+			}
 
-                return getRunPlanLoadList(params);
-            },
-            handleDelete(index, row) {
-                this.$confirm('此操作将删除次日加载的运行图, 是否继续?', '提示', {
-                    confirmButtonText: '确定',
-                    cancelButtonText: '取消',
-                    type: 'warning'
-                }).then(() => {
-                    deleteRunPlanLoad(row.id).then(response => {
-                        this.$message.success('删除成功')
-                        this.reloadTable()
-                    }).catch(error => {
-                        this.reloadTable()
-                        this.$messageBox('删除失败')
-                    })
-                }).catch(() => { })
-            },
-            handleCreateRunPlan() {
-                this.$emit('dispatchDialog', { name: 'createWeekPlan' });
-            },
-            doShow() {
-                this.dialogShow = true;
-            },
-            doClose() {
-                this.loading = false;
-                this.dialogShow = false;
-            },
-            reloadTable() {
-                this.queryList.reload()
-            }
-        }
-    }
+			return getRunPlanLoadList(params);
+		},
+		handleDelete(index, row) {
+			this.$confirm('此操作将删除次日加载的运行图, 是否继续?', '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning'
+			}).then(() => {
+				deleteRunPlanLoad(row.id).then(response => {
+					this.$message.success('删除成功');
+					this.reloadTable();
+				}).catch(() => {
+					this.reloadTable();
+					this.$messageBox('删除失败');
+				});
+			}).catch(() => { });
+		},
+		handleCreateRunPlan() {
+			this.$emit('dispatchDialog', { name: 'createWeekPlan' });
+		},
+		doShow() {
+			this.dialogShow = true;
+			this.$nextTick(()=> { this.reloadTable(); });
+		},
+		doClose() {
+			this.loading = false;
+			this.dialogShow = false;
+		},
+		reloadTable() {
+			this.queryList.reload();
+		}
+	}
+};
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
     @import "src/styles/mixin.scss";
-</style>
\ No newline at end of file
+</style>
diff --git a/src/jmap/theme/fuzhou_01/menusPlan/modifyingPlan.vue b/src/jmap/theme/fuzhou_01/menusPlan/modifyingPlan.vue
index ff0299381..90bba4e44 100644
--- a/src/jmap/theme/fuzhou_01/menusPlan/modifyingPlan.vue
+++ b/src/jmap/theme/fuzhou_01/menusPlan/modifyingPlan.vue
@@ -1,152 +1,152 @@
 <template>
-    <el-dialog class="fuzhou-01__schedule edit-planning-train" :title="title" :visible.sync="dialogShow" width="800px"
-        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
-        <el-row>
-            <el-col :offset="10">列车线路</el-col>
-        </el-row>
-        <el-row>
-            <el-col :span="17">
-                <el-table :data="serviceData" border style="width: 100%" height="160">
-                    <el-table-column prop="startStationCode" label="起点站">
-                    </el-table-column>
-                    <el-table-column prop="startStationStandCode" label="起点站台">
-                    </el-table-column>
-                    <el-table-column prop="endStationCode" label="终点站">
-                    </el-table-column>
-                    <el-table-column prop="endStationStandCode" label="终点站台">
-                    </el-table-column>
-                </el-table>
-            </el-col>
-            <el-col :span="6" :offset="1">
-                <el-row type="flex" justify="center">
-                    <el-button class="view-button" @click="handleAddTask">加任务</el-button>
-                </el-row>
-                <el-row type="flex" justify="center">
-                    <el-button class="view-button" @click="handleReplace">替&ensp;&ensp;换</el-button>
-                </el-row>
-                <el-row type="flex" justify="center">
-                    <el-button class="view-button" @click="handleDeleteTask">删任务</el-button>
-                </el-row>
-                <div class="view-box">
-                    <el-row type="flex" justify="center">
-                        <el-radio-group v-model="storeInOut">
-                            <el-radio :label="1">进库</el-radio>
-                            <el-radio :label="2">出库</el-radio>
-                        </el-radio-group>
-                    </el-row>
-                </div>
-            </el-col>
-        </el-row>
-        <el-row class="view-box">
-            <el-col :span="9" style="padding-left: 10px">
-                <el-input v-model="oldServiceNumber" size="small" :disabled="true"></el-input>
-            </el-col>
-            <el-col :span="9" style="padding-left: 20px">
-                <el-input v-model="newServiceNumber" size="small"></el-input>
-            </el-col>
-            <el-col :span="5" style="padding-left: 20px">
-                <el-button @click="handleModifyingTripNumber" style="width: 150px;">改车次号</el-button>
-            </el-col>
-        </el-row>
-        <el-row style="margin-top: 10px">
-            <el-col :span="4"><span class="view-label">线路开始时间</span></el-col>
-            <el-col :span="8">
-                <el-time-select v-model="serviceStartTime" size="small"></el-time-select>
-            </el-col>
-            <el-col :span="4"><span class="view-label">线路结束时间</span></el-col>
-            <el-col :span="8">
-                <el-time-select v-model="serviceEndTime" size="small"></el-time-select>
-            </el-col>
-        </el-row>
-        <el-row style="margin-top: 20px">
-            <el-col :offset="10">线路详细信息</el-col>
-        </el-row>
-        <el-row>
-            <el-table :data="tripData" border style="width: 100%" height="200">
-                <el-table-column prop="arriveTime" label="到站时间">
-                </el-table-column>
-                <el-table-column prop="stationCode" label="车站">
-                </el-table-column>
-                <el-table-column prop="stationStandCode" label="站台">
-                </el-table-column>
-                <el-table-column prop="stopTime" label="停站时间">
-                </el-table-column>
-                <el-table-column prop="level" label="运行等级">
-                </el-table-column>
-            </el-table>
-        </el-row>
-        <el-row style="margin-top: 20px">
-            <el-checkbox v-model="effect">影响后续任务</el-checkbox>
+  <el-dialog
+    v-dialogDrag
+    class="fuzhou-01__schedule edit-planning-train"
+    :title="title"
+    :visible.sync="dialogShow"
+    width="800px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <el-row>
+      <el-col :offset="10">列车线路</el-col>
+    </el-row>
+    <el-row>
+      <el-col :span="17">
+        <el-table :data="serviceData" border style="width: 100%" height="160">
+          <el-table-column prop="startStationCode" label="起点站" />
+          <el-table-column prop="startStationStandCode" label="起点站台" />
+          <el-table-column prop="endStationCode" label="终点站" />
+          <el-table-column prop="endStationStandCode" label="终点站台" />
+        </el-table>
+      </el-col>
+      <el-col :span="6" :offset="1">
+        <el-row type="flex" justify="center">
+          <el-button class="view-button" @click="handleAddTask">加任务</el-button>
         </el-row>
         <el-row type="flex" justify="center">
-            <el-button @click="commit">确 定</el-button>
-            <el-button @click="doClose">取 消</el-button>
+          <el-button class="view-button" @click="handleReplace">替&ensp;&ensp;换</el-button>
         </el-row>
-    </el-dialog>
+        <el-row type="flex" justify="center">
+          <el-button class="view-button" @click="handleDeleteTask">删任务</el-button>
+        </el-row>
+        <div class="view-box">
+          <el-row type="flex" justify="center">
+            <el-radio-group v-model="storeInOut">
+              <el-radio :label="1">进库</el-radio>
+              <el-radio :label="2">出库</el-radio>
+            </el-radio-group>
+          </el-row>
+        </div>
+      </el-col>
+    </el-row>
+    <el-row class="view-box">
+      <el-col :span="9" style="padding-left: 10px">
+        <el-input v-model="oldServiceNumber" size="small" :disabled="true" />
+      </el-col>
+      <el-col :span="9" style="padding-left: 20px">
+        <el-input v-model="newServiceNumber" size="small" />
+      </el-col>
+      <el-col :span="5" style="padding-left: 20px">
+        <el-button style="width: 150px;" @click="handleModifyingTripNumber">改车次号</el-button>
+      </el-col>
+    </el-row>
+    <el-row style="margin-top: 10px">
+      <el-col :span="4"><span class="view-label">线路开始时间</span></el-col>
+      <el-col :span="8">
+        <el-time-select v-model="serviceStartTime" size="small" />
+      </el-col>
+      <el-col :span="4"><span class="view-label">线路结束时间</span></el-col>
+      <el-col :span="8">
+        <el-time-select v-model="serviceEndTime" size="small" />
+      </el-col>
+    </el-row>
+    <el-row style="margin-top: 20px">
+      <el-col :offset="10">线路详细信息</el-col>
+    </el-row>
+    <el-row>
+      <el-table :data="tripData" border style="width: 100%" height="200">
+        <el-table-column prop="arriveTime" label="到站时间" />
+        <el-table-column prop="stationCode" label="车站" />
+        <el-table-column prop="stationStandCode" label="站台" />
+        <el-table-column prop="stopTime" label="停站时间" />
+        <el-table-column prop="level" label="运行等级" />
+      </el-table>
+    </el-row>
+    <el-row style="margin-top: 20px">
+      <el-checkbox v-model="effect">影响后续任务</el-checkbox>
+    </el-row>
+    <el-row type="flex" justify="center">
+      <el-button @click="commit">确 定</el-button>
+      <el-button @click="doClose">取 消</el-button>
+    </el-row>
+  </el-dialog>
 </template>
 
 <script>
-    import { formatTime, formatName } from '@/utils/runPlan';
+import { formatTime, formatName } from '@/utils/runPlan';
 
-    export default {
-        name: 'modifyingPlan',
-        data() {
-            return {
-                dialogShow: false,
-                loading: false,
-                effect: false,
-                storeInOut: '1',
-                oldServiceNumber: '',
-                newServiceNumber: '',
-                serviceStartTime: '',
-                serviceEndTime: '',
-                serviceData: [],
-                tripData: [],
-            }
-        },
-        computed: {
-            title() {
-                return '修改'
-            }
-        },
-        mounted() {
-        },
-        methods: {
-            formatTime(time) {
-                return formatTime(time);
-            },
-            formatName(code) {
-                return formatName(code);
-            },
-            doShow() {
-                this.dialogShow = true;
-            },
-            doClose() {
-                this.loading = false;
-                this.dialogShow = false;
-            },
-            // 加任务
-            handleAddTask() {
-                this.$emit('dispatchDialog', { name: 'addTask', params: {} })
-            },
-            // 替换
-            handleReplace() {
-                this.$emit('dispatchDialog', { name: 'modifyingTask', params: {} })
-            },
-            // 删任务
-            handleDeleteTask() {
-                this.$emit('dispatchDialog', { name: 'deleteTask', params: {} })
-            },
-            // 改车次号
-            handleModifyingTripNumber() {
-                this.$emit('dispatchDialog', { name: 'modifyingTripNumber', params: {} })
-            },
-            // 确定修改
-            commit() {
-                this.doClose();
-            }
-        }
-    }
+export default {
+	name: 'ModifyingPlan',
+	data() {
+		return {
+			dialogShow: false,
+			loading: false,
+			effect: false,
+			storeInOut: '1',
+			oldServiceNumber: '',
+			newServiceNumber: '',
+			serviceStartTime: '',
+			serviceEndTime: '',
+			serviceData: [],
+			tripData: []
+		};
+	},
+	computed: {
+		title() {
+			return '修改';
+		}
+	},
+	mounted() {
+	},
+	methods: {
+		formatTime(time) {
+			return formatTime(time);
+		},
+		formatName(code) {
+			return formatName(code);
+		},
+		doShow() {
+			this.dialogShow = true;
+		},
+		doClose() {
+			this.loading = false;
+			this.dialogShow = false;
+		},
+		// 加任务
+		handleAddTask() {
+			this.$emit('dispatchDialog', { name: 'addTask', params: {} });
+		},
+		// 替换
+		handleReplace() {
+			this.$emit('dispatchDialog', { name: 'modifyingTask', params: {} });
+		},
+		// 删任务
+		handleDeleteTask() {
+			this.$emit('dispatchDialog', { name: 'deleteTask', params: {} });
+		},
+		// 改车次号
+		handleModifyingTripNumber() {
+			this.$emit('dispatchDialog', { name: 'modifyingTripNumber', params: {} });
+		},
+		// 确定修改
+		commit() {
+			this.doClose();
+		}
+	}
+};
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
     @import "src/styles/mixin.scss";
@@ -157,13 +157,11 @@
         margin-left: 0px;
     }
 
-
     .view-label {
         height: 32px;
         line-height: 32px;
     }
 
-
     .view-box {
         padding: 10px 0px;
         border: 1px inset gray;
@@ -176,4 +174,4 @@
             margin: 5px 20px;
         }
     }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/jmap/theme/fuzhou_01/menusPlan/modifyingTask.vue b/src/jmap/theme/fuzhou_01/menusPlan/modifyingTask.vue
index 2b153891a..691db5458 100644
--- a/src/jmap/theme/fuzhou_01/menusPlan/modifyingTask.vue
+++ b/src/jmap/theme/fuzhou_01/menusPlan/modifyingTask.vue
@@ -1,298 +1,309 @@
 <template>
-    <el-dialog class="fuzhou-01__schedule add-task" :title="title" :visible.sync="dialogShow" width="1000px"
-        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
-        <div style="margin: 10px">
-            <el-row>
-                <el-col :span="4">
-                    <el-row>
-                        <el-col :span="9">
-                            <span>车次号：</span>
-                        </el-col>
-                        <el-col :span="15">
-                            <el-select style="display: inline-black" v-model="model.tripNumber" placeholder="请选择">
-                                <el-option v-for="item in tripNumberList" :key="item.value" :label="item.label"
-                                    :value="item.value">
-                                </el-option>
-                            </el-select>
-                        </el-col>
-                    </el-row>
-                </el-col>
-                <el-col :span="2">
-                    <el-row>
-                        <el-col :offset="4">
-                            <el-checkbox v-model="model.trainManual">手工</el-checkbox>
-                        </el-col>
-                    </el-row>
-                </el-col>
-                <el-col :span="5">
-                    <el-row>
-                        <el-col :span="12">
-                            <span>缺省停站时间：</span>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-select style="display: inline-black" v-model="model.time" placeholder="请选择">
-                                <el-option v-for="item in timeList" :key="item.value" :label="item.label"
-                                    :value="item.value">
-                                </el-option>
-                            </el-select>
-                        </el-col>
-                    </el-row>
-                </el-col>
-                <el-col :span="5">
-                    <el-row>
-                        <el-col :span="9" :offset="2">
-                            <span>表号：</span>
-                        </el-col>
-                        <el-col :span="13">
-                            <el-input v-model="model.serviceNumber"></el-input>
-                        </el-col>
-                    </el-row>
+  <el-dialog
+    v-dialogDrag
+    class="fuzhou-01__schedule add-task"
+    :title="title"
+    :visible.sync="dialogShow"
+    width="1000px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <div style="margin: 10px">
+      <el-row>
+        <el-col :span="4">
+          <el-row>
+            <el-col :span="9">
+              <span>车次号：</span>
+            </el-col>
+            <el-col :span="15">
+              <el-select v-model="model.tripNumber" style="display: inline-black" placeholder="请选择">
+                <el-option
+                  v-for="item in tripNumberList"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-col>
+          </el-row>
+        </el-col>
+        <el-col :span="2">
+          <el-row>
+            <el-col :offset="4">
+              <el-checkbox v-model="model.trainManual">手工</el-checkbox>
+            </el-col>
+          </el-row>
+        </el-col>
+        <el-col :span="5">
+          <el-row>
+            <el-col :span="12">
+              <span>缺省停站时间：</span>
+            </el-col>
+            <el-col :span="12">
+              <el-select v-model="model.time" style="display: inline-black" placeholder="请选择">
+                <el-option
+                  v-for="item in timeList"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-col>
+          </el-row>
+        </el-col>
+        <el-col :span="5">
+          <el-row>
+            <el-col :span="9" :offset="2">
+              <span>表号：</span>
+            </el-col>
+            <el-col :span="13">
+              <el-input v-model="model.serviceNumber" />
+            </el-col>
+          </el-row>
+        </el-col>
+        <el-col :span="8">
+          <el-row>
+            <el-col :span="22" :offset="2">
+              <el-row>
+                <el-col :span="6">
+                  <el-checkbox v-model="model.clearGuest">清客</el-checkbox>
                 </el-col>
                 <el-col :span="8">
-                    <el-row>
-                        <el-col :span="22" :offset="2">
-                            <el-row>
-                                <el-col :span="6">
-                                    <el-checkbox v-model="model.clearGuest">清客</el-checkbox>
-                                </el-col>
-                                <el-col :span="8">
-                                    <el-checkbox v-model="model.continuationPlan">延续计划</el-checkbox>
-                                </el-col>
-                                <el-col :span="6">
-                                    <el-checkbox v-model="model.firstTrain">首班车</el-checkbox>
-                                </el-col>
-                            </el-row>
-                        </el-col>
-                    </el-row>
+                  <el-checkbox v-model="model.continuationPlan">延续计划</el-checkbox>
                 </el-col>
-            </el-row>
-            <el-row>
-                <el-col :span="4">
-                    <el-row>
-                        <el-col :span="9">
-                            <span>序列号：</span>
-                        </el-col>
-                        <el-col :span="15">
-                            <el-select style="display: inline-black" v-model="model.serialNumber" placeholder="请选择">
-                                <el-option v-for="item in serialNumberList" :key="item.value" :label="item.label"
-                                    :value="model.value">
-                                </el-option>
-                            </el-select>
-                        </el-col>
-                    </el-row>
+                <el-col :span="6">
+                  <el-checkbox v-model="model.firstTrain">首班车</el-checkbox>
                 </el-col>
-                <el-col :span="2">
-                    <el-row>
-                        <el-col :offset="4">
-                            <el-checkbox v-model="model.serialManual">手工</el-checkbox>
-                        </el-col>
-                    </el-row>
-                </el-col>
-                <el-col :span="5">
-                    <el-row>
-                        <el-col :span="12">
-                            <span>缺省运行等级：</span>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-select style="display: inline-black" v-model="model.level" placeholder="请选择">
-                                <el-option v-for="item in levelList" :key="item.value" :label="item.label"
-                                    :value="item.value">
-                                </el-option>
-                            </el-select>
-                        </el-col>
-                    </el-row>
-                </el-col>
-                <el-col :span="5">
-                    <el-row>
-                        <el-col :span="9" :offset="2">
-                            <span>开始时间：</span>
-                        </el-col>
-                        <el-col :span="13">
-                            <el-time-select v-model="model.startTime" placeholder="选择时间" :clearable="false">
-                            </el-time-select>
-                        </el-col>
-                    </el-row>
+              </el-row>
+            </el-col>
+          </el-row>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="4">
+          <el-row>
+            <el-col :span="9">
+              <span>序列号：</span>
+            </el-col>
+            <el-col :span="15">
+              <el-select v-model="model.serialNumber" style="display: inline-black" placeholder="请选择">
+                <el-option
+                  v-for="item in serialNumberList"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="model.value"
+                />
+              </el-select>
+            </el-col>
+          </el-row>
+        </el-col>
+        <el-col :span="2">
+          <el-row>
+            <el-col :offset="4">
+              <el-checkbox v-model="model.serialManual">手工</el-checkbox>
+            </el-col>
+          </el-row>
+        </el-col>
+        <el-col :span="5">
+          <el-row>
+            <el-col :span="12">
+              <span>缺省运行等级：</span>
+            </el-col>
+            <el-col :span="12">
+              <el-select v-model="model.level" style="display: inline-black" placeholder="请选择">
+                <el-option
+                  v-for="item in levelList"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-col>
+          </el-row>
+        </el-col>
+        <el-col :span="5">
+          <el-row>
+            <el-col :span="9" :offset="2">
+              <span>开始时间：</span>
+            </el-col>
+            <el-col :span="13">
+              <el-time-select v-model="model.startTime" placeholder="选择时间" :clearable="false" />
+            </el-col>
+          </el-row>
+        </el-col>
+        <el-col :span="8">
+          <el-row>
+            <el-col :span="22" :offset="2">
+              <el-row>
+                <el-col :span="6">
+                  <el-checkbox v-model="model.inStock">入库</el-checkbox>
                 </el-col>
                 <el-col :span="8">
-                    <el-row>
-                        <el-col :span="22" :offset="2">
-                            <el-row>
-                                <el-col :span="6">
-                                    <el-checkbox v-model="model.inStock">入库</el-checkbox>
-                                </el-col>
-                                <el-col :span="8">
-                                    <el-checkbox v-model="model.outStock">出库</el-checkbox>
-                                </el-col>
-                                <el-col :span="6">
-                                    <el-checkbox v-model="model.lastTrain">末班车</el-checkbox>
-                                </el-col>
-                            </el-row>
-                        </el-col>
-                    </el-row>
+                  <el-checkbox v-model="model.outStock">出库</el-checkbox>
                 </el-col>
-            </el-row>
-            <el-row style="margin-bottom: 5px;">
-                交路：
-            </el-row>
-            <el-row>
-                <el-table :data="model.route" border :height="140">
-                    <el-table-column prop="beginStationCode" label="起始站">
-                        <template slot-scope="scope">
-                            {{ formatName(scope.row.beginStationCode) }}
-                        </template>
-                    </el-table-column>
-                    <el-table-column prop="beginStationStandCode" label="起始站台">
-                    </el-table-column>
-                    <el-table-column prop="endStationCode" label="终到站">
-                        <template slot-scope="scope">
-                            {{ formatName(scope.row.endStationCode) }}
-                        </template>
-                    </el-table-column>
-                    <el-table-column prop="endStationStandCode" label="终到站台">
-                    </el-table-column>
-                    <el-table-column prop="describe" label="描述" :width="280">
-                    </el-table-column>
-                    <el-table-column :width="40">
-                    </el-table-column>
-                </el-table>
-            </el-row>
-            <el-row style=" margin-bottom: 5px;margin-top: 10px;">
-                详情：
-            </el-row>
-            <el-row>
-                <el-table :data="model.detail" border :height="140">
-                    <el-table-column prop="stationCode" label="站台" :width="160">
-                        <template slot-scope="scope">
-                            {{ formatName(scope.row.stationCode) }}
-                        </template>
-                    </el-table-column>
-                    <el-table-column prop="startTime" label="到点">
-                        <template slot-scope="scope">
-                            {{ formatTime(scope.row.startTime) }}
-                        </template>
-                    </el-table-column>
-                    <el-table-column prop="stopTime" label="停站时间">
-                        <template slot-scope="scope">
-                            {{ formatTime(scope.row.stopTime) }}
-                        </template>
-                    </el-table-column>
-                    <el-table-column prop="endTime" label="发点">
-                        <template slot-scope="scope">
-                            {{ formatTime(scope.row.endTime) }}
-                        </template>
-                    </el-table-column>
-                    <el-table-column prop="level" label="运行等级">
-                    </el-table-column>
-                    <el-table-column width="280">
-                    </el-table-column>
-                </el-table>
-            </el-row>
-            <el-row>
-                <el-col :offset="16">
-                    <el-checkbox v-model="model.default">显示默认停站时间和运行等级</el-checkbox>
+                <el-col :span="6">
+                  <el-checkbox v-model="model.lastTrain">末班车</el-checkbox>
                 </el-col>
-            </el-row>
-        </div>
-        <el-row type="flex" justify="center" class="button-group">
-            <el-button @click="commit">确 定</el-button>
-            <el-button @click="doClose">取 消</el-button>
-        </el-row>
-    </el-dialog>
+              </el-row>
+            </el-col>
+          </el-row>
+        </el-col>
+      </el-row>
+      <el-row style="margin-bottom: 5px;">
+        交路：
+      </el-row>
+      <el-row>
+        <el-table :data="model.route" border :height="140">
+          <el-table-column prop="beginStationCode" label="起始站">
+            <template slot-scope="scope">
+              {{ formatName(scope.row.beginStationCode) }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="beginStationStandCode" label="起始站台" />
+          <el-table-column prop="endStationCode" label="终到站">
+            <template slot-scope="scope">
+              {{ formatName(scope.row.endStationCode) }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="endStationStandCode" label="终到站台" />
+          <el-table-column prop="describe" label="描述" :width="280" />
+          <el-table-column :width="40" />
+        </el-table>
+      </el-row>
+      <el-row style=" margin-bottom: 5px;margin-top: 10px;">
+        详情：
+      </el-row>
+      <el-row>
+        <el-table :data="model.detail" border :height="140">
+          <el-table-column prop="stationCode" label="站台" :width="160">
+            <template slot-scope="scope">
+              {{ formatName(scope.row.stationCode) }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="startTime" label="到点">
+            <template slot-scope="scope">
+              {{ formatTime(scope.row.startTime) }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="stopTime" label="停站时间">
+            <template slot-scope="scope">
+              {{ formatTime(scope.row.stopTime) }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="endTime" label="发点">
+            <template slot-scope="scope">
+              {{ formatTime(scope.row.endTime) }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="level" label="运行等级" />
+          <el-table-column width="280" />
+        </el-table>
+      </el-row>
+      <el-row>
+        <el-col :offset="16">
+          <el-checkbox v-model="model.default">显示默认停站时间和运行等级</el-checkbox>
+        </el-col>
+      </el-row>
+    </div>
+    <el-row type="flex" justify="center" class="button-group">
+      <el-button @click="commit">确 定</el-button>
+      <el-button @click="doClose">取 消</el-button>
+    </el-row>
+  </el-dialog>
 </template>
 
 <script>
-    import { formatTime, formatName } from '@/utils/runPlan';
+import { formatTime, formatName } from '@/utils/runPlan';
 
-    export default {
-        name: 'ModifyingTask',
-        components: {
-        },
-        data() {
-            return {
-                dialogShow: false,
-                loading: false,
-                model: {
-                    tripNumber: '',
-                    serialNumber: '',
-                    trainManual: false,
-                    serialManual: false,
-                    clearGuest: false,
-                    continuationPlan: false,
-                    firstTrain: false,
-                    lastTrain: false,
-                    inStock: false,
-                    outStock: false,
-                    startTime: '',
-                    route: [],
-                    detail: []
-                },
-                timeList: [],
-                levelList: [],
-                tripNumberList: [],
-                serialNumberList: [],
-            }
-        },
-        computed: {
-            title() {
-                return '修改任务'
-            }
-        },
-        mounted() {
-        },
-        methods: {
-            formatTime(time) {
-                return formatTime(time);
-            },
-            formatName(code) {
-                return formatName(code);
-            },
-            loadInitData(params) {
-                this.model.tripNumber = params.tripNumber;
-                this.model.serviceNumber = params.serviceNumber;
-                let editData = this.$store.state.runPlan.editData[params.serviceNumber]
-                if (editData) {
-                    let tripNumberList = Object.keys(editData.trainMap).sort((a, b) => { return editData.trainMap[a].oldIndex - editData.trainMap[b].oldIndex });
-                    let trainInfo = editData.trainMap[params.tripNumber];
-                    let lastIndex = trainInfo.stationTimeList.length - 1;
-                    let taskObj = {
-                        tripNumber: params.tripNumber,
-                        beginStationCode: trainInfo.stationTimeList[0].stationCode,
-                        beginStationStandCode: '',
-                        endStationCode: trainInfo.stationTimeList[lastIndex].stationCode,
-                        endStationStandCode: ''
-                    }
-                    this.model.route.push(taskObj);
+export default {
+	name: 'ModifyingTask',
+	components: {
+	},
+	data() {
+		return {
+			dialogShow: false,
+			loading: false,
+			model: {
+				tripNumber: '',
+				serialNumber: '',
+				trainManual: false,
+				serialManual: false,
+				clearGuest: false,
+				continuationPlan: false,
+				firstTrain: false,
+				lastTrain: false,
+				inStock: false,
+				outStock: false,
+				startTime: '',
+				route: [],
+				detail: []
+			},
+			timeList: [],
+			levelList: [],
+			tripNumberList: [],
+			serialNumberList: []
+		};
+	},
+	computed: {
+		title() {
+			return '修改任务';
+		}
+	},
+	mounted() {
+	},
+	methods: {
+		formatTime(time) {
+			return formatTime(time);
+		},
+		formatName(code) {
+			return formatName(code);
+		},
+		loadInitData(params) {
+			this.model.tripNumber = params.tripNumber;
+			this.model.serviceNumber = params.serviceNumber;
+			const editData = this.$store.state.runPlan.editData[params.serviceNumber];
+			if (editData) {
+				const trainInfo = editData.trainMap[params.tripNumber];
+				const lastIndex = trainInfo.stationTimeList.length - 1;
+				const taskObj = {
+					tripNumber: params.tripNumber,
+					beginStationCode: trainInfo.stationTimeList[0].stationCode,
+					beginStationStandCode: '',
+					endStationCode: trainInfo.stationTimeList[lastIndex].stationCode,
+					endStationStandCode: ''
+				};
+				this.model.route.push(taskObj);
 
-                    trainInfo.stationTimeList.forEach((elem, index) => {
-                        let stationObj = {
-                            stationCode: elem.stationCode,
-                            startTime: index == 0 ? null : trainInfo.stationTimeList[index - 1].secondTime,
-                            stopTime: index == 0 ? null : elem.secondTime - trainInfo.stationTimeList[index - 1].secondTime,
-                            endTime: elem.secondTime,
-                            level: '',
-                        }
-                        this.model.detail.push(stationObj);
-                    })
-                }
-            },
-            doShow(params) {
-                this.loadInitData(params);
-                this.dialogShow = true;
-            },
-            doClose() {
-                this.loading = false;
-                this.dialogShow = false;
-            },
-            commit() {
-            }
-        }
-    }
+				trainInfo.stationTimeList.forEach((elem, index) => {
+					const stationObj = {
+						stationCode: elem.stationCode,
+						startTime: index == 0 ? null : trainInfo.stationTimeList[index - 1].secondTime,
+						stopTime: index == 0 ? null : elem.secondTime - trainInfo.stationTimeList[index - 1].secondTime,
+						endTime: elem.secondTime,
+						level: ''
+					};
+					this.model.detail.push(stationObj);
+				});
+			}
+		},
+		doShow(params) {
+			this.loadInitData(params);
+			this.dialogShow = true;
+		},
+		doClose() {
+			this.loading = false;
+			this.dialogShow = false;
+		},
+		commit() {
+		}
+	}
+};
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
     @import "src/styles/mixin.scss";
 
-
-
     /deep/ {
         .el-button {
             margin-left: 40px !important;
@@ -312,4 +323,4 @@
             width: 110px !important;
         }
     }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/jmap/utils/parser.js b/src/jmap/utils/parser.js
index 4ecbb8788..02701778b 100644
--- a/src/jmap/utils/parser.js
+++ b/src/jmap/utils/parser.js
@@ -160,9 +160,6 @@ export function parser(data, skinCode) {
 					section['relSwitchCode'] = elem.code;
 				}
 
-				mapDevice[elem.code]['sectionAInstance'] = cnodeSection;
-				mapDevice[elem.code]['sectionBInstance'] = lnodeSection;
-				mapDevice[elem.code]['sectionCInstance'] = rnodeSection;
 				rnodeSection['layer'] = -1;
 			}
 		}, this);
diff --git a/src/main.js b/src/main.js
index 337222066..7d13b4a18 100644
--- a/src/main.js
+++ b/src/main.js
@@ -3,6 +3,7 @@ import Vue from 'vue';
 import 'normalize.css/normalize.css'; // A modern alternative to CSS resets
 
 import ElementUI from 'element-ui';
+import ElementLocale from 'element-ui/lib/locale';
 import 'element-ui/lib/theme-chalk/index.css';
 
 // import locale from 'element-ui/lib/locale/lang/en' // lang i18n
@@ -31,6 +32,8 @@ export const i18n = new VueI18n({
 	messages
 });
 
+ElementLocale.i18n((key, value) => i18n.t(key, value));
+
 new Vue({
 	el: '#app',
 	router,
diff --git a/src/router/index.js b/src/router/index.js
index da4dea946..23aae305f 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -92,10 +92,15 @@ import CommodityDraft from '@/views/orderauthor/commodity/draft';
 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';
+import AuthorDraft from '@/views/orderauthor/author/draft/ruleForm';
+import AuthorDetail from '@/views/orderauthor/author/detail';
+
 import Permission from '@/views/orderauthor/permission/index';
 import PermissionDetail from '@/views/orderauthor/permission/detail';
 import PermissionDraft from '@/views/orderauthor/permission/draft/ruleForm';
+
+import UserRules from '@/views/orderauthor/rules/index';
+
 import Dictionary from '@/views/management/dictionary/index';
 import DictionaryDetail from '@/views/management/dictionaryDetail/index';
 import UserControl from '@/views/management/userControl/index';
@@ -210,6 +215,7 @@ export const UrlConfig = {
 		orderManage: '/orderauthor/order/manage',
 		orderDraft: '/orderauthor/order/draft',
 		authorMange: '/orderauthor/author/manage',
+		authorDetail: '/orderauthor/author/detail',
 		authorDraft: '/orderauthor/author/draft',
 		transferDetail: '/orderauthor/transfer/detail',
 		trainferPackage: '/orderauthor/transfer/package'
@@ -736,7 +742,7 @@ export const asyncRouter = [
 				path: 'manage',
 				component: Package,
 				meta: {
-					i18n: 'router.permissionManage'
+					i18n: 'router.selfPermission'
 				}
 			},
 			{
@@ -845,6 +851,13 @@ export const asyncRouter = [
 			roles: [admin]
 		},
 		children: [
+			{
+				path: 'author/manage',
+				component: Author,
+				meta: {
+					i18n: 'router.authorityManage'
+				}
+			},
 			{
 				path: 'commodity/manage',
 				component: Commodity,
@@ -859,13 +872,6 @@ export const asyncRouter = [
 					i18n: 'router.orderManage'
 				}
 			},
-			{
-				path: 'author/manage',
-				component: Author,
-				meta: {
-					i18n: 'router.authorityManage'
-				}
-			},
 			{
 				path: 'transfer/manage',
 				component: Permission,
@@ -873,6 +879,13 @@ export const asyncRouter = [
 					i18n: 'router.authorityTransferManage'
 				}
 			},
+			{
+				path: 'rules/manage',
+				component: UserRules,
+				meta: {
+					i18n: 'router.userRulesManage'
+				}
+			},
 			{
 				path: 'commodity/draft/:mode/:commodityId',
 				hidden: true,
@@ -890,13 +903,21 @@ export const asyncRouter = [
 				}
 			},
 			{
-				path: 'author/draft/:mode/:userId',
+				path: 'author/manage/rules',
 				hidden: true,
 				component: AuthorDraft,
 				meta: {
 					i18n: 'router.addCoursePermissions'
 				}
 			},
+			{
+				path: 'author/detail/:id',
+				hidden: true,
+				component: AuthorDetail,
+				meta: {
+					i18n: 'router.addCoursePermissions'
+				}
+			},
 			{
 				path: 'transfer/detail/:permissionId',
 				component: PermissionDetail,
diff --git a/src/scripts/plugin/converter/SectionOperationConverter.js b/src/scripts/plugin/converter/SectionOperationConverter.js
index f0f5d4773..afe0f63ba 100644
--- a/src/scripts/plugin/converter/SectionOperationConverter.js
+++ b/src/scripts/plugin/converter/SectionOperationConverter.js
@@ -8,7 +8,7 @@ const SectionType = MapDeviceType.Section.type;
 
 export default {
 	test: function (operates) {
-		let operateType = getOperateTypeBy('Section', operates[0].operation);
+		const operateType = getOperateTypeBy('Section', operates[0].operation);
 		if (operateType) {
 			return true;
 		} else {
@@ -17,39 +17,39 @@ export default {
 	},
 	convert: function (operates) {
 		if (operates && operates.length) {
-			let operation = operates[0].operation;
+			const operation = operates[0].operation;
 			switch (operation) {
-				case SectionOperation.cancelStoppage.menu.operation: return handleMenuCancelStopPage(operates);
+			case SectionOperation.cancelStoppage.menu.operation: return handleMenuCancelStopPage(operates);
 
-				case SectionOperation.stoppage.menu.operation: return handleMenuFailure(operates);
+			case SectionOperation.stoppage.menu.operation: return handleMenuFailure(operates);
 
-				case SectionOperation.alxeFailure.menu.operation: return handleMenuAlxeFailure(operates);
+			case SectionOperation.alxeFailure.menu.operation: return handleMenuAlxeFailure(operates);
 
-				case SectionOperation.fault.menu.operation: return handleMenuFault(operates);
-				case SectionOperation.fault.button.operation: return handleButtonFault(operates);
+			case SectionOperation.fault.menu.operation: return handleMenuFault(operates);
+			case SectionOperation.fault.button.operation: return handleButtonFault(operates);
 
-				case SectionOperation.lock.menu.operation: return handleMenuLock(operates);
+			case SectionOperation.lock.menu.operation: return handleMenuLock(operates);
 
-				case SectionOperation.unlock.menu.operation: return handleMenuUnlock(operates);
+			case SectionOperation.unlock.menu.operation: return handleMenuUnlock(operates);
 
-				case SectionOperation.split.menu.operation: return handleMenuSplit(operates);
+			case SectionOperation.split.menu.operation: return handleMenuSplit(operates);
 
-				case SectionOperation.active.menu.operation: return handleMenuActive(operates);
+			case SectionOperation.active.menu.operation: return handleMenuActive(operates);
 
-				case SectionOperation.setSpeed.menu.operation: return handleMenuSetSpeed(operates);
+			case SectionOperation.setSpeed.menu.operation: return handleMenuSetSpeed(operates);
 
-				case SectionOperation.cancelSpeed.menu.operation: return handleMenuCancelSpeed(operates);
+			case SectionOperation.cancelSpeed.menu.operation: return handleMenuCancelSpeed(operates);
 
-				case SectionOperation.axlePreReset.menu.operation: return handleMenuAxlePreReset(operates);
-				case SectionOperation.axlePreReset.button.operation: return handleButtonAxlePreReset(operates);
+			case SectionOperation.axlePreReset.menu.operation: return handleMenuAxlePreReset(operates);
+			case SectionOperation.axlePreReset.button.operation: return handleButtonAxlePreReset(operates);
 
-				case SectionOperation.detail.menu.operation: return handleMenuDetail(operates);
+			case SectionOperation.detail.menu.operation: return handleMenuDetail(operates);
 
-				case SectionOperation.newtrain.menu.operation: return handleMenuNewTrain(operates);
+			case SectionOperation.newtrain.menu.operation: return handleMenuNewTrain(operates);
 
-				case SectionOperation.alxeEffective.menu.operation: return handleMenuAlxeEffective(operates);
+			case SectionOperation.alxeEffective.menu.operation: return handleMenuAlxeEffective(operates);
 
-				case SectionOperation.setLimitSpeed.menu.operation: return handleMenuSetLimitSpeed(operates);
+			case SectionOperation.setLimitSpeed.menu.operation: return handleMenuSetLimitSpeed(operates);
 			}
 		}
 	}
@@ -57,11 +57,11 @@ export default {
 
 /**
  * 处理右键菜单 取消故障 操作
- * @param {*} operates 
+ * @param {*} operates
  */
 function handleMenuCancelStopPage(operates) {
 	if (operates.length >= 1) {
-		let operate = operates[0];
+		const operate = operates[0];
 		if (operate.type === SectionType && operate.code) {
 			return {
 				type: operate.type,
@@ -77,17 +77,17 @@ function handleMenuCancelStopPage(operates) {
 
 /**
  * 处理右键菜单 设置计轴失效 操作
- * @param {*} operates 
+ * @param {*} operates
  */
 function handleMenuFailure(operates) {
 	if (operates.length >= 1) {
-		let operate = operates[0];
+		const operate = operates[0];
 		if (operate.type === SectionType && operate.code) {
 			return {
 				type: operate.type,
 				code: operate.code,
 				over: true,
-				operation: SectionOperation.stoppage.event,
+				operation: SectionOperation.stoppage.event
 			};
 		}
 		return { error: true };
@@ -97,17 +97,17 @@ function handleMenuFailure(operates) {
 
 /**
  * 处理右键菜单 设置计轴失效 操作
- * @param {*} operates 
+ * @param {*} operates
  */
 function handleMenuAlxeFailure(operates) {
 	if (operates.length >= 1) {
-		let operate = operates[0];
+		const operate = operates[0];
 		if (operate.type === SectionType && operate.code) {
 			return {
 				type: operate.type,
 				code: operate.code,
 				over: true,
-				operation: SectionOperation.alxeFailure.event,
+				operation: SectionOperation.alxeFailure.event
 			};
 		}
 		return { error: true };
@@ -117,15 +117,15 @@ function handleMenuAlxeFailure(operates) {
 
 /**
  * 处理右键菜单 区故解 操作
- * @param {*} operates 
+ * @param {*} operates
  */
 function handleMenuFault(operates) {
 	if (operates.length >= 2) {
-		let operate = operates[0];
+		const operate = operates[0];
 		if (operate.type === SectionType && operate.code) {
 			if (operate.code) {
 				let val = '';
-				let counter = store.getters['map/getCounterBySectionCode'](operate.code, '01');
+				const counter = store.getters['map/getCounterBySectionCode'](operate.code, '01');
 				if (counter) {
 					val = localStore.get(counter.code);
 				}
@@ -146,11 +146,11 @@ function handleMenuFault(operates) {
 
 /**
  * 处理右键菜单 封锁 操作
- * @param {*} operates 
+ * @param {*} operates
  */
 function handleMenuLock(operates) {
 	if (operates.length >= 2) {
-		let operate = operates[0];
+		const operate = operates[0];
 		if (operate.type === SectionType && operate.code) {
 			return {
 				type: operate.type,
@@ -167,11 +167,11 @@ function handleMenuLock(operates) {
 
 /**
  * 处理右键菜单 解锁 操作
- * @param {*} operates 
+ * @param {*} operates
  */
 function handleMenuUnlock(operates) {
 	if (operates.length >= 2) {
-		let operate = operates[0];
+		const operate = operates[0];
 		if (operate.type === SectionType && operate.code) {
 			return {
 				type: operate.type,
@@ -186,14 +186,13 @@ function handleMenuUnlock(operates) {
 	return null;
 }
 
-
 /**
  * 处理右键菜单 切除 操作
- * @param {*} operates 
+ * @param {*} operates
  */
 function handleMenuSplit(operates) {
 	if (operates.length >= 2) {
-		let operate = operates[0];
+		const operate = operates[0];
 		if (operate.type === SectionType && operate.code) {
 			return {
 				type: operate.type,
@@ -208,14 +207,13 @@ function handleMenuSplit(operates) {
 	return null;
 }
 
-
 /**
  * 处理右键菜单 激活 操作
- * @param {*} operates 
+ * @param {*} operates
  */
 function handleMenuActive(operates) {
 	if (operates.length >= 2) {
-		let operate = operates[0];
+		const operate = operates[0];
 		if (operate.type === SectionType && operate.code) {
 			return {
 				type: operate.type,
@@ -237,7 +235,7 @@ function handleMenuActive(operates) {
 
 function handleMenuSetSpeed(operates) {
 	if (operates.length >= 2) {
-		let operate = operates[0];
+		const operate = operates[0];
 		if (operate.type === SectionType && operate.code) {
 			return {
 				type: operate.type,
@@ -259,7 +257,7 @@ function handleMenuSetSpeed(operates) {
 
 function handleMenuCancelSpeed(operates) {
 	if (operates.length == 1) {
-		let operate = operates[0];
+		const operate = operates[0];
 		if (operate.type === SectionType && operate.code) {
 			return {
 				type: operate.type,
@@ -269,7 +267,7 @@ function handleMenuCancelSpeed(operates) {
 		}
 		return { error: true };
 	} else if (operates.length >= 3) {
-		let operate = operates[operates.length - 1];
+		const operate = operates[operates.length - 1];
 		if (operate.type === SectionType && operates[0].code) {
 			return {
 				over: true,
@@ -291,7 +289,7 @@ function handleMenuCancelSpeed(operates) {
 
 function handleMenuAxlePreReset(operates) {
 	if (operates.length >= 2) {
-		let operate = operates[0];
+		const operate = operates[0];
 		if (operate.type === SectionType && operate.code) {
 			return {
 				type: operate.type,
@@ -313,7 +311,7 @@ function handleMenuAxlePreReset(operates) {
 
 function handleMenuDetail(operates) {
 	if (operates.length >= 2) {
-		let operate = operates[0];
+		const operate = operates[0];
 		if (operate.type === SectionType && operate.code) {
 			return {
 				type: operate.type,
@@ -328,13 +326,13 @@ function handleMenuDetail(operates) {
 	return null;
 }
 
-/** 
+/**
  * 处理右键菜单 新建列车操作
- * @param {*} operates 
+ * @param {*} operates
  */
 function handleMenuNewTrain(operates) {
 	if (operates.length >= 2) {
-		let operate = operates[0];
+		const operate = operates[0];
 		if (operate.type === SectionType && operate.code) {
 			return {
 				type: operate.type,
@@ -349,13 +347,13 @@ function handleMenuNewTrain(operates) {
 	return null;
 }
 
-/** 
+/**
  * 处理右键菜单 设置计轴有效操作
- * @param {*} operates 
+ * @param {*} operates
  */
 function handleMenuAlxeEffective(operates) {
 	if (operates.length >= 2) {
-		let operate = operates[0];
+		const operate = operates[0];
 		if (operate.type === SectionType && operate.code) {
 			return {
 				type: operate.type,
@@ -370,13 +368,13 @@ function handleMenuAlxeEffective(operates) {
 	return null;
 }
 
-/** 
+/**
  * 处理右键菜单 设置临时限速操作
- * @param {*} operates 
+ * @param {*} operates
  */
 function handleMenuSetLimitSpeed(operates) {
 	if (operates.length >= 2) {
-		let operate = operates[0];
+		const operate = operates[0];
 		if (operate.type === SectionType && operate.code) {
 			return {
 				type: operate.type,
@@ -400,11 +398,11 @@ function handleMenuSetLimitSpeed(operates) {
 
 /**
  * 处理点击按钮 区故解 操作
- * @param {*} operates 
+ * @param {*} operates
  */
 function handleButtonFault(operates) {
 	if (operates.length >= 2) {
-		let operate = operates[operates.length - 1];
+		const operate = operates[operates.length - 1];
 		if (operate.type === SectionType && operate.code) {
 			return {
 				type: operate.type,
@@ -420,11 +418,11 @@ function handleButtonFault(operates) {
 
 /**
  * 处理点击按钮 计轴预复位 操作
- * @param {*} operates 
+ * @param {*} operates
  */
 function handleButtonAxlePreReset(operates) {
 	if (operates.length >= 2) {
-		let operate = operates[operates.length - 1];
+		const operate = operates[operates.length - 1];
 		if (operate.type === SectionType && operate.code) {
 			return {
 				type: operate.type,
diff --git a/src/scripts/plugin/converter/SignalRouteOperationConverter.js b/src/scripts/plugin/converter/SignalRouteOperationConverter.js
index a2b6bf3c5..cda788326 100644
--- a/src/scripts/plugin/converter/SignalRouteOperationConverter.js
+++ b/src/scripts/plugin/converter/SignalRouteOperationConverter.js
@@ -7,341 +7,341 @@ const SignalOperation = OperationEvent.Signal;
 const SignalType = MapDeviceType.Signal.type;
 
 export default {
-    test: function (operates) {
-        let operateType = getOperateTypeBy('Signal', operates[0].operation);
-        if (operateType) {
-            return true;
-        } else {
-            return false;
-        }
-    },
-    /**
+	test: function (operates) {
+		const operateType = getOperateTypeBy('Signal', operates[0].operation);
+		if (operateType) {
+			return true;
+		} else {
+			return false;
+		}
+	},
+	/**
 	 * 验证前预处理
 	 */
-    preHandle: function (operates) {
-        if (operates && operates.length) {
-            let curOperate = operates[operates.length - 1];
-            switch (operates[0].operation) {
-                case SignalOperation.arrangementRoute.button: {
-                    if (curOperate.model) {
-                        curOperate.val = curOperate.model._viewVal;
-                    }
-                    return curOperate;
-                }
-                case SignalOperation.cancelTrainRoute.button: {
-                    if (curOperate.model) {
-                        curOperate.val = curOperate.model._viewVal;
-                    }
-                    return curOperate;
-                }
-                case SignalOperation.reopenSignal.button: {
-                    return curOperate;
-                }
-                case SignalOperation.humanTrainRoute.button: {
-                    if (curOperate.model) {
-                        curOperate.val = curOperate.model._viewVal;
-                    }
-                    return curOperate;
-                }
-                default: {
-                    return curOperate;
-                }
-            }
-        }
-    },
-    convert: function (operates) {
-        if (operates && operates.length) {
-            switch (operates[0].operation) {
-                case SignalOperation.cancelStoppage.menu.operation: return handleMenuCancelStopPage(operates);
+	preHandle: function (operates) {
+		if (operates && operates.length) {
+			const curOperate = operates[operates.length - 1];
+			switch (operates[0].operation) {
+			case SignalOperation.arrangementRoute.button: {
+				if (curOperate.model) {
+					curOperate.val = curOperate.model._viewVal;
+				}
+				return curOperate;
+			}
+			case SignalOperation.cancelTrainRoute.button: {
+				if (curOperate.model) {
+					curOperate.val = curOperate.model._viewVal;
+				}
+				return curOperate;
+			}
+			case SignalOperation.reopenSignal.button: {
+				return curOperate;
+			}
+			case SignalOperation.humanTrainRoute.button: {
+				if (curOperate.model) {
+					curOperate.val = curOperate.model._viewVal;
+				}
+				return curOperate;
+			}
+			default: {
+				return curOperate;
+			}
+			}
+		}
+	},
+	convert: function (operates) {
+		if (operates && operates.length) {
+			switch (operates[0].operation) {
+			case SignalOperation.cancelStoppage.menu.operation: return handleMenuCancelStopPage(operates);
 
-                case SignalOperation.stoppage.menu.operation: return handleMenuStoppage(operates);
+			case SignalOperation.stoppage.menu.operation: return handleMenuStoppage(operates);
 
-                case SignalOperation.arrangementRoute.button.operation: return handleButtonArrangementRoute(operates);
-                case SignalOperation.arrangementRoute.menu.operation: return handleMenuArrangementRoute(operates);
+			case SignalOperation.arrangementRoute.button.operation: return handleButtonArrangementRoute(operates);
+			case SignalOperation.arrangementRoute.menu.operation: return handleMenuArrangementRoute(operates);
 
-                case SignalOperation.cancelTrainRoute.button.operation: return handleButtonCancelTrainRoute(operates);
-                case SignalOperation.cancelTrainRoute.menu.operation: return handleMenuCancelTrainRoute(operates);
+			case SignalOperation.cancelTrainRoute.button.operation: return handleButtonCancelTrainRoute(operates);
+			case SignalOperation.cancelTrainRoute.menu.operation: return handleMenuCancelTrainRoute(operates);
 
-                case SignalOperation.reopenSignal.button.operation: return handleButtonReopenSignal(operates);
-                case SignalOperation.reopenSignal.menu.operation: return handleMenuReopenSignal(operates);
+			case SignalOperation.reopenSignal.button.operation: return handleButtonReopenSignal(operates);
+			case SignalOperation.reopenSignal.menu.operation: return handleMenuReopenSignal(operates);
 
-                case SignalOperation.humanTrainRoute.button.operation: return handleButtonHumanTrainRoute(operates);
-                case SignalOperation.humanTrainRoute.menu.operation: return handleMenuHumanTrainRoute(operates);
+			case SignalOperation.humanTrainRoute.button.operation: return handleButtonHumanTrainRoute(operates);
+			case SignalOperation.humanTrainRoute.menu.operation: return handleMenuHumanTrainRoute(operates);
 
-                case SignalOperation.lock.menu.operation: return handleMenuLock(operates);
+			case SignalOperation.lock.menu.operation: return handleMenuLock(operates);
 
-                case SignalOperation.unlock.menu.operation: return handleMenuUnlock(operates);
+			case SignalOperation.unlock.menu.operation: return handleMenuUnlock(operates);
 
-                case SignalOperation.guide.menu.operation: return handleMenuGuideRoute(operates);
-                case SignalOperation.guide.button.operation: return handleButtonGuideRoute(operates);
+			case SignalOperation.guide.menu.operation: return handleMenuGuideRoute(operates);
+			case SignalOperation.guide.button.operation: return handleButtonGuideRoute(operates);
 
-                case SignalOperation.signalClose.menu.operation: return handleMenuSignalClose(operates);
+			case SignalOperation.signalClose.menu.operation: return handleMenuSignalClose(operates);
 
-                case SignalOperation.setAutoInterlock.menu.operation: return handleMenuSetAutoInterlock(operates);
-                case SignalOperation.setAutoInterlock.button.operation: return handleButtonSetAutoInterlock(operates);
+			case SignalOperation.setAutoInterlock.menu.operation: return handleMenuSetAutoInterlock(operates);
+			case SignalOperation.setAutoInterlock.button.operation: return handleButtonSetAutoInterlock(operates);
 
-                case SignalOperation.cancelAutoInterlock.menu.operation: return handleMenuCancelAutoInterlock(operates);
+			case SignalOperation.cancelAutoInterlock.menu.operation: return handleMenuCancelAutoInterlock(operates);
 
-                case SignalOperation.setAutoTrigger.menu.operation: return handleMenuSetAutoTrigger(operates);
+			case SignalOperation.setAutoTrigger.menu.operation: return handleMenuSetAutoTrigger(operates);
 
-                case SignalOperation.cancelAutoTrigger.menu.operation: return handleMenuCancelAutoTrigger(operates);
+			case SignalOperation.cancelAutoTrigger.menu.operation: return handleMenuCancelAutoTrigger(operates);
 
-                case SignalOperation.humanControl.menu.operation: return handleMenuHumanControl(operates);
+			case SignalOperation.humanControl.menu.operation: return handleMenuHumanControl(operates);
 
-                case SignalOperation.atsAutoControl.menu.operation: return handleMenuAtsAutoControl(operates);
+			case SignalOperation.atsAutoControl.menu.operation: return handleMenuAtsAutoControl(operates);
 
-                case SignalOperation.detail.menu.operation: return handleMenuDetail(operates);
-            }
-        }
-    }
+			case SignalOperation.detail.menu.operation: return handleMenuDetail(operates);
+			}
+		}
+	}
 };
 
 /**
  * 处理点击按钮 排列进路 操作
- * @param {*} operates 
+ * @param {*} operates
  */
 function handleButtonArrangementRoute(operates) {
-    if (operates.length === 2) {
-        let operate = operates[1];
-        if (operate.type === SignalType && operate.code &&
+	if (operates.length === 2) {
+		const operate = operates[1];
+		if (operate.type === SignalType && operate.code &&
             operate.model && operate.model._viewVal) {
-            return {
-                type: operate.type,
-                code: operate.code,
-                operation: SignalOperation.arrangementRoute.event.query,
-                val: operate.model._viewVal
-            };
-        }
-        return { error: true };
-    } else if (operates.length >= 3) {
-        let operateBeg = operates[1];
-        let operateEnd = operates[operates.length - 1];
-        if (operateEnd.type === SignalType && operateEnd.code &&
+			return {
+				type: operate.type,
+				code: operate.code,
+				operation: SignalOperation.arrangementRoute.event.query,
+				val: operate.model._viewVal
+			};
+		}
+		return { error: true };
+	} else if (operates.length >= 3) {
+		const operateBeg = operates[1];
+		const operateEnd = operates[operates.length - 1];
+		if (operateEnd.type === SignalType && operateEnd.code &&
             operateEnd.model && operateBeg.val === operateEnd.model._viewVal &&
             operateEnd.tempData && operateEnd.tempData.length) {
-            for (let i = 0; i < operateEnd.tempData.length; i++) {
-                let elem = operateEnd.tempData[i];
-                if (elem.startSignalCode === operateBeg.code && elem.endSignalCode == operateEnd.code) {
-                    return {
-                        type: operateEnd.type,
-                        code: operateEnd.code,
-                        over: true,
-                        operation: SignalOperation.arrangementRoute.event.confirm,
-                        val: elem.code
-                    };
-                }
-            }
-        }
-        return { error: true };
-    }
-    return null;
+			for (let i = 0; i < operateEnd.tempData.length; i++) {
+				const elem = operateEnd.tempData[i];
+				if (elem.startSignalCode === operateBeg.code && elem.endSignalCode == operateEnd.code) {
+					return {
+						type: operateEnd.type,
+						code: operateEnd.code,
+						over: true,
+						operation: SignalOperation.arrangementRoute.event.confirm,
+						val: elem.code
+					};
+				}
+			}
+		}
+		return { error: true };
+	}
+	return null;
 }
 
 /**
  * 处理点击按钮 取消进路 操作
- * @param {*} operates 
+ * @param {*} operates
  */
 function handleButtonCancelTrainRoute(operates) {
-    if (operates.length >= 2) {
-        let operate = operates[operates.length - 1];
-        if (operate.type === SignalType && operate.code) {
-            return {
-                type: operate.type,
-                code: operate.code,
-                over: true,
-                operation: SignalOperation.cancelTrainRoute.event
-            };
-        }
-        return { error: true };
-    }
-    return null;
+	if (operates.length >= 2) {
+		const operate = operates[operates.length - 1];
+		if (operate.type === SignalType && operate.code) {
+			return {
+				type: operate.type,
+				code: operate.code,
+				over: true,
+				operation: SignalOperation.cancelTrainRoute.event
+			};
+		}
+		return { error: true };
+	}
+	return null;
 }
 
 /**
  * 处理点击按钮 信号重开 操作
- * @param {*} operates 
+ * @param {*} operates
  */
 function handleButtonReopenSignal(operates) {
-    if (operates.length >= 2) {
-        let operate = operates[operates.length - 1];
-        if (operate.type === SignalType && operate.code) {
-            return {
-                type: operate.type,
-                code: operate.code,
-                over: true,
-                operation: SignalOperation.reopenSignal.event
-            };
-        }
-        return { error: true };
-    }
-    return null;
+	if (operates.length >= 2) {
+		const operate = operates[operates.length - 1];
+		if (operate.type === SignalType && operate.code) {
+			return {
+				type: operate.type,
+				code: operate.code,
+				over: true,
+				operation: SignalOperation.reopenSignal.event
+			};
+		}
+		return { error: true };
+	}
+	return null;
 }
 
 /**
  * 处理点击按钮 总人解 操作
- * @param {*} operates 
+ * @param {*} operates
  */
 function handleButtonHumanTrainRoute(operates) {
-    if (operates.length >= 2) {
-        let operate = operates[operates.length - 1];
-        if (operate.type === SignalType && operate.code) {
-            if (operate.code) {
-                let counter = store.getters['map/getCounterBySingalCode'](operate.code, '02');
-                if (counter) {
-                    let val = localStore.get(counter.code) || '';
-                    return {
-                        type: operate.type,
-                        code: operate.code,
-                        over: true,
-                        operation: SignalOperation.humanTrainRoute.event,
-                        val: val
-                    };
-                }
-            }
+	if (operates.length >= 2) {
+		const operate = operates[operates.length - 1];
+		if (operate.type === SignalType && operate.code) {
+			if (operate.code) {
+				const counter = store.getters['map/getCounterBySingalCode'](operate.code, '02');
+				if (counter) {
+					const val = localStore.get(counter.code) || '';
+					return {
+						type: operate.type,
+						code: operate.code,
+						over: true,
+						operation: SignalOperation.humanTrainRoute.event,
+						val: val
+					};
+				}
+			}
 
-        }
-        return { error: true };
-    }
-    return null;
+		}
+		return { error: true };
+	}
+	return null;
 }
 
 /**
  * 处理右键菜单 取消故障 操作
- * @param {*} operates 
+ * @param {*} operates
  */
 function handleMenuCancelStopPage(operates) {
-    if (operates.length >= 1) {
-        let operate = operates[0];
-        if (operate.type === SignalType && operate.code) {
-            return {
-                type: operate.type,
-                code: operate.code,
-                over: true,
-                operation: SignalOperation.cancelStoppage.event
-            };
-        }
-        return { error: true };
-    }
-    return null;
+	if (operates.length >= 1) {
+		const operate = operates[0];
+		if (operate.type === SignalType && operate.code) {
+			return {
+				type: operate.type,
+				code: operate.code,
+				over: true,
+				operation: SignalOperation.cancelStoppage.event
+			};
+		}
+		return { error: true };
+	}
+	return null;
 }
 
 /**
  * 处理右键菜单 设置故障 操作
- * @param {*} operates 
+ * @param {*} operates
  */
 function handleMenuStoppage(operates) {
-    if (operates.length >= 1) {
-        let operate = operates[0];
-        if (operate.type === SignalType && operate.code) {
-            return {
-                type: operate.type,
-                code: operate.code,
-                over: true,
-                operation: SignalOperation.stoppage.event,
-            };
-        }
-        return { error: true };
-    }
-    return null;
+	if (operates.length >= 1) {
+		const operate = operates[0];
+		if (operate.type === SignalType && operate.code) {
+			return {
+				type: operate.type,
+				code: operate.code,
+				over: true,
+				operation: SignalOperation.stoppage.event
+			};
+		}
+		return { error: true };
+	}
+	return null;
 }
 
 /**
  * 处理右键菜单 排列进路 操作
- * @param {*} operates 
+ * @param {*} operates
  */
 function handleMenuArrangementRoute(operates) {
-    if (operates.length == 1) {
-        let 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) {
-        let 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 };
-    }
+	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;
+	return null;
 }
 
 /**
  * 处理右键菜单 取消进路 操作
- * @param {*} operates 
+ * @param {*} operates
  */
 function handleMenuCancelTrainRoute(operates) {
-    if (operates.length >= 2) {
-        let operate = operates[0];
-        if (operate.type === SignalType && operate.code) {
-            return {
-                type: operate.type,
-                code: operate.code,
-                over: true,
-                operation: SignalOperation.cancelTrainRoute.event
-            };
-        }
-        return { error: true };
-    }
-    return null;
+	if (operates.length >= 2) {
+		const operate = operates[0];
+		if (operate.type === SignalType && operate.code) {
+			return {
+				type: operate.type,
+				code: operate.code,
+				over: true,
+				operation: SignalOperation.cancelTrainRoute.event
+			};
+		}
+		return { error: true };
+	}
+	return null;
 }
 
 /**
  * 处理右键菜单 信号重开 操作
- * @param {*} operates 
+ * @param {*} operates
  */
 function handleMenuReopenSignal(operates) {
-    if (operates.length >= 2) {
-        let operate = operates[0];
-        if (operate.type === SignalType && operate.code) {
-            return {
-                type: operate.type,
-                code: operate.code,
-                over: true,
-                operation: SignalOperation.reopenSignal.event
-            };
-        }
-        return { error: true };
-    }
-    return null;
+	if (operates.length >= 2) {
+		const operate = operates[0];
+		if (operate.type === SignalType && operate.code) {
+			return {
+				type: operate.type,
+				code: operate.code,
+				over: true,
+				operation: SignalOperation.reopenSignal.event
+			};
+		}
+		return { error: true };
+	}
+	return null;
 }
 
 /**
  * 处理右键菜单 总人解 操作
- * @param {*} operates 
+ * @param {*} operates
  */
 function handleMenuHumanTrainRoute(operates) {
-    if (operates.length >= 2) {
-        let operate = operates[0];
-        if (operate.type === SignalType && operate.code) {
-            if (operate.code) {
-                let counter = store.getters['map/getCounterBySingalCode'](operate.code, '02');
-                if (counter) {
-                    let val = localStore.get(counter.code) || '';
-                    return {
-                        type: operate.type,
-                        code: operate.code,
-                        over: true,
-                        operation: SignalOperation.humanTrainRoute.event,
-                        val: val
-                    };
-                }
-            }
-        }
-        return { error: true };
-    }
-    return null;
+	if (operates.length >= 2) {
+		const operate = operates[0];
+		if (operate.type === SignalType && operate.code) {
+			if (operate.code) {
+				const counter = store.getters['map/getCounterBySingalCode'](operate.code, '02');
+				if (counter) {
+					const val = localStore.get(counter.code) || '';
+					return {
+						type: operate.type,
+						code: operate.code,
+						over: true,
+						operation: SignalOperation.humanTrainRoute.event,
+						val: val
+					};
+				}
+			}
+		}
+		return { error: true };
+	}
+	return null;
 }
 
 /**
@@ -349,18 +349,18 @@ function handleMenuHumanTrainRoute(operates) {
  * @param {*} operates
  */
 function handleMenuLock(operates) {
-    if (operates.length >= 2) {
-        let operate = operates[0];
-        if (operate.type === SignalType && operate.code) {
-            return {
-                type: operate.type,
-                code: operate.code,
-                over: true,
-                operation: SignalOperation.lock.event
-            };
-        }
-        return { error: true };
-    }
+	if (operates.length >= 2) {
+		const operate = operates[0];
+		if (operate.type === SignalType && operate.code) {
+			return {
+				type: operate.type,
+				code: operate.code,
+				over: true,
+				operation: SignalOperation.lock.event
+			};
+		}
+		return { error: true };
+	}
 }
 
 /**
@@ -368,18 +368,18 @@ function handleMenuLock(operates) {
  * @param {*} operates
  */
 function handleMenuUnlock(operates) {
-    if (operates.length >= 2) {
-        let operate = operates[0];
-        if (operate.type === SignalType && operate.code) {
-            return {
-                type: operate.type,
-                code: operate.code,
-                over: true,
-                operation: SignalOperation.unlock.event
-            };
-        }
-        return { error: true };
-    }
+	if (operates.length >= 2) {
+		const operate = operates[0];
+		if (operate.type === SignalType && operate.code) {
+			return {
+				type: operate.type,
+				code: operate.code,
+				over: true,
+				operation: SignalOperation.unlock.event
+			};
+		}
+		return { error: true };
+	}
 }
 
 /**
@@ -387,48 +387,48 @@ function handleMenuUnlock(operates) {
  * @param {*} operates
  */
 function handleMenuGuideRoute(operates) {
-    if (operates.length == 1) {
-        let operate = operates[0];
-        if (operate.type === SignalType && operate.code) {
-            return {
-                type: operate.type,
-                code: operate.code,
-                operation: SignalOperation.guide.event.query,
-            };
-        }
-        return { error: true };
-    } else if (operates.length >= 2) {
-        let operate = operates[0];
-        if (operate.type === SignalType && operate.code) {
-            return {
-                type: operate.type,
-                code: operate.code,
-                over: true,
-                operation: SignalOperation.guide.event.confirm
-            };
-        }
-        return { error: true };
-    }
+	if (operates.length == 1) {
+		const operate = operates[0];
+		if (operate.type === SignalType && operate.code) {
+			return {
+				type: operate.type,
+				code: operate.code,
+				operation: SignalOperation.guide.event.query
+			};
+		}
+		return { error: true };
+	} else if (operates.length >= 2) {
+		const operate = operates[0];
+		if (operate.type === SignalType && operate.code) {
+			return {
+				type: operate.type,
+				code: operate.code,
+				over: true,
+				operation: SignalOperation.guide.event.confirm
+			};
+		}
+		return { error: true };
+	}
 }
 
 /**
  * 处理右键菜单 信号关灯 操作
- * @param {*} operates 
+ * @param {*} operates
  */
 function handleMenuSignalClose(operates) {
-    if (operates.length >= 2) {
-        let operate = operates[0];
-        if (operate.type === SignalType && operate.code) {
-            return {
-                type: operate.type,
-                code: operate.code,
-                over: true,
-                operation: SignalOperation.signalClose.event
-            };
-        }
-        return { error: true };
-    }
-    return null;
+	if (operates.length >= 2) {
+		const operate = operates[0];
+		if (operate.type === SignalType && operate.code) {
+			return {
+				type: operate.type,
+				code: operate.code,
+				over: true,
+				operation: SignalOperation.signalClose.event
+			};
+		}
+		return { error: true };
+	}
+	return null;
 }
 
 /**
@@ -436,19 +436,19 @@ function handleMenuSignalClose(operates) {
  * @param {*} operates
  */
 function handleMenuSetAutoInterlock(operates) {
-    if (operates.length >= 2) {
-        let operate = operates[0];
-        if (operate.type === SignalType && operate.code) {
-            return {
-                type: operate.type,
-                code: operate.code,
-                over: true,
-                operation: SignalOperation.setAutoInterlock.event
-            };
-        }
-        return { error: true };
-    }
-    return null;
+	if (operates.length >= 2) {
+		const operate = operates[0];
+		if (operate.type === SignalType && operate.code) {
+			return {
+				type: operate.type,
+				code: operate.code,
+				over: true,
+				operation: SignalOperation.setAutoInterlock.event
+			};
+		}
+		return { error: true };
+	}
+	return null;
 }
 
 /**
@@ -456,19 +456,19 @@ function handleMenuSetAutoInterlock(operates) {
  * @param {*} operates
  */
 function handleMenuCancelAutoInterlock(operates) {
-    if (operates.length >= 2) {
-        let operate = operates[0];
-        if (operate.type === SignalType && operate.code) {
-            return {
-                type: operate.type,
-                code: operate.code,
-                over: true,
-                operation: SignalOperation.cancelAutoInterlock.event
-            };
-        }
-        return { error: true };
-    }
-    return null;
+	if (operates.length >= 2) {
+		const operate = operates[0];
+		if (operate.type === SignalType && operate.code) {
+			return {
+				type: operate.type,
+				code: operate.code,
+				over: true,
+				operation: SignalOperation.cancelAutoInterlock.event
+			};
+		}
+		return { error: true };
+	}
+	return null;
 }
 
 /**
@@ -476,19 +476,19 @@ function handleMenuCancelAutoInterlock(operates) {
  * @param {*} operates
  */
 function handleMenuSetAutoTrigger(operates) {
-    if (operates.length >= 2) {
-        let operate = operates[0];
-        if (operate.type === SignalType && operate.code) {
-            return {
-                type: operate.type,
-                code: operate.code,
-                over: true,
-                operation: SignalOperation.setAutoTrigger.event
-            };
-        }
-        return { error: true };
-    }
-    return null;
+	if (operates.length >= 2) {
+		const operate = operates[0];
+		if (operate.type === SignalType && operate.code) {
+			return {
+				type: operate.type,
+				code: operate.code,
+				over: true,
+				operation: SignalOperation.setAutoTrigger.event
+			};
+		}
+		return { error: true };
+	}
+	return null;
 }
 
 /**
@@ -496,19 +496,19 @@ function handleMenuSetAutoTrigger(operates) {
  * @param {*} operates
  */
 function handleMenuCancelAutoTrigger(operates) {
-    if (operates.length >= 2) {
-        let operate = operates[0];
-        if (operate.type === SignalType && operate.code) {
-            return {
-                type: operate.type,
-                code: operate.code,
-                over: true,
-                operation: SignalOperation.cancelAutoTrigger.event
-            };
-        }
-        return { error: true };
-    }
-    return null;
+	if (operates.length >= 2) {
+		const operate = operates[0];
+		if (operate.type === SignalType && operate.code) {
+			return {
+				type: operate.type,
+				code: operate.code,
+				over: true,
+				operation: SignalOperation.cancelAutoTrigger.event
+			};
+		}
+		return { error: true };
+	}
+	return null;
 }
 
 /**
@@ -516,35 +516,35 @@ function handleMenuCancelAutoTrigger(operates) {
  * @param {*} operates
  */
 function handleMenuHumanControl(operates) {
-    if (operates.length == 1) {
-        let operate = operates[0];
-        if (operate.type === SignalType && operate.code) {
-            return {
-                type: operate.type,
-                code: operate.code,
-                operation: SignalOperation.humanControl.event.query,
-            };
-        }
-        return { error: true };
-    } else if (operates.length >= 2) {
-        let operate = operates[operates.length - 1];
-        let val = null;
-        val = operates[operates.length - 3] && operates[operates.length - 3].val ? operates[operates.length - 3].val : val;
-        val = operates[operates.length - 2] && operates[operates.length - 2].val ? operates[operates.length - 2].val : val;
-        val = operates[operates.length - 1] && operates[operates.length - 1].val ? operates[operates.length - 1].val : val;
+	if (operates.length == 1) {
+		const operate = operates[0];
+		if (operate.type === SignalType && operate.code) {
+			return {
+				type: operate.type,
+				code: operate.code,
+				operation: SignalOperation.humanControl.event.query
+			};
+		}
+		return { error: true };
+	} else if (operates.length >= 2) {
+		const operate = operates[operates.length - 1];
+		let val = null;
+		val = operates[operates.length - 3] && operates[operates.length - 3].val ? operates[operates.length - 3].val : val;
+		val = operates[operates.length - 2] && operates[operates.length - 2].val ? operates[operates.length - 2].val : val;
+		val = operates[operates.length - 1] && operates[operates.length - 1].val ? operates[operates.length - 1].val : val;
 
-        if (operate.type === SignalType && operates[0].code && val) {
-            return {
-                over: true,
-                type: operate.type,
-                code: operates[0].code,
-                operation: SignalOperation.humanControl.event.confirm,
-                val: val
-            };
-        }
-        return { error: true };
-    }
-    return null;
+		if (operate.type === SignalType && operates[0].code && val) {
+			return {
+				over: true,
+				type: operate.type,
+				code: operates[0].code,
+				operation: SignalOperation.humanControl.event.confirm,
+				val: val
+			};
+		}
+		return { error: true };
+	}
+	return null;
 }
 
 /**
@@ -552,35 +552,35 @@ function handleMenuHumanControl(operates) {
  * @param {*} operates
  */
 function handleMenuAtsAutoControl(operates) {
-    if (operates.length == 1) {
-        let operate = operates[0];
-        if (operate.type === SignalType && operate.code) {
-            return {
-                type: operate.type,
-                code: operate.code,
-                operation: SignalOperation.atsAutoControl.event.query,
-            };
-        }
-        return { error: true };
-    } else if (operates.length >= 2) {
-        let operate = operates[operates.length - 1];
-        let val = null;
-        val = operates[operates.length - 3] && operates[operates.length - 3].val ? operates[operates.length - 3].val : val;
-        val = operates[operates.length - 2] && operates[operates.length - 2].val ? operates[operates.length - 2].val : val;
-        val = operates[operates.length - 1] && operates[operates.length - 1].val ? operates[operates.length - 1].val : val;
+	if (operates.length == 1) {
+		const operate = operates[0];
+		if (operate.type === SignalType && operate.code) {
+			return {
+				type: operate.type,
+				code: operate.code,
+				operation: SignalOperation.atsAutoControl.event.query
+			};
+		}
+		return { error: true };
+	} else if (operates.length >= 2) {
+		const operate = operates[operates.length - 1];
+		let val = null;
+		val = operates[operates.length - 3] && operates[operates.length - 3].val ? operates[operates.length - 3].val : val;
+		val = operates[operates.length - 2] && operates[operates.length - 2].val ? operates[operates.length - 2].val : val;
+		val = operates[operates.length - 1] && operates[operates.length - 1].val ? operates[operates.length - 1].val : val;
 
-        if (operate.type === SignalType && operates[0].code && val) {
-            return {
-                over: true,
-                type: operate.type,
-                code: operates[0].code,
-                operation: SignalOperation.atsAutoControl.event.confirm,
-                val: val
-            };
-        }
-        return { error: true };
-    }
-    return null;
+		if (operate.type === SignalType && operates[0].code && val) {
+			return {
+				over: true,
+				type: operate.type,
+				code: operates[0].code,
+				operation: SignalOperation.atsAutoControl.event.confirm,
+				val: val
+			};
+		}
+		return { error: true };
+	}
+	return null;
 }
 
 /**
@@ -588,57 +588,57 @@ function handleMenuAtsAutoControl(operates) {
  * @param {*} operates
  */
 function handleMenuDetail(operates) {
-    if (operates.length == 1) {
-        let operate = operates[0];
-        if (operate.type === SignalType && operate.code) {
-            return {
-                type: operate.type,
-                code: operate.code,
-                operation: SignalOperation.detail.event.query,
-            };
-        }
-        return { error: true };
-    }
-    return null;
+	if (operates.length == 1) {
+		const operate = operates[0];
+		if (operate.type === SignalType && operate.code) {
+			return {
+				type: operate.type,
+				code: operate.code,
+				operation: SignalOperation.detail.event.query
+			};
+		}
+		return { error: true };
+	}
+	return null;
 }
 
 /**
  * 处理点击按钮 设置联锁自动进路 操作
- * @param {*} operates 
+ * @param {*} operates
  */
 function handleButtonSetAutoInterlock(operates) {
-    if (operates.length >= 2) {
-        let operate = operates[operates.length - 1];
-        if (operate.type === SignalType && operate.code) {
-            return {
-                type: operate.type,
-                code: operate.code,
-                over: true,
-                operation: SignalOperation.setAutoInterlock.event
-            };
-        }
-        return { error: true };
-    }
-    return null;
+	if (operates.length >= 2) {
+		const operate = operates[operates.length - 1];
+		if (operate.type === SignalType && operate.code) {
+			return {
+				type: operate.type,
+				code: operate.code,
+				over: true,
+				operation: SignalOperation.setAutoInterlock.event
+			};
+		}
+		return { error: true };
+	}
+	return null;
 }
 
 /**
  * 处理点击按钮 引导 操作
- * @param {*} operates 
+ * @param {*} operates
  */
 function handleButtonGuideRoute(operates) {
-    if (operates.length >= 2) {
-        let operate = operates[operates.length - 1];
-        if (operate.type === SignalType && operate.code) {
-            return {
-                type: operate.type,
-                code: operate.code,
-                over: true,
-                operation: SignalOperation.guide.event
-            };
-        }
-        return { error: true };
-    }
-    return null;
+	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
+			};
+		}
+		return { error: true };
+	}
+	return null;
 }
 
diff --git a/src/store/modules/exam.js b/src/store/modules/exam.js
index 8ec9f2c50..9f4dfe9f6 100644
--- a/src/store/modules/exam.js
+++ b/src/store/modules/exam.js
@@ -1,100 +1,100 @@
 import store from '@/store';
 
 const exam = {
-    namespaced: true,
+	namespaced: true,
 
-    state: {
-        started: false,     //考试状态
-        usedTime: 0, 	    //考试当前所用时间
-        totalTime: 0,       //考试总时间
-        timeInterval: null, //计时器
-        suspend: false,     //暂停
-    },
-    getters: {
-        started: (state) => {
-            return state.started;
-        },
-        usedTime: (state) => {
-            return state.usedTime;
-        },
-        totalTime: (state) => {
-            return state.totalTime;
-        },
-        suspend: (state) => {
-            return state.suspend;
-        }
-    },
-    mutations: {
-        setStarted: (state, started) => {
-            state.started = started;
-        },
-        setSuspend: (state, suspend) => {
-            state.suspend = suspend;
-        },
-        setUsedTime: (state, usedTime) => {
-            state.usedTime = usedTime;
-        },
-        setTotalTime: (state, totalTime) => {
-            state.totalTime = totalTime;
-        },
-        countUsedTime: (state) => {
-            if (state.timeInterval) {
-                clearInterval(state.timeInterval);
-                state.timeInterval = null;
-            }
-            state.timeInterval = setInterval(() => {
-                if (!state.suspend) {
-                    state.usedTime++;
-                }
-            }, 1000);
-        },
-        stopCountTime: (state) => {
-            if (state.timeInterval) {
-                clearInterval(state.timeInterval);
-                state.timeInterval = null;
-            }
-        }
-    },
-    actions: {
-        start({ commit }) {
-            commit('setStarted', true);
-            commit('setSuspend', false);
-            commit('setUsedTime', 0);
-            commit('countUsedTime');
-        },
-        over({ commit }) {
-            commit('setStarted', false);
-            commit('setSuspend', true);
-            commit('setUsedTime', 0);
-            commit('stopCountTime');
-        },
-        isOver() {
-            let trainingList = store.getters['trainingList/trainingList'];
-            let doList = trainingList.filter(elem => {
-                if (elem.usedTime !== undefined) return true;
-            });
+	state: {
+		started: false, 	// 考试状态
+		usedTime: 0, 		// 考试当前所用时间
+		totalTime: 0, 		// 考试总时间
+		timeInterval: null, // 计时器
+		suspend: false 		// 暂停
+	},
+	getters: {
+		started: (state) => {
+			return state.started;
+		},
+		usedTime: (state) => {
+			return state.usedTime;
+		},
+		totalTime: (state) => {
+			return state.totalTime;
+		},
+		suspend: (state) => {
+			return state.suspend;
+		}
+	},
+	mutations: {
+		setStarted: (state, started) => {
+			state.started = started;
+		},
+		setSuspend: (state, suspend) => {
+			state.suspend = suspend;
+		},
+		setUsedTime: (state, usedTime) => {
+			state.usedTime = usedTime;
+		},
+		setTotalTime: (state, totalTime) => {
+			state.totalTime = totalTime;
+		},
+		countUsedTime: (state) => {
+			if (state.timeInterval) {
+				clearInterval(state.timeInterval);
+				state.timeInterval = null;
+			}
+			state.timeInterval = setInterval(() => {
+				if (!state.suspend) {
+					state.usedTime++;
+				}
+			}, 1000);
+		},
+		stopCountTime: (state) => {
+			if (state.timeInterval) {
+				clearInterval(state.timeInterval);
+				state.timeInterval = null;
+			}
+		}
+	},
+	actions: {
+		start({ commit }) {
+			commit('setStarted', true);
+			commit('setSuspend', false);
+			commit('setUsedTime', 0);
+			commit('countUsedTime');
+		},
+		over({ commit }) {
+			commit('setStarted', false);
+			commit('setSuspend', true);
+			commit('setUsedTime', 0);
+			commit('stopCountTime');
+		},
+		isOver() {
+			const trainingList = store.getters['trainingList/trainingList'];
+			const doList = trainingList.filter(elem => {
+				if (elem.usedTime !== undefined) return true;
+			});
 
-            if (doList.length >= trainingList.length) {
-                return true;
-            }
-        },
-        setSuspend({ commit }, suspend) {
-            commit('setSuspend', suspend);
-        },
-        countUsedTime({ commit }) {
-            commit('countUsedTime');
-        },
-        setUsedTime({ state }, usedTime) {
-            if (usedTime) {
-                state.usedTime = usedTime;
-            }
-        },
-        setTotalTime({ commit }, totalTime) {
-            if (totalTime) {
-                commit('setTotalTime', totalTime);
-            }
-        }
-    }
+			if (doList.length >= trainingList.length) {
+				return true;
+			}
+		},
+		setSuspend({ commit }, suspend) {
+			commit('setSuspend', suspend);
+		},
+		setUsedTime({ state }, usedTime) {
+			if (usedTime) {
+				state.usedTime = usedTime;
+			}
+		},
+		setTotalTime({ commit }, totalTime) {
+			if (totalTime) {
+				commit('setTotalTime', totalTime);
+			}
+		},
+		countUsedTime({ commit }) {
+			commit('countUsedTime');
+		}
+	}
 };
 
-export default exam;
\ No newline at end of file
+export default exam;
diff --git a/src/store/modules/ibp.js b/src/store/modules/ibp.js
index adf497fa2..25d701c2f 100644
--- a/src/store/modules/ibp.js
+++ b/src/store/modules/ibp.js
@@ -1,5 +1,4 @@
 import Vue from 'vue';
-import { parser } from '@/ibp/utils/parser';
 
 /**
  * ibp状态数据
@@ -11,7 +10,9 @@ const ibp = {
 		ibp: null, 				// 数据
 		ibpDevice: {},			// 解析后的地图数据
 		ibpList: {}, 			// 数据列表
-		ibpIdList: {}			// 数据列表(以id为标识)
+		ibpIdList: {},			// 数据列表(以id为标识)
+		updateDeviceData: {}, // 修改的数据
+		rightClickCount: 0 // 右键点击设备
 	},
 
 	getters: {
@@ -27,21 +28,32 @@ const ibp = {
 			} else {
 				return null;
 			}
+		},
+		updateDeviceData: (state) => {
+			return state.updateDeviceData;
 		}
 	},
 
 	mutations: {
 		ibpRender: (state, devices) => {
+			console.log('--2', devices);
 			Vue.prototype.$ibp && Vue.prototype.$ibp.render(devices);
 		},
 		setIbpData: (state, ibp) => {
 			state.ibp = ibp;
+		},
+		setUpdateDeviceData: (state, model) => {
+			state.rightClickCount++;
+			state.updateDeviceData = model;
+		},
+		deleteIbpDevices: (state, devices) => {
+			Vue.prototype.$ibp && Vue.prototype.$ibp.render(devices);
 		}
 	},
 
 	actions: {
-		setIbpData: ({ commit }, map) => {
-			commit('setIbpData', map);
+		setIbpData: ({ commit }, ibp) => {
+			commit('setIbpData', ibp);
 		},
 		updateIbpDevices: ({ commit }, models) => {
 			return new Promise((resolve) => {
@@ -51,8 +63,17 @@ const ibp = {
 				commit('ibpRender', models);
 				resolve(models);
 			});
+		},
+		setUpdateDeviceData: ({ commit }, models) => {
+			commit('setUpdateDeviceData', models);
+		},
+		deleteIbpDevices: ({ commit }, models ) => {
+			models = Object.assign(models, {dispose: true});
+			if (!(models instanceof Array)) {
+				models = [models];
+			}
+			commit('deleteIbpDevices', models);
 		}
-
 	}
 };
 
diff --git a/src/store/modules/map.js b/src/store/modules/map.js
index bcb7e8071..dc63b3d2f 100644
--- a/src/store/modules/map.js
+++ b/src/store/modules/map.js
@@ -191,6 +191,53 @@ function saveMapDeviceDefaultRelations(state) {
 	}
 }
 
+// 同步绘制数据到原始数据
+function dataSync(model, map) {
+	var prop = null;
+	var type = model._type;
+	var code = model.code;
+
+	switch (type) {
+	case deviceType.Link: prop = 'linkList'; break;
+	case deviceType.Section: prop = 'sectionList'; break;
+	case deviceType.Switch: prop = 'switchList'; break;
+	case deviceType.Signal: prop = 'signalList'; break;
+	case deviceType.Station: prop = 'stationList'; break;
+	case deviceType.StationStand: prop = 'stationStandList'; break;
+	case deviceType.StationControl: prop = 'stationControlList'; break;
+	case deviceType.StationCounter: prop = 'stationCounterList'; break;
+	case deviceType.ZcControl: prop = 'zcControlList'; break;
+	case deviceType.StationDelayUnlock: prop = 'stationDelayUnlockList'; break;
+	case deviceType.LcControl: prop = 'lcControlList'; break;
+	case deviceType.ButtonControl: prop = 'buttonList'; break;
+	case deviceType.LimitControl: prop = 'tempSpeedLimitList'; break;
+	case deviceType.ImageControl: prop = 'imageControl'; break;
+	case deviceType.Train: prop = 'trainList'; break;
+	case deviceType.TrainWindow: prop = 'trainWindowList'; break;
+	case deviceType.Line: prop = 'lineList'; break;
+	case deviceType.Text: prop = 'textList'; break;
+	}
+
+	const list = map[prop] || [];
+	const idex = list.findIndex(elem => { return elem.code == code; });
+	if (list) {
+		if (model._dispose) {
+			idex >= 0 && list.splice(idex, 1);
+		} else {
+			const elem = list[idex];
+			if (elem) {
+				Object.keys(model).forEach(key => {
+					if (key != 'instance') {
+						elem[key] = model[key];
+					}
+				});
+			} else {
+				list.push(Object.assign({}, model));
+			}
+		}
+	}
+}
+
 /**
  * 实训状态数据
  */
@@ -435,7 +482,13 @@ const map = {
 			state.dataZoom = dataZoom;
 		},
 		mapRender: (state, devices) => {
-			Vue.prototype.$jlmap && Vue.prototype.$jlmap.render(devices);
+			if (state.map) {
+				devices.forEach(elem => { dataSync(elem, state.map); });
+			}
+
+			if (Vue.prototype.$jlmap) {
+				Vue.prototype.$jlmap.render(devices);
+			}
 		},
 		setTrainDetails: (state, details) => {
 			state.trainDetails = details;
@@ -474,14 +527,18 @@ const map = {
 						}
 					});
 
-					Vue.prototype.$jlmap && Vue.prototype.$jlmap.render(trainList);
+					if (Vue.prototype.$jlmap) {
+						Vue.prototype.$jlmap.render(trainList);
+					}
 				}
 			}
 		},
 		mapClear: (state) => {
 			state.map = null;
 			state.mapDevice = {};
-			Vue.prototype.$jlmap && Vue.prototype.$jlmap.clear();
+			if (Vue.prototype.$jlmap) {
+				Vue.prototype.$jlmap.clear();
+			}
 		}
 	},
 
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index d0d4e79d9..3297633a9 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -1,4 +1,4 @@
-import localStore from 'storejs';
+import { setSessionStorage } 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 { getUserConfigInfo } from '@/api/management/user';
@@ -139,7 +139,7 @@ const user = {
 			getUserConfigInfo().then(resp => {
 				if (resp.data) {
 					resp.data.forEach(elem => {
-						localStore(elem.code, elem.val);
+						setSessionStorage(elem.code, elem.val);
 					});
 				}
 			});
diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js
index 2e575c51e..bddcac374 100644
--- a/src/utils/baseUrl.js
+++ b/src/utils/baseUrl.js
@@ -4,7 +4,11 @@ export function getBaseUrl() {
 	if (process.env.NODE_ENV === 'development') {
 		// BASE_API = 'https://joylink.club/jlcloud';
 		BASE_API = 'https://test.joylink.club/jlcloud';
+<<<<<<< HEAD
 		// BASE_API = 'http://192.168.3.5:9000'; // 袁琪
+=======
+		// BASE_API = 'http://192.168.9.255:9000'; // 袁琪
+>>>>>>> 327bf6f32b24ee9862ae9627615dc63ceccd3c9f
 		// BASE_API = 'http://192.168.3.6:9000'; // 旭强
 		// BASE_API = 'http://192.168.3.4:9000' // 琰培
 	} else {
diff --git a/src/views/components/editTable/index.vue b/src/views/components/editTable/index.vue
new file mode 100644
index 000000000..42b591914
--- /dev/null
+++ b/src/views/components/editTable/index.vue
@@ -0,0 +1,173 @@
+<template>
+  <div>
+    <el-table
+      :size="size"
+      :stripe="stripe"
+      :border="border"
+      :data="tableData"
+      :max-height="maxHeight"
+      :height="height"
+    >
+      <el-table-column v-if="tableForm.index" fixed type="index" />
+      <template v-for="(column, index) in tableForm.columns">
+        <el-table-column
+          v-if="checkFieldType(column.type, 'text')"
+          :key="index"
+          :prop="column.prop"
+          :label="column.title"
+          :width="column.width || labelWidth"
+          :sortable="column.sortable"
+        >
+          <template slot-scope="scopeT" @focus="handleFocus" @blur="handleBlur">
+            <template v-if="column.editable && (scopeT.row.editing || column.editing)">
+              <el-input v-model="scopeT.row[column.prop]" :size="size" />
+            </template>
+            <template v-else>
+              {{ formatText(column, scopeT.row) }}
+            </template>
+          </template>
+        </el-table-column>
+        <el-table-column
+          v-if="checkFieldType(column.type, 'select')"
+          :key="index"
+          :prop="column.prop"
+          :label="column.title"
+          :width="column.width || labelWidth"
+          :sortable="column.sortable"
+        >
+          <template slot-scope="scopeS">
+            <template v-if="column.editable && (scopeS.row.editing || column.editing)">
+              <el-select v-model="scopeS.row[column.prop]" :size="size">
+                <el-option
+                  v-for="item in obtainOptions(column)"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                />
+              </el-select>
+            </template>
+            <template v-else>
+              {{ formatText(column, scopeS.row) }}
+            </template>
+          </template>
+        </el-table-column>
+        <el-table-column
+          v-if="checkFieldType(column.type, 'tag')"
+          :key="index"
+          :prop="column.prop"
+          :label="column.title"
+          :width="column.width || labelWidth"
+          :sortable="column.sortable"
+        >
+          <template slot-scope="scopeG">
+            <template v-for="tag in column.columnValue(scopeG.row)">
+              <el-tag
+                :key="tag"
+                :type="column.tagType(scopeG.row, scopeG.$index)"
+                style="margin-right: 10px; margin-bottom: 5px;"
+              >{{ tag }}</el-tag>
+            </template>
+          </template>
+        </el-table-column>
+        <el-table-column
+          v-if="checkFieldType(column.type, 'button')"
+          :key="index"
+          fixed="right"
+          :prop="column.prop"
+          :label="column.title"
+          :width="column.width || labelWidth"
+          :sortable="column.sortable"
+        >
+          <template slot-scope="scopeB">
+            <el-button :size="size" type="warning" @click.native.prevent="handleFocus(scopeB)">编辑</el-button>
+            <template v-for="(action,idx) in column.buttons">
+              <el-button :key="idx" :size="size" :type="action.type" @click.native.prevent="handleClick(action, scopeB)">{{ action.name }}</el-button>
+            </template>
+          </template>
+        </el-table-column>
+      </template>
+    </el-table>
+  </div>
+</template>
+
+<script>
+export default {
+	props: {
+		maxHeight: {
+			type: Number,
+			default() {
+				return 400;
+			}
+		},
+		height: {
+			type: Number,
+			default() {
+				return 400;
+			}
+		},
+		size: {
+			type: String,
+			default() {
+				return 'mini';
+			}
+		},
+		border: {
+			type: Boolean
+		},
+		stripe: {
+			type: Boolean
+		},
+		tableData: {
+			type: Array,
+			default() {
+				return [];
+			}
+		},
+		tableForm: {
+			type: Object,
+			required: true
+		}
+	},
+	data() {
+		return {
+			scope: null,
+			labelWidth: '120'
+		};
+	},
+	methods: {
+		obtainOptions(column) {
+			return column.options();
+		},
+		checkFieldType(field, type) {
+			return field == type;
+		},
+		formatText(column, row) {
+			return column.format ? column.format(row) : row[column.prop];
+		},
+		handleClick(action, scope) {
+			this.handleBlur(this.scope);
+			action.handleClick(scope.$index, scope.row);
+		},
+		handleFocus(scope) {
+			this.handleBlur(this.scope);
+			this.$set(this.tableData[scope.$index], 'editing', true);
+			this.scope = scope;
+		},
+		handleBlur(scope) {
+			if (scope) {
+				this.$set(this.tableData[scope.$index], 'editing', false);
+			}
+		}
+	}
+};
+</script>
+<style lang="scss" scoped>
+	/deep/  .el-table {
+		td,th {
+			padding:  0px;
+		}
+		td:nth-child(1), th:nth-child(1) {
+			background: #fefefe;
+		}
+	}
+</style>
diff --git a/src/views/components/filterCity/index.vue b/src/views/components/filterCity/index.vue
index 28abc0fc8..7272b10f5 100644
--- a/src/views/components/filterCity/index.vue
+++ b/src/views/components/filterCity/index.vue
@@ -175,7 +175,6 @@ export default {
 			}
 		},
 		filterSelectChange(filterSelect) {
-			this.$emit('changeFilter', filterSelect);
 			if (this.isCascader) {
 				// 设置二级联动组件
 				localStore.set('cityCode', filterSelect[0]);
diff --git a/src/views/components/limits/distribute.vue b/src/views/components/limits/distribute.vue
index 57679145c..3b67cf123 100644
--- a/src/views/components/limits/distribute.vue
+++ b/src/views/components/limits/distribute.vue
@@ -10,7 +10,7 @@
 
 <script>
 import { getTotalRemains } from '@/api/management/author';
-import { PermissionType, OperatorModel } from '@/scripts/ConstDic';
+import { PermissionType } from '@/scripts/ConstDic';
 import { giveLessons } from '@/api/management/distribute';
 
 export default {
@@ -47,6 +47,7 @@ export default {
 			return form;
 		},
 		rules() {
+			const that = this;
 			const crules = {
 				total: [
 					{ required: true, message: this.$t('global.pleaseInputPermissionNumber'), trigger: 'change' },
@@ -55,7 +56,7 @@ export default {
 							if (Number.isInteger(Number(value)) && Number(value) > 0) {
 								callback();
 							} else {
-								callback(new Error(this.$t('global.permissionGreaterThen0')));
+								callback(new Error(that.$t('global.permissionGreaterThen0')));
 							}
 						},
 						trigger: 'blur'
@@ -102,21 +103,19 @@ export default {
 			this.maxTotal = 0;
 			if (endTime && startTime) {
 				const model = {
-					// lessonId: this.formModel.lessonId,
 					startTime: startTime,
 					endTime: endTime,
-					type: this.PermissionType
-					// mapId: this.mapId,
-					// mapProductCode: this.prdCode,
+					permissionType: this.PermissionType
 				};
 				if (this.PermissionType == PermissionType.LESSON || this.PermissionType == PermissionType.EXAM) {
 					model['lessonId'] = this.formModel.lessonId;
 					model['mapId'] = this.mapId;
-					model['mapProductCode'] = this.prdCode;
+					model['prdCode'] = this.prdCode;
 				} else if (this.PermissionType == PermissionType.SIMULATION) {
 					model['mapId'] = this.mapId;
-					model['mapProductCode'] = this.prdCode;
+					model['prdCode'] = this.prdCode;
 				}
+				// 获取用户某课程某段时间内可用的权限数量
 				getTotalRemains(model).then(response => {
 					this.maxTotal = response.data;
 					if (this.maxTotal == 0) {
@@ -146,23 +145,20 @@ export default {
 		handleSure() {
 			this.$refs.dataform.validateForm(() => {
 				const model = {
-					// lessonId: this.formModel.lessonId,
 					startTime: this.formModel.date[0],
 					endTime: this.formModel.date[1],
 					permissionType: this.PermissionType,
-					operator: OperatorModel.DISTRIBUTE,
 					amount: this.formModel.total
-					// mapId: this.mapId,
-					// mapProductCode: this.prdCode,
 				};
 				if (this.PermissionType == PermissionType.LESSON || this.PermissionType == PermissionType.EXAM) {
 					model['lessonId'] = this.formModel.lessonId;
 					model['mapId'] = this.mapId;
-					model['mapProductCode'] = this.prdCode;
+					model['prdCode'] = this.prdCode;
 				} else if (this.PermissionType == PermissionType.SIMULATION) {
 					model['mapId'] = this.mapId;
-					model['mapProductCode'] = this.prdCode;
+					model['prdCode'] = this.prdCode;
 				}
+				// 权限分发请求
 				giveLessons(model).then(response => {
 					const url = response.data;
 					this.$emit('QrCodeShow', {
diff --git a/src/views/components/limits/index.vue b/src/views/components/limits/index.vue
index 195a155c7..dee3b4d6a 100644
--- a/src/views/components/limits/index.vue
+++ b/src/views/components/limits/index.vue
@@ -12,8 +12,7 @@
       <el-table-column prop="endTime" :label="`${$t('global.endTime')}`" />
       <el-table-column prop="forever" :label="`${$t('global.isForever')}`">
         <template slot-scope="scope">
-          <el-tag :type="scope.row.forever? 'success': 'primary'" disable-transitions>{{ $ConstSelect.translate(scope.row.forever,
-                                                                                                                'Whether') }}</el-tag>
+          <el-tag :type="scope.row.forever? 'success': 'primary'" disable-transitions>{{ $ConstSelect.translate(scope.row.forever, 'Whether') }}</el-tag>
         </template>
       </el-table-column>
       <el-table-column prop="amount" :label="$t('global.total')" />
@@ -102,12 +101,12 @@ export default {
 			});
 			return sums;
 		},
-		transfer(courseModel) {
+		transfer(courseModel) { // 转增
 			if (this.$refs) {
 				this.$refs.transfer.doShow(courseModel);
 			}
 		},
-		distribute(courseModel) {
+		distribute(courseModel) { // 分发
 			if (this.$refs) {
 				this.$refs.distribute.doShow(courseModel);
 			}
diff --git a/src/views/components/limits/transfer.vue b/src/views/components/limits/transfer.vue
index 238fa0a61..383c1d743 100644
--- a/src/views/components/limits/transfer.vue
+++ b/src/views/components/limits/transfer.vue
@@ -10,8 +10,8 @@
 
 <script>
 import { getTotalRemains } from '@/api/management/author';
-import { giveLessons } from '@/api/management/distribute';
-import { PermissionType, OperatorModel } from '@/scripts/ConstDic';
+import { permissionTurnAdd } from '@/api/management/distribute';
+import { PermissionType } from '@/scripts/ConstDic';
 
 export default {
 	name: 'GoLsesson',
@@ -54,6 +54,7 @@ export default {
 			return form;
 		},
 		rules() {
+			const that = this;
 			const crules = {
 				total: [
 					{ required: true, message: this.$t('global.pleaseInputPermissionNumber'), trigger: 'change' },
@@ -62,7 +63,7 @@ export default {
 							if (Number.isInteger(Number(value)) && Number(value) > 0) {
 								callback();
 							} else {
-								callback(new Error(this.$t('global.permissionGreaterThen0')));
+								callback(new Error(that.$t('global.permissionGreaterThen0')));
 							}
 						},
 						trigger: 'blur'
@@ -109,20 +110,17 @@ export default {
 			this.maxTotal = 0;
 			if (endTime && startTime) {
 				const model = {
-					// lessonId: this.formModel.lessonId,
 					startTime: `${startTime} 00:00:00`,
 					endTime: `${endTime} 23:59:59`,
-					type: this.PermissionType
-					// mapId: this.mapId,
-					// mapProductCode: this.prdCode,
+					permissionType: this.PermissionType
 				};
 				if (this.PermissionType == PermissionType.LESSON || this.PermissionType == PermissionType.EXAM) {
 					model['lessonId'] = this.formModel.lessonId;
 					model['mapId'] = this.mapId;
-					model['mapProductCode'] = this.prdCode;
+					model['prdCode'] = this.prdCode;
 				} else if (this.PermissionType == PermissionType.SIMULATION) {
 					model['mapId'] = this.mapId;
-					model['mapProductCode'] = this.prdCode;
+					model['prdCode'] = this.prdCode;
 				}
 				getTotalRemains(model).then(response => {
 					this.maxTotal = response.data;
@@ -153,24 +151,21 @@ export default {
 		handleSure() {
 			this.$refs.dataform.validateForm(() => {
 				const model = {
-					// lessonId: this.formModel.lessonId,
 					startTime: `${this.formModel.date[0]} 00:00:00`,
 					endTime: `${this.formModel.date[1]} 23:59:59`,
 					amount: this.formModel.total,
-					permissionType: this.PermissionType,
-					operator: OperatorModel.TRANSFER
-					// mapId: this.mapId,
-					// mapProductCode: this.prdCode,
+					permissionType: this.PermissionType
 				};
 				if (this.PermissionType == PermissionType.LESSON || this.PermissionType == PermissionType.EXAM) {
 					model['lessonId'] = this.formModel.lessonId;
 					model['mapId'] = this.mapId;
-					model['mapProductCode'] = this.prdCode;
+					model['prdCode'] = this.prdCode;
 				} else if (this.PermissionType == PermissionType.SIMULATION) {
 					model['mapId'] = this.mapId;
-					model['mapProductCode'] = this.prdCode;
+					model['prdCode'] = this.prdCode;
 				}
-				giveLessons(model).then(response => {
+				// 转增
+				permissionTurnAdd(model).then(response => {
 					const url = response.data;
 					this.$emit('QrCodeShow', {
 						url: url,
diff --git a/src/views/components/pay/index.vue b/src/views/components/pay/index.vue
index 3124f12b0..c597d7ae8 100644
--- a/src/views/components/pay/index.vue
+++ b/src/views/components/pay/index.vue
@@ -95,11 +95,13 @@ export default {
 		// 加载课程信息
 		initLoadPage() {
 			const data = {
-				mapId: this.$route.query.mapId,
-				lessonId: this.$route.params.lessonId,
-				productType: this.$route.query.permissionType,
-				mapProductCode: this.$route.query.prdCode
+				permissionType: this.$route.query.permissionType
 			};
+			if (this.$route.query.permissionType != '04') {
+				data['mapId'] = this.$route.query.mapId;
+				data['prdCode'] = this.$route.query.prdCode;
+				data['lessonId'] = this.$route.query.lessonId;
+			}
 
 			getCommodityDetailByParams(data).then(response => {
 				this.active = 0;
diff --git a/src/views/dashboard/echarts/permission.vue b/src/views/dashboard/echarts/permission.vue
index 4880ff445..920440105 100644
--- a/src/views/dashboard/echarts/permission.vue
+++ b/src/views/dashboard/echarts/permission.vue
@@ -159,10 +159,10 @@ export default {
 				};
 
 				(this.permissionList.filter(elem => { return elem.mapName == mapName; })|| []).forEach(elem => {
-					if (elem.mapProductName == Object.keys(permissionMap)[Object.keys(permissionMap).length -1]) {
-						permissionMap[`${elem.mapProductName}`] = elem.remains;
+					if (elem.prdName == Object.keys(permissionMap)[Object.keys(permissionMap).length -1]) {
+						permissionMap[`${elem.prdName}`] = elem.remains;
 					} else {
-						permissionMap[`${elem.mapProductName}-${permissionDict[elem.type]}`] = elem.remains;
+						permissionMap[`${elem.prdName}-${permissionDict[elem.permissionType]}`] = elem.remains;
 					}
 				});
 
diff --git a/src/views/demonstration/deomonList/index.vue b/src/views/demonstration/deomonList/index.vue
index b8b5fd3b7..a3b6d72ed 100644
--- a/src/views/demonstration/deomonList/index.vue
+++ b/src/views/demonstration/deomonList/index.vue
@@ -71,8 +71,6 @@ export default {
 			return true;
 		}
 	},
-	watch: {
-	},
 	methods: {
 		filterNode(value, data) {
 			if (!value) return true;
@@ -99,9 +97,6 @@ export default {
 		doClose() {
 			this.loading = false;
 			this.dialogShow = false;
-		},
-		handleWatch() {
-
 		},
 		async handleJoin() {
 			if (this.group) {
diff --git a/src/views/demonstration/detail/index.vue b/src/views/demonstration/detail/index.vue
index 10b24ee54..956aa1462 100644
--- a/src/views/demonstration/detail/index.vue
+++ b/src/views/demonstration/detail/index.vue
@@ -49,7 +49,7 @@ 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 } from '@/api/simulation';
+import { simulationNotify, schedulingNotify } from '@/api/simulation';
 import localStore from 'storejs';
 import LimitList from '@/views/components/limits/index';
 import WindowResizeHandler from '@/mixin/WindowResizeHandler';
@@ -94,7 +94,7 @@ export default {
 		},
 		hasPermssion() {
 			let isShow = false;
-			if (this.courseModel.pmsList.length) {
+			if (this.courseModel.pmsList && this.courseModel.pmsList.length) {
 				isShow = true;
 			}
 			return isShow;
@@ -190,15 +190,14 @@ export default {
 						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.length) {
+					if (!this.courseModel.pmsList) {
 						this.tryUser = 1;
 						const paras = {
 							mapId: data.id,
-							mapProductCode: data.code,
-							productType: PermissionType.SIMULATION
+							prdCode: data.code,
+							permissionType: PermissionType.SIMULATION
 						};
 
 						try {
@@ -226,34 +225,39 @@ export default {
 			const query = { skinCode: this.courseModel.skinCode, group: this.jointGroup };
 			this.$router.push({ path: `/trainroom`, query: query });
 		},
-		async start() {
-			if (this.courseModel.prdType == '03') {
-				try {
-					this.buttonLoading = true;
-					const param = {
-						mapId: Number(this.mapId),
-						prdCode: this.courseModel.prdCode
-					};
-					const res = await postCreateRoom(param);
-					if (res && res.code == 200) {
-						const query = { skinCode: this.courseModel.skinCode, group: res.data };
-						this.$router.push({ path: `/trainroom`, query: query });
-					}
-				} catch (error) {
-					this.buttonLoading = false;
-					if (error.code == 20001) {
-						this.$confirm(this.$t('tip.createRoomFailedHint'), this.$t('global.tips'), {
-							confirmButtonText: this.$t('global.confirm'),
-							cancelButtonText: this.$t('global.cancel'),
-							type: 'warning'
-						}).then(() => {}).catch(() => {});
-					}
-					if (error.code == 500009) {
-						this.$messageBox(error.message);
-					}
+		async createRoom() {
+			try {
+				this.buttonLoading = true;
+				const param = {
+					mapId: Number(this.mapId),
+					prdCode: this.courseModel.prdCode
+				};
+				const res = await postCreateRoom(param);
+				if (res && res.code == 200) {
+					const query = { skinCode: this.courseModel.skinCode, group: res.data };
+					this.$router.push({ path: `/trainroom`, query: query });
 				}
+			} catch (error) {
+				this.buttonLoading = false;
+				if (error.code == 20001) {
+					this.$confirm(this.$t('tip.createRoomFailedHint'), this.$t('global.tips'), {
+						confirmButtonText: this.$t('global.confirm'),
+						cancelButtonText: this.$t('global.cancel'),
+						type: 'warning'
+					}).then(() => {}).catch(() => {});
+				}
+				if (error.code == 500009) {
+					this.$messageBox(error.message);
+				}
+			}
+		},
+		async start() {
+			if (this.courseModel.prdType == '05') {
+				this.jumpScheduling();
+			} else if (this.courseModel.prdType == '03') {
+				this.createRoom();
 			} else {
-				if (this.courseModel.pmsList.length) {
+				if (this.courseModel.pmsList && this.courseModel.pmsList.length) {
 					this.jump();
 				} else {
 					if (this.tryTime <= 1) {
@@ -270,6 +274,18 @@ export default {
 				}
 			}
 		},
+		jumpScheduling() {
+			this.buttonLoading = true;
+			const data = { mapId: this.courseModel.mapId, code: this.currentPrdCode };
+			schedulingNotify(data).then(resp => {
+				const query = { skinCode: this.courseModel.skinCode, group: resp.data, prdType: this.courseModel.prdType, mapId: this.courseModel.mapId, code: this.currentPrdCode, goodsId: this.goodsId, try: this.tryUser };
+				this.$router.push({ path: `${UrlConfig.display}/demon`, query: query });
+				launchFullscreen();
+			}).catch(error => {
+				this.$messageBox(this.$t('error.createSimulationFailed') + error.message);
+				this.buttonLoading = false;
+			});
+		},
 		jump() {
 			const data = { mapId: this.courseModel.mapId, code: this.currentPrdCode };
 			this.buttonLoading = true;
diff --git a/src/views/demonstration/list/demonList.vue b/src/views/demonstration/list/demonList.vue
index d554427b5..dddbcdc18 100644
--- a/src/views/demonstration/list/demonList.vue
+++ b/src/views/demonstration/list/demonList.vue
@@ -2,9 +2,8 @@
   <el-card v-loading="loading" class="map-list-main">
     <div slot="header" class="clearfix">
       <span>{{ $t('global.mapList') }}</span>
-      <!-- <div v-if="role" class="back-home" @click="backHome">返回首页</div> -->
     </div>
-    <filter-city ref="filerCity" filter-empty :query-function="queryFunction" @filterSelectChange="refresh" @changeFilter="clearMapSelect" />
+    <filter-city ref="filerCity" 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-125) +'px' }">
       <el-tree
@@ -31,8 +30,8 @@
 <script>
 import { getPublishMapTree } from '@/api/management/mapprd';
 import { UrlConfig } from '@/router/index';
-import FilterCity from '@/views/components/filterCity';
 import { getSessionStorage, setSessionStorage, removeSessionStorage } from '@/utils/auth';
+import FilterCity from '@/views/components/filterCity';
 
 export default {
 	name: 'ExamDetailList',
@@ -77,12 +76,9 @@ export default {
 		}
 	},
 	beforeDestroy () {
-		this.clearMapSelect();
+		removeSessionStorage('demonList');
 	},
 	methods: {
-		// backHome() {
-		// 	this.$router.push({ path: `/` });
-		// },
 		filterNode(value, data) {
 			if (!value) return true;
 			return data.name.indexOf(value) !== -1;
@@ -124,9 +120,6 @@ export default {
 				this.loading = false;
 				this.$messageBox(this.$t('error.refreshFailed'));
 			}
-		},
-		clearMapSelect() {
-			removeSessionStorage('demonList');
 		}
 	}
 };
diff --git a/src/views/display/demon/scheduling.vue b/src/views/display/demon/scheduling.vue
new file mode 100644
index 000000000..abebcbc44
--- /dev/null
+++ b/src/views/display/demon/scheduling.vue
@@ -0,0 +1,328 @@
+<template>
+  <div>
+    <el-dialog
+      :title="title"
+      :visible.sync="show"
+      top="50px"
+      width="95%"
+      :before-do-close="doClose"
+      :close-on-click-modal="false"
+      :z-index="2000"
+    >
+      <div class="scheduling">
+        <el-card class="scheduling_header">
+          <el-form>
+            <el-row>
+              <el-col :span="6">
+                <el-form-item label="派班选择:">
+                  <el-date-picker
+                    v-model="formModel.planDate"
+                    clearable
+                    size="small"
+                    type="date"
+                    value-format="yyyy-MM-dd"
+                    @change="handleQuery"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="运行图名称:">
+                  <el-select v-model="formModel.runPlanName" size="small" style="display: inline-block">
+                    <el-option
+                      v-for="item in runPlanList"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value"
+                    />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="派班模式:">
+                  <div>{{ formModel.mode }}</div>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item style="text-align: right">
+                  <el-button-group>
+                    <el-button size="small" type="warning" @click="handleCheck">检查</el-button>
+                    <el-button size="small" type="primary" @click="handleSave">保存</el-button>
+                  </el-button-group>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </el-card>
+        <div class="scheduling_body">
+          <div class="scheduling_body-table">
+            <edit-table ref="table" border stripe :table-data="tableData" :table-form="tableForm" />
+          </div>
+        </div>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { querySecheduling, generateScheduling, getSchedulingAllTrains, checkScheduling, saveScheduling, generateSchedulingAgain } from '@/api/scheduling';
+import EditTable from '@/views/components/editTable/index';
+
+export default {
+	name: 'AddQuest',
+	components: {
+		EditTable
+	},
+	props: {
+		group: {
+			type: String,
+			required: true
+		}
+	},
+	data() {
+		return {
+			show: false,
+			runPlanList: [],
+			groupNumberList: [],
+			formModel: {
+				id: '',
+				mode: '',
+				planDate: '',
+				runPlanName: ''
+			},
+			tableForm: {
+				index: true,
+				columns: [
+					{
+						title: '司机号',
+						prop: 'driverCode',
+						type: 'text'
+					},
+					{
+						title: '车组号',
+						prop: 'trainCode',
+						type: 'select',
+						width: '150',
+						options: () => { return this.groupNumberList; },
+						editable: true,
+						editing: true
+					},
+					{
+						title: '上线轨',
+						prop: 'onlineSection',
+						type: 'text'
+					},
+					{
+						title: '上线服务号',
+						prop: 'onlineServerNumber',
+						type: 'text'
+					},
+					{
+						title: '上线目的地',
+						prop: 'onlineTargetNumber',
+						type: 'text'
+					},
+					{
+						title: '上线时间',
+						prop: 'onlineTime',
+						type: 'text'
+					},
+					{
+						title: '上线车次号',
+						prop: 'onlineTripNumber',
+						type: 'text',
+						format: (row) => { return `${row.onlineDirectionCode}${row.onlineTripNumber}`; }
+					},
+					{
+						title: '出库段',
+						prop: 'outDepot',
+						type: 'text'
+					},
+					{
+						title: '出库状态',
+						prop: 'outStatus',
+						type: 'tag',
+						columnValue: (row) => { return this.$ConstSelect.translate(row.outStatus, 'Whether'); },
+						tagType: (row) => {
+							switch (row.outStatus) {
+							case true: return 'success';
+							case false: return 'danger';
+							}
+						}
+					},
+					{
+						title: '下线轨',
+						prop: 'offlineSection',
+						type: 'text'
+					},
+					{
+						title: '下线服务号',
+						prop: 'offlineServerNumber',
+						type: 'text'
+					},
+					{
+						title: '下线目的地',
+						prop: 'offlineTargetNumber',
+						type: 'text'
+					},
+					{
+						title: '下线时间',
+						prop: 'offlineTime',
+						type: 'text'
+					},
+					{
+						title: '下线车次号',
+						prop: 'offlineTripNumber',
+						type: 'text',
+						format: (row) => { return `${row.offlineDirectionCode}${row.offlineTripNumber}`; }
+					},
+					{
+						title: '回库段',
+						prop: 'inDepot',
+						type: 'text'
+					},
+					{
+						title: '回库状态',
+						prop: 'inStatus',
+						type: 'tag',
+						columnValue: (row) => { return this.$ConstSelect.translate(row.inStatus, 'Whether'); },
+						tagType: (row) => {
+							switch (row.inStatus) {
+							case true: return 'success';
+							case false: return 'danger';
+							}
+						}
+					}
+				]
+			},
+			tableData: []
+		};
+	},
+	computed: {
+		title() {
+			return '排班计划';
+		}
+	},
+	created() {
+		this.loadInitData();
+	},
+	methods: {
+		doShow() {
+			this.formModel.day = '';
+			this.show = true;
+		},
+		doClose() {
+			this.show = false;
+		},
+		loadInitData() {
+			this.groupNumberList = [];
+			getSchedulingAllTrains(this.group).then(resp => {
+				this.groupNumberList = resp.data.map(elem => { return {value: elem.code, label: elem.groupNumber}; });
+			});
+		},
+		handleQuery(day) {
+			if (day) {
+				querySecheduling(this.group, {day}).then(resp => {
+					if (!resp.data) {
+						this.$confirm('无派班计划，是否创建？', this.$t('global.tips'), {
+							confirmButtonText: this.$t('global.confirm'),
+							cancelButtonText: this.$t('global.cancel'),
+							type: 'warning'
+						}).then(() => {
+							this.handleGenerate(day);
+						}).catch(() => {
+							this.clearData();
+						});
+					} else {
+						this.tableData = resp.data.planList || [];
+						this.formModel.id = resp.data.id;
+						this.formModel.planDate = resp.data.planDate;
+						this.formModel.runPlanName = resp.data.runPlanName;
+						this.$message.success(`加载数据 ${day} 派班计划成功！`);
+					}
+				}).catch(error => {
+					this.clearData();
+					if (error.code == 30002) {
+						this.handleReGenerate(day);
+					} else {
+						this.$messageBox(`${error.message}`);
+					}
+				});
+			}
+		},
+		handleGenerate(day) {
+			generateScheduling(this.group, {day}).then(resp => {
+				this.tableData = resp.data.planList || [];
+				this.formModel.id = resp.data.id;
+				this.formModel.planDate = resp.data.planDate;
+				this.formModel.runPlanName = resp.data.runPlanName;
+				this.$message.success('创建派班计划成功');
+			}).catch(error => {
+				this.clearData();
+				this.$messageBox(`${error.message}`);
+			});
+		},
+		handleReGenerate(day) {
+			generateSchedulingAgain(this.group).then(resp => {
+				this.tableData = resp.data.planList || [];
+				this.formModel.id = resp.data.id;
+				this.formModel.planDate = resp.data.planDate;
+				this.formModel.runPlanName = resp.data.runPlanName;
+				this.$message.success('重新生成派班计划成功');
+			}).catch(error => {
+				this.clearData();
+				this.$messageBox(`${error.message}`);
+			});
+		},
+		handleCheck() {
+			if (this.formModel.planDate) {
+				checkScheduling(this.group).then(resp => {
+					this.$message.success('检查成功');
+				}).catch(() => {
+					this.$messageBox('检查派班计划失败');
+				});
+			} else {
+				this.$messageBox('清先选择派班计划');
+			}
+		},
+		handleSave() {
+			if (this.formModel.planDate) {
+				saveScheduling(this.group, this.tableData).then(resp => {
+					this.$message.success('保存派班计划成功');
+				}).catch(() => {
+					this.$messageBox('保存派班失败');
+				});
+			} else {
+				this.$messageBox('清先选择派班计划');
+			}
+
+		},
+		clearData() {
+			this.formModel.planDate = '';
+			this.tableData = [];
+		}
+	}
+};
+</script>
+<style scoped rel="stylesheet/scss" lang="scss">
+	.scheduling {
+		&_header {
+			background: #fff;
+			padding: 30px 30px 0;
+		}
+		&_body {
+			margin-top: 30px;
+			background: #ffff;
+			border: 1px solid #F1F1F1;
+			width: 100%;
+			overflow: auto;
+		}
+	}
+
+	/deep/ .el-dialog__body {
+		background: #fafafa;
+	}
+
+	/deep/ label {
+		font-weight: 0;
+	}
+</style>
diff --git a/src/views/display/demon/setTime.vue b/src/views/display/demon/setTime.vue
index 334a938ac..1c39f9e71 100644
--- a/src/views/display/demon/setTime.vue
+++ b/src/views/display/demon/setTime.vue
@@ -1,113 +1,114 @@
 <template>
-    <el-dialog :title="title" :visible.sync="show" width="550px" :before-close="doClose">
-        <el-form ref="form" label-width="120px" :model="formModel" :rules="rules">
-            <el-form-item label="系统时间" prop="initTime">
-                <el-time-picker v-model="formModel.initTime" :picker-options="pickerOptions" placeholder="任意时间点"
-                    @change="handleChange">
-                </el-time-picker>
-            </el-form-item>
-            <el-form-item label="加载列车数" prop="loadNum" v-if="hasNumber">
-                <el-input-number v-model="formModel.loadNum" :min="1" :max="maxNumber" label="请选择可加载列车个数">
-                </el-input-number>
-                <span> {{`（可加载的最大车辆个数：${maxNumber}）`}} </span>
-            </el-form-item>
-        </el-form>
-        <span slot="footer" class="dialog-footer">
-            <el-button @click="show = false">取 消</el-button>
-            <el-button type="primary" @click="handleSure">确 定</el-button>
-        </span>
-    </el-dialog>
+  <el-dialog :title="title" :visible.sync="show" width="550px" :before-close="doClose">
+    <el-form ref="form" label-width="120px" :model="formModel" :rules="rules">
+      <el-form-item label="系统时间" prop="initTime">
+        <el-time-picker
+          v-model="formModel.initTime"
+          :picker-options="pickerOptions"
+          placeholder="任意时间点"
+          @change="handleChange"
+        />
+      </el-form-item>
+      <el-form-item v-if="hasNumber" label="加载列车数" prop="loadNum">
+        <el-input-number v-model="formModel.loadNum" :min="1" :max="maxNumber" label="请选择可加载列车个数" />
+        <span> {{ `（可加载的最大车辆个数：${maxNumber}）` }} </span>
+      </el-form-item>
+    </el-form>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="show = false">取 消</el-button>
+      <el-button type="primary" @click="handleSure">确 定</el-button>
+    </span>
+  </el-dialog>
 </template>
 
 <script>
-    import { prefixIntrger } from '@/utils/date';
-    import { timeFormat } from '@/utils/date';
-    import { getDesignatedTimeTrainNum } from '@/api/simulation';
+import { prefixIntrger } from '@/utils/date';
+import { getDesignatedTimeTrainNum } from '@/api/simulation';
 
-    export default {
-        data() {
-            return {
-                show: false,
-                formModel: {
-                    initTime: new Date(),
-                    loadNum: 1,
-                },
-                maxNumber: 1,
-                pickerOptions: { selectableRange: '00:00:00 - 23:59:59' }
-            };
-        },
-        computed: {
-            title() {
-                return '设置仿真系统时间';
-            },
-            hasNumber() {
-                return this.$route.params.mode == 'demon' && this.$route.query.prdType == "04";
-            },
-            group() {
-                return this.$route.query.group;
-            },
-            rules() {
-                return {
-                    initTime: [
-                        { required: true, message: '请选择系统时间', trigger: 'change' },
-                        {
-                            validator(rule, value, callback) {
-                                if (this.maxNumber == 0) {
-                                    callback(new Error("请选择有效的开始时间"));
-                                } else {
-                                    callback();
-                                }
-                            },
-                            trigger: 'change',
-                            maxNumber: this.maxNumber,
-                        }
-                    ],
-                    loadNum: [
-                        { required: true, message: '请选择车辆个数', trigger: 'change' },
+export default {
+	data() {
+		return {
+			show: false,
+			formModel: {
+				initTime: new Date(),
+				loadNum: 1
+			},
+			maxNumber: 1,
+			pickerOptions: { selectableRange: '00:00:00 - 23:59:59' }
+		};
+	},
+	computed: {
+		title() {
+			return '设置仿真系统时间';
+		},
+		hasNumber() {
+			return this.$route.params.mode == 'demon' && this.$route.query.prdType == '04';
+		},
+		group() {
+			return this.$route.query.group;
+		},
+		rules() {
+			return {
+				initTime: [
+					{ required: true, message: '请选择系统时间', trigger: 'change' },
+					{
+						validator(rule, value, callback) {
+							if (this.maxNumber == 0) {
+								callback(new Error('请选择有效的开始时间'));
+							} else {
+								callback();
+							}
+						},
+						trigger: 'change',
+						maxNumber: this.maxNumber
+					}
+				],
+				loadNum: [
+					{ required: true, message: '请选择车辆个数', trigger: 'change' }
 
-                    ]
-                }
-            }
-        },
-        methods: {
-            doShow() {
-                this.formModel.initTime = new Date(this.$store.state.training.initTime || null);
-                this.handleChange(this.formModel.initTime);
-                this.show = true;
-            },
-            doClose() {
-                this.show = false;
-            },
-            handleChange(initTime) {
-                this.formModel.loadNum = 0;
-                if (this.hasNumber) {
-                    getDesignatedTimeTrainNum({ initTime: this.formatTime(initTime) }, this.group).then(resp => {
-                        this.maxNumber = parseInt(resp.data);
-                    })
-                }
-            },
-            formatTime(initTime) {
-                let hh = prefixIntrger(initTime.getHours(), 2);
-                let mm = prefixIntrger(initTime.getMinutes(), 2);
-                let ss = prefixIntrger(initTime.getSeconds(), 2);
-                return `${hh}:${mm}:${ss}`;
-            },
-            handleSure() {
-                this.$refs.form.validate((valid) => {
-                    if (valid) {
-                        let model = {
-                            initTime: this.formatTime(this.formModel.initTime)
-                        }
+				]
+			};
+		}
+	},
+	methods: {
+		doShow() {
+			this.formModel.initTime = new Date(this.$store.state.training.initTime || null);
+			this.handleChange(this.formModel.initTime);
+			this.show = true;
+		},
+		doClose() {
+			this.show = false;
+		},
+		handleChange(initTime) {
+			this.formModel.loadNum = 0;
+			if (this.hasNumber) {
+				getDesignatedTimeTrainNum({ initTime: this.formatTime(initTime) }, this.group).then(resp => {
+					this.maxNumber = parseInt(resp.data);
+				});
+			}
+		},
+		formatTime(initTime) {
+			const hh = prefixIntrger(initTime.getHours(), 2);
+			const mm = prefixIntrger(initTime.getMinutes(), 2);
+			const ss = prefixIntrger(initTime.getSeconds(), 2);
+			return `${hh}:${mm}:${ss}`;
+		},
+		handleSure() {
+			this.$refs.form.validate((valid) => {
+				if (valid) {
+					const model = {
+						initTime: this.formatTime(this.formModel.initTime)
+					};
 
-                        if (this.hasNumber) {
-                            model['loadNum'] = this.formModel.loadNum;
-                        }
+					if (this.hasNumber) {
+						model['loadNum'] = this.formModel.loadNum;
+					}
 
-                        this.$emit('ConfirmSelectBeginTime', model);
-                        this.doClose();
-                    }
-                });
-            }
-        }
-    };
-</script>
\ No newline at end of file
+					this.$emit('ConfirmSelectBeginTime', model);
+					this.doClose();
+				}
+			});
+		}
+	}
+};
+</script>
diff --git a/src/views/display/index.vue b/src/views/display/index.vue
index bb02ae19a..c6a066d24 100644
--- a/src/views/display/index.vue
+++ b/src/views/display/index.vue
@@ -19,6 +19,7 @@
         @hidepanel="hidepanel"
         @quitQuest="quitQuest"
         @showIbp="showIbp"
+        @showScheduling="showScheduling"
       />
 
       <menu-screen v-if="isScreen" ref="menuScreen" :offset="offset" :group="group" @tryTime="tryTime" />
@@ -46,12 +47,13 @@
 
     <Jl3d-Simulation v-show="simulationShow" ref="Jl3dSimulation" :panel-show="simulationShow" @showpanel="showpanel" />
     <Jl3d-Drive v-show="drivingShow" ref="Jl3dDrive" :panel-show="drivingShow" @showdriving="showdriving" />
-    <ibp-plate v-show="ibpShow" ref="ibpPlate" @hideIbp="hideIbp"/>
+    <ibp-plate v-show="ibpShow" ref="ibpPlate" @hideIbp="hideIbp" />
 
     <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 ref="scheduling" :group="group" />
   </div>
 </template>
 
@@ -71,6 +73,7 @@ import MenuPlan from '@/views/display/menuPlan';
 import MenuScript from '@/views/display/menuScript';
 import WindowResizeHandler from '@/mixin/WindowResizeHandler';
 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';
@@ -78,16 +81,14 @@ 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 { isFullscreen } from '@/utils/screen';
 import { loadMapData, loadMapDataById } from '@/utils/loaddata';
-// import { handleToken } from '@/utils/auth';
 import { EventBus } from '@/scripts/event-bus';
 import Vue from 'vue';
 
 // 三维
 import Jl3dSimulation from '@/views/jlmap3d/simulation/jl3dsimulation';
 import Jl3dDrive from '@/views/jlmap3d/drive/jl3ddrive';
-import IbpPlate from '@/views/ibp/index'
+import IbpPlate from '@/views/ibp/index';
 
 export default {
 	name: 'DisplayDraft',
@@ -108,7 +109,8 @@ export default {
 		MenuSystemTime,
 		Jl3dSimulation,
 		Jl3dDrive,
-        IbpPlate
+		IbpPlate,
+		Scheduling
 	},
 	mixins: [WindowResizeHandler],
 	props: {
@@ -135,14 +137,15 @@ export default {
 			panelShow: true,
 			simulationShow: false,
 			drivingShow: false,
-			questId: 0, // 加载任务的Id
+			questId: 0, 		// 加载任务的Id
 			group: '',
 			prdTypeMap: {
-				'01': '01', // 现地 => 现地
-				'02': '02', // 行调 => 行调
-				'04': '02' // 司机加实 => 行调
+				'01': '01', 	// 现地 => 现地
+				'02': '02', 	// 行调 => 行调
+				'04': '02', 	// 司机 => 行调
+				'05': ''		// 派班 => null
 			},
-            ibpShow: false
+			ibpShow: false
 		};
 	},
 	computed: {
@@ -558,11 +561,14 @@ export default {
 				this.$refs.Jl3dSimulation.show(this.skinCode);
 			}
 		},
-        showIbp() {
-            this.panelShow = false;
-            this.ibpShow = true;
-            this.$refs.ibpPlate.show();
-        },
+		showIbp() {
+			this.panelShow = false;
+			this.ibpShow = true;
+			this.$refs.ibpPlate.show();
+		},
+		showScheduling() {
+			this.$refs.scheduling.doShow();
+		},
 		showpanel() {
 			this.panelShow = true;
 			this.simulationShow = false;
@@ -571,10 +577,10 @@ export default {
 			this.panelShow = true;
 			this.drivingShow = false;
 		},
-        hideIbp() {
-            this.panelShow = true;
-            this.ibpShow = false;
-        },
+		hideIbp() {
+			this.panelShow = true;
+			this.ibpShow = false;
+		},
 		runPlanViewShow() {
 			this.$refs.runPlanView.doShow();
 		},
diff --git a/src/views/display/menuDemon.vue b/src/views/display/menuDemon.vue
index 5c1e3d1d6..acba7ee8f 100644
--- a/src/views/display/menuDemon.vue
+++ b/src/views/display/menuDemon.vue
@@ -7,9 +7,10 @@
     </div>
     <div class="display-draft">
       <el-button-group>
-        <!--<el-button @click="jumpIbp">IBP盘</el-button>-->
+        <el-button v-if="isShowIbp" type="success" @click="jumpIbp">IBP盘</el-button>
+        <el-button v-if="isShowScheduling" type="primary" @click="jumpScheduling">排班计划</el-button>
         <el-button type="jumpjlmap3d" @click="jumpjlmap3d">{{ jl3dname }}</el-button>
-        <template v-if="questId">
+        <template v-if="isShowQuest">
           <el-button type="danger" @click="handleQuitQuest">退出剧本</el-button>
         </template>
         <template v-else>
@@ -25,7 +26,6 @@
 
 <!-- 单人仿真 -->
 <script>
-// import ChartView from './demon/chartView';
 import SetTime from './demon/setTime';
 import { Notification } from 'element-ui';
 import { getGoodsTryUse } from '@/api/management/goods';
@@ -40,7 +40,6 @@ import { EventBus } from '@/scripts/event-bus';
 export default {
 	name: 'MenuDemon',
 	components: {
-		// ChartView,
 		SetTime
 	},
 	props: {
@@ -62,10 +61,10 @@ export default {
 	data() {
 		return {
 			isDisable: false,
-			tryTime: 0, // 进入页面多少秒
-			timeNow: 0, // 进入页面 相对时间
-			time: null, // 定时器
-			countTime: 0, // 显示 倒计时
+			tryTime: 0, 				// 进入页面多少秒
+			timeNow: 0, 				// 进入页面 相对时间
+			time: null, 				// 定时器
+			countTime: 0, 				// 显示 倒计时
 			remainingTime: 0,
 			goodsId: this.$route.query.goodsId,
 			try: this.$route.query.try, // 是否是试用权限
@@ -77,6 +76,17 @@ export default {
 			jl3dname: '三维视图'
 		};
 	},
+	computed: {
+		isShowIbp() {
+			return this.$route.query.prdType == '06';
+		},
+		isShowQuest() {
+			return this.questId;
+		},
+		isShowScheduling() {
+			return this.$route.query.prdType == '05';
+		}
+	},
 	watch: {
 		'$store.state.training.subscribeCount': function () {
 			this.group && this.initLoadPage();
@@ -120,8 +130,8 @@ export default {
 		loadInitData() {
 			const data = {
 				mapId: this.$route.query.mapId,
-				mapProductCode: this.$route.query.code,
-				productType: PermissionType.SIMULATION
+				prdCode: this.$route.query.code,
+				permissionType: PermissionType.SIMULATION
 			};
 			getGoodsTryUse(data).then(res => {
 				this.remainingTime = res.data.tryTime;
@@ -186,9 +196,12 @@ export default {
 		jumpjlmap3d() {
 			this.$emit('hidepanel');
 		},
-        jumpIbp() {
-            this.$emit('showIbp')
-        },
+		jumpIbp() {
+			this.$emit('showIbp');
+		},
+		jumpScheduling() {
+			this.$emit('showScheduling');
+		},
 		setTryTime() {
 			if (this.try) {
 				this.$emit('tryTime', { time: this.tryTime, goodsId: this.goodsId });
diff --git a/src/views/display/menuExam.vue b/src/views/display/menuExam.vue
index 448dc57c2..80a78ac0f 100644
--- a/src/views/display/menuExam.vue
+++ b/src/views/display/menuExam.vue
@@ -2,7 +2,7 @@
   <div>
     <div class="display-card" :style="{top: offset + 'px'}">
       <el-row style="vertical-align:middle; ">
-        <span class="display-time">{{ formatTrainingUsedTime }}</span>
+        <span class="display-time">{{ formatUsedTime }}</span>
       </el-row>
     </div>
     <div class="display-draft">
@@ -56,10 +56,15 @@ export default {
 		...mapGetters('map', [
 			'mapDeviceStatus'
 		]),
-		formatTrainingUsedTime() {
+		formatUsedTime() {
 			return timeFormat(this.$store.state.training.usedTime);
 		}
 	},
+	watch: {
+		'$store.state.map.mapViewLoadedCount': function() {
+			this.$store.dispatch('exam/countUsedTime');
+		}
+	},
 	methods: {
 		tipInfo(opt) {
 			if (opt && opt.hasOwnProperty('color') && opt.hasOwnProperty('message')) {
@@ -131,7 +136,6 @@ export default {
 			});
 		},
 		init() {
-			this.$store.dispatch('exam/countUsedTime');
 			launchFullscreen();
 			// 刷新考试列表
 			refreshExamList(this.$route.query.userExamId).then(response => {
diff --git a/src/views/display/menuSchema.vue b/src/views/display/menuSchema.vue
index 0e92443ab..5739614f3 100644
--- a/src/views/display/menuSchema.vue
+++ b/src/views/display/menuSchema.vue
@@ -5,16 +5,9 @@
     </el-select>
 
     <el-button-group>
-      <el-button v-if="isDemon" size="small" :disabled="viewDisabled" type="success" @click="viewRunQuest">加载剧本
-      </el-button>
+      <el-button v-if="isDemon" size="small" :disabled="viewDisabled" type="success" @click="viewRunQuest">加载剧本</el-button>
       <el-button v-if="notScript && runing" size="small" :disabled="viewDisabled" @click="viewRunPlan">运行图预览</el-button>
-      <el-button
-        v-if="!runing && !isPlan && notScript"
-        size="small"
-        :disabled="viewDisabled"
-        type="warning"
-        @click="loadRunPlan"
-      >运行图加载</el-button>
+      <el-button v-if="!runing && !isPlan && notScript" size="small" :disabled="viewDisabled" type="warning" @click="loadRunPlan">运行图加载</el-button>
       <el-button v-if="mode==OperateMode.FAULT" size="small" type="danger" @click="setFault">故障设置</el-button>
     </el-button-group>
 
diff --git a/src/views/display/menuScreen.vue b/src/views/display/menuScreen.vue
index c25c7edf5..31eb033a6 100644
--- a/src/views/display/menuScreen.vue
+++ b/src/views/display/menuScreen.vue
@@ -60,7 +60,7 @@ export default {
 			try {
 				if (this.try != '0') {
 					const data = {
-						productType: PermissionType.SCREEN
+						permissionType: PermissionType.SCREEN
 					};
 
 					const resr = await getGoodsTryUse(data);
diff --git a/src/views/display/menuScript.vue b/src/views/display/menuScript.vue
index 9561c9420..c01ab2e17 100644
--- a/src/views/display/menuScript.vue
+++ b/src/views/display/menuScript.vue
@@ -21,7 +21,6 @@
 import SetTime from './demon/setTime';
 // import { mapGetters } from 'vuex';
 import { Notification } from 'element-ui';
-// import { getGoodsTryUse } from '@/api/management/goods';
 import { runDiagramStart, runDiagramOver, runDiagramGetTime } from '@/api/simulation';
 // import { OperateMode, PermissionType } from '@/scripts/ConstDic';
 import { exitFullscreen } from '@/utils/screen';
@@ -34,7 +33,7 @@ import { EventBus } from '@/scripts/event-bus';
 export default {
 	name: 'MenuTask',
 	components: {
-		SetTime,
+		SetTime
 	},
 	props: {
 		group: {
diff --git a/src/views/display/tipExamList.vue b/src/views/display/tipExamList.vue
index c6fbe9f82..11f8a45e5 100644
--- a/src/views/display/tipExamList.vue
+++ b/src/views/display/tipExamList.vue
@@ -6,7 +6,7 @@
         <i v-show="!isShrink" class="icon el-icon-plus" @click="shrink" />
         <p v-if="!isShrink" style="color: #fff;">
           <span class="time-label">考试计时：</span>
-          <span class="time-elem">{{ formatExamUsedTime }}</span>
+          <span class="time-elem">{{ formatRemainTime }}</span>
         </p>
         <p v-if="isShrink" style="color: #fff;">
           <span>{{ examName }}</span>
@@ -62,7 +62,7 @@
           </div>
           <p style="color: #000; float: left;">
             <span class="time-label">考试计时：</span>
-            <span class="time-elem">{{ formatExamUsedTime }}</span>
+            <span class="time-elem">{{ formatRemainTime }}</span>
           </p>
         </div>
         <div class="drag-right" />
@@ -110,8 +110,16 @@ export default {
 		...mapGetters('trainingList', [
 			'trainingList'
 		]),
-		formatExamUsedTime() {
-			return timeFormat(this.$store.state.exam.usedTime);
+		remainTime() {
+			return this.$store.state.exam.totalTime - this.$store.state.exam.usedTime;
+		},
+		formatRemainTime() {
+			if (this.remainTime < 0) {
+				this.$message.success('考试结束自动提交');
+				this.submit();
+			}
+
+			return timeFormat(this.remainTime);
 		},
 		isFirst() {
 			return this.examIndex == 0;
@@ -119,7 +127,6 @@ export default {
 		isLast() {
 			return this.examIndex == this.trainingList.length - 1;
 		}
-
 	},
 	mounted() {
 		this.loadInitData();
@@ -162,7 +169,6 @@ export default {
 		},
 		// 获取试题列表
 		loadInitData() {
-			this.$store.dispatch('exam/countUsedTime');
 			// 刷新考试列表
 			refreshExamList(this.$route.query.userExamId).then(response => {
 				this.examName = response.data.examName;
diff --git a/src/views/exam/detail/courseDetail.vue b/src/views/exam/detail/courseDetail.vue
index e94cf9daa..0b40e9a29 100644
--- a/src/views/exam/detail/courseDetail.vue
+++ b/src/views/exam/detail/courseDetail.vue
@@ -109,7 +109,7 @@ export default {
 						price: res.data.price,
 						remarks: res.data.remarks,
 						detail: res.data.examDefinitionVOList || [],
-						pmsList: res.data.permissionVOList,
+						pmsList: res.data.permissionVOList || [],
 						prdCode: res.data.prdCode,
 						mapId: res.data.mapId,
 						PermissionType: PermissionType.EXAM
@@ -131,14 +131,14 @@ export default {
 				query: { lessonId: this.courseModel.id }
 			});
 		},
-		transfer() {
+		transfer() { // 转增
 			this.loading = false;
 			if (this.$refs) {
 				this.activeName = 'second';
 				this.$refs.limitList.transfer(this.courseModel);
 			}
 		},
-		distribute() {
+		distribute() { // 分发
 			this.loading = false;
 			if (this.$refs) {
 				this.activeName = 'second';
diff --git a/src/views/exam/detail/examDetail.vue b/src/views/exam/detail/examDetail.vue
index ea672f698..3adaa8bdd 100644
--- a/src/views/exam/detail/examDetail.vue
+++ b/src/views/exam/detail/examDetail.vue
@@ -175,7 +175,6 @@ export default {
 				const response = await generateExamList(data.id);
 				this.userExam = response.data;
 				const list = response.data.userExamQuestionsVOs;
-				await this.$store.dispatch('exam/start');
 				await this.$store.dispatch('exam/setUsedTime', this.userExam.usedTime);
 				await this.$store.dispatch('exam/setTotalTime', this.userExam.duration);
 				await this.$store.dispatch('trainingList/setTrainingList', list);
diff --git a/src/views/exam/index.vue b/src/views/exam/index.vue
index 699930bb2..e741dbfb7 100644
--- a/src/views/exam/index.vue
+++ b/src/views/exam/index.vue
@@ -2,8 +2,7 @@
   <div class="app-wrapper">
     <el-scrollbar wrap-class="scrollbar-wrapper">
       <div v-show="listShow" class="examList" :style="{width: widthLeft+'px'}">
-        <exam-list v-show="detailShow" ref="examlList" :height="height" />
-        <exam-question-list v-show="displayShow" ref="questionList" :height="height" />
+        <exam-list ref="examlList" :height="height" />
       </div>
       <drap-left :width-left="widthLeft" @drapWidth="drapWidth" />
       <transition>
@@ -16,7 +15,6 @@
 <script>
 import { mapGetters } from 'vuex';
 import ExamList from './list/examList';
-import ExamQuestionList from './list/questionList';
 import WindowResizeHandler from '@/mixin/WindowResizeHandler';
 import drapLeft from '@/views/components/drapLeft/index';
 import localStore from 'storejs';
@@ -25,7 +23,6 @@ export default {
 	name: 'Exam',
 	components: {
 		ExamList,
-		ExamQuestionList,
 		drapLeft
 	},
 	mixins: [WindowResizeHandler],
@@ -33,8 +30,6 @@ export default {
 		return {
 			height: 0,
 			listShow: true,
-			detailShow: true,
-			displayShow: false,
 			widthLeft: 450
 		};
 	},
@@ -47,31 +42,15 @@ export default {
 		'lessonbar.opened': function (val) {
 			this.listShow = val;
 			this.resizeHandler();
-		},
-		$route(to, from) {
-			this.loadInitData(to.path);
 		}
 	},
 	mounted() {
-		this.loadInitData(this.$route.path);
 		this.widthLeft = Number(localStore.get('LeftWidth'));
 	},
 	methods: {
 		resizeHandler() {
 			this.height = this._clientHeight - 50;
 		},
-		loadInitData(path) {
-			if (path.indexOf('questionDetail') >= 0) {
-				this.detailShow = false;
-				this.displayShow = true;
-			} else if (path.indexOf('result') >= 0) {
-				this.detailShow = false;
-				this.displayShow = false;
-			} else {
-				this.detailShow = true;
-				this.displayShow = false;
-			}
-		},
 		refresh() {
 			this.$refs && this.$refs.examlList && this.$refs.examlList.refresh();
 		},
diff --git a/src/views/exam/list/questionList.vue b/src/views/exam/list/questionList.vue
deleted file mode 100644
index 5fe000b98..000000000
--- a/src/views/exam/list/questionList.vue
+++ /dev/null
@@ -1,131 +0,0 @@
-<template>
-  <el-card class="map-list-main">
-    <div slot="header" class="clearfix">
-      <span>考题列表</span>
-      <el-button size="small" type="primary" style="float: right; padding: 3px 5px" @click="overExam">考试提交
-      </el-button>
-    </div>
-    <el-scrollbar wrap-class="scrollbar-wrapper" :style="{ height: (height-60) +'px'}">
-      <el-tree
-        ref="treeQuestion"
-        :data="trainingList"
-        node-key="id"
-        :props="defaultProps"
-        highlight-current
-        @node-click="selectedTraining"
-      >
-        <span slot-scope="{ node, data }">
-          <span :style="{color: data.usedTime !== undefined ? 'green':''}" class="el-icon-edit-outline">&nbsp;{{ trainingList.indexOf(data)+1 }}.{{
-            data.trainingName }}
-          </span>
-        </span>
-      </el-tree>
-    </el-scrollbar>
-  </el-card>
-</template>
-<script>
-import { mapGetters } from 'vuex';
-import { refreshExamList } from '@/api/management/userexam';
-
-export default {
-	name: 'ExamDispalyList',
-	props: {
-		height: {
-			type: Number,
-			required: true
-		}
-	},
-	data() {
-		return {
-			filterText: '',
-			defaultProps: {
-				children: 'children',
-				label: 'name'
-			}
-		};
-	},
-	computed: {
-		...mapGetters('trainingList', [
-			'trainingList'
-		])
-	},
-	watch: {
-		'$store.state.exam.totalTime': function (val) {
-			if (this.$store.state.exam.totalTime && this.$store.state.exam.usedTime > this.$store.state.exam.totalTime) {
-				this.$message.success('考试结束，自动提交！');
-				this.submit();
-			}
-		}
-	},
-	mounted() {
-		this.startExam();
-	},
-	methods: {
-		selectedTraining(obj) {
-			if (obj) {
-				const query = { userExamId: this.$route.query.userExamId, trainingId: obj.trainingId };
-				this.$router.replace({
-					path: `/exam/questionDetail/${obj.id}`,
-					query: query
-				});
-			}
-		},
-		startExam() {
-			this.$store.dispatch('exam/start').then(() => {
-				this.refresh();
-			});
-		},
-		overExam() {
-			this.$store.dispatch('exam/isOver').then(isOver => {
-				if (isOver) {
-					this.submit();
-				} else {
-					this.$confirm('考试未完成，是否确认退出?', '提示', {
-						cancelButtonText: '取消',
-						confirmButtonText: '确定',
-						type: 'warning',
-						center: true
-					}).then(() => {
-						this.submit();
-					}).catch(() => {
-					});
-				}
-			});
-		},
-		submit() {
-			this.$store.dispatch('exam/over').then(() => {
-				this.$store.dispatch('trainingList/clearTrainingList');
-				this.$router.replace({ path: `/exam/result/${this.$route.query.userExamId}` });
-			});
-		},
-		refresh() {
-			if (this.$route.query.userExamId) {
-				refreshExamList(this.$route.query.userExamId).then(response => {
-					this.$store.dispatch('exam/setUsedTime', response.data.usedTime);
-					this.$store.dispatch('exam/setTotalTime', response.data.duration);
-					this.$store.dispatch('trainingList/setTrainingList', response.data.userExamQuestionsVOs).then(response => { });
-					this.$nextTick(() => {
-						this.$refs.treeQuestion.setCurrentKey(this.$route.params.examQuestionId); // value 绑定的node-key
-					});
-				}).catch(error => {
-					// 如果时50009则表示考试已完成，不能再次进行y
-					if (error.code === 500009) {
-						this.$router.replace({ path: `/exam/result/${this.$route.params.userExamId}` });
-					} else {
-						this.$messageBox('刷新列表失败');
-					}
-				});
-			}
-		}
-	}
-};
-</script>
-<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/ibp/ibpDraft/ibpEdit/ibpOperate/ibpAlarm.vue b/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpAlarm.vue
index 7e3969fe2..e7b8d2528 100644
--- a/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpAlarm.vue
+++ b/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpAlarm.vue
@@ -1,15 +1,24 @@
 <template>
     <div>
-        <el-form ref="form" :model="form" label-width="80px">
-            <el-form-item label="报警器宽度">
+        <el-form ref="form" :rules="rules" :model="form" label-width="100px">
+            <el-form-item label="报警器编号" prop="code">
+                <el-input :disabled="true" v-model="form.code">
+                    <el-button slot="append" :disabled="isUpdate" type="primary" @click="generateCode">生成编号</el-button>
+                </el-input>
+            </el-form-item>
+            <el-form-item label="报警器宽度" prop="alarmWidth">
                 <el-input-number v-model="form.alarmWidth" controls-position="right" :min="1"></el-input-number>
             </el-form-item>
-            <el-form-item label="报警器长度">
-                <el-input-number v-model="form.alarmHeight" controls-position="right" :min="1"></el-input-number>
+            <el-form-item label="X轴坐标">
+                <el-input-number v-model="form.x" controls-position="right" :min="1"></el-input-number>
+            </el-form-item>
+            <el-form-item label="Y轴坐标">
+                <el-input-number v-model="form.y" controls-position="right" :min="1"></el-input-number>
             </el-form-item>
             <el-form-item>
-                <el-button type="primary" @click="onSubmit">立即创建</el-button>
-                <el-button>取消</el-button>
+                <el-button type="primary" @click="onSubmit('form')">{{ buttonText }}</el-button>
+                <el-button v-show="showDeleteButton" @click="deleteDevice" type="danger">删除</el-button>
+                <el-button v-show="showDeleteButton" @click="initPage">取消</el-button>
             </el-form-item>
         </el-form>
     </div>
@@ -22,16 +31,21 @@
         },
         data() {
             return {
+                isUpdate: false,
+                buttonText: '立即创建',
+                showDeleteButton: false,
                 form: {
+                    code: '',
                     alarmWidth: '',
-                    alarmHeight: ''
+                    x: 10,
+                    y: 10
                 },
                 rules: {
+                    code: [
+                        { required: true, message: '请输入报警器编号', trigger: 'blur' },
+                    ],
                     alarmWidth: [
                         { required: true, message: '请输入报警器宽度', trigger: 'blur' },
-                    ],
-                    alarmHeight: [
-                        { required: true, message: '请输入报警器高度', trigger: 'blur' },
                     ]
                 }
             };
@@ -40,22 +54,72 @@
 
         },
         watch: {
-
+            '$store.state.ibp.rightClickCount': function (val) {
+                const model = this.$store.getters['ibp/updateDeviceData'];
+                if (model._type === 'Alarm' ){
+                    this.buttonText = '修改';
+                    this.showDeleteButton = true;
+                    this.isUpdate = true;
+                    this.form.code = model.code;
+                    this.form.alarmWidth = model.width;
+                    this.form.x = model.point.x;
+                    this.form.y = model.point.y;
+                }
+            }
         },
         mounted() {
         },
         methods: {
-            onSubmit() {
+            onSubmit(form) {
+                this.$refs[form].validate((valid) => {
+                   if (valid){
+                       const alarmModel = {
+                           zlevel: 2,
+                           z: 1,
+                           point:{
+                               x: this.form.x,
+                               y: this.form.y
+                           },
+                           code: this.form.code,
+                           _type: 'Alarm',
+                           width: this.form .alarmWidth,
+                       };
+                       this.$emit('createAlarm', alarmModel);
+                       this.initPage();
+                   } else {
+                       return false;
+                   }
+                });
+            },
+            deleteDevice() {
                 const alarmModel = {
-                    zlevel: 1,
+                    zlevel: 2,
                     z: 1,
-                    x: 10,
-                    y: 10,
-                    _type: 'SquareButton',
+                    point:{
+                        x: this.form.x,
+                        y: this.form.y
+                    },
+                    code: this.form.code,
+                    _type: 'Alarm',
                     width: this.form .alarmWidth,
-                    height: this.form.alarmHeight
                 };
-                this.$emit('createButton', alarmModel)
+                this.$emit('deleteDataModel',alarmModel );
+                this.initPage();
+            },
+            initPage() {
+                this.isUpdate = false;
+                this.buttonText = '立即创建';
+                this.showDeleteButton = false;
+                this.form = {
+                    code: '',
+                    alarmWidth: '',
+                    x: 10,
+                    y: 10
+                };
+            },
+            generateCode() {
+                const mydate = new Date();
+                this.form.code =  "alarm_"+mydate.getDay()+ mydate.getHours()+ mydate.getMinutes()+mydate.getSeconds()+mydate.getMilliseconds()+ Math.round(Math.random() * 10000);
             }
         }
     };
diff --git a/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpAppendageBox.vue b/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpAppendageBox.vue
index 5958b3a06..9e4cad574 100644
--- a/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpAppendageBox.vue
+++ b/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpAppendageBox.vue
@@ -1,15 +1,27 @@
 <template>
     <div>
-        <el-form ref="form" :model="form" label-width="80px">
-            <el-form-item label="扶梯框宽度">
+        <el-form ref="form" :rules="rules" :model="form" label-width="100px">
+            <el-form-item label="扶梯框编号" prop="code">
+                <el-input :disabled="true" v-model="form.code" >
+                    <el-button slot="append" :disabled="isUpdate" type="primary" @click="generateCode">生成编号</el-button>
+                </el-input>
+            </el-form-item>
+            <el-form-item label="扶梯框宽度" prop="appendageBoxWidth">
                 <el-input-number v-model="form.appendageBoxWidth" controls-position="right" :min="1"></el-input-number>
             </el-form-item>
-            <el-form-item label="扶梯框高度">
+            <el-form-item label="扶梯框高度" prop="appendageBoxHeight">
                 <el-input-number v-model="form.appendageBoxHeight" controls-position="right" :min="1"></el-input-number>
             </el-form-item>
+            <el-form-item label="X轴坐标">
+                <el-input-number v-model="form.x" controls-position="right" :min="1"></el-input-number>
+            </el-form-item>
+            <el-form-item label="Y轴坐标">
+                <el-input-number v-model="form.y" controls-position="right" :min="1"></el-input-number>
+            </el-form-item>
             <el-form-item>
-                <el-button type="primary" @click="onSubmit">立即创建</el-button>
-                <el-button>取消</el-button>
+                <el-button type="primary" @click="onSubmit('form')">{{ buttonText }}</el-button>
+                <el-button v-show="showDeleteButton" @click="deleteDevice" type="danger">删除</el-button>
+                <el-button v-show="showDeleteButton" @click="initPage">取消</el-button>
             </el-form-item>
         </el-form>
     </div>
@@ -22,11 +34,20 @@
         },
         data() {
             return {
+                isUpdate: false,
+                buttonText: '立即创建',
+                showDeleteButton: false,
                 form: {
+                    code: '',
                     appendageBoxWidth: '',
-                    appendageBoxHeight: ''
+                    appendageBoxHeight: '',
+                    x: 10,
+                    y: 10
                 },
                 rules: {
+                    code: [
+                        { required: true, message: '请输入扶梯框编号', trigger: 'blur' },
+                    ],
                     appendageBoxWidth: [
                         { required: true, message: '请输入扶梯框宽度', trigger: 'blur' },
                     ],
@@ -40,22 +61,76 @@
 
         },
         watch: {
-
+            '$store.state.ibp.rightClickCount': function (val) {
+                const model = this.$store.getters['ibp/updateDeviceData'];
+                if (model._type === 'AppendageBox' ){
+                    this.buttonText = '修改';
+                    this.showDeleteButton = true;
+                    this.isUpdate = true;
+                    this.form.code = model.code;
+                    this.form.appendageBoxWidth = model.width;
+                    this.form.appendageBoxHeight = model.height;
+                    this.form.x = model.point.x;
+                    this.form.y = model.point.y;
+                }
+            }
         },
         mounted() {
         },
         methods: {
-            onSubmit() {
+            onSubmit(form) {
+                this.$refs[form].validate((valid) => {
+                    if (valid){
+                        const appendageBoxModel = {
+                            zlevel: 2,
+                            z: 1,
+                            point: {
+                                x: this.form.x,
+                                y: this.form.y
+                            },
+                            _type: 'AppendageBox',
+                            code: this.form.code,
+                            width: this.form .appendageBoxWidth,
+                            height: this.form.appendageBoxHeight
+                        };
+                        this.$emit('createAppendageBox', appendageBoxModel);
+                        this.initPage();
+                    } else {
+                        return false;
+                    }
+                });
+            },
+            deleteDevice() {
                 const appendageBoxModel = {
-                    zlevel: 1,
+                    zlevel: 2,
                     z: 1,
-                    x: 10,
-                    y: 10,
+                    point: {
+                        x: this.form.x,
+                        y: this.form.y
+                    },
                     _type: 'AppendageBox',
+                    code: this.form.code,
                     width: this.form .appendageBoxWidth,
                     height: this.form.appendageBoxHeight
                 };
-                this.$emit('createAppendageBox', appendageBoxModel)
+                this.$emit('deleteDataModel',appendageBoxModel );
+                this.initPage();
+            },
+            initPage() {
+                this.isUpdate = false;
+                this.buttonText = '立即创建';
+                this.showDeleteButton = false;
+                this.form = {
+                    code: '',
+                    appendageBoxWidth: '',
+                    appendageBoxHeight: '',
+                    x: 10,
+                    y: 10
+                };
+            },
+            generateCode() {
+                const mydate = new Date();
+                this.form.code =  "aBox"+mydate.getDay()+ mydate.getHours()+ mydate.getMinutes()+mydate.getSeconds()+mydate.getMilliseconds()+ Math.round(Math.random() * 10000);
             }
         }
     };
diff --git a/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpArrow.vue b/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpArrow.vue
index c2944394d..75e2910c2 100644
--- a/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpArrow.vue
+++ b/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpArrow.vue
@@ -1,23 +1,32 @@
 <template>
     <div>
-        <el-form ref="form" :model="form" label-width="80px">
-            <el-form-item label="箭头方向">
-                <el-select v-model="form.arrowDirection" placeholder="请选择箭头方向">
-                    <el-option label="向上" value="redButton"></el-option>
-                    <el-option label="向下" value="yellowButton"></el-option>
-                    <el-option label="向左" value="greenButton"></el-option>
-                    <el-option label="向右" value="greenButton"></el-option>
+        <el-form ref="form" :rules="rules" :model="form" label-width="80px">
+            <el-form-item label="箭头编号" prop="code">
+                <el-input :disabled="true" v-model="form.code" >
+                    <el-button slot="append" :disabled="isUpdate" type="primary" @click="generateCode">生成编号</el-button>
+                </el-input>
+            </el-form-item>
+            <el-form-item label="箭头方向" prop="orientation">
+                <el-select v-model="form.orientation" placeholder="请选择箭头方向">
+                    <el-option label="向上" value="top"></el-option>
+                    <el-option label="向下" value="bottom"></el-option>
+                    <el-option label="向左" value="left"></el-option>
+                    <el-option label="向右" value="right"></el-option>
                 </el-select>
             </el-form-item>
-            <el-form-item label="箭头长度">
+            <el-form-item label="箭头长度" prop="arrowLength">
+                <el-input-number v-model="form.arrowLength" controls-position="right" :min="1"></el-input-number>
+            </el-form-item>
+            <el-form-item label="箭头宽度" prop="arrowLength">
                 <el-input-number v-model="form.arrowWidth" controls-position="right" :min="1"></el-input-number>
             </el-form-item>
-            <el-form-item label="箭头宽度">
-                <el-input-number v-model="form.arrowHeight" controls-position="right" :min="1"></el-input-number>
+            <el-form-item label="箭头颜色" prop="fillColor">
+                <el-input v-model="form.fillColor"></el-input>
             </el-form-item>
             <el-form-item>
-                <el-button type="primary" @click="onSubmit">立即创建</el-button>
-                <el-button>取消</el-button>
+                <el-button type="primary" @click="onSubmit('form')">{{ buttonText }}</el-button>
+                <el-button v-show="showDeleteButton" @click="deleteDevice" type="danger">删除</el-button>
+                <el-button v-show="showDeleteButton" @click="initPage">取消</el-button>
             </el-form-item>
         </el-form>
     </div>
@@ -25,26 +34,41 @@
 
 <script>
     export default {
-        name: 'ButtonDraft',
+        name: 'ArrowDraft',
         components: {
         },
         data() {
             return {
+                isUpdate: false,
+                buttonText: '立即创建',
+                showDeleteButton: false,
+                point: {
+                    x: 10,
+                    y: 10
+                },
                 form: {
-                    arrowDirection: '',
+                    code: '',
+                    orientation: '',
                     arrowWidth: '',
-                    arrowHeight: ''
+                    arrowLength: '',
+                    fillColor: ''
                 },
                 rules: {
-                    arrowDirection: [
+                    code: [
+                        { required: true, message: '请输入箭头编号', trigger: 'blur' },
+                    ],
+                    orientation: [
                         { required: true, message: '请选择箭头方向', trigger: 'change'}
                     ],
-                    arrowWidth: [
+                    arrowLength: [
                         { required: true, message: '请输入箭头长度', trigger: 'blur' },
                     ],
-                    arrowHeight: [
+                    arrowWidth: [
                         { required: true, message: '请输入箭头线宽', trigger: 'blur' },
-                    ]
+                    ],
+                    fillColor: [
+                        { required: true, message: '请输入箭头颜色', trigger: 'blur' },
+                    ],
                 }
             };
         },
@@ -52,23 +76,80 @@
 
         },
         watch: {
-
+            '$store.state.ibp.rightClickCount': function (val) {
+                const model = this.$store.getters['ibp/updateDeviceData'];
+                if (model._type === 'Arrow' ){
+                    this.buttonText = '修改';
+                    this.showDeleteButton = true;
+                    this.isUpdate = true;
+                    this.form.code = model.code;
+                    this.form.orientation = model.orientation;
+                    this.form.arrowLength = model.length;
+                    this.form.arrowWidth = model.width;
+                    this.form.fillColor = model.fill;
+                    this.point = model.point;
+                }
+            }
         },
         mounted() {
         },
         methods: {
-            onSubmit() {
+            onSubmit(form) {
+                this.$refs[form].validate((valid) => {
+                    if (valid){
+                        const arrowModel = {
+                            zlevel: 2,
+                            z: 1,
+                            point: this.point,
+                            _type: 'Arrow',
+                            code: this.form.code,
+                            orientation: this.form.orientation,
+                            fill: this.form.fillColor,
+                            width: this.form .arrowWidth,
+                            length: this.form.arrowLength,
+                        };
+                        this.$emit('createArrow', arrowModel);
+                        this.initPage();
+                    }else {
+                        return false;
+                    }
+                });
+
+            },
+            deleteDevice() {
                 const arrowModel = {
-                    zlevel: 1,
+                    zlevel: 2,
                     z: 1,
-                    x: 10,
-                    y: 10,
+                    point: this.point,
                     _type: 'Arrow',
-                    colorType: this.form.buttonColor,
+                    code: this.form.code,
+                    orientation: this.form.orientation,
+                    fill: this.form.fillColor,
                     width: this.form .arrowWidth,
-                    height: this.form.arrowHeight
+                    length: this.form.arrowLength,
                 };
-                this.$emit('createButton', arrowModel)
+                this.$emit('deleteDataModel',arrowModel);
+                this.initPage();
+            },
+            initPage() {
+                this.isUpdate = false;
+                this.buttonText = '立即创建';
+                this.showDeleteButton = false;
+                this.form = {
+                    code: '',
+                    orientation: '',
+                    arrowWidth: '',
+                    arrowLength: '',
+                    fillColor: ''
+                };
+                this.point = {
+                    x: 10,
+                    y: 10
+                };
+            },
+            generateCode() {
+                const mydate = new Date();
+                this.form.code =  "arrow_"+mydate.getDay()+ mydate.getHours()+ mydate.getMinutes()+mydate.getSeconds()+mydate.getMilliseconds()+ Math.round(Math.random() * 10000);
             }
         }
     };
diff --git a/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpBg.vue b/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpBg.vue
index b8df1cb20..bab79fabf 100644
--- a/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpBg.vue
+++ b/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpBg.vue
@@ -1,6 +1,6 @@
 <template>
     <div>
-        <el-form ref="form" :model="form" label-width="80px">
+        <el-form ref="form" :rules="rules" :model="form" label-width="120px">
             <el-form-item label="背景板宽度">
                 <el-input-number v-model="form.bgWidth" controls-position="right" :min="1" ></el-input-number>
             </el-form-item>
@@ -57,6 +57,8 @@
                     height: this.form.bgHeight
                 };
                 this.$emit('createBg', bgModel)
+            },
+            initPage(){
             }
         }
     };
diff --git a/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpButton.vue b/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpButton.vue
index c8c38b73a..4edf35332 100644
--- a/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpButton.vue
+++ b/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpButton.vue
@@ -1,22 +1,33 @@
 <template>
     <div>
-        <el-form ref="form" :model="form" label-width="80px">
-            <el-form-item label="按钮颜色">
+        <el-form ref="form" :rules="rules" :model="form" label-width="80px">
+            <el-form-item label="按钮编号" prop="code">
+                <el-input :disabled="true" v-model="form.code" >
+                    <el-button slot="append" :disabled="isUpdate" type="primary" @click="generateCode">生成编号</el-button>
+                </el-input>
+            </el-form-item>
+            <el-form-item label="按钮颜色" prop="buttonColor">
                 <el-select v-model="form.buttonColor" placeholder="请选择按钮颜色">
-                    <el-option label="红色按钮" value="redButton"></el-option>
-                    <el-option label="黄色按钮" value="yellowButton"></el-option>
-                    <el-option label="绿色按钮" value="greenButton"></el-option>
+                    <el-option label="红色按钮" value="red"></el-option>
+                    <el-option label="黄色按钮" value="yellow"></el-option>
+                    <el-option label="绿色按钮" value="green"></el-option>
+                    <el-option label="蓝色按钮" value="blue"></el-option>
+                    <el-option label="灰色按钮" value="gray"></el-option>
                 </el-select>
             </el-form-item>
-            <el-form-item label="按钮宽度">
+            <el-form-item label="按钮宽度" prop="buttonWidth">
                 <el-input-number v-model="form.buttonWidth" controls-position="right" :min="1"></el-input-number>
             </el-form-item>
-            <el-form-item label="按钮高度">
-                <el-input-number v-model="form.buttonHeight" controls-position="right" :min="1"></el-input-number>
+            <el-form-item label="X轴坐标">
+                <el-input-number v-model="form.x" controls-position="right" :min="1"></el-input-number>
+            </el-form-item>
+            <el-form-item label="Y轴坐标">
+                <el-input-number v-model="form.y" controls-position="right" :min="1"></el-input-number>
             </el-form-item>
             <el-form-item>
-                <el-button type="primary" @click="onSubmit">立即创建</el-button>
-                <el-button>取消</el-button>
+                <el-button type="primary" @click="onSubmit('form')">{{ buttonText }}</el-button>
+                <el-button v-show="showDeleteButton" @click="deleteDevice" type="danger">删除</el-button>
+                <el-button v-show="showDeleteButton" @click="initPage">取消</el-button>
             </el-form-item>
         </el-form>
     </div>
@@ -29,20 +40,25 @@
         },
         data() {
             return {
+                isUpdate: false,
+                buttonText: '立即创建',
+                showDeleteButton: false,
                 form: {
+                    code: '',
                     buttonColor: '',
                     buttonWidth: '',
-                    buttonHeight: ''
+                    x: 10,
+                    y: 10
                 },
                 rules: {
+                    code: [
+                        { required: true, message: '请输入按钮编号', trigger: 'blur' },
+                    ],
                     buttonColor: [
                         { required: true, message: '请选择按钮颜色', trigger: 'change'}
                     ],
                     buttonWidth: [
                         { required: true, message: '请输入按钮宽度', trigger: 'blur' },
-                    ],
-                    buttonHeight: [
-                        { required: true, message: '请输入按钮高度', trigger: 'blur' },
                     ]
                 }
             };
@@ -51,32 +67,82 @@
 
         },
         watch: {
-
+            '$store.state.ibp.rightClickCount': function (val) {
+                const model = this.$store.getters['ibp/updateDeviceData'];
+                if (model._type === 'SquareButton' ){
+                    this.buttonText = '修改';
+                    this.showDeleteButton = true;
+                    this.isUpdate = true;
+                    this.form.code = model.code;
+                    this.form.buttonColor = model.color;
+                    this.form.buttonWidth = model.width;
+                    this.form.x = model.point.x;
+                    this.form.y = model.point.y;
+                }
+            }
         },
         mounted() {
         },
         methods: {
-            onSubmit() {
+            onSubmit(form) {
+                this.$refs[form].validate((valid) => {
+                    if (valid) {
+                        const buttonModel = {
+                            zlevel: 2,
+                            z: 1,
+                            point: {
+                                x: this.form.x,
+                                y: this.form.y
+                            },
+                            _type: 'SquareButton',
+                            code: this.form.code,
+                            color: this.form.buttonColor,
+                            status: 'off',
+                            width: this.form.buttonWidth,
+                        };
+                        this.$emit('createButton', buttonModel);
+                        this.initPage();
+                    }else {
+                        return false;
+                    }
+                });
+            },
+            deleteDevice() {
                 const buttonModel = {
-                    zlevel: 1,
+                    zlevel: 2,
                     z: 1,
-                    x: 10,
-                    y: 10,
+                    point: {
+                        x: this.form.x,
+                        y: this.form.y
+                    },
                     _type: 'SquareButton',
-                    colorType: this.form.buttonColor,
-                    width: this.form .bgWidth,
-                    height: this.form.bgHeight
+                    code: this.form.code,
+                    color: this.form.buttonColor,
+                    status: 'off',
+                    width: this.form.buttonWidth,
                 };
-                this.$emit('createButton', buttonModel)
+                this.$emit('deleteDataModel',buttonModel );
+                this.initPage();
+            },
+            initPage() {
+                this.isUpdate = false;
+                this.buttonText = '立即创建';
+                this.showDeleteButton = false;
+                this.form = {
+                    code: '',
+                    buttonColor: '',
+                    buttonWidth: '',
+                    x: 10,
+                    y: 10
+                };
+            },
+            generateCode() {
+                const mydate = new Date();
+                this.form.code =  "sButton_"+mydate.getDay()+ mydate.getHours()+ mydate.getMinutes()+mydate.getSeconds()+mydate.getMilliseconds()+ Math.round(Math.random() * 10000);
             }
         }
     };
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
-    @import "src/styles/mixin.scss";
-    .button_box{
-        width: 100%;
-        background: #f0f0f0;
-        overflow: hidden;
-    }
+
 </style>
diff --git a/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpCLamp.vue b/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpCLamp.vue
deleted file mode 100644
index 81032a2c0..000000000
--- a/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpCLamp.vue
+++ /dev/null
@@ -1,78 +0,0 @@
-<template>
-    <div>
-        <el-form ref="form" :model="form" label-width="80px">
-            <el-form-item label="圆形指示灯半径">
-                <el-input-number v-model="form.r" controls-position="right" :min="1"></el-input-number>
-            </el-form-item>
-            <el-form-item label="圆形指示灯关闭颜色">
-                <el-input-number v-model="form.offColor" controls-position="right" :min="1"></el-input-number>
-            </el-form-item>
-            <el-form-item label="圆形指示灯打开颜色">
-                <el-input-number v-model="form.onColor" controls-position="right" :min="1"></el-input-number>
-            </el-form-item>
-            <el-form-item>
-                <el-button type="primary" @click="onSubmit">立即创建</el-button>
-                <el-button>取消</el-button>
-            </el-form-item>
-        </el-form>
-    </div>
-</template>
-
-<script>
-    export default {
-        name: 'ButtonDraft',
-        components: {
-        },
-        data() {
-            return {
-                form: {
-                    r: '',
-                    offColor: '',
-                    onColor: ''
-                },
-                rules: {
-                    r: [
-                        { required: true, message: '请输入圆形指示灯半径', trigger: 'change'}
-                    ],
-                    offColor: [
-                        { required: true, message: '请输入圆形指示灯关闭颜色', trigger: 'blur' },
-                    ],
-                    onColor: [
-                        { required: true, message: '请输入圆形指示灯打开颜色', trigger: 'blur' },
-                    ]
-                }
-            };
-        },
-        computed: {
-
-        },
-        watch: {
-
-        },
-        mounted() {
-        },
-        methods: {
-            onSubmit() {
-                const lampModel = {
-                    zlevel: 1,
-                    z: 1,
-                    x: 10,
-                    y: 10,
-                    _type: 'CircularLamp',
-                    r: this.form.r,
-                    offColor: this.form.offColor,
-                    onColor: this.form.onColor
-                };
-                this.$emit('createLamp', lampModel)
-            }
-        }
-    };
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-    @import "src/styles/mixin.scss";
-    .button_box{
-        width: 100%;
-        background: #f0f0f0;
-        overflow: hidden;
-    }
-</style>
diff --git a/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpElevator.vue b/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpElevator.vue
new file mode 100644
index 000000000..b904465d3
--- /dev/null
+++ b/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpElevator.vue
@@ -0,0 +1,166 @@
+<template>
+    <div>
+        <el-form ref="form" :rules="rules" :model="form" label-width="120px">
+            <el-form-item label="电梯编号" prop="code">
+                <el-input :disabled="true" v-model="form.code">
+                    <el-button slot="append" :disabled="isUpdate" type="primary" @click="generateCode">生成编号</el-button>
+                </el-input>
+            </el-form-item>
+            <el-form-item label="电梯宽度" prop="elevatorWidth">
+                <el-input-number v-model="form.elevatorWidth" controls-position="right" :min="1"></el-input-number>
+            </el-form-item>
+            <el-form-item label="电梯高度" prop="elevatorHeight">
+                <el-input-number v-model="form.elevatorHeight" controls-position="right" :min="1"></el-input-number>
+            </el-form-item>
+            <el-form-item label="电梯颜色" prop="elevatorColor">
+                <el-color-picker v-model="form.elevatorColor"></el-color-picker>
+            </el-form-item>
+            <el-form-item label="启动方向" prop="direction">
+                <el-select v-model="form.direction" placeholder="请选择启动方向">
+                    <el-option label="不启动" value="none"></el-option>
+                    <el-option label="向上启动" value="top"></el-option>
+                    <el-option label="向下启动" value="bottom"></el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="X轴坐标">
+                <el-input-number v-model="form.x" controls-position="right" :min="1"></el-input-number>
+            </el-form-item>
+            <el-form-item label="Y轴坐标">
+                <el-input-number v-model="form.y" controls-position="right" :min="1"></el-input-number>
+            </el-form-item>
+            <el-form-item>
+                <el-button type="primary" @click="onSubmit('form')">{{ buttonText }}</el-button>
+                <el-button v-show="showDeleteButton" @click="deleteDevice" type="danger">删除</el-button>
+                <el-button v-show="showDeleteButton" @click="initPage">取消</el-button>
+            </el-form-item>
+        </el-form>
+    </div>
+</template>
+<script>
+    export default {
+        name: 'ElevatorDraft',
+        components: {
+        },
+        data() {
+            return {
+                isUpdate: false,
+                buttonText: '立即创建',
+                showDeleteButton: false,
+                form: {
+                    code: '',
+                    elevatorWidth: '',
+                    elevatorHeight: '',
+                    elevatorColor:'',
+                    direction:'none',
+                    x: 10,
+                    y: 10
+                },
+                rules: {
+                    code: [
+                        { required: true, message: '请输入电梯编号', trigger: 'blur' },
+                    ],
+                    elevatorWidth: [
+                        { required: true, message: '请输入电梯宽度', trigger: 'blur' },
+                    ],
+                    elevatorHeight: [
+                        { required: true, message: '请输入电梯高度', trigger: 'blur' },
+                    ],
+                    elevatorColor: [
+                        { required: true, message: '请选择电梯颜色', trigger: 'change' },
+                    ],
+                    direction: [
+                        { required: true, message: '请选择启动方向', trigger: 'change' },
+                    ],
+                }
+            };
+        },
+        computed: {
+
+        },
+        watch: {
+            '$store.state.ibp.rightClickCount': function (val) {
+                const model = this.$store.getters['ibp/updateDeviceData'];
+                if (model._type === 'Elevator' ){
+                    this.buttonText = '修改';
+                    this.showDeleteButton = true;
+                    this.isUpdate = true;
+                    this.form.code = model.code;
+                    this.form.elevatorWidth = model.width;
+                    this.form.elevatorHeight = model.height;
+                    this.form.elevatorColor = model.fillColor;
+                    this.form.direction = model.direction;
+                    this.form.x = model.point.x;
+                    this.form.y = model.point.y;
+                }
+            }
+        },
+        mounted() {
+        },
+        methods: {
+            onSubmit(form) {
+                this.$refs[form].validate((valid) => {
+                    if (valid){
+                        const elevatorModel = {
+                            zlevel: 2,
+                            z: 2,
+                            point: {
+                                x: this.form.x,
+                                y: this.form.y
+                            },
+                            _type: 'Elevator',
+                            code: this.form.code,
+                            width: this.form.elevatorWidth,
+                            height: this.form.elevatorHeight,
+                            fillColor: this.form.elevatorColor,
+                            direction: this.form.direction,
+                        };
+                        this.$emit('createElevator', elevatorModel);
+                        this.initPage();
+                    } else {
+                        return false;
+                    }
+                });
+
+            },
+            deleteDevice() {
+                const elevatorModel = {
+                    zlevel: 2,
+                    z: 2,
+                    point: {
+                        x: this.form.x,
+                        y: this.form.y
+                    },
+                    _type: 'Elevator',
+                    code: this.form.code,
+                    width: this.form.elevatorWidth,
+                    height: this.form.elevatorHeight,
+                    fillColor: this.form.elevatorColor,
+                    direction: this.form.direction,
+                };
+                this.$emit('deleteDataModel',elevatorModel );
+                this.initPage();
+            },
+            initPage() {
+                this.isUpdate = false;
+                this.buttonText = '立即创建';
+                this.showDeleteButton = false;
+                this.form = {
+                    code: '',
+                    elevatorWidth: '',
+                    elevatorHeight: '',
+                    elevatorColor:'',
+                    direction:'none',
+                    x: 10,
+                    y: 10
+                };
+            },
+            generateCode() {
+                const mydate = new Date();
+                this.form.code =  "elevator_"+mydate.getDay()+ mydate.getHours()+ mydate.getMinutes()+mydate.getSeconds()+mydate.getMilliseconds()+ Math.round(Math.random() * 10000);
+            }
+        }
+    };
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+</style>
diff --git a/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpKey.vue b/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpKey.vue
new file mode 100644
index 000000000..94f2fd60b
--- /dev/null
+++ b/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpKey.vue
@@ -0,0 +1,157 @@
+<template>
+    <div>
+        <el-form ref="form" :rules="rules" :model="form" label-width="120px">
+            <el-form-item label="钥匙编号" prop="code">
+                <el-input :disabled="true" v-model="form.code">
+                    <el-button slot="append" :disabled="isUpdate" type="primary" @click="generateCode">生成编号</el-button>
+                </el-input>
+            </el-form-item>
+            <el-form-item label="钥匙宽度" prop="keyWidth">
+                <el-input-number v-model="form.keyWidth" controls-position="right" :min="1"></el-input-number>
+            </el-form-item>
+            <el-form-item label="钥匙高度" prop="keyHeight">
+                <el-input-number v-model="form.keyHeight" controls-position="right" :min="1"></el-input-number>
+            </el-form-item>
+            <el-form-item label="钥匙朝向" prop="status">
+                <el-select v-model="form.status" placeholder="请选择钥匙朝向">
+                    <el-option label="水平" value="on"></el-option>
+                    <el-option label="竖直" value="off"></el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="X轴坐标">
+                <el-input-number v-model="form.x" controls-position="right" :min="1"></el-input-number>
+            </el-form-item>
+            <el-form-item label="Y轴坐标">
+                <el-input-number v-model="form.y" controls-position="right" :min="1"></el-input-number>
+            </el-form-item>
+            <el-form-item>
+                <el-button type="primary" @click="onSubmit('form')">{{ buttonText }}</el-button>
+                <el-button v-show="showDeleteButton" @click="deleteDevice" type="danger">删除</el-button>
+                <el-button v-show="showDeleteButton" @click="initPage">取消</el-button>
+            </el-form-item>
+        </el-form>
+    </div>
+</template>
+
+<script>
+    export default {
+        name: 'KeyDraft',
+        components: {
+        },
+        data() {
+            return {
+                isUpdate: false,
+                buttonText: '立即创建',
+                showDeleteButton: false,
+                form: {
+                    code: '',
+                    keyWidth: '',
+                    keyHeight: '',
+                    status:'',
+                    x: 10,
+                    y: 10
+                },
+                rules: {
+                    code: [
+                        { required: true, message: '请输入钥匙孔编号', trigger: 'blur' },
+                    ],
+                    keyWidth: [
+                        { required: true, message: '请输入钥匙孔宽度', trigger: 'blur' },
+                    ],
+                    keyHeight: [
+                        { required: true, message: '请输入钥匙孔高度', trigger: 'blur' },
+                    ],
+                    status: [
+                        { required: true, message: '请选择钥匙朝向', trigger: 'change' },
+                    ],
+                }
+            };
+        },
+        computed: {
+
+        },
+        watch: {
+            '$store.state.ibp.rightClickCount': function (val) {
+                const model = this.$store.getters['ibp/updateDeviceData'];
+                if (model._type === 'Key' ){
+                    this.buttonText = '修改';
+                    this.showDeleteButton = true;
+                    this.isUpdate = true;
+                    this.form.code = model.code;
+                    this.form.keyWidth = model.width;
+                    this.form.keyHeight = model.height;
+                    this.form.status = model.status;
+                    this.form.x = model.point.x;
+                    this.form.y = model.point.y;
+                }
+            }
+        },
+        mounted() {
+        },
+        methods: {
+            onSubmit(form) {
+                this.$refs[form].validate((valid) => {
+                    if(valid) {
+                        const keyModel = {
+                            zlevel: 3,
+                            z: 1,
+                            point: {
+                                x: this.form.x,
+                                y: this.form.y
+                            },
+                            draggable: true,
+                            _type: 'Key',
+                            code: this.form.code,
+                            width: this.form.keyWidth,
+                            height: this.form.keyHeight,
+                            status:this.form.status
+                        };
+                        this.$emit('createKey', keyModel);
+                        this.initPage();
+                    }else {
+                        return false;
+                    }
+                });
+
+            },
+            deleteDevice() {
+                const keyModel = {
+                    zlevel: 3,
+                    z: 1,
+                    point: {
+                        x: this.form.x,
+                        y: this.form.y
+                    },
+                    draggable: true,
+                    _type: 'Key',
+                    code: this.form.code,
+                    width: this.form .keyWidth,
+                    height: this.form.keyHeight,
+                    status:this.form.status
+                };
+                this.$emit('deleteDataModel',keyModel);
+                this.initPage();
+            },
+            initPage() {
+                this.isUpdate = false;
+                this.buttonText = '立即创建';
+                this.showDeleteButton = false;
+                this.form = {
+                    code: '',
+                    keyWidth: '',
+                    keyHeight: '',
+                    status:'',
+                    x: 10,
+                    y: 10
+                };
+            },
+            generateCode() {
+                const mydate = new Date();
+                this.form.code =  "key_"+mydate.getDay()+ mydate.getHours()+ mydate.getMinutes()+mydate.getSeconds()+mydate.getMilliseconds()+ Math.round(Math.random() * 10000);
+            }
+        }
+    };
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+</style>
diff --git a/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpLamp.vue b/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpLamp.vue
new file mode 100644
index 000000000..828b3f0c1
--- /dev/null
+++ b/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpLamp.vue
@@ -0,0 +1,131 @@
+<template>
+    <div>
+        <el-form ref="form" :rules="rules" :model="form" label-width="120px">
+            <el-form-item label="圆形指示灯编号" prop="code">
+                <el-input :disabled="true" v-model="form.code" >
+                    <el-button slot="append" :disabled="isUpdate" type="primary" @click="generateCode">生成编号</el-button>
+                </el-input>
+            </el-form-item>
+            <el-form-item label="圆形指示灯半径" prop="r">
+                <el-input-number v-model="form.r" controls-position="right" :min="1"></el-input-number>
+            </el-form-item>
+            <el-form-item label="X轴坐标">
+                <el-input-number v-model="form.x" controls-position="right" :min="1"></el-input-number>
+            </el-form-item>
+            <el-form-item label="Y轴坐标">
+                <el-input-number v-model="form.y" controls-position="right" :min="1"></el-input-number>
+                </el-form-item>
+            <el-form-item>
+                <el-button type="primary" @click="onSubmit('form')">{{ buttonText }}</el-button>
+                <el-button v-show="showDeleteButton" @click="deleteDevice" type="danger">删除</el-button>
+                <el-button v-show="showDeleteButton" @click="initPage">取消</el-button>
+            </el-form-item>
+        </el-form>
+    </div>
+</template>
+
+<script>
+    export default {
+        name: 'LampDraft',
+        components: {
+        },
+        data() {
+            return {
+                isUpdate: false,
+                buttonText: '立即创建',
+                showDeleteButton: false,
+                form: {
+                    code: '',
+                    r: '',
+                    x: 10,
+                    y: 10
+                },
+                rules: {
+                    code: [
+                        { required: true, message: '请输入按钮编号', trigger: 'blur' },
+                    ],
+                    r: [
+                        { required: true, message: '请输入圆形指示灯半径', trigger: 'blur'}
+                    ],
+                }
+            };
+        },
+        computed: {
+
+        },
+        watch: {
+            '$store.state.ibp.rightClickCount': function (val) {
+                 const model = this.$store.getters['ibp/updateDeviceData'];
+                 if (model._type === 'CircularLamp' ){
+                     this.buttonText = '修改';
+                     this.showDeleteButton = true;
+                     this.isUpdate = true;
+                     this.form.code = model.code;
+                     this.form.r = model.r;
+                     this.form.x = model.point.x;
+                     this.form.y = model.point.y;
+                 }
+            }
+        },
+        mounted() {
+        },
+        methods: {
+            onSubmit(form) {
+                this.$refs[form].validate((valid) => {
+                    if(valid){
+                        const lampModel = {
+                            zlevel: 2,
+                            z: 1,
+                            point: {
+                                x: this.form.x,
+                                y: this.form.y
+                            },
+                            _type: 'CircularLamp',
+                            code: this.form.code,
+                            r: this.form.r,
+                            fillColor: '#332C22'
+                        };
+                        this.$emit('createLamp', lampModel);
+                        this.initPage();
+                    }else {
+                        return false;
+                    }
+                });
+
+            },
+            deleteDevice() {
+                 const lampModel = {
+                      zlevel: 2,
+                      z: 1,
+                      point: {
+                          x: this.form.x,
+                          y: this.form.y
+                      },
+                      _type: 'CircularLamp',
+                      code: this.form.code,
+                      r: this.form.r,
+                      fillColor: '#332C22'
+                 };
+                 this.$emit('deleteDataModel',lampModel );
+                 this.initPage();
+            },
+            initPage() {
+                this.isUpdate = false;
+                this.buttonText = '立即创建';
+                this.showDeleteButton = false;
+                this.form = {
+                     code: '',
+                     r: '',
+                     x: 10,
+                     y: 10
+                };
+            },
+            generateCode() {
+                const mydate = new Date();
+                this.form.code =  "lamp_"+mydate.getDay()+ mydate.getHours()+ mydate.getMinutes()+mydate.getSeconds()+mydate.getMilliseconds()+ Math.round(Math.random() * 10000);
+            }
+        }
+    };
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+</style>
diff --git a/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpLine.vue b/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpLine.vue
new file mode 100644
index 000000000..d39ccbc9b
--- /dev/null
+++ b/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpLine.vue
@@ -0,0 +1,161 @@
+<template>
+    <div>
+       <el-form ref="form" :rules="rules" :model="form" label-width="100px">
+           <el-form-item label="线段编号" prop="code">
+               <el-input :disabled="true" v-model="form.code" >
+                   <el-button slot="append" :disabled="isUpdate" type="primary" @click="generateCode">生成编号</el-button>
+               </el-input>
+           </el-form-item>
+           <el-form-item label="线段宽度" prop="lineWidth">
+               <el-input-number v-model="form.lineWidth" controls-position="right" :min="1" :max="50"></el-input-number>
+           </el-form-item>
+           <el-form-item label="线段颜色" prop="fillColor">
+               <el-input v-model="form.fillColor"></el-input>
+           </el-form-item>
+           <el-form-item label="起始X轴坐标">
+               <el-input-number v-model="form.x1" controls-position="right" :min="1"></el-input-number>
+           </el-form-item>
+           <el-form-item label="起始Y轴坐标">
+               <el-input-number v-model="form.y1" controls-position="right" :min="1"></el-input-number>
+           </el-form-item>
+           <el-form-item label="终止X轴坐标">
+               <el-input-number v-model="form.x2" controls-position="right" :min="1"></el-input-number>
+           </el-form-item>
+           <el-form-item label="终止Y轴坐标">
+               <el-input-number v-model="form.y2" controls-position="right" :min="1"></el-input-number>
+           </el-form-item>
+           <el-form-item>
+               <el-button type="primary" @click="onSubmit('form')">{{ buttonText }}</el-button>
+               <el-button v-show="showDeleteButton" @click="deleteDevice" type="danger">删除</el-button>
+               <el-button v-show="showDeleteButton" @click="initPage">取消</el-button>
+           </el-form-item>
+       </el-form>
+    </div>
+</template>
+
+<script>
+    export default {
+        name: 'TextDraft',
+        components: {
+        },
+        data() {
+            return {
+                isUpdate: false,
+                buttonText: '立即创建',
+                showDeleteButton: false,
+                form: {
+                    code: '',
+                    lineWidth: '',
+                    fillColor: '',
+                    x1: 10,
+                    y1: 10,
+                    x2: 20,
+                    y2: 10
+                },
+                rules: {
+                    code: [
+                        { required: true, message: '请输入线段编号', trigger: 'blur' },
+                    ],
+                    lineWidth: [
+                        { required: true, message: '请输入线段宽度', trigger: 'blur' },
+                    ],
+                    fillColor: [
+                        { required: true, message: '请输入线段颜色', trigger: 'blur' },
+                    ],
+                }
+            };
+        },
+        computed: {
+
+        },
+        watch: {
+            '$store.state.ibp.rightClickCount': function (val) {
+                const model = this.$store.getters['ibp/updateDeviceData'];
+                if (model._type === 'IbpLine' ){
+                    this.buttonText = '修改';
+                    this.showDeleteButton = true;
+                    this.isUpdate = true;
+                    this.form.code = model.code;
+                    this.form.lineWidth = model.lineWidth;
+                    this.form.fillColor = model.fillColor;
+                    this.form.x1 = model.point1.x;
+                    this.form.y1 = model.point1.y;
+                    this.form.x2 = model.point2.x;
+                    this.form.y2 = model.point2.y;
+                }
+            }
+        },
+        mounted() {
+        },
+        methods: {
+            onSubmit(form) {
+                this.$refs[form].validate((valid) =>{
+                    if (valid){
+                        const lineModel = {
+                            zlevel: 2,
+                            z: 1,
+                            point1: {
+                                x: this.form.x1,
+                                y: this.form.y1
+                            },
+                            point2: {
+                                x: this.form.x2,
+                                y: this.form.y2
+                            },
+                            code: this.form.code,
+                            _type: 'IbpLine',
+                            lineWidth: this.form.lineWidth,
+                            fillColor: this.form.fillColor
+                        };
+                        this.$emit('createLine', lineModel);
+                        this.initPage();
+                    }else {
+                        return false;
+                    }
+                });
+
+            },
+            deleteDevice() {
+                const lineModel = {
+                    zlevel: 2,
+                    z: 1,
+                    point1: {
+                        x: this.form.x1,
+                        y: this.form.y1
+                    },
+                    point2: {
+                        x: this.form.x2,
+                        y: this.form.y2
+                    },
+                    code: this.form.code,
+                    _type: 'IbpLine',
+                    lineWidth: this.form.lineWidth,
+                    fillColor: this.form.fillColor
+                };
+                this.$emit('deleteDataModel',lineModel );
+                this.initPage();
+            },
+            initPage() {
+                this.isUpdate = false;
+                this.buttonText = '立即创建';
+                this.showDeleteButton = false;
+                this.form = {
+                    code: '',
+                    lineWidth: '',
+                    fillColor: '',
+                    x1: 10,
+                    y1: 10,
+                    x2: 20,
+                    y2: 10
+                };
+            },
+            generateCode() {
+                const mydate = new Date();
+                this.form.code =  "line_"+mydate.getDay()+ mydate.getHours()+ mydate.getMinutes()+mydate.getSeconds()+mydate.getMilliseconds()+ Math.round(Math.random() * 10000);
+            }
+        }
+    };
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+</style>
diff --git a/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpRotatingButton.vue b/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpRotatingButton.vue
index d0d5643e4..4c9a8b35d 100644
--- a/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpRotatingButton.vue
+++ b/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpRotatingButton.vue
@@ -1,15 +1,24 @@
 <template>
     <div>
-        <el-form ref="form" :model="form" label-width="80px">
-            <el-form-item label="旋转按钮宽度">
+        <el-form ref="form" :rules="rules" :model="form" label-width="120px">
+            <el-form-item label="钥匙孔编号" prop="code">
+                <el-input :disabled="true" v-model="form.code" >
+                    <el-button slot="append" :disabled="isUpdate" type="primary" @click="generateCode">生成编号</el-button>
+                </el-input>
+            </el-form-item>
+            <el-form-item label="钥匙孔宽度" prop="rotatingButtonWidth">
                 <el-input-number v-model="form.rotatingButtonWidth" controls-position="right" :min="1"></el-input-number>
             </el-form-item>
-            <el-form-item label="旋转按钮高度">
-                <el-input-number v-model="form.rotatingButtonHeight" controls-position="right" :min="1"></el-input-number>
+            <el-form-item label="X轴坐标">
+                <el-input-number v-model="form.x" controls-position="right" :min="1"></el-input-number>
+            </el-form-item>
+            <el-form-item label="Y轴坐标">
+                <el-input-number v-model="form.y" controls-position="right" :min="1"></el-input-number>
             </el-form-item>
             <el-form-item>
-                <el-button type="primary" @click="onSubmit">立即创建</el-button>
-                <el-button>取消</el-button>
+                <el-button type="primary" @click="onSubmit('form')">{{ buttonText }}</el-button>
+                <el-button v-show="showDeleteButton" @click="deleteDevice" type="danger">删除</el-button>
+                <el-button v-show="showDeleteButton" @click="initPage">取消</el-button>
             </el-form-item>
         </el-form>
     </div>
@@ -22,16 +31,21 @@
         },
         data() {
             return {
+                isUpdate: false,
+                buttonText: '立即创建',
+                showDeleteButton: false,
                 form: {
+                    code: '',
                     rotatingButtonWidth: '',
-                    rotatingButtonHeight: ''
+                    x: 10,
+                    y: 10
                 },
                 rules: {
-                    rotatingButtonWidth: [
-                        { required: true, message: '请输入旋转按钮宽度', trigger: 'blur' },
+                    code: [
+                        { required: true, message: '请输入钥匙孔编号', trigger: 'blur' },
                     ],
-                    rotatingButtonHeight: [
-                        { required: true, message: '请输入旋转按钮高度', trigger: 'blur' },
+                    rotatingButtonWidth: [
+                        { required: true, message: '请输入钥匙孔宽度', trigger: 'blur' },
                     ]
                 }
             };
@@ -40,22 +54,75 @@
 
         },
         watch: {
-
+            '$store.state.ibp.rightClickCount': function (val) {
+                const model = this.$store.getters['ibp/updateDeviceData'];
+                if (model._type === 'RotatingButton' ){
+                    this.buttonText = '修改';
+                    this.showDeleteButton = true;
+                    this.isUpdate = true;
+                    this.form.code = model.code;
+                    this.form.rotatingButtonWidth = model.width;
+                    this.form.x = model.point.x;
+                    this.form.y = model.point.y;
+                }
+            }
         },
         mounted() {
         },
         methods: {
-            onSubmit() {
+            onSubmit(form) {
+                this.$refs[form].validate((valid) => {
+                    if (valid) {
+                        const rotatingButtonModel = {
+                            zlevel: 2,
+                            z: 1,
+                            point: {
+                                x: this.form.x,
+                                y: this.form.y
+                            },
+                            draggable: true,
+                            _type: 'RotatingButton',
+                            code: this.form.code,
+                            width: this.form .rotatingButtonWidth,
+                        };
+                        this.$emit('createRotatingButton', rotatingButtonModel);
+                        this.initPage();
+                    } else {
+                        return false;
+                    }
+                });
+
+            },
+            deleteDevice() {
                 const rotatingButtonModel = {
-                    zlevel: 1,
+                    zlevel: 2,
                     z: 1,
-                    x: 10,
-                    y: 10,
+                    point: {
+                        x: this.form.x,
+                        y: this.form.y
+                    },
+                    draggable: true,
                     _type: 'RotatingButton',
+                    code: this.form.code,
                     width: this.form .rotatingButtonWidth,
-                    height: this.form.rotatingButtonHeight
                 };
-                this.$emit('createAppendageBox', rotatingButtonModel)
+                this.$emit('deleteDataModel',rotatingButtonModel );
+                this.initPage();
+            },
+            initPage() {
+                this.isUpdate = false;
+                this.buttonText = '立即创建';
+                this.showDeleteButton = false;
+                this.form = {
+                    code: '',
+                    rotatingButtonWidth: '',
+                    x: 10,
+                    y: 10
+                };
+            },
+            generateCode() {
+                const mydate = new Date();
+                this.form.code =  "rButton_"+mydate.getDay()+ mydate.getHours()+ mydate.getMinutes()+mydate.getSeconds()+mydate.getMilliseconds()+ Math.round(Math.random() * 10000);
             }
         }
     };
diff --git a/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpTelephoneTerminal.vue b/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpTelephoneTerminal.vue
new file mode 100644
index 000000000..a3585f898
--- /dev/null
+++ b/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpTelephoneTerminal.vue
@@ -0,0 +1,133 @@
+<template>
+    <div>
+        <el-form ref="form" :rules="rules" :model="form" label-width="120px">
+            <el-form-item label="端子编号" prop="code">
+                 <el-input :disabled="true" v-model="form.code" style="width:300px">
+                    <el-button slot="append" :disabled="isUpdate" type="primary" @click="generateCode">生成编号</el-button>
+                </el-input>
+            </el-form-item>
+            <el-form-item label="端子宽度" prop="terminalWidth">
+                <el-input-number v-model="form.terminalWidth" controls-position="right" :min="1"></el-input-number>
+            </el-form-item>
+            <el-form-item label="X轴坐标">
+                <el-input-number v-model="form.x" controls-position="right" :min="1"></el-input-number>
+            </el-form-item>
+            <el-form-item label="Y轴坐标">
+                <el-input-number v-model="form.y" controls-position="right" :min="1"></el-input-number>
+            </el-form-item>
+            <el-form-item>
+                <el-button type="primary" @click="onSubmit('form')">{{ buttonText }}</el-button>
+                <el-button v-show="showDeleteButton" @click="deleteDevice" type="danger">删除</el-button>
+                <el-button v-show="showDeleteButton" @click="initPage">取消</el-button>
+            </el-form-item>
+        </el-form>
+    </div>
+</template>
+
+<script>
+    export default {
+        name: 'KeyDraft',
+        components: {
+        },
+        data() {
+            return {
+                isUpdate: false,
+                buttonText: '立即创建',
+                showDeleteButton: false,
+                form: {
+                    code: '',
+                    terminalWidth: '',
+                    x: 10,
+                    y: 10
+                },
+                rules: {
+                    code: [
+                        { required: true, message: '请输入端子编号', trigger: 'blur' },
+                    ],
+                    terminalWidth: [
+                        { required: true, message: '请输入端子宽度', trigger: 'blur' },
+                    ],
+                }
+            };
+        },
+        computed: {
+
+        },
+        watch: {
+            '$store.state.ibp.rightClickCount': function (val) {
+                const model = this.$store.getters['ibp/updateDeviceData'];
+                if (model._type === 'TeleTerminal' ){
+                    this.buttonText = '修改';
+                    this.showDeleteButton = true;
+                    this.isUpdate = true;
+                    this.form.code = model.code;
+                    this.form.terminalWidth = model.width;
+                    this.form.terminalHeight = model.height;
+                    this.form.x = model.point.x;
+                    this.form.y = model.point.y;
+                }
+            }
+        },
+        mounted() {
+        },
+        methods: {
+            onSubmit(form) {
+                this.$refs[form].validate((valid) => {
+                   if (valid){
+                       const TerminalModel = {
+                           zlevel: 2,
+                           z: 1,
+                           point: {
+                               x: this.form.x,
+                               y: this.form.y
+                           },
+                           draggable: true,
+                           _type: 'TeleTerminal',
+                           code: this.form.code,
+                           width: this.form.terminalWidth,
+                       };
+                       this.$emit('createTeleTerminal', TerminalModel);
+                       this.initPage();
+                   } else {
+                       return false;
+                   }
+                });
+
+            },
+            deleteDevice() {
+                const TerminalModel = {
+                    zlevel: 2,
+                    z: 1,
+                    point: {
+                        x: this.form.x,
+                        y: this.form.y
+                    },
+                    draggable: true,
+                    _type: 'TeleTerminal',
+                    code: this.form.code,
+                    width: this.form .terminalWidth,
+                };
+                this.$emit('deleteDataModel',TerminalModel);
+                this.initPage();
+            },
+            initPage() {
+                this.isUpdate = false;
+                this.buttonText = '立即创建';
+                this.showDeleteButton = false;
+                this.form = {
+                    code: '',
+                    terminalWidth: '',
+                    x: 10,
+                    y: 10
+                };
+            },
+            generateCode() {
+                const mydate = new Date();
+                this.form.code =  "terminal"+mydate.getDay()+ mydate.getHours()+ mydate.getMinutes()+mydate.getSeconds()+mydate.getMilliseconds()+ Math.round(Math.random() * 10000);
+            }
+        }
+    };
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+</style>
diff --git a/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpText.vue b/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpText.vue
index c40b605a3..1bc5fbee7 100644
--- a/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpText.vue
+++ b/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpText.vue
@@ -1,24 +1,33 @@
 <template>
     <div>
-       <el-form ref="form" :model="form" label-width="80px">
-           <el-form-item label="文字编号">
-               <el-input v-model="form.code"></el-input>
+       <el-form ref="form" :rules="rules" :model="form" label-width="80px">
+           <el-form-item label="文字编号" prop="code">
+               <el-input :disabled="true" v-model="form.code" >
+                   <el-button slot="append" :disabled="isUpdate" type="primary" @click="generateCode">生成编号</el-button>
+               </el-input>
            </el-form-item>
-           <el-form-item label="文字内容">
+           <el-form-item label="文字内容" prop="context">
                <el-input type="textarea" v-model="form.context"></el-input>
            </el-form-item>
-           <el-form-item label="文字颜色">
+           <el-form-item label="文字颜色" prop="textFill">
                <el-input v-model="form.textFill"></el-input>
            </el-form-item>
-           <el-form-item label="文字大小">
+           <el-form-item label="文字大小" prop="fontSize">
                <el-input-number v-model="form.fontSize" controls-position="right" :min="1" :max="50"></el-input-number>
            </el-form-item>
-           <el-form-item label="是否加粗">
-               <el-switch v-model="form.fontWeight"></el-switch>
+           <el-form-item label="文字粗细" prop="fontWeight">
+               <el-input-number v-model="form.fontWeight" controls-position="right" :min="1" ></el-input-number>
+           </el-form-item>
+           <el-form-item label="X轴坐标">
+               <el-input-number v-model="form.x" controls-position="right" :min="1"></el-input-number>
+           </el-form-item>
+           <el-form-item label="Y轴坐标">
+               <el-input-number v-model="form.y" controls-position="right" :min="1"></el-input-number>
            </el-form-item>
            <el-form-item>
-               <el-button type="primary" @click="onSubmit">立即创建</el-button>
-               <el-button>取消</el-button>
+               <el-button type="primary" @click="onSubmit('form')">{{ buttonText }}</el-button>
+               <el-button v-show="showDeleteButton" @click="deleteDevice" type="danger">删除</el-button>
+               <el-button v-show="showDeleteButton" @click="initPage">取消</el-button>
            </el-form-item>
        </el-form>
     </div>
@@ -31,12 +40,17 @@
         },
         data() {
             return {
+                isUpdate: false,
+                buttonText: '立即创建',
+                showDeleteButton: false,
                 form: {
                     code: '',
                     context: '',
                     textFill: '',
                     fontSize: '',
-                    fontWeight: false
+                    fontWeight: '',
+                    x: 10,
+                    y: 10
                 },
                 rules: {
                     code: [
@@ -51,6 +65,9 @@
                     fontSize: [
                         { required: true, message: '请输入文字大小', trigger: 'blur' },
                     ],
+                    fontWeight: [
+                        { required: true, message: '请输入文字粗细', trigger: 'blur' },
+                    ],
                 }
             };
         },
@@ -58,26 +75,103 @@
 
         },
         watch: {
-
+            '$store.state.ibp.rightClickCount': function (val) {
+                const model = this.$store.getters['ibp/updateDeviceData'];
+                if (model._type === 'IbpText' ){
+                    this.buttonText = '修改';
+                    this.showDeleteButton = true;
+                    this.isUpdate = true;
+                    this.form.code = model.code;
+                    this.form.context = model.context;
+                    this.form.textFill = model.textFill;
+                    this.form.fontSize = model.fontSize;
+                    this.form.fontWeight = model.fontWeight;
+                    this.form.x = model.point.x;
+                    this.form.y = model.point.y;
+                }
+            }
         },
         mounted() {
         },
         methods: {
-            onSubmit() {
+            onSubmit(form) {
+                this.$refs[form].validate((valid) => {
+                    if (valid) {
+                        const textModel = {
+                            zlevel: 2,
+                            z: 1,
+                            point: {
+                                x: this.form.x,
+                                y: this.form.y
+                            },
+                            code: this.form.code,
+                            _type: 'IbpText',
+                            context: this.form.context,
+                            textFill: this.form.textFill,
+                            fontSize: this.form.fontSize ,
+                            fontWeight: this.form.fontWeight,
+                            fontFamily: 'consolas'
+                        };
+                        this.$emit('createText', textModel);
+                        this.initPage();
+                    } else {
+                        return false;
+                    }
+                });
                 const textModel = {
-                    zlevel: 1,
+                    zlevel: 2,
                     z: 1,
-                    x: 10,
-                    y: 10,
+                    point: {
+                        x: this.form.x,
+                        y: this.form.y
+                    },
                     code: this.form.code,
                     _type: 'IbpText',
-                    context: this.form .context,
+                    context: this.form.context,
                     textFill: this.form.textFill,
                     fontSize: this.form.fontSize ,
                     fontWeight: this.form.fontWeight,
                     fontFamily: 'consolas'
                 };
-                this.$emit('createText', textModel)
+                this.$emit('createText', textModel);
+                this.initPage();
+            },
+            deleteDevice() {
+                const textModel = {
+                    zlevel: 2,
+                    z: 1,
+                    point: {
+                        x: this.form.x,
+                        y: this.form.y
+                    },
+                    code: this.form.code,
+                    _type: 'IbpText',
+                    context: this.form.context,
+                    textFill: this.form.textFill,
+                    fontSize: this.form.fontSize ,
+                    fontWeight: this.form.fontWeight,
+                    fontFamily: 'consolas'
+                };
+                this.$emit('deleteDataModel',textModel);
+                this.initPage();
+            },
+            initPage() {
+                this.isUpdate = false;
+                this.buttonText = '立即创建';
+                this.showDeleteButton = false;
+                this.form = {
+                    code: '',
+                    context: '',
+                    textFill: '',
+                    fontSize: '',
+                    fontWeight: '',
+                    x: 10,
+                    y: 10
+                };
+            },
+            generateCode() {
+                const mydate = new Date();
+                this.form.code =  "text_"+mydate.getDay()+ mydate.getHours()+ mydate.getMinutes()+mydate.getSeconds()+mydate.getMilliseconds()+ Math.round(Math.random() * 10000);
             }
         }
     };
diff --git a/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpTip.vue b/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpTip.vue
deleted file mode 100644
index 4a08b39d0..000000000
--- a/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpTip.vue
+++ /dev/null
@@ -1,93 +0,0 @@
-<template>
-    <div>
-        <el-form ref="form" :model="form" label-width="80px">
-            <el-form-item label="文字编号">
-                <el-input v-model="form.code"></el-input>
-            </el-form-item>
-            <el-form-item label="文字内容">
-                <el-input v-model="form.context"></el-input>
-            </el-form-item>
-            <el-form-item label="文字颜色">
-                <el-input v-model="form.textFill"></el-input>
-            </el-form-item>
-            <el-form-item label="文字大小">
-                <el-input-number v-model="form.fontSize" controls-position="right" :min="1" :max="50"></el-input-number>
-            </el-form-item>
-            <el-form-item label="是否加粗">
-                <el-switch v-model="form.fontWeight"></el-switch>
-            </el-form-item>
-            <el-form-item>
-                <el-button type="primary" @click="onSubmit">立即创建</el-button>
-                <el-button>取消</el-button>
-            </el-form-item>
-        </el-form>
-    </div>
-</template>
-
-<script>
-
-    export default {
-        name: 'TextDraft',
-        components: {
-        },
-        data() {
-            return {
-                form: {
-                    code: '',
-                    context: '',
-                    textFill: '',
-                    fontSize: '',
-                    fontWeight: false
-                },
-                rules: {
-                    code: [
-                        { required: true, message: '请输入文字编号', trigger: 'blur' },
-                    ],
-                    context: [
-                        { required: true, message: '请输入文字内容', trigger: 'blur' },
-                    ],
-                    textFill: [
-                        { required: true, message: '请输入文字颜色', trigger: 'blur' },
-                    ],
-                    fontSize: [
-                        { required: true, message: '请输入文字大小', trigger: 'blur' },
-                    ],
-                }
-            };
-        },
-        computed: {
-
-        },
-        watch: {
-
-        },
-        mounted() {
-        },
-        methods: {
-            onSubmit() {
-                const textModel = {
-                    zlevel: 1,
-                    z: 1,
-                    x: 10,
-                    y: 10,
-                    code: this.form.code,
-                    _type: 'IbpText',
-                    context: this.form .context,
-                    textFill: this.form.textFill,
-                    fontSize: this.form.fontSize ,
-                    fontWeight: this.form.fontWeight,
-                    fontFamily: 'consolas'
-                };
-                this.$emit('createText', textModel)
-            }
-        }
-    };
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-    @import "src/styles/mixin.scss";
-    .button_box{
-        width: 100%;
-        background: #f0f0f0;
-        overflow: hidden;
-    }
-</style>
diff --git a/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpTipBox.vue b/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpTipBox.vue
new file mode 100644
index 000000000..03142f573
--- /dev/null
+++ b/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpTipBox.vue
@@ -0,0 +1,158 @@
+<template>
+    <div>
+        <el-form ref="form" :rules="rules" :model="form" label-width="100px">
+            <el-form-item label="提示框编号" prop="code">
+                <el-input :disabled="true" v-model="form.code" >
+                    <el-button slot="append" :disabled="isUpdate" type="primary" @click="generateCode">生成编号</el-button>
+                </el-input>
+            </el-form-item>
+            <el-form-item label="提示框宽度" prop="tipBoxWidth">
+                <el-input-number v-model="form.tipBoxWidth" controls-position="right" :min="1" ></el-input-number>
+            </el-form-item>
+            <el-form-item label="提示框高度" prop="tipBoxHeight">
+                <el-input-number v-model="form.tipBoxHeight" controls-position="right" :min="1" ></el-input-number>
+            </el-form-item>
+            <el-form-item label="提示框颜色" prop="fillColor">
+                <el-input v-model="form.fillColor"></el-input>
+            </el-form-item>
+            <el-form-item label="X轴坐标">
+                <el-input-number v-model="form.x" controls-position="right" :min="1"></el-input-number>
+            </el-form-item>
+            <el-form-item label="Y轴坐标">
+                <el-input-number v-model="form.y" controls-position="right" :min="1"></el-input-number>
+            </el-form-item>
+            <el-form-item>
+                <el-button type="primary" @click="onSubmit('form')">{{ buttonText }}</el-button>
+                <el-button v-show="showDeleteButton" @click="deleteDevice" type="danger">删除</el-button>
+                <el-button v-show="showDeleteButton" @click="initPage">取消</el-button>
+            </el-form-item>
+        </el-form>
+    </div>
+</template>
+
+<script>
+
+    export default {
+        name: 'TextDraft',
+        components: {
+        },
+        data() {
+            return {
+                isUpdate: false,
+                buttonText: '立即创建',
+                showDeleteButton: false,
+                form: {
+                    code: '',
+                    tipBoxWidth: '',
+                    tipBoxHeight: '',
+                    fillColor: '',
+                    x: 10,
+                    y: 10
+                },
+                rules: {
+                    code: [
+                        { required: true, message: '请输入提示框编号', trigger: 'blur' },
+                    ],
+                    tipBoxWidth: [
+                        { required: true, message: '请输入提示框宽度', trigger: 'blur' },
+                    ],
+                    tipBoxHeight: [
+                        { required: true, message: '请输入提示框高度', trigger: 'blur' },
+                    ],
+                    fillColor: [
+                        { required: true, message: '请输入提示框颜色', trigger: 'blur' },
+                    ]
+                }
+            };
+        },
+        computed: {
+
+        },
+        watch: {
+            '$store.state.ibp.rightClickCount': function (val) {
+                const model = this.$store.getters['ibp/updateDeviceData'];
+                if (model._type === 'TipBox' ){
+                    this.buttonText = '修改';
+                    this.showDeleteButton = true;
+                    this.isUpdate = true;
+                    this.form.code = model.code;
+                    this.form.tipBoxWidth = model.width;
+                    this.form.tipBoxHeight = model.height;
+                    this.form.fillColor = model.fillColor;
+                    this.form.x = model.point.x;
+                    this.form.y = model.point.y;
+                }
+            }
+        },
+        mounted() {
+        },
+        methods: {
+            onSubmit(form) {
+                this.$refs[form].validate((valid) => {
+                   if (valid) {
+                       const tipBoxModel = {
+                           zlevel: 1,
+                           z: 1,
+                           point: {
+                               x: this.form.x,
+                               y: this.form.y
+                           },
+                           code: this.form.code,
+                           _type: 'TipBox',
+                           width: this.form.tipBoxWidth,
+                           height: this.form.tipBoxHeight,
+                           fillColor: this.form.fillColor
+                       };
+                       this.$emit('createTipBox', tipBoxModel);
+                       this.initPage();
+                   } else {
+                       return false;
+                   }
+                });
+
+            },
+            deleteDevice() {
+                const tipBoxModel = {
+                    zlevel: 1,
+                    z: 1,
+                    point: {
+                        x: this.form.x,
+                        y: this.form.y
+                    },
+                    code: this.form.code,
+                    _type: 'TipBox',
+                    width: this.form.tipBoxWidth,
+                    height: this.form.tipBoxHeight,
+                    fillColor: this.form.fillColor
+                };
+                this.$emit('deleteDataModel',tipBoxModel);
+                this.initPage();
+            },
+            initPage() {
+                this.isUpdate = false;
+                this.buttonText = '立即创建';
+                this.showDeleteButton = false;
+                this.form = {
+                    code: '',
+                    tipBoxWidth: '',
+                    tipBoxHeight: '',
+                    fillColor: '',
+                    x: 10,
+                    y: 10
+                };
+            },
+            generateCode() {
+                const mydate = new Date();
+                this.form.code =  "tipBox_"+mydate.getDay()+ mydate.getHours()+ mydate.getMinutes()+mydate.getSeconds()+mydate.getMilliseconds()+ Math.round(Math.random() * 10000);
+            }
+        }
+    };
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+    @import "src/styles/mixin.scss";
+    .button_box{
+        width: 100%;
+        background: #f0f0f0;
+        overflow: hidden;
+    }
+</style>
diff --git a/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/index.vue b/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/index.vue
index 1e06b7d61..42b4c8990 100644
--- a/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/index.vue
+++ b/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/index.vue
@@ -1,89 +1,183 @@
 <template>
-  <transition name="el-zoom-in-center">
-    <div class="map-control">
-      <el-card type="border-card">
-        <div slot="header" class="clearfix">
+    <transition name="el-zoom-in-center">
+        <div class="map-control">
+            <el-card type="border-card">
+                <div slot="header" class="clearfix">
           <span>
             车站名称
             <b>请选择车站</b>
           </span>
-          <el-button
-            type="text"
-            style="float: right; padding: 3px 0; margin-right: 5px;"
-            @click="handleSave"
-          >保存</el-button>
+                    <el-button
+                        type="text"
+                        style="float: right; padding: 3px 0; margin-right: 5px;"
+                        @click="handleSave"
+                    >保存</el-button>
+                </div>
+                <el-tabs v-model="enabledTab" class="mapEdit" type="card" @tab-click="handleTabClick">
+                    <el-tab-pane label="背景板" name="Background">
+                        <ibp-bg
+                            @createBg="createDataModel"
+                        ></ibp-bg>
+                    </el-tab-pane>
+                    <el-tab-pane  label="线条" name="IbpLine">
+                        <ibp-line ref="ibpline"
+                            @createLine="createDataModel" @deleteDataModel="deleteDataModel"
+                        >
+                        </ibp-line>
+                    </el-tab-pane>
+                    <el-tab-pane label="文字" name="IbpText">
+                        <ibp-text ref="ibptext"
+                            @createText="createDataModel" @deleteDataModel="deleteDataModel"
+                        >
+                        </ibp-text>
+                    </el-tab-pane>
+                    <el-tab-pane label="提示框" name="TipBox">
+                        <ibp-tip-box ref="tipbox"
+                            @createTipBox="createDataModel" @deleteDataModel="deleteDataModel"
+                        ></ibp-tip-box>
+                    </el-tab-pane>
+                    <el-tab-pane label="按钮" name="SquareButton">
+                        <ibp-button ref="squarebutton"
+                            @createButton="createDataModel" @deleteDataModel="deleteDataModel"
+                        >
+                        </ibp-button>
+                    </el-tab-pane>
+                    <el-tab-pane label="圆形指示灯" name="CircularLamp">
+                        <ibp-lamp ref="circularlamp"
+                            @createLamp="createDataModel" @deleteDataModel="deleteDataModel"
+                        >
+                        </ibp-lamp>
+                    </el-tab-pane>
+                    <el-tab-pane label="箭头" name="Arrow">
+                        <ibp-arrow ref="arrow"
+                            @createArrow="createDataModel" @deleteDataModel="deleteDataModel"
+                        >
+                        </ibp-arrow>
+                    </el-tab-pane>
+                    <el-tab-pane label="扶梯框" name="AppendageBox">
+                        <ibp-appendage-box ref="appendagebox"
+                            @createAppendageBox="createDataModel" @deleteDataModel="deleteDataModel"
+                        >
+                        </ibp-appendage-box>
+                    </el-tab-pane>
+                    <el-tab-pane label="报警器" name="Alarm">
+                        <ibp-alarm ref="alarm"
+                            @createAlarm="createDataModel" @deleteDataModel="deleteDataModel"
+                        >
+                        </ibp-alarm>
+                    </el-tab-pane>
+                    <el-tab-pane label="钥匙孔" name="RotatingButton">
+                        <ibp-rotating-button ref="rotatingbutton"
+                            @createRotatingButton="createDataModel" @deleteDataModel="deleteDataModel"
+                        >
+                        </ibp-rotating-button>
+                    </el-tab-pane>
+                    <el-tab-pane label="电话端子" name="TeleTerminal">
+                        <ibp-telephone-terminal ref="teleTerminal"
+                            @createTeleTerminal="createDataModel" @deleteDataModel="deleteDataModel"
+                        >
+                        </ibp-telephone-terminal>
+                    </el-tab-pane>
+                    <el-tab-pane label="电梯" name="elevator">
+                        <ibp-elevator ref="elevator"
+                            @createElevator="createDataModel" @deleteDataModel="deleteDataModel"
+                        >
+                        </ibp-elevator>
+                    </el-tab-pane>
+                    <el-tab-pane label="钥匙" name="key">
+                        <ibp-key ref="key"
+                            @createKey="createDataModel" @deleteDataModel="deleteDataModel"
+                        >
+                        </ibp-key>
+                    </el-tab-pane>
+                </el-tabs>
+            </el-card>
         </div>
-        <el-tabs v-model="enabledTab" class="mapEdit" type="card">
-          <el-tab-pane label="背景板" name="BgImage">
-            <ibp-bg
-              @createBg="createDataModel"
-            />
-          </el-tab-pane>
-          <el-tab-pane label="文字" name="Text">
-            <ibp-text
-              @createText="createDataModel"
-            />
-          </el-tab-pane>
-          <el-tab-pane label="功能提示" name="Tip">
-            <ibp-tip
-              @createTip="createDataModel"
-            />
-          </el-tab-pane>
-          <el-tab-pane label="按键" name="Button">
-            <ibp-button
-              @createButton="createDataModel"
-            />
-          </el-tab-pane>
-          <el-tab-pane label="圆形指示灯" name="CircularLamp" />
-          <el-tab-pane label="箭头" name="Arrow" />
-          <el-tab-pane label="扶梯框" name="AppendageBox" />
-          <el-tab-pane label="报警器" name="Alarm" />
-          <el-tab-pane label="旋转按钮" name="SpinButton" />
-        </el-tabs>
-      </el-card>
-    </div>
-  </transition>
+    </transition>
 </template>
 <script>
-import { updateIbpData } from '@/ibp/utils/parser';
-import IbpText from './ibpText';
-import IbpTip from './ibpTip';
-import IbpButton from './ibpButton';
-import IbpBg from './ibpBg';
+    import { checkLoginLine } from '@/api/login';
+    import { EventBus } from '@/scripts/event-bus';
+    import IbpText from './ibpText';
+    import IbpTipBox from './ibpTipBox';
+    import IbpButton from './ibpButton';
+    import IbpBg from './ibpBg';
+    import IbpAlarm from './ibpAlarm';
+    import IbpAppendageBox from './ibpAppendageBox';
+    import IbpArrow from './ibpArrow';
+    import IbpLamp from './ibpLamp';
+    import IbpRotatingButton from './ibpRotatingButton';
+    import IbpLine from './ibpLine';
+    import IbpTelephoneTerminal from './ibpTelephoneTerminal';
+    import IbpElevator from './ibpElevator';
+    import IbpKey from './ibpKey';
 
-export default {
-	name: 'IbpOperate',
-	components: {
-		IbpText,
-		IbpBg,
-		IbpButton,
-		IbpTip
-	},
-	mixins: [
 
-	],
-	data() {
-		return {
-			enabledTab: 'BgImage'
-		};
-	},
-	watch: {
 
-	},
-	mounted() {
+    export default {
+        name: 'IbpOperate',
+        components: {
+            IbpText,
+            IbpBg,
+            IbpButton,
+            IbpTipBox,
+            IbpAlarm,
+            IbpAppendageBox,
+            IbpArrow,
+            IbpLamp,
+            IbpRotatingButton,
+            IbpLine,
+            IbpTelephoneTerminal,
+            IbpElevator,
+            IbpKey
+        },
+        mixins: [
 
-	},
-	beforeDestroy() {
+        ],
+        data() {
+            return {
+                enabledTab: 'BgImage',
+                data: ''
+            };
+        },
+        watch: {
+            '$store.state.ibp.rightClickCount': function (val) {
+                const model = this.$store.getters['ibp/updateDeviceData'];
+                this.enabledTab = model._type;
+            }
+        },
+        mounted() {
 
-	},
-	methods: {
-		createDataModel(textModel) {
-			this.$store.dispatch('ibp/updateIbpDevices', textModel);
-			updateIbpData(textModel, 'update');
-		},
-		handleSave() {
-			console.log(this.$store.state.ibp.ibp);
-		}
-	}
-};
+        },
+        beforeDestroy() {
+
+        },
+        methods: {
+            createDataModel(model) {
+                console.log('-1',model);
+                this.$store.dispatch('ibp/updateIbpDevices', model);
+            },
+            deleteDataModel(model) {
+                this.$store.dispatch('ibp/deleteIbpDevices', model);
+            },
+            handleSave() {
+                const data = JSON.stringify(this.$store.state.ibp.ibp)
+                console.log(data);
+            },
+            handleTabClick() {
+                this.$refs.ibpline.initPage();
+                this.$refs.ibptext.initPage();
+                this.$refs.tipbox.initPage();
+                this.$refs.squarebutton.initPage();
+                this.$refs.circularlamp.initPage();
+                this.$refs.arrow.initPage();
+                this.$refs.appendagebox.initPage();
+                this.$refs.alarm.initPage();
+                this.$refs.rotatingbutton.initPage();
+                this.$refs.elevator.initPage();
+                this.$refs.key.initPage();
+                this.$refs.teleTerminal.initPage()
+            }
+        }
+    };
 </script>
diff --git a/src/views/ibp/ibpDraft/ibpEdit/index.vue b/src/views/ibp/ibpDraft/ibpEdit/index.vue
index 44a2ea3ef..8011d0ea8 100644
--- a/src/views/ibp/ibpDraft/ibpEdit/index.vue
+++ b/src/views/ibp/ibpDraft/ibpEdit/index.vue
@@ -1,65 +1,67 @@
 <template>
-  <transition name="el-zoom-in-center">
-    <div class="mapPaint">
-      <div class="map-view">
-        <ibp-plate ref="ibpPlate" />
-      </div>
-      <div class="map-draft">
-        <ibp-operate ref="ibpOperate" />
-      </div>
-    </div>
-  </transition>
+    <transition name="el-zoom-in-center">
+        <div class="mapPaint">
+            <div class="map-view">
+                <ibp-plate ref="ibpPlate"/>
+            </div>
+            <div class="map-draft">
+                <ibp-operate  ref="ibpOperate"></ibp-operate>
+            </div>
+        </div>
+    </transition>
 </template>
 <script>
-import IbpPlate from '@/views/ibp/index';
-import WindowResizeHandler from '@/mixin/WindowResizeHandler';
-import IbpOperate from './ibpOperate/index';
+    import { checkLoginLine } from '@/api/login';
+    import IbpPlate from '@/views/ibp/index';
+    import WindowResizeHandler from '@/mixin/WindowResizeHandler';
+    import { EventBus } from '@/scripts/event-bus';
+    import IbpOperate from './ibpOperate/index';
 
-export default {
-	name: 'MapView',
-	components: {
-		IbpPlate,
-		IbpOperate
-	},
-	mixins: [
-		WindowResizeHandler
-	],
-	data() {
-		return {
-			mapSaveing: false,
-			viewDraft: 'draft',
-			autoSaveTask: null,
-			selected: null,
-			mapInfo: { name: '' },
-			timeDemon: null
-		};
-	},
-	watch: {
+    export default {
+        name: 'IbpView',
+        components: {
+            IbpPlate,
+            IbpOperate
+        },
+        mixins: [
+            WindowResizeHandler
+        ],
+        data() {
+            return {
+                mapSaveing: false,
+                viewDraft: 'draft',
+                autoSaveTask: null,
+                selected: null,
+                mapInfo: { name: "" },
+                timeDemon: null
+            };
+        },
+        watch: {
 
-	},
-	mounted() {
-		this.$refs.ibpPlate.show();
-		this.$refs.ibpPlate.drawIbpInit();
-	},
-	beforeDestroy() {
+        },
+        mounted() {
+            this.$refs.ibpPlate.show();
+            this.$refs.ibpPlate.drawIbpInit();
+        },
+        beforeDestroy() {
 
-	},
-	methods: {
-		resizeHandler() {
-			this._clientWidth = this._clientWidth || document.documentElement.clientWidth;
-			this._clientHeight = this._clientHeight || document.documentElement.clientHeight;
-			const width = this._clientWidth - 521;
-			const height = this._clientHeight - 60;
-			this.$store.dispatch('config/resize', { width: width, height: height });
-		},
-		endViewLoading(isSuccess) {
+        },
+        methods: {
+            resizeHandler() {
+                this._clientWidth = this._clientWidth || document.documentElement.clientWidth;
+                this._clientHeight = this._clientHeight || document.documentElement.clientHeight;
+                const width = this._clientWidth - 521;
+                const height = this._clientHeight;
+                this.$store.dispatch('config/resize', { width: width, height: height });
+            },
+            endViewLoading(isSuccess) {
 
-		},
-		selectViewDraft(data) {
-			this.viewDraft = data;
-		}
-	}
-};
+            },
+            selectViewDraft(data) {
+                this.viewDraft = data;
+            }
+        }
+    };
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
     @import "src/styles/mixin.scss";
diff --git a/src/views/ibp/index.vue b/src/views/ibp/index.vue
index 8815012a0..4a23f1b71 100644
--- a/src/views/ibp/index.vue
+++ b/src/views/ibp/index.vue
@@ -1,133 +1,129 @@
 <template>
-    <div>
-        <div :id="ibpId" :style="{ width: '100%', height: '100%' }" class="ibp-canvas"></div>
-        <el-button v-if="showBackButton" class="ibp-button" type="primary" @click="back">返回</el-button>
-    </div>
+  <div>
+    <div :id="ibpId" :style="{ width: '100%', height: '100%' }" class="ibp-canvas" />
+    <el-button v-if="showBackButton" class="ibp-button" type="primary" @click="back">返回</el-button>
+  </div>
 </template>
 
 <script>
 import Vue from 'vue';
-import localStore from 'storejs';
 import IbpPan from '@/ibp/ibpPan';
 import { parser } from '@/ibp/utils/parser';
-import ibpData from '@/ibp/constant/ibpData'
+import ibpData from '@/ibp/constant/ibpData';
 import { mapGetters } from 'vuex';
 
 export default {
-    name: 'Ibp',
-    components: {
+	name: 'Ibp',
+	data() {
+		return {
+			width: this.$store.state.config.width,
+			height: this.$store.state.config.height,
+			dataZoom: {
+				offsetX: '0',
+				offsetY: '0',
+				scaleRate: '1'
+			},
+			config: {
+				scaleRate: '1',
+				origin: {
+					x: 0,
+					y: 0
+				}
+			},
+			showBackButton: true
+		};
+	},
+	computed: {
+		...mapGetters([
+			'canvasWidth',
+			'canvasHeight'
+		]),
+		ibpId() {
+			const ibpId = ['ibp', (Math.random().toFixed(5)) * 100000].join('_');
+			// this.$store.dispatch('config/setCurrentIbpId', { id: ibpId });
+			return ibpId;
+		}
+	},
+	watch: {
+		'$store.state.config.canvasSizeCount': function (val) {
+			this.resetSize();
+		}
+	},
+	mounted() {
+	},
+	beforeDestroy() {
+		if (this.$ibp) {
+			this.$ibp.dispose();
+		}
+	},
+	methods: {
+		resizeHandler() {
+			this._clientWidth = this._clientWidth || document.documentElement.clientWidth;
+			this._clientHeight = this._clientHeight || document.documentElement.clientHeight;
+			const width = this._clientWidth - 521;
+			const height = this._clientHeight - 60;
+			this.$store.dispatch('config/resize', { width: width, height: height });
+		},
+		show: function () {
+			document.getElementById(this.ibpId).oncontextmenu = function (e) {
+				return false;
+			};
 
-    },
-    data() {
-        return {
-            width: this.$store.state.config.width,
-            height: this.$store.state.config.height,
-            dataZoom: {
-                offsetX: '0',
-                offsetY: '0',
-                scaleRate: '1'
-            },
-            config: {
-                scaleRate: '1',
-                origin: {
-                    x: 0,
-                    y: 0
-                }
-            },
-            showBackButton: true
-        };
-    },
-    computed: {
-        ...mapGetters([
-            'canvasWidth',
-            'canvasHeight'
-        ]),
-        ibpId() {
-            const ibpId = ['ibp', (Math.random().toFixed(5)) * 100000].join('_');
-            // this.$store.dispatch('config/setCurrentIbpId', { id: ibpId });
-            return ibpId;
-        }
-    },
-    watch: {
-        '$store.state.config.canvasSizeCount': function (val) {
-            this.resetSize();
-        }
-    },
-    mounted() {
-    },
-    beforeDestroy() {
-        if (this.$ibp) {
-            this.$ibp.dispose();
-        }
-    },
-    methods: {
-        resizeHandler() {
-            this._clientWidth = this._clientWidth || document.documentElement.clientWidth;
-            this._clientHeight = this._clientHeight || document.documentElement.clientHeight;
-            const width = this._clientWidth - 521;
-            const height = this._clientHeight - 60;
-            this.$store.dispatch('config/resize', { width: width, height: height });
-        },
-        show: function () {
-            document.getElementById(this.ibpId).oncontextmenu = function (e) {
-                return false;
-            };
+			const data = parser(ibpData, {width: this.canvasWidth, height: this.canvasHeight});
+			this.$ibp = new IbpPan({
+				dom: document.getElementById(this.ibpId),
+				config: {
+					renderer: 'canvas',
+					width: this.canvasWidth,
+					height: this.canvasHeight
+				},
+				options: {
+					scaleRate: 1,
+					offsetX: 0,
+					offsetY: 0
+				},
+				methods: {
+					dataLoaded: this.handleDataLoaded,
+					viewLoaded: this.handleViewLoaded,
+					stateLoaded: this.handleStateLoaded
+				}
+			});
+			Vue.prototype.$ibp = this.$ibp;
+			this.setMap(data);
+			this.$store.dispatch('ibp/setIbpData', ibpData);
+			window.document.oncontextmenu = function () {
+				return false;
+			};
+		},
+		setMap(data) {
+			this.$ibp.setMap(data, data);
+		},
+		resetSize() {
+			this.$nextTick(() => {
+				this.width = this.$store.state.config.width;
+				this.height = this.$store.state.config.height;
 
-            const data = parser(ibpData,{width: this.canvasWidth, height: this.canvasHeight});
-            this.$ibp = new IbpPan({
-                dom: document.getElementById(this.ibpId),
-                config: {
-                    renderer: 'canvas',
-                    width: this.canvasWidth,
-                    height: this.canvasHeight
-                },
-                options: {
-                    scaleRate: 1,
-                    offsetX: 0,
-                    offsetY: 0
-                },
-                methods: {
-                    dataLoaded: this.handleDataLoaded,
-                    viewLoaded: this.handleViewLoaded,
-                    stateLoaded: this.handleStateLoaded
-                }
-            });
-            Vue.prototype.$ibp = this.$ibp;
-            this.setMap(data);
-            this.$store.dispatch('ibp/setIbpData', ibpData);
-            window.document.oncontextmenu = function () {
-                return false;
-            };
-        },
-        setMap(data) {
-            this.$ibp.setMap(data, data);
-        },
-        resetSize() {
-            this.$nextTick(() => {
-                this.width = this.$store.state.config.width;
-                this.height = this.$store.state.config.height;
+				this.$ibp && this.$ibp.resize({ width: this.width, height: this.height });
+			});
+		},
+		back() {
+			this.$emit('hideIbp');
+		},
 
-                this.$ibp && this.$ibp.resize({ width: this.width, height: this.height });
-            });
-        },
-        back() {
-            this.$emit('hideIbp');
-        },
-
-        // 点击选择事件
-        onSelected(em) {
-            this.$emit('onSelect', em);
-        },
-        // 右键点击事件
-        onContextMenu(em) {
-            this.$emit('onMenu', em);
-        },
-        // 绘图时调用，元素可拖拽
-        drawIbpInit() {
-            this.$ibp.drawIbpInit();
-            this.showBackButton = false;
-        }
-    }
+		// 点击选择事件
+		onSelected(em) {
+			this.$emit('onSelect', em);
+		},
+		// 右键点击事件
+		onContextMenu(em) {
+			this.$emit('onMenu', em);
+		},
+		// 绘图时调用，元素可拖拽
+		drawIbpInit() {
+			this.$ibp.drawIbpInit();
+			this.showBackButton = false;
+		}
+	}
 };
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 6dcd9c867..94c081631 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -46,7 +46,6 @@
 
 <script>
 import md5 from 'js-md5';
-import localStore from 'storejs';
 
 export default {
 	name: 'Login',
@@ -95,8 +94,6 @@ export default {
 					const model = Object.assign({}, this.loginForm);
 					model.password = md5(model.password);
 					model.type = 'class';
-					// 清空js的localStorage值
-					localStore.clear();
 
 					this.loading = true;
 					this.$store.dispatch('Login', model).then(() => {
@@ -126,7 +123,7 @@ export default {
   .login-container {
     .el-input {
       display: inline-block;
-      height: 47px;
+      height: 50px;
       width: 85%;
 
       input {
@@ -134,9 +131,9 @@ export default {
         border: 0px;
         -webkit-appearance: none;
         border-radius: 0px;
-        padding: 12px 5px 12px 15px;
+        padding: 8px 9px 12px 15px;
         color: $light_gray;
-        height: 47px;
+		height: 50px;
 
         &:-webkit-autofill {
           -webkit-box-shadow: 0 0 0px 1000px $bg inset !important;
@@ -187,7 +184,7 @@ export default {
     }
 
     .svg-container {
-      padding: 6px 5px 6px 15px;
+      padding: 6px 5px 6px 9px;
       color: $dark_gray;
       vertical-align: middle;
       width: 30px;
diff --git a/src/views/login/loginNew.vue b/src/views/login/loginNew.vue
index 3964372fd..1d1f1746f 100644
--- a/src/views/login/loginNew.vue
+++ b/src/views/login/loginNew.vue
@@ -41,10 +41,8 @@
 
 <script>
 import QrcodeVue from 'qrcode.vue';
-import localStore from 'storejs';
 import { getLoginUrl, checkLoginStatus } from '@/api/login';
 import { setToken } from '@/utils/auth';
-// import { getSessionId } from '@/utils/index';
 import { LoginParams } from '@/utils/login';
 
 export default {
@@ -97,9 +95,6 @@ export default {
 				return;
 			}
 
-			// 清空js的localStorage值
-			localStore.clear();
-
 			// 清空已存在的定时器
 			// 设置定时器检测
 			this.clearTimer(this.checkLogin);
diff --git a/src/views/login/loginNewPlan.vue b/src/views/login/loginNewPlan.vue
index b60bd806f..c676f8aeb 100644
--- a/src/views/login/loginNewPlan.vue
+++ b/src/views/login/loginNewPlan.vue
@@ -40,7 +40,6 @@
 
 <script>
 import QrcodeVue from 'qrcode.vue';
-import localStore from 'storejs';
 import { getLoginUrl, checkLoginStatus } from '@/api/login';
 import { setPlanToken } from '@/utils/auth';
 // import { getSessionId } from '@/utils/index';
@@ -97,9 +96,6 @@ export default {
 				return;
 			}
 
-			// 清空js的localStorage值
-			localStore.clear();
-
 			// 清空已存在的定时器
 			// 设置定时器检测
 			this.clearTimer(this.checkLogin);
diff --git a/src/views/login/loginNewScreen.vue b/src/views/login/loginNewScreen.vue
index eaf7f09c2..2e1469266 100644
--- a/src/views/login/loginNewScreen.vue
+++ b/src/views/login/loginNewScreen.vue
@@ -40,10 +40,8 @@
 
 <script>
 import QrcodeVue from 'qrcode.vue';
-import localStore from 'storejs';
 import { getLoginUrl, checkLoginStatus } from '@/api/login';
 import { setScreenToken } from '@/utils/auth';
-// import { getSessionId } from '@/utils/index';
 import { UrlConfig } from '@/router/index';
 import { LoginParams } from '@/utils/login';
 
@@ -97,9 +95,6 @@ export default {
 				return;
 			}
 
-			// 清空js的localStorage值
-			localStore.clear();
-
 			// 清空已存在的定时器
 			// 设置定时器检测
 			this.clearTimer(this.checkLogin);
diff --git a/src/views/login/loginPlan.vue b/src/views/login/loginPlan.vue
index 422506c6c..f1ecc9013 100644
--- a/src/views/login/loginPlan.vue
+++ b/src/views/login/loginPlan.vue
@@ -52,7 +52,6 @@
 
 <script>
 import md5 from 'js-md5';
-import localStore from 'storejs';
 import { UrlConfig } from '@/router/index';
 
 export default {
@@ -102,8 +101,7 @@ export default {
 					const model = Object.assign({}, this.loginForm);
 					model.password = md5(model.password);
 					model.type = 'plan';
-					// 清空js的localStorage值
-					localStore.clear();
+
 					this.loading = true;
 					this.$store.dispatch('Login', model).then(() => {
 						this.$store.dispatch('GetUserConfigInfo');
@@ -133,7 +131,7 @@ export default {
     .login-container {
         .el-input {
             display: inline-block;
-            height: 47px;
+            height: 50px;
             width: 85%;
 
             input {
@@ -141,9 +139,9 @@ export default {
                 border: 0px;
                 -webkit-appearance: none;
                 border-radius: 0px;
-                padding: 12px 5px 12px 15px;
+                padding: 8px 9px 12px 15px;
                 color: $light_gray;
-                height: 47px;
+                height: 50px;
 
                 &:-webkit-autofill {
                     -webkit-box-shadow: 0 0 0px 1000px $bg inset !important;
@@ -194,7 +192,7 @@ export default {
         }
 
         .svg-container {
-            padding: 6px 5px 6px 15px;
+            padding: 6px 5px 6px 9px;
             color: $dark_gray;
             vertical-align: middle;
             width: 30px;
diff --git a/src/views/login/loginScreen.vue b/src/views/login/loginScreen.vue
index c68dc3361..37f8668e7 100644
--- a/src/views/login/loginScreen.vue
+++ b/src/views/login/loginScreen.vue
@@ -52,7 +52,6 @@
 
 <script>
 import md5 from 'js-md5';
-import localStore from 'storejs';
 import { UrlConfig } from '@/router/index';
 
 export default {
@@ -102,8 +101,7 @@ export default {
 					const model = Object.assign({}, this.loginForm);
 					model.password = md5(model.password);
 					model.type = 'dp';
-					// 清空js的localStorage值
-					localStore.clear();
+
 					this.loading = true;
 					this.$store.dispatch('Login', model).then(() => {
 						this.$store.dispatch('GetUserConfigInfo');
@@ -133,7 +131,7 @@ export default {
     .login-container {
         .el-input {
             display: inline-block;
-            height: 47px;
+            height: 50px;
             width: 85%;
 
             input {
@@ -141,9 +139,9 @@ export default {
                 border: 0px;
                 -webkit-appearance: none;
                 border-radius: 0px;
-                padding: 12px 5px 12px 15px;
+                padding: 8px 9px 12px 15px;
                 color: $light_gray;
-                height: 47px;
+                height: 50px;
 
                 &:-webkit-autofill {
                     -webkit-box-shadow: 0 0 0px 1000px $bg inset !important;
@@ -194,7 +192,7 @@ export default {
         }
 
         .svg-container {
-            padding: 6px 5px 6px 15px;
+            padding: 6px 5px 6px 9px;
             color: $dark_gray;
             vertical-align: middle;
             width: 30px;
diff --git a/src/views/management/dictionaryDetail/index.vue b/src/views/management/dictionaryDetail/index.vue
index 262d1884c..ac8b5f960 100644
--- a/src/views/management/dictionaryDetail/index.vue
+++ b/src/views/management/dictionaryDetail/index.vue
@@ -133,12 +133,18 @@ export default {
 		},
 
 		handleDelete(index, row) {
-			del(this.dicId, row.id).then(response => {
-				this.$message.success(this.$t('system.deleteSuccess'));
-				this.reloadTable();
-			}).catch(() => {
-				this.reloadTable();
-				this.$messageBox(this.$t('error.deleteFailed'));
+			this.$confirm(this.$t('system.wellDelType'), this.$t('global.tips'), {
+				confirmButtonText: this.$t('global.confirm'),
+				cancelButtonText: this.$t('global.cancel'),
+				type: 'warning'
+			}).then(() => {
+				del(this.dicId, row.id).then(response => {
+					this.$message.success(this.$t('system.deleteSuccess'));
+					this.reloadTable();
+				}).catch(() => {
+					this.reloadTable();
+					this.$messageBox(this.$t('error.deleteFailed'));
+				});
 			});
 		},
 
diff --git a/src/views/management/userControl/index.vue b/src/views/management/userControl/index.vue
index b85cd59df..cb4010e4d 100644
--- a/src/views/management/userControl/index.vue
+++ b/src/views/management/userControl/index.vue
@@ -59,7 +59,7 @@ export default {
 						prop: 'mobile'
 					},
 					{
-						title: this.$t('system.global.email'),
+						title: this.$t('global.email'),
 						prop: 'email'
 					},
 					{
diff --git a/src/views/map/mapdraft/mapedit/index.vue b/src/views/map/mapdraft/mapedit/index.vue
index 44a7daf67..2c3233432 100644
--- a/src/views/map/mapdraft/mapedit/index.vue
+++ b/src/views/map/mapdraft/mapedit/index.vue
@@ -316,6 +316,11 @@ export default {
 		}
 	}
 
+	.mapPaint{
+		height: 100%;
+		overflow: hidden;
+	}
+
     .map-view {
         float: left;
         width: auto;
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/link.vue b/src/views/map/mapdraft/mapedit/mapoperate/link.vue
index 11e43b69e..68d83d0ea 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/link.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/link.vue
@@ -585,6 +585,10 @@ export default {
 <style rel="stylesheet/scss" lang="scss" scoped>
     @import "src/styles/mixin.scss";
 
+	.view-control{
+		height: calc(100% - 100px);
+	}
+
 	.button_box{
 		width: 100%;
 		background: #f0f0f0;
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/section.vue b/src/views/map/mapdraft/mapedit/mapoperate/section.vue
index b5b36955b..97e13fc71 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/section.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/section.vue
@@ -182,7 +182,6 @@ export default {
 				destinationCode: '', // 目的地码
 				destinationCodePoint: { x: 0, y: 0 }, // 目的地码坐标
 				destinationCodeShow: false, // 是否显示目的地码
-				// nameShow: false,
 				axleShow: false,
 				namePoint: { x: 0, y: 0 },
 				kmRangeRight: 0,
@@ -190,7 +189,6 @@ export default {
 				region: '',
 				logicSectionNum: [],
 				logicSectionShow: false,
-				// logicSectionNameShow: false,
 				isStandTrack: false,
 				standTrackName: '',
 				standTrackNamePosition: { x: 0, y: 0 },
@@ -212,7 +210,6 @@ export default {
 				sepTypeRight: '',
 				offsetRight: 0,
 				trainPosType: '01',
-				// pointY: '',
 				parentCode: '',
 				points: [],
 				isCurve: false
@@ -326,7 +323,6 @@ export default {
 							{ prop: 'relSwitchCode', label: this.$t('map.relSwitchCode'), type: 'select', optionLabel: 'code&&name', optionValue: 'code', options: this.switchList, change: true, deviceChange: this.deviceChange, isHidden: !this.isRelSwitchCode, disabled: true },
 
 							{ prop: 'logicSectionShow', label: this.$t('map.displayLogicalExtents'), type: 'checkbox', isHidden: !this.isSwitchSectionShow }, // 1
-							// { prop: 'logicSectionNameShow', label: this.$t('map.displayLogicalWxtentNames'), type: 'checkbox', disabled: this.islogicSectionNameShow, isHidden: !this.isSwitchSectionShow }, // 1
 							{ prop: 'logicSectionNameSort', label: this.$t('map.logicSectionNameSort'), type: 'radio', isHidden: !this.isLogicSectionNameSort, radioList: [
 								{value: true, label: this.$t('map.fromSmallToLarge')},
 								{value: false, label: this.$t('map.fromLargeToSmall')}
@@ -457,9 +453,6 @@ export default {
 		isStationAxleShow() {
 			return this.editModel.section == '02';
 		},
-		// islogicSectionNameShow() {
-		// 	return !this.editModel.logicSectionShow;
-		// },
 		isstandTrackNameShow() {
 			return this.editModel.type !== '03' && this.editModel.isStandTrack;
 		},
@@ -561,7 +554,6 @@ export default {
 						x: selected.namePosition.x,
 						y: selected.namePosition.y
 					};
-					// this.editModel.nameShow = selected.nameShow;
 					this.editModel.axleShow = selected.axleShow;
 					this.editModel.relStandCode = selected.relStandCode;
 					this.editModel.leftStopPointOffset = selected.leftStopPointOffset;
@@ -581,7 +573,6 @@ export default {
 
 					this.editModel.logicSectionNum = selected.type === '01' ? selected.logicSectionNum : [0];
 					this.editModel.logicSectionShow = selected.logicSectionShow;
-					// this.editModel.logicSectionNameShow = selected.logicSectionNameShow;
 					this.editModel.isStandTrack = selected.isStandTrack;
 					this.editModel.standTrackName = selected.standTrackName;
 					this.editModel.standTrackNamePosition = {
@@ -666,7 +657,6 @@ export default {
 				axleShow: false,
 				type: '02',
 				namePosition: { x: 0, y: 0 },
-				// nameShow: model.logicSectionNameShow,
 				isStandTrack: false,
 				standTrackName: model.standTrackName,
 				standTrackNamePosition: {
@@ -695,7 +685,6 @@ export default {
 				relSwitchCode: model.relSwitchCode,
 				logicSectionNum: [],
 				logicSectionShow: model.logicSectionShow,
-				// logicSectionNameShow: model.logicSectionNameShow,
 				stationCode: model.stationCode,
 				linkCode: model.linkCode,
 				offsetLeft: middleOffset * (index) + model.offsetLeft,
@@ -776,7 +765,6 @@ export default {
 							code: uid,
 							name: uname,
 							type: '01',
-							// nameShow: true,
 							axleShow: false,
 							isStandTrack: false,
 							standTrackName: '',
@@ -797,7 +785,6 @@ export default {
 							namePosition: { x: 0, y: 0 },
 							logicSectionNum: [0],
 							logicSectionShow: true,
-							// logicSectionNameShow: true,
 							logicSectionNameSort: true,
 							linkCode: link.code,
 							sepTypeLeft: '01',
@@ -880,8 +867,6 @@ export default {
 				relStandCode: this.editModel.relStandCode,
 				leftStopPointOffset: Number(this.editModel.leftStopPointOffset),
 				rightStopPointOffset: Number(this.editModel.rightStopPointOffset),
-
-				// nameShow: this.editModel.nameShow,
 				axleShow: this.editModel.axleShow,
 				namePosition: {
 					x: this.editModel.namePoint.x,
@@ -919,7 +904,6 @@ export default {
 				points: JSON.parse(pointArr),
 				logicSectionNum: this.editModel.logicSectionNum,
 				logicSectionShow: this.editModel.logicSectionShow,
-				// logicSectionNameShow: this.editModel.logicSectionNameShow,
 				sepTypeLeft: this.editModel.sepTypeLeft,
 				offsetLeft: this.editModel.offsetLeft,
 				sepTypeRight: this.editModel.sepTypeRight,
@@ -947,15 +931,10 @@ export default {
 					const model = this.buildEditModel();
 					this.sectionList.forEach(section => {
 						if (section.parentCode == model.code) {
-							// section.nameShow = section.logicSectionNameShow = model.logicSectionNameShow;
 							section.logicSectionShow = model.logicSectionShow;
 							section.trainPosType = model.trainPosType;
 							edits.push(section);
 						}
-						// if (section.points[0].y == this.editModel.pointY && section.points[section.points.length - 1].y == this.editModel.pointY) {
-						// 	section.trainPosType = this.editModel.trainPosType;
-						// 	edits.push(section);
-						// }
 					});
 					edits.push(model);
 					this.fieldS = '';
@@ -1005,7 +984,6 @@ export default {
 							name: uidL,
 							type: '01',
 							parentCode: '',
-							// nameShow: selected.nameShow,
 							axleShow: selected.axleShow,
 							isStandTrack: false,
 							kmRangeRight: '',
@@ -1026,7 +1004,6 @@ export default {
 							logicSectionNameSort: selected.logicSectionNameSort,
 							logicSectionNum: selected.logicSectionNum,
 							logicSectionShow: selected.logicSectionShow,
-							// logicSectionNameShow: selected.logicSectionNameShow,
 							sepTypeLeft: selected.sepTypeLeft,
 							offsetLeft: selected.offsetLeft,
 							sepTypeRight: '01',
@@ -1052,7 +1029,6 @@ export default {
 							name: uidR,
 							type: '01',
 							parentCode: '',
-							// nameShow: selected.nameShow,
 							axleShow: selected.axleShow,
 							isStandTrack: false,
 							kmRangeRight: '',
@@ -1073,7 +1049,6 @@ export default {
 							logicSectionNameSort: selected.logicSectionNameSort,
 							logicSectionNum: selected.logicSectionNum,
 							logicSectionShow: selected.logicSectionShow,
-							// logicSectionNameShow: selected.logicSectionNameShow,
 							sepTypeLeft: '01',
 							offsetLeft: selected.offsetLeft,
 							sepTypeRight: selected.sepTypeRight,
@@ -1165,7 +1140,6 @@ export default {
 							});
 
 							if (lsection.points[lsection.points.length - 1].x == rsection.points[0].x && lsection.points[lsection.points.length - 1].y == rsection.points[0].y) {
-								// model.nameShow = lsection.nameShow;
 								model.axleShow = lsection.axleShow;
 								model.logicSectionNum = lsection.logicSectionNum;
 								model.logicSectionShow = lsection.logicSectionShow;
@@ -1174,7 +1148,6 @@ export default {
 								model.offsetLeft = lsection.offsetLeft;
 								model.sepTypeRight = rsection.sepTypeRight;
 								model.offsetRight = lsection.offsetRight + rsection.offsetRight;
-								// model.logicSectionNameShow = lsection.logicSectionNameShow;
 								model.isCurve = lsection.isCurve;
 								model.points = [
 									{ x: lsection.points[0].x, y: lsection.points[0].y },
@@ -1186,7 +1159,6 @@ export default {
 								this.$emit('addOrUpdateMapModel', model);
 							}
 							if (lsection.points[0].x == rsection.points[rsection.points.length - 1].x && lsection.points[0].y == rsection.points[rsection.points.length - 1].y) {
-								// model.nameShow = rsection.nameShow;
 								model.axleShow = rsection.axleShow;
 								model.logicSectionNum = rsection.logicSectionNum;
 								model.logicSectionShow = rsection.logicSectionShow;
@@ -1195,7 +1167,6 @@ export default {
 								model.offsetLeft = rsection.offsetLeft;
 								model.sepTypeRight = lsection.sepTypeRight;
 								model.offsetRight = lsection.offsetRight + rsection.offsetRight;
-								// model.logicSectionNameShow = rsection.logicSectionNameShow;
 								model.isCurve = rsection.isCurve;
 								model.points = [
 									{ x: rsection.points[0].x, y: rsection.points[0].y },
@@ -1269,7 +1240,6 @@ export default {
 								code: uid,
 								name: sectiona.name || sectionb.name || sectionc.name,
 								type: '03',
-								// nameShow: true,
 								axleShow: false,
 								namePosition: point,
 								isStandTrack: false,
@@ -1291,7 +1261,6 @@ export default {
 								points: [{ x: 0, y: 0 }, { x: 0, y: 0 }],
 								logicSectionNum: [0],
 								logicSectionShow: false,
-								// logicSectionNameShow: false,
 								sepTypeLeft: '00',
 								offsetLeft: 0,
 								sepTypeRight: '00',
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/signal.vue b/src/views/map/mapdraft/mapedit/mapoperate/signal.vue
index 1fd3d4dd5..44c4ef97e 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/signal.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/signal.vue
@@ -223,7 +223,6 @@ export default {
 								{ prop: 'position.x', firstLevel: 'position', secondLevel: 'x', label: 'x:', type: 'number', labelWidth: '25px' },
 								{ prop: 'position.y', firstLevel: 'position', secondLevel: 'y', label: 'y:', type: 'number', labelWidth: '25px' }
 							] },
-							// { prop: 'nameShow', label: this.$t('map.signalDisplayName'), type: 'checkbox' },
 							{ prop: 'lampPostType', label: this.$t('map.lampPostType'), type: 'select', optionLabel: 'name', optionValue: 'code', options: this.SignalLampPostTypeList },
 							{ prop: 'lampPositionType', label: this.$t('map.lampPositionType'), type: 'select', optionLabel: 'name', optionValue: 'code', options: this.SignalLampPositionTypeList },
 							{ prop: 'directionType', label: this.$t('map.signalDirectionType'), type: 'select', optionLabel: 'name', optionValue: 'code', options: this.SignalDirectionTypeList },
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/station.vue b/src/views/map/mapdraft/mapedit/mapoperate/station.vue
index c6676f736..682ded21e 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/station.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/station.vue
@@ -118,6 +118,7 @@ export default {
 								{ prop: 'position.x', firstLevel: 'position', secondLevel: 'x', label: 'x:', type: 'number', labelWidth: '25px' },
 								{ prop: 'position.y', firstLevel: 'position', secondLevel: 'y', label: 'y:', type: 'number', labelWidth: '25px' }
 							] },
+							{ prop: 'visible', label: this.$t('map.stationstandShowName'), type: 'checkbox' },
 							{ prop: 'nameFont', label: this.$t('map.stationNameFont'), type: 'font', placeholder: this.$t('tip.stationFont') },
 							{ prop: 'nameFontColor', label: this.$t('map.stationNameFontColor'), type: 'color' },
 							{ prop: 'kmRange', label: this.$t('map.stationKmRange'), type: 'number', min: 0, placeholder: this.$t('tip.meter') },
@@ -236,7 +237,6 @@ export default {
 							zcCode: '',
 							runPlanName: '',
 							visible: true,
-							nameShow: true,
 							nameFont: '14px consolas',
 							nameFontColor: '#FFFFFF',
 							kmPost: '1000km~2000km',
diff --git a/src/views/mapsystem/common/index.vue b/src/views/mapsystem/common/index.vue
index 928c90a46..a57fcb724 100644
--- a/src/views/mapsystem/common/index.vue
+++ b/src/views/mapsystem/common/index.vue
@@ -109,7 +109,7 @@ export default {
 			this.point = { x: em.clientX, y: em.clientY };
 
 			if (em.subType === 'TrainWindow') {
-				device = { _type: deviceType.Train, _code: em.deviceCode };
+				device = { _type: deviceType.Train, code: em.deviceCode };
 				this.$store.dispatch('map/setTrainWindowShow', true);
 			} else if (em.deviceCode && !this.isScreen) {
 				device = this.getDeviceByEm(em);
diff --git a/src/views/orderauthor/author/detail.vue b/src/views/orderauthor/author/detail.vue
index 046a09d35..84e70e698 100644
--- a/src/views/orderauthor/author/detail.vue
+++ b/src/views/orderauthor/author/detail.vue
@@ -1,91 +1,113 @@
 <template>
-  <el-dialog :title="title" :visible.sync="dialogVisible" width="30%" :before-close="handleClose" center>
-    <div v-if="orderType">
-      <data-form ref="dataform" :form="formOrder" :form-model="formOrderModel" />
+  <div>
+    <QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
+    <div class="draft">
+      <el-button-group>
+        <el-button type="primary" @click="turnback">{{ $t('global.return') }}</el-button>
+      </el-button-group>
     </div>
-    <div v-else>
-      <data-form ref="dataform" :form="form" :form-model="formModel" />
-    </div>
-    <span slot="footer" class="dialog-footer">
-      <el-button type="primary" @click="handleClose">{{ $t('global.close') }}</el-button>
-    </span>
-  </el-dialog>
+  </div>
 </template>
 
 <script>
+import { getPermissonDetail } from '@/api/management/author';
+
 export default {
-	name: 'AuthorDetail',
+	name: 'Author',
+	components: {
+	},
 	data() {
 		return {
-			dialogVisible: false,
-			formModel: {
-				source: '',
-				userMobile: '',
-				userName: ''
-			},
-			formOrderModel: {
-				source: '',
-				order: ''
-			},
 			PermissionTypeList: [],
-			orderType: '',
-			order: ''
+			ruleList: [
+				{ value: true, label: '是' },
+				{ value: false, label: '否' }
+			],
+			pagerConfig: {
+				pageSize: 'pageSize',
+				pageIndex: 'pageNum'
+			},
+			queryForm: {
+				labelWidth: '140px',
+				reset: true,
+				show: false,
+				queryObject: {
+				}
+			},
+			queryList: {
+				query: this.queryFunction,
+				selectCheckShow: false,
+				indexShow: true,
+				columns: [
+					{
+						title: '权限名称',
+						prop: 'name'
+					},
+					{
+						title: '是否包权限',
+						prop: 'isPackage',
+						type: 'tag',
+						columnValue: (row) => { return this.$convertField(row.isPackage, this.ruleList, ['value', 'label']); },
+						tagType: (row) => { return ''; }
+					},
+					{
+						title: this.$t('orderAuthor.permissionType'),
+						prop: 'type',
+						type: 'tag',
+						columnValue: (row) => { return this.$convertField(row.type, this.PermissionTypeList, ['value', 'label']); },
+						tagType: (row) => { return ''; }
+					},
+					{
+						title: '创建时间',
+						prop: 'createTime'
+					},
+					{
+						title: '创建者',
+						prop: 'creatorUserName'
+					},
+					{
+						type: 'button',
+						title: this.$t('global.operate'),
+						width: '150',
+						buttons: [
+						]
+					}
+				],
+				actions: [
+				]
+			}
 		};
 	},
-	computed: {
-		form() {
-			const form = {
-				labelWidth: '130px',
-				items: [
-					{ prop: 'source', label: this.$t('orderAuthor.source'), type: 'text', disabled: true },
-					{ prop: 'name', label: this.$t('orderAuthor.distributionUser'), type: 'text', disabled: true },
-					{ prop: 'mobile', label: this.$t('orderAuthor.userMobile'), type: 'text', disabled: true }
-				]
-			};
-			return form;
-		},
-		formOrder() {
-			const form = {
-				labelWidth: '130px',
-				items: [
-					{ prop: 'source', label: this.$t('orderAuthor.source'), type: 'text', disabled: true },
-					{ prop: 'order', label: this.$t('orderAuthor.orderNumber'), type: 'text', disabled: true }
-				]
-			};
-			return form;
-		},
-		title() {
-			return this.$t('orderAuthor.sourcesOfInformation');
-		}
-	},
+
 	mounted() {
+		this.loadInitData();
 	},
 	methods: {
-		show(data) {
-			this.dialogVisible = true;
-			if (typeof data == 'object') {
-				this.orderType = false;
-				this.formModel = {
-					source: this.$t('orderAuthor.distributePermission'),
-					mobile: data.mobile,
-					name: data.name
-				};
-			} else {
-				this.orderType = true;
-				this.formOrderModel = {
-					source: this.$t('orderAuthor.orderCreation'),
-					order: data
-				};
+		loadInitData() {
+			this.$Dictionary.permissionType().then(list => {
+				this.$convertList(list, this.PermissionTypeList, elem => {
+					return true;
+				});
+			});
+		},
+		queryFunction() {
+			return getPermissonDetail(this.$route.params.id);
+		},
+		reloadTable() {
+			if (this.queryList && this.queryList.reload) {
+				this.queryList.reload();
 			}
 		},
-		handleClose(done) {
-			this.formModel = {
-				source: '',
-				userMobile: '',
-				userName: ''
-			};
-			this.dialogVisible = false;
+		turnback() {
+			this.$router.go(-1);
 		}
 	}
 };
 </script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+    .draft {
+        width: 400px;
+        text-align: center;
+        margin: 20px auto;
+    }
+</style>
diff --git a/src/views/orderauthor/author/draft.vue b/src/views/orderauthor/author/draft.vue
deleted file mode 100644
index ad45eb187..000000000
--- a/src/views/orderauthor/author/draft.vue
+++ /dev/null
@@ -1,223 +0,0 @@
-<template>
-  <div class="card-box">
-    <el-steps class="steps" :active="display">
-      <el-step :title="this.$t('orderAuthor.addUserPermissions')" 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 -120 + 'px'}" style="padding-top: 40px">
-        <data-form ref="dataform" :form="form" :form-model="formModel" :rules="rules" />
-      </el-scrollbar>
-    </el-card>
-    <div class="draft">
-      <el-button-group>
-        <el-button type="primary" @click="create">{{ $t('global.create') }}</el-button>
-        <el-button type="primary" @click="turnback">{{ $t('global.back') }}</el-button>
-      </el-button-group>
-    </div>
-  </div>
-</template>
-
-<script>
-import { getPublishLessonList } from '@/api/jmap/lesson';
-import { getUserInfoByNameOrMobile } from '@/api/management/user';
-import { createLessonPermisson } from '@/api/management/author';
-import WindowResizeHandler from '@/mixin/WindowResizeHandler';
-
-export default {
-	name: 'DictionaryDetailEdit',
-	mixins: [
-		WindowResizeHandler
-	],
-	data() {
-		return {
-			height: '',
-			display: 1,
-			LessonList: [],
-			UserList: [],
-			PermissionTypeList: [],
-			UserLoading: false,
-			formModel: {
-				userId: '',
-				type: '01',
-				forever: true,
-				lessonId: '',
-				total: 0
-			}
-		};
-	},
-	computed: {
-		form() {
-			const form = {
-				labelWidth: '140px',
-				items: [
-					{ prop: 'userId', label: this.$t('orderAuthor.userName'), type: 'select', required: false, options: this.UserList, remote: this.userRemote, loading: this.UserLoading },
-					{ prop: 'lessonId', label: this.$t('orderAuthor.courseName'), type: 'select', required: false, options: this.LessonList },
-					{ prop: 'type', label: this.$t('orderAuthor.permissionType'), type: 'select', required: false, options: this.PermissionTypeList },
-					{ prop: 'forever', label: this.$t('orderAuthor.permanenceOrNot'), type: 'radio', required: false, disabled: true, options: this.$ConstSelect.Whether },
-					{ prop: 'total', label: this.$t('orderAuthor.permissionNumber'), type: 'number', required: false }
-				]
-
-			};
-			return form;
-		},
-
-		rules() {
-			const _this = this;
-			const baseRules = {
-				userId: [
-					{ required: true, message: this.$t('rules.userNameInput'), trigger: 'blur' }
-				],
-				lessonId: [
-					{ required: true, message: this.$t('rules.lessonInput'), trigger: 'change' }
-				],
-				type: [
-					{ required: true, message: this.$t('rules.permissionTypeInput'), trigger: 'change' }
-				],
-				forever: [
-					{ required: true, message: this.$t('rules.pleaseSelect'), trigger: 'change' }
-				],
-				total: [
-					{ required: true, message: this.$t('rules.authorAmountInput'), trigger: 'change' },
-					{
-						validator(rule, value, callback) {
-							if (Number.isInteger(Number(value)) && Number(value) >= 0) {
-								callback();
-							} else {
-								callback(new Error(_this.$t('rules.authorAmountInputError')));
-							}
-						},
-						trigger: 'blur'
-					}
-				]
-			};
-
-			// 清空表单验证提示信息
-			this.$nextTick(function () {
-				this.$refs.dataform.clearValidate();
-			});
-
-			return baseRules;
-		}
-	},
-	mounted() {
-		this.initLoadPage();
-	},
-	methods: {
-		resizeHandler: function () {
-			this.height = this._clientHeight - 130;
-		},
-		initLoadPage() {
-			// 加载发布课程列表
-			this.display = 1;
-			this.LessonList.length = 0;
-			getPublishLessonList().then(response => {
-				const data = response.data;
-				if (data && data.length) {
-					data.forEach(elem => {
-						this.LessonList.push({ value: elem.id, label: elem.name });
-					});
-				}
-			});
-
-			// 转换权限类型
-			this.$Dictionary.permissionType().then(list => {
-				this.$convertList(list, this.PermissionTypeList, elem => {
-					return true;
-				});
-			});
-
-			// 清空表单验证提示信息
-			this.$nextTick(function () {
-				this.$refs.dataform.resetForm();
-			});
-		},
-		userRemote(query) {
-			if (query !== '') {
-				this.loading = true;
-				this.UserList.length = 0;
-				setTimeout(() => {
-					this.loading = false;
-					getUserInfoByNameOrMobile({ query: query }).then(response => {
-						response.data.forEach(item => {
-							this.UserList.push({ value: item.id, label: item.name });
-						});
-					}).catch(() => {
-						this.$messageBox(this.$t('error.remoteQueryError'));
-					});
-				}, 200);
-			} else {
-				this.UserList.length = 0;
-			}
-		},
-		buildModel() {
-			const model = {
-				userId: this.formModel.userId,
-				lessonId: this.formModel.lessonId,
-				type: this.formModel.type,
-				forever: this.formModel.forever,
-				total: this.formModel.total
-			};
-			return model;
-		},
-		create() {
-			this.$refs.dataform.validateForm(() => {
-				createLessonPermisson(this.buildModel()).then(response => {
-					this.display = 2;
-					this.turnback();
-					this.$message.success(this.$t('tip.creatingSuccessful'));
-				}).catch(() => {
-					this.$messageBox(this.$t('tip.creatingFailed'));
-				});
-			});
-		},
-		turnback() {
-			this.$router.go(-1);
-		}
-	}
-};
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-    .steps {
-        width: 940px;
-        margin: 0 auto;
-        margin-top: 20px;
-        height: 100%;
-
-        /deep/ {
-            .el-step__icon.is-icon {
-                width: 95px;
-            }
-        }
-    }
-
-    .forms {
-        width: 800px;
-        margin: 0 auto;
-        margin-top: 20px;
-
-        /deep/ {
-            .el-select {
-                float: left;
-                width: calc(600px);
-            }
-
-            .el-form-item__content>.el-input>.el-input__inner {
-                float: left;
-                width: calc(600px);
-            }
-
-            .el-input-number {
-                float: left;
-                width: calc(250px);
-            }
-        }
-    }
-
-    .draft {
-        width: 400px;
-        text-align: center;
-        margin: 20px auto;
-    }
-</style>
diff --git a/src/views/orderauthor/author/draft/choosePermission.vue b/src/views/orderauthor/author/draft/choosePermission.vue
new file mode 100644
index 000000000..a3e53d18a
--- /dev/null
+++ b/src/views/orderauthor/author/draft/choosePermission.vue
@@ -0,0 +1,180 @@
+<template>
+  <el-dialog
+    :title="title"
+    :visible.sync="show"
+    top="20px"
+    width="90%"
+    :before-close="doClose"
+    :close-on-click-modal="false"
+  >
+    <QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
+  </el-dialog>
+</template>
+
+<script>
+import { getLessonPermissonPageList } from '@/api/management/author';
+
+export default {
+	name: 'Author',
+	props: {
+		ruleList: {
+			type: Array,
+			default() {
+				return [];
+			}
+		},
+		effectiveTypeList: {
+			type: Array,
+			default() {
+				return [];
+			}
+		},
+		permissionTypeList: {
+			type: Array,
+			default() {
+				return [];
+			}
+		}
+	},
+	data() {
+		return {
+			PermissionTypeList: [],
+			ruleLists: [
+				{ value: true, label: '是' },
+				{ value: false, label: '否' }
+			],
+			show: false,
+			param: '',
+			pagerConfig: {
+				pageSize: 'pageSize',
+				pageIndex: 'pageNum'
+			},
+			queryForm: {
+				labelWidth: '100px',
+				reset: true,
+				queryObject: {
+					'name': {
+						type: 'text',
+						label: '权限名称'
+					},
+					'type': {
+						type: 'select',
+						label: this.$t('orderAuthor.permissionType'),
+						config: {
+							data: []
+						}
+					}
+				}
+			},
+			queryList: {
+				query: this.queryFunction,
+				selectCheckShow: false,
+				indexShow: true,
+				columns: [
+					{
+						title: '创建时间',
+						prop: 'createTime'
+					},
+					{
+						title: '创建者',
+						prop: 'creatorUserName'
+					},
+					{
+						title: '是否包权限',
+						prop: 'isPackage',
+						type: 'tag',
+						columnValue: (row) => { return this.$convertField(row.isPackage, this.ruleLists, ['value', 'label']); },
+						tagType: (row) => { return ''; }
+					},
+					{
+						title: '权限名称',
+						prop: 'name'
+					},
+					{
+						title: this.$t('orderAuthor.permissionType'),
+						prop: 'type',
+						type: 'tag',
+						columnValue: (row) => { return this.$convertField(row.type, this.PermissionTypeList, ['value', 'label']); },
+						tagType: (row) => { return ''; }
+					},
+					{
+						type: 'button',
+						title: this.$t('global.operate'),
+						width: '120',
+						buttons: [
+							{
+								name: this.$t('global.add'),
+								handleClick: this.handlePut,
+								type: '',
+								showControl: (row) => { return !row.isPut; }
+							},
+							{
+								name: this.$t('global.delete'),
+								handleClick: this.handlePop,
+								type: 'warning',
+								showControl: (row) => { return row.isPut; }
+							}
+						]
+					}
+				]
+			}
+		};
+	},
+	computed: {
+		title() {
+			return this.$t('orderAuthor.editPermissionRules');
+		}
+	},
+	watch: {
+	},
+	mounted() {
+		this.loadInitData();
+	},
+	methods: {
+		loadInitData() {
+			this.$Dictionary.permissionType().then(list => {
+				if (list && list.length) {
+					this.queryForm.queryObject.type.config.data = list;
+				}
+				this.$convertList(list, this.PermissionTypeList, elem => {
+					return true;
+				});
+				this.PermissionTypeList.push({ value: undefined, label: this.$t('orderAuthor.permissionPack') });
+			});
+		},
+		formatterDate(row, porpInfo) {
+			return String(row[porpInfo.property] || '').split(' ')[0];
+		},
+		async queryFunction(params) {
+			params['isPackage'] = false;
+			const resp = await getLessonPermissonPageList(params);
+			this.ruleList.forEach(elem => {
+				resp.data.list.forEach(item => {
+					if (item.id == elem.id) {
+						item.isPut = true;
+					}
+				});
+			});
+
+			return resp;
+		},
+		reloadTable() {
+			if (this.queryList && this.queryList.reload) {
+				this.queryList.reload();
+			}
+		},
+		doShow() {
+			this.show = true;
+		},
+		doClose() {
+			this.show = false;
+		},
+		handlePut(index, row) {
+			this.$emit('addRuleForm', index, row);
+		},
+		handlePop(index, row) {
+			this.$emit('deleteForm', index, row);
+		}
+	}
+};
+</script>
diff --git a/src/views/orderauthor/author/draft/ruleForm.vue b/src/views/orderauthor/author/draft/ruleForm.vue
new file mode 100644
index 000000000..03aea6439
--- /dev/null
+++ b/src/views/orderauthor/author/draft/ruleForm.vue
@@ -0,0 +1,236 @@
+<template>
+  <el-card>
+    <div class="pack-box" :style="{ height: height +'px' }">
+      <el-scrollbar wrap-class="scrollbar-wrapper" style="">
+        <el-steps class="steps" :active="display">
+          <el-step title="新建权限" icon="el-icon-edit" />
+          <el-step icon="el-icon-setting" />
+        </el-steps>
+        <el-card class="forms pack-rule">
+          <el-form ref="formData" label-width="130px" :model="addModel" size="mini" :rules="rules" class="rule_box">
+            <el-form-item label="权限名称:" prop="name">
+              <el-input v-model="addModel.name" size="small" />
+            </el-form-item>
+            <el-form-item label="是否包权限:">
+              <el-checkbox v-model="addModel.isPackage" />
+            </el-form-item>
+          </el-form>
+          <el-button class="addList" size="small" @click="dialogSelect">添加权限</el-button>
+          <el-table
+            :data="ruleList"
+            border
+            style="width: 100%"
+            :height="height-300"
+          >
+            <el-table-column prop="createTime" label="创建时间" />
+            <el-table-column prop="creatorUserName" label="创建者" />
+            <el-table-column prop="name" label="权限名称" />
+            <el-table-column prop="type" :label="this.$t('orderAuthor.permissionType')">
+              <template slot-scope="scope">
+                {{ computedName(PermissionTypeList, scope.row.type) }}
+              </template>
+            </el-table-column>
+            <el-table-column :label="this.$t('global.operate')" width="60">
+              <template slot-scope="scope">
+                <el-button type="text" size="small" @click="deleteForm(scope.$index, scope.row)">{{ $t('global.delete') }}
+                </el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-card>
+        <div class="draft">
+          <el-button-group>
+            <el-button type="primary" @click="packForm">{{ $t('orderAuthor.packaging') }}</el-button>
+            <el-button type="primary" @click="turnback">{{ $t('global.back') }}</el-button>
+          </el-button-group>
+        </div>
+        <choose-permission
+          ref="choosePermission"
+          :rule-list="ruleList"
+          :effective-type-list="EffectiveTypeList"
+          :permission-type-list="PermissionTypeList"
+          @addRuleForm="addRuleForm"
+          @deleteForm="deleteForm"
+        />
+      </el-scrollbar>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import { UrlConfig } from '@/router/index';
+import { createLessonPermisson } from '@/api/management/author';
+import WindowResizeHandler from '@/mixin/WindowResizeHandler';
+import ChoosePermission from './choosePermission';
+import { EventBus } from '@/scripts/event-bus';
+import { setTimeout } from 'timers';
+
+export default {
+	name: 'PackRule',
+	components: {
+		ChoosePermission
+	},
+	mixins: [
+		WindowResizeHandler
+	],
+	data() {
+		return {
+			display: 1,
+			height: 0,
+			addModel: {
+				name: '',
+				isPackage: true
+			},
+			rules: {
+				name: [
+					{ required: true, message: '请输入权限名称', trigger: 'blur' }
+				]
+			},
+			urlInfo: {},
+			ruleList: [],
+			EffectiveTypeList: [],
+			PermissionTypeList: []
+		};
+	},
+	mounted() {
+		this.loadInitData();
+	},
+	methods: {
+		turnback() {
+			this.$router.go(-1);
+		},
+		resizeHandler: function () {
+			this.height = this._clientHeight - 62;
+		},
+		computedName(list, code) {
+			let name = '';
+			list.forEach(elem => {
+				if (elem.value == code) {
+					name = elem.label;
+				}
+			});
+			return name;
+		},
+		loadInitData() {
+			this.EffectiveTypeList = [];
+			this.$Dictionary.effectiveType().then(list => {
+				this.EffectiveTypeList = list.map(elem => { return { value: elem.code, label: elem.name }; });
+			});
+
+			this.PermissionTypeList = [];
+			this.$Dictionary.permissionType().then(list => {
+				this.PermissionTypeList = list.map(elem => { return { value: elem.code, label: elem.name }; });
+			});
+		},
+		dialogSelect(row) {
+			this.$refs.choosePermission.doShow();
+		},
+		deleteForm(index, row) {
+			const idx = this.ruleList.findIndex(elem => { return elem.id == row.id; });
+			if (idx >= 0) {
+				row['isPut'] = false;
+				this.ruleList.splice(idx, 1);
+			}
+			EventBus.$emit('reloadTable', { index: index, list: row });
+		},
+		addRuleForm(index, row) {
+			row['isPut'] = true;
+			this.ruleList.push(row);
+			EventBus.$emit('reloadTable', { index: index, list: row });
+		},
+		packForm() {
+			if (this.ruleList && this.ruleList.length) {
+				const arr = this.ruleList.map(nor => {
+					return nor.id;
+				});
+				const data = {
+					name: this.addModel.name,
+					isPackage: this.addModel.isPackage,
+					relPermissions: arr
+				};
+				createLessonPermisson(data).then(resp => {
+					this.$message.success('打包成功');
+					setTimeout(() => {
+						this.$router.push({ path: `${UrlConfig.orderauthor.authorMange}` });
+					}, 2000);
+				}).catch(() => {
+					this.$messageBox(this.$t('tip.packagingFailed'));
+				});
+			} else {
+				this.$messageBox('请选择多个权限');
+			}
+		}
+	}
+};
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+	.rule_box{
+		width: 80%;
+	}
+
+	.steps{
+		/deep/ {
+			.el-step__title.is-finish {
+				padding-left: 15px;
+			}
+		}
+	}
+
+    .pack-box {
+        padding-top: 10px;
+
+        /deep/ {
+            .el-step__icon.is-icon {
+                width: 95px;
+            }
+        }
+
+        .steps {
+            width: 980px;
+            margin: 0 auto;
+            padding-top: 5px;
+        }
+
+        .forms {
+            width: 800px;
+            margin: 0 auto;
+            margin-top: 20px;
+            padding: 40px;
+        }
+    }
+
+    ::-webkit-scrollbar {
+        width: 10px;
+        height: 10px;
+    }
+
+    .pack-rule {
+        .addList {
+            float: right;
+            font-size: 14px;
+            color: #000;
+            margin-bottom: 8px;
+            cursor: pointer;
+        }
+
+        .btn-footer {
+            width: 100%;
+            display: flex;
+            justify-content: center;
+            margin-top: 20px;
+        }
+
+        /deep/ .el-table__footer-wrapper {
+            .is-leaf:nth-child(3) {
+                font-size: 0;
+            }
+        }
+    }
+
+    .draft {
+        width: 400px;
+        text-align: center;
+        margin: 20px auto;
+    }
+</style>
diff --git a/src/views/orderauthor/author/index.vue b/src/views/orderauthor/author/index.vue
index 625ae7341..190bab457 100644
--- a/src/views/orderauthor/author/index.vue
+++ b/src/views/orderauthor/author/index.vue
@@ -1,41 +1,37 @@
 <template>
   <div>
     <QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
-    <author-detail ref="authorDetail" />
   </div>
 </template>
 
 <script>
-import { getLessonPermissonPageList, setLessonPermisson, getDistribute } from '@/api/management/author';
+import { getLessonPermissonPageList } from '@/api/management/author';
+import { listPublishMap } from '@/api/jmap/map';
 import { UrlConfig } from '@/router/index';
-import authorDetail from './detail';
 
 export default {
 	name: 'Author',
 	components: {
-		authorDetail
 	},
 	data() {
 		return {
-			param: '',
-			WhetherTypeList: [],
-			EffectiveTypeList: [],
 			PermissionTypeList: [],
+			mapList: [],
+			ruleList: [
+				{ value: true, label: '是' },
+				{ value: false, label: '否' }
+			],
 			pagerConfig: {
 				pageSize: 'pageSize',
 				pageIndex: 'pageNum'
 			},
 			queryForm: {
-				labelWidth: '140px',
+				labelWidth: '100px',
 				reset: true,
 				queryObject: {
-					'userMobile': {
+					'name': {
 						type: 'text',
-						label: this.$t('orderAuthor.userMobile')
-					},
-					'userName': {
-						type: 'text',
-						label: this.$t('orderAuthor.userName')
+						label: '权限名称'
 					},
 					'type': {
 						type: 'select',
@@ -43,6 +39,23 @@ export default {
 						config: {
 							data: []
 						}
+					},
+					'isPackage': {
+						type: 'select',
+						label: '是否包权限',
+						config: {
+							data: [
+								{ value: true, label: '是' },
+								{ value: false, label: '否' }
+							]
+						}
+					},
+					mapId: {
+						type: 'select',
+						label: this.$t('orderAuthor.map'),
+						config: {
+							data: []
+						}
 					}
 				}
 			},
@@ -52,24 +65,22 @@ export default {
 				indexShow: true,
 				columns: [
 					{
-						title: this.$t('orderAuthor.userName'),
-						prop: 'userName'
+						title: '权限名称',
+						prop: 'name'
 					},
 					{
-						title: this.$t('orderAuthor.userMobile'),
-						prop: 'userMobile'
+						title: '是否包权限',
+						prop: 'isPackage',
+						type: 'tag',
+						columnValue: (row) => { return this.$convertField(row.isPackage, this.ruleList, ['value', 'label']); },
+						tagType: (row) => { return ''; }
 					},
 					{
-						title: this.$t('orderAuthor.mapName'),
-						prop: 'mapName'
-					},
-					{
-						title: this.$t('orderAuthor.mapProductName'),
-						prop: 'mapProductName'
-					},
-					{
-						title: this.$t('orderAuthor.courseName'),
-						prop: 'lessonName'
+						title: '所属地图',
+						prop: 'mapId',
+						type: 'tag',
+						columnValue: (row) => { return this.$convertField(row.mapId, this.mapList, ['value', 'label']); },
+						tagType: (row) => { return ''; }
 					},
 					{
 						title: this.$t('orderAuthor.permissionType'),
@@ -79,100 +90,33 @@ export default {
 						tagType: (row) => { return ''; }
 					},
 					{
-						title: this.$t('orderAuthor.permanenceOrNot'),
-						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: '创建时间',
+						prop: 'createTime'
 					},
 					{
-						title: this.$t('orderAuthor.publicOrPrivate'),
-						prop: 'canDistribute',
-						type: 'tag',
-						columnValue: (row) => { return this.$ConstSelect.translate(row.canDistribute, 'PermissionUseList'); },
-						tagType: (row) => {
-							switch (row.canDistribute) {
-							case true: return 'success';
-							case false: return 'danger';
-							}
-						}
-					},
-					{
-						title: this.$t('orderAuthor.totalPermissions'),
-						prop: 'amount'
-					},
-					{
-						title: this.$t('orderAuthor.residualPermissionNumber'),
-						prop: 'remains'
-					},
-					{
-						title: this.$t('orderAuthor.startTime'),
-						prop: 'startTime',
-						type: 'formatter',
-						formatter: this.formatterDate
-
-					},
-					{
-						title: this.$t('orderAuthor.endTime'),
-						prop: 'endTime',
-						type: 'formatter',
-						formatter: this.formatterDate
-					},
-					{
-						title: this.$t('orderAuthor.courseAuthorityStatus'),
-						prop: 'status',
-						type: 'tag',
-						columnValue: (row) => { return this.$convertField(row.status, this.EffectiveTypeList, ['value', 'label']); },
-						tagType: (row) => {
-							switch (row.status) {
-							case '1': return 'success';
-							default: return 'danger';
-							}
-						}
+						title: '创建者',
+						prop: 'creatorUserName'
 					},
+					// {
+					// 	title: '更新者',
+					// 	prop: 'updateUserName'
+					// },
 					{
 						type: 'button',
 						title: this.$t('global.operate'),
 						width: '250',
 						buttons: [
 							{
-								name: this.$t('orderAuthor.setupFailure'),
-								type: 'warning',
-								handleClick: this.handleSetFailure,
-								showControl: (row) => {
-									return row.status === '1';
-								}
-							},
-							{
-								name: this.$t('orderAuthor.setupEffective'),
-								type: 'primary',
-								handleClick: this.handleSetFailure,
-								showControl: (row) => {
-									return row.status === '0';
-								}
-							},
-							{
-								name: this.$t('orderAuthor.renew'),
-								type: 'warning',
-								handleClick: this.handleRenewAdd,
-								showControl: (row) => {
-									return row.origin === '01' && (row.forever || (row.endTime && Date.parse(new Date(row.endTime.replace(/\-/g, '\/'))) > Date.parse(new Date())));
-								}
-							},
-							{
-								name: this.$t('orderAuthor.source'),
+								name: '打包详情',
+								handleClick: this.handleRulesDetail,
 								type: '',
-								handleClick: this.handleSource
+								showControl: (row) => { return row.isPackage; }
 							}
 						]
 					}
 				],
 				actions: [
+					{ text: '新建', handler: this.handleAdd }
 				]
 			}
 		};
@@ -182,12 +126,7 @@ export default {
 		this.loadInitData();
 	},
 	methods: {
-		loadInitData() {
-			this.$Dictionary.effectiveType().then(list => {
-				this.$convertList(list, this.EffectiveTypeList, elem => {
-					return true;
-				});
-			});
+		async loadInitData() {
 			this.$Dictionary.permissionType().then(list => {
 				list.forEach(elem => {
 					this.queryForm.queryObject.type.config.data.push({ value: elem.code, label: elem.name });
@@ -196,45 +135,31 @@ export default {
 					return true;
 				});
 			});
-		},
-		formatterDate(row, porpInfo) {
-			return row[porpInfo.property];
+			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 getLessonPermissonPageList(params);
 		},
-		handleSetFailure(index, row) {
-			this.$confirm(this.$t('tip.updatePrivilegeTip'), this.$t('global.tips'), {
-				confirmButtonText: this.$t('global.confirm'),
-				cancelButtonText: this.$t('global.cancel'),
-				type: 'warning'
-			}).then(() => {
-				setLessonPermisson({ id: row.id, status: row.status == 1 ? '0' : '1' }).then(res => {
-					this.$message.success(this.$t('tip.setupSuccessfully'));
-					this.reloadTable();
-				}).catch(() => {
-					this.$messageBox(this.$t('tip.setupFailed'));
-				});
-			}).catch(() => { });
-		},
-		handleRenewAdd(index, row) {
-			this.$router.push({ path: `${UrlConfig.orderauthor.authorDraft}/renew/${row.id}` });
-		},
-		handlePermissionAdd() {
-			this.$router.push({ path: `${UrlConfig.orderauthor.authorDraft}/add/0` });
-		},
 		reloadTable() {
 			if (this.queryList && this.queryList.reload) {
 				this.queryList.reload();
 			}
 		},
-		async handleSource(index, row) {
-			try {
-				const res = await getDistribute(row.distributeId);
-				this.$refs.authorDetail.show(res.data);
-			} catch (error) {
-				this.$messageBox(this.$t('tip.requestFailed'));
-			}
+		handleRulesDetail(index, row) {
+			this.$router.push({ path: `${UrlConfig.orderauthor.authorDetail}/${row.id}` });
+		},
+		handleAdd() {
+			this.$router.push({ path: `${UrlConfig.orderauthor.authorMange}/rules` });
 		}
 	}
 };
diff --git a/src/views/orderauthor/commodity/addGoods.vue b/src/views/orderauthor/commodity/addGoods.vue
new file mode 100644
index 000000000..61207433b
--- /dev/null
+++ b/src/views/orderauthor/commodity/addGoods.vue
@@ -0,0 +1,151 @@
+<template>
+  <el-dialog
+    :title="this.$t('orderAuthor.trainingList')"
+    :visible.sync="show"
+    top="20px"
+    width="90%"
+    :before-do-close="doClose"
+    :close-on-click-modal="false"
+  >
+    <QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
+  </el-dialog>
+</template>
+
+<script>
+import { getLessonPermissonPageList } from '@/api/management/author';
+
+export default {
+	name: 'AddGoods',
+	props: {
+		trainings: {
+			type: Array,
+			default() {
+				return [];
+			}
+		},
+		detail: {
+			type: Object,
+			default() {
+				return null;
+			}
+		}
+	},
+	data() {
+		return {
+			show: false,
+			PermissionTypeList: [],
+			ruleLists: [
+				{ value: true, label: '是' },
+				{ value: false, label: '否' }
+			],
+			pagerConfig: {
+				pageSize: 'pageSize',
+				pageIndex: 'pageNum'
+			},
+			queryForm: {
+				labelWidth: '80px',
+				reset: true,
+				queryObject: {
+					name: {
+						type: 'text',
+						label: '权限名称'
+					},
+					type: {
+						type: 'select',
+						label: this.$t('orderAuthor.permissionType'),
+						config: {
+							data: []
+						}
+					}
+				}
+			},
+			queryList: {
+				query: this.queryFunction,
+				selectCheckShow: false,
+				indexShow: true,
+				columns: [
+					{
+						title: '创建时间',
+						prop: 'createTime'
+					},
+					{
+						title: '创建者',
+						prop: 'creatorUserName'
+					},
+					{
+						title: '是否包权限',
+						prop: 'isPackage',
+						type: 'tag',
+						columnValue: (row) => { return this.$convertField(row.isPackage, this.ruleLists, ['value', 'label']); },
+						tagType: (row) => { return ''; }
+					},
+					{
+						title: '权限名称',
+						prop: 'name'
+					},
+					{
+						title: this.$t('orderAuthor.permissionType'),
+						prop: 'type',
+						type: 'tag',
+						columnValue: (row) => { return this.$convertField(row.type, this.PermissionTypeList, ['value', 'label']); },
+						tagType: (row) => { return ''; }
+					},
+					{
+						type: 'button',
+						title: this.$t('global.operate'),
+						width: '250',
+						buttons: [
+							{
+								name: this.$t('orderAuthor.select'),
+								type: 'primary',
+								handleClick: this.handleAdd
+							}
+						]
+					}
+				],
+				actions: [
+				]
+			},
+
+			currentModel: {}
+		};
+	},
+	created() {
+		this.loadInitData();
+	},
+	methods: {
+		doShow() {
+			this.show = true;
+			this.reloadTable();
+		},
+		doClose() {
+			this.show = false;
+		},
+		async queryFunction(params) {
+			return getLessonPermissonPageList(params);
+		},
+		async loadInitData() {
+			this.$Dictionary.permissionType().then(list => {
+				if (list && list.length) {
+					this.queryForm.queryObject.type.config.data = list;
+				}
+				this.$convertList(list, this.PermissionTypeList, elem => {
+					return true;
+				});
+				this.PermissionTypeList.push({ value: undefined, label: this.$t('orderAuthor.permissionPack') });
+			});
+		},
+
+		handleAdd(index, row) {
+			this.$emit('selectGoods', row);
+			this.doClose();
+		},
+
+		reloadTable() {
+			if (this.queryList && this.queryList.reload) {
+				this.queryList.reload();
+			}
+		}
+	}
+};
+</script>
diff --git a/src/views/orderauthor/commodity/draft.vue b/src/views/orderauthor/commodity/draft.vue
index bf3ca955a..d2860031c 100644
--- a/src/views/orderauthor/commodity/draft.vue
+++ b/src/views/orderauthor/commodity/draft.vue
@@ -1,40 +1,38 @@
 <template>
-  <div>
+  <el-card>
     <!-- <turnback-bar :title="turnbackBarTitle"></turnback-bar> -->
-    <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 -70 + 'px'}"
-          style="padding-top: 40px"
-        >
+    <div class="pack-box" :style="{ height: height +'px' }">
+      <el-scrollbar wrap-class="scrollbar-wrapper">
+        <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 pack-rule">
           <data-form ref="dataform" :form="form" :form-model="formModel" :rules="rules" />
-        </el-scrollbar>
-      </el-card>
-      <div class="draft">
-        <el-button-group>
-          <el-button v-if="isAdd" type="primary" @click="create">{{ $t('global.create') }}</el-button>
-          <el-button v-if="isEdit" type="warning" @click="update">{{ $t('global.update') }}</el-button>
-          <el-button type="primary" @click="turnback">{{ $t('global.back') }}</el-button>
-        </el-button-group>
-      </div>
+        </el-card>
+        <div class="draft">
+          <el-button-group>
+            <el-button v-if="isAdd" type="primary" @click="create">{{ $t('global.create') }}</el-button>
+            <el-button v-if="isEdit" type="warning" @click="update">{{ $t('global.update') }}</el-button>
+            <el-button type="primary" @click="turnback">{{ $t('global.back') }}</el-button>
+          </el-button-group>
+        </div>
+      </el-scrollbar>
     </div>
-  </div>
+    <add-goods ref="addGoods" @selectGoods="selectGoods" />
+  </el-card>
 </template>
 
 <script>
-import { listPublishMap, getPublishMapInfo } from '@/api/jmap/map';
-import { saveCommodityList, getCommodityDetailById, updataCommodityList } from '@/api/management/goods';
-import { getCommodityMapProduct } from '@/api/management/mapprd';
-import { getCommodityProductLesson } from '@/api/jmap/lesson';
+import { saveCommodityList, updataCommodityList, getCommodityDetailById } from '@/api/management/goods';
 import WindowResizeHandler from '@/mixin/WindowResizeHandler';
+import addGoods from './addGoods';
 
 export default {
 	name: 'DictionaryDetailEdit',
+	components: {
+		addGoods
+	},
 	mixins: [
 		WindowResizeHandler
 	],
@@ -44,79 +42,53 @@ export default {
 			height: '',
 			display: 1,
 			foreverInitData: false,
-			dataLesson: [],
-			productList: [],
-			mapIdList: [],
-			productTypeList: [],
-			mapProductCodeList: [],
 			mapProductCodeListFilter: [],
 			lessonIdList: [],
 			TimeStyleList: [],
 			TimeStyleDict: {},
 			formModel: {
 				name: '',
-				skinCode: '',
-				productType: '01',
-				mapId: '',
-				mapProductCode: '',
-				lessonId: '',
+				permissionName: '',
+				permissionId: '',
 				forever: false,
 				tryUseTime: 0,
 				tryUseTimeUnit: '05',
 				price: 0,
 				remarks: ''
-			}
+			},
+			ruleList: [],
+			EffectiveTypeList: [],
+			PermissionTypeList: []
 		};
 	},
 	computed: {
-		// turnbackBarTitle() {
-		//     return '';
-		// },
 		isAdd() {
-			return this.type === 'ADD';
+			return this.$route.params.mode === 'add';
 		},
 		isEdit() {
-			return (this.type === 'EDIT') && !isNaN(Number(this.$route.params.commodityId));
+			return (this.$route.params.mode === 'edit') && !isNaN(Number(this.$route.params.commodityId));
 		},
 		title() {
 			return this.isAdd ? this.$t('orderAuthor.addGoods') : (this.isEdit ? this.$t('orderAuthor.addGoods') : this.$t('orderAuthor.unknownRouter'));
 		},
-		isShowLesson() {
-			return this.formModel.productType === '01' || this.formModel.productType === '02'; // 教学类型,考试类型
-		},
-		isShowSimulation() {
-			return this.formModel.productType === '03'; // 仿真类型
-		},
-		isShowScreen() {
-			return this.formModel.productType === '04'; // 大屏类型
-		},
 		isShowForever() {
 			return this.formModel.forever;
 		},
-		isDisabled() {
-			return this.isEdit;
-		},
 		foreverIsDisabled() {
 			return this.foreverInitData;
 		},
-		payTypeIsDisabled() {
-			return this.isEdit;
-		},
 
 		form() {
 			const form = {
-				labelWidth: '140px',
+				labelWidth: '135px',
 				items: [
-					{ prop: 'name', label: this.$t('orderAuthor.commodityName'), type: 'text', required: false },
-					{ prop: 'productType', label: this.$t('orderAuthor.productType'), type: 'select', required: false, disabled: this.isDisabled, options: this.productTypeList, change: true, onChange: this.typeChange },
-					{ prop: 'mapId', label: this.$t('orderAuthor.map'), type: 'select', required: false, disabled: this.isDisabled, options: this.mapIdList, show: this.isShowLesson || this.isShowSimulation, change: true, onChange: this.mapChange },
-					{ prop: 'mapProductCode', label: this.$t('orderAuthor.productName'), type: 'select', required: false, disabled: this.isDisabled, options: this.mapProductCodeListFilter, show: this.isShowLesson || this.isShowSimulation, change: true, onChange: this.productChange },
-					{ prop: 'lessonId', label: this.$t('orderAuthor.lesson'), type: 'select', required: false, disabled: this.isDisabled, options: this.lessonIdList, show: this.isShowLesson },
-					{ prop: 'forever', label: this.$t('orderAuthor.whetherTrial'), type: 'radio', required: false, options: this.$ConstSelect.Whether, disabled: this.foreverIsDisabled },
-					{ prop: 'tryUseTimeUnit', label: this.$t('orderAuthor.unitOfTime'), type: 'select', required: false, disabled: this.foreverIsDisabled, show: this.isShowForever, options: this.TimeStyleList },
-					{ prop: 'tryUseTime', label: this.$t('orderAuthor.trialTime'), type: 'number', required: false, disabled: this.foreverIsDisabled, show: this.isShowForever, message: `${this.TimeStyleDict[this.formModel.tryUseTimeUnit]}` },
-					{ prop: 'price', label: this.$t('orderAuthor.price'), type: 'number', required: false, min: 0.01, message: this.$t('global.yuan') },
-					{ prop: 'remarks', label: this.$t('orderAuthor.describtion'), type: 'textarea', required: false }
+					{ prop: 'name', label: '商品名称', type: 'text', required: false },
+					{ prop: 'permissionName', label: '权限', type: 'text', required: false, disabled: true, rightWidth: true, buttontip: '选择权限', buttonClick: this.buttonClick },
+					{ prop: 'forever', label: '是否试用', type: 'radio', required: false, options: this.$ConstSelect.Whether, disabled: this.foreverIsDisabled },
+					{ prop: 'tryUseTimeUnit', label: '时间单位', type: 'select', required: false, disabled: this.foreverIsDisabled, show: this.isShowForever, options: this.TimeStyleList },
+					{ prop: 'tryUseTime', label: '试用时长', type: 'number', required: false, disabled: this.foreverIsDisabled, show: this.isShowForever, message: `${this.TimeStyleDict[this.formModel.tryUseTimeUnit]}` },
+					{ prop: 'price', label: '价格', type: 'number', required: false, min: 0.01, message: '元' },
+					{ prop: 'remarks', label: '描述', type: 'textarea', required: false }
 				]
 
 			};
@@ -128,17 +100,8 @@ export default {
 				name: [
 					{ required: true, message: this.$t('rules.goodsNameInput'), trigger: 'blur' }
 				],
-				productType: [
-					{ required: true, message: this.$t('rules.productTypeInput'), trigger: 'change' }
-				],
-				mapId: [
-					{ required: true, message: this.$t('rules.mapInput'), trigger: 'change' }
-				],
-				mapProductCode: [
-					{ required: true, message: this.$t('rules.productInput'), trigger: 'change' }
-				],
-				lessonId: [
-					{ required: true, message: this.$t('rules.lessonInput'), trigger: 'change' }
+				permissionName: [
+					{ required: true, message: '请选择权限', trigger: 'change' }
 				],
 				forever: [
 					{ required: true, message: this.$t('rules.pleaseSelect'), trigger: 'change' }
@@ -171,11 +134,6 @@ export default {
 				]
 			};
 
-			// 清空表单验证提示信息
-			this.$nextTick(function () {
-				this.$refs.dataform.clearValidate();
-			});
-
 			return baseRules;
 		}
 	},
@@ -184,58 +142,38 @@ export default {
 	},
 	methods: {
 		resizeHandler: function () {
-			this.height = this._clientHeight - 170;
+			this.height = this._clientHeight - 62;
+		},
+		computedName(list, code) {
+			let name = '';
+			list.forEach(elem => {
+				if (elem.value == code) {
+					name = elem.label;
+				}
+			});
+			return name;
+		},
+		convertList(FromList, ToList, checktypeFunction) {
+			if (FromList) {
+				ToList.length = 0;
+				FromList.forEach(elem => {
+					if (checktypeFunction(elem)) {
+						ToList.push({ value: elem.code, label: elem.name });
+					}
+				});
+			}
 		},
 		async initLoadPage() {
-			// 加载字典数据
-			// 加载地图,产品，课程
-			this.mapIdList.length = 0;
-			try {
-				const response = await listPublishMap();
-				// this.dataLesson = response.data;
-				const data = response.data;
-				if (data && data.length) {
-					data.forEach(elem => {
-						this.mapIdList.push({ value: elem.id, label: elem.name });
-					});
-				}
-			} catch (error) {
-				this.$messageBox(this.$t('error.getItemListFailed'));
-			}
-			// 产品类型
-			this.$Dictionary.productType().then(list => {
-				this.$convertList(list, this.productTypeList, elem => {
-					return true;
-				});
-			});
-
-			// 时间类型
-			this.TimeStyleDict = {};
-			this.$Dictionary.timeStyleType().then(list => {
-				this.$convertList(list, this.TimeStyleList, elem => {
-					return true;
-				});
-				list.forEach(elem => {
-					this.TimeStyleDict[elem.code] = elem.name;
-				});
-			});
-
-			// 清空数据
-			this.$refs.dataform.resetForm();
 
 			// 获取操作模式
 			this.type = String(this.$route.params.mode).toUpperCase();
 			if (this.type === 'EDIT') {
 				try {
 					const res = await getCommodityDetailById(this.$route.params.commodityId);
-					this.mapChange(res.data.mapId);
-					this.productChange(res.data.mapProductCode);
 					this.formModel = {
 						name: res.data.name,
-						productType: res.data.productType,
-						mapId: res.data.mapId,
-						mapProductCode: res.data.mapProductCode,
-						lessonId: res.data.lessonId,
+						permissionId: res.data.permissionId,
+						permissionName: res.data.permissionName,
 						forever: res.data.tryUse,
 						tryUseTime: res.data.tryUseTime,
 						tryUseTimeUnit: res.data.tryUseTimeUnit || '05',
@@ -244,65 +182,34 @@ export default {
 						id: res.data.id
 					};
 				} catch (err) {
-					this.$messageBox(this.$t('error.getItemListFailed'));
+					this.$messageBox('获取商品详情失败');
 				}
 			}
-			// 清空表单验证提示信息
-			this.$nextTick(function () {
-				this.$refs.dataform.clearValidate();
-			});
-		},
-		typeChange(type) {
-			this.mapProductCodeListFilter = this.mapProductCodeList.filter(elem => {
-				if (type != '03') { // 不是仿真时,过滤综合演练
-					return elem.prdType != '03';
-				} else {
+
+			// 时间类型
+			this.TimeStyleDict = {};
+			this.$Dictionary.timeStyleType().then(list => {
+				this.convertList(list, this.TimeStyleList, elem => {
 					return true;
-				}
+				});
+				list.forEach(elem => {
+					this.TimeStyleDict[elem.code] = elem.name;
+				});
 			});
 		},
-		async mapChange(mapId) {
-			this.mapProductCodeList = [];
-			this.formModel.mapProductCode = '';
-			this.lessonIdList = [];
-			this.formModel.lessonId = '';
-			try {
-				const rest = await getPublishMapInfo(mapId);
-				if (rest && rest.code == 200) {
-					const resp = await getCommodityMapProduct(rest.data.skinCode);
-					if (resp && resp.code == 200) {
-						resp.data.forEach(ele => {
-							this.mapProductCodeList.push({ value: ele.code, label: ele.name, prdType: ele.prdType });
-							this.typeChange(this.formModel.productType);
-						});
-					}
-				}
-			} catch (err) {
-				this.$messageBox(this.$t('error.getMapProductListFailed'));
-			}
+		buttonClick() {
+			this.$refs.addGoods.doShow();
 		},
-		async productChange(productId) {
-			this.formModel.lessonId = '';
-			this.lessonIdList = [];
-			try {
-				const rest = await getCommodityProductLesson(productId);
-				if (rest && rest.code == 200) {
-					rest.data.forEach(ele => {
-						this.lessonIdList.push({ value: ele.id, label: ele.name });
-					});
-				}
-			} catch (err) {
-				this.$messageBox(this.$t('error.getLessonListFailed'));
-			}
+
+		selectGoods(data) {
+			this.formModel.permissionId = data.id;
+			this.formModel.permissionName = data.name;
 		},
 		buildModel() {
 			// 构造基础数据
 			const model = {
 				name: this.formModel.name,
-				productType: this.formModel.productType,
-				mapId: this.formModel.mapId,
-				mapProductCode: this.formModel.mapProductCode,
-				lessonId: this.formModel.lessonId,
+				permissionId: this.formModel.permissionId,
 				tryUse: this.formModel.forever,
 				tryUseTime: this.formModel.tryUseTime,
 				tryUseTimeUnit: this.formModel.tryUseTimeUnit,
@@ -317,8 +224,8 @@ export default {
 				saveCommodityList(this.buildModel()).then(response => {
 					this.turnback();
 					this.$message.success(this.$t('tip.creatingSuccessful'));
-				}).catch(() => {
-					this.$messageBox(this.$t('tip.creatingFailed'));
+				}).catch((error) => {
+					this.$messageBox(this.$t('tip.creatingFailed')+':'+error.message);
 				});
 			});
 		},
@@ -340,53 +247,71 @@ export default {
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-    .card-box {
-        padding-top: 10px;
-    }
+    .rule_box{
+		width: 80%;
+	}
 
-    .steps {
-        width: 940px;
-        margin: 0 auto;
-        margin-top: 5px;
-        height: 100%;
+	.steps{
+		/deep/ {
+			.el-step__title.is-finish {
+				padding-left: 15px;
+			}
+		}
+	}
+
+    .pack-box {
+        padding-top: 10px;
 
         /deep/ {
             .el-step__icon.is-icon {
                 width: 95px;
             }
         }
+
+        .steps {
+            width: 980px;
+            margin: 0 auto;
+            padding-top: 5px;
+        }
+
+        .forms {
+            width: 800px;
+            margin: 0 auto;
+            margin-top: 20px;
+            padding: 40px;
+        }
     }
 
-    .forms {
-        width: 800px;
-        margin: 0 auto;
-        margin-top: 20px;
+    ::-webkit-scrollbar {
+        width: 10px;
+        height: 10px;
+    }
 
-        /deep/ {
-            .el-select {
-                float: left;
-                width: calc(600px);
-            }
+    .pack-rule {
+        .addList {
+            float: right;
+            font-size: 14px;
+            color: #000;
+            margin-bottom: 8px;
+            cursor: pointer;
+        }
 
-            .el-form-item__content>.el-input>.el-input__inner {
-                float: left;
-                width: calc(600px);
-            }
+        .btn-footer {
+            width: 100%;
+            display: flex;
+            justify-content: center;
+            margin-top: 20px;
+        }
 
-            .el-input-number {
-                float: left;
-                width: calc(250px);
-            }
-
-            .el-textarea>.el-textarea__inner {
-                float: left;
-                width: calc(600px);
+        /deep/ .el-table__footer-wrapper {
+            .is-leaf:nth-child(3) {
+                font-size: 0;
             }
         }
     }
 
     .draft {
-        width: 300px;
+        width: 400px;
         text-align: center;
         margin: 20px auto;
     }
diff --git a/src/views/orderauthor/commodity/index.vue b/src/views/orderauthor/commodity/index.vue
index 1476c970f..4255e44fd 100644
--- a/src/views/orderauthor/commodity/index.vue
+++ b/src/views/orderauthor/commodity/index.vue
@@ -60,23 +60,8 @@ export default {
 						prop: 'name'
 					},
 					{
-						title: this.$t('orderAuthor.productType'),
-						prop: 'productType',
-						type: 'tag',
-						columnValue: (row) => { return this.$convertField(row.productType, this.productTypeList, ['value', 'label']); },
-						tagType: (row) => { return 'success'; }
-					},
-					{
-						title: this.$t('orderAuthor.mapName'),
-						prop: 'mapName'
-					},
-					{
-						title: this.$t('orderAuthor.productName'),
-						prop: 'prdName'
-					},
-					{
-						title: this.$t('orderAuthor.courseName'),
-						prop: 'lessonName'
+						title: '权限名称',
+						prop: 'permissionName'
 					},
 					{
 						title: this.$t('orderAuthor.price'),
diff --git a/src/views/orderauthor/order/addGoods.vue b/src/views/orderauthor/order/addGoods.vue
index dab334ff8..454ad5271 100644
--- a/src/views/orderauthor/order/addGoods.vue
+++ b/src/views/orderauthor/order/addGoods.vue
@@ -36,6 +36,7 @@ export default {
 			show: false,
 			productTypeList: [],
 			EffectiveTypeList: [],
+			mapList: [],
 			pagerConfig: {
 				pageSize: 'pageSize',
 				pageIndex: 'pageNum'
@@ -48,26 +49,19 @@ export default {
 						type: 'text',
 						label: this.$t('orderAuthor.name')
 					},
-					productType: {
-						type: 'select',
-						label: this.$t('orderAuthor.productType'),
-						config: {
-							data: []
-						}
-					},
+					// productType: {
+					// 	type: 'select',
+					// 	label: this.$t('orderAuthor.productType'),
+					// 	config: {
+					// 		data: []
+					// 	}
+					// },
 					mapId: {
 						type: 'select',
 						label: this.$t('orderAuthor.map'),
 						config: {
 							data: []
 						}
-					},
-					status: {
-						type: 'select',
-						label: this.$t('orderAuthor.state'),
-						config: {
-							data: this.$ConstSelect.Status
-						}
 					}
 				}
 			},
@@ -81,28 +75,20 @@ export default {
 						prop: 'name'
 					},
 					{
-						title: this.$t('orderAuthor.productType'),
-						prop: 'productType',
-						type: 'tag',
-						columnValue: (row) => { return this.$convertField(row.productType, this.productTypeList, ['value', 'label']); },
-						tagType: (row) => { return 'success'; }
-					},
-					{
-						title: this.$t('orderAuthor.mapName'),
-						prop: 'mapName'
-					},
-					{
-						title: this.$t('orderAuthor.productName'),
-						prop: 'prdName'
-					},
-					{
-						title: this.$t('orderAuthor.courseName'),
-						prop: 'lessonName'
+						title: '权限名称',
+						prop: 'permissionName'
 					},
 					{
 						title: this.$t('orderAuthor.price'),
 						prop: 'price'
 					},
+					{
+						title: '所属地图',
+						prop: 'mapId',
+						type: 'tag',
+						columnValue: (row) => { return this.$convertField(row.mapId, this.mapList, ['value', 'label']); },
+						tagType: (row) => { return ''; }
+					},
 					{
 						title: this.$t('orderAuthor.state'),
 						prop: 'status',
@@ -160,20 +146,13 @@ export default {
 					return true;
 				});
 			});
-			// 产品类型
-			this.$Dictionary.productType().then(list => {
-				list.forEach(elem => {
-					this.queryForm.queryObject.productType.config.data.push({ value: elem.code, label: elem.name });
-				});
-				this.$convertList(list, this.productTypeList, elem => {
-					return true;
-				});
-			});
 			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, '获取发布地图');
diff --git a/src/views/orderauthor/order/canDistribute.vue b/src/views/orderauthor/order/canDistribute.vue
index 8f9a721d4..f1d86c12e 100644
--- a/src/views/orderauthor/order/canDistribute.vue
+++ b/src/views/orderauthor/order/canDistribute.vue
@@ -52,7 +52,11 @@ export default {
 		handleSure() {
 			this.doClose();
 			Object.assign(this.data, this.formModel);
-			this.$emit('distribute', this.data);
+			const model = {
+				code: this.data.code,
+				canDistribute: this.data.canDistribute ? this.data.canDistribute : false
+			};
+			this.$emit('distribute', model);
 		},
 		handleClose() {
 			this.doClose();
diff --git a/src/views/orderauthor/order/detail.vue b/src/views/orderauthor/order/detail.vue
new file mode 100644
index 000000000..4ba9687b7
--- /dev/null
+++ b/src/views/orderauthor/order/detail.vue
@@ -0,0 +1,115 @@
+<template>
+  <el-dialog title="订单详情" :visible.sync="show" width="500px" :before-do-close="doClose" :close-on-click-modal="false">
+    <div>
+      <el-scrollbar wrap-class="scrollbar-wrapper" style="height: 400px">
+        <data-form ref="dataform" :form="form" :form-model="formModel" class="data-box" />
+      </el-scrollbar>
+    </div>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="doClose">关 闭</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+
+export default {
+	name: 'RouteDetail',
+	components: {
+	},
+	props: {
+
+	},
+	data() {
+		return {
+			show: false,
+			formModel: {
+				organizationName: '',
+				userName: '',
+				goodsName: '',
+				amount: '',
+				forever: '',
+				startTime: '',
+				monthAmount: '',
+				totalPrice: '',
+				payWays: '',
+				createTime: '',
+				orderType: '',
+				contractNo: '',
+				bizType: '',
+				payStatusZh: '',
+				sellerName: ''
+			}
+		};
+	},
+	computed: {
+		form() {
+			const form = {
+				labelWidth: '120px',
+				items: [
+					{ prop: 'organizationName', label: `${this.$t('orderAuthor.organizationOrEnterprise')}:`, type: 'text', disabled: true },
+					{ prop: 'userName', label: `${this.$t('orderAuthor.userName')}:`, type: 'text', disabled: true },
+					{ prop: 'goodsName', label: `${this.$t('orderAuthor.commodityName')}:`, type: 'text', disabled: true },
+					{ prop: 'amount', label: `${this.$t('orderAuthor.permissionNumber')}:`, type: 'text', disabled: true },
+					{ prop: 'forever', label: `${this.$t('orderAuthor.permanenceOrNot')}:`, type: 'radio', disabled: true, required: false, options: this.$ConstSelect.Whether },
+					{ prop: 'startTime', label: `${this.$t('orderAuthor.startDate')}:`, type: 'text', disabled: true },
+					{ prop: 'monthAmount', label: `${this.$t('orderAuthor.purchaseMonths')}:`, type: 'text', disabled: true },
+					{ prop: 'totalPrice', label: `${this.$t('orderAuthor.totalPrice')}:`, type: 'text', disabled: true },
+					{ prop: 'payWays', label: `${this.$t('orderAuthor.paymentMethod')}:`, type: 'text', disabled: true },
+					{ prop: 'createTime', label: `${this.$t('orderAuthor.creationDate')}:`, type: 'text', disabled: true },
+					{ prop: 'orderType', label: `${this.$t('orderAuthor.orderType')}:`, type: 'text', disabled: true },
+					{ prop: 'contractNo', label: `${this.$t('orderAuthor.contractNumber')}:`, type: 'text', disabled: true },
+					{ prop: 'bizType', label: `${this.$t('orderAuthor.businessType')}:`, type: 'text', disabled: true },
+					{ prop: 'payStatusZh', label: `${this.$t('orderAuthor.paymentStatus')}:`, type: 'text', disabled: true },
+					{ prop: 'sellerName', label: `${this.$t('orderAuthor.salesman')}:`, type: 'text', disabled: true }
+				]
+
+			};
+			return form;
+		}
+	},
+	watch: {
+
+	},
+	mounted() {
+	},
+	methods: {
+		doShow(data) {
+			this.show = true;
+			this.formModel = {
+				organizationName: data.organizationName,
+				userName: data.userName,
+				goodsName: data.goodsName,
+				amount: data.amount,
+				forever: data.forever,
+				startTime: data.startTime,
+				monthAmount: data.monthAmount,
+				totalPrice: data.totalPrice,
+				payWays: data.payWays,
+				createTime: data.createTime,
+				orderType: data.orderType,
+				contractNo: data.contractNo,
+				bizType: data.bizType,
+				payStatusZh: data.payStatusZh,
+				sellerName: data.sellerName
+			};
+		},
+		doClose() {
+			this.show = false;
+		}
+	}
+};
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+	.draft {
+        width: 400px;
+        text-align: center;
+        margin: 20px auto;
+    }
+	/deep/{
+		.data-box .el-form-item {
+			margin-bottom: 12px;
+		}
+	}
+
+</style>
diff --git a/src/views/orderauthor/order/draft.vue b/src/views/orderauthor/order/draft.vue
index d6be9ea6b..6097a3a77 100644
--- a/src/views/orderauthor/order/draft.vue
+++ b/src/views/orderauthor/order/draft.vue
@@ -103,9 +103,6 @@ export default {
 		};
 	},
 	computed: {
-		// turnbackBarTitle() {
-		//     return '';
-		// },
 		isAdd() {
 			return this.type === 'ADD';
 		},
diff --git a/src/views/orderauthor/order/list.vue b/src/views/orderauthor/order/list.vue
index 2ca09548b..b2a9f6937 100644
--- a/src/views/orderauthor/order/list.vue
+++ b/src/views/orderauthor/order/list.vue
@@ -3,6 +3,7 @@
     <QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
     <can-distribute ref="canDistribute" @distribute="distribute" />
     <qr-code ref="qrCode" />
+    <detail ref="detail" />
   </div>
 </template>
 
@@ -10,17 +11,19 @@
 import { getOrderPageList } from '@/api/management/order';
 import { getSellerList } from '@/api/management/user';
 import { getOrganizationList } from '@/api/management/organization';
-import { giveLessons } from '@/api/management/distribute';
-import { OperatorModel } from '@/scripts/ConstDic';
+import { postDistribute } from '@/api/management/distribute';
+// import { OperatorModel } from '@/scripts/ConstDic';
 import { UrlConfig } from '@/router/index';
 import QrCode from '@/components/QrCode';
 import CanDistribute from './canDistribute';
+import detail from './detail';
 
 export default {
 	name: 'List',
 	components: {
 		QrCode,
-		CanDistribute
+		CanDistribute,
+		detail
 	},
 	data() {
 		return {
@@ -29,10 +32,9 @@ export default {
 			OrderTypeList: [],
 			PayTypeList: [],
 			PayStatusList: [],
-			// OrganizationList: [],
 			WhetherTypeList: [],
 			EffectiveTypeList: [],
-			PermissionTypeList: [],
+			// PermissionTypeList: [],
 			pagerConfig: {
 				pageSize: 'pageSize',
 				pageIndex: 'pageNum'
@@ -51,13 +53,6 @@ export default {
 					'userName': {
 						type: 'text',
 						label: this.$t('orderAuthor.userName')
-					},
-					'permissionType': {
-						type: 'select',
-						label: this.$t('orderAuthor.permissionType'),
-						config: {
-							data: []
-						}
 					}
 				}
 			},
@@ -70,6 +65,7 @@ export default {
 						title: this.$t('orderAuthor.organizationOrEnterprise'),
 						prop: 'organizationName',
 						type: 'tag',
+						width: '250',
 						columnValue: (row) => { return row.organizationName; },
 						tagType: (row) => { return ''; }
 					},
@@ -81,13 +77,13 @@ export default {
 						title: this.$t('orderAuthor.commodityName'),
 						prop: 'goodsName'
 					},
-					{
-						title: this.$t('orderAuthor.permissionType'),
-						prop: 'permissionType',
-						type: 'tag',
-						columnValue: (row) => { return this.$convertField(row.permissionType, this.PermissionTypeList, ['value', 'label']); },
-						tagType: (row) => { return ''; }
-					},
+					// {
+					// 	title: this.$t('orderAuthor.permissionType'),
+					// 	prop: 'permissionType',
+					// 	type: 'tag',
+					// 	columnValue: (row) => { return this.$convertField(row.permissionType, this.PermissionTypeList, ['value', 'label']); },
+					// 	tagType: (row) => { return ''; }
+					// },
 					{
 						title: this.$t('orderAuthor.permissionNumber'),
 						prop: 'amount'
@@ -111,39 +107,41 @@ export default {
 						title: this.$t('orderAuthor.purchaseMonths'),
 						prop: 'monthAmount'
 					},
-					{
-						title: this.$t('orderAuthor.totalPrice'),
-						prop: 'totalPrice'
-					},
-					{
-						title: this.$t('orderAuthor.paymentMethod'),
-						prop: 'payWays',
-						type: 'tag',
-						columnValue: (row) => { return this.$convertField(row.payWays, this.PayTypeList, ['value', 'label']); },
-						tagType: (row) => { return 'success'; }
-					},
+					// {
+					// 	title: this.$t('orderAuthor.totalPrice'),
+					// 	prop: 'totalPrice'
+					// },
+					// {
+					// 	title: this.$t('orderAuthor.paymentMethod'),
+					// 	prop: 'payWays',
+					// 	width: '130',
+					// 	type: 'tag',
+					// 	columnValue: (row) => { return this.$convertField(row.payWays, this.PayTypeList, ['value', 'label']); },
+					// 	tagType: (row) => { return 'success'; }
+					// },
 					{
 						title: this.$t('orderAuthor.creationDate'),
-						prop: 'createTime'
-					},
-					{
-						title: this.$t('orderAuthor.orderType'),
-						prop: 'orderType',
-						type: 'tag',
-						columnValue: (row) => { return this.$convertField(row.orderType, this.OrderTypeList, ['value', 'label']); },
-						tagType: (row) => { return 'success'; }
-					},
-					{
-						title: this.$t('orderAuthor.contractNumber'),
-						prop: 'contractNo'
-					},
-					{
-						title: this.$t('orderAuthor.businessType'),
-						prop: 'bizType',
-						type: 'tag',
-						columnValue: (row) => { return this.$convertField(row.bizType, this.BizTypeList, ['value', 'label']); },
-						tagType: (row) => { return 'success'; }
+						prop: 'createTime',
+						width: '160'
 					},
+					// {
+					// 	title: this.$t('orderAuthor.orderType'),
+					// 	prop: 'orderType',
+					// 	type: 'tag',
+					// 	columnValue: (row) => { return this.$convertField(row.orderType, this.OrderTypeList, ['value', 'label']); },
+					// 	tagType: (row) => { return 'success'; }
+					// },
+					// {
+					// 	title: this.$t('orderAuthor.contractNumber'),
+					// 	prop: 'contractNo'
+					// },
+					// {
+					// 	title: this.$t('orderAuthor.businessType'),
+					// 	prop: 'bizType',
+					// 	type: 'tag',
+					// 	columnValue: (row) => { return this.$convertField(row.bizType, this.BizTypeList, ['value', 'label']); },
+					// 	tagType: (row) => { return 'success'; }
+					// },
 					{
 						title: this.$t('orderAuthor.paymentStatus'),
 						prop: 'payStatus',
@@ -157,21 +155,21 @@ export default {
 							}
 						}
 					},
-					{
-						title: this.$t('orderAuthor.salesman'),
-						prop: 'sellerName',
-						type: 'tag',
-						columnValue: (row) => { return row.sellerName; },
-						tagType: (row) => { return 'success'; }
-					},
+					// {
+					// 	title: this.$t('orderAuthor.salesman'),
+					// 	prop: 'sellerName',
+					// 	type: 'tag',
+					// 	columnValue: (row) => { return row.sellerName; },
+					// 	tagType: (row) => { return 'success'; }
+					// },
 					{
 						type: 'button',
 						title: this.$t('global.operate'),
 						width: '260',
 						buttons: [
 							{
-								name: this.$t('global.edit'),
-								handleClick: this.handleEdit
+								name: '详情',
+								handleClick: this.handleDetail
 							},
 							{
 								name: this.$t('orderAuthor.obtainQrCode'),
@@ -201,7 +199,6 @@ export default {
 		loadInitData() {
 			this.queryForm.queryObject.organizationId.config.data.length = 0;
 			getOrganizationList().then(response => {
-				// this.OrganizationList = response.data;
 				response.data.forEach(elem => {
 					this.queryForm.queryObject.organizationId.config.data.push({ value: elem.id, label: elem.name });
 				});
@@ -241,14 +238,14 @@ export default {
 				});
 			});
 
-			this.$Dictionary.permissionType().then(list => {
-				list.forEach(elem => {
-					this.queryForm.queryObject.permissionType.config.data.push({ value: elem.code, label: elem.name });
-				});
-				this.$convertList(list, this.PermissionTypeList, elem => {
-					return true;
-				});
-			});
+			// this.$Dictionary.permissionType().then(list => {
+			// 	list.forEach(elem => {
+			// 		this.queryForm.queryObject.permissionType.config.data.push({ value: elem.code, label: elem.name });
+			// 	});
+			// 	this.$convertList(list, this.PermissionTypeList, elem => {
+			// 		return true;
+			// 	});
+			// });
 		},
 		queryFunction(params) {
 			return getOrderPageList(params);
@@ -256,12 +253,12 @@ export default {
 		handleNormalAdd() {
 			this.$router.push({ path: `${UrlConfig.orderauthor.orderDraft}/add/0` });
 		},
-		handleEdit(index, data) {
-			this.$alert('功能待开发', this.$t('tip.hint'), {
-				confirmButtonText: this.$t('tip.confirm'),
-				callback: action => {
-				}
-			});
+		handleDetail(index, data) {
+			data.payWays = this.$convertField(data.payWays, this.PayTypeList, ['value', 'label']);
+			data.orderType = this.$convertField(data.orderType, this.OrderTypeList, ['value', 'label']);
+			data.bizType = this.$convertField(data.bizType, this.BizTypeList, ['value', 'label']);
+			data.payStatusZh = this.$convertField(data.payStatus, this.PayStatusList, ['value', 'label']);
+			this.$refs.detail.doShow(data);
 		},
 		handleCanDistribute(index, data) {
 			if (data.qrCodeGenerated) {
@@ -273,21 +270,11 @@ export default {
 		},
 		distribute(data) {
 			const model = {
-				amount: data.amount,
-				forever: data.forever,
-				orderCode: data.code,
-				startTime: data.startTime + ' 00:00:00',
-				monthAmount: data.monthAmount,
-				canDistribute: data.canDistribute,
-				operator: OperatorModel.TRANSFER,
-				mapId: data.mapId,
-				lessonId: data.lessonId || '',
-				mapProductCode: data.mapProductCode || '',
-				permissionType: data.permissionType,
-				organizationId: data.organizationId
+				code: data.code,
+				canDistribute: data.canDistribute ? data.canDistribute : false
 			};
 
-			giveLessons(model).then(response => {
+			postDistribute(model).then(response => {
 				this.reloadTable();
 				if (data.qrCodeGenerated) {
 					this.$refs.qrCode.doShow({
diff --git a/src/views/orderauthor/permission/Qcode.vue b/src/views/orderauthor/permission/Qcode.vue
new file mode 100644
index 000000000..ec465d922
--- /dev/null
+++ b/src/views/orderauthor/permission/Qcode.vue
@@ -0,0 +1,88 @@
+<template>
+  <el-dialog title="扫码" :visible.sync="centerDialogVisible" width="30%" center>
+    <el-input v-model="input" :placeholder="$t('global.inputRoomNumber')" />
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="centerDialogVisible = false">{{ $t('global.cancel') }}</el-button>
+      <el-button type="primary" @click="comit">{{ $t('global.confirm') }}</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import { getPermission } from '@/api/management/distribute';
+
+export default {
+	name: 'Dashboard',
+	data() {
+		return {
+			centerDialogVisible: false,
+			input: ''
+		};
+	},
+	methods: {
+		doShow() {
+			this.centerDialogVisible = true;
+		},
+		doClose() {
+			this.centerDialogVisible = false;
+		},
+		async comit() {
+			if (this.input) {
+				try {
+					await getPermission(`${this.input}`);
+					this.centerDialogVisible = false;
+				} catch (error) {
+					this.$messageBox(`${this.$t('error.scanningError')}:${error.message}`);
+				}
+			} else {
+				this.$messageBox(this.$t('global.inputRoomNumber'));
+			}
+		}
+	}
+};
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .dashboard {
+    &-container {
+      margin: 30px;
+    }
+
+    &-text {
+      font-size: 30px;
+      line-height: 46px;
+    }
+  }
+
+  /deep/ .el-carousel {
+    overflow: hidden;
+  }
+
+  .home-box {
+    float: left;
+    width: 100%;
+    font-family: 'Microsoft YaHei';
+
+    .title {
+      font-size: 45px;
+      text-align: center;
+      font-weight: 400;
+      border-bottom: 2px dashed #333;
+      padding-bottom: 15px;
+      margin: 50px 200px 120px 200px;
+      position: relative;
+
+      .logo-img {
+        position: absolute;
+        right: 0;
+        top: 0;
+        width: 55px;
+      }
+    }
+
+    .card-box {
+      width: 100%;
+      padding: 0 300px;
+    }
+  }
+</style>
diff --git a/src/views/orderauthor/permission/draft/choosePermission.vue b/src/views/orderauthor/permission/draft/choosePermission.vue
index 2604d1793..f7250cedf 100644
--- a/src/views/orderauthor/permission/draft/choosePermission.vue
+++ b/src/views/orderauthor/permission/draft/choosePermission.vue
@@ -73,6 +73,10 @@ export default {
 						title: this.$t('orderAuthor.organizationOrEnterprise'),
 						prop: 'organizationName'
 					},
+					{
+						title: '权限名称',
+						prop: 'permissionName'
+					},
 					{
 						title: this.$t('orderAuthor.userName'),
 						prop: 'userName'
@@ -81,25 +85,25 @@ export default {
 						title: this.$t('orderAuthor.userMobile'),
 						prop: 'userMobile'
 					},
-					{
-						title: this.$t('orderAuthor.mapName'),
-						prop: 'mapName'
-					},
-					{
-						title: this.$t('orderAuthor.mapProductName'),
-						prop: 'mapProductName'
-					},
-					{
-						title: this.$t('orderAuthor.courseName'),
-						prop: 'lessonName'
-					},
-					{
-						title: this.$t('orderAuthor.permissionType'),
-						prop: 'permissionType',
-						type: 'tag',
-						columnValue: (row) => { return this.$convertField(row.permissionType, this.PermissionTypeList, ['value', 'label']); },
-						tagType: (row) => { return ''; }
-					},
+					// {
+					// 	title: this.$t('orderAuthor.mapName'),
+					// 	prop: 'mapName'
+					// },
+					// {
+					// 	title: this.$t('orderAuthor.mapProductName'),
+					// 	prop: 'mapProductName'
+					// },
+					// {
+					// 	title: this.$t('orderAuthor.courseName'),
+					// 	prop: 'lessonName'
+					// },
+					// {
+					// 	title: this.$t('orderAuthor.permissionType'),
+					// 	prop: 'permissionType',
+					// 	type: 'tag',
+					// 	columnValue: (row) => { return this.$convertField(row.permissionType, this.PermissionTypeList, ['value', 'label']); },
+					// 	tagType: (row) => { return ''; }
+					// },
 					{
 						title: this.$t('orderAuthor.publicOrPrivate'),
 						prop: 'canDistribute',
@@ -154,13 +158,13 @@ export default {
 								name: this.$t('global.add'),
 								handleClick: this.handlePut,
 								type: '',
-								showControl: (row) => { return !row.isPut && row.permissionType; }
+								showControl: (row) => { return !row.isPut; }
 							},
 							{
 								name: this.$t('global.delete'),
 								handleClick: this.handlePop,
 								type: 'warning',
-								showControl: (row) => { return row.isPut && row.permissionType; }
+								showControl: (row) => { return row.isPut; }
 							}
 						]
 					}
diff --git a/src/views/orderauthor/permission/draft/ruleForm.vue b/src/views/orderauthor/permission/draft/ruleForm.vue
index b0f4c6bb4..575568487 100644
--- a/src/views/orderauthor/permission/draft/ruleForm.vue
+++ b/src/views/orderauthor/permission/draft/ruleForm.vue
@@ -16,16 +16,16 @@
             style="width: 100%"
             :height="height-300"
           >
-            <el-table-column prop="mapName" :label="this.$t('orderAuthor.mapName')" />
-            <el-table-column prop="mapProductName" :label="this.$t('orderAuthor.mapProductName')" width="120" />
+            <el-table-column prop="permissionName" label="权限名称" />
+            <!-- <el-table-column prop="mapProductName" :label="this.$t('orderAuthor.mapProductName')" width="120" />
             <el-table-column prop="lessonName" :label="this.$t('orderAuthor.courseName')" width="100" />
-            <el-table-column prop="permissionType" :label="this.$t('orderAuthor.permissionType')" width="100">
-              <template slot-scope="scope">
-                {{ computedName(PermissionTypeList, scope.row.permissionType) }}
-              </template>
-            </el-table-column>
-            <el-table-column prop="amount" :label="this.$t('orderAuthor.totalPermissions')" width="80" />
-            <el-table-column prop="remains" :label="this.$t('orderAuthor.residualPermissionNumber')" width="80" />
+            <el-table-column prop="permissionType" :label="this.$t('orderAuthor.permissionType')" width="100"> -->
+            <!-- <template slot-scope="scope">
+              {{ computedName(PermissionTypeList, scope.row.permissionType) }}
+            </template>
+            </el-table-column> -->
+            <el-table-column prop="amount" :label="this.$t('orderAuthor.totalPermissions')" width="120" />
+            <el-table-column prop="remains" :label="this.$t('orderAuthor.residualPermissionNumber')" width="120" />
             <el-table-column :label="this.$t('global.operate')" width="60">
               <template slot-scope="scope">
                 <el-button type="text" size="small" @click="deleteForm(scope.$index, scope.row)">{{ $t('global.delete') }}
@@ -37,7 +37,7 @@
         <div class="draft">
           <el-button-group>
             <el-button v-if="!urlInfo.url" type="primary" @click="packForm">{{ $t('orderAuthor.packaging') }}</el-button>
-            <el-button v-if="urlInfo.url" type="primary" @click="QrCodeShow">{{ $t('orderAuthor.obtainQrCode') }}</el-button>
+            <el-button v-if="urlInfo.url" type="primary" @click="qrCodeShow">{{ $t('orderAuthor.obtainQrCode') }}</el-button>
             <el-button type="primary" @click="turnback">{{ $t('global.back') }}</el-button>
           </el-button-group>
         </div>
diff --git a/src/views/orderauthor/permission/index.vue b/src/views/orderauthor/permission/index.vue
index c26e6b09a..1f1dafbd5 100644
--- a/src/views/orderauthor/permission/index.vue
+++ b/src/views/orderauthor/permission/index.vue
@@ -2,6 +2,7 @@
   <div>
     <QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
     <qr-code ref="qrCode" />
+    <qcode ref="qcode" />
   </div>
 </template>
 
@@ -10,11 +11,13 @@ import { superAdmin } from '@/router';
 import { listPackagePermission, restorePackagePermission, getPackageQrCode, permissionDistributeUnPackage } from '@/api/management/distribute';
 import { UrlConfig } from '@/router/index';
 import QrCode from '@/components/QrCode';
+import Qcode from './Qcode';
 
 export default {
 	name: 'Author',
 	components: {
-		QrCode
+		QrCode,
+		Qcode
 	},
 	data() {
 		return {
@@ -36,13 +39,13 @@ export default {
 						type: 'text',
 						label: this.$t('orderAuthor.founder')
 					},
-					'permissionType': {
-						type: 'select',
-						label: this.$t('orderAuthor.permissionType'),
-						config: {
-							data: []
-						}
-					},
+					// 'permissionType': {
+					// 	type: 'select',
+					// 	label: this.$t('orderAuthor.permissionType'),
+					// 	config: {
+					// 		data: []
+					// 	}
+					// },
 					'status': {
 						type: 'select',
 						label: this.$t('orderAuthor.authorityStatus'),
@@ -62,6 +65,10 @@ export default {
 						title: this.$t('orderAuthor.organizationOrEnterprise'),
 						prop: 'organizationName'
 					},
+					{
+						title: '权限名称',
+						prop: 'permissionName'
+					},
 					{
 						title: this.$t('orderAuthor.founder'),
 						prop: 'userName'
@@ -70,25 +77,25 @@ export default {
 						title: this.$t('orderAuthor.founderPhone'),
 						prop: 'userMobile'
 					},
-					{
-						title: this.$t('orderAuthor.mapName'),
-						prop: 'mapName'
-					},
-					{
-						title: this.$t('orderAuthor.mapProductName'),
-						prop: 'mapProductName'
-					},
-					{
-						title: this.$t('orderAuthor.courseName'),
-						prop: 'lessonName'
-					},
-					{
-						title: this.$t('orderAuthor.permissionType'),
-						prop: 'permissionType',
-						type: 'tag',
-						columnValue: (row) => { return this.$convertField(row.permissionType, this.PermissionTypeList, ['value', 'label']); },
-						tagType: (row) => { return ''; }
-					},
+					// {
+					// 	title: this.$t('orderAuthor.mapName'),
+					// 	prop: 'mapName'
+					// },
+					// {
+					// 	title: this.$t('orderAuthor.mapProductName'),
+					// 	prop: 'mapProductName'
+					// },
+					// {
+					// 	title: this.$t('orderAuthor.courseName'),
+					// 	prop: 'lessonName'
+					// },
+					// {
+					// 	title: this.$t('orderAuthor.permissionType'),
+					// 	prop: 'permissionType',
+					// 	type: 'tag',
+					// 	columnValue: (row) => { return this.$convertField(row.permissionType, this.PermissionTypeList, ['value', 'label']); },
+					// 	tagType: (row) => { return ''; }
+					// },
 					{
 						title: this.$t('orderAuthor.publicOrPrivate'),
 						prop: 'canDistribute',
@@ -172,7 +179,8 @@ export default {
 					}
 				],
 				actions: [
-					{ text: this.$t('orderAuthor.privilegePackaging'), btnCode: 'employee_insert', handler: this.handlePackage }
+					{ text: this.$t('orderAuthor.privilegePackaging'), btnCode: 'employee_insert', handler: this.handlePackage },
+					{ text: '领取权限', handler: this.handlerPermission, show: process.env.NODE_ENV == 'development' }
 				]
 			}
 		};
@@ -191,15 +199,15 @@ export default {
 					return true;
 				});
 			});
-			this.$Dictionary.permissionType().then(list => {
-				list.forEach(elem => {
-					this.queryForm.queryObject.permissionType.config.data.push({ value: elem.code, label: elem.name });
-				});
-				this.$convertList(list, this.PermissionTypeList, elem => {
-					return true;
-				});
-				this.PermissionTypeList.push({ value: undefined, label: this.$t('orderAuthor.permissionPack') });
-			});
+			// this.$Dictionary.permissionType().then(list => {
+			// 	list.forEach(elem => {
+			// 		this.queryForm.queryObject.permissionType.config.data.push({ value: elem.code, label: elem.name });
+			// 	});
+			// 	this.$convertList(list, this.PermissionTypeList, elem => {
+			// 		return true;
+			// 	});
+			// 	this.PermissionTypeList.push({ value: undefined, label: this.$t('orderAuthor.permissionPack') });
+			// });
 		},
 		formatterDate(row, porpInfo) {
 			return row[porpInfo.property];
@@ -255,6 +263,9 @@ export default {
 		},
 		handlePackage() {
 			this.$router.push({ path: `${UrlConfig.orderauthor.trainferPackage}` });
+		},
+		handlerPermission() {
+			this.$refs.qcode.doShow();
 		}
 	}
 };
diff --git a/src/views/orderauthor/rules/index.vue b/src/views/orderauthor/rules/index.vue
new file mode 100644
index 000000000..e909ba95c
--- /dev/null
+++ b/src/views/orderauthor/rules/index.vue
@@ -0,0 +1,181 @@
+<template>
+  <div>
+    <QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
+    <select-role ref="selectRole" @reloadTable="reloadTable" />
+  </div>
+</template>
+
+<script>
+import { listPermision } from '@/api/management/author';
+import selectRole from './selectRole/list';
+
+export default {
+	name: 'Author',
+	components: {
+		selectRole
+	},
+	data() {
+		return {
+			PermissionTypeList: [],
+			EffectiveTypeList: [],
+			pagerConfig: {
+				pageSize: 'pageSize',
+				pageIndex: 'pageNum'
+			},
+			queryForm: {
+				labelWidth: '120px',
+				reset: true,
+				queryObject: {
+					permissionType: {
+						type: 'select',
+						label: this.$t('permission.permissionType'),
+						config: {
+							data: []
+						}
+					},
+					status: {
+						type: 'select',
+						label: '状态类型',
+						config: {
+							data: []
+						}
+					}
+				}
+			},
+			queryList: {
+				query: this.queryFunction,
+				selectCheckShow: false,
+				indexShow: true,
+				columns: [
+					{
+						title: '权限名称',
+						width: '260',
+						prop: 'permissionName'
+					},
+					{
+						title: this.$t('permission.permissionType'),
+						prop: 'permissionType',
+						type: 'tag',
+						columnValue: (row) => { return this.$convertField(row.permissionType, this.PermissionTypeList, ['value', 'label']); },
+						tagType: (row) => { return ''; }
+					},
+					{
+						title: this.$t('permission.permissionUseType'),
+						prop: 'canDistribute',
+						type: 'tag',
+						columnValue: (row) => { return this.$ConstSelect.translate(row.canDistribute, 'PermissionUseList'); },
+						tagType: (row) => {
+							switch (row.canDistribute) {
+							case true: return 'success';
+							case false: return 'danger';
+							}
+						}
+					},
+					{
+						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'
+					},
+					{
+						title: this.$t('permission.permissionRemains'),
+						prop: 'remains'
+					},
+					{
+						title: this.$t('permission.startTime'),
+						prop: 'startTime',
+						type: 'formatter',
+						formatter: this.formatterDate
+
+					},
+					{
+						title: this.$t('permission.endTime'),
+						prop: 'endTime',
+						type: 'formatter',
+						formatter: this.formatterDate
+					},
+					{
+						title: this.$t('permission.belonger'),
+						prop: 'ownerName'
+					},
+					{
+						title: this.$t('permission.permissionStatus'),
+						prop: 'status',
+						type: 'tag',
+						columnValue: (row) => { return this.$convertField(row.status, this.EffectiveTypeList, ['value', 'label']); },
+						tagType: (row) => {
+							switch (row.status) {
+							case '1': return 'success';
+							default: return 'danger';
+							}
+						}
+					},
+					{
+						type: 'button',
+						title: this.$t('global.operate'),
+						width: '200',
+						buttons: [
+							{
+								name: this.$t('permission.setBelonger'),
+								handleClick: this.handleRoleVest,
+								type: ''
+							}
+						]
+					}
+				],
+				actions: [
+				]
+			}
+		};
+	},
+
+	mounted() {
+		this.loadInitData();
+	},
+	methods: {
+		handleRoleVest(index, row) {
+			this.$refs.selectRole.doShow(row.id);
+		},
+		loadInitData() {
+			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 => {
+					this.queryForm.queryObject.permissionType.config.data.push({ value: elem.code, label: elem.name });
+				});
+				this.$convertList(list, this.PermissionTypeList, elem => {
+					return true;
+				});
+			});
+		},
+		formatterDate(row, porpInfo) {
+			return row[porpInfo.property];
+		},
+		queryFunction(params) {
+			return listPermision(params);
+		},
+		reloadTable() {
+			if (this.queryList && this.queryList.reload) {
+				this.queryList.reload();
+			}
+		}
+	}
+};
+</script>
diff --git a/src/views/orderauthor/rules/selectRole/list.vue b/src/views/orderauthor/rules/selectRole/list.vue
new file mode 100644
index 000000000..412745500
--- /dev/null
+++ b/src/views/orderauthor/rules/selectRole/list.vue
@@ -0,0 +1,111 @@
+<template>
+  <el-dialog
+    :title="$t('permission.userList')"
+    :visible.sync="show"
+    top="20px"
+    width="90%"
+    :before-do-close="doClose"
+    :close-on-click-modal="false"
+  >
+    <QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
+  </el-dialog>
+</template>
+
+<script>
+import { getUserList } from '@/api/management/user';
+import { putPermissionOwner } from '@/api/management/author';
+
+export default {
+	name: 'SelectRole',
+	data() {
+		return {
+			show: false,
+			roleId: '',
+			pagerConfig: {
+				pageSize: 'pageSize',
+				pageIndex: 'pageNum'
+			},
+			queryForm: {
+				labelWidth: '80px',
+				reset: true,
+				queryObject: {
+					name: {
+						type: 'text',
+						label: this.$t('global.name')
+					}
+				}
+
+			},
+			queryList: {
+				query: getUserList,
+				selectCheckShow: false,
+				indexShow: true,
+				columns: [
+					{
+						title: this.$t('global.name'),
+						prop: 'name'
+					},
+					{
+						title: this.$t('global.nickName'),
+						prop: 'nickname'
+					},
+					{
+						title: this.$t('global.mobile'),
+						prop: 'mobile'
+					},
+					{
+						title: this.$t('global.email'),
+						prop: 'email'
+					},
+					{
+						type: 'button',
+						title: this.$t('global.operate'),
+						width: '250',
+						buttons: [
+							{
+								name: this.$t('global.select'),
+								handleClick: this.selectRole,
+								showControl: (row) => {
+									return row.id != this.$store.state.user.id;
+								}
+							}
+						]
+					}
+				]
+			},
+			currentModel: {}
+		};
+	},
+	created() {
+	},
+	methods: {
+		doShow(roleId) {
+			this.roleId = roleId;
+			this.show = true;
+		},
+		doClose() {
+			this.show = false;
+		},
+
+		selectRole(index, row) {
+			this.$confirm(this.$t('permission.isSureSetBelonger').replace('{name}', row.name), this.$t('global.tips'), {
+				confirmButtonText: this.$t('global.confirm'),
+				cancelButtonText: this.$t('global.cancel'),
+				type: 'warning'
+			}).then(() => {
+				putPermissionOwner({ id: this.roleId, owner: row }).then(resp => {
+					this.$message.success(this.$t('permission.setSuccess'));
+					this.show = false;
+					this.$emit('reloadTable');
+				}).catch(() => {
+					this.$messageBox(this.$t('error.setFailed'));
+				});
+			}).catch(() => { });
+		},
+
+		reloadTable() {
+			this.queryList.reload();
+		}
+	}
+};
+</script>
diff --git a/src/views/package/draft/editRule.vue b/src/views/package/draft/editRule.vue
index 3b00b835e..67c882c76 100644
--- a/src/views/package/draft/editRule.vue
+++ b/src/views/package/draft/editRule.vue
@@ -2,7 +2,7 @@
   <el-dialog :title="title" :visible.sync="show" width="800px" :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" :disabled="disabled" @click="draftRule">{{ isAdd? $t('global.add'): $t('global.edit') }}
+      <el-button type="primary" @click="draftRule">{{ isAdd? $t('global.add'): $t('global.edit') }}
       </el-button>
       <el-button @click="doClose">{{ $t('global.cancel') }}</el-button>
     </span>
@@ -78,6 +78,7 @@ export default {
 			return form;
 		},
 		rules() {
+			const that = this;
 			const crules = {
 				permissionType: [
 					{ required: true, message: this.$t('rules.permissionTypeInput'), trigger: 'change' }
@@ -101,7 +102,7 @@ export default {
 							if (Number.isInteger(Number(value)) && Number(value) > 0) {
 								callback();
 							} else {
-								callback(new Error(this.$t('rules.permissionNumberGreater0')));
+								callback(new Error(that.$t('rules.permissionNumberGreater0')));
 							}
 						},
 						trigger: 'blur'
@@ -164,17 +165,17 @@ export default {
 				const model = {
 					startTime: startTime,
 					endTime: endTime,
-					type: this.formModel.permissionType,
+					permissionType: this.formModel.permissionType,
 					ownerId: this.formModel.ownerId
 				};
 
 				if (this.formModel.permissionType == PermissionType.LESSON || this.formModel.permissionType == PermissionType.EXAM) {
 					model['lessonId'] = this.formModel.lessonId;
 					model['mapId'] = this.formModel.mapId;
-					model['mapProductCode'] = this.formModel.mapProductCode;
+					model['prdCode'] = this.formModel.mapProductCode;
 				} else if (this.formModel.permissionType == PermissionType.SIMULATION) {
 					model['mapId'] = this.formModel.mapId;
-					model['mapProductCode'] = this.formModel.mapProductCode;
+					model['prdCode'] = this.formModel.mapProductCode;
 				}
 
 				getTotalRemains(model).then(response => {
@@ -230,7 +231,6 @@ export default {
 					});
 					cb(results);
 				} catch (error) {
-					console.error(error, '查询用户list');
 					cb(results);
 				}
 			} else {
@@ -263,8 +263,8 @@ export default {
 			this.show = false;
 		},
 		draftRule() {
-			if (this.formModel.amount <= this.maxTotal && this.formModel.amount) {
-				this.$refs.dataform.validateForm(() => {
+			this.$refs.dataform.validateForm(() => {
+				if (this.formModel.amount <= this.maxTotal && this.formModel.amount) {
 					if (this.isAdd) {
 						this.$emit('addRuleForm', {
 							operator: OperatorModel.TRANSFER,
@@ -293,8 +293,8 @@ export default {
 						});
 					}
 					this.doClose();
-				});
-			}
+				}
+			});
 		}
 	}
 };
diff --git a/src/views/package/index.vue b/src/views/package/index.vue
index 746d6a8a7..c97f6139b 100644
--- a/src/views/package/index.vue
+++ b/src/views/package/index.vue
@@ -59,25 +59,18 @@ export default {
 				selectCheckShow: false,
 				indexShow: true,
 				columns: [
+					{
+						title: '权限名称',
+						width: '210',
+						prop: 'permissionName'
+					},
 					{
 						title: this.$t('permission.permissionType'),
-						prop: 'type',
+						prop: 'permissionType',
 						type: 'tag',
-						columnValue: (row) => { return this.$convertField(row.type, this.PermissionTypeList, ['value', 'label']); },
+						columnValue: (row) => { return this.$convertField(row.permissionType, this.PermissionTypeList, ['value', 'label']); },
 						tagType: (row) => { return ''; }
 					},
-					{
-						title: this.$t('permission.mapName'),
-						prop: 'mapName'
-					},
-					{
-						title: this.$t('permission.mapProductName'),
-						prop: 'mapProductName'
-					},
-					{
-						title: this.$t('permission.lessonName'),
-						prop: 'lessonName'
-					},
 					{
 						title: this.$t('permission.permissionUseType'),
 						prop: 'canDistribute',
@@ -90,18 +83,18 @@ 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.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'
@@ -184,9 +177,11 @@ export default {
 				list.forEach(elem => {
 					this.queryForm.queryObject.type.config.data.push({ value: elem.code, label: elem.name });
 				});
+				console.log(list);
 				this.$convertList(list, this.PermissionTypeList, elem => {
 					return true;
 				});
+				console.log(this.PermissionTypeList);
 			});
 		},
 		formatterDate(row, porpInfo) {
diff --git a/src/views/planMonitor/detail.vue b/src/views/planMonitor/detail.vue
index f9644b0ac..c78225c87 100644
--- a/src/views/planMonitor/detail.vue
+++ b/src/views/planMonitor/detail.vue
@@ -26,8 +26,7 @@
 // import { mapGetters } from 'vuex';
 // import { getCourseLessonTree } from '@/api/management/exam';
 import { getPublishMapInfo } from '@/api/jmap/map';
-import { queryPermissionScreen } from '@/api/management/author';
-// import { getGoodsTryUse } from '@/api/management/goods';
+// import { queryPermissionScreen } from '@/api/management/author';
 import { PermissionType } from '@/scripts/ConstDic';
 // import { launchFullscreen } from '@/utils/screen';
 import { UrlConfig } from '@/router/index';
@@ -86,11 +85,7 @@ export default {
 			this.height = this._clientHeight;
 		},
 		async getScreenLists() {
-			const res = await queryPermissionScreen();
-			this.screenList = res.data;
-			this.courseModel = {
-				pmsList: this.screenList || []
-			};
+
 		},
 		async initLoadPage() {
 			const that = this;
diff --git a/src/views/planMonitor/planmanage/planList.vue b/src/views/planMonitor/planmanage/planList.vue
index 9aa7b8518..07f5e9669 100644
--- a/src/views/planMonitor/planmanage/planList.vue
+++ b/src/views/planMonitor/planmanage/planList.vue
@@ -30,7 +30,8 @@
 <script>
 import FilterCity from '@/views/components/filterCity';
 import { listPublishMap } from '@/api/jmap/map';
-import { queryPermissionScreen } from '@/api/management/author';
+// import { queryPermissionScreen } from '@/api/management/author';
+import { getSessionStorage, setSessionStorage, removeSessionStorage } from '@/utils/auth';
 import { UrlConfig } from '@/router/index';
 
 export default {
@@ -70,13 +71,11 @@ export default {
 		}
 	},
 	created() {
-		this.getScreenLists();
+	},
+	beforeDestroy () {
+		removeSessionStorage('planMonitorList');
 	},
 	methods: {
-		async getScreenLists() {
-			const list = await queryPermissionScreen();
-			this.screenList = list.data;
-		},
 		filterNode(value, data) {
 			if (!value) return true;
 			return data.name.indexOf(value) !== -1;
@@ -88,6 +87,7 @@ export default {
 			}
 		},
 		clickEvent(obj) {
+			setSessionStorage('planMonitorList', obj.id);
 			this.$router.push({ path: `${UrlConfig.plan.detail}/${obj.id}` });
 		},
 		refresh(filterSelect) {
@@ -96,10 +96,7 @@ export default {
 			listPublishMap().then(res => {
 				(res.data || []).forEach(ele => {
 					if (ele.cityCode == filterSelect) {
-						ele.valid = false;
-						if (this.screenList.length) {
-							ele.valid = true;
-						}
+						ele.valid = true;
 						this.treeData.push(ele);
 					}
 				});
@@ -114,7 +111,7 @@ export default {
 					this.$router.push({ path: `${UrlConfig.plan.prefix}/home` });
 				} else {
 					this.$nextTick(() => {
-						const mapId = (this.treeList[0] || { id: 0 }).id;
+						const mapId = getSessionStorage('planMonitorList') || (this.treeList[0] || { id: 0 }).id;
 						this.$router.push({ path: `${UrlConfig.plan.detail}/${mapId}` });
 						this.$refs.tree.setCurrentKey(mapId); // value 绑定的node-key
 					});
diff --git a/src/views/publish/examRule/draft/rule.vue b/src/views/publish/examRule/draft/rule.vue
index d406122ba..c277139e3 100644
--- a/src/views/publish/examRule/draft/rule.vue
+++ b/src/views/publish/examRule/draft/rule.vue
@@ -184,8 +184,8 @@ export default {
 				} else {
 					this.$router.push({ path: `${path}` });
 				}
-			}).catch(res => {
-				this.$messageBox('保存规则失败');
+			}).catch(error => {
+				this.$messageBox(`保存规则失败: ${error.message}`);
 			});
 		},
 		addRuleList(data) {
diff --git a/src/views/publish/runPlanCommon/index.vue b/src/views/publish/runPlanCommon/index.vue
index 41742043d..5ac9e95c0 100644
--- a/src/views/publish/runPlanCommon/index.vue
+++ b/src/views/publish/runPlanCommon/index.vue
@@ -6,14 +6,16 @@
 
 <script>
 import { superAdmin } from '@/router';
-import { getRunPlanLoadList, runPlanTemplateList } from '@/api/runplan';
+import { getRunPlanLoadList, runPlanTemplateList, listAllTempLateRunPlan } from '@/api/runplan';
 import { UrlConfig } from '@/router/index';
+import { listPublishMap } from '@/api/jmap/map';
 
 export default {
 	name: 'RunPlanCommon',
 	data() {
 		return {
-			skinCodeList: [],
+			mapList: [],
+			templatePlanList: [],
 			pagerConfig: {
 				pageSize: 'pageSize',
 				pageIndex: 'pageNum'
@@ -22,13 +24,12 @@ export default {
 				labelWidth: '140px',
 				reset: true,
 				queryObject: {
-					mapName: {
-						type: 'text',
-						label: this.$t('publish.mapName')
-					},
-					runPlanName: {
-						type: 'text',
-						label: this.$t('publish.runPlanName')
+					mapId: {
+						type: 'select',
+						label: this.$t('publish.mapName'),
+						config: {
+							data: []
+						}
 					}
 				}
 			},
@@ -39,11 +40,17 @@ export default {
 				columns: [
 					{
 						title: this.$t('publish.mapName'),
-						prop: 'mapName'
+						prop: 'mapId',
+						type: 'tag',
+						columnValue: (row) => { return this.$convertField(row.mapId, this.mapList, ['id', 'name']); },
+						tagType: (row) => { return ''; }
 					},
 					{
 						title: this.$t('publish.runPlanName'),
-						prop: 'runPlanName'
+						prop: 'templatePlanId',
+						type: 'tag',
+						columnValue: (row) => { return this.$convertField(row.templatePlanId, this.templatePlanList, ['id', 'name']); },
+						tagType: (row) => { return 'success'; }
 					},
 					{
 						type: 'button',
@@ -72,7 +79,23 @@ export default {
 			currentModel: {}
 		};
 	},
+	mounted() {
+		this.loadPageData();
+	},
 	methods: {
+		loadPageData() {
+			this.mapList = [];
+			listPublishMap().then(resp => {
+				this.mapList = resp.data;
+				this.mapList.forEach(elem => {
+					this.queryForm.queryObject.mapId.config.data.push({ value: elem.id, label: elem.name });
+				});
+			});
+			this.templatePlanList = [];
+			listAllTempLateRunPlan().then(resp => {
+				this.templatePlanList = resp.data;
+			});
+		},
 		queryFunction(params) {
 			params['userId'] = '';
 			return getRunPlanLoadList(params);
diff --git a/src/views/publish/runPlanEveryDay/index.vue b/src/views/publish/runPlanEveryDay/index.vue
index 5bcd48e4c..04448d83b 100644
--- a/src/views/publish/runPlanEveryDay/index.vue
+++ b/src/views/publish/runPlanEveryDay/index.vue
@@ -6,7 +6,7 @@
 
 <script>
 import { superAdmin } from '@/router';
-import { getSkinCodeList } from '@/api/management/mapskin';
+import { listPublishMap } from '@/api/jmap/map';
 import { runPlanEveryDayList, deleteRunPlanEveryDay } from '@/api/runplan';
 import { UrlConfig } from '@/router/index';
 
@@ -14,7 +14,7 @@ export default {
 	name: 'RunPlanEveryDay',
 	data() {
 		return {
-			skinCodeList: [],
+			mapList: [],
 			pagerConfig: {
 				pageSize: 'pageSize',
 				pageIndex: 'pageNum'
@@ -27,9 +27,9 @@ export default {
 						type: 'text',
 						label: this.$t('publish.runPlanName')
 					},
-					skinCode: {
+					mapId: {
 						type: 'select',
-						label: this.$t('publish.skinType'),
+						label: this.$t('publish.mapName'),
 						config: {
 							data: []
 						}
@@ -46,13 +46,13 @@ export default {
 						prop: 'name'
 					},
 					{
-						title: this.$t('publish.skinType'),
-						prop: 'skinCode',
+						title: this.$t('publish.mapName'),
+						prop: 'mapId',
 						type: 'tag',
 						columnValue: (row) => {
-							return this.$convertField(row.skinCode, this.skinCodeList, ['code', 'name']);
+							return this.$convertField(row.mapId, this.mapList, ['id', 'name']);
 						},
-						tagType: (row) => { return ''; }
+						tagType: (row) => { return 'success'; }
 					},
 					{
 						title: this.$t('publish.runEveryDayTime'),
@@ -91,11 +91,11 @@ export default {
 	},
 	methods: {
 		loadInitData() {
-			this.skinCodeList = [];
-			getSkinCodeList().then(response => {
-				this.skinCodeList = response.data;
+			this.mapList = [];
+			listPublishMap().then(response => {
+				this.mapList = response.data;
 				response.data.forEach(elem => {
-					this.queryForm.queryObject.skinCode.config.data.push({ value: elem.code, label: elem.name });
+					this.queryForm.queryObject.mapId.config.data.push({ value: elem.id, label: elem.name });
 				});
 			});
 		},
diff --git a/src/views/publish/runPlanTemplate/index.vue b/src/views/publish/runPlanTemplate/index.vue
index be7757936..885cb1cec 100644
--- a/src/views/publish/runPlanTemplate/index.vue
+++ b/src/views/publish/runPlanTemplate/index.vue
@@ -1,6 +1,7 @@
 <template>
   <div>
     <QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
+    <map-select ref="map" @confirm="handleGenerateEveryDay" />
   </div>
 </template>
 
@@ -9,9 +10,13 @@ import { superAdmin } from '@/router';
 import { getSkinCodeList } from '@/api/management/mapskin';
 import { runPlanTemplateList, deleteRunPlanTemplate, generateCommonRunPlanEveryDay } from '@/api/runplan';
 import { UrlConfig } from '@/router/index';
+import MapSelect from './mapSelect';
 
 export default {
 	name: 'RunPlanTemplate',
+	components: {
+		MapSelect
+	},
 	data() {
 		return {
 			skinCodeList: [],
@@ -71,7 +76,7 @@ export default {
 							},
 							{
 								name: this.$t('publish.generateRunPlan'),
-								handleClick: this.handleGenerateEveryDay,
+								handleClick: this.handleMapSelect,
 								type: ''
 							},
 							{
@@ -120,15 +125,20 @@ export default {
 				});
 			}).catch(() => { });
 		},
+		// 选择皮肤关联的地图
+		handleMapSelect(index, row) {
+			this.$refs.map.doShow(row);
+		},
 		// 生成每日运行图
-		handleGenerateEveryDay(index, row) {
+		handleGenerateEveryDay({planId, mapId}) {
 			this.$confirm(this.$t('publish.wellGenerateEveryRunPlan'), this.$t('global.tips'), {
 				confirmButtonText: this.$t('global.confirm'),
 				cancelButtonText: this.$t('global.cancel'),
 				type: 'warning'
 			}).then(() => {
-				generateCommonRunPlanEveryDay(row.id).then(response => {
+				generateCommonRunPlanEveryDay(planId, {mapId}).then(response => {
 					this.reloadTable();
+					this.$refs.map.doClose();
 					this.$message.success(this.$t('publish.createCommonSuccess'));
 				}).catch(() => {
 					this.reloadTable();
diff --git a/src/views/publish/runPlanTemplate/mapSelect.vue b/src/views/publish/runPlanTemplate/mapSelect.vue
new file mode 100644
index 000000000..115cd5136
--- /dev/null
+++ b/src/views/publish/runPlanTemplate/mapSelect.vue
@@ -0,0 +1,73 @@
+<template>
+  <el-dialog
+    :title="title"
+    :visible.sync="show"
+    width="30%"
+    :before-close="doClose"
+  >
+    <el-form ref="form" :model="formMdoel" :rules="rules" label-width="140px">
+      <el-form-item :label="$t('publish.selectMap')" prop="mapId">
+        <el-select v-model="formMdoel.mapId">
+          <el-option
+            v-for="item in mapList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          />
+        </el-select>
+      </el-form-item>
+    </el-form>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="doClose">{{ $t('global.cancel') }}</el-button>
+      <el-button type="primary" @click="handleCofirm">{{ $t('global.confirm') }}</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import { getPublishMapListBySkinCode } from '@/api/jmap/map';
+
+export default {
+	data() {
+		return {
+			show: false,
+			mapList: [],
+			formMdoel: {
+				planId: 0,
+				mapId: ''
+			}
+		};
+	},
+	computed: {
+		title() {
+			return this.$t('publish.selectMap');
+		},
+		rules() {
+			return {
+				mapId: [
+					{ required: true, message: this.$t('rules.mapInput'), trigger: 'blur' }
+				]
+			};
+		}
+	},
+	methods: {
+		doShow(row) {
+			this.formMdoel.planId = row.id;
+			this.show = true;
+			getPublishMapListBySkinCode(row.skinCode).then(resp => {
+				this.mapList = resp.data;
+			});
+		},
+		doClose(done) {
+			this.show = false;
+		},
+		handleCofirm() {
+			this.$refs['form'].validate((valid) => {
+				if (valid) {
+					this.$emit('confirm', this.formMdoel);
+				}
+			});
+		}
+	}
+};
+</script>
diff --git a/src/views/screenMonitor/detail/index.vue b/src/views/screenMonitor/detail/index.vue
index 05a2f53d3..c19d5f684 100644
--- a/src/views/screenMonitor/detail/index.vue
+++ b/src/views/screenMonitor/detail/index.vue
@@ -1,217 +1,214 @@
 <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" v-if="!courseModel.pmsList.length">
-                <span class="list-label">{{ $t('screenMonitor.productTrialDuration') }}</span>
-                <span class="list-elem">{{ showTryTime }}</span>
-            </p>
-            <p class="list-item">
-                <span class="list-label">{{ $t('global.permissionList') }}</span>
-            </p>
-            <limit-list ref="limitList" :courseModel="courseModel" @initLoadPage="getScreenLists"></limit-list>
-            <p style="display: flex; justify-content: center;">
-                <span class="list-label"></span>
-                <el-button type="success" @click="buy">{{ $t('global.buy') }}</el-button>
-                <el-button type="primary" @click="distribute" v-if="hasPermssion">{{$t('global.distributePermission')}}</el-button>
-                <el-button type="primary" @click="transfer" v-if="hasPermssion">{{$t('global.transferQRCode')}}</el-button>
-                <el-button type="primary" @click="start">{{$t('screenMonitor.aTSScreenSimulation')}}</el-button>
-            </p>
-        </div>
-        <set-time ref="setTime" @ConfirmSelectBeginTime="jump"></set-time>
-    </el-card>
+  <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 v-if="!courseModel.pmsList.length" class="list-item">
+        <span class="list-label">{{ $t('screenMonitor.productTrialDuration') }}</span>
+        <span class="list-elem">{{ showTryTime }}</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('screenMonitor.aTSScreenSimulation') }}</el-button>
+      </p>
+    </div>
+    <set-time ref="setTime" @ConfirmSelectBeginTime="jump" />
+  </el-card>
 </template>
+
 <script>
-    import { mapGetters } from 'vuex';
-    import { getCourseLessonTree } from '@/api/management/exam';
-    import { listPublishMap, getPublishMapInfo } from '@/api/jmap/map';
-    import { queryPermissionScreen } from '@/api/management/author';
-    import { getGoodsTryUse } from '@/api/management/goods';
-    import { PermissionType } from '@/scripts/ConstDic';
-    import { launchFullscreen } from '@/utils/screen';
-    import { UrlConfig } from '@/router/index';
-    import WindowResizeHandler from '@/mixin/WindowResizeHandler';
-    import LimitList from "@/views/components/limits/index";
-    import SetTime from '@/views/display/demon/setTime';
-    import { bitScreenNotify } from '@/api/simulation';
+import { getPublishMapInfo } from '@/api/jmap/map';
+import { queryPermissionScreen } from '@/api/management/author';
+import { getGoodsTryUse } from '@/api/management/goods';
+import { PermissionType } from '@/scripts/ConstDic';
+import { launchFullscreen } from '@/utils/screen';
+import { UrlConfig } from '@/router/index';
+import WindowResizeHandler from '@/mixin/WindowResizeHandler';
+import LimitList from '@/views/components/limits/index';
+import SetTime from '@/views/display/demon/setTime';
+import { bitScreenNotify } from '@/api/simulation';
 
-    export default {
-        name: 'ExamDetailList',
-        mixins: [
-            WindowResizeHandler
-        ],
-        components: {
-            LimitList,
-            SetTime
-        },
-        data() {
-            return {
-                height: '',
-                courseModel: {
-                    mapId: '',
-                    name: '',
-                    skinCode: '',
-                    updateTime: '',
-                    pmsList: [],
-                },
-                goodsId: '',
-                tryTime: 0,
-                showTryTime: '0',
-                tryUser: 0,
-                EffectiveTypeList: [],
-                screenList: [],
-            }
-        },
-        mixins: [
-            WindowResizeHandler
-        ],
-        filters: {
-        },
-        computed: {
-            hasPermssion() {
-                let isShow = false;
-                this.courseModel.pmsList.forEach(item => {
-                    if (item.canDistribute) {
-                        isShow = true;
-                    }
-                });
-                return isShow;
-            }
-        },
-        watch: {
-            $route(newVal) {
-                this.initLoadPage();
-            }
-        },
-        async mounted() {
-            this.$Dictionary.effectiveType().then(list => {
-                this.EffectiveTypeList = list;
-            });
-            await this.getScreenLists();
-            this.initLoadPage();
-        },
-        methods: {
-            resizeHandler: function () {
-                this.height = this._clientHeight;
-            },
-            async getScreenLists() {
-                let res = await queryPermissionScreen();
-                this.screenList = res.data;
-                this.courseModel = {
-                    pmsList: this.screenList || [],
-                };
-            },
-            async initLoadPage() {
-                let that = this;
-                let data = { id: this.$route.params.lessonId };
-                if (parseInt(data.id)) {
-                    try {
-                        let 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.SCREEN
-                        };
-
-                        this.$store.dispatch('training/setPrdType', res.data.prdType)
-                        let paras = {
-                            productType: PermissionType.SCREEN
-                        };
-
-                        if (!that.courseModel.pmsList.length) {
-                            this.tryUser = 1;
-                            try {
-                                let resp = await getGoodsTryUse(paras);
-                                if (resp.data.tryTime <= 0) {
-                                    this.tryTime = 0;
-                                    this.setTryTime(0)
-                                } else {
-                                    this.tryTime = resp.data.tryTime;
-                                    this.setTryTime(resp.data.tryTime)
-                                    this.goodsId = resp.data.goodsId;
-                                }
-
-                            } catch (err) {
-                                this.$messageBox(this.$t('error.acquisitionTimeFailed'))
-                            }
-                        }
-                    } catch (error) {
-                        this.$messageBox(this.$t('error.refreshFailed'))
-                    };
-                }
-            },
-            buy() {
-                this.$router.push({
-                    path: `${UrlConfig.dp.pay}/${this.$route.params.lessonId}`,
-                    query: { permissionType: PermissionType.SCREEN, prdCode: this.courseModel.prdCode, mapId: this.courseModel.mapId }
-                });
-            },
-            transfer() {
-                if (this.$refs) {
-                    this.$refs.limitList.transfer(this.courseModel);
-                }
-            },
-            distribute() {
-                if (this.$refs) {
-                    this.$refs.limitList.distribute(this.courseModel);
-                }
-            },
-            selectBeginTime() {
-                this.$refs.setTime.doShow();
-            },
-            jump(model) {
-                let data = { mapId: this.courseModel.mapId }
-                bitScreenNotify(data).then(resp => {
-                    let query = {
-                        skinCode: this.courseModel.skinCode, group: resp.data, prdType: '01', mapId: this.courseModel.mapId, try: this.tryUser, goodsId: this.goodsId, initTime: model.initTime,
-                    }
-                    this.$router.push({ path: `${UrlConfig.display}/dp`, query: query });
-                    launchFullscreen();
-
-                }).catch(error => {
-                    this.$messageBox(this.$t('error.createSimulationFailed') + error.message);
-                })
-            },
-            start() {
-                if (this.courseModel.pmsList.length) {
-                    this.selectBeginTime();
-                } else {
-                    if (this.tryTime <= 0) {
-                        this.$confirm(this.$('tip.noPermissionHint'), this.$t('global.tips'), {
-                            confirmButtonText: this.$t('global.confirm'),
-                            cancelButtonText: this.$t('global.cancel'),
-                            type: 'warning'
-                        }).then(() => {
-                            this.buy();
-                        }).catch(() => { });
-                    } else {
-                        this.selectBeginTime();
-                    }
-                }
-
-            },
-            setTryTime(val) {
-                if (val <= 1) {
-                    this.showTryTime = `0`+ this.$t('global.minute');
-                } else if (1 < val && val <= 60) {
-                    this.showTryTime =  '1'+ this.$t('global.minute');
-                } else if (val > 60) {
-                    let time = parseInt(val / 60);
-                    this.showTryTime = time+ this.$t('global.minutes');
-                }
-            }
-        }
-    }
+export default {
+	name: 'ExamDetailList',
+	components: {
+		LimitList,
+		SetTime
+	},
+	filters: {
+	},
+	mixins: [
+		WindowResizeHandler
+	],
+	data() {
+		return {
+			height: '',
+			courseModel: {
+				mapId: '',
+				name: '',
+				skinCode: '',
+				updateTime: '',
+				pmsList: []
+			},
+			goodsId: '',
+			tryTime: 0,
+			showTryTime: '0',
+			tryUser: 0,
+			EffectiveTypeList: [],
+			screenList: []
+		};
+	},
+	computed: {
+		hasPermssion() {
+			let isShow = false;
+			this.courseModel.pmsList.forEach(item => {
+				if (item.canDistribute) {
+					isShow = true;
+				}
+			});
+			return isShow;
+		}
+	},
+	watch: {
+		$route(newVal) {
+			this.initLoadPage();
+		}
+	},
+	async mounted() {
+		this.$Dictionary.effectiveType().then(list => {
+			this.EffectiveTypeList = list;
+		});
+		await this.getScreenLists();
+		this.initLoadPage();
+	},
+	methods: {
+		resizeHandler: function () {
+			this.height = this._clientHeight;
+		},
+		async getScreenLists() {
+			const res = await queryPermissionScreen();
+			this.screenList = res.data;
+			this.courseModel = {
+				pmsList: this.screenList || []
+			};
+		},
+		async initLoadPage() {
+			const data = { id: this.$route.params.lessonId };
+			if (parseInt(data.id)) {
+				try {
+					const res = await getPublishMapInfo(data.id);
+					this.tryUser = 0;
+					this.courseModel = {
+						name: res.data.name,
+						mapId: res.data.id,
+						skinCode: res.data.skinCode,
+						updateTime: res.data.updateTime,
+						pmsList: this.screenList || [],
+						permissionType: PermissionType.SCREEN
+					};
+					this.$store.dispatch('training/setPrdType', res.data.prdType);
+					const paras = {
+						permissionType: PermissionType.SCREEN
+					};
+					if (!this.courseModel.pmsList.length) {
+						this.tryUser = 1;
+						try {
+							const resp = await getGoodsTryUse(paras);
+							if (resp.data.tryTime <= 0) {
+								this.tryTime = 0;
+								this.setTryTime(0);
+							} else {
+								this.tryTime = resp.data.tryTime;
+								this.setTryTime(resp.data.tryTime);
+								this.goodsId = resp.data.goodsId;
+							}
+						} catch (error) {
+							console.log(error);
+							this.$messageBox(this.$t('error.acquisitionTimeFailed'));
+						}
+					}
+				} catch (error) {
+					console.log(error);
+					this.$messageBox(this.$t('error.refreshFailed'));
+				}
+			}
+		},
+		buy() {
+			this.$router.push({
+				path: `${UrlConfig.dp.pay}/${this.$route.params.lessonId}`,
+				query: { permissionType: PermissionType.SCREEN }
+			});
+		},
+		transfer() {
+			if (this.$refs) {
+				this.$refs.limitList.transfer(this.courseModel);
+			}
+		},
+		distribute() {
+			if (this.$refs) {
+				this.$refs.limitList.distribute(this.courseModel);
+			}
+		},
+		selectBeginTime() {
+			this.$refs.setTime.doShow();
+		},
+		jump(model) {
+			const data = { mapId: this.courseModel.mapId };
+			bitScreenNotify(data).then(resp => {
+				const query = {
+					skinCode: this.courseModel.skinCode,
+					group: resp.data, prdType: '01',
+					mapId: this.courseModel.mapId,
+					try: this.tryUser,
+					goodsId: this.goodsId,
+					initTime: model.initTime
+				};
+				this.$router.push({ path: `${UrlConfig.display}/dp`, query: query });
+				launchFullscreen();
+			}).catch(error => {
+				this.$messageBox(this.$t('error.createSimulationFailed') + error.message);
+			});
+		},
+		start() {
+			if (this.courseModel.pmsList.length) {
+				this.selectBeginTime();
+			} else {
+				if (this.tryTime <= 0) {
+					this.$confirm(this.$t('tip.noPermissionHint'), this.$t('global.tips'), {
+						confirmButtonText: this.$t('global.confirm'),
+						cancelButtonText: this.$t('global.cancel'),
+						type: 'warning'
+					}).then(() => {
+						this.buy();
+					}).catch(() => { });
+				} else {
+					this.selectBeginTime();
+				}
+			}
+		},
+		setTryTime(val) {
+			if (val <= 1) {
+				this.showTryTime = `0`+ this.$t('global.minute');
+			} else if (val > 1 && val <= 60) {
+				this.showTryTime = '1'+ this.$t('global.minute');
+			} else if (val > 60) {
+				const time = parseInt(val / 60);
+				this.showTryTime = time+ this.$t('global.minutes');
+			}
+		}
+	}
+};
 </script>
 <style scoped>
     ::-webkit-scrollbar {
diff --git a/src/views/screenMonitor/list/demonList.vue b/src/views/screenMonitor/list/demonList.vue
index 3fa674aae..1ecad8ff7 100644
--- a/src/views/screenMonitor/list/demonList.vue
+++ b/src/views/screenMonitor/list/demonList.vue
@@ -1,124 +1,139 @@
 <template>
-    <el-card class="map-list-main" v-loading="loading">
-        <div slot="header" class="clearfix">
-            <span>{{$t('global.mapList')}}</span>
-        </div>
-        <filter-city ref="filerCity" @filterSelectChange="refresh" filterEmpty :queryFunction="queryFunction">
-        </filter-city>
-        <el-input :placeholder="this.$t('global.filteringKeywords')" v-model="filterText" clearable> </el-input>
-        <el-scrollbar wrapClass="scrollbar-wrapper" :style="{ height: (height-125) +'px' }">
-            <el-tree ref="tree" :data="treeList" node-key="id" highlight-current
-                :default-expanded-keys="defaultShowKeys" :props="defaultProps" @node-click="clickEvent"
-                @node-contextmenu="showContextMenu" :span=22>
-                <span slot-scope="{ node, data }">
-                    <span class="el-icon-tickets"
-                        :style="{color: data.valid ? 'green':''}">&nbsp;{{ node.label }}</span>
-                </span>
-            </el-tree>
-        </el-scrollbar>
-    </el-card>
+  <el-card v-loading="loading" class="map-list-main">
+    <div slot="header" class="clearfix">
+      <span>{{ $t('global.mapList') }}</span>
+    </div>
+    <filter-city ref="filerCity" 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-125) +'px' }">
+      <el-tree
+        ref="tree"
+        :data="treeList"
+        node-key="id"
+        highlight-current
+        :default-expanded-keys="defaultShowKeys"
+        :props="defaultProps"
+        :span="22"
+        @node-click="clickEvent"
+        @node-contextmenu="showContextMenu"
+      >
+        <span slot-scope="{ node:nd, data }">
+          <span
+            class="el-icon-tickets"
+            :style="{color: data.valid ? 'green':''}"
+          >&nbsp;{{ nd.label }}</span>
+        </span>
+      </el-tree>
+    </el-scrollbar>
+  </el-card>
 </template>
 <script>
-    import FilterCity from '@/views/components/filterCity';
-    import { listPublishMap } from '@/api/jmap/map';
-    import { queryPermissionScreen } from '@/api/management/author';
-    import { UrlConfig } from '@/router/index';
+import FilterCity from '@/views/components/filterCity';
+import { listPublishMap } from '@/api/jmap/map';
+import { queryPermissionScreen } from '@/api/management/author';
+import { UrlConfig } from '@/router/index';
+import { getSessionStorage, setSessionStorage, removeSessionStorage } from '@/utils/auth';
 
-    export default {
-        name: 'ExamDetailList',
-        props: {
-            height: {
-                type: Number
-            }
-        },
-        components: {
-            FilterCity
-        },
-        data() {
-            return {
-                loading: true,
-                queryFunction: listPublishMap,
-                defaultShowKeys: [],
-                filterText: '',
-                treeData: [],
-                treeList: [],
-                selected: {},
-                defaultProps: {
-                    children: 'children',
-                    label: 'name'
-                },
-                node: {
-                },
-                screenList: [],
-            }
-        },
-        watch: {
-            filterText(val) {
-                this.treeList = this.treeData.filter((res) => {
-                    return res.name.includes(val)
-                })
-            }
-        },
-        created() {
-            this.getScreenLists();
-        },
-        methods: {
-            async getScreenLists() {
-                let list = await queryPermissionScreen();
-                this.screenList = list.data;
-            },
-            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) {
-                this.$router.push({ path: `${UrlConfig.dp.detail}/${obj.id}` });
-            },
-            refresh(filterSelect) {
-                this.loading = true;
-                this.treeData = this.treeList = [];
-                listPublishMap().then(res => {
-                    (res.data || []).forEach(ele => {
-                        if (ele.cityCode == filterSelect) {
-                            ele.valid = false;
-                            if (this.screenList.length) {
-                                ele.valid = true;
-                            }
-                            this.treeData.push(ele);
-                        }
-                    })
+export default {
+	name: 'ExamDetailList',
+	components: {
+		FilterCity
+	},
+	props: {
+		height: {
+			type: Number,
+			required: true
+		}
+	},
+	data() {
+		return {
+			loading: true,
+			queryFunction: listPublishMap,
+			defaultShowKeys: [],
+			filterText: '',
+			treeData: [],
+			treeList: [],
+			selected: {},
+			defaultProps: {
+				children: 'children',
+				label: 'name'
+			},
+			node: {
+			},
+			screenList: []
+		};
+	},
+	watch: {
+		filterText(val) {
+			this.treeList = this.treeData.filter((res) => {
+				return res.name.includes(val);
+			});
+		}
+	},
+	created() {
+		this.getScreenLists();
+	},
+	beforeDestroy () {
+		removeSessionStorage('screenMonitorList');
+	},
+	methods: {
+		async getScreenLists() {
+			const list = await queryPermissionScreen();
+			this.screenList = list.data || [];
+		},
+		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) {
+			setSessionStorage('screenMonitorList', obj.id);
+			this.$router.push({ path: `${UrlConfig.dp.detail}/${obj.id}` });
+		},
+		refresh(filterSelect) {
+			this.loading = true;
+			this.treeData = this.treeList = [];
+			listPublishMap().then(res => {
+				(res.data || []).forEach(ele => {
+					if (ele.cityCode == filterSelect) {
+						ele.valid = false;
+						if (this.screenList.length) {
+							ele.valid = true;
+						}
+						this.treeData.push(ele);
+					}
+				});
 
-                    this.treeList = this.filterText ?
-                        this.treeData.filter((res) => {
-                            return res.name.includes(this.filterText)
-                        })
-                        :
-                        this.treeData;
+				this.treeList = this.filterText
+					? this.treeData.filter((res) => {
+						return res.name.includes(this.filterText);
+					})
+					: this.treeData;
 
-                    if (this.treeList.length == 0) {
-                        this.$router.push({ path: `${UrlConfig.dp.prefix}/home` });
-                    } else {
-                        this.$nextTick(() => {
-                            let mapId = (this.treeList[0] || { id: 0 }).id;
-                            this.$router.push({ path: `${UrlConfig.dp.detail}/${mapId}` });
-                            this.$refs.tree.setCurrentKey(mapId); // value 绑定的node-key
-                        });
-                    }
+				if (this.treeList.length == 0) {
+					this.$router.push({ path: `${UrlConfig.dp.prefix}/home` });
+				} else {
+					this.$nextTick(() => {
+						const mapId = getSessionStorage('screenMonitorList')|| (this.treeList[0] || { id: 0 }).id;
+						this.$router.push({ path: `${UrlConfig.dp.detail}/${mapId}` });
+						this.$refs.tree.setCurrentKey(mapId); // value 绑定的node-key
+					});
+				}
 
-                    this.$nextTick(() => { this.loading = false; })
-                }).catch(error => {
-                    this.loading = false;
-                    this.$messageBox(this.$t('error.refreshFailed'));
-                });
-            }
-        }
-    }
+				this.$nextTick(() => { this.loading = false; });
+			}).catch(error => {
+				console.log(error);
+				this.loading = false;
+				this.$messageBox(this.$t('error.refreshFailed'));
+			});
+		}
+	}
+};
 </script>
 <style>
     .el-tree {
diff --git a/src/views/scriptManage/display/tipScriptRecord.vue b/src/views/scriptManage/display/tipScriptRecord.vue
index c5244bafd..69baf254f 100644
--- a/src/views/scriptManage/display/tipScriptRecord.vue
+++ b/src/views/scriptManage/display/tipScriptRecord.vue
@@ -61,7 +61,7 @@ import {saveScriptScenes, saveScriptData, dumpScriptData, updateMapLocation, scr
                 backDisabled:false,
                 size:{
                     width:350,
-                    height:window.innerHeight-130-212,
+                    height:window.innerHeight-342,
                 }
                 // isSaveStage: true,
             }
@@ -82,7 +82,7 @@ import {saveScriptScenes, saveScriptData, dumpScriptData, updateMapLocation, scr
         },
         methods: {
             resizeHandler() {
-                this.size = { width:350, height:window.innerHeight-130-212};
+                this.size = { width:350, height:window.innerHeight-342};
             },
             setIsParse(isPause){
                 this.isPause=isPause;
@@ -184,9 +184,10 @@ import {saveScriptScenes, saveScriptData, dumpScriptData, updateMapLocation, scr
             },
             create(){
                 this.$refs['getAction'].loadInitData();
+                // this.$refs['addRole'].resetData(data);
             },
             setAction(row){
-                debugger;
+                // debugger;
                 this.$refs['addAction'].doShow(row);
             }
         }
diff --git a/src/views/scriptManage/scriptRecord/addAction.vue b/src/views/scriptManage/scriptRecord/addAction.vue
index ceac09430..1050d4959 100644
--- a/src/views/scriptManage/scriptRecord/addAction.vue
+++ b/src/views/scriptManage/scriptRecord/addAction.vue
@@ -174,6 +174,8 @@
         },
         methods:{
             initData(){
+                this.buttonName="添加对话";
+                this.operateType="add";
                 getScriptPlayMember(this.group).then(resp => {
                     let roleTypeList=ConstConfig.ConstSelect.roleType;
                     this.orginMemberList=resp.data;
@@ -224,6 +226,7 @@
                             this.adding=false;
                             this.$message.success('添加指令成功');
                             this.$emit('create');
+                            // this.$emit('create',[this.commandData.action.memberId]);
                             // this.$parent.$parent.$refs['addRole'].resetData([this.commandData.action.memberId]);
                             // this.initCommandActionData();
                         }).catch(error => {
@@ -251,6 +254,7 @@
                                 this.modifying=false;
                                 this.$message.success('添加对话成功');
                                 this.$emit('create');
+                                // [this.modalData.actionVO.memberId]
                                 // this.initActionData();
                                 // this.$parent.$parent.$refs['addRole'].resetData([this.modalData.actionVO.memberId,this.modalData.actionVO.targetId]);
                             }).catch(error => {
diff --git a/src/views/scriptManage/scriptRecord/addRole.vue b/src/views/scriptManage/scriptRecord/addRole.vue
index 4348ed133..802ad109b 100644
--- a/src/views/scriptManage/scriptRecord/addRole.vue
+++ b/src/views/scriptManage/scriptRecord/addRole.vue
@@ -49,6 +49,9 @@
                     this.allRoleData=this.coverData(lastData);
                     getScriptPlayMember(group).then(response=>{
                         let last=response.data;
+                        // let userdata=JSON.stringify(response.data)
+                        // let reg=new RegExp('\"id\":\"(.*?)\\\"','g');
+                        // let datalist=userdata.match(reg);
                         let data=[];
                         last.forEach(function(element){data.push(element.id)});
                         this.selectRoleData=data;
@@ -95,18 +98,20 @@
                     }
                 }
             },
-            resetData(data){
-                // let allRoleData=this.allRoleData;
-                // debugger;
-                // data.forEach(function(element){
-                //     allRoleData.forEach(function(select){
-                //             if(select.key==element)
-                //             {
-                //                 select.disabled=true;
-                //             }
-                //     });
-                // });
-            },
+            // resetData(data){
+            //     debugger;
+            //     let allRoleData=this.allRoleData;
+            //     // debugger;
+            //     data.forEach(function(element){
+            //         allRoleData.forEach(function(select){
+            //                 if(select.key==element)
+            //                 {
+            //                     debugger;
+            //                     select.disabled="disabled";
+            //                 }
+            //         });
+            //     });
+            // },
             changeSex(event,id)
             {
                 let group=this.$props.group;
diff --git a/src/views/scriptManage/scriptRecord/getAction.vue b/src/views/scriptManage/scriptRecord/getAction.vue
index da79a2ee7..98cf19448 100644
--- a/src/views/scriptManage/scriptRecord/getAction.vue
+++ b/src/views/scriptManage/scriptRecord/getAction.vue
@@ -81,6 +81,7 @@
                     this.$store.dispatch('scriptRecord/updateBgSet', response.data.bgSet);
                     this.actionInfoList=[];
                     let roleTypeList=ConstConfig.ConstSelect.roleType;
+
                     let memberVOList=JSON.stringify(response.data.memberVOList);
                     roleTypeList.forEach(function(element){
                         let rolename=element.value;
@@ -88,15 +89,20 @@
                     });
                     memberVOList=JSON.parse(memberVOList);
                     let actionList=response.data.actionVOList;
+
+
+                    
                     actionList.forEach(element => {
+
                         let member=memberVOList.find(elem=>{return elem.id==element.memberId});
-                        let memberName=member.name==undefined?"":" - "+member.name;
+
+                        let memberName=member.name?" - "+member.name:"";
                         switch(element.type)
                         {
                             case "Conversation":
                             {
                                 let target=memberVOList.find(elem=>{return elem.id==element.targetId});
-                                let targetName=target.name==undefined?"":" - "+target.name;
+                                let targetName=target.name?" - "+target.name:"";
                                 this.actionInfoList.push({id:element.id,isCoversition:true,memberName:member.role+memberName,targetName:target.role+targetName,reply:element.reply,row:element,visible:true});
                                 break;
                             }
@@ -143,9 +149,6 @@
             reloadTable(){
                 this.loadInitData();
             },
-            // create(data){
-            //     this.reloadTable();
-            // },
             modifyAction(row){
                 this.$emit("setAction",row);
             }
diff --git a/src/views/teach/detail/index.vue b/src/views/teach/detail/index.vue
index b268b8999..288610f00 100644
--- a/src/views/teach/detail/index.vue
+++ b/src/views/teach/detail/index.vue
@@ -110,7 +110,7 @@ export default {
 						price: response.data.price,
 						remarks: response.data.remarks,
 						detail: response.data.chapters,
-						pmsList: response.data.pmsList,
+						pmsList: response.data.pmsList || [],
 						prdCode: response.data.prdCode,
 						mapId: response.data.mapId,
 						skinCode: response.data.skinCode,
diff --git a/static/model/suidao/suidao2.FBX b/static/model/suidao/suidao2.FBX
new file mode 100644
index 000000000..6fd58e20d
Binary files /dev/null and b/static/model/suidao/suidao2.FBX differ