diff --git a/package.json b/package.json
index e84f39ff7..9a08831b7 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,8 @@
 	"author": "Pan <panfree23@gmail.com>",
 	"license": "MIT",
 	"scripts": {
-		"dev": "vue-cli-service serve --open",
+		"start": "vue-cli-service serve --open",
+		"dev": "node --max_old_space_size=4096 node_modules/@vue/cli-service/bin/vue-cli-service.js serve",
 		"build": "vue-cli-service build",
 		"test": "vue-cli-service build --mode staging",
 		"local": "vue-cli-service build --mode native",
@@ -28,6 +29,7 @@
 		"path-to-regexp": "2.4.0",
 		"qrcode.vue": "^1.6.2",
 		"qs": "^6.9.3",
+		"recordrtc": "^5.5.9",
 		"script-loader": "^0.7.2",
 		"sessionstorage": "^0.1.0",
 		"sockjs-client": "^1.4.0",
diff --git a/src/api/chat.js b/src/api/chat.js
index 6bbb3d402..cd18aac44 100644
--- a/src/api/chat.js
+++ b/src/api/chat.js
@@ -49,6 +49,15 @@ export function chatWithText(data, group) {
     });
 }
 
+// 文字聊天 发送文字
+export function chatWithAudio(file, group) {
+    return request({
+        url: `/api/jointTraining/chatWithAudio?group=${group}`,
+        method: 'post',
+        data: file
+    });
+}
+
 // 生成分发二维码
 export function getJoinTrainCode(data, group) {
     return request({
@@ -165,14 +174,6 @@ export function getUserRoles(group) {
     });
 }
 
-// 返回房间
-export function putJointTrainingState() {
-    return request({
-        url: `/api/jointTraining/room/back`,
-        method: 'put'
-    });
-}
-
 // 踢出用户
 export function putJointTrainingUserkicked(userId, group) {
     return request({
@@ -284,3 +285,28 @@ export function realDeviceIsUsed(group, projectCode) {
         }
     });
 }
+
+// 获取仿真成员列表（新版地图）
+export function getSimulationMembersNew(group) {
+    return request({
+        url: `/simulation/${group}/members`,
+        method: 'get'
+    });
+}
+
+// 获取仿真会话列表（新版地图）
+export function getSimulationConversationListNew(group) {
+    return request({
+        url: `/simulation/${group}/conversations`,
+        method: 'get'
+    });
+}
+
+// 获取/创建仿真会话（新版地图）
+export function getSimulationConversationIdNew(params, group) {
+    return request({
+        url: `/simulation/${group}/wx/conversation`,
+        method: 'get',
+        params: params
+    });
+}
diff --git a/src/api/designPlatform.js b/src/api/designPlatform.js
index 09bf58a50..fbc2120a8 100644
--- a/src/api/designPlatform.js
+++ b/src/api/designPlatform.js
@@ -7,13 +7,6 @@ export function getRpListByUserMapId(mapId) {
         method: 'get'
     });
 }
-export function getMapList(cityCode) {
-    /** 根据cityCode获取地图列表 */
-    return request({
-        url: `/api/mapSystem/queryMapByCityCode/${cityCode}`,
-        method: 'get'
-    });
-}
 
 /** 获取用户自己的运行图详情*/
 export function getRpDetailByUserMapId(planId) {
@@ -31,14 +24,6 @@ export function getUserMapDetailByMapId(mapId) {
     });
 }
 
-/** 用户自己的运行图仿真测试*/
-export function runUserPlanNotify({ planId }) {
-    return request({
-        url: `/api/draftMap/runPlan/simulationCheck/${planId}`,
-        method: 'get'
-    });
-}
-
 /** 管理员获取需审核的课程列表 */
 export function reviewLessonList(params) {
     return request({
diff --git a/src/api/jmap/mapdraft.js b/src/api/jmap/mapdraft.js
index cb80f5429..ba9d7f8bc 100644
--- a/src/api/jmap/mapdraft.js
+++ b/src/api/jmap/mapdraft.js
@@ -536,4 +536,42 @@ export function getFlankProtectionList(mapId, params) {
         params
     });
 }
-
+/** 创建车站区段停站时间 */
+export function createStationParkTime(data) {
+    return request({
+        url: `/api/mapBuild/stationParkTime`,
+        method: 'post',
+        data
+    });
+}
+/** 删除车站区段停站时间 */
+export function deleteStationParkTime(stationParkTimeId) {
+    return request({
+        url: `/api/mapBuild/stationParkTime/${stationParkTimeId}`,
+        method: 'delete'
+    });
+}
+/** 获取车站区段停站时间 */
+export function getStationParkTime(stationParkTimeId, params) {
+    return request({
+        url: `/api/mapBuild/stationParkTime/${stationParkTimeId}`,
+        method: 'get',
+        params
+    });
+}
+/** 更新车站区段停站时间 */
+export function updateStationParkTime(data) {
+    return request({
+        url: `/api/mapBuild/stationParkTime/${data.id}`,
+        method: 'get',
+        data
+    });
+}
+/** 分页获取车站区段停站时间 */
+export function getStationParkTimeList(mapId, params) {
+    return request({
+        url: `/api/mapBuild/${mapId}/stationParkTime`,
+        method: 'get',
+        params
+    });
+}
diff --git a/src/api/jointTraining.js b/src/api/jointTraining.js
index ff4a72a42..dd3785ddc 100644
--- a/src/api/jointTraining.js
+++ b/src/api/jointTraining.js
@@ -127,14 +127,6 @@ export function getUserRolesNew(group) {
     });
 }
 
-// 返回房间
-export function putJointTrainingStateNew() {
-    return request({
-        url: `/api/v1/jointTraining/room/back`,
-        method: 'put'
-    });
-}
-
 // 踢出用户
 export function putJointTrainingUserkickedNew(userId, group) {
     return request({
diff --git a/src/api/quest.js b/src/api/quest.js
deleted file mode 100644
index c807a6b59..000000000
--- a/src/api/quest.js
+++ /dev/null
@@ -1,74 +0,0 @@
-import request from '@/utils/request';
-
-/** 分页查找个人录制的仿真任务*/
-export function getQuestPageList(mapId, params) {
-    return request({
-        url: `/api/script/draft/${mapId}/list`,
-        method: 'get',
-        params: params
-    });
-}
-/** 创建任务 */
-export function createQuest(data) {
-    return request({
-        url: `/api/script/draft`,
-        method: 'post',
-        data
-    });
-}
-/** 根据任务id删除任务 */
-export function deleteQuest(id) {
-    return request({
-        url: `/api/script/draft/${id}`,
-        method: 'delete'
-    });
-}
-/** 根据id查询任务基础信息 */
-export function getQuestById(id) {
-    return request({
-        url: `/api/script/draft/${id}`,
-        method: 'get'
-    });
-}
-/** 根据id查询任务详情信息 */
-export function getQuestByIdList(id) {
-    return request({
-        url: `/api/script/draft/${id}/detail`,
-        method: 'get'
-    });
-}
-/** 更新任务基本信息 */
-export function updateQuest(id, data) {
-    return request({
-        url: `/api/script/draft/${id}`,
-        method: 'put',
-        data
-    });
-}
-
-/** 分页查找上线的仿真任务*/
-export function getQuestPageListOnline(params) {
-    return request({
-        url: `/api/quest/paging/online`,
-        method: 'get',
-        params: params
-    });
-}
-
-/** 剧本发布 */
-export function publishQuest(id, data) {
-    return request({
-        url: `/api/script/draft/${id}/publish`,
-        method: 'put',
-        data
-    });
-}
-
-/** 剧本撤销发布 */
-export function retractQuest(id, data) {
-    return request({
-        url: `/api/script/draft/${id}/retract`,
-        method: 'put'
-    });
-}
-
diff --git a/src/api/scheduling.js b/src/api/scheduling.js
index 6743c56ed..a519bf21e 100644
--- a/src/api/scheduling.js
+++ b/src/api/scheduling.js
@@ -45,3 +45,35 @@ export function generateSchedulingAgain(group) {
         method: 'delete'
     });
 }
+/** 生成地图通用派班计划 */
+export function generateCommonScheduling (data) {
+    return request({
+        url: `/api/v1/scheduling/generate/common`,
+        method: 'post',
+        data
+    });
+}
+/** 查询某天的派班计划 */
+export function querySechedulingNew (group, params) {
+    return request({
+        url: `/api/v1/scheduling/${group}/day`,
+        method: 'get',
+        params
+    });
+}
+/** 生成某天的基础派班计划 */
+export function generateSchedulingNew (group, params) {
+    return request({
+        url: `/api/v1/scheduling/${group}/generate`,
+        method: 'post',
+        params
+    });
+}
+/** 保存派班计划数据 */
+export function saveSchedulingNew(group, data) {
+    return request({
+        url: `/api/v1/scheduling/${group}/save`,
+        method: 'post',
+        data
+    });
+}
diff --git a/src/api/script.js b/src/api/script.js
index e60fa9df6..b203a935e 100644
--- a/src/api/script.js
+++ b/src/api/script.js
@@ -24,3 +24,63 @@ export function getDraftScriptByGroup(group) {
         method: 'get'
     });
 }
+
+/** 剧本撤销发布 */
+export function retractScript(id, data) {
+    return request({
+        url: `/api/script/draft/${id}/retract`,
+        method: 'put'
+    });
+}
+
+/** 剧本发布 */
+export function publishScript(id, data) {
+    return request({
+        url: `/api/script/draft/${id}/publish`,
+        method: 'put',
+        data
+    });
+}
+
+/** 更新剧本基本信息 */
+export function updateScript(id, data) {
+    return request({
+        url: `/api/script/draft/${id}`,
+        method: 'put',
+        data
+    });
+}
+
+/** 根据剧本id删除剧本 */
+export function deleteScript(id) {
+    return request({
+        url: `/api/script/draft/${id}`,
+        method: 'delete'
+    });
+}
+
+/** 分页查找个人录制的仿真剧本*/
+export function getScriptPageList(mapId, params) {
+    return request({
+        url: `/api/script/draft/${mapId}/list`,
+        method: 'get',
+        params: params
+    });
+}
+
+/** 创建剧本 */
+export function createScript(data) {
+    return request({
+        url: `/api/script/draft`,
+        method: 'post',
+        data
+    });
+}
+
+/** 根据id查询任务基础信息 */
+export function getScriptByIdBasic(id) {
+    return request({
+        url: `/api/script/draft/${id}`,
+        method: 'get'
+    });
+}
diff --git a/src/api/simulation.js b/src/api/simulation.js
index 84227d643..eab1503f4 100644
--- a/src/api/simulation.js
+++ b/src/api/simulation.js
@@ -605,3 +605,10 @@ export function exitRunPlan (group) {
         method: 'post'
     });
 }
+/** 加载指定运行计划 */
+export function simulationLoadRunPlan(group, templateId) {
+    return request({
+        url: `/simulation/${group}/load/runPlan/${templateId}`,
+        method: 'put'
+    });
+}
diff --git a/src/api/trainingPlatform.js b/src/api/trainingPlatform.js
index 15738bce9..373e78912 100644
--- a/src/api/trainingPlatform.js
+++ b/src/api/trainingPlatform.js
@@ -9,14 +9,6 @@ export function getTrainingSystemList(cityCode, params) {
     });
 }
 
-export function getTrainingSystemListByMapId(mapId) {
-    /** 根据mapId去获取其子系统 */
-    return request({
-        url: `/api/mapSystem/${mapId}`,
-        method: 'get'
-    });
-}
-
 export function generateMapSystem(mapId) {
     /** 根据mapId生成地图子系统 */
     return request({
diff --git a/src/components/QueryListPage/QueryForm.vue b/src/components/QueryListPage/QueryForm.vue
index 1bea530dd..3e38317af 100644
--- a/src/components/QueryListPage/QueryForm.vue
+++ b/src/components/QueryListPage/QueryForm.vue
@@ -143,7 +143,7 @@
               </el-row>
             </template>
           </el-col>
-          <el-col :span="24-leftSpan-1" :offset="1">
+          <el-col :span="24-leftSpan-1" :offset="offsetSpan">
             <el-button style="margin-right: 10px" type="primary" size="small" :disabled="!canQuery" @click="query">{{ $t('global.query') }}</el-button>
             <el-button v-if="queryForm.reset" type="primary" size="small" :disabled="!canQuery" @click="doClean">{{ $t('global.reset') }}</el-button>
             <el-button v-if="exportFlag" type="primary" size="small" :disabled="!canQuery" @click="doExport">{{ $t('global.export') }}</el-button>
@@ -201,6 +201,12 @@ export default {
             default() {
                 return 18;
             }
+        },
+        offsetSpan: {
+            type: Number,
+            default() {
+                return 1;
+            }
         }
     },
     data() {
diff --git a/src/components/QueryListPage/QueryListPage.vue b/src/components/QueryListPage/QueryListPage.vue
index 68affd896..1a5f880f5 100644
--- a/src/components/QueryListPage/QueryListPage.vue
+++ b/src/components/QueryListPage/QueryListPage.vue
@@ -6,6 +6,7 @@
       ref="queryForm"
       :query-form="queryForm"
       :left-span="queryForm.leftSpan"
+      :offset-span="queryForm.offsetSpan"
       :query-list="queryList"
       :before-query="queryForm.beforeQuery"
       :can-query="canQuery"
@@ -32,7 +33,7 @@
       >
         <el-table-column v-if="queryList.selectCheckShow" type="selection" width="55" />
         <el-table-column v-if="queryList.indexShow" type="index" width="50" :label="this.$t('global.index')" />
-        <el-table-column v-if="queryList.radioShow" :label="`#${$t('global.select')}`" width="60">
+        <el-table-column v-if="queryList.radioShow" :label="`#${$t('global.select')}`" width="80">
           <template slot-scope="scope">
             <el-radio v-model="choose" :label="scope.row">{{ `` }}</el-radio>
           </template>
diff --git a/src/i18n/langs/en/display.js b/src/i18n/langs/en/display.js
index 4aa0d4779..408b64af1 100644
--- a/src/i18n/langs/en/display.js
+++ b/src/i18n/langs/en/display.js
@@ -162,7 +162,7 @@ export default {
         createSchedulePlanSuccess: 'Create schedule plan success',
         regenerateSchedulePlanSuccess: 'Regenerate schedule plan success',
         checkPassed: 'Check passed',
-        checkFailed: 'Check failed',
+        checkFailed: 'Data check failed',
         checkSchedulePlanFailed: 'Check schedule plan failed',
         saveSchedulePlanSuccess: 'Save schedule plan success',
         saveSchedulePlanFail: 'Save schedule plan fail',
diff --git a/src/i18n/langs/en/tip.js b/src/i18n/langs/en/tip.js
index 91c39c666..230297945 100644
--- a/src/i18n/langs/en/tip.js
+++ b/src/i18n/langs/en/tip.js
@@ -234,5 +234,9 @@ export default {
     mapSortSuccessfully: 'Map sort successfully！',
     mapSortFailed: 'Map sort failed',
     enterTrainingRoomFailed: 'Failed to enter the comprehensive drill, please consult the administrator is still in the room!',
-    failedToAddNewRoom: 'Failed to add new room'
+    failedToAddNewRoom: 'Failed to add new room',
+    dwellTimeSuccessful: 'Create dwell time successful!',
+    dwellTimeFailed: 'Failed to create dwell time!',
+    updateDwellTimeSuccessful: 'Update dwell time successful!',
+    updateDwellTimeFailed: 'Failed to update dwell time!'
 };
diff --git a/src/i18n/langs/zh/display.js b/src/i18n/langs/zh/display.js
index b4e95c37d..882ee4c95 100644
--- a/src/i18n/langs/zh/display.js
+++ b/src/i18n/langs/zh/display.js
@@ -161,8 +161,8 @@ export default {
         schedulePlanSuccess: '派班计划成功！',
         createSchedulePlanSuccess: '创建派班计划成功',
         regenerateSchedulePlanSuccess: '重新生成派班计划成功',
-        checkPassed: '检查通过',
-        checkFailed: '检查不通过',
+        checkPassed: '数据检查校验通过',
+        checkFailed: '数据检查校验不通过',
         checkSchedulePlanFailed: '检查派班计划失败',
         saveSchedulePlanSuccess: '保存派班计划成功',
         saveSchedulePlanFail: '保存派班失败',
diff --git a/src/i18n/langs/zh/tip.js b/src/i18n/langs/zh/tip.js
index 373531735..e74f6f5a1 100644
--- a/src/i18n/langs/zh/tip.js
+++ b/src/i18n/langs/zh/tip.js
@@ -234,5 +234,9 @@ export default {
     mapSortSuccessfully: '地图排序成功！',
     mapSortFailed: '地图排序失败！',
     enterTrainingRoomFailed: '进入综合演练失败，请咨询管理员是否还在房间内！',
-    failedToAddNewRoom: '加入新房间失败'
+    failedToAddNewRoom: '加入新房间失败',
+    dwellTimeSuccessful: '创建停站时间成功！',
+    dwellTimeFailed: '创建停站时间失败！',
+    updateDwellTimeSuccessful: '更新停站时间成功！',
+    updateDwellTimeFailed: '更新停站时间失败！'
 };
diff --git a/src/jlmap3d/edit/Jlmap3dnewdata.js b/src/jlmap3d/edit/Jlmap3dnewdata.js
index 5637150c5..6e240ff41 100644
--- a/src/jlmap3d/edit/Jlmap3dnewdata.js
+++ b/src/jlmap3d/edit/Jlmap3dnewdata.js
@@ -24,6 +24,7 @@ export function Jlmap3ddata(mapid,scope){
     console.log(data);
     if(data.data ){
       if(data.data.assets){
+        // initobj(editmapid,data.data.id);
         init3d(editmapid,data.data);
       }else{
         initobj(editmapid,data.data.id);
diff --git a/src/jlmap3d/edit/action/sectionaction.js b/src/jlmap3d/edit/action/sectionaction.js
index b6ec6224a..a6ee4b7df 100644
--- a/src/jlmap3d/edit/action/sectionaction.js
+++ b/src/jlmap3d/edit/action/sectionaction.js
@@ -37,7 +37,6 @@ export function Sectionaction(){
   }
   //点击事件
   this.raycaster = function(data,type){
-    console.log(type);
     let modellist;
     if(type == "test"){
       modellist = data.scene.getObjectByName("section").children;
@@ -80,13 +79,13 @@ export function Sectionaction(){
 
     raycaster.setFromCamera( mouse, data.camera );
     let intersects1;
-    console.log(modellist);
+    // console.log(modellist);
     for(let i=0;i<modellist.length;i++){
       intersects1 = raycaster.intersectObject(modellist[i],true);
-      console.log(intersects1);
+      // console.log(intersects1);
       if(intersects1[0]){
-        console.log(intersects1[0].object.code);
-        console.log(modellist[i].code);
+        // console.log(intersects1[0].object.code);
+        // console.log(modellist[i].code);
         if(intersects1[0].object.code == modellist[i].code){
 
           return modellist[i];
diff --git a/src/jlmap3d/edit/connect/newgetmodels.js b/src/jlmap3d/edit/connect/newgetmodels.js
index 896e36750..8116c5f47 100644
--- a/src/jlmap3d/edit/connect/newgetmodels.js
+++ b/src/jlmap3d/edit/connect/newgetmodels.js
@@ -59,37 +59,32 @@ export function getmodels(data) {
       let sections = [];
       // console.log(data.mapdata.sectionlist.sections.datalist);
       for(let i in data.mapdata.sectionlist.sections.datalist){
-        console.log(data.mapdata.sectionlist.sections.datalist[i].code);
-        console.log(data.mapdata.sectionlist.sections.datalist[i]);
-        console.log(data.mapdata.sectionlist.sections.datalist[i].mesh.lengthFact);
         let section = {
           // uuid:data.mapdata.sectionlist.sections.modellist[i].uuid,
           code:data.mapdata.sectionlist.sections.datalist[i].code,
           name:data.mapdata.sectionlist.sections.datalist[i].name,
           lengthFact:data.mapdata.sectionlist.sections.datalist[i].mesh.lengthFact,
           standTrack:data.mapdata.sectionlist.sections.datalist[i].standTrack,
-          rightlist:data.mapdata.sectionlist.sections.datalist[i].rightlist,
-          leftlist:data.mapdata.sectionlist.sections.datalist[i].leftlist,
           rp:data.mapdata.sectionlist.sections.datalist[i].rp,
           lp:data.mapdata.sectionlist.sections.datalist[i].lp,
-
+          railpoint:data.mapdata.sectionlist.sections.datalist[i].mesh.railpoint,
           rail:data.mapdata.sectionlist.sections.datalist[i].rail,
           position:data.mapdata.sectionlist.sections.datalist[i].mesh.position,
           rotation:data.mapdata.sectionlist.sections.datalist[i].mesh.rotation,
           scale:data.mapdata.sectionlist.sections.datalist[i].mesh.scale,
-          rsection:null,
-          lsection:null,
-          csection:null
-        }
-        if(data.mapdata.sectionlist.sections.datalist[i].rsection){
-          section.rsection = data.mapdata.sectionlist.sections.datalist[i].rsection;
-        }
-        if(data.mapdata.sectionlist.sections.datalist[i].lsection){
-          section.lsection = data.mapdata.sectionlist.sections.datalist[i].lsection;
-        }
-        if(data.mapdata.sectionlist.sections.datalist[i].csection){
-          section.csection = data.mapdata.sectionlist.sections.datalist[i].csection;
         }
+        let nowmesh =  data.mapdata.sectionlist.sectiongroup.getObjectByProperty("code",section.code);
+        section.railpoint = nowmesh.railpoint
+        // console.log(nowmesh.railpoint);
+        // if(data.mapdata.sectionlist.sections.datalist[i].rsection){
+        //   section.rsection = data.mapdata.sectionlist.sections.datalist[i].rsection;
+        // }
+        // if(data.mapdata.sectionlist.sections.datalist[i].lsection){
+        //   section.lsection = data.mapdata.sectionlist.sections.datalist[i].lsection;
+        // }
+        // if(data.mapdata.sectionlist.sections.datalist[i].csection){
+        //   section.csection = data.mapdata.sectionlist.sections.datalist[i].csection;
+        // }
 
         // testmesh1.position.z = link.position.z;
 
diff --git a/src/jlmap3d/edit/jlmap3dedit.js b/src/jlmap3d/edit/jlmap3dedit.js
index 3921d3586..409e5be75 100644
--- a/src/jlmap3d/edit/jlmap3dedit.js
+++ b/src/jlmap3d/edit/jlmap3dedit.js
@@ -53,7 +53,7 @@ export function JLmap3dEdit(dom, data, mapid) {
   dom.appendChild(this.renderer.domElement);
 
   //定义相机
-  this.camera = new THREE.PerspectiveCamera(70, dom.clientWidth/dom.clientHeight, 1, 1000);
+  this.camera = new THREE.PerspectiveCamera(70, dom.clientWidth/dom.clientHeight, 1, 100000);
   this.camera.aspect = window.innerWidth / window.innerHeight;
   this.camera.updateProjectionMatrix();
   this.camera.position.set(0,0,1800);
@@ -68,7 +68,6 @@ export function JLmap3dEdit(dom, data, mapid) {
   this.transcontrol.addEventListener( 'change', render );
 
 	this.transcontrol.addEventListener( 'dragging-changed', function ( event ) {
-
 		scope.controls.enabled = ! event.value;
     scope.selectswitch = ! event.value;
 	} );
@@ -163,8 +162,8 @@ export function JLmap3dEdit(dom, data, mapid) {
   this.export = function(){
     let exporter = new THREE.OBJExporter();
     console.log(scope.mapdata);
-    let exportmodels = scope.mapdata.stationstandlist.group;
-    // let exportmodels = scope.mapdata.sectionlist.switchgroup;
+    // let exportmodels = scope.mapdata.stationstandlist.group;
+    let exportmodels = scope.mapdata.sectionlist.sectiongroup;
     // let exportmodels = scope.mapdata.stationstandlist.group;
     let result = exporter.parse( exportmodels );
 
@@ -234,10 +233,14 @@ export function JLmap3dEdit(dom, data, mapid) {
 
 
   this.vexscal = function(){
-
-    this.scalswitch = true;
-    scalControls.attach(scope.selectmodel);
     scope.transcontrol.detach()
+    this.scalswitch = true;
+    if(scope.selectmodel.railpoint){
+      scalControls.attach(scope.selectmodel,scope.selectmodel.railpoint);
+    }else{
+      scalControls.attach(scope.selectmodel);
+    }
+
 
   };
 
@@ -257,6 +260,7 @@ export function JLmap3dEdit(dom, data, mapid) {
     console.log("autoss");
     console.log(scope.mapdata);
     scope.mapdata.signallist.resetsignal(scope.mapdata);
+    scope.mapdata.switchlist.resetswitch(scope.mapdata);
     //old
     // scope.mapdata.signallist.resetsignal(scope.mapdata.linklist);
   };
@@ -313,7 +317,12 @@ export function JLmap3dEdit(dom, data, mapid) {
 
       if(scope.selectmodel != null){
         //console.log(scope.selectmodel.rotation);
-        scope.transcontrol.attach( scope.selectmodel );
+        if(scalControls.scalon){
+
+        }else{
+          scope.transcontrol.attach( scope.selectmodel,scope.editmode );
+        }
+
 
       }
 
diff --git a/src/jlmap3d/edit/neweditmodel/SectionList.js b/src/jlmap3d/edit/neweditmodel/SectionList.js
index d88122343..69b413b5b 100644
--- a/src/jlmap3d/edit/neweditmodel/SectionList.js
+++ b/src/jlmap3d/edit/neweditmodel/SectionList.js
@@ -443,18 +443,32 @@ export function SectionList() {
         testmesh2.rotation.z = 0.2193;
         data.rp.x = data.lp.x+(data.lengthFact)*Math.cos(testmesh2.rotation.z);
         data.rp.z = data.lp.z-(data.lengthFact)*Math.sin(testmesh2.rotation.z);
+
       }else if(data.points[0].y<data.points[data.pointslength].y){
         testmesh2.rotation.z = -0.2193;
         data.rp.x = data.lp.x+(data.lengthFact)*Math.cos(testmesh2.rotation.z);
         data.rp.z = data.lp.z-(data.lengthFact)*Math.sin(testmesh2.rotation.z);
+
       }else{
         data.rp.z = data.lp.z;
+
         // testmesh2.rotation.z = rotenum;
       }
 
       testmesh2.position.x = (data.lp.x + data.rp.x)/2;
       testmesh2.position.z = (data.lp.z + data.rp.z)/2;
-
+      if(data.rp.z != data.lp.z){
+        testmesh2.railpoint = [
+          {x:data.lp.x,y:0,z:data.lp.z},
+          {x:testmesh2.position.x,y:0,z:testmesh2.position.z},
+          {x:data.rp.x,y:0,z:data.rp.z}
+        ];
+      }else{
+        testmesh2.railpoint = [
+          {x:data.lp.x,y:0,z:data.lp.z},
+          {x:data.rp.x,y:0,z:data.rp.z}
+        ];
+      }
       // if(data.iscur == "3"){
       //     testmesh2.position.z = origin.mesh.position.z;
       // }
@@ -500,6 +514,18 @@ export function SectionList() {
       }
       testmesh2.position.x = (data.rp.x + data.lp.x)/2;
       testmesh2.position.z = (data.rp.z + data.lp.z)/2;
+      if(data.rp.z != data.lp.z){
+        testmesh2.railpoint = [
+          {x:data.lp.x,y:0,z:data.lp.z},
+          {x:testmesh2.position.x,y:0,z:testmesh2.position.z},
+          {x:data.rp.x,y:0,z:data.rp.z}
+        ];
+      }else{
+        testmesh2.railpoint = [
+          {x:data.lp.x,y:0,z:data.lp.z},
+          {x:data.rp.x,y:0,z:data.rp.z}
+        ];
+      }
       // if(data.iscur == "3"){
       //     testmesh2.position.z = origin.mesh.position.z;
       // }
@@ -514,6 +540,7 @@ export function SectionList() {
       //     testmesh2.rotation.z = -0.2193;
       // }
     }
+
     // console.log(data.ctype);
     if(type == "cross"){
       // console.log(data.ctype);
@@ -582,194 +609,18 @@ export function SectionList() {
 
         // testmesh2.rotation.z = ;
       }
-      // if(data.ctype == "1"){
-      //   buildrailcurve(testmesh2,"right",data.ctype);
-      // }
-      // if(data.ctype == "2"){
-      //   buildrailcurve(testmesh2,"right",data.ctype);
-      // }
-      // if(data.ctype == "3"){
-      //   buildrailcurve(testmesh2,"left",data.ctype);
-      // }
-      // if(data.ctype == "4"){
-      //   buildrailcurve(testmesh2,"left",data.ctype);
-      // }
+      testmesh2.railpoint = [
+        {x:data.lp.x,y:0,z:data.lp.z},
+        {x:testmesh2.position.x,y:0,z:testmesh2.position.z},
+        {x:data.rp.x,y:0,z:data.rp.z}
+      ];
+
     }
+
     // var box = new THREE.BoxHelper( testmesh2, 0xffffff );
     //  scope.sectiongroup.add( box );
 
   }
-  function buildrailcurve(origin,direct,type){
-      console.log(origin.position);
-      if(direct == "right"){
-        let testmesh1 = autorail.clone(true);
-        for(let i=0;i<autorail.rightlist.length;i++){
-               testmesh1.geometry.attributes.position.array[autorail.rightlist[i]*3] = 1;
-               testmesh1.geometry.attributes.uv.array[autorail.rightlist[i]*2] = testmesh1.geometry.attributes.position.array[0]-testmesh1.geometry.attributes.position.array[3];
-
-           }
-           let newrail1 = new THREE.BufferGeometry();
-           newrail1.copy(testmesh1.geometry);
-           testmesh1.geometry = newrail1;
-           testmesh1.geometry.attributes.position.needsUpdate = true;
-           testmesh1.geometry.attributes.uv.needsUpdate = true;
-           testmesh1.geometry.computeBoundingSphere();
-           testmesh1.geometry.center();
-        //
-
-        let testmesh2 = autorail.clone(true);
-        for(let i=0;i<autorail.rightlist.length;i++){
-             testmesh2.geometry.attributes.position.array[autorail.rightlist[i]*3] = 1;
-             testmesh2.geometry.attributes.uv.array[autorail.rightlist[i]*2] = testmesh2.geometry.attributes.position.array[0]-testmesh2.geometry.attributes.position.array[3];
-
-         }
-         let newrail2 = new THREE.BufferGeometry();
-         newrail2.copy(testmesh2.geometry);
-         testmesh2.geometry = newrail2;
-         testmesh2.geometry.attributes.position.needsUpdate = true;
-         testmesh2.geometry.attributes.uv.needsUpdate = true;
-         testmesh2.geometry.computeBoundingSphere();
-         testmesh2.geometry.center();
-
-
-        let testmesh3 = autorail.clone(true);
-        for(let i=0;i<autorail.rightlist.length;i++){
-             testmesh3.geometry.attributes.position.array[autorail.rightlist[i]*3] = 1;
-             testmesh3.geometry.attributes.uv.array[autorail.rightlist[i]*2] = testmesh3.geometry.attributes.position.array[0]-testmesh3.geometry.attributes.position.array[3];
-
-         }
-         let newrail3 = new THREE.BufferGeometry();
-         newrail3.copy(testmesh3.geometry);
-         testmesh3.geometry = newrail3;
-         testmesh3.geometry.attributes.position.needsUpdate = true;
-         testmesh3.geometry.attributes.uv.needsUpdate = true;
-         testmesh3.geometry.computeBoundingSphere();
-         testmesh3.geometry.center();
-
-        if(type == "1"){
-          testmesh1.rotation.x = 0;
-          testmesh2.rotation.x = 0;
-          testmesh3.rotation.x = 0;
-
-          testmesh1.position.x =(origin.lengthFact)/2 +0.9;
-          testmesh1.position.z = 0.03;
-          testmesh1.rotation.z = 0.05;
-
-          testmesh2.position.x = (origin.lengthFact)/2 +2.3;
-          testmesh2.position.z = 0.14;
-          testmesh2.rotation.z = 0.1;
-          testmesh3.position.x =  (origin.lengthFact)/2 +3.7;
-          testmesh3.position.z = 0.32;
-          testmesh3.rotation.z = 0.15;
-
-        }
-        if(type == "2"){
-          testmesh1.rotation.y = 0;
-          testmesh2.rotation.y = 0;
-          testmesh3.rotation.y = 0;
-          testmesh1.position.x = (origin.lengthFact)/2 +0.9;
-          testmesh1.position.z = 0.03;
-          testmesh1.rotation.z = 0.05;
-          testmesh2.position.x = (origin.lengthFact)/2 +2.3;
-          testmesh2.position.z = 0.14;
-          testmesh2.rotation.z = 0.1;
-          testmesh3.position.x = (origin.lengthFact)/2 +3.7;
-          testmesh3.position.z = 0.32;
-          testmesh3.rotation.z = 0.15;
-
-        }
-
-        origin.add( testmesh1 );
-        origin.add( testmesh2 );
-        origin.add( testmesh3 );
-
-      }
-      if(direct == "left"){
-        let testmesh1 = autorail.clone(true);
-        // console.log(testmesh2.geometry.attributes.position.array);
-        for(let i=0;i<autorail.rightlist.length;i++){
-             testmesh1.geometry.attributes.position.array[autorail.rightlist[i]*3] = 1;
-             testmesh1.geometry.attributes.uv.array[autorail.rightlist[i]*2] = testmesh1.geometry.attributes.position.array[0]-testmesh1.geometry.attributes.position.array[3];
-
-         }
-         let newrail1 = new THREE.BufferGeometry();
-         newrail1.copy(testmesh1.geometry);
-         testmesh1.geometry = newrail1;
-         testmesh1.geometry.attributes.position.needsUpdate = true;
-         testmesh1.geometry.attributes.uv.needsUpdate = true;
-         testmesh1.geometry.computeBoundingSphere();
-         testmesh1.geometry.center();
-
-        origin.add( testmesh1 );
-
-        let testmesh2 = autorail.clone(true);
-        for(let i=0;i<autorail.rightlist.length;i++){
-             testmesh2.geometry.attributes.position.array[autorail.rightlist[i]*3] = 1;
-             testmesh2.geometry.attributes.uv.array[autorail.rightlist[i]*2] = testmesh2.geometry.attributes.position.array[0]-testmesh2.geometry.attributes.position.array[3];
-
-         }
-         let newrail2 = new THREE.BufferGeometry();
-         newrail2.copy(testmesh2.geometry);
-         testmesh2.geometry = newrail2;
-         testmesh2.geometry.attributes.position.needsUpdate = true;
-         testmesh2.geometry.attributes.uv.needsUpdate = true;
-         testmesh2.geometry.computeBoundingSphere();
-         testmesh2.geometry.center();
-
-
-        let testmesh3 = autorail.clone(true);
-        for(let i=0;i<autorail.rightlist.length;i++){
-             testmesh3.geometry.attributes.position.array[autorail.rightlist[i]*3] = 1;
-             testmesh3.geometry.attributes.uv.array[autorail.rightlist[i]*2] = testmesh3.geometry.attributes.position.array[0]-testmesh3.geometry.attributes.position.array[3];
-
-         }
-         let newrail3 = new THREE.BufferGeometry();
-         newrail3.copy(testmesh3.geometry);
-         testmesh3.geometry = newrail3;
-         testmesh3.geometry.attributes.position.needsUpdate = true;
-         testmesh3.geometry.attributes.uv.needsUpdate = true;
-         testmesh3.geometry.computeBoundingSphere();
-         testmesh3.geometry.center();
-
-                 if(type == "3"){
-
-                   testmesh1.rotation.x = 0;
-                   testmesh2.rotation.x = 0;
-                   testmesh3.rotation.x = 0;
-                   testmesh1.position.x = - (origin.lengthFact)/2-0.9;
-                   testmesh1.position.z = 0.03;
-                   testmesh1.rotation.z = 0.05;
-                   testmesh2.position.x =  - (origin.lengthFact)/2 -2.3;
-                   testmesh2.position.z = 0.14;
-                   testmesh2.rotation.z = 0.1;
-                   testmesh3.position.x =  - (origin.lengthFact)/2 -3.7;
-                   testmesh3.position.z = 0.32;
-                   testmesh3.rotation.z = 0.15;
-
-                 }
-                 if(type == "4"){
-                   testmesh1.rotation.z = 0;
-                   testmesh2.rotation.z = 0;
-                   testmesh3.rotation.z = 0;
-                   testmesh1.position.x =  - (origin.lengthFact)/2 -0.9;
-                   testmesh1.position.z = 0.03;
-                   testmesh1.rotation.z = 0.05;
-                   testmesh2.position.x = - (origin.lengthFact)/2 -2.3;
-                   testmesh2.position.z = 0.14;
-                   testmesh2.rotation.z = 0.1;
-                   testmesh3.position.x = - (origin.lengthFact)/2 -3.7;
-                   testmesh3.position.z = 0.32;
-                   testmesh3.rotation.z = 0.15;
-
-                 }
-
-                 origin.add( testmesh1 );
-                 origin.add( testmesh2 );
-                 origin.add( testmesh3 );
-
-
-      }
-    }
   function createsection(autorail,position,start,end,py){
     position.z = py;
     if(scope.sections.datalist[start].code == end){
@@ -796,6 +647,7 @@ export function SectionList() {
     // var testmesh2 = new THREE.Mesh( geometry, material );
 
     testmesh2.position.set(position.x+(scope.sections.datalist[start].lengthFact/2),position.y,position.z);
+
     scope.sections.datalist[start].lp = {
      x:testmesh2.position.x-scope.sections.datalist[start].lengthFact/2,
      y:0,
@@ -806,6 +658,11 @@ export function SectionList() {
       y:0,
       z:testmesh2.position.z
     };
+    testmesh2.railpoint = [
+      {x:scope.sections.datalist[start].lp.x,y:0,z:scope.sections.datalist[start].lp.z},
+      {x:scope.sections.datalist[start].rp.x,y:0,z:scope.sections.datalist[start].rp.z}
+    ];
+
     scope.sectiongroup.add( testmesh2 );
     scope.sections.datalist[start].mesh = testmesh2;
     scope.sections.datalist[start].mesh.lengthFact = scope.sections.datalist[start].lengthFact;
@@ -853,24 +710,13 @@ export function SectionList() {
 
   this.loadpromise = function(jlmap3ddata,assetloader,sectiondata,scene){
 
-    for(let i=0;i<assetloader.modellist.length;i++){
-      if(assetloader.modellist[i].deviceType == "autorail"){
-        autorail = assetloader.modellist[i].mesh.children[0];
-      }
-    }
-    let count = autorail.geometry.attributes.position.count;
-    let rightlist = [];
-    let leftlist = [];
-    for(let i=0;i<count;i++){
-      if(autorail.geometry.attributes.position.array[i*3] >0.49){
-        rightlist.push(i);
-      }
-      if(autorail.geometry.attributes.position.array[i*3] <-0.49){
-        leftlist.push(i);
-      }
-    }
-    autorail.rightlist = rightlist;
-    autorail.leftlist = leftlist;
+    var texture = new THREE.TextureLoader().load( '../../static/test/z0251.png' );
+        texture.wrapS = texture.wrapT = THREE.RepeatWrapping;
+        texture.repeat.set( 1,1);
+
+    var selectmaterial = new THREE.MeshPhongMaterial( { map: texture,transparent:true,alphaTest:0.1 } );
+
+
     scene.add(scope.sectiongroup);
     return new Promise(function(resolve, reject){
       for(let i=0,leni = sectiondata.length;i<leni;i++){
@@ -879,40 +725,126 @@ export function SectionList() {
           name:sectiondata[i].name,
           standTrack:sectiondata[i].standTrack,
           rail:sectiondata[i].rail,
-          rightlist:rightlist,
-          leftlist:leftlist,
-          rsection:sectiondata[i].rsection,
-          lsection:sectiondata[i].lsection,
-          csection:sectiondata[i].csection,
           lengthFact:sectiondata[i].lengthFact,
           rp:sectiondata[i].rp,
           lp:sectiondata[i].lp,
+          railpoint:sectiondata[i].railpoint,
           mesh:null
         };
 
         let len = newsection.lengthFact;
-        let testmesh2 = autorail.clone(true);
-        for(let i=0;i<autorail.rightlist.length;i++){
-            testmesh2.geometry.attributes.position.array[autorail.rightlist[i]*3] = len;
-            testmesh2.geometry.attributes.uv.array[autorail.rightlist[i]*2] = testmesh2.geometry.attributes.position.array[0]-testmesh2.geometry.attributes.position.array[3];
-        }
-        let newrail = new THREE.BufferGeometry();
-        newrail.copy(testmesh2.geometry);
+        let testmesh2 = null;
+        if(newsection.railpoint.length>2){
+          // console.log(newsection);
+          let height = Math.random()/1000;
+          var closedSpline = new THREE.CatmullRomCurve3( [
+  			    new THREE.Vector3(newsection.railpoint[0].x,height,newsection.railpoint[0].z),
+            new THREE.Vector3(newsection.railpoint[1].x,height,newsection.railpoint[1].z),
+            new THREE.Vector3(newsection.railpoint[2].x,height,newsection.railpoint[2].z)
+  				] );
+  				closedSpline.type = 'catmullrom';
+  				closedSpline.closed = false;
+  				var extrudeSettings = {
+  				    steps           : 5,
+  				    curveSegments   : 1,
+  				    bevelSegments   : 1,
+  				    bevelEnabled    : false,
+  				    extrudePath     : closedSpline,
+  				};
+  				var shape = new THREE.Shape();
+  				shape.moveTo( 0,-2 );
+  				shape.lineTo( 0, 2 );
+  				var geometry = new THREE.ExtrudeBufferGeometry( shape, extrudeSettings );
+  				testmesh2 = new THREE.Mesh( geometry, selectmaterial );
+
+          testmesh2.railpoint = [
+            {x:newsection.railpoint[0].x,y:height,z:newsection.railpoint[0].z},
+            {x:newsection.railpoint[1].x,y:height,z:newsection.railpoint[1].z},
+            {x:newsection.railpoint[2].x,y:height,z:newsection.railpoint[2].z},
+          ];
+          testmesh2.lengthFact = newsection.railpoint[2].x - newsection.railpoint[0].x;
+          // closedSpline.arcLengthDivisions;
+  				let count = testmesh2.geometry.attributes.position.count/3;
+
+  				for(let i=0;i<count;i++){
+  					let ui=i*6;
+  					if(i%2 != 0){
+  						testmesh2.geometry.attributes.uv.array[ui] = 0;
+  						testmesh2.geometry.attributes.uv.array[ui+1] = 1;
+  						testmesh2.geometry.attributes.uv.array[ui+2] = len/5;
+  						testmesh2.geometry.attributes.uv.array[ui+3] = 1;
+  						testmesh2.geometry.attributes.uv.array[ui+4] = len/5;
+  						testmesh2.geometry.attributes.uv.array[ui+5] = 0;
+  					}else{
+  						testmesh2.geometry.attributes.uv.array[ui] = 0;
+  						testmesh2.geometry.attributes.uv.array[ui+1] = 0;
+  						testmesh2.geometry.attributes.uv.array[ui+2] = 0;
+  						testmesh2.geometry.attributes.uv.array[ui+3] = 1;
+  						testmesh2.geometry.attributes.uv.array[ui+4] = len/5;
+  						testmesh2.geometry.attributes.uv.array[ui+5] = 0;
+  					}
+  				}
+
+        }else{
+          let height = Math.random()/1000;
+
+          var closedSpline = new THREE.CatmullRomCurve3( [
+            new THREE.Vector3(newsection.railpoint[0].x,height,newsection.railpoint[0].z),
+            new THREE.Vector3(newsection.railpoint[1].x,height,newsection.railpoint[0].z),
+          ] );
+
+  				closedSpline.type = 'catmullrom';
+  				closedSpline.closed = false;
+  				// Set up settings for later extrusion
+  				var extrudeSettings = {
+  				    steps           : 1,
+  				    curveSegments   : 1,
+  				    bevelSegments   : 1,
+  				    bevelEnabled    : false,
+  				    extrudePath     : closedSpline,
+  				};
+  				var shape = new THREE.Shape();
+  				shape.moveTo( -2,0 );
+  				shape.lineTo( 2,0 );
+  				// Extrude the triangle along the CatmullRom curve
+  				var geometry = new THREE.ExtrudeBufferGeometry( shape, extrudeSettings );
+  				testmesh2 = new THREE.Mesh( geometry, selectmaterial );
+          testmesh2.railpoint = [
+            {x:newsection.railpoint[0].x,y:height,z:newsection.railpoint[0].z},
+            {x:newsection.railpoint[1].x,y:height,z:newsection.railpoint[0].z},
+          ];
+            testmesh2.lengthFact = newsection.railpoint[1].x - newsection.railpoint[0].x;
+            // closedSpline.arcLengthDivisions;
+  				let count = testmesh2.geometry.attributes.position.count/3;
+
+  				for(let i=0;i<count;i++){
+  					let ui=i*6;
+  					if(i%2 != 0){
+  						testmesh2.geometry.attributes.uv.array[ui] = 0;
+  						testmesh2.geometry.attributes.uv.array[ui+1] = 1;
+  						testmesh2.geometry.attributes.uv.array[ui+2] = len;
+  						testmesh2.geometry.attributes.uv.array[ui+3] = 1;
+  						testmesh2.geometry.attributes.uv.array[ui+4] = len;
+  						testmesh2.geometry.attributes.uv.array[ui+5] = 0;
+  					}else{
+  						testmesh2.geometry.attributes.uv.array[ui] = 0;
+  						testmesh2.geometry.attributes.uv.array[ui+1] = 0;
+  						testmesh2.geometry.attributes.uv.array[ui+2] = 0;
+  						testmesh2.geometry.attributes.uv.array[ui+3] = 1;
+  						testmesh2.geometry.attributes.uv.array[ui+4] = len;
+  						testmesh2.geometry.attributes.uv.array[ui+5] = 0;
+  					}
+  				}
+
+        }
 
-        // console.log(sectiondata[i]);
-        // console.log(testmesh2);
-        // console.log(newsection);
-        testmesh2.geometry = newrail;
-        testmesh2.geometry.attributes.position.needsUpdate = true;
-        testmesh2.geometry.attributes.uv.needsUpdate = true;
-        testmesh2.geometry.computeBoundingSphere();
-        testmesh2.geometry.center();
         testmesh2.code = newsection.code;
-        testmesh2.rightlist = sectiondata[i].rightlist;
-        testmesh2.leftlist = sectiondata[i].leftlist;
-        testmesh2.lengthFact = newsection.lengthFact;
-        testmesh2.position.set(sectiondata[i].position.x,sectiondata[i].position.y,sectiondata[i].position.z);
-        testmesh2.rotation.set(sectiondata[i].rotation._x,sectiondata[i].rotation._y,sectiondata[i].rotation._z);
+        testmesh2.standTrack = newsection.standTrack;
+        testmesh2.meshtype = "section";
+
+        // testmesh2.geometry.computeBoundingBox();
+        // testmesh2.geometry.center()
+        // testmesh2.position.set(sectiondata[i].position.x,sectiondata[i].position.y,sectiondata[i].position.z);
         scope.sectiongroup.add(testmesh2);
         newsection.mesh = testmesh2;
         scope.sections.datalist[newsection.code] = newsection;
diff --git a/src/jlmap3d/edit/neweditmodel/SignalList.js b/src/jlmap3d/edit/neweditmodel/SignalList.js
index d7a7f69a9..ef2d6bf27 100644
--- a/src/jlmap3d/edit/neweditmodel/SignalList.js
+++ b/src/jlmap3d/edit/neweditmodel/SignalList.js
@@ -145,6 +145,8 @@ export function SignalList() {
 
               // console.log(signaldata[i]);
               let newmesh = assetloader.modellist[num].mesh.clone(true);
+              newmesh.sectionCode = data[n].sectionCode;
+              newmesh.sectionOffset = data[n].sectionOffset;
               // newmesh.uuid = signaldata[i].id;
               for(let j=0;j<newmesh.children.length;j++){
                 newmesh.children[j].code = signaldata[i].code;
@@ -152,8 +154,8 @@ export function SignalList() {
               newmesh.name = signaldata[i].name;
               newmesh.modelid = assetloader.modellist[num].id;
               newmesh.code = signaldata[i].code;
-              newmesh.right = data[i].right;
-              newmesh.virtual = data[i].virtual;
+              newmesh.right = data[n].right;
+              newmesh.virtual = data[n].virtual;
               newmesh.position.x = signaldata[i].position.x;
               newmesh.position.y = signaldata[i].position.y;
               newmesh.position.z = signaldata[i].position.z;
@@ -179,38 +181,34 @@ export function SignalList() {
   };
   this.resetsignal = function(jlmap3ddata){
     // console.log(jlmap3ddata.linksgroup);
-    console.log(jlmap3ddata.sectionlist.sections.datalist);
-    let sectiondata = jlmap3ddata.sectionlist.sections.datalist;
+    let sectiondata = jlmap3ddata.sectionlist.sectiongroup.children;
     for(let i=0;i<scope.group.children.length;i++){
       let signaldata = scope.group.children[i];
-      for(let j in sectiondata){
+
+      for(let j=0;j<sectiondata.length;j++){
         if(sectiondata[j].code == signaldata.sectionCode){
-
-          let section = sectiondata[signaldata.sectionCode];
+          let section = sectiondata[j];
           let posx = null;
-          console.log(section);
+          // console.log(section);
+
+          posx = section.railpoint[0].x + signaldata.sectionOffset;
 
-          if(signaldata.sectionOffset > section.lengthFact/2){
-            posx = section.mesh.position.x + signaldata.sectionOffset - section.lengthFact/2;
-          }else{
-            posx = section.mesh.position.x - (section.lengthFact/2 - signaldata.sectionOffset);
-          }
           //根据线路方向修改信号灯位置
           if(signaldata.right == false){
             if(section.standTrack == true){
               posx = posx - 7;
             }
 
-            signaldata.position.set(posx,0,section.mesh.position.z-3);
+            signaldata.position.set(posx,0,section.railpoint[0].z-3);
             signaldata.rotation.z = ( Math.PI / 2 );
           }else if(signaldata.right == true){
             if(section.standTrack == true){
               posx = posx + 7;
             }
-            signaldata.position.set(posx,0,section.mesh.position.z+3);
+            signaldata.position.set(posx,0,section.railpoint[0].z+3);
             signaldata.rotation.z = ( - Math.PI / 2 );
           }
-
+          j = sectiondata.length;
         }
       }
 
diff --git a/src/jlmap3d/edit/neweditmodel/StationStandList.js b/src/jlmap3d/edit/neweditmodel/StationStandList.js
index c105100c7..63dbd7de4 100644
--- a/src/jlmap3d/edit/neweditmodel/StationStandList.js
+++ b/src/jlmap3d/edit/neweditmodel/StationStandList.js
@@ -157,10 +157,7 @@ export function StationStandList() {
   }
   this.loadpromise = function(jlmap3ddata,standsdata,jlmapstanddata,scene,assetloader){
     return new Promise(function(resolve, reject){
-      console.log("............");
-      console.log(jlmap3ddata);
-      console.log(standsdata);
-      console.log(jlmapstanddata);
+    
       let stations = jlmap3ddata.stationstandlist.list;
       let num;
       let num2;
diff --git a/src/jlmap3d/edit/neweditmodel/SwitchList.js b/src/jlmap3d/edit/neweditmodel/SwitchList.js
index fb68bca80..7139ef710 100644
--- a/src/jlmap3d/edit/neweditmodel/SwitchList.js
+++ b/src/jlmap3d/edit/neweditmodel/SwitchList.js
@@ -75,6 +75,7 @@ export function SwitchList() {
           pc:switchdata[i].pc
         };
 
+        // console.log(newswitch.pa);
         let autoswitch = assetloader.modellist[num].mesh.clone(true);
         autoswitch.code = switchdata[i].code;
         for(let j=0;j<autoswitch.children.length;j++){
@@ -94,6 +95,23 @@ export function SwitchList() {
     });
 
   }
+
+  this.resetswitch = function(data){
+    // console.log("reset");
+    let sectiondata = data.sectionlist.sectiongroup;
+    for(let i=0;i<scope.switchs.datalist.length;i++){
+
+      let sectionA = sectiondata.getObjectByProperty("code",scope.switchs.datalist[i].pa);
+      let sectionB = sectiondata.getObjectByProperty("code",scope.switchs.datalist[i].pb);
+
+      if(sectionA.railpoint[0].x > sectionB.railpoint[0].x){
+        scope.switchs.modellist[i].position.set(sectionA.railpoint[0].x,0,sectionA.railpoint[0].z);
+      }else{
+        scope.switchs.modellist[i].position.set(sectionA.railpoint[1].x,0,sectionA.railpoint[1].z);
+      }
+    }
+  }
+
   this.update = function(){
 
   }
diff --git a/src/jlmap3d/jl3ddrive/jl3ddrive.js b/src/jlmap3d/jl3ddrive/jl3ddrive.js
index 2af26708b..e9552f250 100644
--- a/src/jlmap3d/jl3ddrive/jl3ddrive.js
+++ b/src/jlmap3d/jl3ddrive/jl3ddrive.js
@@ -140,10 +140,10 @@ export function JLmapDriving(dom,data,mapId,storemod,translation,routegroup,proj
 	// controls3.getObject().rotation.x = Math.PI/2;
 	scene.add(controls3.getObject());
 
-	let cameracctv = new THREE.PerspectiveCamera(60, dom.clientWidth/dom.clientHeight, 1, 40);
-	cameracctv.position.set( 2, -1,27 );
+	let cameracctv = new THREE.PerspectiveCamera(50, dom.clientWidth/dom.clientHeight, 1, 10);
+	cameracctv.position.set( 0, -1,30 );
 
-	cameracctv.rotation.y = Math.PI/2;
+	// cameracctv.rotation.y = Math.PI/2;
 	camera.add(cameracctv);
 
 
diff --git a/src/jlmap3d/jl3dsimulation/connect/Jlmap3dSubscribeNew.js b/src/jlmap3d/jl3dsimulation/connect/Jlmap3dSubscribeNew.js
index 0ed1d9502..d01f54579 100644
--- a/src/jlmap3d/jl3dsimulation/connect/Jlmap3dSubscribeNew.js
+++ b/src/jlmap3d/jl3dsimulation/connect/Jlmap3dSubscribeNew.js
@@ -147,6 +147,7 @@ export function Jlmap3dSubscribeNew(jlmap3d,routegroup,jsonwebwork) {
 
 	function trainrun(data){
 		let code = data.code;
+
 		if(trainlisttest.list[code].dispose == "0"){
 			if(trainlisttest.list[code].curve == null){
 				if (data.right == '1') { // 向右
@@ -204,6 +205,7 @@ export function Jlmap3dSubscribeNew(jlmap3d,routegroup,jsonwebwork) {
 
 			}else{
 				//后端数据驱动车的位置更新与代码驱动车的移动相结合
+
 				if(data.code != trainlisttest.list[code].code){
 					if (data.right == '1') { // 向右
 						trainlisttest.list[code].right = '1';
diff --git a/src/jlmap3d/jl3dsimulation/jlmap3d.js b/src/jlmap3d/jl3dsimulation/jlmap3d.js
index 83e53f0a2..ffac70487 100644
--- a/src/jlmap3d/jl3dsimulation/jlmap3d.js
+++ b/src/jlmap3d/jl3dsimulation/jlmap3d.js
@@ -53,6 +53,8 @@ export function JLmap3d(dom, data,skinCode,storemod,routegroup,project) {
   let camera = SetCamera(dom);
   //定义场景(渲染容器)
   let scene = SetScene(project);
+  let scenesimulation = new THREE.Group();
+  scene.add(scenesimulation);
   //定义镜头操作
   let controls = new THREE.OrbitControls(camera);
   controls.maxPolarAngle = Math.PI/2;
@@ -110,14 +112,14 @@ export function JLmap3d(dom, data,skinCode,storemod,routegroup,project) {
         scope.jsonwebwork = new Worker("../../static/workertest/jsonworker.js");
         scope.Subscribe = new Jlmap3dSubscribe(scope,routegroup,scope.jsonwebwork);
         scope.Subscribe.socketon(scope.Subscribe.topic);
-        SimulationLoad(mapnetdata,scope,netdata.data,mapdata,camera,controls,scene,storemod);
+        SimulationLoad(mapnetdata,scope,netdata.data,mapdata,camera,controls,scenesimulation,storemod);
 
       }else{
         scope.datatype = "new";
         scope.jsonwebworknew = new Worker("../../static/workertest/jsonworkernew.js");
         scope.Subscribe = new Jlmap3dSubscribeNew(scope,routegroup,scope.jsonwebworknew);
         scope.Subscribe.socketon(scope.Subscribe.topic);
-        SimulationLoadNew(mapnetdata,scope,netdata.data,mapdata,camera,controls,scene,storemod);
+        SimulationLoadNew(mapnetdata,scope,netdata.data,mapdata,camera,controls,scenesimulation,storemod);
       }
 
     });
diff --git a/src/jlmap3d/main/control/DragControls.js b/src/jlmap3d/main/control/DragControls.js
index a461d8557..a872e19a3 100644
--- a/src/jlmap3d/main/control/DragControls.js
+++ b/src/jlmap3d/main/control/DragControls.js
@@ -21,7 +21,7 @@ THREE.DragControls = function ( _objects, _camera, _domElement ) {
 	var _intersection = new THREE.Vector3();
 	var _worldPosition = new THREE.Vector3();
 	var _inverseMatrix = new THREE.Matrix4();
-	
+
 	var _selected = null, _hovered = null;
 
 	//
diff --git a/src/jlmap3d/main/control/ScalControls.js b/src/jlmap3d/main/control/ScalControls.js
index 14edb8315..ec4039ba4 100644
--- a/src/jlmap3d/main/control/ScalControls.js
+++ b/src/jlmap3d/main/control/ScalControls.js
@@ -7,23 +7,54 @@
 THREE.ScalControls = function ( scene,_camera, _domElement ) {
 	var _scene = scene;
 	var originposition;
+
 	var _objects = [];
+
+	var helpmove = null;
+	var objectparent = null;
+	var selectmaterial = null;
+	var oldobject = null;
+
+	var geometry = new THREE.BoxBufferGeometry( 1, 1, 1 );
+	var material = new THREE.MeshBasicMaterial( {color: 0x00ff00} );
+
+	var newcurvehelp = new THREE.Group();
+
+	var cube = new THREE.Mesh( geometry, material );
+	cube.name = "left";
+	newcurvehelp.add( cube );
+	_objects.push(cube);
+
+	var cube = new THREE.Mesh( geometry, material );
+	cube.name = "mid";
+	newcurvehelp.add( cube );
+	_objects.push(cube);
+
+	var cube = new THREE.Mesh( geometry, material );
+	cube.name = "right";
+	newcurvehelp.add( cube );
+	_objects.push(cube);
+
+	var newlinehelp = new THREE.Group();
+
+	var cube = new THREE.Mesh( geometry, material );
+	cube.name = "left";
+	newlinehelp.add( cube );
+	_objects.push(cube);
+
+	var cube = new THREE.Mesh( geometry, material );
+	cube.name = "right";
+	newlinehelp.add( cube );
+	_objects.push(cube);
+
 	var cubegroup = new THREE.Group();
 
-	var geometry = new THREE.BoxBufferGeometry( 5, 5, 5 );
-	var material = new THREE.MeshBasicMaterial( {color: 0x00ff00} );
 	var cube = new THREE.Mesh( geometry, material );
-	cube.position.x = 1;
-	cube.position.z = 0;
 	cube.name = "right";
 	cubegroup.add( cube );
 	_objects.push(cube);
 
-	var geometry = new THREE.BoxBufferGeometry( 5, 5, 5 );
-	var material = new THREE.MeshBasicMaterial( {color: 0x00ff00} );
 	var cube = new THREE.Mesh( geometry, material );
-	cube.position.x = -1;
-	cube.position.z = 0;
 	cube.name = "left";
 	cubegroup.add( cube );
 	_objects.push(cube);
@@ -53,6 +84,7 @@ THREE.ScalControls = function ( scene,_camera, _domElement ) {
 
 	var scope = this;
 
+	this.scalon = false;
 	function activate() {
 
 		_domElement.addEventListener( 'mousemove', onDocumentMouseMove, false );
@@ -99,57 +131,58 @@ THREE.ScalControls = function ( scene,_camera, _domElement ) {
 			if ( _raycaster.ray.intersectPlane( _plane, _intersection ) ) {
 				_selected.position.copy( _intersection.sub( _offset ).applyMatrix4( _inverseMatrix ) );
 				_selected.position.y = 0;
-				console.log(_movemesh);
-				if(_movemesh.meshtype == "link"){
-					if(_selected.name == "left"){
-						for(let i=0;i<_movemesh.leftlist.length;i++){
-							_movemesh.geometry.attributes.position.array[_movemesh.leftlist[i]*3] = _selected.position.x - originposition;
-							_movemesh.geometry.attributes.uv.array[_movemesh.leftlist[i]*2] = _movemesh.geometry.attributes.position.array[0]-_movemesh.geometry.attributes.position.array[3];
 
-						}
-					}
+				if(_movemesh.meshtype = "section"){
+					newsectioncreate();
 
-					if(_selected.name == "right"){
-						for(let i=0;i<_movemesh.rightlist.length;i++){
-							_movemesh.geometry.attributes.position.array[_movemesh.rightlist[i]*3] = _selected.position.x - originposition;
-							_movemesh.geometry.attributes.uv.array[_movemesh.leftlist[i]*2] = _movemesh.geometry.attributes.position.array[0]-_movemesh.geometry.attributes.position.array[3];
-						}
-					}
 				}else{
-					if(_selected.name == "left"){
-						for(let i=0;i<_movemesh.leftlist.length;i++){
-							_movemesh.geometry.attributes.position.array[_movemesh.leftlist[i]*3] = _selected.position.x - originposition;
-							_movemesh.geometry.attributes.uv.array[_movemesh.leftlist[i]*2] = (_movemesh.geometry.attributes.position.array[3]-_movemesh.geometry.attributes.position.array[0])/15.3;
-						}
-					}
+					if(_movemesh.meshtype == "link"){
+	 					if(_selected.name == "left"){
+	 						for(let i=0;i<_movemesh.leftlist.length;i++){
+	 							_movemesh.geometry.attributes.position.array[_movemesh.leftlist[i]*3] = _selected.position.x - originposition.x;
+	 							_movemesh.geometry.attributes.uv.array[_movemesh.leftlist[i]*2] = _movemesh.geometry.attributes.position.array[0]-_movemesh.geometry.attributes.position.array[3];
 
-					if(_selected.name == "right"){
-						for(let i=0;i<_movemesh.rightlist.length;i++){
+	 						}
+	 					}
+
+	 					if(_selected.name == "right"){
+	 						for(let i=0;i<_movemesh.rightlist.length;i++){
+	 							_movemesh.geometry.attributes.position.array[_movemesh.rightlist[i]*3] = _selected.position.x - originposition.x;
+	 							_movemesh.geometry.attributes.uv.array[_movemesh.leftlist[i]*2] = _movemesh.geometry.attributes.position.array[0]-_movemesh.geometry.attributes.position.array[3];
+	 						}
+	 					}
+	 				}else{
+	 					if(_selected.name == "left"){
+	 						for(let i=0;i<_movemesh.leftlist.length;i++){
+	 							_movemesh.geometry.attributes.position.array[_movemesh.leftlist[i]*3] = _selected.position.x - originposition.x;
+	 							_movemesh.geometry.attributes.uv.array[_movemesh.leftlist[i]*2] = (_movemesh.geometry.attributes.position.array[3]-_movemesh.geometry.attributes.position.array[0])/15.3;
+	 						}
+	 					}
+
+	 					if(_selected.name == "right"){
+	 						for(let i=0;i<_movemesh.rightlist.length;i++){
+
+	 							_movemesh.geometry.attributes.position.array[_movemesh.rightlist[i]*3] = _selected.position.x - originposition.x;
+	 							_movemesh.geometry.attributes.uv.array[_movemesh.leftlist[i]*2] = (_movemesh.geometry.attributes.position.array[3]-_movemesh.geometry.attributes.position.array[0])/15.3;
+	 						}
+	 					}
+	 				}
+
+
+
+	 				// newgeometry.attributes.uv.array[7] = i;
+
+	 				_movemesh.geometry.attributes.position.needsUpdate = true;
+	 				_movemesh.geometry.attributes.uv.needsUpdate = true;
+	 				_movemesh.material.needsUpdate = true;
+	 				// _movemesh.geometry.computeBoundingBox();
+	 				_movemesh.geometry.computeBoundingSphere();
+	 				_movemesh.geometry.center();
+	 				// _movemesh.lengthfact = (_movemesh.geometry.attributes.position.array[_movemesh.rightlist[0]] - _movemesh.geometry.attributes.position.array[_movemesh.leftlist[0]])*2+28;
+	 				_movemesh.lengthFact = (_movemesh.geometry.attributes.position.array[_movemesh.rightlist[0]*3] - _movemesh.geometry.attributes.position.array[_movemesh.leftlist[0]*3]);
 
-							_movemesh.geometry.attributes.position.array[_movemesh.rightlist[i]*3] = _selected.position.x - originposition;
-							_movemesh.geometry.attributes.uv.array[_movemesh.leftlist[i]*2] = (_movemesh.geometry.attributes.position.array[3]-_movemesh.geometry.attributes.position.array[0])/15.3;
-						}
-					}
 				}
 
-
-
-				// newgeometry.attributes.uv.array[7] = i;
-
-				_movemesh.geometry.attributes.position.needsUpdate = true;
-				_movemesh.geometry.attributes.uv.needsUpdate = true;
-				_movemesh.material.needsUpdate = true;
-				// _movemesh.geometry.computeBoundingBox();
-				_movemesh.geometry.computeBoundingSphere();
-				_movemesh.geometry.center();
-				// _movemesh.lengthfact = (_movemesh.geometry.attributes.position.array[_movemesh.rightlist[0]] - _movemesh.geometry.attributes.position.array[_movemesh.leftlist[0]])*2+28;
-				_movemesh.lengthFact = (_movemesh.geometry.attributes.position.array[_movemesh.rightlist[0]*3] - _movemesh.geometry.attributes.position.array[_movemesh.leftlist[0]*3]);
-
-				// testmesh2.position.z = 50;
-
-				// testmesh2.geometry.center();
-				// console.log(testmesh2.geometry.attributes);
-
 			}
 
 			scope.dispatchEvent( { type: 'drag', object: _selected } );
@@ -230,6 +263,7 @@ THREE.ScalControls = function ( scene,_camera, _domElement ) {
 
 			_selected = null;
 
+			console.log("mouseup");
 		}
 
 		_domElement.style.cursor = _hovered ? 'pointer' : 'auto';
@@ -316,6 +350,104 @@ THREE.ScalControls = function ( scene,_camera, _domElement ) {
 
 	}
 
+	//区段重新构建
+	function newsectioncreate(){
+		oldobject = _movemesh;
+		objectparent.remove(oldobject);
+
+		let newpointlist = [];
+		let curvestep = 1;
+		var closedSpline;
+		var extrudeSettings;
+		for(let i=0;i<_movemesh.railpoint.length;i++){
+			newpointlist.push(new THREE.Vector3(_movemesh.railpoint[i].x,_movemesh.railpoint[i].y,_movemesh.railpoint[i].z));
+		}
+
+		if(_movemesh.railpoint.length>2){
+
+			if(_selected.name == "left"){
+				newpointlist[0] = new THREE.Vector3(_selected.position.x,_movemesh.railpoint[0].y,_selected.position.z);
+			}
+			if(_selected.name == "mid"){
+				newpointlist[1] = new THREE.Vector3(_selected.position.x,_movemesh.railpoint[0].y,_selected.position.z);
+			}
+			if(_selected.name == "right"){
+				newpointlist[2] = new THREE.Vector3(_selected.position.x,_movemesh.railpoint[0].y,_selected.position.z);
+			}
+			curvestep = 10;
+		}else{
+
+			if(_selected.name == "left"){
+				newpointlist[0] = new THREE.Vector3(_selected.position.x,_movemesh.railpoint[0].y,_selected.position.z);
+			}
+			if(_selected.name == "right"){
+				newpointlist[1] = new THREE.Vector3(_selected.position.x,_movemesh.railpoint[0].y,_selected.position.z);
+			}
+			curvestep =1;
+		}
+		closedSpline = new THREE.CatmullRomCurve3(newpointlist);
+		closedSpline.type = 'catmullrom';
+		closedSpline.closed = false;
+
+		extrudeSettings = {
+				steps           : curvestep,
+				curveSegments   : 1,
+				bevelSegments   : 1,
+				bevelEnabled    : false,
+				extrudePath     : closedSpline,
+		};
+
+		var shape = new THREE.Shape();
+		shape.moveTo( 0,-2 );
+		shape.lineTo( 0, 2 );
+		selectmaterial = _movemesh.material;
+		var geometry = new THREE.ExtrudeBufferGeometry( shape, extrudeSettings );
+		_movemesh = new THREE.Mesh( geometry, selectmaterial );
+		_movemesh.code = oldobject.code;
+		_movemesh.railpoint = [];
+		for(let i=0;i<newpointlist.length;i++){
+			_movemesh.railpoint[i] = {
+				x:newpointlist[i].x,
+				y:newpointlist[i].y,
+				z:newpointlist[i].z
+			}
+		}
+		_movemesh.lengthFact = closedSpline.arcLengthDivisions/4;
+		if(newpointlist.length>2){
+			_movemesh.lengthFact = _movemesh.lengthFact/curvestep;
+		}
+
+		let len = _movemesh.lengthFact;
+		// closedSpline.arcLengthDivisions;
+		let count = _movemesh.geometry.attributes.position.count/3;
+
+		for(let i=0;i<count;i++){
+			let ui=i*6;
+			if(i%2 != 0){
+				_movemesh.geometry.attributes.uv.array[ui] = 0;
+				_movemesh.geometry.attributes.uv.array[ui+1] = 1;
+				_movemesh.geometry.attributes.uv.array[ui+2] = len;
+				_movemesh.geometry.attributes.uv.array[ui+3] = 1;
+				_movemesh.geometry.attributes.uv.array[ui+4] = len;
+				_movemesh.geometry.attributes.uv.array[ui+5] = 0;
+			}else{
+				_movemesh.geometry.attributes.uv.array[ui] = 0;
+				_movemesh.geometry.attributes.uv.array[ui+1] = 0;
+				_movemesh.geometry.attributes.uv.array[ui+2] = 0;
+				_movemesh.geometry.attributes.uv.array[ui+3] = 1;
+				_movemesh.geometry.attributes.uv.array[ui+4] = len;
+				_movemesh.geometry.attributes.uv.array[ui+5] = 0;
+			}
+		}
+		_movemesh.meshtype = "section";
+		// _movemesh.geometry.computeBoundingBox();
+		// _movemesh.geometry.center()
+		// _movemesh.position.set(oldobject.position.x,oldobject.position.y,oldobject.position.z);
+
+		// console.log(_movemesh.railpoint[2].x);
+		objectparent.add(_movemesh);
+	}
+
 	activate();
 
 	// API
@@ -327,24 +459,68 @@ THREE.ScalControls = function ( scene,_camera, _domElement ) {
 	this.dispose = dispose;
 
 	// Backward compatibility
-  this.attach = function(movemesh){
-		console.log(movemesh);
-		_movemesh = movemesh;
-		originposition = movemesh.position.x;
-		let offset = (_movemesh.geometry.attributes.position.array[movemesh.rightlist[0]*3] - _movemesh.geometry.attributes.position.array[movemesh.leftlist[0]*3])/2;
-		cubegroup.children[0].position.x = movemesh.position.x + offset;
-		cubegroup.children[0].position.y = movemesh.position.y;
-		cubegroup.children[0].position.z = movemesh.position.z;
-		cubegroup.children[1].position.x = movemesh.position.x - offset;
-		cubegroup.children[1].position.y = movemesh.position.y;
-		cubegroup.children[1].position.z = movemesh.position.z;
+  this.attach = function(movemesh,points){
+		if(!helpmove){
+			if(points){
+
+				_movemesh = movemesh;
+				originposition = movemesh.position;
+				if(points.length>2){
+					helpmove = newcurvehelp;
+				}else{
+					helpmove = newlinehelp;
+				}
+				helpmove.position.y = 0;
+				for(let i=0;i<points.length;i++){
+					helpmove.children[i].position.x = points[i].x;
+					helpmove.children[i].position.y = points[i].y;
+					helpmove.children[i].position.z = points[i].z;
+				}
+
+			}else{
+				_movemesh = movemesh;
+				originposition = movemesh.position;
+				let offset = (_movemesh.geometry.attributes.position.array[movemesh.rightlist[0]*3] - _movemesh.geometry.attributes.position.array[movemesh.leftlist[0]*3])/2;
+				cubegroup.children[0].position.x = movemesh.position.x + offset;
+				cubegroup.children[0].position.y = movemesh.position.y;
+				cubegroup.children[0].position.z = movemesh.position.z;
+				cubegroup.children[1].position.x = movemesh.position.x - offset;
+				cubegroup.children[1].position.y = movemesh.position.y;
+				cubegroup.children[1].position.z = movemesh.position.z;
+				helpmove = cubegroup;
+				helpmove.position.y = 0;
+			}
+			objectparent = _movemesh.parent;
+			scope.scalon = true;
+			_scene.add(helpmove);
+		}
+
+
 
-		_scene.add(cubegroup);
   }
 
 	this.detach = function(){
 		// _movemesh = "";
-		_scene.remove(cubegroup);
+		if(helpmove){
+
+			if(_selected){
+
+			}else{
+				console.log("detach");
+				helpmove.position.y = 90000;
+				// _scene.remove(helpmove);
+				// objectparent = null;
+				scope.scalon = false;
+				helpmove = null;
+			}
+			// for(let i=0;i<helpmove.children.length;i++){
+			// 	helpmove.children[i].position.x = -9999;
+			// 	helpmove.children[i].position.y = -9999;
+			// 	helpmove.children[i].position.z = -9999;
+			// }
+
+		}
+
 	}
 
 	this.setObjects = function () {
diff --git a/src/jlmap3d/main/control/TransformControls.js b/src/jlmap3d/main/control/TransformControls.js
index 2770d3886..46d53435e 100644
--- a/src/jlmap3d/main/control/TransformControls.js
+++ b/src/jlmap3d/main/control/TransformControls.js
@@ -18,6 +18,24 @@ THREE.TransformControls = function ( camera, domElement ) {
 
 	var scope = this;
 
+	var geometry = new THREE.BoxBufferGeometry( 1, 1, 1 );
+	var material = new THREE.MeshBasicMaterial( {color: 0x00ff00} );
+
+	var virtualmovebox = new THREE.Mesh( geometry, material );
+	var atobject = undefined;
+	var sectionswitch = undefined;
+
+	var cube1 = new THREE.Mesh( geometry, material );
+	cube1.name = "left";
+
+	var cube2 = new THREE.Mesh( geometry, material );
+	cube2.name = "mis";
+
+	var cube3 = new THREE.Mesh( geometry, material );
+	cube3.name = "right";
+
+
+
 	// Define properties with getters/setter
 	// Setting the defined property will automatically trigger change event
 	// Defined properties are passed down to gizmo and plane
@@ -131,16 +149,48 @@ THREE.TransformControls = function ( camera, domElement ) {
 	};
 
 	// Set current object
-	this.attach = function ( object ) {
+	this.attach = function ( object,editmode ) {
+		console.log(editmode);
+		atobject = object;
+		if(editmode == "trackedit"){
+			if(atobject){
+				sectionswitch = true;
+				atobject.add(virtualmovebox);
 
-		this.object = object;
-		this.visible = true;
+				this.object = virtualmovebox;
+				this.visible = true;
 
+				let len = object.railpoint.length-1;
+
+				cube1.position.set(object.railpoint[0].x-object.position.x,0,object.railpoint[0].z-object.position.z);
+				cube3.position.set(object.railpoint[len].x-object.position.x,0,object.railpoint[len].z-object.position.z);
+				atobject.add(cube1);
+				atobject.add(cube3);
+				if(object.railpoint.length>2){
+					cube2.position.set(object.railpoint[1].x-object.position.x,0,object.railpoint[1].z-object.position.z);
+					atobject.add(cube2);
+					virtualmovebox.position.set(cube2.position.x,cube2.position.y,cube2.position.z);
+				}else{
+					virtualmovebox.position.set((cube1.position.x+cube3.position.x)/2,0,(cube1.position.z+cube3.position.z)/2);
+				}
+			}
+		}else{
+			sectionswitch = false;
+			this.object = object;
+			this.visible = true;
+
+		}
 	};
 
 	// Detatch from object
 	this.detach = function () {
-
+		if(atobject){
+			atobject.remove(virtualmovebox);
+			atobject.remove(cube1);
+			atobject.remove(cube2);
+			atobject.remove(cube3);
+		}
+		sectionswitch = false;
 		this.object = undefined;
 		this.visible = false;
 		this.axis = null;
@@ -335,13 +385,47 @@ THREE.TransformControls = function ( camera, domElement ) {
 			} else {
 				offset.applyQuaternion( parentQuaternionInv ).divide( parentScale );
 			}
+			console.log(sectionswitch);
+			if(sectionswitch){
+				let oldpositionx = object.position.x;
+				let oldpositionz = object.position.z;
+				object.position.copy( offset ).add( positionStart );
+				atobject.position.x += object.position.x - oldpositionx;
+				atobject.position.z += object.position.z - oldpositionz;
+
+				console.log(object.position.x - oldpositionx);
+				atobject.railpoint[0] = {
+					x:cube1.matrixWorld.elements[12],
+					y:cube1.matrixWorld.elements[13],
+					z:cube1.matrixWorld.elements[14],
+				};
+
+				if(atobject.railpoint.length>2){
+					atobject.railpoint[1] = {
+						x:cube2.matrixWorld.elements[12],
+						y:cube2.matrixWorld.elements[13],
+						z:cube2.matrixWorld.elements[14],
+					};
+					atobject.railpoint[2] = {
+						x:cube3.matrixWorld.elements[12],
+						y:cube3.matrixWorld.elements[13],
+						z:cube3.matrixWorld.elements[14],
+					};
+				}else{
+					atobject.railpoint[1] = {
+						x:cube3.matrixWorld.elements[12],
+						y:cube3.matrixWorld.elements[13],
+						z:cube3.matrixWorld.elements[14],
+					};
+				}
+			}else{
+				object.position.copy( offset ).add( positionStart );
+			}
+
 
-			object.position.copy( offset ).add( positionStart );
 
 			// Apply translation snap
-
 			if ( this.translationSnap ) {
-
 				if ( space === 'local' ) {
 
 					object.position.applyQuaternion(_tempQuaternion.copy( quaternionStart ).inverse() );
diff --git a/src/jlmap3d/main/loaders/DriverLoadNew.js b/src/jlmap3d/main/loaders/DriverLoadNew.js
index c74a9d790..4202c551d 100644
--- a/src/jlmap3d/main/loaders/DriverLoadNew.js
+++ b/src/jlmap3d/main/loaders/DriverLoadNew.js
@@ -85,7 +85,7 @@ export function DriverLoadNew(data,scope,netdata,mapdata,sectionlist,signallist,
     })
     .then(function(data){
       //console.log(data);
-      return  sectionlist.loadpromise(mapdata.sectionList,sectiondata.section,scene,assetloader);
+      return  sectionlist.loadpromise(mapdata.sectionList,sectiondata.section,rails,scene,assetloader);
     })
     .then(function(data){
       //console.log(data);
@@ -99,14 +99,14 @@ export function DriverLoadNew(data,scope,netdata,mapdata,sectionlist,signallist,
       //console.log(assetloader);
       return  trainlisttest.drivertrain(mapdata.trainList,sceneload,assetloader,mixers,actions,"01");
     })
-    .then(function(data){
-      return new Promise(function(resolve, reject){
-        let stopoffset = 64;
-        rails.init(sectiondata.section,sectiondata,switchdata,sceneload);
-        resolve("loadrail");
-
-      });
-    })
+    // .then(function(data){
+    //   return new Promise(function(resolve, reject){
+    //     let stopoffset = 64;
+    //     rails.init(sectiondata.section,sectiondata,switchdata,sceneload);
+    //     resolve("loadrail");
+    //
+    //   });
+    // })
     .then(function(data){
       return new Promise(function(resolve, reject){
 
diff --git a/src/jlmap3d/main/loaders/SimulationLoadNew.js b/src/jlmap3d/main/loaders/SimulationLoadNew.js
index 73cb97664..46f5b5f55 100644
--- a/src/jlmap3d/main/loaders/SimulationLoadNew.js
+++ b/src/jlmap3d/main/loaders/SimulationLoadNew.js
@@ -83,7 +83,7 @@ export function SimulationLoadNew(data,scope,netdata,mapdata,camera,controls,sce
     })
     .then(function(data){
       //console.log(data);
-      return  sectionlist.loadpromise(mapdata.sectionList,sectiondata.section,scene,assetloader);
+      return  sectionlist.loadpromise(mapdata.sectionList,sectiondata.section,rails,scene,assetloader);
     })
     .then(function(data){
       //console.log(data);
@@ -97,14 +97,13 @@ export function SimulationLoadNew(data,scope,netdata,mapdata,camera,controls,sce
       //console.log(assetloader);
       return  trainlisttest.initpromise(mapdata.trainList,sceneload,assetloader,mixers,actions,"02");
     })
-    .then(function(data){
-      return new Promise(function(resolve, reject){
-        let stopoffset = 64;
-        rails.init(sectiondata.section,sectiondata,switchdata,sceneload);
-        resolve("loadrail");
-
-      });
-    })
+    // .then(function(data){
+    //   return new Promise(function(resolve, reject){
+    //     rails.init(sectiondata.section,sectiondata,switchdata,sceneload);
+    //     resolve("loadrail");
+    //
+    //   });
+    // })
     .then(function(data){
       return new Promise(function(resolve, reject){
 
diff --git a/src/jlmap3d/main/newmodel/RailListN.js b/src/jlmap3d/main/newmodel/RailListN.js
index 4233800df..abe2e1a3a 100644
--- a/src/jlmap3d/main/newmodel/RailListN.js
+++ b/src/jlmap3d/main/newmodel/RailListN.js
@@ -180,7 +180,7 @@ export function RailListN(){
         scope.sectionrail[section[i].code].standTrack = false;
       }
 
-      // 
+      //
       // for(let n=0,nm=scope.sectionrail[section[i].code].lineleft.points.length;n<nm;n++){
       //   var geometry = new THREE.CircleGeometry( 0.05, 16 );
       //   var material = new THREE.MeshBasicMaterial( { color: 0xffff00 } );
@@ -216,5 +216,60 @@ export function RailListN(){
     }
 
   }
+  this.setrails = function(sectioncode,points,standtrack,lengthfact,scene){
+    scope.sectionrail[sectioncode] = {
+      lengthfact:lengthfact,
+      lineleft:null,
+      lineright:null,
+      standTrack:standtrack,
+    };
+    let leftpoints = [];
+    let rightpoints = [];
+    for(let i=0;i<points.length;i++){
+      leftpoints.push(points[i]);
+      rightpoints.push(points[points.length-i-1]);
+    }
 
+    scope.sectionrail[sectioncode].lineleft = new THREE.CatmullRomCurve3(leftpoints);
+    scope.sectionrail[sectioncode].lineleft.curveType = "centripetal";
+    scope.sectionrail[sectioncode].lineleft.name = sectioncode;
+
+    scope.sectionrail[sectioncode].lineright = new THREE.CatmullRomCurve3(rightpoints);
+    scope.sectionrail[sectioncode].lineright.curveType = "centripetal";
+    scope.sectionrail[sectioncode].lineright.name = sectioncode;
+
+    // //
+    // for(let n=0,nm=scope.sectionrail[sectioncode].lineleft.points.length;n<nm;n++){
+    //   var geometry = new THREE.CircleGeometry( 0.05, 16 );
+    //   var material = new THREE.MeshBasicMaterial( { color: 0xffff00 } );
+    //   var circle = new THREE.Mesh( geometry, material );
+    //   // console.log(n);
+    //   // console.log(scope.sectionrail[section[i].code].lineleft.points[n]);
+    //   circle.position.x = scope.sectionrail[sectioncode].lineleft.points[n].x;
+    //   circle.position.y = scope.sectionrail[sectioncode].lineleft.points[n].y;
+    //   circle.position.z = scope.sectionrail[sectioncode].lineleft.points[n].z;
+    //   circle.rotation.x = -Math.PI/2;
+    //   scene.add( circle );
+    // }
+    // // scope.sectionrail[section[i].code].lineright.tension = 0.11;
+    // var points = scope.sectionrail[sectioncode].lineleft.getPoints( 50 );
+    // var geometry = new THREE.BufferGeometry().setFromPoints( points );
+    // var material;
+    // if(scope.sectionrail[sectioncode].type == "a"){
+    //   material = new THREE.LineBasicMaterial( { color : 0xff0000 } );
+    // }
+    // if(scope.sectionrail[sectioncode].type == "b"){
+    //   material = new THREE.LineBasicMaterial( { color : 0x00ff00 } );
+    // }
+    // if(scope.sectionrail[sectioncode].type == "c"){
+    //   material = new THREE.LineBasicMaterial( { color : 0x0000ff } );
+    // }
+    //
+    //
+    // // Create the final object to add to the scene
+    // var curveObject = new THREE.Line( geometry, material );
+    //
+    // curveObject.position.y = Math.random();
+    // scene.add(curveObject);
+  }
 }
diff --git a/src/jlmap3d/main/newmodel/SectionListN.js b/src/jlmap3d/main/newmodel/SectionListN.js
index bf319df8f..7bd2f8c4f 100644
--- a/src/jlmap3d/main/newmodel/SectionListN.js
+++ b/src/jlmap3d/main/newmodel/SectionListN.js
@@ -17,32 +17,32 @@ export function SectionListN() {
   this.stopsection = [];
   this.standtrack = [];
   var autorail;
-this.loadpromise = function(sectionList,sectiondata,scene,assetloader){
+this.loadpromise = function(sectionList,sectiondata,rails,scene,assetloader){
   // console.log(sectiondata);
   var texture = new THREE.TextureLoader().load( '../../static/test/z0251.png' );
 			texture.wrapS = texture.wrapT = THREE.RepeatWrapping;
 			texture.repeat.set( 1,1);
 
-	var selectmaterial = new THREE.MeshPhongMaterial( { map: texture,transparent:true } );
+	var selectmaterial = new THREE.MeshPhongMaterial( { map: texture,transparent:true,alphaTest:0.1 } );
 
-  for(let i=0;i<assetloader.modellist.length;i++){
-    if(assetloader.modellist[i].deviceType == "autorail"){
-      autorail = assetloader.modellist[i].mesh.children[0];
-    }
-  }
-  let count = autorail.geometry.attributes.position.count;
-  let rightlist = [];
-  let leftlist = [];
-  for(let i=0;i<count;i++){
-    if(autorail.geometry.attributes.position.array[i*3] >0.49){
-      rightlist.push(i);
-    }
-    if(autorail.geometry.attributes.position.array[i*3] <-0.49){
-      leftlist.push(i);
-    }
-  }
-  autorail.rightlist = rightlist;
-  autorail.leftlist = leftlist;
+  // for(let i=0;i<assetloader.modellist.length;i++){
+  //   if(assetloader.modellist[i].deviceType == "autorail"){
+  //     autorail = assetloader.modellist[i].mesh.children[0];
+  //   }
+  // }
+  // let count = autorail.geometry.attributes.position.count;
+  // let rightlist = [];
+  // let leftlist = [];
+  // for(let i=0;i<count;i++){
+  //   if(autorail.geometry.attributes.position.array[i*3] >0.49){
+  //     rightlist.push(i);
+  //   }
+  //   if(autorail.geometry.attributes.position.array[i*3] <-0.49){
+  //     leftlist.push(i);
+  //   }
+  // }
+  // autorail.rightlist = rightlist;
+  // autorail.leftlist = leftlist;
   scene.add(scope.sectiongroup);
   return new Promise(function(resolve, reject){
     // console.log(sectiondata);
@@ -53,11 +53,7 @@ this.loadpromise = function(sectionList,sectiondata,scene,assetloader){
         name:sectiondata[i].name,
         standTrack:sectiondata[i].standTrack,
         rail:sectiondata[i].rail,
-        rightlist:sectiondata[i].rightlist,
-        leftlist:sectiondata[i].leftlist,
-        rsection:sectiondata[i].rsection,
-        lsection:sectiondata[i].lsection,
-        csection:sectiondata[i].csection,
+        railpoint:sectiondata[i].railpoint,
         lengthFact:sectiondata[i].lengthFact,
 
         lconnect:null,
@@ -72,149 +68,136 @@ this.loadpromise = function(sectionList,sectiondata,scene,assetloader){
         mesh:null
       };
 
+      // newsection.railpoint.length>2
       let len = newsection.lengthFact;
-      let testmesh2 = autorail.clone(true);
-      for(let i=0;i<autorail.rightlist.length;i++){
-          testmesh2.geometry.attributes.position.array[autorail.rightlist[i]*3] = len;
-          testmesh2.geometry.attributes.uv.array[autorail.rightlist[i]*2] = testmesh2.geometry.attributes.position.array[0]-testmesh2.geometry.attributes.position.array[3];
-      }
-      let newrail = new THREE.BufferGeometry();
-      newrail.copy(testmesh2.geometry);
-      testmesh2.geometry = newrail;
-      testmesh2.geometry.attributes.position.needsUpdate = true;
-      testmesh2.geometry.attributes.uv.needsUpdate = true;
-      testmesh2.geometry.computeBoundingSphere();
-      testmesh2.geometry.center();
-      testmesh2.position.set(sectiondata[i].position.x,sectiondata[i].position.y,sectiondata[i].position.z);
-      testmesh2.rotation.set(sectiondata[i].rotation._x,sectiondata[i].rotation._y,sectiondata[i].rotation._z);
-      testmesh2.matrixAutoUpdate = false;
-      scope.sections.datalist[newsection.code] = newsection;
-      testmesh2.updateMatrix();
-      mergegeometry.merge(new THREE.Geometry().fromBufferGeometry(testmesh2.geometry),testmesh2.matrix);
-      testmesh2.geometry.dispose();
-      for(let j in testmesh2.material){
-        testmesh2.material[j].map.dispose();
-        testmesh2.material[j].dispose();
-      }
-      testmesh2 = null;
-      // if(newsection.rp.z != newsection.lp.z){
-      //   // console.log(newsection);
-      //   let height = Math.random()/1000;
-      //   var closedSpline = new THREE.CatmullRomCurve3( [
-			//     new THREE.Vector3(newsection.lp.x, height, newsection.lp.z),
-	    //     new THREE.Vector3(newsection.lp.x+2, height,newsection.lp.z),
-      //     new THREE.Vector3((newsection.lp.x+newsection.rp.x)/2, height,(newsection.lp.z+newsection.rp.z)/2),
-      //     new THREE.Vector3(newsection.rp.x-2, height,newsection.rp.z),
-      //     new THREE.Vector3(newsection.rp.x, height, newsection.rp.z)
-			// 	] );
-      //
-			// 	closedSpline.type = 'catmullrom';
-			// 	closedSpline.closed = false;
-			// 	// Set up settings for later extrusion
-			// 	var extrudeSettings = {
-			// 	    steps           : 12,
-			// 	    curveSegments   : 1,
-			// 	    bevelSegments   : 1,
-			// 	    bevelEnabled    : false,
-			// 	    extrudePath     : closedSpline,
-			// 	};
-			// 	var shape = new THREE.Shape();
-			// 	shape.moveTo( 0,-2 );
-			// 	shape.lineTo( 0, 2 );
-			// 	// Extrude the triangle along the CatmullRom curve
-			// 	var geometry = new THREE.ExtrudeBufferGeometry( shape, extrudeSettings );
-			// 	var material = new THREE.MeshLambertMaterial( { color: 0xb00000, wireframe: true } );
-			// 	// newnormal = new Float32Array(newnormal);
-			// 	// console.log(newnormal);
-			// 	// geometry.attributes.normal = new THREE.BufferAttribute(newnormal, 3);
-			// 	// geometry.attributes.needsUpdate = true;
-			// 	// Create mesh with the resulting geometry
-			// 	var mesh = new THREE.Mesh( geometry, selectmaterial );
-			// 	let count = mesh.geometry.attributes.position.count/3;
-      //
-			// 	for(let i=0;i<count;i++){
-			// 		let ui=i*6;
-			// 		if(i%2 != 0){
-			// 			mesh.geometry.attributes.uv.array[ui] = 0;
-			// 			mesh.geometry.attributes.uv.array[ui+1] = 1;
-			// 			mesh.geometry.attributes.uv.array[ui+2] = len/10;
-			// 			mesh.geometry.attributes.uv.array[ui+3] = 1;
-			// 			mesh.geometry.attributes.uv.array[ui+4] = len/10;
-			// 			mesh.geometry.attributes.uv.array[ui+5] = 0;
-			// 		}else{
-			// 			mesh.geometry.attributes.uv.array[ui] = 0;
-			// 			mesh.geometry.attributes.uv.array[ui+1] = 0;
-			// 			mesh.geometry.attributes.uv.array[ui+2] = 0;
-			// 			mesh.geometry.attributes.uv.array[ui+3] = 1;
-			// 			mesh.geometry.attributes.uv.array[ui+4] = len/10;
-			// 			mesh.geometry.attributes.uv.array[ui+5] = 0;
-			// 		}
-			// 	}
-      //   mergegeometry.merge(new THREE.Geometry().fromBufferGeometry(mesh.geometry),mesh.matrix);
-      //   // mergegeometry.merge(new THREE.Geometry().fromBufferGeometry(mesh.geometry),mesh.matrix);
-      //   console.log(mesh);
-			// 	// scene.add(mesh);
-      // }else{
-      //   let height = Math.random()/1000;
-      //   var closedSpline = new THREE.CatmullRomCurve3( [
-			//     new THREE.Vector3(newsection.lp.x, height, newsection.lp.z),
-      //     new THREE.Vector3(newsection.rp.x, height, newsection.rp.z)
-			// 	] );
-      //
-			// 	closedSpline.type = 'catmullrom';
-			// 	closedSpline.closed = false;
-			// 	// Set up settings for later extrusion
-			// 	var extrudeSettings = {
-			// 	    steps           : 1,
-			// 	    curveSegments   : 1,
-			// 	    bevelSegments   : 1,
-			// 	    bevelEnabled    : false,
-			// 	    extrudePath     : closedSpline,
-			// 	};
-			// 	var shape = new THREE.Shape();
-			// 	shape.moveTo( -2,0 );
-			// 	shape.lineTo( 2,0 );
-			// 	// Extrude the triangle along the CatmullRom curve
-			// 	var geometry = new THREE.ExtrudeBufferGeometry( shape, extrudeSettings );
-			// 	var material = new THREE.MeshLambertMaterial( { color: 0xb00000, wireframe: true } );
-			// 	// newnormal = new Float32Array(newnormal);
-			// 	// console.log(newnormal);
-			// 	// geometry.attributes.normal = new THREE.BufferAttribute(newnormal, 3);
-			// 	// geometry.attributes.needsUpdate = true;
-			// 	// Create mesh with the resulting geometry
-			// 	var mesh = new THREE.Mesh( geometry, selectmaterial );
-			// 	let count = mesh.geometry.attributes.position.count/3;
-      //
-			// 	for(let i=0;i<count;i++){
-			// 		let ui=i*6;
-			// 		if(i%2 != 0){
-			// 			mesh.geometry.attributes.uv.array[ui] = 0;
-			// 			mesh.geometry.attributes.uv.array[ui+1] = 1;
-			// 			mesh.geometry.attributes.uv.array[ui+2] = len;
-			// 			mesh.geometry.attributes.uv.array[ui+3] = 1;
-			// 			mesh.geometry.attributes.uv.array[ui+4] = len;
-			// 			mesh.geometry.attributes.uv.array[ui+5] = 0;
-			// 		}else{
-			// 			mesh.geometry.attributes.uv.array[ui] = 0;
-			// 			mesh.geometry.attributes.uv.array[ui+1] = 0;
-			// 			mesh.geometry.attributes.uv.array[ui+2] = 0;
-			// 			mesh.geometry.attributes.uv.array[ui+3] = 1;
-			// 			mesh.geometry.attributes.uv.array[ui+4] = len;
-			// 			mesh.geometry.attributes.uv.array[ui+5] = 0;
-			// 		}
-			// 	}
-      //
-      //   mergegeometry.merge(new THREE.Geometry().fromBufferGeometry(mesh.geometry),mesh.matrix);
-      //   // console.log(mesh);
-			// 	// scene.add(mesh);
-      //
+      // let testmesh2 = autorail.clone(true);
+      // for(let i=0;i<autorail.rightlist.length;i++){
+      //     testmesh2.geometry.attributes.position.array[autorail.rightlist[i]*3] = len;
+      //     testmesh2.geometry.attributes.uv.array[autorail.rightlist[i]*2] = testmesh2.geometry.attributes.position.array[0]-testmesh2.geometry.attributes.position.array[3];
       // }
-    }
-    let mergemesh = new THREE.Mesh( mergegeometry, autorail.material );
-    // let mergemesh = new THREE.Mesh( mergegeometry, selectmaterial );
+      // let newrail = new THREE.BufferGeometry();
+      // newrail.copy(testmesh2.geometry);
+      // testmesh2.geometry = newrail;
+      // testmesh2.geometry.attributes.position.needsUpdate = true;
+      // testmesh2.geometry.attributes.uv.needsUpdate = true;
+      // testmesh2.geometry.computeBoundingSphere();
+      // testmesh2.geometry.center();
+      // testmesh2.position.set(sectiondata[i].position.x,sectiondata[i].position.y,sectiondata[i].position.z);
+      // testmesh2.rotation.set(sectiondata[i].rotation._x,sectiondata[i].rotation._y,sectiondata[i].rotation._z);
+      // testmesh2.matrixAutoUpdate = false;
+      // scope.sections.datalist[newsection.code] = newsection;
+      // testmesh2.updateMatrix();
+      // mergegeometry.merge(new THREE.Geometry().fromBufferGeometry(testmesh2.geometry),testmesh2.matrix);
+      // testmesh2.geometry.dispose();
+      // for(let j in testmesh2.material){
+      //   testmesh2.material[j].map.dispose();
+      //   testmesh2.material[j].dispose();
+      // }
+      // testmesh2 = null;
+      if(newsection.railpoint.length>2){
+        // console.log(newsection);
+        let height = Math.random()/1000;
+        var closedSpline = new THREE.CatmullRomCurve3( [
+          new THREE.Vector3(newsection.railpoint[0].x,height,newsection.railpoint[0].z),
+          new THREE.Vector3(newsection.railpoint[1].x,height,newsection.railpoint[1].z),
+          new THREE.Vector3(newsection.railpoint[2].x,height,newsection.railpoint[2].z)
+				] );
 
+				closedSpline.type = 'catmullrom';
+				closedSpline.closed = false;
+				var extrudeSettings = {
+				    steps           : 5,
+				    curveSegments   : 1,
+				    bevelSegments   : 1,
+				    bevelEnabled    : false,
+				    extrudePath     : closedSpline,
+				};
+				var shape = new THREE.Shape();
+				shape.moveTo( 0,-2 );
+				shape.lineTo( 0, 2 );
+				var geometry = new THREE.ExtrudeBufferGeometry( shape, extrudeSettings );
+				var mesh = new THREE.Mesh( geometry, selectmaterial );
+				let count = mesh.geometry.attributes.position.count/3;
+
+				for(let i=0;i<count;i++){
+					let ui=i*6;
+					if(i%2 != 0){
+						mesh.geometry.attributes.uv.array[ui] = 0;
+						mesh.geometry.attributes.uv.array[ui+1] = 1;
+						mesh.geometry.attributes.uv.array[ui+2] = len/5;
+						mesh.geometry.attributes.uv.array[ui+3] = 1;
+						mesh.geometry.attributes.uv.array[ui+4] = len/5;
+						mesh.geometry.attributes.uv.array[ui+5] = 0;
+					}else{
+						mesh.geometry.attributes.uv.array[ui] = 0;
+						mesh.geometry.attributes.uv.array[ui+1] = 0;
+						mesh.geometry.attributes.uv.array[ui+2] = 0;
+						mesh.geometry.attributes.uv.array[ui+3] = 1;
+						mesh.geometry.attributes.uv.array[ui+4] = len/5;
+						mesh.geometry.attributes.uv.array[ui+5] = 0;
+					}
+				}
+        mergegeometry.merge(new THREE.Geometry().fromBufferGeometry(mesh.geometry),mesh.matrix);
+        mesh.geometry.dispose();
+        mesh.material.map.dispose();
+        mesh.material.dispose();
+        rails.setrails(sectiondata[i].code,closedSpline.points,sectiondata[i].standTrack,len,scene);
+      }else{
+        let height = Math.random()/1000;
+        var closedSpline = new THREE.CatmullRomCurve3( [
+          new THREE.Vector3(newsection.railpoint[0].x,height,newsection.railpoint[0].z),
+          new THREE.Vector3(newsection.railpoint[1].x,height,newsection.railpoint[1].z),
+				] );
+
+				closedSpline.type = 'catmullrom';
+				closedSpline.closed = false;
+				// Set up settings for later extrusion
+				var extrudeSettings = {
+				    steps           : 1,
+				    curveSegments   : 1,
+				    bevelSegments   : 1,
+				    bevelEnabled    : false,
+				    extrudePath     : closedSpline,
+				};
+				var shape = new THREE.Shape();
+				shape.moveTo( -2,0 );
+				shape.lineTo( 2,0 );
+				// Extrude the triangle along the CatmullRom curve
+				var geometry = new THREE.ExtrudeBufferGeometry( shape, extrudeSettings );
+				var mesh = new THREE.Mesh( geometry, selectmaterial );
+				let count = mesh.geometry.attributes.position.count/3;
+
+				for(let i=0;i<count;i++){
+					let ui=i*6;
+					if(i%2 != 0){
+						mesh.geometry.attributes.uv.array[ui] = 0;
+						mesh.geometry.attributes.uv.array[ui+1] = 1;
+						mesh.geometry.attributes.uv.array[ui+2] = len;
+						mesh.geometry.attributes.uv.array[ui+3] = 1;
+						mesh.geometry.attributes.uv.array[ui+4] = len;
+						mesh.geometry.attributes.uv.array[ui+5] = 0;
+					}else{
+						mesh.geometry.attributes.uv.array[ui] = 0;
+						mesh.geometry.attributes.uv.array[ui+1] = 0;
+						mesh.geometry.attributes.uv.array[ui+2] = 0;
+						mesh.geometry.attributes.uv.array[ui+3] = 1;
+						mesh.geometry.attributes.uv.array[ui+4] = len;
+						mesh.geometry.attributes.uv.array[ui+5] = 0;
+					}
+				}
+        mergegeometry.merge(new THREE.Geometry().fromBufferGeometry(mesh.geometry),mesh.matrix);
+        mesh.geometry.dispose();
+        mesh.material.map.dispose();
+        mesh.material.dispose();
+
+        rails.setrails(sectiondata[i].code,closedSpline.points,sectiondata[i].standTrack,len,scene);
+      }
+    }
+    // let mergemesh = new THREE.Mesh( mergegeometry, autorail.material );
+    let mergemesh = new THREE.Mesh( mergegeometry, selectmaterial );
     mergemesh.matrixAutoUpdate = false;
     scope.sectiongroup.add(mergemesh);
+
     resolve("loadersection");
   });
 
diff --git a/src/jlmap3d/main/newmodel/SwitchListN.js b/src/jlmap3d/main/newmodel/SwitchListN.js
index bb93ce3ac..f387087ae 100644
--- a/src/jlmap3d/main/newmodel/SwitchListN.js
+++ b/src/jlmap3d/main/newmodel/SwitchListN.js
@@ -35,7 +35,6 @@ export function SwitchListN() {
           directtype:null,
           locateType:0
         };
-
         let autoswitch = assetloader.modellist[num].mesh.clone(true);
         autoswitch.code = switchdata[i].code;
         for(let j=0;j<autoswitch.children.length;j++){
diff --git a/src/jmapNew/config/defaultStyle.js b/src/jmapNew/config/defaultStyle.js
index 5902818d9..307342c71 100644
--- a/src/jmapNew/config/defaultStyle.js
+++ b/src/jmapNew/config/defaultStyle.js
@@ -134,5 +134,6 @@ export const drawSectionStyle = {
     continueProtectSection: 'rgba(255,0,255,0.5)',
     signalNearSectionCBTC: 'rgba(255, 0, 0, 0.5)',
     signalNearSectionReserve: 'rgba(160, 32, 240, 0.5)',
-    signalNearSection: 'rgba(124, 252, 0, 0.5)'
+    signalNearSection: 'rgba(124, 252, 0, 0.5)',
+    routingSection: 'rgba(255, 20, 147, 0.9)'
 };
diff --git a/src/jmapNew/config/deviceStyle.js b/src/jmapNew/config/deviceStyle.js
index 8b1d88135..17e03ec16 100644
--- a/src/jmapNew/config/deviceStyle.js
+++ b/src/jmapNew/config/deviceStyle.js
@@ -6,7 +6,8 @@ const mapDeviceStyle = {
     '06': 'ningbo_01',
     '07': 'haerbin_01',
     '08': 'foshan_01',
-    '09': 'xian_02'
+    '09': 'xian_02',
+    '10': 'xian_01'
 };
 
 export function selectLineCode(code) {
diff --git a/src/jmapNew/config/skinCode/bejing_01.js b/src/jmapNew/config/skinCode/bejing_01.js
index 4e06547e8..663af9e08 100644
--- a/src/jmapNew/config/skinCode/bejing_01.js
+++ b/src/jmapNew/config/skinCode/bejing_01.js
@@ -266,6 +266,7 @@ class SkinCode extends defaultStyle {
             },
             standEmergent: { 										// 紧急关闭
                 mergentR: 4, 										// 站台紧急关闭半径
+                mergentN: 4, 										// 站台紧急关闭边数
                 insideOffset: { x: 0, y: -40 }, 					// 内站台紧急关闭偏移量
                 outsideOffset: { x: 0, y: 20 }, 					// 外站台紧急关闭偏移量
                 closeColor: '#F61107' 								// 站台紧急关闭颜色
diff --git a/src/jmapNew/config/skinCode/chengdu_01.js b/src/jmapNew/config/skinCode/chengdu_01.js
index 1cf3c7a85..9505ece98 100644
--- a/src/jmapNew/config/skinCode/chengdu_01.js
+++ b/src/jmapNew/config/skinCode/chengdu_01.js
@@ -214,6 +214,7 @@ class SkinCode extends defaultStyle {
             },
             standEmergent: { 								// 紧急关闭
                 mergentR: 4, 								// 站台紧急关闭半径
+                mergentN: 4, 								// 站台紧急关闭边数
                 insideOffset: { x: 0, y: 25 }, 				// 内站台紧急关闭偏移量
                 outsideOffset: { x: 0, y: -25}, 			// 外站台紧急关闭偏移量
                 closeColor: 'red' 							// 站台紧急关闭颜色
diff --git a/src/jmapNew/config/skinCode/chengdu_03.js b/src/jmapNew/config/skinCode/chengdu_03.js
index 777f059a0..753f745bf 100644
--- a/src/jmapNew/config/skinCode/chengdu_03.js
+++ b/src/jmapNew/config/skinCode/chengdu_03.js
@@ -220,6 +220,7 @@ class SkinCode extends defaultStyle {
             standEmergent: { 								// 紧急关闭
                 flicker: true, // 闪烁
                 mergentR: 5, 								// 站台紧急关闭半径
+                mergentN: 4, 								// 站台紧急关闭边数
                 insideOffset: { x: 0, y: 30 }, 				// 内站台紧急关闭偏移量
                 outsideOffset: { x: 0, y: -30}, 			// 外站台紧急关闭偏移量
                 closeColor: '#F61107' 						// 站台紧急关闭颜色
diff --git a/src/jmapNew/config/skinCode/foshan_01.js b/src/jmapNew/config/skinCode/foshan_01.js
index da21c50c2..94cf12772 100644
--- a/src/jmapNew/config/skinCode/foshan_01.js
+++ b/src/jmapNew/config/skinCode/foshan_01.js
@@ -80,7 +80,7 @@ class SkinCode extends defaultStyle {
                 beyondWidth: 0, 								// 区段宽超出宽度
                 invadeColor: '#EF0C08', 						// 区段侵入颜色
                 spareColor: '#3F3F3F', 							// 区段空闲颜色
-                communicationOccupiedColor: '#FF329A', 			// 区段通信车占用颜色
+                communicationOccupiedColor: '#FE0000', 			// 区段通信车占用颜色
                 unCommunicationOccupiedColor: '#FE0000', 		// 区段非通讯车占用颜色
                 routeLockColor: '#FFFFFF',						// 区段路由锁定颜色
                 faultLockColor: '#00FF00', 						// 区段故障锁闭颜色
@@ -128,8 +128,8 @@ class SkinCode extends defaultStyle {
             },
             text: {
                 show: true,										// 信号机名称显示
-                distance: 0,									// 文字和灯杆的距离
-                isAlignCenter: true,							// 信号字体对其方式
+                distance: 3,									// 文字和灯杆的距离
+                isAlignCenter: false,							// 信号字体对其方式
                 fontSize: 11,									// 信号机名称字体大小
                 fontWeight: 'bold',								// 信号机名称字体粗细
                 defaultColor: '#FFFFFF',						// 信号灯字体默认色
@@ -209,6 +209,7 @@ class SkinCode extends defaultStyle {
             },
             standEmergent: { 									// 紧急关闭
                 mergentR: 4, 									// 站台紧急关闭半径
+                mergentN: 4, 									// 站台紧急关闭边数
                 insideOffset: { x: 0, y: 25}, 					// 内站台紧急关闭偏移量
                 outsideOffset: { x: 0, y: 15}, 				// 外站台紧急关闭偏移量
                 closeColor: '#F61107' 							// 站台紧急关闭颜色
diff --git a/src/jmapNew/config/skinCode/fuzhou_01.js b/src/jmapNew/config/skinCode/fuzhou_01.js
index 1e943d647..a123cedc9 100644
--- a/src/jmapNew/config/skinCode/fuzhou_01.js
+++ b/src/jmapNew/config/skinCode/fuzhou_01.js
@@ -128,8 +128,8 @@ class SkinCode extends defaultStyle {
             },
             text: {
                 show: true,										// 信号机名称显示
-                distance: 0,									// 文字和灯杆的距离
-                isAlignCenter: true,							// 信号字体对其方式
+                distance: 3,									// 文字和灯杆的距离
+                isAlignCenter: false,							// 信号字体对其方式
                 fontSize: 11,									// 信号机名称字体大小
                 fontWeight: 'bold',								// 信号机名称字体粗细
                 defaultColor: '#FFFFFF',						// 信号灯字体默认色
@@ -206,6 +206,7 @@ class SkinCode extends defaultStyle {
             },
             standEmergent: { 									// 紧急关闭
                 mergentR: 4, 									// 站台紧急关闭半径
+                mergentN: 4, 									// 站台紧急关闭边数
                 insideOffset: { x: 0, y: 25 }, 				// 内站台紧急关闭偏移量
                 outsideOffset: { x: 0, y: -25 }, 			// 外站台紧急关闭偏移量
                 closeColor: '#F61107' 							// 站台紧急关闭颜色
diff --git a/src/jmapNew/config/skinCode/haerbin_01.js b/src/jmapNew/config/skinCode/haerbin_01.js
index 4ea5a9be1..fd1ab0029 100644
--- a/src/jmapNew/config/skinCode/haerbin_01.js
+++ b/src/jmapNew/config/skinCode/haerbin_01.js
@@ -214,6 +214,7 @@ class SkinCode extends defaultStyle {
             },
             standEmergent: { 									// 紧急关闭
                 mergentR: 4, 									// 站台紧急关闭半径
+                mergentN: 4, 									// 站台紧急关闭边数
                 insideOffset: { x: -10, y: -20 }, 				// 内站台紧急关闭偏移量
                 outsideOffset: { x: -10, y: -10}, 				// 外站台紧急关闭偏移量
                 closeColor: '#F61107', 							// 站台紧急关闭颜色
diff --git a/src/jmapNew/config/skinCode/ningbo_01.js b/src/jmapNew/config/skinCode/ningbo_01.js
index 0cc29e9cd..71bdfc74f 100644
--- a/src/jmapNew/config/skinCode/ningbo_01.js
+++ b/src/jmapNew/config/skinCode/ningbo_01.js
@@ -318,6 +318,7 @@ class SkinCode extends defaultStyle {
             },
             standEmergent: { 								// 紧急关闭
                 mergentR: 4, 								// 站台紧急关闭半径
+                mergentN: 4, 								// 站台紧急关闭边数
                 insideOffset: { x: 0, y: 25 }, 				// 内站台紧急关闭偏移量
                 outsideOffset: { x: 0, y: -25 }, 			// 外站台紧急关闭偏移量
                 closeColor: 'red' 							// 站台紧急关闭颜色
diff --git a/src/jmapNew/config/skinCode/xian_01.js b/src/jmapNew/config/skinCode/xian_01.js
new file mode 100644
index 000000000..a5adad4c4
--- /dev/null
+++ b/src/jmapNew/config/skinCode/xian_01.js
@@ -0,0 +1,666 @@
+import defaultStyle from '../defaultStyle';
+import deviceType from '../../constant/deviceType';
+
+class SkinCode extends defaultStyle {
+    constructor() {
+        super();
+        this[deviceType.Section] = {
+            active: {
+                routeColor: false							// 进路触发颜色
+            },
+            text: {
+                show: true,									// 物理区段名称显示
+                position: 0, 								// 区段名称位置 1 上面 -1 下面 0 对称
+                distance: 18,								// 文字离区段距离
+                fontSize: 11, 								// 字体大小
+                fontWeight: 'normal',						// 字体粗细
+                fontColor: '#FFFFFF', 						// 字体颜色
+                textAlign: 'center', 						// 水平对齐方式
+                textPosition: 'inside', 					// 文字位置
+                textVerticalAlign: 'middle' 				// 文字垂直对齐方式
+            },
+            logicText: {
+                show: true, // 逻辑区段名称显示
+                position: 0, 								// 区段名称位置 1 上面 -1 下面 0 对称
+                distance: 6,								// 文字离区段距离
+                fontSize: 8, 								// 字体大小
+                fontWeight: 'normal',						// 字体粗细
+                fontColor: '#FFFFFF', 						// 字体颜色
+                textAlign: 'center', 						// 水平对齐方式
+                textPosition: 'inside', 					// 文字位置
+                textVerticalAlign: 'middle' 				// 文字垂直对齐方式
+            },
+            standText: {
+                show: true,									// 站台轨名称显示
+                position: 0, 								// 区段名称位置 1 上面 -1 下面 0 对称
+                distance: 30,								// 文字离区段距离
+                fontSize: 11, 								// 字体大小
+                fontWeight: 'normal',						// 字体粗细
+                fontColor: '#FFFFFF', 						// 字体颜色
+                textAlign: 'center', 						// 水平对齐方式
+                textPosition: 'inside', 					// 文字位置
+                textVerticalAlign: 'middle' 				// 文字垂直对齐方式
+            },
+            reentryText: {
+                show: true,									// 折返轨名称显示
+                position: 0, 								// 区段名称位置 1 上面 -1 下面 0 对称
+                distance: 30,								// 文字离区段距离
+                fontSize: 11, 								// 字体大小
+                fontWeight: 'normal',						// 字体粗细
+                fontColor: '#FFFFFF', 						// 字体颜色
+                textAlign: 'center', 						// 水平对齐方式
+                textPosition: 'inside', 					// 文字位置
+                textVerticalAlign: 'middle' 				// 文字垂直对齐方式
+            },
+            transferText: {
+                show: true,									// 转换轨名称显示
+                position: 0, 								// 区段名称位置 1 上面 -1 下面 0 对称
+                distance: 28,								// 文字离区段距离
+                fontSize: 11, 								// 字体大小
+                fontWeight: 'normal',						// 字体粗细
+                fontColor: '#FFFFFF', 						// 字体颜色
+                textAlign: 'center', 						// 水平对齐方式
+                textPosition: 'inside', 					// 文字位置
+                textVerticalAlign: 'middle' 				// 文字垂直对齐方式
+            },
+            destinationText: {
+                show: true,									// 目的码名称显示
+                opposite: true,								// 对称相反
+                position: 0, 								// 区段名称位置 1 上面 -1 下面 0 对称
+                distance: 10,								// 文字离区段距离
+                fontSize: 10, 								// 字体大小
+                fontWeight: 'bold',							// 字体粗细
+                fontColor: 'yellow', 						// 字体颜色
+                textAlign: 'center', 						// 水平对齐方式
+                textPosition: 'inside', 					// 文字位置
+                textVerticalAlign: 'middle' 				// 文字垂直对齐方式
+            },
+            line: {
+                width: 5, 										// 区段宽度
+                beyondWidth: 1, 								// 区段宽超出宽度
+                invadeColor: '#EF0C08', 						// 区段侵入颜色
+                spareColor: '#3F3F3F', 							// 区段空闲颜色
+                communicationOccupiedColor: '#FF329A', 			// 区段通信车占用颜色
+                unCommunicationOccupiedColor: '#FE0000', 		// 区段非通讯车占用颜色
+                routeLockColor: '#FFFFFF',						// 区段路由锁定颜色
+                faultLockColor: '#9B4A0A', 						// 区段故障锁定颜色
+                undefinedColor: '#0071C1', 						// 区段未定义颜色
+                protectionLockedColor: '#FEFF00', 				// 保护区段锁闭(未用)
+                blockColor: '#800080', 							// 区段封锁颜色
+                atcExcisionColor: '#A0522D', 					// 区段atc切除颜色
+                atsExcisionColor: '#A0522D', 					// 区段ats切除颜色
+                timeReleaseColor: '#3F3F3F', 					// 区段延时释放颜色
+                protectiveLockColor: '#FFFF00', 				// 区段保护锁闭
+                protectiveTimeReleaseColor: '#0071C1', 			// 区段保护延时解锁
+                logicalColor: '#FFFF00', 						// 逻辑区段颜色 (未用)
+                logicalTextColor: '#FFFFFF' 					// 逻辑区段名称颜色 (未用)
+            },
+            axle: {}, // 计轴
+            speedLimit: { 										// 限速元素
+                width: 1, 										// 限速线的宽短
+                distance: 5, 									// 限速线距离区段距离
+                lineColor: '#FFFF00', 							// 限速线颜色
+                nameShow: false 								// 名称显示
+            },
+            separator: {
+                z: 6,											// 分割符层级
+                width: 1.2, 									// 分隔符宽度
+                endWidth: 3.5, 									// 尽头分隔符宽度
+                endColor: '#3F3F3F', 							// 尽头分隔符颜色
+                color: '#3149C3', 								// 区段边界符颜色
+                halfHeight: 5									// 区段分隔符高度的一半
+            },
+            block: {
+                special: false // 区段特殊显示
+            },
+            trainPosition:{
+                display: false // 列车实时位置显示
+            }
+        };
+
+        this[deviceType.Signal] = {
+            distance: 10,									// 设备距离区段的距离
+            post: {
+                standardLength: 6, // 高柱长度
+                standardHeight: 6, // 灯柱高度
+                standardColor: '#3149C3',						// 灯珠颜色
+                standardWidth: 2								// 灯珠宽度
+            },
+            text: {
+                show: true,										// 信号机名称显示
+                distance: 3,									// 文字和灯杆的距离
+                isAlignCenter: false,							// 信号字体对其方式
+                fontSize: 11,									// 信号机名称字体大小
+                fontWeight: 'bold',								// 信号机名称字体粗细
+                defaultColor: '#FFFFFF',						// 信号灯字体默认色
+                blockColor: '#EF0C08',							// 信号灯字体锁定颜色
+                checkColor: '#00FF00',							// 信号字体
+                nameBorderShow: true							// 信号机名字边框显示
+            },
+            lamp: {
+                bgShow: false, // 是否被选中
+                guidName: 'defult',								// 默认引导类型
+                stopWidth: 2,									// 禁止线宽度
+                borderWidth: 1,									// 信号灯边框线宽度
+                borderColor: '#3149C3',							// 信号灯边框线颜色
+                radiusR: 6,										// 信号灯半径
+                blockColor: '#EF0C08',							// 信号灯锁闭
+                grayColor: '#7F7F7F',							// 信号灯灰色
+                redColor: '#FF0000',							// 信号灯红色
+                greenColor: '#00FF00',							// 信号灯绿色
+                yellowColor: '#FFFF00',							// 信号灯黄色
+                whiteColor: '#FFFFFF',							// 信号灯白色
+                blueColor: '#0070C0'							// 信号灯蓝色
+            },
+            route: {
+                direction: false,								// 自动进路方向
+                offset: { x: -4, y: 0 },						// 自动进路偏移量
+                routeColor: '#00FF00'							// 自动进路
+            },
+            auto: {
+                signalFrontTriangle: false,						// 信号灯前三角展示
+                direction: false,								// 自动通过方向
+                offset: { x: -4, y: 0},							// 自动通过偏移量
+                width: 5,										// 自动宽度
+                autoRoute: '#00FF00',							// 自动进路
+                autoTrigger: '#FFFF00',							// 自动触发
+                manualControl: '#FFFF00',						// 人工控制
+                outConflict: '#C00808'							// 出车冲突
+            },
+            delay: {
+                direction: true,								// 延时解锁方向
+                offset: { x: 15, y: -10},						// 延时解锁偏移量
+                fontSize: 11,									// 延迟解锁字体大小
+                fontColor: '#FF0000',							// 延迟解锁颜色
+                fontWeight: 'bold'								// 字体粗细
+            },
+            button: {
+                distance: 5,									// 信号灯按钮距离区段的距离
+                borderDashColor: '#FFFFFF',						// 信号灯按钮边线
+                buttonColor: 'darkgreen',						// 信号灯按钮颜色
+                buttonLightenColor: '#E4EF50'					// 信号灯按钮闪烁颜色
+            },
+            lowButton:{
+                display: false // 现地 信号机按钮
+            }
+        };
+
+        this[deviceType.StationStand] = {
+            common: { 											// 通用属性
+                textFontSize: 11, 								// 站台默认字体大小
+                functionButtonShow: '03'					// 功能灯按钮显示条件（01所有模式下显示 02 行调显示 03现地显示）
+            },
+            safetyDoor: { 										// 屏蔽门
+                height: 3, 										// 站台屏蔽门高度
+                width: 60,
+                distance: 8, 									// 站台和屏蔽门之间的距离
+                defaultColor: '#00FF00', 						// 屏蔽门默认颜色
+                splitDoorColor: '#F61107' 						// 屏蔽门切除颜色
+            },
+            stand: { 											// 站台
+                headFontSize: 11, 								// 站台首端字体大小
+                spareColor: '#606060', 							// 站台空闲颜色
+                stopColor: '#FEFE00', 							// 站台列车停站颜色
+                jumpStopColor: '#9A99FF', 						// 站台跳停颜色
+                designatedJumpStopColor: 'lightSkyBlue' 		// 站台指定列车跳停颜色
+            },
+            standEmergent: { 									// 紧急关闭
+                mergentR: 4, 									// 站台紧急关闭半径
+                mergentN: 4, 									// 站台紧急关闭边数
+                insideOffset: { x: 0, y: 25 }, 				// 内站台紧急关闭偏移量
+                outsideOffset: { x: 0, y: -25 }, 			// 外站台紧急关闭偏移量
+                closeColor: '#F61107' 							// 站台紧急关闭颜色
+            },
+            reentry: { 											// 站台折返策略
+                position: 0, 									// 折返方向
+                offset: {x: -16, y: 20}, 						// 折返偏移量
+                noHumanColor: '#0F16DA', 						// 站台无人折返
+                autoChangeEndsColor: '#0BF400' 					// 站台自动换端
+            },
+            detainCar: { 										// 扣车
+                text: 'H', 										// 扣车显示内容
+                position: 1, 									// 扣车方向
+                offset: {x: -8, y: -6}, 						// 扣车偏移量
+                trainColor: '#E4EF50', 							// 车站扣车颜色
+                centerTrainColor: '#FFFFFF', 					// 中心扣车颜色
+                andCenterTrainColor: '#F61107', 				// 车站+中心扣车颜色
+                detainTrainTextColor: '#E4EF50' 				// 车站扣除文字颜色
+            },
+            stopTime: { 										// 停站时间
+                position: 1, 									// 运行时间方向
+                offset: {x: -8, y: 26},		 					// 运行时间偏移量
+                textColor: '#FFFFFF' 							// 停站时间字体颜色
+            },
+            level: { 											// 运行等级
+                position: 1, 									// 运行等级方向
+                offset: {x: -8, y: 6}, 							// 运行等级偏移量
+                textColor: '#FFFFFF' 							// 停站等级字体颜色
+            },
+            trainStop: {}, 									// 停车标志
+            trainDepart: {}, 								// 停车计时
+            text: {
+                fontSize: 11,								// 字体大小
+                fontWeight: 'normal',						// 字体粗细
+                distance: 5 								// 灯跟文字距离
+            },
+            lamp: {
+                radiusR: 6,									// 控制灯大小
+                lampColor: '#5A5D5A' // 功能按钮颜色
+            }
+        };
+
+        this[deviceType.StationCounter] = {
+            text: {
+                distance: 2,							 		// 计数器名称和文字的距离
+                fontColor: '#FFFFFF',		 			 		// 计数器字体颜色
+                borderColor: '#E4EF50'	 				 		// 计数器边框颜色
+            }
+        };
+
+        this[deviceType.StationDelayUnlock] = {
+            text: {
+                distance: 3,									// 延迟解锁和设备之间的距离
+                fontColor: '#FFFFFF',							// 延时解锁字体颜色
+                borderColor: '#FFFFFF'							// 延迟解锁边框颜色
+            }
+        };
+        this[deviceType.AutoTurnBack] = {
+            // 是否显示
+            visibleConditions: '03',
+            text: {
+                fontSize: 11,								// 字体大小
+                fontWeight: 'normal',						// 字体粗细
+                distance: 5 								// 灯跟文字距离
+            },
+            subtitleText: {
+                fontSize: 11,								// 字体大小
+                fontWeight: 'normal',						// 字体粗细
+                distance: 17 // 等于副标题距离
+            },
+            lamp: {
+                lineDash: null, // 灯的包围框
+                borderShow: false, // 是否显示边框
+                stroke: '#FFFFFF', // 框的颜色
+                fill: 'rgba(0,0,0,0)', // 填充色
+                radiusR: 6,									// 控制灯大小
+                controlColor: '#b5b3b3',					// 控制灯颜色 (灰色)
+                lightUpColor: '#ffff00'						// 点亮灯颜色
+            },
+            OutFrame: {
+
+            }
+        };
+        /** 引导总锁 */
+        this[deviceType.GuideLock] = {
+            // 是否显示
+            displayCondition: '03', // 显示条件 prdType
+            text: {
+                fontSize: 11,								// 字体大小
+                fontWeight: 'normal',						// 字体粗细
+                distance: 5 								// 灯跟文字距离
+            },
+            lamp: {
+                fill: 'rgba(0,0,0,0)', // 填充色
+                radiusR: 6,									// 控制灯大小
+                controlColor: '#b5b3b3',					// 控制灯颜色 (灰色)
+                lightUpColor: '#FF0000'						// 点亮灯颜色
+            }
+        };
+        this[deviceType.Station] = {
+            // text: {
+            // 	show: true											// 公里标名称显示
+            // },
+            kmPostShow: true,										// 公里标显示
+            kilometerPosition: 'up',									// 公里标朝向
+            text: {
+                fontSize: 11,								// 字体大小
+                fontWeight: 'normal',						// 字体粗细
+                distance: 5 								// 灯跟文字距离
+            },
+            lamp: {
+                radiusR: 6,									// 控制灯大小
+                controlColor: '#FFFF00'						// 控制灯颜色
+            },
+            turnBack: { // 按图折返
+                lamp: 1, // 灯数量
+                lampSpace: 60 // 灯间距
+            },
+            StationControl:{
+                text: {
+                    distance: 2,									// 灯和文字之间的距离
+                    fontSize: 11,									// 字体大小
+                    fontFormat: 'consolas',							// 字体格式
+                    fontColor: '#ffffff',							// 字体颜色
+                    fontWeight: 'normal',							// 字体粗细
+                    textAlign: 'middle',							// 字体水平对齐
+                    textVerticalAlign: 'top',						// 字体垂直对齐
+                    centerControlText: '中控', // 中控文字内容
+                    substationControlText: '站控', // 站控文字内容
+                    emergencyControlText:'紧急站控', // 紧急站控文字内容
+                    interconnectedControlText:'连锁控' // 连锁控文字内容
+                    // stationCenterControlText: '站中控',          // 站中控文字内容
+                    // generalAlarmControlText: '总报警'            // 总报警文字内容
+                },
+                lamp: {
+                    count: 2,										// 控制模式灯个数
+                    offset: {x: 0, y: 0},							// 控制模式灯偏移量
+                    radiusR: 4,										// 控制模式灯的半径
+                    distance: 36,									// 控制模式之间灯之间的距离
+                    grayColor: '#7F7F7F',							// 控制模式灰色
+                    greenColor: '#00FF00',							// 控制模式绿色
+                    redColor: '#FF0000',							// 控制模式红色
+                    yellowColor: '#FFFF00',							// 控制模式黄色
+                    emergencyControlShow: false,					// 紧急站控显示
+                    centerControlShow: true,						// 中控显示
+                    substationControlShow: true,					// 站控按钮显示
+                    interconnectedControlShow: false,				// 联锁控显示
+                    centerControlButtonShow: false						// 中控显示
+                },
+                arrow: {
+                    show: true		 								// 控制模式箭头显隐
+                },
+                mouseOverStyle: {										// 鼠标悬浮样式
+                    fontSize: null,
+                    fontFormat: 'consolas',
+                    fontColor: '#000',
+                    fontWeight: 'normal',
+                    textAlign: 'middle',
+                    textVerticalAlign: 'top'
+                }
+            }
+        };
+
+        this[deviceType.Switch] = {
+            text: {
+                show: true,									// 道岔名称显示
+                position: 0, 								// 区段名称位置 1 上面 -1 下面 0 对称
+                offset: {x: 0, y: 8},						// 道岔名称与区段距离
+                fontSize: 11,								// 字体大小
+                fontColor: '#C0C0C0',						// 道岔名称颜色
+                fontWeight: 'bold',							// 字体粗细
+                borderColor: '#FE0000',						// 道岔边框颜色
+                lossColor: '#FFFFFF',						// 道岔失去颜色
+                locateColor: '#00FF00',						// 道岔定位颜色
+                inversionColor: '#9C9D09',					// 道岔反位颜色
+                monolockLocationColor: '#ea282c',			// 道岔单锁'定位'颜色
+                monolockInversionColor: '#ea282c',			// 道岔单锁'反位'颜色
+                block: true									// 封锁名称
+            },
+            sectionAction: {
+                flag: false,								// 道岔 关联区段显示
+                spareColor: '#5b5b5b'						// 区段显示颜色
+            },
+            core: {
+                length: 6									// 	道岔单边长度
+            },
+            jointImg: {										// 道岔 A B C D四元素属性配置
+                trapezoidLength: 8,							// 直角梯形元素默认长度
+                block: false,								// 联合图形封锁状态
+                flashingColors: '#D600D5',					// 联合图形封锁闪烁显示颜色
+                fork: false,								// 挤岔专用（如有挤岔操作 变为true）
+                forKColor: 'red'							// 挤岔颜色 配合挤岔专用
+            },
+            arcBlcok: {										// 圆形封锁图形
+                show: false,								// 显示
+                arcBorderColor: 'green',					// 默认边框颜色
+                locationColor: 'green',						// 定位封锁颜色
+                inversionColor: '#FFFF00'					// 反位封锁颜色
+            },
+            rectLock: {										// 矩形封锁框图形
+                rectWidth: 18, 								// 矩形框 宽高
+                rectBorderColor: '#fff',					// 矩形边框颜色
+                monolock: false, 							// 单锁显示
+                block: false								// 封锁显示
+            }
+        };
+
+        this[deviceType.Line] = {
+            lineColor: '#FFFFFF'								// 线条颜色
+        };
+
+        this[deviceType.LcControl] = {
+            text: {
+                fontSize: 10,										// 灯字体大小
+                fontWeight: 'normal',								// 字体粗细
+                distance: 5 										// 灯跟文字距离
+            },
+            lamp: {
+                radiusR: 6,											// 灯大小
+                controlColor: '#FFFF00'								// 灯颜色
+            },
+            mouseOverStyle: {
+                fontSize: 10,
+                fontFormat: 'consolas',
+                fontColor: '#FFF000',
+                fontWeight: 'normal',
+                textAlign: 'middle',
+                textVerticalAlign: 'top',
+                arcColor: '#00FFFF',
+                textColor: '#000000'
+            }
+        };
+        this[deviceType.SwitchFault] = {
+            displayCondition: '01', // 显示条件 （01所有模式下显示 02 行调显示 03现地显示）
+            text: {
+                fontSize: 11,								// 字体大小
+                fontWeight: 'normal',								// 字体粗细
+                distance: 5 								// 灯跟文字距离
+            },
+            lamp: {
+                radiusR: 6,									// 控制灯大小
+                controlColor: '#000000',					// 控制灯颜色
+                offColor: '#ff0000',
+                lineWidth: 2,
+                strokeColor: '#FFFFFF' // 控制灯描边样式
+            }
+        };
+        this[deviceType.ZcControl] = {
+            text: {
+                fontSize: 10,										// 字体大小
+                fontWeight: 'normal',								// 字体粗细
+                distance: 5 										// 灯跟文字距离
+            },
+            lamp: {
+                radiusR: 6,											// 灯大小
+                controlColor: '#00FF00'								// 灯颜色
+            },
+            mouseOverStyle: {
+                fontSize: 10,
+                fontFormat: 'consolas',
+                fontColor: '#FFF000',
+                fontWeight: 'normal',
+                textAlign: 'middle',
+                textVerticalAlign: 'top',
+                arcColor: '#00FFFF',
+                textColor: '#000000'
+            }
+        };
+
+        this[deviceType.LimitControl] = {
+            text: {
+                fontSize: 10,										// 字体大小
+                fontWeight: 'normal',								// 字体粗细
+                distance: 5 										// 灯跟文字距离
+            },
+            lamp: {
+                radiusR: 6,											// 灯大小
+                controlColor: '#ECE9D8'								// 灯颜色
+            },
+            mouseOverStyle: {
+                fontSize: 10,
+                fontFormat: 'consolas',
+                fontColor: '#FFF000',
+                fontWeight: 'normal',
+                textAlign: 'middle',
+                textVerticalAlign: 'top',
+                textColor: '#000000',
+                arcColor: '#00FFFF'
+            }
+        };
+        this[deviceType.AutomaticRoute] = {
+            // 是否显示
+            displayCondition: '03', // 显示条件 prdType
+            text: {
+                fontSize: 11,								// 字体大小
+                fontWeight: 'normal',						// 字体粗细
+                distance: 5 								// 灯跟文字距离
+            },
+            lamp: {
+                fill: 'rgba(0,0,0,0)', // 填充色
+                radiusR: 6,									// 控制灯大小
+                controlColor: '#b5b3b3'						// 控制灯颜色 (灰色)
+            }
+        };
+        this[deviceType.TrainWindow] = {
+            lineColor: '#4DD43F',								// 车次窗颜色
+            lineDash: null,										// 车次窗虚线间隔
+            lineWidth: 1,										// 车次窗线宽
+            trainWindowSmooth: 0								// 车次窗矩形圆滑程度
+        };
+        this[deviceType.SplitStation] = {
+            lineLength: 15,	// 箭头线长度
+            lineWidth: 2, // 线宽
+            height: 35, // 分隔整体高度
+            strokeColor: '#00FF00', // 线颜色
+            triangleFillColor: '#00FF00', // 三角填充颜色
+            textFill: '#FFFFFF', // 文字颜色
+            verticalDistance: 10, // 箭头三角垂直高度
+            horizontalDistance: 7// 箭头三角水平高度
+        };
+        this[deviceType.Train] = {
+            trainBody: {
+                trainBodyLineWidth: 0, // 车身line宽
+                changeTrainWidth: true, // 是否根据车身上车组号、服务号、车次号、目的地码显示情况改变列车长度
+                specialTrainType: [
+                    {
+                        type: '03',
+                        serviceNumber: 'MM',
+                        nameFormat: 'serviceNumber:groupNumber'
+                    },
+                    {
+                        type: '02',
+                        nameFormat: 'targetCode:groupNumber'
+                    }
+                ], // 特殊列车类型需设置显示格式
+                lrPadding: 1, // 两边间隔
+                upPadding: 1, // 上边距离
+                trainBodyFillColor: '#000000', // 列车车身填充颜色
+                trainNameFormat: 'targetCode:serviceNumber:tripNumber'// 列车显示格式
+            },
+            directionArrow: {
+            },
+            hsda: {
+                trainHSDATextFontSize: 8// 列车HDSA字号
+            },
+            trainNumber: {
+                targetCodePrefix: '000', // 目的地码前缀
+                defaultTargetCode: 'AAA', // 默认目的地码
+                trainTargetTextAlign: 'left', // 车次号文字显示位置
+                trainNumberOffset: { x: 1, y: 1}// 目的地码偏移量
+            },
+            trainServer: {
+                serviceNumberPrefix: '00', // 服务号(表号)前缀
+                defaultServiceNumber: 'BB', // 默认服务号（表号）
+                trainServerOffset: { x: 26, y: 1}// 列车服务号偏移
+            },
+            trainTarget: {
+                tripNumberPrefix: '0000', // 车次号前缀
+                defaultDirectionCode: 'D', // 默认车次号1
+                defaultTripNumber: 'CCC', // 默认车次号2
+                trainTargetOffset: { x: 42, y: 1}// 列车车次号偏移
+            },
+            trainTargetNumber: {
+                groupNumberPrefix: '000', // 车组号前缀
+                defaultGroupNumber: 'EEE', // 默认车组号
+                trainTargetNumberOffset: {x: -1, y: 1}// 车组号偏移量
+            },
+            trainHead: {
+                trainMoreLength: 1, // 列车车头比车身高出的长度,上下相比车体伸出去的边框
+                trainHeadTriangleFirst: { x: 0, y: 0}, // 列车车头三角坐标1偏移量
+                trainHeadTriangleSecond: { x: 4, y: 7.5}, // 列车车头三角坐标2偏移量
+                trainHeadTriangleThird: { x: 0, y: 15}, // 列车车头三角坐标3偏移量
+                trainHeadRectHeight: 15, // 列车车头矩形高度
+                trainConntWidth: 4, // 列车竖杠的宽度
+                trainHeadFillColor: '#EF0C08'// 列车车头矩形填充颜色
+            },
+            common: {
+                trainHeight: 17, // 列车高度
+                trainHeadDistance: 2, // 列车和车头之间的间距
+                trainWidth: 76, // 列车长度
+                trainTextFontSize: 15, // 列车字号
+                fontFamily: 'consolas', // 默认字体 族类
+                nameFontSize: 15, // 字体大小
+                haveTextHSDA: false, // 是否需创建textHSDA对象
+                haveArrowText: true, // 是否需创建arrowText对象
+                haveTrainBorder: false, // 是否需创建trainBorder对象
+                aspectRatio: 8 / 15, // 字体宽高比例（用以拼接text是计算位置）
+                textOffset: 1, // 字体偏移（用以控制字体据车头的距离）
+                trainWidthMoreText: 2, // 计算列车长度时--列车长比text多出尺寸
+                displayPosition: 'margin', // 非同通信车在物理区段（有逻辑区段）上显示的位置 margin:行驶方向边缘车次窗 center: 中间位置车次窗
+                trainTip:true // 鼠标悬停列车状态信息框是否显示
+            },
+            trainStatusStyle: {
+                destinationStatus: [
+                    {status: '01', showColor: '#FFFFFF'},
+                    {status: '02', showColor: '#00FF00'},
+                    {status: '03', showColor: '#3265FF'},
+                    {status: '04', showColor: '#9B4A09'},
+                    {status: '05', showColor: '#EF0C08'},
+                    {status: '06', showColor: '#FFFFFF'},
+                    {status: '07', showColor: '#FFFF00'}
+                ], // 目的地状态 01准点 02早点 03严重早点 04晚点 05严重晚点 06头码车 07ATP切除
+                destinationStatusSetText: 'trainServer', // 目的地状态设置的对应哪个text的颜色
+                directionType: [
+                    {
+                        type: 1,
+                        lineLShow: false,
+                        lineRShow: false,
+                        arrowLShow: false,
+                        arrowRShow: true
+                    },
+                    {
+                        type: 0,
+                        lineLShow: false,
+                        lineRShow: false,
+                        arrowLShow: true,
+                        arrowRShow: false
+                    }
+                ], // 运行方向状态类型对应车头显示状态  1从左往右 0从右往左
+                directionStopType: [
+                    {type: '01', lineLShow: false, lineRShow: false},
+                    {type: '02', lineLShow: false, lineRShow: true},
+                    {type: '03', lineLShow: true, lineRShow: false}
+                ], // 列车停止方向类型对应车头显示状态   01未知方向 02从左往右 上行 03从右往左 下行
+                driveModeStatus: [
+                    {
+                        status: 'AM',
+                        trainLColor: '#00FF00',
+                        trainRColor: '#00FF00'
+                    },
+                    {
+                        status: 'CM',
+                        trainLColor: '#FFFF00',
+                        trainRColor: '#FFFF00'
+                    },
+                    {
+                        status: 'RM',
+                        trainLColor: '#EA700D',
+                        trainRColor: '#EA700D'
+                    },
+                    {
+                        status: 'NRM',
+                        trainLColor: '#A0522D',
+                        trainRColor: '#A0522D'
+                    }
+                ], // 列车运行模式对应车头颜色 ATO自动驾驶模式AM  ATP监控下的人工驾驶模式CM 限制人工驾驶模式RM 非限制人工驾驶模式NRM
+                runControlStatus: [], // 设置运行控制状态类型 eg:{status: '01', hShow: false, sShow: false}
+                doorStatus: [], // 设置车门状态类型
+                communicationStatus: [], // 设置通信状态  eg:{status: '01', trainColor:'#725A64'}
+                alarmStatus: [], // 设置报警状态 eg:{status: '01', aShow: false}
+                serverNoType: []// 服务号状态类型 eg:{type: '01', showColor: '#FFFFFF'}
+            }
+        };
+    }
+}
+
+export default new SkinCode();
diff --git a/src/jmapNew/config/skinCode/xian_02.js b/src/jmapNew/config/skinCode/xian_02.js
index 77dcc1384..557291bed 100644
--- a/src/jmapNew/config/skinCode/xian_02.js
+++ b/src/jmapNew/config/skinCode/xian_02.js
@@ -11,8 +11,8 @@ class SkinCode extends defaultStyle {
             text: {
                 show: true,									// 物理区段名称显示
                 position: 0, 								// 区段名称位置 1 上面 -1 下面 0 对称
-                distance: 10,								// 文字离区段距离
-                fontSize: 12, 								// 字体大小
+                distance: 18,								// 文字离区段距离
+                fontSize: 11, 								// 字体大小
                 fontWeight: 'normal',						// 字体粗细
                 fontColor: 'lightgreen', 					// 字体颜色
                 textAlign: 'center', 						// 水平对齐方式
@@ -22,8 +22,8 @@ class SkinCode extends defaultStyle {
             logicText: {									// 逻辑区段名称
                 show: false,								// 逻辑区段名称显示
                 position: 0, 								// 区段名称位置 1 上面 -1 下面 0 对称
-                distance: 12,								// 文字离区段距离
-                fontSize: 11, 								// 字体大小
+                distance: 6,								// 文字离区段距离
+                fontSize: 8, 								// 字体大小
                 fontWeight: 'normal',						// 字体粗细
                 fontColor: '#FFFFFF', 						// 字体颜色
                 textAlign: 'center', 						// 水平对齐方式
@@ -33,7 +33,7 @@ class SkinCode extends defaultStyle {
             standText: {									// 站台
                 show: true,									// 站台轨名称显示
                 position: 0, 								// 区段名称位置 1 上面 -1 下面 0 对称
-                distance: 24,								// 文字离区段距离
+                distance: 30,								// 文字离区段距离
                 fontSize: 11, 								// 字体大小
                 fontWeight: 'normal',						// 字体粗细
                 fontColor: '#FFFFFF', 						// 字体颜色
@@ -44,7 +44,7 @@ class SkinCode extends defaultStyle {
             reentryText: { 									// 折返
                 show: true,									// 折返轨名称显示
                 position: 0, 								// 区段名称位置 1 上面 -1 下面 0 对称
-                distance: 36,								// 文字离区段距离
+                distance: 30,								// 文字离区段距离
                 fontSize: 11, 								// 字体大小
                 fontWeight: 'normal',						// 字体粗细
                 fontColor: '#FFFFFF', 						// 字体颜色
@@ -55,7 +55,7 @@ class SkinCode extends defaultStyle {
             transferText: { 								// 转换轨
                 show: true,									// 转换轨名称显示
                 position: 0, 								// 区段名称位置 1 上面 -1 下面 0 对称
-                distance: 36,								// 文字离区段距离
+                distance: 30,								// 文字离区段距离
                 fontSize: 11, 								// 字体大小
                 fontWeight: 'normal',						// 字体粗细
                 fontColor: '#FFFFFF', 						// 字体颜色
@@ -67,7 +67,7 @@ class SkinCode extends defaultStyle {
                 show: true,									// 目的码名称显示
                 opposite: true,								// 对称相反
                 position: 0, 								// 区段名称位置 1 上面 -1 下面 0 对称
-                distance: 12,								// 文字离区段距离
+                distance: 28,								// 文字离区段距离
                 fontSize: 11, 								// 字体大小
                 fontWeight: 'bold',							// 字体粗细
                 fontColor: 'yellow', 						// 字体颜色
@@ -134,12 +134,12 @@ class SkinCode extends defaultStyle {
         };
 
         this[deviceType.Signal] = {
-            distance: 3,									// 设备距离区段的距离
+            distance: 10,									// 设备距离区段的距离
             post: {
                 standardLength: 7, // 高柱长度
                 standardHeight: 6, // 灯柱高度
                 standardColor: '#fff',						// 灯柱颜色
-                standardWidth: 3,							// 灯柱宽度
+                standardWidth: 2,							// 灯柱宽度
                 autoRouteColor: '#008000',					// 自动进路开启灯柱颜色
                 shapeChange: true,							// 灯柱形状改变
                 terminalOptional: '#CC3399'					// 终端可选信号机灯柱颜色
@@ -245,21 +245,27 @@ class SkinCode extends defaultStyle {
                 doorOpenColor:'#007f00' // 车门开启状态颜色（西安二号线线路样式）
             },
             standEmergent: { 								// 紧急关闭
-                mergentR: 4, 								// 站台紧急关闭半径
-                insideOffset: { x: 0, y: 25 }, 				// 内站台紧急关闭偏移量
-                outsideOffset: { x: 0, y: -25}, 			// 外站台紧急关闭偏移量
-                closeColor: 'red' 							// 站台紧急关闭颜色
+                mergentR: 9, 								// 站台紧急关闭半径
+                mergentN: 8, 								// 站台紧急关闭边数（西安二号线特殊样式）
+                insideOffset: { x: 0, y: 40 }, 				// 内站台紧急关闭偏移量
+                outsideOffset: { x: 0, y: -40}, 			// 外站台紧急关闭偏移量
+                closeColor: 'red',							// 站台紧急关闭颜色
+                defaultColor:'#808080', // 西安二号线特殊样式（默认颜色）
+                special:true // 西安二号线特殊样式
             },
             reentry: {}, 									// 站台折返策略
             detainCar: { 									// 扣车
                 position: -1,								// 扣车标识在站台上显示方向
                 text: 'H', 									// 扣车显示内容
-                offset: {x: -8, y: 13}, 					// 扣车偏移量
+                offset: {x: 8, y: 0}, 					// 扣车偏移量
                 centerTrainColor: 'white', 					// 中心扣车颜色
                 andCenterTrainColor: 'red', 				// 车站+中心扣车颜色
                 detainTrainTextColor: '#E4EF50', 			// 车站扣除文字颜色
                 fontSize: 10,
-                fontWeight: 'normal'
+                fontWeight: 'normal',
+                circleWidth:14, // 西安二号线特殊样式 圆圈的宽度
+                defaultColor:'#808080', // 默认颜色
+                special:true // 西安二号线特殊样式
             },
             stopTime: { 									// 停站时间
                 position: 1, 								// 停站时间方向
@@ -397,7 +403,7 @@ class SkinCode extends defaultStyle {
             text: {
                 show: true,									// 道岔名称显示
                 position: 0, 								// 区段名称位置 1 上面 -1 下面 0 对称
-                offset: {x: 5, y: -10},						// 道岔名称与区段距离
+                offset: { x: -15, y: 9 },					// 道岔名称与区段距离
                 fontSize: 11,								// 字体大小
                 fontColor: '#C0C0C0',						// 道岔名称颜色
                 fontWeight: 'normal',						// 字体粗细
@@ -451,7 +457,7 @@ class SkinCode extends defaultStyle {
 
         this[deviceType.ZcControl] = {
             // 是否显示
-            visible:true,
+            visible:false,
             text: {
                 fontSize: 11,								// 字体大小
                 fontWeight: 'normal',								// 字体粗细
@@ -554,20 +560,12 @@ class SkinCode extends defaultStyle {
                 text: 'PSD',
                 defaultColor: '#FFF'
             },
-            mfa: {
-                text: 'MFA',
+            mf: {
+                text: 'MF',
                 defaultColor: '#FFF'
             },
-            mfb: {
-                text: 'MFB',
-                defaultColor: '#FFF'
-            },
-            pfa: {
-                text: 'PFA',
-                defaultColor: '#FFF'
-            },
-            pfb: {
-                text: 'PFB',
+            pf: {
+                text: 'PF',
                 defaultColor: '#FFF'
             }
         };
diff --git a/src/jmapNew/constant/deviceRender.js b/src/jmapNew/constant/deviceRender.js
index f3af7ac4e..eda9a8c90 100644
--- a/src/jmapNew/constant/deviceRender.js
+++ b/src/jmapNew/constant/deviceRender.js
@@ -235,4 +235,9 @@ deviceRender[deviceType.SplitStation] = {
     _type: deviceType.SplitStation,
     zlevel: 1
 };
+/** SwitchFault 道岔故障 */
+deviceRender[deviceType.SwitchFault] = {
+    _type: deviceType.SwitchFault,
+    zlevel: 1
+};
 export default deviceRender;
diff --git a/src/jmapNew/constant/deviceType.js b/src/jmapNew/constant/deviceType.js
index 5f21e6396..3e2551a7b 100644
--- a/src/jmapNew/constant/deviceType.js
+++ b/src/jmapNew/constant/deviceType.js
@@ -40,7 +40,8 @@ const deviceType = {
     ReturnModeGroup: 'ReturnModeGroup',
     ControlSwitch: 'ControlSwitch',
     Axle: 'Axle',
-    SplitStation:'SplitStation'
+    SplitStation:'SplitStation',
+    SwitchFault: 'SwitchFault'
 };
 
 export default deviceType;
diff --git a/src/jmapNew/map.js b/src/jmapNew/map.js
index 80cd14f6e..d2e7e103a 100644
--- a/src/jmapNew/map.js
+++ b/src/jmapNew/map.js
@@ -294,7 +294,7 @@ class Jlmap {
     }
     showStationHandlePsd(oDevice, stationCode) {
         const standDevice = this.mapDevice[oDevice.standCode];
-        if (standDevice.deviceStationCode === stationCode || !stationCode) {
+        if (standDevice && standDevice.deviceStationCode === stationCode || !stationCode) {
             this.$painter.updateSpecialShowStation(oDevice, true);
         } else {
             this.$painter.updateSpecialShowStation(oDevice, false);
diff --git a/src/jmapNew/shape/Psd/ESafeDoor.js b/src/jmapNew/shape/Psd/ESafeDoor.js
index a15161277..75cf7f1c0 100644
--- a/src/jmapNew/shape/Psd/ESafeDoor.js
+++ b/src/jmapNew/shape/Psd/ESafeDoor.js
@@ -56,12 +56,12 @@ class ESafeDoor extends Group {
                     z: model.z,
                     shape: {
                         x1:model.x - model.width / 2,
-                        y1:model.y + (1 + offesetY ) / 2 * (2 + (model.height - 2) / 2),
+                        y1:model.y + (1 + offesetY ) / 2 * (2 + (model.height)),
                         x2:model.x + model.width / 2,
-                        y2:model.y + (1 + offesetY ) / 2 * (2 + (model.height - 2) / 2)
+                        y2:model.y + (1 + offesetY ) / 2 * (2 + (model.height))
                     },
                     style: {
-                        lineWidth: (model.height - 2) / 2,
+                        lineWidth: (model.height),
                         lineDash:[(model.width) * 0.6 / 4, (model.width) * 0.4 / 3],
                         lineDashOffset:0,
                         stroke: style.StationStand.safetyDoor.defaultColor
@@ -72,12 +72,12 @@ class ESafeDoor extends Group {
                     z: model.z,
                     shape: {
                         x1:model.x - model.width / 2,
-                        y1:model.y + (1 - offesetY) / 2 * ((model.height - 2) / 2 + 2),
+                        y1:model.y + (1 - offesetY) / 2 * ((model.height) + 2),
                         x2:model.x + model.width / 2,
-                        y2:model.y + (1 - offesetY) / 2 * ((model.height - 2) / 2 + 2)
+                        y2:model.y + (1 - offesetY) / 2 * ((model.height) + 2)
                     },
                     style: {
-                        lineWidth: (model.height - 2) / 2,
+                        lineWidth: (model.height),
                         lineDash:[(model.width) * 0.45 / 3, (model.width) * 0.55 / 4],
                         lineDashOffset:(model.width) * 0.45 / 3,
                         stroke: style.StationStand.safetyDoor.defaultColor
diff --git a/src/jmapNew/shape/SaidLamp/EDeviceStatus.js b/src/jmapNew/shape/SaidLamp/EDeviceStatus.js
index 4ac3673d2..a2b4b162e 100644
--- a/src/jmapNew/shape/SaidLamp/EDeviceStatus.js
+++ b/src/jmapNew/shape/SaidLamp/EDeviceStatus.js
@@ -26,66 +26,110 @@ export default class EDeviceStatus extends Group {
                 textVerticalAlign: model.style.textStyle.textVerticalAlign
             }
         });
-        this.mfa = new Text({
-            zlevel: this.zlevel,
-            z: this.z,
-            style: {
-                x: model.x + model.style.FaultStatusGroup.distance,
-                y: model.y,
-                fontWeight: model.style.textStyle.fontWeight,
-                fontSize: model.style.FaultStatusGroup.fontSize,
-                fontFamily: model.style.fontFamily,
-                text: model.style.FaultStatusGroup.mfa.text,
-                textFill: model.style.FaultStatusGroup.mfa.defaultColor,
-                textAlign: model.style.textStyle.textAlign,
-                textVerticalAlign: model.style.textStyle.textVerticalAlign
-            }
+        this.mfList = [];
+        for (let i = 0; i < model.mfNum; i++) {
+            const mf = new Text({
+                zlevel: this.zlevel,
+                z: this.z,
+                style: {
+                    x: model.x + model.style.FaultStatusGroup.distance * (i + 1),
+                    y: model.y,
+                    fontWeight: model.style.textStyle.fontWeight,
+                    fontSize: model.style.FaultStatusGroup.fontSize,
+                    fontFamily: model.style.fontFamily,
+                    text: model.style.FaultStatusGroup.mf.text + String.fromCharCode((65 + i)),
+                    textFill: model.style.FaultStatusGroup.mf.defaultColor,
+                    textAlign: model.style.textStyle.textAlign,
+                    textVerticalAlign: model.style.textStyle.textVerticalAlign
+                }
+            });
+            this.mfList.push(mf);
+        }
+        this.pfList = [];
+        for (let i = 0; i < model.pfNum; i++) {
+            const pf = new Text({
+                zlevel: this.zlevel,
+                z: this.z,
+                style: {
+                    x: model.x + model.style.FaultStatusGroup.distance * (this.mfList.length + i + 1),
+                    y: model.y,
+                    fontWeight: model.style.textStyle.fontWeight,
+                    fontSize: model.style.FaultStatusGroup.fontSize,
+                    fontFamily: model.style.fontFamily,
+                    text: model.style.FaultStatusGroup.pf.text + String.fromCharCode((65 + i)),
+                    textFill: model.style.FaultStatusGroup.pf.defaultColor,
+                    textAlign: model.style.textStyle.textAlign,
+                    textVerticalAlign: model.style.textStyle.textVerticalAlign
+                }
+            });
+            this.pfList.push(pf);
+        }
+        this.mfList.forEach(item => {
+            this.add(item);
         });
-        this.mfb = new Text({
-            zlevel: this.zlevel,
-            z: this.z,
-            style: {
-                x: model.x + model.style.FaultStatusGroup.distance * 2,
-                y: model.y,
-                fontWeight: model.style.textStyle.fontWeight,
-                fontSize: model.style.FaultStatusGroup.fontSize,
-                fontFamily: model.style.fontFamily,
-                text: model.style.FaultStatusGroup.mfb.text,
-                textFill: model.style.FaultStatusGroup.mfb.defaultColor,
-                textAlign: model.style.textStyle.textAlign,
-                textVerticalAlign: model.style.textStyle.textVerticalAlign
-            }
-        });
-        this.pfa = new Text({
-            zlevel: this.zlevel,
-            z: this.z,
-            style: {
-                x: model.x + model.style.FaultStatusGroup.distance * 3,
-                y: model.y,
-                fontWeight: model.style.textStyle.fontWeight,
-                fontSize: model.style.FaultStatusGroup.fontSize,
-                fontFamily: model.style.fontFamily,
-                text: model.style.FaultStatusGroup.pfa.text,
-                textFill: model.style.FaultStatusGroup.pfa.defaultColor,
-                textAlign: model.style.textStyle.textAlign,
-                textVerticalAlign: model.style.textStyle.textVerticalAlign
-            }
-        });
-        this.pfb = new Text({
-            zlevel: this.zlevel,
-            z: this.z,
-            style: {
-                x: model.x + model.style.FaultStatusGroup.distance * 4,
-                y: model.y,
-                fontWeight: model.style.textStyle.fontWeight,
-                fontSize: model.style.FaultStatusGroup.fontSize,
-                fontFamily: model.style.fontFamily,
-                text: model.style.FaultStatusGroup.pfb.text,
-                textFill: model.style.FaultStatusGroup.pfb.defaultColor,
-                textAlign: model.style.textStyle.textAlign,
-                textVerticalAlign: model.style.textStyle.textVerticalAlign
-            }
+        this.pfList.forEach(item => {
+            this.add(item);
         });
+        // this.mfa = new Text({
+        //     zlevel: this.zlevel,
+        //     z: this.z,
+        //     style: {
+        //         x: model.x + model.style.FaultStatusGroup.distance,
+        //         y: model.y,
+        //         fontWeight: model.style.textStyle.fontWeight,
+        //         fontSize: model.style.FaultStatusGroup.fontSize,
+        //         fontFamily: model.style.fontFamily,
+        //         text: model.style.FaultStatusGroup.mfa.text,
+        //         textFill: model.style.FaultStatusGroup.mfa.defaultColor,
+        //         textAlign: model.style.textStyle.textAlign,
+        //         textVerticalAlign: model.style.textStyle.textVerticalAlign
+        //     }
+        // });
+        // this.mfb = new Text({
+        //     zlevel: this.zlevel,
+        //     z: this.z,
+        //     style: {
+        //         x: model.x + model.style.FaultStatusGroup.distance * 2,
+        //         y: model.y,
+        //         fontWeight: model.style.textStyle.fontWeight,
+        //         fontSize: model.style.FaultStatusGroup.fontSize,
+        //         fontFamily: model.style.fontFamily,
+        //         text: model.style.FaultStatusGroup.mfb.text,
+        //         textFill: model.style.FaultStatusGroup.mfb.defaultColor,
+        //         textAlign: model.style.textStyle.textAlign,
+        //         textVerticalAlign: model.style.textStyle.textVerticalAlign
+        //     }
+        // });
+        // this.pfa = new Text({
+        //     zlevel: this.zlevel,
+        //     z: this.z,
+        //     style: {
+        //         x: model.x + model.style.FaultStatusGroup.distance * 3,
+        //         y: model.y,
+        //         fontWeight: model.style.textStyle.fontWeight,
+        //         fontSize: model.style.FaultStatusGroup.fontSize,
+        //         fontFamily: model.style.fontFamily,
+        //         text: model.style.FaultStatusGroup.pfa.text,
+        //         textFill: model.style.FaultStatusGroup.pfa.defaultColor,
+        //         textAlign: model.style.textStyle.textAlign,
+        //         textVerticalAlign: model.style.textStyle.textVerticalAlign
+        //     }
+        // });
+        // this.pfb = new Text({
+        //     zlevel: this.zlevel,
+        //     z: this.z,
+        //     style: {
+        //         x: model.x + model.style.FaultStatusGroup.distance * 4,
+        //         y: model.y,
+        //         fontWeight: model.style.textStyle.fontWeight,
+        //         fontSize: model.style.FaultStatusGroup.fontSize,
+        //         fontFamily: model.style.fontFamily,
+        //         text: model.style.FaultStatusGroup.pfb.text,
+        //         textFill: model.style.FaultStatusGroup.pfb.defaultColor,
+        //         textAlign: model.style.textStyle.textAlign,
+        //         textVerticalAlign: model.style.textStyle.textVerticalAlign
+        //     }
+        // });
         this.add(this.psd);
         this.add(this.mfa);
         this.add(this.mfb);
diff --git a/src/jmapNew/shape/SaidLamp/index.js b/src/jmapNew/shape/SaidLamp/index.js
index d4b59b9d5..86b39fe52 100644
--- a/src/jmapNew/shape/SaidLamp/index.js
+++ b/src/jmapNew/shape/SaidLamp/index.js
@@ -21,21 +21,22 @@ export default class SaidLamp extends Group {
         this.model = model;
         this.style = style;
         this.deviceStyle = style[model._type];
-        if (!this.deviceStyle) { return; }
-        this.isShowShape = true;
-        if (isShowThePrdType(model.prdType, this.deviceStyle.displayCondition) || model.previewOrMapDraw) {
-            this.create();
-            this.createMouseEvent();
-            this.setState(model);
-        }
-        if (model.previewOrMapDraw) {
-            this.setShowMode();
+        if (this.deviceStyle) {
+            this.isShowShape = true;
+            if (isShowThePrdType(model.prdType, this.deviceStyle.displayCondition) || model.previewOrMapDraw) {
+                this.create();
+                this.createMouseEvent();
+                this.setState(model);
+            }
+            if (model.previewOrMapDraw) {
+                this.setShowMode();
+            }
         }
     }
 
     create() {
         const model = this.model;
-        const lampDevice = ['LeuControl', 'IntersiteControl', 'CenterCommunication', 'AtsControl', 'LocalControl', 'ChainControl', 'Maintain', 'PowerSupply', 'MaintenanceLamps', 'ZcCommunication'];
+        const lampDevice = ['LeuControl', 'IntersiteControl', 'CenterCommunication', 'AtsControl', 'LocalControl', 'ChainControl', 'Maintain', 'PowerSupply', 'MaintenanceLamps', 'ZcCommunication', 'SwitchFault'];
         if (lampDevice.includes(this._type)) {
             this.control = new EControl({
                 zlevel: this.zlevel,
@@ -47,8 +48,9 @@ export default class SaidLamp extends Group {
                         r: this.deviceStyle.lamp.radiusR
                     },
                     subType: 'Control',
-                    lineWidth: 0,
-                    fill: this.deviceStyle.lamp.controlColor
+                    lineWidth: this.deviceStyle.lamp.lineWidth || 0,
+                    fill: this.deviceStyle.lamp.controlColor,
+                    stroke: this.deviceStyle.lamp.strokeColor
                 },
                 text: {
                     position: [0, 0],
@@ -93,6 +95,8 @@ export default class SaidLamp extends Group {
                 z: this.z,
                 x: model.position.x,
                 y: model.position.y,
+                mfNum: model.mfNum,
+                pfNum: model.pfNum,
                 style: this.style
             });
             this.add(this.control);
@@ -129,8 +133,8 @@ export default class SaidLamp extends Group {
                 this.control = new EUnmanned({
                     zlevel: this.zlevel,
                     z: this.z,
-                    x: model.unmannedPosition.x,
-                    y: model.unmannedPosition.y,
+                    x: model.position.x,
+                    y: model.position.y,
                     _subType: 'Unmanned',
                     width: this.style.NoOneReturn.width,
                     fill: this.style.NoOneReturn.defaultColor
@@ -201,11 +205,13 @@ export default class SaidLamp extends Group {
     }
     setShowMode() {
         const showMode = this.model.showMode;
-        const showConditions = this.deviceStyle.displayCondition;
-        if (showConditions === '01' || showMode === showConditions) {
-            this.control && this.control.show();
-        } else {
-            this.control && this.control.hide();
+        if (this.deviceStyle) {
+            const showConditions = this.deviceStyle.displayCondition;
+            if (showConditions === '01' || showMode === showConditions) {
+                this.control && this.control.show();
+            } else {
+                this.control && this.control.hide();
+            }
         }
     }
     setShowStation(stationCode) {
diff --git a/src/jmapNew/shape/Section/EAxle.js b/src/jmapNew/shape/Section/EAxle.js
index d094e0c6b..9a4d03864 100644
--- a/src/jmapNew/shape/Section/EAxle.js
+++ b/src/jmapNew/shape/Section/EAxle.js
@@ -4,87 +4,81 @@
 import Path from 'zrender/src/graphic/Path';
 
 // 计轴
-export const EAxle = Path.extend({
+export default Path.extend({
     type: 'EAxle',
     _subType: '',
-    shape: {
-        // style: this.style,
-        // traingle: traingle11,
-        // drictx: 1,
-        // dricty:	1,
-        // point: this.model.points[0]
-    },
-    buildPath: function (ctx, model) {
-        if (model && model.style && model.traingle) {
-            const axleLength = 2 * model.style.Section.axle.radius;
-            const positionx = model.point.x + model.drictx * (model.traingle.getCos(axleLength) * 1.2);
-            const positiony = model.point.y + model.dricty * (model.traingle.getCos(axleLength) * 1.2);
+    buildPath: function (path, shape) {
+        if (shape && shape.style && shape.traingle) {
+            const axleLength = 2 * shape.style.Section.axle.radius;
+            // const positionx = shape.point.x + shape.drictx * (shape.traingle.getCos(axleLength) * 1.2);
+            // const positiony = shape.point.y + shape.dricty * (shape.traingle.getCos(axleLength) * 1.2);
+            const positionx = shape.point.x + shape.drictx * (shape.traingle.getCos(axleLength) * 1.05);
+            const positiony = shape.point.y + shape.dricty * (shape.traingle.getCos(axleLength) * 1.05);
             // 圆弧
-            const arcX = positionx - model.dricty * model.traingle.getSin(axleLength);
-            const arcY = positiony + model.drictx * model.traingle.getSin(axleLength);
-            const arcR = model.style.Section.axle.radius;
-            ctx.arc(arcX, arcY, arcR, 0, 2 * Math.PI, false);
-            ctx.closePath();
+            const arcX = positionx - shape.dricty * shape.traingle.getSin(axleLength);
+            const arcY = positiony + shape.drictx * shape.traingle.getSin(axleLength);
+            const arcR = shape.style.Section.axle.radius;
+            path.arc(arcX, arcY, arcR, 0, 2 * Math.PI, false);
+            path.closePath();
 
-            const x1 = positionx - model.traingle.getCos(axleLength * model.multiple1) - model.dricty * model.traingle.getSin(axleLength);
-            const y1 = positiony + model.drictx * model.traingle.getSin(axleLength * model.multiple1) - model.traingle.getSin(axleLength);
-            const x2 = positionx + model.traingle.getCos(axleLength * model.multiple2) - model.dricty * model.traingle.getSin(axleLength);
-            const y2 = positiony + model.drictx * model.traingle.getSin(axleLength * model.multiple2) + model.traingle.getSin(axleLength);
-            ctx.moveTo(x1, y1);
-            ctx.lineTo(x2, y2);
-            ctx.closePath();
+            const x1 = positionx - shape.traingle.getCos(axleLength * shape.multiple1) - shape.dricty * shape.traingle.getSin(axleLength);
+            const y1 = positiony + shape.drictx * shape.traingle.getSin(axleLength * shape.multiple1) - shape.traingle.getSin(axleLength);
+            const x2 = positionx + shape.traingle.getCos(axleLength * shape.multiple2) - shape.dricty * shape.traingle.getSin(axleLength);
+            const y2 = positiony + shape.drictx * shape.traingle.getSin(axleLength * shape.multiple2) + shape.traingle.getSin(axleLength);
+            path.moveTo(x1, y1);
+            path.lineTo(x2, y2);
+            path.closePath();
         }
     }
 });
 
 // export default class EAxle extends Group {
-// 	constructor(model) {
-// 		super();
-// 		this.model = model;
-// 		this.zlevel = model.zlevel;
-// 		this.z = 5;
-// 		this.create(model);
-// 	}
+//     constructor(model) {
+//         super();
+//         this.model = model;
+//         this.zlevel = model.zlevel;
+//         this.z = 5;
+//         this.create(model);
+//     }
 
-// 	create(model) {
-// 		if (model && model.style && model.traingle) {
-// 			const axleLength = 2 * model.style.Section.axle.radius;
-// 			const positionx = model.point.x + model.drictx * (model.traingle.getCos(axleLength));
-// 			const positiony = model.point.y + model.dricty * (model.traingle.getCos(axleLength));
+//     create(model) {
+//         if (model && model.style && model.traingle) {
+//             const axleLength = 2 * model.style.Section.axle.radius;
+//             const positionx = model.point.x + model.drictx * (model.traingle.getCos(axleLength) * 1.2);
+//             const positiony = model.point.y + model.dricty * (model.traingle.getCos(axleLength) * 1.2);
+//             this.line = new Line({
+//                 zlevel: this.zlevel,
+//                 z: this.z,
+//                 progressive: model.progressive,
+//                 shape: {
+//                     x1: positionx - model.traingle.getCos(axleLength) - model.dricty * model.traingle.getSin(axleLength),
+//                     y1: positiony + model.drictx * model.traingle.getSin(axleLength) - model.traingle.getSin(axleLength),
+//                     x2: positionx + model.traingle.getCos(axleLength) - model.dricty * model.traingle.getSin(axleLength),
+//                     y2: positiony + model.drictx * model.traingle.getSin(axleLength) + model.traingle.getSin(axleLength)
+//                 },
+//                 style: {
+//                     GBaseLineWidth: 2,
+//                     stroke: model.style.Section.axle.color
+//                 }
+//             });
+//             this.axle = new Circle({
+//                 zlevel: this.zlevel,
+//                 z: this.z,
+//                 progressive: model.progressive,
+//                 shape: {
+//                     cx: positionx - model.dricty * model.traingle.getSin(axleLength),
+//                     cy: positiony + model.drictx * model.traingle.getSin(axleLength),
+//                     r: model.style.Section.axle.radius
+//                 },
+//                 style: {
+//                     GBaseLineWidth: 1,
+//                     stroke: model.style.Section.axle.color,
+//                     fill: model.style.transparentColor
+//                 }
+//             });
 
-// 			this.line = new Line({
-// 				zlevel: this.zlevel,
-// 				z: this.z,
-// 				progressive: model.progressive,
-// 				shape: {
-// 					x1: positionx - model.traingle.getCos(axleLength) - model.dricty * model.traingle.getSin(axleLength),
-// 					y1: positiony + model.drictx * model.traingle.getSin(axleLength) - model.traingle.getSin(axleLength),
-// 					x2: positionx + model.traingle.getCos(axleLength) - model.dricty * model.traingle.getSin(axleLength),
-// 					y2: positiony + model.drictx * model.traingle.getSin(axleLength) + model.traingle.getSin(axleLength)
-// 				},
-// 				style: {
-// 					GBaseLineWidth: 1,
-// 					stroke: model.style.Section.axle.color
-// 				}
-// 			});
-// 			this.axle = new Circle({
-// 				zlevel: this.zlevel,
-// 				z: this.z,
-// 				progressive: model.progressive,
-// 				shape: {
-// 					cx: positionx - model.dricty * model.traingle.getSin(axleLength),
-// 					cy: positiony + model.drictx * model.traingle.getSin(axleLength),
-// 					r: model.style.Section.axle.radius
-// 				},
-// 				style: {
-// 					GBaseLineWidth: 1,
-// 					stroke: model.style.Section.axle.color,
-// 					fill: model.style.transparentColor
-// 				}
-// 			});
-
-// 			this.add(this.line);
-// 			this.add(this.axle);
-// 		}
-// 	}
+//             this.add(this.line);
+//             this.add(this.axle);
+//         }
+//     }
 // }
diff --git a/src/jmapNew/shape/Section/index.js b/src/jmapNew/shape/Section/index.js
index b55d1709a..adc308203 100644
--- a/src/jmapNew/shape/Section/index.js
+++ b/src/jmapNew/shape/Section/index.js
@@ -6,7 +6,7 @@ import ELines from './ELines'; // 创建多线条 曲线 (私有)
 import EblockLines from './EblockLines'; // 区段封锁特有
 import ESeparator from './ESeparator'; // 分隔符 (私有)
 import EMouse from './EMouse';
-import { EAxle } from './EAxle'; // 创建计轴
+import EAxle from './EAxle'; // 创建计轴
 import { EBackArrow, EBackArrowTriangle } from './EBackArrow'; // 折返进路箭头
 import ELimitName from './ELimitName'; // 成都三号线 限速名称
 import JTriangle from '../../utils/JTriangle';
@@ -60,6 +60,7 @@ export default class Section extends Group {
                         multiple2: 1.5
                     },
                     style: {
+                        lineWidth: 2,
                         fill: this.style.Section.axle.color,
                         stroke: this.style.Section.axle.color
                     }
@@ -79,6 +80,7 @@ export default class Section extends Group {
                         multiple2: 1
                     },
                     style: {
+                        lineWidth: 2,
                         fill: this.style.Section.axle.color,
                         stroke: this.style.Section.axle.color
                     }
diff --git a/src/jmapNew/shape/Signal/index.js b/src/jmapNew/shape/Signal/index.js
index 1a0d61d09..f0b5d3491 100644
--- a/src/jmapNew/shape/Signal/index.js
+++ b/src/jmapNew/shape/Signal/index.js
@@ -117,8 +117,8 @@ class Signal extends Group {
                     fill: style.Signal.insideTriangle.fillColor
                 }
             });
-            this.add(this.insideTriangle);
-            this.insideTriangle.hide();
+            // this.add(this.insideTriangle);
+            // this.insideTriangle.hide();
         }
         if (style.Signal.sigBack) {
             const signalRect = this.getBoundingRect();
diff --git a/src/jmapNew/shape/StationStand/EDetainCircle.js b/src/jmapNew/shape/StationStand/EDetainCircle.js
new file mode 100644
index 000000000..072c594a4
--- /dev/null
+++ b/src/jmapNew/shape/StationStand/EDetainCircle.js
@@ -0,0 +1,67 @@
+import Group from 'zrender/src/container/Group';
+import Circle from 'zrender/src/graphic/shape/Circle';
+import Line from 'zrender/src/graphic/shape/Line';
+
+class EDetainCircle extends Group {
+    constructor(model) {
+        super();
+        this.model = model;
+        this.create();
+    }
+
+    create() {
+        const model = this.model;
+        const style = this.model.style;
+        this.detainCircle = new Circle({
+            zlevel: model.zlevel,
+            z: model.z,
+            shape: {
+                cx: model.x,
+                cy: model.y,
+                r: model.radius
+            },
+            style:{
+                lineWidth:2,
+                stroke:style.StationStand.detainCar.defaultColor
+            }
+        });
+        this.line1 = new Line({
+            zlevel: model.zlevel,
+            z: model.z,
+            shape:{
+                x1:model.x - model.radius * 0.7,
+                y1:model.y - model.radius * 0.7,
+                x2:model.x + model.radius * 0.7,
+                y2:model.y + model.radius * 0.7
+            },
+            style:{
+                lineWidth:2,
+                stroke:style.StationStand.detainCar.defaultColor
+            }
+        });
+        this.line2 = new Line({
+            zlevel: model.zlevel,
+            z: model.z,
+            shape:{
+                x1:model.x - model.radius * 0.7,
+                y1:model.y + model.radius * 0.7,
+                x2:model.x + model.radius * 0.7,
+                y2:model.y - model.radius * 0.7
+            },
+            style:{
+                lineWidth:2,
+                stroke:style.StationStand.detainCar.defaultColor
+            }
+        });
+        this.add(this.detainCircle);
+        this.add(this.line1);
+        this.add(this.line2);
+    }
+
+    setColor(color) {
+        this.detainCircle.setStyle('stroke', color);
+        this.line1.setStyle('stroke', color);
+    }
+}
+
+export default EDetainCircle;
diff --git a/src/jmapNew/shape/StationStand/ESafeEmergent.js b/src/jmapNew/shape/StationStand/ESafeEmergent.js
index e06d27cd1..fa735e890 100644
--- a/src/jmapNew/shape/StationStand/ESafeEmergent.js
+++ b/src/jmapNew/shape/StationStand/ESafeEmergent.js
@@ -1,6 +1,7 @@
 import Group from 'zrender/src/container/Group';
 import Isogon from 'zrender/src/graphic/shape/Isogon';
 import Polygon from 'zrender/src/graphic/shape/Polygon';
+import Line from 'zrender/src/graphic/shape/Line';
 import {arrow} from '../utils/ShapePoints';
 
 class ESafeEmergent extends Group {
@@ -8,6 +9,9 @@ class ESafeEmergent extends Group {
         super();
         this.model = model;
         this.isNew = false;
+        if (this.model.style.StationStand.standEmergent.special) {
+            this.create();
+        }
     }
 
     create() {
@@ -43,18 +47,63 @@ class ESafeEmergent extends Group {
                         n: model.n
                     },
                     style: {
-                        lineWidth: 0,
-                        stroke: style.StationStand.standEmergent.closeColor,
-                        fill: style.StationStand.standEmergent.closeColor
+                        lineWidth: 0
                     }
                 });
+                if (style.StationStand.standEmergent.special) {
+                    this.emergent.setStyle('lineWidth', 2);
+                    this.emergent.setStyle('stroke', style.StationStand.standEmergent.defaultColor);
+                } else {
+                    this.emergent.setStyle('stroke', style.StationStand.standEmergent.closeColor);
+                    this.emergent.setStyle('fill', style.StationStand.standEmergent.closeColor);
+                }
                 this.add(this.emergent);
+                if (style.StationStand.standEmergent.special) {
+                    // r*Math.r*cos(Math.PI/180*22.5)
+                    // Math.sin(Math.PI/180*50)
+                    // Math.cos(Math.PI/180*50)
+                    this.emergent.rotation = Math.PI / 8;
+                    this.emergent.origin = [model.x, model.y];
+                    this.emergent.dirty();
+                    this.emergentLine1 = new Line({
+                        zlevel: model.zlevel,
+                        z: model.z,
+                        shape:{
+                            x1:model.x - model.r * 0.5939,
+                            y1:model.y - model.r * 0.7077,
+                            x2:model.x + model.r * 0.5939,
+                            y2:model.y + model.r * 0.7077
+                        },
+                        style:{
+                            lineWidth:2,
+                            stroke:style.StationStand.standEmergent.defaultColor
+                        }
+                    });
+                    this.emergentLine2 = new Line({
+                        zlevel: model.zlevel,
+                        z: model.z,
+                        shape:{
+                            x1:model.x + model.r * 0.5939,
+                            y1:model.y - model.r * 0.7077,
+                            x2:model.x - model.r * 0.5939,
+                            y2:model.y + model.r * 0.7077
+                        },
+                        style:{
+                            lineWidth:2,
+                            stroke:style.StationStand.standEmergent.defaultColor
+                        }
+                    });
+                    this.add(this.emergentLine1);
+                    this.add(this.emergentLine2);
+                }
             }
         }
     }
 
     hideMode() {
-        this.emergent && this.emergent.hide();
+        if (!this.model.style.StationStand.standEmergent.special) {
+            this.emergent && this.emergent.hide();
+        }
     }
 
     showMode() {
diff --git a/src/jmapNew/shape/StationStand/index.js b/src/jmapNew/shape/StationStand/index.js
index c1ddfda90..a9cd55baa 100644
--- a/src/jmapNew/shape/StationStand/index.js
+++ b/src/jmapNew/shape/StationStand/index.js
@@ -12,6 +12,7 @@ import EHighlight from '../element/EHighlight';
 import ETrainStop from './ETrainStop';
 import ETrainDepart from './ETrainDepart';
 import EControl from '../element/EControl';
+import EDetainCircle from './EDetainCircle';
 import {isShowThePrdType} from '../../utils/handlePath';
 
 class StationStand extends Group {
@@ -74,7 +75,7 @@ class StationStand extends Group {
             x: emergentX,
             y: emergentY,
             r: style.StationStand.standEmergent.mergentR,
-            n: 4
+            n: style.StationStand.standEmergent.mergentN
         });
         this.add(this.emergent);
 
@@ -131,21 +132,34 @@ class StationStand extends Group {
             this.add(this.reentry);
         }
 
-        /** 站台扣车*/
-        const detainD = model.right ? 1 : -1;
-        const detainX = model.position.x - style.StationStand.detainCar.position * detainD * (style.StationStand.detainCar.offset.x - model.width / 2);
-        const detainY = model.position.y + detainD * (style.StationStand.detainCar.offset.y - model.height / 2);
-        this.detain = new EDetain({
-            zlevel: this.zlevel,
-            z: this.z,
-            style: style,
-            x: detainX,
-            y: detainY,
-            width: model.width,
-            inside: model.inside,
-            right: model.right
-        });
-        this.add(this.detain);
+        if (style.StationStand.detainCar.special) {
+            const detainD = model.right ? 1 : -1;
+            this.detainCircle = new EDetainCircle({
+                zlevel: this.zlevel,
+                z: this.z,
+                style: style,
+                x: model.position.x + (model.width / 2) * detainD + detainD * style.StationStand.detainCar.offset.x + detainD * style.StationStand.detainCar.circleWidth / 2,
+                y: model.position.y,
+                radius:style.StationStand.detainCar.circleWidth / 2
+            });
+            this.add(this.detainCircle);
+        } else {
+            /** 站台扣车*/
+            const detainD = model.right ? 1 : -1;
+            const detainX = model.position.x - style.StationStand.detainCar.position * detainD * (style.StationStand.detainCar.offset.x - model.width / 2);
+            const detainY = model.position.y + detainD * (style.StationStand.detainCar.offset.y - model.height / 2);
+            this.detain = new EDetain({
+                zlevel: this.zlevel,
+                z: this.z,
+                style: style,
+                x: detainX,
+                y: detainY,
+                width: model.width,
+                inside: model.inside,
+                right: model.right
+            });
+            this.add(this.detain);
+        }
 
         /** 停站时间*/
         if (style.StationStand.stopTime.offset) {
diff --git a/src/jmapNew/shape/Train/EMouse.js b/src/jmapNew/shape/Train/EMouse.js
index e37c0892e..bb8351a2a 100644
--- a/src/jmapNew/shape/Train/EMouse.js
+++ b/src/jmapNew/shape/Train/EMouse.js
@@ -2,6 +2,7 @@ import Group from 'zrender/src/container/Group';
 import Text from 'zrender/src/graphic/Text';
 import LangStorage from '@/utils/lang';
 import Rect from 'zrender/src/graphic/shape/Rect';
+import store from '@/store/index_APP_TARGET';
 
 class EMouse extends Group {
     constructor(device) {
@@ -27,10 +28,14 @@ class EMouse extends Group {
         default: trainType = LangStorage.getLang() == 'en' ? 'unknown' : '未知'; break;
         }
         let text = '';
+        let direction = this.device.model.right == 1;
+        if (store.state.map.mapConfig.upDirection == 'left') {
+            direction = this.device.model.right != 1;
+        }
         if (LangStorage.getLang() == 'en') {
-            text = ` The planned train: ${trainType} \n Table No.: ${this.device.model.serviceNumber} \n Train Trip No.: ${this.device.model.tripNumber}\n Destination: ${this.device.model.destinationCode ? this.device.model.destinationCode : ''}\n Train No.: ${this.device.model.groupNumber}\n Early or late: ${destinationText}\n Direction: ${this.device.model.directionType == '02' ? 'up' : 'down'}\n Crew No.: \n Start Station: \n Terminal Station: \n Occupied Track: ${this.device.model.sectionModel ? this.device.model.sectionModel.name : ''}\n Current Station: \n Train-ground communication: normal \n Operation Speed level: 4 \n Detained: ${this.device.model.hold ? 'Detained' : 'Normal'}\n \n 跳停状态: ${this.device.model.jump ? 'Skip to continue moving' : 'Normal'}Stationary: ${!this.device.model.stop ? 'No' : 'Yes'}\n Blocked: No \n Speed: ${this.device.model.speed || 0} km/h \n Authorized Distance: ${this.device.model.maLen || 0} m`;
+            text = ` The planned train: ${trainType} \n Table No.: ${this.device.model.serviceNumber} \n Train Trip No.: ${this.device.model.tripNumber}\n Destination: ${this.device.model.destinationCode ? this.device.model.destinationCode : ''}\n Train No.: ${this.device.model.groupNumber}\n Early or late: ${destinationText}\n Direction: ${direction ? 'up' : 'down'}\n Crew No.: \n Start Station: \n Terminal Station: \n Occupied Track: ${this.device.model.sectionModel ? this.device.model.sectionModel.name : ''}\n Current Station: \n Train-ground communication: normal \n Operation Speed level: 4 \n Detained: ${this.device.model.hold ? 'Detained' : 'Normal'}\n \n 跳停状态: ${this.device.model.jump ? 'Skip to continue moving' : 'Normal'}Stationary: ${!this.device.model.stop ? 'No' : 'Yes'}\n Blocked: No \n Speed: ${this.device.model.speed || 0} km/h \n Authorized Distance: ${this.device.model.maLen || 0} m`;
         } else {
-            text = `列车类型: ${trainType} \n表\0\0\0\0号: ${this.device.model.serviceNumber}\n车\0次\0号: ${this.device.model.tripNumber}\n目的地号: ${this.device.model.destinationCode ? this.device.model.destinationCode : ''}\n车\0组\0号: ${this.device.model.groupNumber}\n早\0晚\0点: ${destinationText}\n运行方向: ${this.device.model.directionType == '02' ? '上行' : '下行'}\n乘务组号: \n起点站名: \n终点站名: \n占用轨道: ${this.device.model.sectionModel ? this.device.model.sectionModel.name : ''}\n所在车站: \n车地通信: 正常\n运行等级: 4\n扣车状态: ${ this.device.model.hold ? '扣车' : '正常'}\n跳停状态: ${this.device.model.jump ? '跳停' : '正常'} \n停稳状态: ${!this.device.model.stop ? '未停稳' : '停稳'}\n阻塞状态: 无\n列车速度: ${this.device.model.speed || 0} km/h\n列车移动授权距离: ${this.device.model.maLen || 0} m`;
+            text = `列车类型: ${trainType} \n表\0\0\0\0号: ${this.device.model.serviceNumber}\n车\0次\0号: ${this.device.model.tripNumber}\n目的地号: ${this.device.model.destinationCode ? this.device.model.destinationCode : ''}\n车\0组\0号: ${this.device.model.groupNumber}\n早\0晚\0点: ${destinationText}\n运行方向: ${direction ? '上行' : '下行'}\n乘务组号: \n起点站名: \n终点站名: \n占用轨道: ${this.device.model.sectionModel ? this.device.model.sectionModel.name : ''}\n所在车站: \n车地通信: 正常\n运行等级: 4\n扣车状态: ${ this.device.model.hold ? '扣车' : '正常'}\n跳停状态: ${this.device.model.jump ? '跳停' : '正常'} \n停稳状态: ${!this.device.model.stop ? '未停稳' : '停稳'}\n阻塞状态: 无\n列车速度: ${this.device.model.speed || 0} km/h\n列车移动授权距离: ${this.device.model.maLen || 0} m`;
         }
         const trainTip = this.device.style.Train.common.trainTip;
         if (trainTip) {
diff --git a/src/jmapNew/shape/Train/index.js b/src/jmapNew/shape/Train/index.js
index 891a6cd3d..f19af6378 100644
--- a/src/jmapNew/shape/Train/index.js
+++ b/src/jmapNew/shape/Train/index.js
@@ -73,7 +73,7 @@ export default class Train extends Group {
                 tripNumber: model.tripNumber,
                 destinationCode: model.destinationCode,
                 groupNumber: model.groupNumber,
-                directionType: model.directionType,
+                right: model.right,
                 directionCode: model.directionCode,
                 sectionModel: model.sectionModel,
                 runStatus: model.runStatus,
diff --git a/src/jmapNew/shape/element/EControl.js b/src/jmapNew/shape/element/EControl.js
index daab1517c..423588802 100644
--- a/src/jmapNew/shape/element/EControl.js
+++ b/src/jmapNew/shape/element/EControl.js
@@ -25,7 +25,8 @@ export default class EControl extends Group {
             shape: this.arcStyle.shape,
             style: {
                 lineWidth: this.arcStyle.lineWidth,
-                fill: this.arcStyle.fill
+                fill: this.arcStyle.fill,
+                stroke: this.arcStyle.stroke
             },
             onmouseover: this.arcStyle.mouseover,
             onmouseout: this.arcStyle.mouseout
diff --git a/src/jmapNew/shape/factory.js b/src/jmapNew/shape/factory.js
index c300aa1e9..e8d551734 100644
--- a/src/jmapNew/shape/factory.js
+++ b/src/jmapNew/shape/factory.js
@@ -65,6 +65,7 @@ mapShape[deviceType.ModeStatusGroup] = SaidLamp;
 mapShape[deviceType.FaultStatusGroup] = SaidLamp;
 mapShape[deviceType.ReturnModeGroup] = SaidLamp;
 mapShape[deviceType.Axle] = SaidLamp;
+mapShape[deviceType.SwitchFault] = SaidLamp;
 mapShape[deviceType.SplitStation] = SplitStation;
 
 function shapefactory(device, jmap) {
diff --git a/src/jmapNew/theme/beijing_01/menusPlan/addTask.vue b/src/jmapNew/theme/beijing_01/menusPlan/addTask.vue
deleted file mode 100644
index 009c19f02..000000000
--- a/src/jmapNew/theme/beijing_01/menusPlan/addTask.vue
+++ /dev/null
@@ -1,175 +0,0 @@
-<template>
-  <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 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();
-		}
-	}
-};
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-    @import "src/styles/mixin.scss";
-
-    /deep/ {
-        .el-button {
-            margin-left: 40px !important;
-            margin-right: 40px !important;
-        }
-
-        .el-row {
-            margin-bottom: 5px !important;
-        }
-
-        .el-input__inner {
-            height: 20px !important;
-            line-height: 20px !important;
-        }
-    }
-</style>
diff --git a/src/jmapNew/theme/beijing_01/menusPlan/chooseTemplatePlan.vue b/src/jmapNew/theme/beijing_01/menusPlan/chooseTemplatePlan.vue
deleted file mode 100644
index 947163306..000000000
--- a/src/jmapNew/theme/beijing_01/menusPlan/chooseTemplatePlan.vue
+++ /dev/null
@@ -1,115 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    :title="title"
-    class="beijing-01__schedule choose-plan-template"
-    :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 } from '@/api/runplan';
-import { listPublishMap } from '@/api/jmap/map';
-
-export default {
-    name: 'ChooseTemplatePlan',
-    data() {
-        return {
-            dialogShow: false,
-            loading: false,
-            mapList: [],
-            pagerConfig: {
-                pageSize: 'pageSize',
-                pageIndex: 'pageNum'
-            },
-            queryForm: {
-                reset: true,
-                labelWidth: '100px',
-                queryObject: {
-                    name: {
-                        type: 'text',
-                        label: '运行图名称'
-                    }
-                }
-            },
-            queryList: {
-                query: this.queryFunction,
-                selectCheckShow: false,
-                radioShow: true,
-                columns: [
-                    {
-                        title: '运行图名称',
-                        prop: 'name'
-                    },
-                    {
-                        title: '地图名称',
-                        prop: 'mapId',
-                        type: 'tag',
-                        columnValue: (row) => {
-                            return this.$convertField(row.mapId, this.mapList, ['id', 'name']);
-                        },
-                        tagType: (row) => { return 'success'; }
-                    }
-                ]
-            },
-
-            currentModel: {}
-        };
-    },
-    computed: {
-        title() {
-            return '选择模板运行图';
-        }
-    },
-    methods: {
-        loadInitData() {
-            this.mapList = [];
-            listPublishMap().then(response => {
-                this.mapList = response.data;
-            });
-        },
-        doShow() {
-            this.loading = false;
-            this.dialogShow = true;
-            this.loadInitData();
-        },
-        doClose() {
-            this.dialogShow = false;
-        },
-        queryFunction(params) {
-            if (this.$store.state.map && this.$store.state.map.map) {
-                params['mapId'] = this.$route.query.mapId;
-                // params['lineCode'] = this.$store.getters['map/lineCode'];
-            }
-            return runPlanTemplateList(params);
-        },
-        handleConfirm() {
-            this.doClose();
-            if (this.$refs && this.$refs.pageRules) {
-                const choose = this.$refs.pageRules.currentChoose();
-                if (choose) {
-                    this.$emit('chooseConfirm', choose);
-                } else {
-                    this.$messageBox(`请选择模板运行图`);
-                }
-            }
-        },
-        reloadTable() {
-            this.queryList.reload();
-        }
-    }
-};
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-    @import "src/styles/mixin.scss";
-</style>
diff --git a/src/jmapNew/theme/beijing_01/menusPlan/components/dataTable.vue b/src/jmapNew/theme/beijing_01/menusPlan/components/dataTable.vue
deleted file mode 100644
index fa98a48e7..000000000
--- a/src/jmapNew/theme/beijing_01/menusPlan/components/dataTable.vue
+++ /dev/null
@@ -1,206 +0,0 @@
-<template>
-  <div v-if="show">
-    <template v-if="maxmini">
-      <div class="nav">
-        <div v-show="config.showClose" class="cls-status" @click="touch('Close')"><span /></div>
-        <div class="min-status" @click="touch('Minim')"><span /></div>
-      </div>
-      <el-table
-        ref="table"
-        :data="config.data"
-        :highlight-current-row="config.highlightCurrentRow"
-        :height="height"
-        border
-        @current-change="handleChange"
-      >
-        <template v-for="(item,index) in config.columns">
-          <el-table-column :key="index" :prop="item.prop" :label="item.label" :width="item.width" />
-        </template>
-      </el-table>
-    </template>
-    <template v-else>
-      <div class="nav">
-        <div class=" max-status" @click="touch('Maxim')"><span /></div>
-      </div>
-    </template>
-  </div>
-</template>
-
-<script>
-export default {
-	name: 'DataTable',
-	props: {
-		height: {
-			type: Number,
-			required: true
-		},
-		config: {
-			type: Object,
-			required: true
-		}
-	},
-	data() {
-		return {
-			show: true,
-			maxmini: true,
-			touchStrategy: {
-				'Close': [false, true],
-				'Minim': [true, false],
-				'Maxim': [true, true]
-			}
-		};
-	},
-	methods: {
-		handleChange(row) {
-			if (this.config.handleChange) {
-				this.config.handleChange(row);
-			}
-		},
-		setCurrentRow(row) {
-			this.$refs.table.setCurrentRow(row);
-		},
-		touch(operate) {
-			this.$nextTick(() => {
-				[this.show, this.maxmini] = this.touchStrategy[operate];
-				this.$emit('touch', this.maxmini);
-			});
-		}
-	}
-};
-</script>
-
-<style scoped rel="stylesheet/scss" lang="scss" >
-    @import "src/styles/mixin.scss";
-    $height: 20px;
-    $width: 20px;
-
-    .nav {
-        display: table;
-        float: right;
-        width: 100%;
-        color: #0000;
-        background: -webkit-linear-gradient(#FDFDFE, #B1CBF3);
-        background: -o-linear-gradient(#FDFDFE, #B1CBF3);
-        background: -moz-linear-gradient(#FDFDFE, #B1CBF3);
-        background: linear-gradient(#FDFDFE, #B1CBF3);
-        border: 1px solid #B6BCCC !important;
-        border-bottom: 2px solid #B6BCCC !important;
-        list-style: none;
-        height: $height;
-        line-height: $height;
-    }
-
-    /deep/ {
-        .el-table--border th.gutter {
-            background: #EBEADB !important;
-        }
-
-        .el-table {
-            overflow-y: hidden;
-            width: 100%;
-
-            th.is-leaf {
-                padding: 0px 0;
-                background: #EBEADB;
-                border-right: none !important;
-                border-left: 1px solid #D1CDBD !important;
-                border-top: 1px solid #D1CDBD !important;
-                border-bottom: 1px inset #D1CDBD !important;
-                color: #000;
-
-                .cell {
-                    height: $height;
-                    line-height: $height;
-                }
-            }
-
-            td {
-                padding: 0px 0;
-
-                .cell {
-                    height: $height;
-                    line-height: $height;
-                    font-size: smaller !important;
-                }
-
-            }
-
-            .current-row>td {
-                background: #316AC5 !important;
-                color: #fff !important;
-            }
-        }
-
-        .cls-status {
-            float: right;
-            width: 12px;
-            height: 100%;
-            line-height: 100%;
-            margin-left: 5px;
-            cursor: pointer;
-
-            span {
-                display: inline-block;
-                content: '/';
-                background: black;
-                width: 2px;
-                height: 12px;
-                vertical-align: middle;
-               transform: rotate(45deg);
-            }
-
-            span::after {
-                display: block;
-                content: '/';
-                background: black;
-                width: 2px;
-                height: 12px;
-               transform: rotate(-90deg);
-            }
-        }
-
-        .min-status {
-            float: right;
-            width: 20px;
-            height: 100%;
-            line-height: 100%;
-            cursor: pointer;
-
-            span {
-                display: inline-block;
-                content: '-';
-                background: black;
-                width: 2px;
-                height: 12px;
-                vertical-align: middle;
-               transform: rotate(-90deg);
-            }
-        }
-
-        .max-status {
-            float: right;
-            width: 20px;
-            height: 100%;
-            line-height: 100%;
-            cursor: pointer;
-
-            span {
-                display: inline-block;
-                content: '';
-                background: black;
-                width: 2px;
-                height: 12px;
-                transform: rotate(0deg);
-            }
-
-            span::after {
-                display: block;
-                content: '';
-                background: black;
-                width: 2px;
-                height: 12px;
-               transform: rotate(90deg);
-            }
-        }
-    }
-</style>
diff --git a/src/jmapNew/theme/beijing_01/menusPlan/createTodayPlan.vue b/src/jmapNew/theme/beijing_01/menusPlan/createTodayPlan.vue
deleted file mode 100644
index 0c483abb4..000000000
--- a/src/jmapNew/theme/beijing_01/menusPlan/createTodayPlan.vue
+++ /dev/null
@@ -1,134 +0,0 @@
-<template>
-  <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 } from '@/api/runplan';
-import { getStationList } from '@/api/runplan';
-import { getEveryDayRunPlanData, generateDayRunPlan } from '@/api/simulation';
-import { getPublishMapInfo } from '@/api/jmap/map';
-
-export default {
-    name: 'ReloadTodayPlan',
-    data() {
-        return {
-            dialogShow: false,
-            loading: false,
-            pagerConfig: {
-                pageSize: 'pageSize',
-                pageIndex: 'pageNum'
-            },
-            queryForm: {
-                reset: true,
-                labelWidth: '100px',
-                queryObject: {
-                    name: {
-                        type: 'text',
-                        label: '运行图名称'
-                    }
-                }
-            },
-            queryList: {
-                query: this.queryFunction,
-                selectCheckShow: false,
-                radioShow: true,
-                columns: [
-                    {
-                        title: '运行图名称',
-                        prop: 'name'
-                    }
-                ]
-            },
-
-            currentModel: {}
-        };
-    },
-    computed: {
-        title() {
-            return '加载当天计划';
-        }
-    },
-    methods: {
-        doShow() {
-            this.loading = false;
-            this.dialogShow = true;
-        },
-        doClose() {
-            this.dialogShow = false;
-        },
-        queryFunction(params) {
-            if (this.$store.state.map && this.$store.state.map.map) {
-                // params['lineCode'] = this.$store.getters['map/lineCode'];
-                params['mapId'] = this.$route.query.mapId;
-            }
-            return runPlanTemplateList(params);
-        },
-        // 生成每日运行图
-        handleConfirm() {
-            if (this.$refs && this.$refs.pageRules) {
-                const choose = this.$refs.pageRules.currentChoose();
-                if (choose && choose.id) {
-                    this.loading = true;
-                    generateDayRunPlan(choose.id, this.$route.query.group).then(response => {
-                        this.loading = false;
-                        this.reloadTable();
-                        this.loadRunData();
-                        this.doClose();
-                        this.$message.success(`生成用户每日运行图成功`);
-                    }).catch(() => {
-                        this.loading = false;
-                        this.reloadTable();
-                        this.$messageBox(`生成用户每日运行图失败`);
-                    });
-                } else {
-                    this.$messageBox(`请选择需要加载的运行图`);
-                }
-            }
-        },
-        loadRunData() {
-            // const skinCode = this.$route.query.skinCode;
-            const mapId = this.$route.query.mapId;
-            this.$store.dispatch('runPlan/clear');
-            if (mapId) {
-                getStationList(mapId).then(response => {
-                    const stations = response.data;
-                    getPublishMapInfo(this.$route.query.mapId).then(res=>{
-                        this.PlanConvert = this.$theme.loadPlanConvert(res.data.lineCode);
-                        this.$store.dispatch('runPlan/setStations', stations).then(() => {
-                            getEveryDayRunPlanData(this.$route.query.group).then(resp => {
-                                this.$store.dispatch('runPlan/setPlanData', resp.data);
-                            }).catch(() => {
-                                this.$store.dispatch('runPlan/setPlanData', []);
-                                this.$messageBox(`获取运行图数据失败`);
-                            });
-                        });
-                    });
-                }).catch(() => {
-                    this.$messageBox(`获取车站列表失败`);
-                });
-            }
-        },
-        reloadTable() {
-            this.queryList.reload();
-        }
-    }
-};
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-    @import "src/styles/mixin.scss";
-</style>
diff --git a/src/jmapNew/theme/beijing_01/menusPlan/createWeekPlan.vue b/src/jmapNew/theme/beijing_01/menusPlan/createWeekPlan.vue
deleted file mode 100644
index 2eabc8044..000000000
--- a/src/jmapNew/theme/beijing_01/menusPlan/createWeekPlan.vue
+++ /dev/null
@@ -1,137 +0,0 @@
-<template>
-  <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';
-
-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 {
-				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";
-
-    .card-box {
-        padding-top: 10px;
-    }
-
-    /deep/ {
-        .el-row {
-            margin: 10px;
-        }
-    }
-</style>
diff --git a/src/jmapNew/theme/beijing_01/menusPlan/deleteTask.vue b/src/jmapNew/theme/beijing_01/menusPlan/deleteTask.vue
deleted file mode 100644
index cd79c305f..000000000
--- a/src/jmapNew/theme/beijing_01/menusPlan/deleteTask.vue
+++ /dev/null
@@ -1,73 +0,0 @@
-<template>
-  <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();
-		}
-	}
-};
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-    @import "src/styles/mixin.scss";
-
-    /deep/ {
-        .el-row {
-            margin: 10px;
-        }
-    }
-</style>
diff --git a/src/jmapNew/theme/beijing_01/menusPlan/deleteTodayPlan.vue b/src/jmapNew/theme/beijing_01/menusPlan/deleteTodayPlan.vue
deleted file mode 100644
index 2e22a7c64..000000000
--- a/src/jmapNew/theme/beijing_01/menusPlan/deleteTodayPlan.vue
+++ /dev/null
@@ -1,62 +0,0 @@
-<template>
-  <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();
-		}
-	}
-};
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-    @import "src/styles/mixin.scss";
-
-    /deep/ {
-        .el-row {
-            margin: 10px;
-        }
-    }
-</style>
diff --git a/src/jmapNew/theme/beijing_01/menusPlan/managePlanList.vue b/src/jmapNew/theme/beijing_01/menusPlan/managePlanList.vue
deleted file mode 100644
index 7fcd45639..000000000
--- a/src/jmapNew/theme/beijing_01/menusPlan/managePlanList.vue
+++ /dev/null
@@ -1,143 +0,0 @@
-<template>
-  <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, listAllTempLateRunPlan } from '@/api/runplan';
-import { getPublishMapListOnline } from '@/api/jmap/map';
-
-export default {
-    name: 'ManagePlanList',
-    data() {
-        return {
-            dialogShow: false,
-            loading: false,
-            pagerConfig: {
-                pageSize: 'pageSize',
-                pageIndex: 'pageNum'
-            },
-            queryForm: {
-                labelWidth: '140px',
-                reset: true
-            },
-            queryList: {
-                query: this.queryFunction,
-                selectCheckShow: false,
-                indexShow: true,
-                columns: [
-                    {
-                        title: this.$t('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 '运行图计划表';
-        }
-    },
-    mounted() {
-        this.loadPageData();
-    },
-    methods: {
-        loadPageData() {
-            this.mapList = [];
-            getPublishMapListOnline().then(resp => {
-                this.mapList = resp.data;
-            });
-            this.templatePlanList = [];
-            listAllTempLateRunPlan().then(resp => {
-                this.templatePlanList = resp.data;
-            });
-        },
-        queryFunction(params) {
-            if (this.$route.query.mapId) {
-                params['mapId'] = this.$route.query.mapId;
-            }
-
-            if (this.$store.state.user.id) {
-                params['userId'] = this.$store.state.user.id;
-            }
-
-            return getRunPlanLoadList(params);
-        },
-        handleDelete(index, row) {
-            this.$confirm('此操作将删除次日加载的运行图, 是否继续?', '提示', {
-                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>
diff --git a/src/jmapNew/theme/beijing_01/menusPlan/modifyingPlan.vue b/src/jmapNew/theme/beijing_01/menusPlan/modifyingPlan.vue
deleted file mode 100644
index 1d2b31102..000000000
--- a/src/jmapNew/theme/beijing_01/menusPlan/modifyingPlan.vue
+++ /dev/null
@@ -1,177 +0,0 @@
-<template>
-  <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 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-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';
-
-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";
-
-    .view-button {
-        display: list-item;
-        width: 150px !important;
-        margin-left: 0px;
-    }
-
-    .view-label {
-        height: 32px;
-        line-height: 32px;
-    }
-
-    .view-box {
-        padding: 10px 0px;
-        border: 1px inset gray;
-        border-top: 1px outset gray;
-        border-left: 1px outset gray;
-    }
-
-    /deep/ {
-        .el-row {
-            margin: 5px 20px;
-        }
-    }
-</style>
diff --git a/src/jmapNew/theme/beijing_01/menusPlan/modifyingTask.vue b/src/jmapNew/theme/beijing_01/menusPlan/modifyingTask.vue
deleted file mode 100644
index 8cc14cd09..000000000
--- a/src/jmapNew/theme/beijing_01/menusPlan/modifyingTask.vue
+++ /dev/null
@@ -1,327 +0,0 @@
-<template>
-  <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-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-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-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-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';
-
-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 tripNumberList = Object.keys(editData.trainMap).sort((a, b) => { return editData.trainMap[a].oldIndex - editData.trainMap[b].oldIndex; });
-				const trainInfo = editData.trainMap[params.tripNumber];
-				const lastIndex = trainInfo.stationTimeList.length - 1;
-				const taskObj = {
-					tripNumber: params.tripNumber,
-					beginStationCode: trainInfo.stationTimeList[0].stationCode,
-					beginStationStandCode: '',
-					endStationCode: trainInfo.stationTimeList[lastIndex].stationCode,
-					endStationStandCode: ''
-				};
-				this.model.route.push(taskObj);
-
-				trainInfo.stationTimeList.forEach((elem, index) => {
-					const stationObj = {
-						stationCode: elem.stationCode,
-						startTime: index == 0 ? null : trainInfo.stationTimeList[index - 1].secondTime,
-						stopTime: index == 0 ? null : elem.secondTime - trainInfo.stationTimeList[index - 1].secondTime,
-						endTime: elem.secondTime,
-						level: ''
-					};
-					this.model.detail.push(stationObj);
-				});
-			}
-		},
-		doShow(params) {
-			this.loadInitData(params);
-			this.dialogShow = true;
-		},
-		doClose() {
-			this.loading = false;
-			this.dialogShow = false;
-		},
-		handleCommit() {
-		}
-	}
-};
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-    @import "src/styles/mixin.scss";
-
-    /deep/ {
-        .el-button {
-            margin-left: 40px !important;
-            margin-right: 40px !important;
-        }
-
-        .el-row {
-            margin-bottom: 5px !important;
-        }
-
-        .el-input__inner {
-            height: 20px !important;
-            line-height: 20px !important;
-        }
-
-        .el-input {
-            width: 110px !important;
-        }
-    }
-</style>
diff --git a/src/jmapNew/theme/beijing_01/model.js b/src/jmapNew/theme/beijing_01/model.js
index ed34da08c..dd040cf61 100644
--- a/src/jmapNew/theme/beijing_01/model.js
+++ b/src/jmapNew/theme/beijing_01/model.js
@@ -14,6 +14,9 @@ class Model {
         this['private'][deviceType.StationControl] = {
             indicatorShow: true									// 标识灯名称显示
         };
+        this['private'][deviceType.Station] = {
+            kmPostShow: true									// 公里标显示
+        };
         this['private'][deviceType.Switch] = {
             nameShow: true
         };
diff --git a/src/jmapNew/theme/beijing_01/planSchedule/index.vue b/src/jmapNew/theme/beijing_01/planSchedule/index.vue
deleted file mode 100644
index 6fa39ed23..000000000
--- a/src/jmapNew/theme/beijing_01/planSchedule/index.vue
+++ /dev/null
@@ -1,403 +0,0 @@
-<template>
-  <div class="plan-schedule" style="width: 100%">
-    <title-bar ref="titleBar" @back="back" />
-    <menu-bar ref="menuBar" :line-code="lineCode" @dispatchDialog="dispatchDialog" />
-    <schedule ref="schedule" :group="group" :line-code="lineCode" :max-height="height" :max-width="width" />
-    <status-bar ref="statusBar" :max-top="height" @setPosition="setPosition" />
-
-    <manage-plan-list ref="managePlanList" @dispatchDialog="dispatchDialog" />
-    <create-week-plan ref="createWeekPlan" @reloadTable="reloadTable" />
-    <create-today-plan ref="createTodayPlan" />
-    <modifying-plan ref="modifyingPlan" @dispatchDialog="dispatchDialog" />
-    <add-task ref="addTask" />
-    <delete-task ref="deleteTask" />
-    <modifying-task ref="modifyingTask" />
-  </div>
-</template>
-
-<script>
-import TitleBar from './titleBar';
-import MenuBar from './menuBar';
-import StatusBar from './statusBar';
-import Schedule from './schedule';
-import ManagePlanList from '../menusPlan/managePlanList';
-import CreateWeekPlan from '../menusPlan/createWeekPlan';
-import CreateTodayPlan from '../menusPlan/createTodayPlan';
-import ModifyingPlan from '../menusPlan/modifyingPlan';
-import AddTask from '../menusPlan/addTask';
-import DeleteTask from '../menusPlan/deleteTask';
-import ModifyingTask from '../menusPlan/modifyingTask';
-
-export default {
-    name: 'Menus',
-    components: {
-        TitleBar,
-        MenuBar,
-        StatusBar,
-        Schedule,
-        ManagePlanList,
-        CreateWeekPlan,
-        CreateTodayPlan,
-        ModifyingPlan,
-        AddTask,
-        DeleteTask,
-        ModifyingTask
-    },
-    props: {
-        group: {
-            type: String,
-            required: true
-        }
-    },
-    data() {
-        return {
-        };
-    },
-    computed: {
-        lineCode() {
-            return this.$route.query.lineCode || '02';
-        },
-        width() {
-            return this.$store.state.app.width;
-        },
-        height() {
-            return this.$store.state.app.height;
-        }
-    },
-    methods: {
-        setPosition() {
-            this.$nextTick(() => {
-                this.$refs.schedule.setPosition();
-            });
-        },
-        dispatchDialog(dialogObj) {
-            this.$nextTick(() => {
-                if (this.$refs[dialogObj.name]) {
-                    this.$refs[dialogObj.name].doShow(dialogObj.params);
-                }
-            });
-        },
-        reloadTable(dialogObj) {
-            if (this.$refs[dialogObj.name]) {
-                this.$refs[dialogObj.name].reloadTable();
-            }
-        },
-        confirm(params) {
-        },
-        back() {
-            this.$emit('back');
-        }
-    }
-};
-</script>
-
-<style>
-    .plan-schedule {
-        position: absolute;
-        background: gray;
-    }
-
-    .plan-schedule .pop-menu {
-        background: #F0F0F0;
-    }
-
-    .plan-schedule .pop-menu span {
-        color: #000;
-    }
-
-    .plan-schedule .system-close {
-        cursor: pointer;
-        position: absolute;
-        right: 0px;
-        background: -webkit-linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
-        background: -o-linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
-        background: -moz-linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
-        background: linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
-        border: 1px solid white;
-        border-radius: 4px;
-    }
-
-    .plan-schedule .system-close::before {
-        position: absolute;
-        height: 22px;
-        line-height: 22px;
-        top: 0px;
-        left: 0px;
-        font-size: x-large;
-    }
-
-    .plan-schedule .pop-menu .is-disabled span {
-        color: #B4B3B8;
-    }
-
-    .beijing-01__schedule {
-        overflow: hidden !important;
-    }
-
-    .beijing-01__schedule .el-dialog {
-        background: rgba(0, 85, 231, 1);
-        box-shadow: 1px hsla(240, 0%, 100%, 0.5) inset;
-        border: 2px solid #727375;
-        border-radius: 4px;
-        color: #000;
-        font-size: 14px;
-    }
-
-    .beijing-01__schedule .el-dialog .el-dialog__header {
-        height: 30px;
-        padding: 5px;
-    }
-
-    .beijing-01__schedule .el-dialog .el-dialog__footer {
-        background: #ECE9D8;
-        opacity: 1;
-    }
-
-    .beijing-01__schedule .el-dialog .el-dialog__body {
-        padding-top: 10px;
-        padding-bottom: 10px;
-        padding-left: 5px;
-        padding-right: 5px;
-        margin: 0px 3px 3px 3px;
-        border: 2px solid rgba(120, 121, 123, 0.5);
-        box-shadow: 1px hsla(240, 0%, 100%, 0.5) inset;
-        color: #000;
-        background: #ECE9D8;
-        opacity: 1;
-    }
-
-    .beijing-01__schedule .el-dialog .el-dialog__title {
-        font-size: 16px;
-    }
-
-    .beijing-01__schedule .el-dialog .el-dialog__headerbtn {
-        background: -webkit-linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
-        background: -o-linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
-        background: -moz-linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
-        background: linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
-        border: 1px solid white;
-        border-radius: 4px;
-        top: 0px;
-        right: 3px;
-        line-height: 26px;
-        width: 26px;
-    }
-
-    .beijing-01__schedule .el-dialog .el-dialog__headerbtn .el-icon-close:before {
-        font-size: 16px;
-    }
-
-    .beijing-01__schedule .el-dialog .el-dialog__headerbtn .el-dialog__close {
-        color: #fff;
-    }
-
-    .beijing-01__schedule .el-dialog .el-form {
-        background: #ECE9D8 !important;
-    }
-
-    .beijing-01__schedule .el-dialog .el-card {
-        background: #ECE9D8 !important;
-    }
-
-    .beijing-01__schedule .el-dialog .el-button {
-        height: 32px;
-        line-height: 32px;
-        padding: 0px;
-        width: 80px;
-        border: 2px outset #E2E2E2;
-        border-radius: 0px !important;
-        color: #000;
-        background: #ECE9D8;
-    }
-
-    .beijing-01__schedule .el-dialog .expand {
-        width: 120px;
-    }
-
-    .beijing-01__schedule .el-dialog .el-button:focus span {
-        border: 1px dashed gray;
-    }
-
-    .beijing-01__schedule .el-dialog .el-button:active {
-        border: 2px inset #E2E2E2;
-    }
-
-    .beijing-01__schedule .el-dialog .el-button:disabled {
-        border: 2px inset #E2E2E2;
-    }
-
-    .beijing-01__schedule .el-dialog .el-button:disabled span {
-        border: 0px;
-    }
-
-    .beijing-01__schedule .el-dialog .button-group {
-        margin: 0px 5px;
-        text-align: center !important;
-    }
-
-    .beijing-01__schedule .el-dialog .el-input {
-        border: 2px inset #E9E9E9;
-    }
-
-    .beijing-01__schedule .el-dialog .el-input .el-input__inner {
-        color: #000;
-        background: #fff !important;
-        border: 0px;
-        border-radius: 0px !important;
-        box-sizing: border-box;
-    }
-
-    .beijing-01__schedule .el-dialog .el-input.is-disabled .el-input__inner {
-        background: #F0F0F0 !important;
-    }
-
-    .beijing-01__schedule .el-dialog .el-textarea {
-        border: 2px inset #E9E9E9;
-        border-radius: 0px;
-    }
-
-    .beijing-01__schedule .el-dialog .el-textarea .el-textarea__inner {
-        color: #000;
-        background: #fff !important;
-        border: 0px;
-        border-radius: 0px !important;
-        box-sizing: border-box;
-    }
-
-    .beijing-01__schedule .el-dialog .el-textarea.is-disabled .el-textarea__inner {
-        background: #F0F0F0 !important;
-    }
-
-    .beijing-01__schedule .el-dialog .el-table {
-        border: 2px inset #E9E9E9;
-        color: #000 !important;
-    }
-
-    .beijing-01__schedule .el-dialog .el-table .cell {
-        line-height: unset !important;
-    }
-
-    .beijing-01__schedule .el-dialog .el-table th.is-leaf {
-        background: #ECE9D8 !important;
-        border-right: 1px solid #BDBDBD !important;
-        border-bottom: 1px solid #BDBDBD !important;
-        color: #000 !important;
-        height: 20px !important;
-        padding: 0px;
-    }
-
-    .beijing-01__schedule .el-dialog .el-table tr td {
-        height: 20px !important;
-        padding: 0px;
-    }
-
-    .beijing-01__schedule .el-dialog .el-table .el-table__empty-text {
-        top: 15px !important;
-    }
-
-    .beijing-01__schedule .el-dialog .current-row>td {
-        background: #316AC5 !important;
-        color: #fff !important;
-    }
-
-    .beijing-01__schedule .el-dialog .el-checkbox__inner {
-        border: 1px inset #dcdfe6 !important;
-    }
-
-    .beijing-01__schedule .el-dialog .el-checkbox__label {
-        color: #000 !important;
-    }
-
-    .beijing-01__schedule .el-dialog .el-checkbox.is-disabled .el-checkbox__inner {
-        background: #E6E6E6 !important;
-    }
-
-    .beijing-01__schedule .el-dialog .el-checkbox.is-disabled .el-checkbox__label {
-        color: #C5C9CC !important;
-    }
-
-    .beijing-01__schedule .el-dialog .el-checkbox__input.is-checked .el-checkbox__inner {
-        background: #fff !important;
-        border: 1px inset #dcdfe6 !important;
-    }
-
-    .beijing-01__schedule .el-dialog .el-checkbox__input.is-checked .el-checkbox__inner::after {
-        position: absolute;
-        -webkit-box-sizing: content-box;
-        box-sizing: content-box;
-        content: "";
-        border: 1px solid #000;
-        border-left: 0;
-        border-top: 0;
-        height: 7px;
-        left: 4px;
-        top: 1px;
-    }
-
-    .beijing-01__schedule .el-dialog .el-radio__inner {
-        border: 1px inset #dcdfe6 !important;
-    }
-
-    .beijing-01__schedule .el-dialog .el-radio__label {
-        color: #000 !important;
-    }
-
-    .beijing-01__schedule .el-dialog .el-radio__input.is-checked .el-radio__inner {
-        background: #fff !important;
-        border: 1px inset #dcdfe6 !important;
-    }
-
-    .beijing-01__schedule .el-dialog .el-radio__input.is-checked .el-radio__inner::after {
-        width: 4px;
-        height: 4px;
-        border-radius: 100%;
-        background-color: #000 !important;
-        position: absolute;
-        left: 50%;
-        top: 50%;
-    }
-
-    .beijing-01__schedule .el-dialog .el-radio.is-disabled .el-radio__inner {
-        background: #E6E6E6 !important;
-    }
-
-    .beijing-01__schedule .el-dialog .el-radio.is-disabled .el-radio__label {
-        color: #C5C9CC !important;
-    }
-
-    .beijing-01__schedule .el-dialog .base-label {
-        background: rgba(0, 0, 0, x);
-        position: relative;
-        left: -15px;
-        top: -18px;
-    }
-
-    .beijing-01__schedule .el-dialog .el-form-item label {
-        font-weight: normal !important;
-        color: #000 !important;
-    }
-
-    .beijing-01__schedule .el-dialog .context {
-        height: 100px;
-        border: 2px inset #E2E2E2;
-        overflow-y: scroll;
-    }
-
-    .beijing-01__schedule .el-dialog .table {
-        margin-top: 10px;
-    }
-
-    .beijing-01__schedule .el-dialog .notice {
-        margin-left: 62px;
-        line-height: 30px;
-    }
-
-    .beijing-01__schedule .el-dialog .button-group {
-        margin-top: 10px;
-    }
-
-    .beijing-01__schedule .el-dialog .el-tree__empty-block {
-        background: #E9E9E9 !important;
-        color: #000 !important;
-    }
-</style>
diff --git a/src/jmapNew/theme/beijing_01/planSchedule/menuBar.vue b/src/jmapNew/theme/beijing_01/planSchedule/menuBar.vue
deleted file mode 100644
index e64ae3063..000000000
--- a/src/jmapNew/theme/beijing_01/planSchedule/menuBar.vue
+++ /dev/null
@@ -1,514 +0,0 @@
-<template>
-  <div id="PlanMenuBar">
-    <div class="nav">
-      <template v-for="(item,i) in menu">
-        <template v-if="noShowingChildren(item.children)">
-          <li class="nav-li" @click="hookClick(item)">
-            <span class="nav-li-text">{{ item.title }}</span>
-          </li>
-        </template>
-        <template v-else>
-          <li class="nav-li" @click.stop="popupMenuA(item, i)">
-            <span class="nav-li-text">{{ item.title }}</span>
-            <ul class="nav-ul" :class="{'active' :i==classA}">
-              <template v-for="(child,j) in item.children">
-                <template
-                  v-if="child.children&&child.children.length>0&&hasShowingChildren(child.children)"
-                >
-                  <li v-if="child.type === 'separator'" class="menu-separator">
-                    <span class="status">&ensp;</span>
-                    <span class="separator">&ensp;</span>
-                  </li>
-                  <li v-else-if="child.type === 'file'" class="menu-li">
-                    <div class="menu-li-block">
-                      <span class="menu-li-text">
-                        <span class="status">&ensp;</span>
-                        <el-button type="text" class="button" :disabled="child.disabled">
-                          <input
-                            :ref="child.label"
-                            type="file"
-                            accept=".csv, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel"
-                            @change="openLoadFile(child)"
-                          >
-                          {{ child.title }}
-                        </el-button>
-                      </span>
-                    </div>
-                  </li>
-                  <li v-else class="menu-li" @click.stop="popupMenuB(child, j)">
-                    <div class="menu-li-block">
-                      <span class="menu-li-text">
-                        <span class="status">&ensp;</span>
-                        <span class="label">{{ child.title }}</span>
-                      </span>
-                    </div>
-                    <ul class="menu-ul" :class="{'active' :j==classB}">
-                      <template v-for="(grandchild,k) in child.children">
-                        <li v-if="grandchild.type === 'separator'" class="menu-separator">
-                          <span class="status">&ensp;</span>
-                          <span class="separator">&ensp;</span>
-                        </li>
-                        <li v-else-if="grandchild.type === 'file'" class="menu-li">
-                          <div class="menu-li-block">
-                            <span class="menu-li-text">
-                              <span class="status">&ensp;</span>
-                              <el-button
-                                type="text"
-                                class="button"
-                                :disabled="grandchild.disabled"
-                              >
-                                <input
-                                  :ref="grandchild.label"
-                                  type="file"
-                                  accept=".csv, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel"
-                                  @change="openLoadFile(grandchild)"
-                                >
-                                {{ grandchild.title }}
-                              </el-button>
-                            </span>
-                          </div>
-                        </li>
-                        <li v-else class="menu-li" @click.stop="hookClick(grandchild)">
-                          <div class="menu-li-block">
-                            <span class="menu-li-text">
-                              <span class="status">&ensp;</span>
-                              <span class="label">{{ grandchild.title }}</span>
-                            </span>
-                          </div>
-                        </li>
-                      </template>
-                    </ul>
-                  </li>
-                </template>
-                <template v-else>
-                  <li v-if="child.type === 'separator'" class="menu-separator">
-                    <span class="status">&ensp;</span>
-                    <span class="separator">&ensp;</span>
-                  </li>
-                  <li v-else-if="child.type === 'file'" class="menu-li">
-                    <div class="menu-li-block">
-                      <span class="menu-li-text">
-                        <span class="status">&ensp;</span>
-                        <el-button type="text" class="button" :disabled="child.disabled">
-                          <input
-                            :ref="child.title"
-                            type="file"
-                            accept=".csv, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel"
-                            @change="openLoadFile(child)"
-                          >
-                          {{ child.title }}
-                        </el-button>
-                      </span>
-                    </div>
-                  </li>
-                  <li v-else class="menu-li" @click.stop="hookClick(child)">
-                    <div class="menu-li-block">
-                      <span class="menu-li-text">
-                        <span class="status">&ensp;</span>
-                        <span class="label">{{ child.title }}</span>
-                      </span>
-                    </div>
-                  </li>
-                </template>
-              </template>
-            </ul>
-          </li>
-        </template>
-      </template>
-    </div>
-  </div>
-</template>
-<script>
-import { mapGetters } from 'vuex';
-import { EventBus } from '@/scripts/event-bus';
-
-export default {
-    name: 'PlanMenuBar',
-    props: {
-        lineCode: {
-            type: String,
-            required: true
-        }
-    },
-    data() {
-        return {
-            classA: -1,
-            classB: -1,
-            tempClassA: -1,
-            tempClassB: -1,
-            menu: [
-                {
-                    title: '文件（F）',
-                    children: [
-                    ]
-                },
-                {
-                    title: '显示（V）',
-                    children: [
-                        // {
-                        //     title: '缩放',
-                        // },
-                        // {
-                        //     title: '单色显示历史计划',
-                        // },
-                        // {
-                        //     title: '彩色显示历史计划'
-                        // }
-                    ]
-                },
-                {
-                    title: '编辑（E）',
-                    children: [
-                        // {
-                        //     title: '修改',
-                        //     click: this.handleEditPlanningTrain
-                        // },
-                        // {
-                        //     title: '加任务',
-                        //     click: this.handleAddTask
-                        // },
-                        // {
-                        //     title: '删任务',
-                        //     click: this.handleDeleteTask
-                        // },
-                        // {
-                        //     title: '改表号',
-                        //     click: this.handleModifyingPlanId
-                        // },
-                        // {
-                        //     title: '平移多辆车',
-                        //     click: this.handleTranslationalMulTrain
-                        // }
-                    ]
-                },
-                {
-                    title: '工具（T）',
-                    children: [
-                        {
-                            title: '查看计划列表',
-                            click: this.handleViewPlanSchedule
-                        },
-                        {
-                            title: '创建一周计划',
-                            click: this.handleCreateWeekPlan
-                        },
-                        {
-                            title: '加载当天计划',
-                            click: this.handleReloadTodayPlan
-                        }
-                        // {
-                        //     title: '有效性检查',
-                        //     click: this.handleValidityCheck
-                        // }
-                    ]
-                },
-                {
-                    title: '帮助（H）',
-                    children: [
-                    ]
-                }
-            ]
-        };
-    },
-    computed: {
-        ...mapGetters('training', [
-            'mode'
-        ]),
-        ...mapGetters('map', [
-            'stationList'
-        ])
-    },
-    watch: {
-        tempClassA() {
-            this.classA = this.$store.state.menuOperation.break ? -1 : this.tempClassA;
-        },
-        tempClassB() {
-            this.classB = this.$store.state.menuOperation.break ? -1 : this.tempClassB;
-        },
-        '$store.state.menuOperation.break': function (val) {
-            if (val) {
-                this.classA = this.classB = -1;
-            } else {
-                this.classA = this.tempClassA;
-                this.classB = this.tempClassB;
-            }
-        }
-    },
-    mounted() {
-        this.initMenu();
-    },
-    methods: {
-        initMenu() {
-            this.clickEvent();
-            this.closeMenu();
-        },
-        clickEvent() {
-            const self = this;
-            window.onclick = function (e) {
-                self.closeMenu(false);
-            };
-        },
-        noShowingChildren(children) {
-            if (!children || children.length <= 0) {
-                return true;
-            }
-            return false;
-        },
-        hasShowingChildren(children) {
-            if (children && children.length > 0) {
-                return true;
-            }
-            return false;
-        },
-        closeMenu() {
-            this.classA = this.tempClassA = -1;
-            this.classB = this.tempClassB = -1;
-        },
-        hookClick(item, event) {
-            this.closeMenu();
-            setTimeout(() => {
-                if (item && typeof item.click == 'function') {
-                    item.click();
-                }
-            }, 500);
-        },
-        popupMenuA(item, index) {
-            this.clickEvent();
-            this.tempClassA = index;
-            this.tempClassB = -1;
-        },
-        popupMenuB(item, index) {
-            this.tempClassB = index;
-        },
-        openLoadFile(item) {
-            const obj = this.$refs[item.title][0];
-            if (obj.files) {
-                const file = obj.files[0];
-                item.click(file);
-                obj.value = '';
-            }
-        },
-        doClose() {
-            this.$nextTick(() => {
-                EventBus.$emit('closeMenu');
-            });
-        },
-        // 刷新
-        refresh() {
-            this.closeMenu(true);
-            EventBus.$emit('refresh');
-        },
-        undeveloped() {
-            this.doClose();
-            this.$alert('实现中......', '提示', {
-                confirmButtonText: '确定',
-                callback: action => {
-                }
-            });
-        },
-        // 修改计划
-        handleEditPlanningTrain() {
-            this.$emit('dispatchDialog', { name: 'modifyingPlan' });
-        },
-        // 添加任务
-        handleAddTask() {
-            const params = this.$store.state.runPlan.selected;
-            this.$emit('dispatchDialog', { name: 'addTask', params });
-        },
-        // 删除任务
-        handleDeleteTask() {
-            const params = this.$store.state.runPlan.selected;
-            this.$emit('dispatchDialog', { name: 'deleteTask', params });
-        },
-        // 修改任务
-        handleModifyingTask() {
-            const params = this.$store.state.runPlan.selected;
-            this.$emit('dispatchDialog', { name: 'modifyingTask', params });
-        },
-        // 改表号
-        handleModifyingPlanId() {
-            this.$emit('dispatchDialog', { name: 'modifyingPlanId' });
-        },
-        // 平移多辆车
-        handleTranslationalMulTrain() {
-            this.$emit('dispatchDialog', { name: 'translationalMulTrain' });
-        },
-        // 查看计划列表
-        handleViewPlanSchedule() {
-            this.$emit('dispatchDialog', { name: 'managePlanList' });
-        },
-        // 创建一周计划
-        handleCreateWeekPlan() {
-            this.$emit('dispatchDialog', { name: 'createWeekPlan' });
-        },
-        // 创建当天计划
-        handleReloadTodayPlan() {
-            this.$emit('dispatchDialog', { name: 'createTodayPlan' });
-        },
-        // 有效性检查
-        handleValidityCheck() {
-        }
-    }
-};
-</script>
-
-<style scoped rel="stylesheet/scss" lang="scss">
-    @import "src/styles/mixin.scss";
-    $top: 25px;
-    $width: 30px;
-    $height: 20px;
-    $menuPadding: 10px;
-    $menuItemHeight: 30px;
-    $menuItemWidth: 160px;
-    $menuItemPadding: 5px;
-
-    #PlanMenuBar {
-        z-index: 10;
-        position: absolute;
-        top: $top;
-        width: 100%;
-        height: $height;
-        line-height: $height;
-    }
-
-    .nav {
-        display: block;
-        cursor: pointer;
-        color: #0000;
-        background: #EBEADB;
-        list-style: none;
-        border: 1px solid #B6BCCC !important;
-    }
-
-    .nav-li {
-        position: relative;
-        display: inline-block;
-        padding-left: $menuPadding;
-        padding-right: $menuPadding;
-    }
-
-    .nav-li:active {
-        background: #C9D0E1;
-        border-radius: 4px;
-    }
-
-    .nav-li-text {
-        font-size: 13px;
-        color: #000;
-        text-align: center;
-        text-decoration: none;
-    }
-
-    .nav-ul {
-        display: none;
-        position: absolute;
-        list-style: none;
-        border: 1px solid gray;
-        width: $menuItemWidth;
-        padding: 0px;
-        margin: 0px;
-    }
-
-    .menu-ul {
-        display: none;
-        list-style: none;
-        background: #F0F0F0;
-        line-height: $menuItemHeight;
-        width: $menuItemWidth;
-        bottom: $menuItemHeight;
-    }
-
-    .active {
-        position: absolute;
-        display: block !important;
-    }
-
-    .menu-ul-text {
-        font-size: 14px;
-        color: #000;
-        letter-spacing: 0;
-        height: $menuItemHeight;
-        line-height: $menuItemHeight;
-        border-left: 1px solid #000;
-        border-right: 1px solid #000;
-    }
-
-    .menu-separator {
-        text-align: left;
-        background: #F0F0F0;
-        height: 2px;
-        line-height: 2px;
-    }
-
-    .menu-separator .status {
-        display: inline-block;
-        border-right: 1px inset #CACACA;
-        width: $width;
-        height: 100%;
-        background: #EFECDE;
-    }
-
-    .menu-separator .separator {
-        display: inline-block;
-        background: #CACACA;
-        margin-left: 5px;
-        height: 2px;
-        width: $menuItemWidth - $width - 30px;
-    }
-
-    .menu-li {
-        text-align: left;
-        background: #F0F0F0;
-        height: $menuItemHeight;
-        line-height: $menuItemHeight;
-    }
-
-    .menu-li-block {
-        letter-spacing: 0;
-        height: $menuItemHeight;
-        line-height: $menuItemHeight;
-    }
-
-    .menu-li-text {
-        font-size: 14px;
-        color: #000;
-    }
-
-    .menu-li-text .status {
-        display: inline-block;
-        border-right: 1px inset #CACACA;
-        width: $width;
-        background: #EFECDE;
-    }
-
-    .menu-li-text .label {
-        display: inline-block;
-        margin-left: 5px;
-    }
-
-    .menu-li-text .button {
-        position: relative;
-        overflow: hidden;
-        margin-left: 10px;
-        line-height: 0px;
-        width: $menuItemWidth - $width;
-        top: -$menuItemHeight;
-        color: #000;
-        cursor: pointer;
-
-        input {
-            opacity: 0;
-            cursor: pointer;
-            position: absolute;
-            top: 0px;
-            width: $menuItemWidth - $width - 10px;
-        }
-    }
-
-    .menu-li-block:hover {
-        background: #C9DEF7;
-        box-sizing: border-box;
-        -moz-box-sizing: border-box;
-        -webkit-box-sizing: border-box;
-    }
-</style>
diff --git a/src/jmapNew/theme/beijing_01/planSchedule/menuTool.vue b/src/jmapNew/theme/beijing_01/planSchedule/menuTool.vue
deleted file mode 100644
index d3ecde016..000000000
--- a/src/jmapNew/theme/beijing_01/planSchedule/menuTool.vue
+++ /dev/null
@@ -1,172 +0,0 @@
-<template>
-    <div id="PlanMenuTool">
-        <div class="nav">
-            <div class="tool" v-for="(item,index) in tools" :key="index">
-                <img :src="item.src" :alt="item.title" />
-            </div>
-        </div>
-    </div>
-</template>
-<script>
-    import { mapGetters } from 'vuex';
-    import { prefixIntrger } from '@/utils/date';
-    import logo_ from '@/assets/logo_.png';
-
-
-    export default {
-        name: 'PlanMenuTool',
-        data() {
-            return {
-                tools: [
-                    {
-                        title: '服务器1',
-                        operate: '',
-                        src: logo_,
-                        click: this.undeveloped,
-                    },
-                    {
-                        title: '服务器2',
-                        operate: '',
-                        src: '',
-                        click: this.undeveloped,
-                    },
-                    {
-                        title: '前置机1',
-                        operate: '',
-                        src: '',
-                        click: this.undeveloped,
-                    },
-                    {
-                        title: '前置机2',
-                        operate: '',
-                        src: '',
-                        click: this.undeveloped,
-                    },
-                    {
-                        title: '主调',
-                        operate: '',
-                        src: '',
-                        click: this.undeveloped,
-                    },
-                    {
-                        title: '调度台1',
-                        operate: '',
-                        src: '',
-                        click: this.undeveloped,
-                    },
-                    {
-                        title: '调度台2',
-                        operate: '',
-                        src: '',
-                        click: this.undeveloped,
-                    },
-                    {
-                        title: '调度台3',
-                        operate: '',
-                        src: '',
-                        click: this.undeveloped,
-                    },
-                    {
-                        title: '大屏',
-                        operate: '',
-                        src: '',
-                        click: this.undeveloped,
-                    },
-                    {
-                        title: '维护工作站',
-                        operate: '',
-                        src: '',
-                        click: this.undeveloped,
-                    },
-                    {
-                        title: '运行图显示人工站',
-                        operate: '',
-                        src: '',
-                        click: this.undeveloped,
-                    },
-                    {
-                        title: '跳停',
-                        operate: '',
-                        src: '',
-                        click: this.undeveloped,
-                    },
-                    {
-                        title: '扣车',
-                        operate: '',
-                        src: '',
-                        click: this.undeveloped,
-                    },
-                    {
-                        title: '列车报警',
-                        operate: '',
-                        src: logo_,
-                        click: this.undeveloped,
-                    }
-                ]
-            }
-        },
-        watch: {
-            '$store.state.training.initTime': function (initTime) {
-                let date = new Date(initTime);
-                this.time = `${prefixIntrger(date.getHours(), 2)}:${prefixIntrger(date.getMinutes(), 2)}${prefixIntrger(date.getSeconds(), 2)}`
-            }
-        },
-        computed: {
-            isShowSystemTime() {
-                return this.$route.params.mode == 'demon' || this.$route.params.mode === 'dp' || !this.$route.params.mode;
-            }
-        },
-        mounted() {
-            this.initTools();
-        },
-        methods: {
-            initTools() {
-                this.tools = [];
-            }
-        }
-    }
-</script>
-
-<style scoped rel="stylesheet/scss" lang="scss" scoped>
-    @import "src/styles/mixin.scss";
-    $top: 48px;
-    $width: 25px;
-    $height: 25px;
-
-    #PlanMenuTool {
-        z-index: 5;
-        position: absolute;
-        width: 100%;
-        top: $top;
-    }
-
-    .nav {
-        display: block;
-        color: #0000;
-        background: #EBEADB;
-        border: 1px solid #B6BCCC !important;
-        border-bottom: 2px solid #B6BCCC !important;
-        list-style: none;
-        height: $height;
-        line-height: $height;
-    }
-
-    .tool {
-        padding-left: 10px;
-        display: flex;
-        justify-content: center;
-        cursor: pointer;
-        position: relative;
-        float: left;
-        margin: 1px;
-        width: $width;
-
-        img {
-            display: block;
-            text-align: center;
-            padding-top: 2px;
-            height: $height - 5;
-            width: $width - 5;
-        }
-    }
-</style>
\ No newline at end of file
diff --git a/src/jmapNew/theme/beijing_01/planSchedule/schedule.vue b/src/jmapNew/theme/beijing_01/planSchedule/schedule.vue
deleted file mode 100644
index 82a3c9ed3..000000000
--- a/src/jmapNew/theme/beijing_01/planSchedule/schedule.vue
+++ /dev/null
@@ -1,468 +0,0 @@
-<template>
-  <div id="PlanSchedule" :style="{top: top+'px', height: height+'px'}">
-    <div class="left">
-      <div :id="runPlanId" />
-    </div>
-    <div class="right">
-      <data-table
-        ref="serviceTable"
-        :height="height/2"
-        :config="serviceNumberConfig"
-        :style="{top: top-height/2+'px'}"
-        @touch="scheduleTouch"
-      />
-      <data-table
-        ref="tripTable"
-        :height="height/2"
-        :config="tripNumberConfig"
-        :style="{top: top-height/2+'px'}"
-        @touch="trainNumTouch"
-      />
-    </div>
-  </div>
-</template>
-
-<script>
-import { mapGetters } from 'vuex';
-import { timeFormat } from '@/utils/date';
-import {toTimeStamp, formatDuring} from '@/utils/date';
-import DataTable from '../menusPlan/components/dataTable';
-import echarts from 'echarts';
-
-export default {
-    name: 'PlanSchedule',
-    components: {
-        DataTable
-    },
-    props: {
-        group: {
-            type: String,
-            required: true
-        },
-        lineCode: {
-            type: String,
-            required: true
-        },
-        maxWidth: {
-            type: Number,
-            require: true
-        },
-        maxHeight: {
-            type: Number,
-            required: true
-        }
-    },
-    data() {
-        return {
-            top: 0,
-            height: 0,
-            heights: [100, 100],
-            runPlanId: 'plan-schedule-id',
-            myChart: null,
-            PlanConvert: {},
-            serviceNumberConfig: {
-                data: [],
-                highlightCurrentRow: true,
-                handleChange: this.serviceNumberChange,
-                showClose: false,
-                columns: [
-                    {
-                        prop: 'serviceNumber',
-                        label: '表号'
-                    },
-                    {
-                        width: 40
-                    }
-                ]
-            },
-            tripNumberConfig: {
-                data: [],
-                highlightCurrentRow: true,
-                handleChange: this.tripNumberChange,
-                showClose: false,
-                columns: [
-                    {
-                        prop: 'tripNumber',
-                        label: '车次号'
-                    },
-                    {
-                        width: 40
-                    }
-                ]
-            },
-            realData: {},
-            kmRangeCoordMap: {},
-            option: {
-                title: {
-                    text: '',
-                    left: 'center'
-                },
-                grid: {
-                    top: '30px',
-                    left: '120px',
-                    right: '40px',
-                    bottom: '65px',
-                    containLabel: true,
-                    backgroundColor: 'floralwhite'
-                },
-                toolbox: {
-                    // right: '30px',
-                    // feature: {
-                    //     dataZoom: {
-                    //         yAxisIndex: 'none'
-                    //     },
-                    //     restore: {},
-                    //     saveAsImage: {}
-                    // }
-                },
-                tooltip: {
-                    axisPointer: {
-                        trigger: 'item',
-                        type: 'cross'
-                    },
-                    formatter: this.axisTooltip,
-                    borderWidth: 1
-                },
-                xAxis: [
-                    {
-                        type: 'category',
-                        boundaryGap: false,
-                        data: [],
-                        axisLine: {
-                            onZero: false,
-                            lineStyle: {
-                                width: 2,
-                                color: '#d14a61'
-                            }
-                        },
-                        axisLabel: {
-                            formatter: this.xAxisLableFormat,
-                            textStyle: {
-                                color: '#333'
-                            }
-                        },
-                        axisPointer: {
-                            snap: true,
-                            label: {
-                                formatter: this.xAxisPointFormat,
-                                backgroundColor: 'rgb(255,0,0,0.5)',
-                                color: 'white'
-                            }
-                        }
-                    }
-                ],
-                yAxis: {
-                    type: 'value',
-                    splitLine: {
-                        show: false
-                    },
-                    axisTick: {
-                        show: false
-                    },
-                    axisLine: {
-                        onZero: false,
-                        lineStyle: {
-                            width: 2,
-                            color: '#d14a61'
-                        }
-                    },
-                    axisLabel: {
-                        interval: 'auto',
-                        formatter: this.yAxisLableFormat
-                    },
-                    axisPointer: {
-                        xAxisIndex: 'all',
-                        label: {
-                            formatter: this.yAxisPointFormat,
-                            backgroundColor: 'rgb(0,100,0,0.5)',
-                            color: 'white'
-                        }
-                    },
-                    min: 0,
-                    max: 0
-                },
-                series: [],
-                dataZoom: [
-                    {
-                        type: 'inside'
-                    },
-                    {
-                        fiterMode: 'filter',
-                        handleIcon: 'M10.7,11.9v-1.3H9.3v1.3c-4.9,0.3-8.8,4.4-8.8,9.4c0,5,3.9,9.1,8.8,9.4v1.3h1.3v-1.3c4.9-0.3,8.8-4.4,8.8-9.4C19.5,16.3,15.6,12.2,10.7,11.9z M13.3,24.4H6.7V23h6.6V24.4z M13.3,19.6H6.7v-1.4h6.6V19.6z',
-                        handleSize: '80%',
-                        handleStyle: {
-                            color: '#fff',
-                            shadowBlur: 3,
-                            shadowColor: 'rgba(0, 0, 0, 0.6)',
-                            shadowOffsetX: 2,
-                            shadowOffsetY: 2
-                        },
-                        bottom: '20px'
-                    }
-                ]
-            },
-            absoluteTime: 2 * 3600,
-            indexKmRangeMap: {}
-        };
-    },
-    computed: {
-        ...mapGetters('runPlan', [
-            'stations'
-        ])
-    },
-    watch: {
-        maxWidth() {
-            this.setPosition();
-        },
-        maxHeight() {
-            this.setPosition();
-        },
-        '$store.state.runPlan.planLoadedCount': async function () {
-            await this.loadChartPage();
-        },
-        '$store.state.runPlan.planSizeCount': function () {
-            this.reSize({ width: this.$store.state.runPlan.width, height: this.$store.state.runPlan.height });
-        },
-        '$store.state.runPlan.selected.serviceNumber': function (val) {
-            const index = this.serviceNumberConfig.data.findIndex(elem => {
-                return elem.serviceNumber == val;
-            });
-
-            this.$refs.serviceTable.setCurrentRow(this.serviceNumberConfig.data[index]);
-        },
-        '$store.state.runPlan.selected.tripNumber': function (val) {
-            const index = this.tripNumberConfig.data.findIndex(elem => {
-                return elem.tripNumber == val;
-            });
-            this.$refs.tripTable.setCurrentRow(this.tripNumberConfig.data[index]);
-        }
-    },
-    mounted() {
-        this.PlanConvert = this.$theme.loadPlanConvert(this.lineCode);
-    },
-    beforeDestroy() {
-        this.destroy();
-    },
-    methods: {
-        serviceNumberChange(row) {
-            if (row) {
-                this.$store.dispatch('runPlan/setSelected', { serviceNumber: row.serviceNumber, tripNumber: null });
-                const serviceObj = this.$store.state.runPlan.editData[row.serviceNumber];
-                if (serviceObj) {
-                    this.analyticalTripNumber(serviceObj.trainMap);
-                }
-            }
-        },
-        tripNumberChange(row) {
-            if (row) {
-                this.$store.dispatch('runPlan/setSelected', { serviceNumber: this.$store.state.runPlan.selected.serviceNumber, tripNumber: row.tripNumber });
-            }
-        },
-        async analyticalServiceNumber(data) {
-            this.serviceNumberConfig.data = Object.keys(data || {})
-                .sort((a, b) => { return data[a].oldIndex - data[b].oldIndex; })
-                .map(serviceNumber => { return { serviceNumber }; });
-        },
-        async analyticalTripNumber(data) {
-            this.tripNumberConfig.data = Object.keys(data || {})
-                .sort((a, b) => { return data[a].oldIndex - data[b].oldIndex; })
-                .map(tripNumber => { return { tripNumber }; });
-        },
-        async setPosition() {
-            this.$nextTick(() => {
-                let top = 3;
-                const width = this.maxWidth * 0.85;
-                let height = this.maxHeight;
-
-                const titleBar = document.getElementById('PlanTitleBar');
-                const menuBar = document.getElementById('PlanMenuBar');
-                const menuTool = document.getElementById('PlanMenuTool');
-                const statusBar = document.getElementById('PlanStatusBar');
-
-                if (titleBar) {
-                    top += (titleBar.offsetHeight || 0);
-                }
-
-                if (menuBar) {
-                    top += (menuBar.offsetHeight || 0);
-                }
-
-                if (menuTool) {
-                    top += (menuTool.offsetHeight || 0);
-                }
-
-                if (statusBar) {
-                    height -= (statusBar.offsetHeight || 0);
-                }
-
-                height = height - top;
-                this.$store.dispatch('runPlan/resize', { width, height });
-
-                if (this.top != top) {
-                    this.top = top;
-                }
-
-                if (this.height != height) {
-                    this.height = height - 20 * 2;
-                }
-            });
-        },
-        async loadChartPage() {
-            try {
-                let series = [];
-                const stations = this.$store.state.runPlan.stations;
-                const planData = this.$store.state.runPlan.planData;
-
-                this.viewDisabled = true;
-                this.kmRangeCoordMap = this.PlanConvert.convertStationsToMap(stations);
-                series = this.pushModels(series, [this.PlanConvert.initializeYaxis(stations)]);
-                series = this.pushModels(series, this.PlanConvert.convertDataToModels(planData, stations, this.kmRangeCoordMap, { color: '#000', width: 0.5 }));
-                await this.loadInitData(series);
-                await this.analyticalServiceNumber(this.$store.state.runPlan.editData);
-                this.viewDisabled = false;
-
-            } catch (error) {
-                this.viewDisabled = false;
-                this.$messageBox(`加载运行图数据失败`);
-            }
-        },
-        async loadInitData(series) {
-            this.myChart && this.myChart.showLoading();
-            await this.xAxisInit();
-            await this.yAxisInit();
-            await this.loadInitChart(series);
-            this.myChart && this.myChart.hideLoading();
-        },
-        pushModels(series, models) {
-            if (models && models.length) {
-                models.forEach(elem => {
-                    if (elem) {
-                        series.push(elem);
-                    }
-                });
-            }
-
-            return series;
-        },
-        loadInitChart(series) {
-            return new Promise((resolve, reject) => {
-                try {
-                    this.destroy();
-                    let startValue = 3600 + this.PlanConvert.TranslationTime;
-                    const offsetTime = 3600;
-                    const initTime = toTimeStamp(formatDuring(this.$store.state.training.initTime));
-                    startValue = initTime - this.PlanConvert.TranslationTime;
-                    this.option.dataZoom[0].startValue = this.option.dataZoom[1].startValue = startValue - offsetTime;
-                    this.option.dataZoom[0].endValue = this.option.dataZoom[1].endValue = startValue + offsetTime;
-                    this.option.series = series;
-                    this.myChart = echarts.init(document.getElementById(this.runPlanId));
-                    if (this.myChart) {
-                        this.myChart.setOption(this.option);
-                        this.reSize({ width: this.$store.state.runPlan.width, height: this.$store.state.runPlan.height });
-                        this.myChart.on('click', this.mouseClick);
-                    }
-                    resolve(true);
-                } catch (error) {
-                    reject(error);
-                }
-            });
-
-        },
-        xAxisPointFormat(params) {
-            return timeFormat(params.value);
-        },
-        yAxisPointFormat(params) {
-            return this.PlanConvert.computedFormatYAxis(this.stations, params);
-        },
-        xAxisLableFormat(value, index) {
-            if (value % 60 === 0) {
-                return timeFormat(value);
-            }
-        },
-        yAxisLableFormat(value, index) {
-            return '';
-        },
-        xAxisInit() {
-            const list = [];
-            for (var time = 0 + this.PlanConvert.TranslationTime; time < 3600 * 24 + this.PlanConvert.TranslationTime; time++) {
-                list.push(time);
-            }
-
-            const startValue = 3600 * 6;
-            const offsetTime = 3600 * 1;
-
-            this.option.xAxis[0].data = list;
-            if (!this.option.dataZoom[0].startValue) {
-                this.option.dataZoom[0].startValue = this.option.dataZoom[1].startValue = startValue - offsetTime;
-            }
-
-            if (!this.option.dataZoom[0].endValue) {
-                this.option.dataZoom[0].endValue = this.option.dataZoom[1].endValue = startValue + offsetTime;
-            }
-        },
-        yAxisInit() {
-            if (Object.keys(this.PlanConvert).length) {
-                this.option.yAxis.min = this.PlanConvert.computedYaxisMinValue(this.stations);
-                this.option.yAxis.max = this.PlanConvert.computedYaxisMaxValue(this.stations);
-            }
-        },
-        axisTooltip(param) {
-            const station = this.stations[Math.floor((param.data[1] - this.PlanConvert.EdgeHeight) / this.PlanConvert.CoordMultiple)] || { name: '', kmRange: '' };
-            return [
-                `Point Data <hr size=1 style=" margin: 3px 0">`,
-                `车站名称: ${station.name}<br>`,
-                `车站公里标: ${station.kmRange} km <br>`,
-                `到站时间: ${timeFormat(param.data[0] + this.PlanConvert.TranslationTime)} (${param.data[0]})<br>`
-            ].join('');
-        },
-        mouseClick(params) {
-            const model = {
-                serviceNumber: params.seriesName
-            };
-            this.$store.dispatch('runPlan/setSelected', model);
-        },
-        reSize(opt) {
-            if (this.myChart) {
-                this.myChart.resize({
-                    width: opt.width,
-                    height: opt.height,
-                    silent: false
-                });
-            }
-        },
-        destroy() {
-            if (this.myChart && this.myChart.isDisposed) {
-                this.myChart.dispose();
-                this.myChart = null;
-            }
-        },
-        scheduleTouch() {
-
-        },
-        trainNumTouch() {
-
-        }
-    }
-};
-</script>
-<style scoped rel="stylesheet/scss" lang="scss">
-    @import "src/styles/mixin.scss";
-
-    #PlanSchedule {
-        z-index: 5;
-        position: absolute;
-        width: 100%;
-
-        .left {
-            height: 100%;
-            width: 85%;
-            float: left;
-        }
-
-        .right {
-            height: 100%;
-            width: 15%;
-            float: right;
-        }
-    }
-</style>
diff --git a/src/jmapNew/theme/beijing_01/planSchedule/statusBar.vue b/src/jmapNew/theme/beijing_01/planSchedule/statusBar.vue
deleted file mode 100644
index 4c1418fb3..000000000
--- a/src/jmapNew/theme/beijing_01/planSchedule/statusBar.vue
+++ /dev/null
@@ -1,107 +0,0 @@
-<template>
-  <data-table
-    id="PlanStatusBar"
-    ref="dataTable"
-    :height="height-11"
-    :config="stationListConfig"
-    :close="false"
-    :style="{top: maxmini? maxTop-110+'px':maxTop-21+'px'}"
-    @touch="touch"
-  />
-</template>
-
-<script>
-import DataTable from '../menusPlan/components/dataTable';
-import { formatTime, formatName } from '@/utils/runPlan';
-
-export default {
-	name: 'PlanStatusBar',
-	components: {
-		DataTable
-	},
-	props: {
-		maxTop: {
-			type: Number,
-			required: true
-		}
-	},
-	data() {
-		return {
-			maxmini: true,
-			height: 100,
-			stationListConfig: {
-				data: [],
-				showClose: true,
-				highlightCurrentRow: true,
-				columns: [
-					{
-						prop: 'stationName',
-						label: '站台',
-						width: 400
-					},
-					{
-						prop: 'startTime',
-						label: '到点'
-					},
-					{
-						prop: 'stopTime',
-						label: '停站时间'
-					},
-					{
-						prop: 'endTime',
-						label: '发点'
-					},
-					{
-						prop: 'level',
-						label: '运行等级'
-
-					}
-				]
-			}
-		};
-	},
-	watch: {
-		'$store.state.runPlan.selected': function (select) {
-			this.stationListConfig.data = [];
-			const serviceObj = this.$store.state.runPlan.editData[select.serviceNumber];
-			if (serviceObj) {
-				const trainMap = serviceObj.trainMap;
-				if (trainMap) {
-					const trainObj = trainMap[select.tripNumber];
-					if (trainObj) {
-						const stationTimeList = trainObj.stationTimeList;
-						if (stationTimeList && stationTimeList.length) {
-							stationTimeList.forEach((elem, index) => {
-								const stationObj = {
-									stationName: formatName(elem.stationCode),
-									startTime: formatTime(index == 0 ? null : stationTimeList[index - 1].secondTime),
-									stopTime: formatTime(index == 0 ? null : elem.secondTime - stationTimeList[index - 1].secondTime),
-									endTime: formatTime(elem.secondTime),
-									level: ''
-								};
-								this.stationListConfig.data.push(stationObj);
-							});
-						}
-					}
-				}
-			}
-		}
-	},
-	methods: {
-		touch(maxmini) {
-			this.maxmini = maxmini;
-			this.$emit('setPosition');
-		}
-	}
-};
-</script>
-
-<style scoped rel="stylesheet/scss" lang="scss">
-    @import "src/styles/mixin.scss";
-
-    #PlanStatusBar {
-        z-index: 5;
-        position: absolute;
-        width: 100%;
-    }
-</style>
diff --git a/src/jmapNew/theme/beijing_01/planSchedule/titleBar.vue b/src/jmapNew/theme/beijing_01/planSchedule/titleBar.vue
deleted file mode 100644
index 689c3486a..000000000
--- a/src/jmapNew/theme/beijing_01/planSchedule/titleBar.vue
+++ /dev/null
@@ -1,75 +0,0 @@
-<template>
-    <div id="PlanTitleBar">
-        <img class="logo" :src="logoImg" />
-        <span> {{mapName}} &ensp;</span>
-        <span v-if="runPlanName">({{runPlanName}})</span>
-        <span class="system-close el-icon-close" @click="back"></span>
-    </div>
-</template>
-
-<script>
-    import logo_ from '@/assets/logo_.png';
-    import { getPublishMapInfo } from '@/api/jmap/map';
-
-    export default {
-        name: 'PlanTitleBar',
-        data() {
-            return {
-                mapName: '',
-                logoImg: logo_
-            }
-        },
-        computed: {
-            runPlanName() {
-                return this.$route.query.planName || '';
-            }
-        },
-        mounted() {
-            if (this.$route.query.mapId) {
-                getPublishMapInfo(this.$route.query.mapId).then(resp => {
-                    this.mapName = resp.data.name;
-                })
-            }
-        },
-        methods: {
-            back() {
-                this.$emit('back');
-            }
-        }
-    }
-</script>
-<style scoped rel="stylesheet/scss" lang="scss" scoped>
-    @import "src/styles/mixin.scss";
-    $width: 25px;
-    $height: 25px;
-
-    #PlanTitleBar {
-        z-index: 10;
-        display: flex;
-        position: absolute;
-        width: 100%;
-        height: $height;
-        line-height: $height;
-        background: -webkit-linear-gradient(#0055E8, #0099F8);
-        background: -o-linear-gradient(#0055E8, #0099F8);
-        background: -moz-linear-gradient(#0055E8, #0099F8);
-        background: linear-gradient(#0055E8, #0099F8);
-        color: white;
-        font: bold;
-        font-size: 16px;
-
-        .logo {
-            display: inline-block;
-            width: $width;
-            height: $height;
-            padding-right: 5px;
-        }
-
-        .system-close {
-            width: 25px;
-            height: 25px;
-            position: absolute;
-            right: 1px;
-        }
-    }
-</style>
\ No newline at end of file
diff --git a/src/jmapNew/theme/chengdu_01/model.js b/src/jmapNew/theme/chengdu_01/model.js
index ed34da08c..dd040cf61 100644
--- a/src/jmapNew/theme/chengdu_01/model.js
+++ b/src/jmapNew/theme/chengdu_01/model.js
@@ -14,6 +14,9 @@ class Model {
         this['private'][deviceType.StationControl] = {
             indicatorShow: true									// 标识灯名称显示
         };
+        this['private'][deviceType.Station] = {
+            kmPostShow: true									// 公里标显示
+        };
         this['private'][deviceType.Switch] = {
             nameShow: true
         };
diff --git a/src/jmapNew/theme/chengdu_01/planSchedule/index.vue b/src/jmapNew/theme/chengdu_01/planSchedule/index.vue
deleted file mode 100644
index 696eed1e0..000000000
--- a/src/jmapNew/theme/chengdu_01/planSchedule/index.vue
+++ /dev/null
@@ -1,403 +0,0 @@
-<template>
-  <div class="plan-schedule" style="width: 100%">
-    <title-bar ref="titleBar" @back="back" />
-    <menu-bar ref="menuBar" :line-code="lineCode" @dispatchDialog="dispatchDialog" />
-    <schedule ref="schedule" :group="group" :line-code="lineCode" :max-height="height" :max-width="width" />
-    <status-bar ref="statusBar" :max-top="height" @setPosition="setPosition" />
-
-    <manage-plan-list ref="managePlanList" @dispatchDialog="dispatchDialog" />
-    <create-week-plan ref="createWeekPlan" @reloadTable="reloadTable" />
-    <create-today-plan ref="createTodayPlan" />
-    <modifying-plan ref="modifyingPlan" @dispatchDialog="dispatchDialog" />
-    <add-task ref="addTask" />
-    <delete-task ref="deleteTask" />
-    <modifying-task ref="modifyingTask" />
-  </div>
-</template>
-
-<script>
-import TitleBar from './titleBar';
-import MenuBar from './menuBar';
-import StatusBar from './statusBar';
-import Schedule from './schedule';
-import ManagePlanList from '../menusPlan/managePlanList';
-import CreateWeekPlan from '../menusPlan/createWeekPlan';
-import CreateTodayPlan from '../menusPlan/createTodayPlan';
-import ModifyingPlan from '../menusPlan/modifyingPlan';
-import AddTask from '../menusPlan/addTask';
-import DeleteTask from '../menusPlan/deleteTask';
-import ModifyingTask from '../menusPlan/modifyingTask';
-
-export default {
-    name: 'Menus',
-    components: {
-        TitleBar,
-        MenuBar,
-        StatusBar,
-        Schedule,
-        ManagePlanList,
-        CreateWeekPlan,
-        CreateTodayPlan,
-        ModifyingPlan,
-        AddTask,
-        DeleteTask,
-        ModifyingTask
-    },
-    props: {
-        group: {
-            type: String,
-            required: true
-        }
-    },
-    data() {
-        return {
-        };
-    },
-    computed: {
-        skinCode() {
-            return this.$route.query.skinCode || '02';
-        },
-        width() {
-            return this.$store.state.app.width;
-        },
-        height() {
-            return this.$store.state.app.height;
-        }
-    },
-    methods: {
-        setPosition() {
-            this.$nextTick(() => {
-                this.$refs.schedule.setPosition();
-            });
-        },
-        dispatchDialog(dialogObj) {
-            this.$nextTick(() => {
-                if (this.$refs[dialogObj.name]) {
-                    this.$refs[dialogObj.name].doShow(dialogObj.params);
-                }
-            });
-        },
-        reloadTable(dialogObj) {
-            if (this.$refs[dialogObj.name]) {
-                this.$refs[dialogObj.name].reloadTable();
-            }
-        },
-        confirm(params) {
-        },
-        back() {
-            this.$emit('back');
-        }
-    }
-};
-</script>
-
-<style>
-    .plan-schedule {
-        position: absolute;
-        background: gray;
-    }
-
-    .plan-schedule .pop-menu {
-        background: #F0F0F0;
-    }
-
-    .plan-schedule .pop-menu span {
-        color: #000;
-    }
-
-    .plan-schedule .system-close {
-        cursor: pointer;
-        position: absolute;
-        right: 0px;
-        background: -webkit-linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
-        background: -o-linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
-        background: -moz-linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
-        background: linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
-        border: 1px solid white;
-        border-radius: 4px;
-    }
-
-    .plan-schedule .system-close::before {
-        position: absolute;
-        height: 22px;
-        line-height: 22px;
-        top: 0px;
-        left: 0px;
-        font-size: x-large;
-    }
-
-    .plan-schedule .pop-menu .is-disabled span {
-        color: #B4B3B8;
-    }
-
-    .beijing-01__schedule {
-        overflow: hidden !important;
-    }
-
-    .beijing-01__schedule .el-dialog {
-        background: rgba(0, 85, 231, 1);
-        box-shadow: 1px hsla(240, 0%, 100%, 0.5) inset;
-        border: 2px solid #727375;
-        border-radius: 4px;
-        color: #000;
-        font-size: 14px;
-    }
-
-    .beijing-01__schedule .el-dialog .el-dialog__header {
-        height: 30px;
-        padding: 5px;
-    }
-
-    .beijing-01__schedule .el-dialog .el-dialog__footer {
-        background: #ECE9D8;
-        opacity: 1;
-    }
-
-    .beijing-01__schedule .el-dialog .el-dialog__body {
-        padding-top: 10px;
-        padding-bottom: 10px;
-        padding-left: 5px;
-        padding-right: 5px;
-        margin: 0px 3px 3px 3px;
-        border: 2px solid rgba(120, 121, 123, 0.5);
-        box-shadow: 1px hsla(240, 0%, 100%, 0.5) inset;
-        color: #000;
-        background: #ECE9D8;
-        opacity: 1;
-    }
-
-    .beijing-01__schedule .el-dialog .el-dialog__title {
-        font-size: 16px;
-    }
-
-    .beijing-01__schedule .el-dialog .el-dialog__headerbtn {
-        background: -webkit-linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
-        background: -o-linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
-        background: -moz-linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
-        background: linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
-        border: 1px solid white;
-        border-radius: 4px;
-        top: 0px;
-        right: 3px;
-        line-height: 26px;
-        width: 26px;
-    }
-
-    .beijing-01__schedule .el-dialog .el-dialog__headerbtn .el-icon-close:before {
-        font-size: 16px;
-    }
-
-    .beijing-01__schedule .el-dialog .el-dialog__headerbtn .el-dialog__close {
-        color: #fff;
-    }
-
-    .beijing-01__schedule .el-dialog .el-form {
-        background: #ECE9D8 !important;
-    }
-
-    .beijing-01__schedule .el-dialog .el-card {
-        background: #ECE9D8 !important;
-    }
-
-    .beijing-01__schedule .el-dialog .el-button {
-        height: 32px;
-        line-height: 32px;
-        padding: 0px;
-        width: 80px;
-        border: 2px outset #E2E2E2;
-        border-radius: 0px !important;
-        color: #000;
-        background: #ECE9D8;
-    }
-
-    .beijing-01__schedule .el-dialog .expand {
-        width: 120px;
-    }
-
-    .beijing-01__schedule .el-dialog .el-button:focus span {
-        border: 1px dashed gray;
-    }
-
-    .beijing-01__schedule .el-dialog .el-button:active {
-        border: 2px inset #E2E2E2;
-    }
-
-    .beijing-01__schedule .el-dialog .el-button:disabled {
-        border: 2px inset #E2E2E2;
-    }
-
-    .beijing-01__schedule .el-dialog .el-button:disabled span {
-        border: 0px;
-    }
-
-    .beijing-01__schedule .el-dialog .button-group {
-        margin: 0px 5px;
-        text-align: center !important;
-    }
-
-    .beijing-01__schedule .el-dialog .el-input {
-        border: 2px inset #E9E9E9;
-    }
-
-    .beijing-01__schedule .el-dialog .el-input .el-input__inner {
-        color: #000;
-        background: #fff !important;
-        border: 0px;
-        border-radius: 0px !important;
-        box-sizing: border-box;
-    }
-
-    .beijing-01__schedule .el-dialog .el-input.is-disabled .el-input__inner {
-        background: #F0F0F0 !important;
-    }
-
-    .beijing-01__schedule .el-dialog .el-textarea {
-        border: 2px inset #E9E9E9;
-        border-radius: 0px;
-    }
-
-    .beijing-01__schedule .el-dialog .el-textarea .el-textarea__inner {
-        color: #000;
-        background: #fff !important;
-        border: 0px;
-        border-radius: 0px !important;
-        box-sizing: border-box;
-    }
-
-    .beijing-01__schedule .el-dialog .el-textarea.is-disabled .el-textarea__inner {
-        background: #F0F0F0 !important;
-    }
-
-    .beijing-01__schedule .el-dialog .el-table {
-        border: 2px inset #E9E9E9;
-        color: #000 !important;
-    }
-
-    .beijing-01__schedule .el-dialog .el-table .cell {
-        line-height: unset !important;
-    }
-
-    .beijing-01__schedule .el-dialog .el-table th.is-leaf {
-        background: #ECE9D8 !important;
-        border-right: 1px solid #BDBDBD !important;
-        border-bottom: 1px solid #BDBDBD !important;
-        color: #000 !important;
-        height: 20px !important;
-        padding: 0px;
-    }
-
-    .beijing-01__schedule .el-dialog .el-table tr td {
-        height: 20px !important;
-        padding: 0px;
-    }
-
-    .beijing-01__schedule .el-dialog .el-table .el-table__empty-text {
-        top: 15px !important;
-    }
-
-    .beijing-01__schedule .el-dialog .current-row>td {
-        background: #316AC5 !important;
-        color: #fff !important;
-    }
-
-    .beijing-01__schedule .el-dialog .el-checkbox__inner {
-        border: 1px inset #dcdfe6 !important;
-    }
-
-    .beijing-01__schedule .el-dialog .el-checkbox__label {
-        color: #000 !important;
-    }
-
-    .beijing-01__schedule .el-dialog .el-checkbox.is-disabled .el-checkbox__inner {
-        background: #E6E6E6 !important;
-    }
-
-    .beijing-01__schedule .el-dialog .el-checkbox.is-disabled .el-checkbox__label {
-        color: #C5C9CC !important;
-    }
-
-    .beijing-01__schedule .el-dialog .el-checkbox__input.is-checked .el-checkbox__inner {
-        background: #fff !important;
-        border: 1px inset #dcdfe6 !important;
-    }
-
-    .beijing-01__schedule .el-dialog .el-checkbox__input.is-checked .el-checkbox__inner::after {
-        position: absolute;
-        -webkit-box-sizing: content-box;
-        box-sizing: content-box;
-        content: "";
-        border: 1px solid #000;
-        border-left: 0;
-        border-top: 0;
-        height: 7px;
-        left: 4px;
-        top: 1px;
-    }
-
-    .beijing-01__schedule .el-dialog .el-radio__inner {
-        border: 1px inset #dcdfe6 !important;
-    }
-
-    .beijing-01__schedule .el-dialog .el-radio__label {
-        color: #000 !important;
-    }
-
-    .beijing-01__schedule .el-dialog .el-radio__input.is-checked .el-radio__inner {
-        background: #fff !important;
-        border: 1px inset #dcdfe6 !important;
-    }
-
-    .beijing-01__schedule .el-dialog .el-radio__input.is-checked .el-radio__inner::after {
-        width: 4px;
-        height: 4px;
-        border-radius: 100%;
-        background-color: #000 !important;
-        position: absolute;
-        left: 50%;
-        top: 50%;
-    }
-
-    .beijing-01__schedule .el-dialog .el-radio.is-disabled .el-radio__inner {
-        background: #E6E6E6 !important;
-    }
-
-    .beijing-01__schedule .el-dialog .el-radio.is-disabled .el-radio__label {
-        color: #C5C9CC !important;
-    }
-
-    .beijing-01__schedule .el-dialog .base-label {
-        background: rgba(0, 0, 0, x);
-        position: relative;
-        left: -15px;
-        top: -18px;
-    }
-
-    .beijing-01__schedule .el-dialog .el-form-item label {
-        font-weight: normal !important;
-        color: #000 !important;
-    }
-
-    .beijing-01__schedule .el-dialog .context {
-        height: 100px;
-        border: 2px inset #E2E2E2;
-        overflow-y: scroll;
-    }
-
-    .beijing-01__schedule .el-dialog .table {
-        margin-top: 10px;
-    }
-
-    .beijing-01__schedule .el-dialog .notice {
-        margin-left: 62px;
-        line-height: 30px;
-    }
-
-    .beijing-01__schedule .el-dialog .button-group {
-        margin-top: 10px;
-    }
-
-    .beijing-01__schedule .el-dialog .el-tree__empty-block {
-        background: #E9E9E9 !important;
-        color: #000 !important;
-    }
-</style>
diff --git a/src/jmapNew/theme/chengdu_01/planSchedule/menuBar.vue b/src/jmapNew/theme/chengdu_01/planSchedule/menuBar.vue
deleted file mode 100644
index e64ae3063..000000000
--- a/src/jmapNew/theme/chengdu_01/planSchedule/menuBar.vue
+++ /dev/null
@@ -1,514 +0,0 @@
-<template>
-  <div id="PlanMenuBar">
-    <div class="nav">
-      <template v-for="(item,i) in menu">
-        <template v-if="noShowingChildren(item.children)">
-          <li class="nav-li" @click="hookClick(item)">
-            <span class="nav-li-text">{{ item.title }}</span>
-          </li>
-        </template>
-        <template v-else>
-          <li class="nav-li" @click.stop="popupMenuA(item, i)">
-            <span class="nav-li-text">{{ item.title }}</span>
-            <ul class="nav-ul" :class="{'active' :i==classA}">
-              <template v-for="(child,j) in item.children">
-                <template
-                  v-if="child.children&&child.children.length>0&&hasShowingChildren(child.children)"
-                >
-                  <li v-if="child.type === 'separator'" class="menu-separator">
-                    <span class="status">&ensp;</span>
-                    <span class="separator">&ensp;</span>
-                  </li>
-                  <li v-else-if="child.type === 'file'" class="menu-li">
-                    <div class="menu-li-block">
-                      <span class="menu-li-text">
-                        <span class="status">&ensp;</span>
-                        <el-button type="text" class="button" :disabled="child.disabled">
-                          <input
-                            :ref="child.label"
-                            type="file"
-                            accept=".csv, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel"
-                            @change="openLoadFile(child)"
-                          >
-                          {{ child.title }}
-                        </el-button>
-                      </span>
-                    </div>
-                  </li>
-                  <li v-else class="menu-li" @click.stop="popupMenuB(child, j)">
-                    <div class="menu-li-block">
-                      <span class="menu-li-text">
-                        <span class="status">&ensp;</span>
-                        <span class="label">{{ child.title }}</span>
-                      </span>
-                    </div>
-                    <ul class="menu-ul" :class="{'active' :j==classB}">
-                      <template v-for="(grandchild,k) in child.children">
-                        <li v-if="grandchild.type === 'separator'" class="menu-separator">
-                          <span class="status">&ensp;</span>
-                          <span class="separator">&ensp;</span>
-                        </li>
-                        <li v-else-if="grandchild.type === 'file'" class="menu-li">
-                          <div class="menu-li-block">
-                            <span class="menu-li-text">
-                              <span class="status">&ensp;</span>
-                              <el-button
-                                type="text"
-                                class="button"
-                                :disabled="grandchild.disabled"
-                              >
-                                <input
-                                  :ref="grandchild.label"
-                                  type="file"
-                                  accept=".csv, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel"
-                                  @change="openLoadFile(grandchild)"
-                                >
-                                {{ grandchild.title }}
-                              </el-button>
-                            </span>
-                          </div>
-                        </li>
-                        <li v-else class="menu-li" @click.stop="hookClick(grandchild)">
-                          <div class="menu-li-block">
-                            <span class="menu-li-text">
-                              <span class="status">&ensp;</span>
-                              <span class="label">{{ grandchild.title }}</span>
-                            </span>
-                          </div>
-                        </li>
-                      </template>
-                    </ul>
-                  </li>
-                </template>
-                <template v-else>
-                  <li v-if="child.type === 'separator'" class="menu-separator">
-                    <span class="status">&ensp;</span>
-                    <span class="separator">&ensp;</span>
-                  </li>
-                  <li v-else-if="child.type === 'file'" class="menu-li">
-                    <div class="menu-li-block">
-                      <span class="menu-li-text">
-                        <span class="status">&ensp;</span>
-                        <el-button type="text" class="button" :disabled="child.disabled">
-                          <input
-                            :ref="child.title"
-                            type="file"
-                            accept=".csv, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel"
-                            @change="openLoadFile(child)"
-                          >
-                          {{ child.title }}
-                        </el-button>
-                      </span>
-                    </div>
-                  </li>
-                  <li v-else class="menu-li" @click.stop="hookClick(child)">
-                    <div class="menu-li-block">
-                      <span class="menu-li-text">
-                        <span class="status">&ensp;</span>
-                        <span class="label">{{ child.title }}</span>
-                      </span>
-                    </div>
-                  </li>
-                </template>
-              </template>
-            </ul>
-          </li>
-        </template>
-      </template>
-    </div>
-  </div>
-</template>
-<script>
-import { mapGetters } from 'vuex';
-import { EventBus } from '@/scripts/event-bus';
-
-export default {
-    name: 'PlanMenuBar',
-    props: {
-        lineCode: {
-            type: String,
-            required: true
-        }
-    },
-    data() {
-        return {
-            classA: -1,
-            classB: -1,
-            tempClassA: -1,
-            tempClassB: -1,
-            menu: [
-                {
-                    title: '文件（F）',
-                    children: [
-                    ]
-                },
-                {
-                    title: '显示（V）',
-                    children: [
-                        // {
-                        //     title: '缩放',
-                        // },
-                        // {
-                        //     title: '单色显示历史计划',
-                        // },
-                        // {
-                        //     title: '彩色显示历史计划'
-                        // }
-                    ]
-                },
-                {
-                    title: '编辑（E）',
-                    children: [
-                        // {
-                        //     title: '修改',
-                        //     click: this.handleEditPlanningTrain
-                        // },
-                        // {
-                        //     title: '加任务',
-                        //     click: this.handleAddTask
-                        // },
-                        // {
-                        //     title: '删任务',
-                        //     click: this.handleDeleteTask
-                        // },
-                        // {
-                        //     title: '改表号',
-                        //     click: this.handleModifyingPlanId
-                        // },
-                        // {
-                        //     title: '平移多辆车',
-                        //     click: this.handleTranslationalMulTrain
-                        // }
-                    ]
-                },
-                {
-                    title: '工具（T）',
-                    children: [
-                        {
-                            title: '查看计划列表',
-                            click: this.handleViewPlanSchedule
-                        },
-                        {
-                            title: '创建一周计划',
-                            click: this.handleCreateWeekPlan
-                        },
-                        {
-                            title: '加载当天计划',
-                            click: this.handleReloadTodayPlan
-                        }
-                        // {
-                        //     title: '有效性检查',
-                        //     click: this.handleValidityCheck
-                        // }
-                    ]
-                },
-                {
-                    title: '帮助（H）',
-                    children: [
-                    ]
-                }
-            ]
-        };
-    },
-    computed: {
-        ...mapGetters('training', [
-            'mode'
-        ]),
-        ...mapGetters('map', [
-            'stationList'
-        ])
-    },
-    watch: {
-        tempClassA() {
-            this.classA = this.$store.state.menuOperation.break ? -1 : this.tempClassA;
-        },
-        tempClassB() {
-            this.classB = this.$store.state.menuOperation.break ? -1 : this.tempClassB;
-        },
-        '$store.state.menuOperation.break': function (val) {
-            if (val) {
-                this.classA = this.classB = -1;
-            } else {
-                this.classA = this.tempClassA;
-                this.classB = this.tempClassB;
-            }
-        }
-    },
-    mounted() {
-        this.initMenu();
-    },
-    methods: {
-        initMenu() {
-            this.clickEvent();
-            this.closeMenu();
-        },
-        clickEvent() {
-            const self = this;
-            window.onclick = function (e) {
-                self.closeMenu(false);
-            };
-        },
-        noShowingChildren(children) {
-            if (!children || children.length <= 0) {
-                return true;
-            }
-            return false;
-        },
-        hasShowingChildren(children) {
-            if (children && children.length > 0) {
-                return true;
-            }
-            return false;
-        },
-        closeMenu() {
-            this.classA = this.tempClassA = -1;
-            this.classB = this.tempClassB = -1;
-        },
-        hookClick(item, event) {
-            this.closeMenu();
-            setTimeout(() => {
-                if (item && typeof item.click == 'function') {
-                    item.click();
-                }
-            }, 500);
-        },
-        popupMenuA(item, index) {
-            this.clickEvent();
-            this.tempClassA = index;
-            this.tempClassB = -1;
-        },
-        popupMenuB(item, index) {
-            this.tempClassB = index;
-        },
-        openLoadFile(item) {
-            const obj = this.$refs[item.title][0];
-            if (obj.files) {
-                const file = obj.files[0];
-                item.click(file);
-                obj.value = '';
-            }
-        },
-        doClose() {
-            this.$nextTick(() => {
-                EventBus.$emit('closeMenu');
-            });
-        },
-        // 刷新
-        refresh() {
-            this.closeMenu(true);
-            EventBus.$emit('refresh');
-        },
-        undeveloped() {
-            this.doClose();
-            this.$alert('实现中......', '提示', {
-                confirmButtonText: '确定',
-                callback: action => {
-                }
-            });
-        },
-        // 修改计划
-        handleEditPlanningTrain() {
-            this.$emit('dispatchDialog', { name: 'modifyingPlan' });
-        },
-        // 添加任务
-        handleAddTask() {
-            const params = this.$store.state.runPlan.selected;
-            this.$emit('dispatchDialog', { name: 'addTask', params });
-        },
-        // 删除任务
-        handleDeleteTask() {
-            const params = this.$store.state.runPlan.selected;
-            this.$emit('dispatchDialog', { name: 'deleteTask', params });
-        },
-        // 修改任务
-        handleModifyingTask() {
-            const params = this.$store.state.runPlan.selected;
-            this.$emit('dispatchDialog', { name: 'modifyingTask', params });
-        },
-        // 改表号
-        handleModifyingPlanId() {
-            this.$emit('dispatchDialog', { name: 'modifyingPlanId' });
-        },
-        // 平移多辆车
-        handleTranslationalMulTrain() {
-            this.$emit('dispatchDialog', { name: 'translationalMulTrain' });
-        },
-        // 查看计划列表
-        handleViewPlanSchedule() {
-            this.$emit('dispatchDialog', { name: 'managePlanList' });
-        },
-        // 创建一周计划
-        handleCreateWeekPlan() {
-            this.$emit('dispatchDialog', { name: 'createWeekPlan' });
-        },
-        // 创建当天计划
-        handleReloadTodayPlan() {
-            this.$emit('dispatchDialog', { name: 'createTodayPlan' });
-        },
-        // 有效性检查
-        handleValidityCheck() {
-        }
-    }
-};
-</script>
-
-<style scoped rel="stylesheet/scss" lang="scss">
-    @import "src/styles/mixin.scss";
-    $top: 25px;
-    $width: 30px;
-    $height: 20px;
-    $menuPadding: 10px;
-    $menuItemHeight: 30px;
-    $menuItemWidth: 160px;
-    $menuItemPadding: 5px;
-
-    #PlanMenuBar {
-        z-index: 10;
-        position: absolute;
-        top: $top;
-        width: 100%;
-        height: $height;
-        line-height: $height;
-    }
-
-    .nav {
-        display: block;
-        cursor: pointer;
-        color: #0000;
-        background: #EBEADB;
-        list-style: none;
-        border: 1px solid #B6BCCC !important;
-    }
-
-    .nav-li {
-        position: relative;
-        display: inline-block;
-        padding-left: $menuPadding;
-        padding-right: $menuPadding;
-    }
-
-    .nav-li:active {
-        background: #C9D0E1;
-        border-radius: 4px;
-    }
-
-    .nav-li-text {
-        font-size: 13px;
-        color: #000;
-        text-align: center;
-        text-decoration: none;
-    }
-
-    .nav-ul {
-        display: none;
-        position: absolute;
-        list-style: none;
-        border: 1px solid gray;
-        width: $menuItemWidth;
-        padding: 0px;
-        margin: 0px;
-    }
-
-    .menu-ul {
-        display: none;
-        list-style: none;
-        background: #F0F0F0;
-        line-height: $menuItemHeight;
-        width: $menuItemWidth;
-        bottom: $menuItemHeight;
-    }
-
-    .active {
-        position: absolute;
-        display: block !important;
-    }
-
-    .menu-ul-text {
-        font-size: 14px;
-        color: #000;
-        letter-spacing: 0;
-        height: $menuItemHeight;
-        line-height: $menuItemHeight;
-        border-left: 1px solid #000;
-        border-right: 1px solid #000;
-    }
-
-    .menu-separator {
-        text-align: left;
-        background: #F0F0F0;
-        height: 2px;
-        line-height: 2px;
-    }
-
-    .menu-separator .status {
-        display: inline-block;
-        border-right: 1px inset #CACACA;
-        width: $width;
-        height: 100%;
-        background: #EFECDE;
-    }
-
-    .menu-separator .separator {
-        display: inline-block;
-        background: #CACACA;
-        margin-left: 5px;
-        height: 2px;
-        width: $menuItemWidth - $width - 30px;
-    }
-
-    .menu-li {
-        text-align: left;
-        background: #F0F0F0;
-        height: $menuItemHeight;
-        line-height: $menuItemHeight;
-    }
-
-    .menu-li-block {
-        letter-spacing: 0;
-        height: $menuItemHeight;
-        line-height: $menuItemHeight;
-    }
-
-    .menu-li-text {
-        font-size: 14px;
-        color: #000;
-    }
-
-    .menu-li-text .status {
-        display: inline-block;
-        border-right: 1px inset #CACACA;
-        width: $width;
-        background: #EFECDE;
-    }
-
-    .menu-li-text .label {
-        display: inline-block;
-        margin-left: 5px;
-    }
-
-    .menu-li-text .button {
-        position: relative;
-        overflow: hidden;
-        margin-left: 10px;
-        line-height: 0px;
-        width: $menuItemWidth - $width;
-        top: -$menuItemHeight;
-        color: #000;
-        cursor: pointer;
-
-        input {
-            opacity: 0;
-            cursor: pointer;
-            position: absolute;
-            top: 0px;
-            width: $menuItemWidth - $width - 10px;
-        }
-    }
-
-    .menu-li-block:hover {
-        background: #C9DEF7;
-        box-sizing: border-box;
-        -moz-box-sizing: border-box;
-        -webkit-box-sizing: border-box;
-    }
-</style>
diff --git a/src/jmapNew/theme/chengdu_01/planSchedule/schedule.vue b/src/jmapNew/theme/chengdu_01/planSchedule/schedule.vue
deleted file mode 100644
index 57008bbed..000000000
--- a/src/jmapNew/theme/chengdu_01/planSchedule/schedule.vue
+++ /dev/null
@@ -1,477 +0,0 @@
-<template>
-  <div id="PlanSchedule" :style="{top: top+'px', height: height+'px'}">
-    <div class="left">
-      <div :id="runPlanId" />
-    </div>
-    <div class="right">
-      <data-table
-        ref="serviceTable"
-        :height="height/2"
-        :config="serviceNumberConfig"
-        :style="{top: top-height/2+'px'}"
-        @touch="scheduleTouch"
-      />
-      <data-table
-        ref="tripTable"
-        :height="height/2"
-        :config="tripNumberConfig"
-        :style="{top: top-height/2+'px'}"
-        @touch="trainNumTouch"
-      />
-    </div>
-  </div>
-</template>
-
-<script>
-import { mapGetters } from 'vuex';
-import { timeFormat } from '@/utils/date';
-import DataTable from '../menusPlan/components/dataTable';
-import echarts from 'echarts';
-
-export default {
-    name: 'PlanSchedule',
-    components: {
-        DataTable
-    },
-    props: {
-        group: {
-            type: String,
-            required: true
-        },
-        lineCode: {
-            type: String,
-            required: true
-        },
-        maxWidth: {
-            type: Number,
-            require: true
-        },
-        maxHeight: {
-            type: Number,
-            required: true
-        }
-    },
-    data() {
-        return {
-            top: 0,
-            height: 0,
-            heights: [100, 100],
-            runPlanId: 'plan-schedule-id',
-            myChart: null,
-            PlanConvert: {},
-            serviceNumberConfig: {
-                data: [],
-                highlightCurrentRow: true,
-                handleChange: this.serviceNumberChange,
-                showClose: false,
-                columns: [
-                    {
-                        prop: 'serviceNumber',
-                        label: '表号'
-                    },
-                    {
-                        width: 40
-                    }
-                ]
-            },
-            tripNumberConfig: {
-                data: [],
-                highlightCurrentRow: true,
-                handleChange: this.tripNumberChange,
-                showClose: false,
-                columns: [
-                    {
-                        prop: 'tripNumber',
-                        label: '车次号'
-                    },
-                    {
-                        width: 40
-                    }
-                ]
-            },
-            realData: {},
-            kmRangeCoordMap: {},
-            option: {
-                title: {
-                    text: '',
-                    left: 'center'
-                },
-                grid: {
-                    top: '30px',
-                    left: '120px',
-                    right: '40px',
-                    bottom: '65px',
-                    containLabel: true,
-                    backgroundColor: 'floralwhite'
-                },
-                toolbox: {
-                    // right: '30px',
-                    // feature: {
-                    //     dataZoom: {
-                    //         yAxisIndex: 'none'
-                    //     },
-                    //     restore: {},
-                    //     saveAsImage: {}
-                    // }
-                },
-                tooltip: {
-                    axisPointer: {
-                        trigger: 'item',
-                        type: 'cross'
-                    },
-                    formatter: this.axisTooltip,
-                    borderWidth: 1
-                },
-                xAxis: [
-                    {
-                        type: 'category',
-                        boundaryGap: false,
-                        data: [],
-                        axisLine: {
-                            onZero: false,
-                            lineStyle: {
-                                width: 2,
-                                color: '#d14a61'
-                            }
-                        },
-                        axisLabel: {
-                            formatter: this.xAxisLableFormat,
-                            textStyle: {
-                                color: '#333'
-                            }
-                        },
-                        axisPointer: {
-                            snap: true,
-                            label: {
-                                formatter: this.xAxisPointFormat,
-                                backgroundColor: 'rgb(255,0,0,0.5)',
-                                color: 'white'
-                            }
-                        }
-                    }
-                ],
-                yAxis: {
-                    type: 'value',
-                    splitLine: {
-                        show: false
-                    },
-                    axisTick: {
-                        show: false
-                    },
-                    axisLine: {
-                        onZero: false,
-                        lineStyle: {
-                            width: 2,
-                            color: '#d14a61'
-                        }
-                    },
-                    axisLabel: {
-                        interval: 'auto',
-                        formatter: this.yAxisLableFormat
-                    },
-                    axisPointer: {
-                        xAxisIndex: 'all',
-                        label: {
-                            formatter: this.yAxisPointFormat,
-                            backgroundColor: 'rgb(0,100,0,0.5)',
-                            color: 'white'
-                        }
-                    },
-                    min: 0,
-                    max: 0
-                },
-                series: [],
-                dataZoom: [
-                    {
-                        type: 'inside'
-                    },
-                    {
-                        fiterMode: 'filter',
-                        handleIcon: 'M10.7,11.9v-1.3H9.3v1.3c-4.9,0.3-8.8,4.4-8.8,9.4c0,5,3.9,9.1,8.8,9.4v1.3h1.3v-1.3c4.9-0.3,8.8-4.4,8.8-9.4C19.5,16.3,15.6,12.2,10.7,11.9z M13.3,24.4H6.7V23h6.6V24.4z M13.3,19.6H6.7v-1.4h6.6V19.6z',
-                        handleSize: '80%',
-                        handleStyle: {
-                            color: '#fff',
-                            shadowBlur: 3,
-                            shadowColor: 'rgba(0, 0, 0, 0.6)',
-                            shadowOffsetX: 2,
-                            shadowOffsetY: 2
-                        },
-                        bottom: '20px'
-                    }
-                ]
-            },
-            absoluteTime: 2 * 3600,
-            indexKmRangeMap: {}
-        };
-    },
-    watch: {
-        maxWidth() {
-            this.setPosition();
-        },
-        maxHeight() {
-            this.setPosition();
-        },
-        '$store.state.runPlan.planLoadedCount': async function () {
-            await this.loadChartPage();
-        },
-        '$store.state.runPlan.planSizeCount': function () {
-            this.reSize({ width: this.$store.state.runPlan.width, height: this.$store.state.runPlan.height });
-        },
-        '$store.state.runPlan.selected.serviceNumber': function (val) {
-            const index = this.serviceNumberConfig.data.findIndex(elem => {
-                return elem.serviceNumber == val;
-            });
-
-            this.$refs.serviceTable.setCurrentRow(this.serviceNumberConfig.data[index]);
-        },
-        '$store.state.runPlan.selected.tripNumber': function (val) {
-            const index = this.tripNumberConfig.data.findIndex(elem => {
-                return elem.tripNumber == val;
-            });
-            this.$refs.tripTable.setCurrentRow(this.tripNumberConfig.data[index]);
-        }
-    },
-    computed: {
-        ...mapGetters('runPlan', [
-            'stations'
-        ])
-    },
-    mounted() {
-        this.PlanConvert = this.$theme.loadPlanConvert(this.lineCode);
-    },
-    beforeDestroy() {
-        this.destroy();
-    },
-    methods: {
-        serviceNumberChange(row) {
-            if (row) {
-                this.$store.dispatch('runPlan/setSelected', { serviceNumber: row.serviceNumber, tripNumber: null });
-                const serviceObj = this.$store.state.runPlan.editData[row.serviceNumber];
-                if (serviceObj) {
-                    this.analyticalTripNumber(serviceObj.trainMap);
-                }
-            }
-        },
-        tripNumberChange(row) {
-            if (row) {
-                this.$store.dispatch('runPlan/setSelected', { serviceNumber: this.$store.state.runPlan.selected.serviceNumber, tripNumber: row.tripNumber });
-            }
-        },
-        async analyticalServiceNumber(data) {
-            this.serviceNumberConfig.data = Object.keys(data || {})
-                .sort((a, b) => { return data[a].oldIndex - data[b].oldIndex; })
-                .map(serviceNumber => { return { serviceNumber }; });
-        },
-        async analyticalTripNumber(data) {
-            this.tripNumberConfig.data = Object.keys(data || {})
-                .sort((a, b) => { return data[a].oldIndex - data[b].oldIndex; })
-                .map(tripNumber => { return { tripNumber }; });
-        },
-        async setPosition() {
-            this.$nextTick(() => {
-                let top = 3;
-                const width = this.maxWidth * 0.85;
-                let height = this.maxHeight;
-
-                const titleBar = document.getElementById('PlanTitleBar');
-                const menuBar = document.getElementById('PlanMenuBar');
-                const menuTool = document.getElementById('PlanMenuTool');
-                const statusBar = document.getElementById('PlanStatusBar');
-
-                if (titleBar) {
-                    top += (titleBar.offsetHeight || 0);
-                }
-
-                if (menuBar) {
-                    top += (menuBar.offsetHeight || 0);
-                }
-
-                if (menuTool) {
-                    top += (menuTool.offsetHeight || 0);
-                }
-
-                if (statusBar) {
-                    height -= (statusBar.offsetHeight || 0);
-                }
-
-                height = height - top;
-                this.$store.dispatch('runPlan/resize', { width, height });
-
-                if (this.top != top) {
-                    this.top = top;
-                }
-
-                if (this.height != height) {
-                    this.height = height - 20 * 2;
-                }
-            });
-        },
-        async loadChartPage() {
-            try {
-                let series = [];
-                const stations = this.$store.state.runPlan.stations;
-                const planData = this.$store.state.runPlan.planData;
-
-                this.viewDisabled = true;
-                this.kmRangeCoordMap = this.PlanConvert.convertStationsToMap(stations);
-                series = this.pushModels(series, [this.PlanConvert.initializeYaxis(stations)]);
-                series = this.pushModels(series, this.PlanConvert.convertDataToModels(planData, stations, this.kmRangeCoordMap, { color: '#000', width: 0.5 }));
-                await this.loadInitData(series);
-                await this.analyticalServiceNumber(this.$store.state.runPlan.editData);
-                this.viewDisabled = false;
-
-            } catch (error) {
-                this.viewDisabled = false;
-                this.$messageBox(`加载运行图数据失败`);
-            }
-        },
-        async loadInitData(series) {
-            this.myChart && this.myChart.showLoading();
-            await this.xAxisInit();
-            await this.yAxisInit();
-            await this.loadInitChart(series);
-            this.myChart && this.myChart.hideLoading();
-        },
-        pushModels(series, models) {
-            if (models && models.length) {
-                models.forEach(elem => {
-                    if (elem) {
-                        series.push(elem);
-                    }
-                });
-            }
-
-            return series;
-        },
-        popModels(series, models) {
-            if (models && models.length) {
-                models.forEach(elem => {
-                    const index = series.indexOf(elem);
-                    if (index >= 0) {
-                        series.split(index, 1);
-                    }
-                });
-            }
-            return series;
-        },
-        loadInitChart(series) {
-            return new Promise((resolve, reject) => {
-                try {
-                    this.destroy();
-                    let startValue = 3600 + this.PlanConvert.TranslationTime;
-                    const offsetTime = 3600;
-                    startValue = this.$store.state.training.initTime - this.PlanConvert.TranslationTime;
-                    this.option.dataZoom[0].startValue = this.option.dataZoom[1].startValue = startValue - offsetTime;
-                    this.option.dataZoom[0].endValue = this.option.dataZoom[1].endValue = startValue + offsetTime;
-                    this.option.series = series;
-                    this.myChart = echarts.init(document.getElementById(this.runPlanId));
-                    if (this.myChart) {
-                        this.myChart.setOption(this.option);
-                        this.reSize({ width: this.$store.state.runPlan.width, height: this.$store.state.runPlan.height });
-                        this.myChart.on('click', this.mouseClick);
-                    }
-                    resolve(true);
-                } catch (error) {
-                    reject(error);
-                }
-            });
-
-        },
-        xAxisPointFormat(params) {
-            return timeFormat(params.value);
-        },
-        yAxisPointFormat(params) {
-            return this.PlanConvert.computedFormatYAxis(this.stations, params);
-        },
-        xAxisLableFormat(value, index) {
-            if (value % 60 === 0) {
-                return timeFormat(value);
-            }
-        },
-        yAxisLableFormat(value, index) {
-            return '';
-        },
-        xAxisInit() {
-            const list = [];
-            for (var time = 0 + this.PlanConvert.TranslationTime; time < 3600 * 24 + this.PlanConvert.TranslationTime; time++) {
-                list.push(time);
-            }
-
-            const startValue = 3600 * 6;
-            const offsetTime = 3600 * 1;
-
-            this.option.xAxis[0].data = list;
-            if (!this.option.dataZoom[0].startValue) {
-                this.option.dataZoom[0].startValue = this.option.dataZoom[1].startValue = startValue - offsetTime;
-            }
-
-            if (!this.option.dataZoom[0].endValue) {
-                this.option.dataZoom[0].endValue = this.option.dataZoom[1].endValue = startValue + offsetTime;
-            }
-        },
-        yAxisInit() {
-            if (Object.keys(this.PlanConvert).length) {
-                this.option.yAxis.min = this.PlanConvert.computedYaxisMinValue(this.stations);
-                this.option.yAxis.max = this.PlanConvert.computedYaxisMaxValue(this.stations);
-            }
-        },
-        axisTooltip(param) {
-            const station = this.stations[Math.floor((param.data[1] - this.PlanConvert.EdgeHeight) / this.PlanConvert.CoordMultiple)] || { name: '', kmRange: '' };
-            return [
-                `Point Data <hr size=1 style=" margin: 3px 0">`,
-                `车站名称: ${station.name}<br>`,
-                `车站公里标: ${station.kmRange} km <br>`,
-                `到站时间: ${timeFormat(param.data[0] + this.PlanConvert.TranslationTime)} (${param.data[0]})<br>`
-            ].join('');
-        },
-        mouseClick(params) {
-            const model = {
-                serviceNumber: params.seriesName
-            };
-            this.$store.dispatch('runPlan/setSelected', model);
-        },
-        reSize(opt) {
-            if (this.myChart) {
-                this.myChart.resize({
-                    width: opt.width,
-                    height: opt.height,
-                    silent: false
-                });
-            }
-        },
-        destroy() {
-            if (this.myChart && this.myChart.isDisposed) {
-                this.myChart.dispose();
-                this.myChart = null;
-            }
-        },
-        scheduleTouch() {
-
-        },
-        trainNumTouch() {
-
-        }
-    }
-};
-</script>
-<style scoped rel="stylesheet/scss" lang="scss">
-    @import "src/styles/mixin.scss";
-
-    #PlanSchedule {
-        z-index: 5;
-        position: absolute;
-        width: 100%;
-
-        .left {
-            height: 100%;
-            width: 85%;
-            float: left;
-        }
-
-        .right {
-            height: 100%;
-            width: 15%;
-            float: right;
-        }
-    }
-</style>
diff --git a/src/jmapNew/theme/chengdu_01/planSchedule/statusBar.vue b/src/jmapNew/theme/chengdu_01/planSchedule/statusBar.vue
deleted file mode 100644
index 170553e15..000000000
--- a/src/jmapNew/theme/chengdu_01/planSchedule/statusBar.vue
+++ /dev/null
@@ -1,100 +0,0 @@
-<template>
-    <data-table id="PlanStatusBar" ref="dataTable" :height="height-11" :config="stationListConfig" :close="false"
-        :style="{top: maxmini? maxTop-110+'px':maxTop-21+'px'}" @touch="touch"></data-table>
-</template>
-
-<script>
-    import DataTable from '../menusPlan/components/dataTable';
-    import { formatTime, formatName } from '@/utils/runPlan';
-
-    export default {
-        name: 'PlanStatusBar',
-        props: {
-            maxTop: {
-                type: Number,
-                required: true
-            }
-        },
-        components: {
-            DataTable
-        },
-        data() {
-            return {
-                maxmini: true,
-                height: 100,
-                stationListConfig: {
-                    data: [],
-                    showClose: true,
-                    highlightCurrentRow: true,
-                    columns: [
-                        {
-                            prop: 'stationName',
-                            label: '站台',
-                            width: 400
-                        },
-                        {
-                            prop: 'startTime',
-                            label: '到点',
-                        },
-                        {
-                            prop: 'stopTime',
-                            label: '停站时间',
-                        },
-                        {
-                            prop: 'endTime',
-                            label: '发点',
-                        },
-                        {
-                            prop: 'level',
-                            label: '运行等级'
-
-                        }
-                    ]
-                }
-            }
-        },
-        watch: {
-            '$store.state.runPlan.selected': function (select) {
-                this.stationListConfig.data = [];
-                let serviceObj = this.$store.state.runPlan.editData[select.serviceNumber];
-                if (serviceObj) {
-                    let trainMap = serviceObj.trainMap;
-                    if (trainMap) {
-                        let trainObj = trainMap[select.tripNumber];
-                        if (trainObj) {
-                            let stationTimeList = trainObj.stationTimeList;
-                            if (stationTimeList && stationTimeList.length) {
-                                stationTimeList.forEach((elem, index) => {
-                                    let stationObj = {
-                                        stationName: formatName(elem.stationCode),
-                                        startTime: formatTime(index == 0 ? null : stationTimeList[index - 1].secondTime),
-                                        stopTime: formatTime(index == 0 ? null : elem.secondTime - stationTimeList[index - 1].secondTime),
-                                        endTime: formatTime(elem.secondTime),
-                                        level: ''
-                                    }
-                                    this.stationListConfig.data.push(stationObj);
-                                });
-                            }
-                        }
-                    }
-                }
-            }
-        },
-        methods: {
-            touch(maxmini) {
-                this.maxmini = maxmini;
-                this.$emit('setPosition');
-            }
-        }
-    }
-</script>
-
-<style scoped rel="stylesheet/scss" lang="scss" scoped>
-    @import "src/styles/mixin.scss";
-
-    #PlanStatusBar {
-        z-index: 5;
-        position: absolute;
-        width: 100%;
-    }
-</style>
\ No newline at end of file
diff --git a/src/jmapNew/theme/chengdu_01/planSchedule/titleBar.vue b/src/jmapNew/theme/chengdu_01/planSchedule/titleBar.vue
deleted file mode 100644
index 689c3486a..000000000
--- a/src/jmapNew/theme/chengdu_01/planSchedule/titleBar.vue
+++ /dev/null
@@ -1,75 +0,0 @@
-<template>
-    <div id="PlanTitleBar">
-        <img class="logo" :src="logoImg" />
-        <span> {{mapName}} &ensp;</span>
-        <span v-if="runPlanName">({{runPlanName}})</span>
-        <span class="system-close el-icon-close" @click="back"></span>
-    </div>
-</template>
-
-<script>
-    import logo_ from '@/assets/logo_.png';
-    import { getPublishMapInfo } from '@/api/jmap/map';
-
-    export default {
-        name: 'PlanTitleBar',
-        data() {
-            return {
-                mapName: '',
-                logoImg: logo_
-            }
-        },
-        computed: {
-            runPlanName() {
-                return this.$route.query.planName || '';
-            }
-        },
-        mounted() {
-            if (this.$route.query.mapId) {
-                getPublishMapInfo(this.$route.query.mapId).then(resp => {
-                    this.mapName = resp.data.name;
-                })
-            }
-        },
-        methods: {
-            back() {
-                this.$emit('back');
-            }
-        }
-    }
-</script>
-<style scoped rel="stylesheet/scss" lang="scss" scoped>
-    @import "src/styles/mixin.scss";
-    $width: 25px;
-    $height: 25px;
-
-    #PlanTitleBar {
-        z-index: 10;
-        display: flex;
-        position: absolute;
-        width: 100%;
-        height: $height;
-        line-height: $height;
-        background: -webkit-linear-gradient(#0055E8, #0099F8);
-        background: -o-linear-gradient(#0055E8, #0099F8);
-        background: -moz-linear-gradient(#0055E8, #0099F8);
-        background: linear-gradient(#0055E8, #0099F8);
-        color: white;
-        font: bold;
-        font-size: 16px;
-
-        .logo {
-            display: inline-block;
-            width: $width;
-            height: $height;
-            padding-right: 5px;
-        }
-
-        .system-close {
-            width: 25px;
-            height: 25px;
-            position: absolute;
-            right: 1px;
-        }
-    }
-</style>
\ No newline at end of file
diff --git a/src/jmapNew/theme/chengdu_03/menusPlan/addTask.vue b/src/jmapNew/theme/chengdu_03/menusPlan/addTask.vue
deleted file mode 100644
index 009c19f02..000000000
--- a/src/jmapNew/theme/chengdu_03/menusPlan/addTask.vue
+++ /dev/null
@@ -1,175 +0,0 @@
-<template>
-  <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 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();
-		}
-	}
-};
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-    @import "src/styles/mixin.scss";
-
-    /deep/ {
-        .el-button {
-            margin-left: 40px !important;
-            margin-right: 40px !important;
-        }
-
-        .el-row {
-            margin-bottom: 5px !important;
-        }
-
-        .el-input__inner {
-            height: 20px !important;
-            line-height: 20px !important;
-        }
-    }
-</style>
diff --git a/src/jmapNew/theme/chengdu_03/menusPlan/chooseTemplatePlan.vue b/src/jmapNew/theme/chengdu_03/menusPlan/chooseTemplatePlan.vue
deleted file mode 100644
index fa220d049..000000000
--- a/src/jmapNew/theme/chengdu_03/menusPlan/chooseTemplatePlan.vue
+++ /dev/null
@@ -1,115 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    :title="title"
-    class="beijing-01__schedule choose-plan-template"
-    :visible.sync="dialogShow"
-    width="70%"
-    :before-close="doClose"
-    :modal="false"
-    :close-on-click-modal="false"
-  >
-    <QueryListPage ref="pageRules" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
-    <el-row type="flex" justify="center" class="button-group">
-      <el-button type="primary" :loading="loading" @click="handleConfirm">选 择</el-button>
-      <el-button @click="dialogShow = false">取 消</el-button>
-    </el-row>
-  </el-dialog>
-</template>
-
-<script>
-import { runPlanTemplateList } from '@/api/runplan';
-import { listPublishMap } from '@/api/jmap/map';
-
-export default {
-    name: 'ChooseTemplatePlan',
-    data() {
-        return {
-            dialogShow: false,
-            loading: false,
-            mapList: [],
-            pagerConfig: {
-                pageSize: 'pageSize',
-                pageIndex: 'pageNum'
-            },
-            queryForm: {
-                reset: true,
-                labelWidth: '100px',
-                queryObject: {
-                    name: {
-                        type: 'text',
-                        label: '运行图名称'
-                    }
-                }
-            },
-            queryList: {
-                query: this.queryFunction,
-                selectCheckShow: false,
-                radioShow: true,
-                columns: [
-                    {
-                        title: '运行图名称',
-                        prop: 'name'
-                    },
-                    {
-                        title: '地图名称',
-                        prop: 'mapId',
-                        type: 'tag',
-                        columnValue: (row) => {
-                            return this.$convertField(row.mapId, this.mapList, ['id', 'name']);
-                        },
-                        tagType: (row) => { return 'success'; }
-                    }
-                ]
-            },
-
-            currentModel: {}
-        };
-    },
-    computed: {
-        title() {
-            return '选择模板运行图';
-        }
-    },
-    methods: {
-        loadInitData() {
-            this.mapList = [];
-            listPublishMap().then(response => {
-                this.mapList = response.data;
-            });
-        },
-        doShow() {
-            this.loading = false;
-            this.dialogShow = true;
-            this.loadInitData();
-        },
-        doClose() {
-            this.dialogShow = false;
-        },
-        queryFunction(params) {
-            if (this.$store.state.map && this.$store.state.map.map) {
-                // params['lineCode'] = this.$store.getters['map/lineCode'];
-                params['mapId'] = this.$route.query.mapId;
-            }
-            return runPlanTemplateList(params);
-        },
-        handleConfirm() {
-            this.doClose();
-            if (this.$refs && this.$refs.pageRules) {
-                const choose = this.$refs.pageRules.currentChoose();
-                if (choose) {
-                    this.$emit('chooseConfirm', choose);
-                } else {
-                    this.$messageBox(`请选择模板运行图`);
-                }
-            }
-        },
-        reloadTable() {
-            this.queryList.reload();
-        }
-    }
-};
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-    @import "src/styles/mixin.scss";
-</style>
diff --git a/src/jmapNew/theme/chengdu_03/menusPlan/createTodayPlan.vue b/src/jmapNew/theme/chengdu_03/menusPlan/createTodayPlan.vue
deleted file mode 100644
index 7b6159a5d..000000000
--- a/src/jmapNew/theme/chengdu_03/menusPlan/createTodayPlan.vue
+++ /dev/null
@@ -1,128 +0,0 @@
-<template>
-  <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 } from '@/api/runplan';
-import { getStationList } from '@/api/runplan';
-import { generateDayRunPlan } from '@/api/simulation';
-import { getPublishMapInfo } from '@/api/jmap/map';
-
-export default {
-    name: 'ReloadTodayPlan',
-    data() {
-        return {
-            dialogShow: false,
-            loading: false,
-            pagerConfig: {
-                pageSize: 'pageSize',
-                pageIndex: 'pageNum'
-            },
-            queryForm: {
-                reset: true,
-                labelWidth: '100px',
-                queryObject: {
-                    name: {
-                        type: 'text',
-                        label: '运行图名称'
-                    }
-                }
-            },
-            queryList: {
-                query: this.queryFunction,
-                selectCheckShow: false,
-                radioShow: true,
-                columns: [
-                    {
-                        title: '运行图名称',
-                        prop: 'name'
-                    }
-                ]
-            },
-
-            currentModel: {}
-        };
-    },
-    computed: {
-        title() {
-            return '加载当天计划';
-        }
-    },
-    methods: {
-        doShow() {
-            this.loading = false;
-            this.dialogShow = true;
-        },
-        doClose() {
-            this.dialogShow = false;
-        },
-        queryFunction(params) {
-            if (this.$store.state.map && this.$store.state.map.map) {
-                params['mapId'] = this.$route.query.mapId;
-            }
-            return runPlanTemplateList(params);
-        },
-        // 生成每日运行图
-        handleConfirm() {
-            if (this.$refs && this.$refs.pageRules) {
-                const choose = this.$refs.pageRules.currentChoose();
-                if (choose && choose.id) {
-                    this.loading = true;
-                    generateDayRunPlan(choose.id, this.$route.query.group).then(response => {
-                        this.loading = false;
-                        this.reloadTable();
-                        this.loadRunData();
-                        this.doClose();
-                        this.$message.success(`生成用户每日运行图成功`);
-                    }).catch((error) => {
-                        console.error(error);
-                        this.loading = false;
-                        this.reloadTable();
-                        this.$messageBox(`生成用户每日运行图失败`);
-                    });
-                } else {
-                    this.$messageBox(`请选择需要加载的运行图`);
-                }
-            }
-        },
-        loadRunData() {
-            // const skinCode = this.$route.query.skinCode;
-            const mapId = this.$route.query.mapId;
-            this.$store.dispatch('runPlan/clear');
-            if (mapId) {
-                getStationList(mapId).then(response => {
-                    const stations = response.data;
-                    getPublishMapInfo(this.$route.query.mapId).then(res=>{
-                        this.PlanConvert = this.$theme.loadPlanConvert(res.data.lineCode);
-                        this.$store.dispatch('runPlan/setStations', stations).then(() => {
-                        });
-                    });
-                }).catch(() => {
-                    this.$messageBox(`获取车站列表失败`);
-                });
-            }
-        },
-        reloadTable() {
-            this.queryList.reload();
-        }
-    }
-};
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-    @import "src/styles/mixin.scss";
-</style>
diff --git a/src/jmapNew/theme/chengdu_03/menusPlan/createWeekPlan.vue b/src/jmapNew/theme/chengdu_03/menusPlan/createWeekPlan.vue
deleted file mode 100644
index 2eabc8044..000000000
--- a/src/jmapNew/theme/chengdu_03/menusPlan/createWeekPlan.vue
+++ /dev/null
@@ -1,137 +0,0 @@
-<template>
-  <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';
-
-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 {
-				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";
-
-    .card-box {
-        padding-top: 10px;
-    }
-
-    /deep/ {
-        .el-row {
-            margin: 10px;
-        }
-    }
-</style>
diff --git a/src/jmapNew/theme/chengdu_03/menusPlan/deleteTask.vue b/src/jmapNew/theme/chengdu_03/menusPlan/deleteTask.vue
deleted file mode 100644
index cd79c305f..000000000
--- a/src/jmapNew/theme/chengdu_03/menusPlan/deleteTask.vue
+++ /dev/null
@@ -1,73 +0,0 @@
-<template>
-  <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();
-		}
-	}
-};
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-    @import "src/styles/mixin.scss";
-
-    /deep/ {
-        .el-row {
-            margin: 10px;
-        }
-    }
-</style>
diff --git a/src/jmapNew/theme/chengdu_03/menusPlan/deleteTodayPlan.vue b/src/jmapNew/theme/chengdu_03/menusPlan/deleteTodayPlan.vue
deleted file mode 100644
index 2e22a7c64..000000000
--- a/src/jmapNew/theme/chengdu_03/menusPlan/deleteTodayPlan.vue
+++ /dev/null
@@ -1,62 +0,0 @@
-<template>
-  <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();
-		}
-	}
-};
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-    @import "src/styles/mixin.scss";
-
-    /deep/ {
-        .el-row {
-            margin: 10px;
-        }
-    }
-</style>
diff --git a/src/jmapNew/theme/chengdu_03/menusPlan/managePlanList.vue b/src/jmapNew/theme/chengdu_03/menusPlan/managePlanList.vue
deleted file mode 100644
index 7fcd45639..000000000
--- a/src/jmapNew/theme/chengdu_03/menusPlan/managePlanList.vue
+++ /dev/null
@@ -1,143 +0,0 @@
-<template>
-  <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, listAllTempLateRunPlan } from '@/api/runplan';
-import { getPublishMapListOnline } from '@/api/jmap/map';
-
-export default {
-    name: 'ManagePlanList',
-    data() {
-        return {
-            dialogShow: false,
-            loading: false,
-            pagerConfig: {
-                pageSize: 'pageSize',
-                pageIndex: 'pageNum'
-            },
-            queryForm: {
-                labelWidth: '140px',
-                reset: true
-            },
-            queryList: {
-                query: this.queryFunction,
-                selectCheckShow: false,
-                indexShow: true,
-                columns: [
-                    {
-                        title: this.$t('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 '运行图计划表';
-        }
-    },
-    mounted() {
-        this.loadPageData();
-    },
-    methods: {
-        loadPageData() {
-            this.mapList = [];
-            getPublishMapListOnline().then(resp => {
-                this.mapList = resp.data;
-            });
-            this.templatePlanList = [];
-            listAllTempLateRunPlan().then(resp => {
-                this.templatePlanList = resp.data;
-            });
-        },
-        queryFunction(params) {
-            if (this.$route.query.mapId) {
-                params['mapId'] = this.$route.query.mapId;
-            }
-
-            if (this.$store.state.user.id) {
-                params['userId'] = this.$store.state.user.id;
-            }
-
-            return getRunPlanLoadList(params);
-        },
-        handleDelete(index, row) {
-            this.$confirm('此操作将删除次日加载的运行图, 是否继续?', '提示', {
-                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>
diff --git a/src/jmapNew/theme/chengdu_03/menusPlan/modifyingPlan.vue b/src/jmapNew/theme/chengdu_03/menusPlan/modifyingPlan.vue
deleted file mode 100644
index 1d2b31102..000000000
--- a/src/jmapNew/theme/chengdu_03/menusPlan/modifyingPlan.vue
+++ /dev/null
@@ -1,177 +0,0 @@
-<template>
-  <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 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-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';
-
-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";
-
-    .view-button {
-        display: list-item;
-        width: 150px !important;
-        margin-left: 0px;
-    }
-
-    .view-label {
-        height: 32px;
-        line-height: 32px;
-    }
-
-    .view-box {
-        padding: 10px 0px;
-        border: 1px inset gray;
-        border-top: 1px outset gray;
-        border-left: 1px outset gray;
-    }
-
-    /deep/ {
-        .el-row {
-            margin: 5px 20px;
-        }
-    }
-</style>
diff --git a/src/jmapNew/theme/chengdu_03/menusPlan/modifyingTask.vue b/src/jmapNew/theme/chengdu_03/menusPlan/modifyingTask.vue
deleted file mode 100644
index 4679c003e..000000000
--- a/src/jmapNew/theme/chengdu_03/menusPlan/modifyingTask.vue
+++ /dev/null
@@ -1,326 +0,0 @@
-<template>
-  <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-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-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-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-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';
-
-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) => {
-					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;
-            margin-right: 40px !important;
-        }
-
-        .el-row {
-            margin-bottom: 5px !important;
-        }
-
-        .el-input__inner {
-            height: 20px !important;
-            line-height: 20px !important;
-        }
-
-        .el-input {
-            width: 110px !important;
-        }
-    }
-</style>
diff --git a/src/jmapNew/theme/chengdu_03/model.js b/src/jmapNew/theme/chengdu_03/model.js
index ed34da08c..dd040cf61 100644
--- a/src/jmapNew/theme/chengdu_03/model.js
+++ b/src/jmapNew/theme/chengdu_03/model.js
@@ -14,6 +14,9 @@ class Model {
         this['private'][deviceType.StationControl] = {
             indicatorShow: true									// 标识灯名称显示
         };
+        this['private'][deviceType.Station] = {
+            kmPostShow: true									// 公里标显示
+        };
         this['private'][deviceType.Switch] = {
             nameShow: true
         };
diff --git a/src/jmapNew/theme/chengdu_03/planSchedule/menuTool.vue b/src/jmapNew/theme/chengdu_03/planSchedule/menuTool.vue
deleted file mode 100644
index a2ee9e8f0..000000000
--- a/src/jmapNew/theme/chengdu_03/planSchedule/menuTool.vue
+++ /dev/null
@@ -1,170 +0,0 @@
-<template>
-  <div id="PlanMenuTool">
-    <div class="nav">
-      <div v-for="(item,index) in tools" :key="index" class="tool">
-        <img :src="item.src" :alt="item.title">
-      </div>
-    </div>
-  </div>
-</template>
-<script>
-import { prefixIntrger } from '@/utils/date';
-import logo_ from '@/assets/logo_.png';
-
-export default {
-    name: 'PlanMenuTool',
-    data() {
-        return {
-            tools: [
-                {
-                    title: '服务器1',
-                    operate: '',
-                    src: logo_,
-                    click: this.undeveloped
-                },
-                {
-                    title: '服务器2',
-                    operate: '',
-                    src: '',
-                    click: this.undeveloped
-                },
-                {
-                    title: '前置机1',
-                    operate: '',
-                    src: '',
-                    click: this.undeveloped
-                },
-                {
-                    title: '前置机2',
-                    operate: '',
-                    src: '',
-                    click: this.undeveloped
-                },
-                {
-                    title: '主调',
-                    operate: '',
-                    src: '',
-                    click: this.undeveloped
-                },
-                {
-                    title: '调度台1',
-                    operate: '',
-                    src: '',
-                    click: this.undeveloped
-                },
-                {
-                    title: '调度台2',
-                    operate: '',
-                    src: '',
-                    click: this.undeveloped
-                },
-                {
-                    title: '调度台3',
-                    operate: '',
-                    src: '',
-                    click: this.undeveloped
-                },
-                {
-                    title: '大屏',
-                    operate: '',
-                    src: '',
-                    click: this.undeveloped
-                },
-                {
-                    title: '维护工作站',
-                    operate: '',
-                    src: '',
-                    click: this.undeveloped
-                },
-                {
-                    title: '运行图显示人工站',
-                    operate: '',
-                    src: '',
-                    click: this.undeveloped
-                },
-                {
-                    title: '跳停',
-                    operate: '',
-                    src: '',
-                    click: this.undeveloped
-                },
-                {
-                    title: '扣车',
-                    operate: '',
-                    src: '',
-                    click: this.undeveloped
-                },
-                {
-                    title: '列车报警',
-                    operate: '',
-                    src: logo_,
-                    click: this.undeveloped
-                }
-            ]
-        };
-    },
-    computed: {
-        isShowSystemTime() {
-            return this.$route.params.mode == 'demon' || this.$route.params.mode === 'dp' || !this.$route.params.mode;
-        }
-    },
-    watch: {
-        '$store.state.training.initTime': function (initTime) {
-            const date = new Date(initTime);
-            this.time = `${prefixIntrger(date.getHours(), 2)}:${prefixIntrger(date.getMinutes(), 2)}${prefixIntrger(date.getSeconds(), 2)}`;
-        }
-    },
-    mounted() {
-        this.initTools();
-    },
-    methods: {
-        initTools() {
-            this.tools = [];
-        }
-    }
-};
-</script>
-
-<style scoped rel="stylesheet/scss" lang="scss" scoped>
-    @import "src/styles/mixin.scss";
-    $top: 48px;
-    $width: 25px;
-    $height: 25px;
-
-    #PlanMenuTool {
-        z-index: 5;
-        position: absolute;
-        width: 100%;
-        top: $top;
-    }
-
-    .nav {
-        display: block;
-        color: #0000;
-        background: #EBEADB;
-        border: 1px solid #B6BCCC !important;
-        border-bottom: 2px solid #B6BCCC !important;
-        list-style: none;
-        height: $height;
-        line-height: $height;
-    }
-
-    .tool {
-        padding-left: 10px;
-        display: flex;
-        justify-content: center;
-        cursor: pointer;
-        position: relative;
-        float: left;
-        margin: 1px;
-        width: $width;
-
-        img {
-            display: block;
-            text-align: center;
-            padding-top: 2px;
-            height: $height - 5;
-            width: $width - 5;
-        }
-    }
-</style>
diff --git a/src/jmapNew/theme/chengdu_03/planSchedule/statusBar.vue b/src/jmapNew/theme/chengdu_03/planSchedule/statusBar.vue
deleted file mode 100644
index 170553e15..000000000
--- a/src/jmapNew/theme/chengdu_03/planSchedule/statusBar.vue
+++ /dev/null
@@ -1,100 +0,0 @@
-<template>
-    <data-table id="PlanStatusBar" ref="dataTable" :height="height-11" :config="stationListConfig" :close="false"
-        :style="{top: maxmini? maxTop-110+'px':maxTop-21+'px'}" @touch="touch"></data-table>
-</template>
-
-<script>
-    import DataTable from '../menusPlan/components/dataTable';
-    import { formatTime, formatName } from '@/utils/runPlan';
-
-    export default {
-        name: 'PlanStatusBar',
-        props: {
-            maxTop: {
-                type: Number,
-                required: true
-            }
-        },
-        components: {
-            DataTable
-        },
-        data() {
-            return {
-                maxmini: true,
-                height: 100,
-                stationListConfig: {
-                    data: [],
-                    showClose: true,
-                    highlightCurrentRow: true,
-                    columns: [
-                        {
-                            prop: 'stationName',
-                            label: '站台',
-                            width: 400
-                        },
-                        {
-                            prop: 'startTime',
-                            label: '到点',
-                        },
-                        {
-                            prop: 'stopTime',
-                            label: '停站时间',
-                        },
-                        {
-                            prop: 'endTime',
-                            label: '发点',
-                        },
-                        {
-                            prop: 'level',
-                            label: '运行等级'
-
-                        }
-                    ]
-                }
-            }
-        },
-        watch: {
-            '$store.state.runPlan.selected': function (select) {
-                this.stationListConfig.data = [];
-                let serviceObj = this.$store.state.runPlan.editData[select.serviceNumber];
-                if (serviceObj) {
-                    let trainMap = serviceObj.trainMap;
-                    if (trainMap) {
-                        let trainObj = trainMap[select.tripNumber];
-                        if (trainObj) {
-                            let stationTimeList = trainObj.stationTimeList;
-                            if (stationTimeList && stationTimeList.length) {
-                                stationTimeList.forEach((elem, index) => {
-                                    let stationObj = {
-                                        stationName: formatName(elem.stationCode),
-                                        startTime: formatTime(index == 0 ? null : stationTimeList[index - 1].secondTime),
-                                        stopTime: formatTime(index == 0 ? null : elem.secondTime - stationTimeList[index - 1].secondTime),
-                                        endTime: formatTime(elem.secondTime),
-                                        level: ''
-                                    }
-                                    this.stationListConfig.data.push(stationObj);
-                                });
-                            }
-                        }
-                    }
-                }
-            }
-        },
-        methods: {
-            touch(maxmini) {
-                this.maxmini = maxmini;
-                this.$emit('setPosition');
-            }
-        }
-    }
-</script>
-
-<style scoped rel="stylesheet/scss" lang="scss" scoped>
-    @import "src/styles/mixin.scss";
-
-    #PlanStatusBar {
-        z-index: 5;
-        position: absolute;
-        width: 100%;
-    }
-</style>
\ No newline at end of file
diff --git a/src/jmapNew/theme/chengdu_03/planSchedule/titleBar.vue b/src/jmapNew/theme/chengdu_03/planSchedule/titleBar.vue
deleted file mode 100644
index 689c3486a..000000000
--- a/src/jmapNew/theme/chengdu_03/planSchedule/titleBar.vue
+++ /dev/null
@@ -1,75 +0,0 @@
-<template>
-    <div id="PlanTitleBar">
-        <img class="logo" :src="logoImg" />
-        <span> {{mapName}} &ensp;</span>
-        <span v-if="runPlanName">({{runPlanName}})</span>
-        <span class="system-close el-icon-close" @click="back"></span>
-    </div>
-</template>
-
-<script>
-    import logo_ from '@/assets/logo_.png';
-    import { getPublishMapInfo } from '@/api/jmap/map';
-
-    export default {
-        name: 'PlanTitleBar',
-        data() {
-            return {
-                mapName: '',
-                logoImg: logo_
-            }
-        },
-        computed: {
-            runPlanName() {
-                return this.$route.query.planName || '';
-            }
-        },
-        mounted() {
-            if (this.$route.query.mapId) {
-                getPublishMapInfo(this.$route.query.mapId).then(resp => {
-                    this.mapName = resp.data.name;
-                })
-            }
-        },
-        methods: {
-            back() {
-                this.$emit('back');
-            }
-        }
-    }
-</script>
-<style scoped rel="stylesheet/scss" lang="scss" scoped>
-    @import "src/styles/mixin.scss";
-    $width: 25px;
-    $height: 25px;
-
-    #PlanTitleBar {
-        z-index: 10;
-        display: flex;
-        position: absolute;
-        width: 100%;
-        height: $height;
-        line-height: $height;
-        background: -webkit-linear-gradient(#0055E8, #0099F8);
-        background: -o-linear-gradient(#0055E8, #0099F8);
-        background: -moz-linear-gradient(#0055E8, #0099F8);
-        background: linear-gradient(#0055E8, #0099F8);
-        color: white;
-        font: bold;
-        font-size: 16px;
-
-        .logo {
-            display: inline-block;
-            width: $width;
-            height: $height;
-            padding-right: 5px;
-        }
-
-        .system-close {
-            width: 25px;
-            height: 25px;
-            position: absolute;
-            right: 1px;
-        }
-    }
-</style>
\ No newline at end of file
diff --git a/src/jmapNew/theme/factory.js b/src/jmapNew/theme/factory.js
index 661112890..4cdd371d7 100644
--- a/src/jmapNew/theme/factory.js
+++ b/src/jmapNew/theme/factory.js
@@ -11,7 +11,8 @@ class Theme {
             '06': 'ningbo_01',
             '07': 'haerbin_01', // 哈尔滨培训线路
             '08': 'foshan_01',
-            '09': 'xian_02'
+            '09': 'xian_02',
+            '10': 'xian_01'
         };
         this._localShowMode = { // 现地显示模式
             '01': 'all', // 成都一 全显
@@ -22,7 +23,8 @@ class Theme {
             '06': 'ecStation', // 宁波一 集中站显示
             '07': 'ecStation', // 哈尔滨培训线路 集中站显示
             '08': 'all', // 佛山有轨线路 全显
-            '09': 'all'
+            '09': 'all',
+            '10': 'all'
         };
     }
 
@@ -32,9 +34,9 @@ class Theme {
     }
 
     // 加载运行图计划表组件
-    loadPlanComponent(code) {
-        return Object.assign({}, require(`./${this._mapMenu[code || this._code]}/planSchedule/index`).default);
-    }
+    // loadPlanComponent(code) {
+    //     return Object.assign({}, require(`./${this._mapMenu[code || this._code]}/planSchedule/index`).default);
+    // }
 
     // 加载运行图解析和转化函数
     loadPlanConvert(code) {
diff --git a/src/jmapNew/theme/foshan_01/menus/dialog/routeControl.vue b/src/jmapNew/theme/foshan_01/menus/dialog/routeControl.vue
index 4c0a1bbb9..e515e9d87 100644
--- a/src/jmapNew/theme/foshan_01/menus/dialog/routeControl.vue
+++ b/src/jmapNew/theme/foshan_01/menus/dialog/routeControl.vue
@@ -23,8 +23,8 @@
       </el-col>
     </el-row>
     <div v-if="passModel" style="margin: 12px 0;">
-      <el-radio :id="upRadioId" v-model="passRadio" label="1" style="display: block; padding-left: 10px; margin-bottom: 10px;" :disabled="passRadio == '2'" @change="changeRadio">设置自动通过</el-radio>
-      <el-radio :id="upRadioId" v-model="passRadio" label="2" style="display: block; padding-left: 10px;" :disabled="passRadio == '1'" @change="changeRadio">取消自动通过</el-radio>
+      <el-radio v-model="passRadio" label="1" style="display: block; padding-left: 10px; margin-bottom: 10px;" :disabled="passRadio == '2'" @change="changeRadio">设置自动通过</el-radio>
+      <el-radio v-model="passRadio" label="2" style="display: block; padding-left: 10px;" :disabled="passRadio == '1'" @change="changeRadio">取消自动通过</el-radio>
     </div>
     <el-row justify="center" class="button-group">
       <el-col :span="10" :offset="2">
diff --git a/src/jmapNew/theme/foshan_01/menus/dialog/stationControl.vue b/src/jmapNew/theme/foshan_01/menus/dialog/stationControl.vue
index c6449ac0a..b01a98cc3 100644
--- a/src/jmapNew/theme/foshan_01/menus/dialog/stationControl.vue
+++ b/src/jmapNew/theme/foshan_01/menus/dialog/stationControl.vue
@@ -64,7 +64,8 @@ export default {
             row: null,
             operation: '',
             stationLists: [],
-            disabledAll: false
+            disabledAll: false,
+            checked2: false
         };
     },
     computed: {
diff --git a/src/jmapNew/theme/foshan_01/menus/dialog/switchControl.vue b/src/jmapNew/theme/foshan_01/menus/dialog/switchControl.vue
index 02921ccf3..3bdb6d848 100644
--- a/src/jmapNew/theme/foshan_01/menus/dialog/switchControl.vue
+++ b/src/jmapNew/theme/foshan_01/menus/dialog/switchControl.vue
@@ -190,7 +190,7 @@ export default {
             const operate = {
                 over: true,
                 operation: OperationEvent.Switch.locate.menu.operation,
-                cmdType: CMD.Switch.CMD_SWITCH_TURN_NP_CHAIN
+                cmdType: CMD.Switch.CMD_SWITCH_NORMAL_POSITION
             };
 
             this.sendCommand(operate);
@@ -200,7 +200,7 @@ export default {
             const operate = {
                 over: true,
                 operation: OperationEvent.Switch.reverse.menu.operation,
-                cmdType: CMD.Switch.CMD_SWITCH_TURN_RP_CHAIN
+                cmdType: CMD.Switch.CMD_SWITCH_REVERSE_POSITION
             };
 
             this.sendCommand(operate);
diff --git a/src/jmapNew/theme/foshan_01/menus/dialog/turnBackControl.vue b/src/jmapNew/theme/foshan_01/menus/dialog/turnBackControl.vue
index 882b862bd..e3dfd4fc3 100644
--- a/src/jmapNew/theme/foshan_01/menus/dialog/turnBackControl.vue
+++ b/src/jmapNew/theme/foshan_01/menus/dialog/turnBackControl.vue
@@ -24,10 +24,10 @@
     </el-row>
     <el-row style="margin: 12px 0;">
       <el-col :span="11">
-        <el-radio :id="upRadioId" v-model="passRadio" label="1" style="display: block; padding-left: 10px; margin-bottom: 10px;" :disabled="passRadio == '2'">设置</el-radio>
+        <el-radio v-model="passRadio" label="1" style="display: block; padding-left: 10px; margin-bottom: 10px;" :disabled="passRadio == '2'">设置</el-radio>
       </el-col>
       <el-col :span="11" :offset="2">
-        <el-radio :id="upRadioId" v-model="passRadio" label="2" style="display: block; padding-left: 10px;" :disabled="passRadio == '1'">取消</el-radio>
+        <el-radio v-model="passRadio" label="2" style="display: block; padding-left: 10px;" :disabled="passRadio == '1'">取消</el-radio>
       </el-col>
     </el-row>
     <el-row justify="center" class="button-group">
diff --git a/src/jmapNew/theme/foshan_01/menus/menuSwitch.vue b/src/jmapNew/theme/foshan_01/menus/menuSwitch.vue
index f13e3354b..dc2b1669a 100644
--- a/src/jmapNew/theme/foshan_01/menus/menuSwitch.vue
+++ b/src/jmapNew/theme/foshan_01/menus/menuSwitch.vue
@@ -45,11 +45,36 @@ export default {
                 Local: [
                 ],
                 Center: [
-                    // {
-                    //     label: '设置临时限速',
-                    //     handler: this.setSpeed,
-                    //     cmdType: CMD.Section.CMD_SECTION_SET_LIMIT_SPEED
-                    // },
+                    {
+                        label: '道岔总定',
+                        handler: this.locate,
+                        cmdType:CMD.Switch.CMD_SWITCH_NORMAL_POSITION
+                    },
+                    {
+                        label: '道岔总反',
+                        handler: this.reverse,
+                        cmdType:CMD.Switch.CMD_SWITCH_REVERSE_POSITION
+                    },
+                    {
+                        label: '道岔单锁',
+                        handler: this.lock,
+                        cmdType:CMD.Switch.CMD_SWITCH_SINGLE_LOCK
+                    },
+                    {
+                        label: '道岔单解',
+                        handler: this.unlock,
+                        cmdType:CMD.Switch.CMD_SWITCH_SINGLE_UNLOCK
+                    },
+                    {
+                        label: '道岔封闭',
+                        handler: this.block,
+                        cmdType:CMD.Switch.CMD_SWITCH_BLOCK
+                    },
+                    {
+                        label: '道岔解封',
+                        handler: this.unblock,
+                        cmdType:CMD.Switch.CMD_SWITCH_UNBLOCK
+                    }
                 ]
             },
             menuForce: [
@@ -213,48 +238,84 @@ export default {
         },
         // 单操到定位
         locate(selectType) {
-            commitOperate(menuOperate.Switch.locate, {switchCode:selectType.code}, 3).then(({valid, operate})=>{
-                // this.$refs.switchControl.doShow(data.operate, this.selected);
+            let code = selectType.code;
+            let type = 3;
+            if (!code) {
+                code = this.selected.code;
+                type = 0;
+            }
+            commitOperate(menuOperate.Switch.locate, {switchCode: code}, type).then(({valid, operate})=>{
+                !selectType.code && this.$refs.switchControl.doShow(operate, this.selected);
             }).catch(error=>{
                 this.$refs.noticeInfo.doShow({}, error.message);
             });
         },
         // 单操到反位
         reverse(selectType) {
-            commitOperate(menuOperate.Switch.reverse, {switchCode:selectType.code}, 3).then(({valid, operate})=>{
-                // this.$refs.switchControl.doShow(data.operate, this.selected);
+            let code = selectType.code;
+            let type = 3;
+            if (!code) {
+                code = this.selected.code;
+                type = 0;
+            }
+            commitOperate(menuOperate.Switch.reverse, {switchCode: code}, type).then(({valid, operate})=>{
+                !selectType.code && this.$refs.switchControl.doShow(operate, this.selected);
             }).catch(error=>{
                 this.$refs.noticeInfo.doShow({}, error.message);
             });
         },
         // 道岔单锁
         lock(selectType) {
-            commitOperate(menuOperate.Switch.lock, {switchCode:selectType.code}, 3).then(({valid, operate})=>{
-                // this.$refs.switchControl.doShow(data.operate, this.selected);
+            let code = selectType.code;
+            let type = 3;
+            if (!code) {
+                code = this.selected.code;
+                type = 0;
+            }
+            commitOperate(menuOperate.Switch.lock, {switchCode: code}, type).then(({valid, operate})=>{
+                !selectType.code && this.$refs.switchControl.doShow(operate, this.selected);
             }).catch(error=>{
                 this.$refs.noticeInfo.doShow({}, error.message);
             });
         },
         // 道岔解锁
         unlock(selectType) {
-            commitOperate(menuOperate.Switch.unlock, {switchCode:selectType.code}, 3).then(({valid, operate})=>{
-                // this.$refs.switchUnLock.doShow(data.operate, this.selected);
+            let code = selectType.code;
+            let type = 3;
+            if (!code) {
+                code = this.selected.code;
+                type = 0;
+            }
+            commitOperate(menuOperate.Switch.unlock, {switchCode: code}, type).then(({valid, operate})=>{
+                !selectType.code && this.$refs.switchUnLock.doShow(operate, this.selected);
             }).catch(error=>{
                 this.$refs.noticeInfo.doShow({}, error.message);
             });
         },
         // 道岔封锁
         block(selectType) {
-            commitOperate(menuOperate.Switch.block, {switchCode:selectType.code}, 3).then(({valid, operate})=>{
-                // this.$refs.switchControl.doShow(data.operate, this.selected);
+            let code = selectType.code;
+            let type = 3;
+            if (!code) {
+                code = this.selected.code;
+                type = 0;
+            }
+            commitOperate(menuOperate.Switch.block, {switchCode: code}, type).then(({valid, operate})=>{
+                !selectType.code && this.$refs.switchControl.doShow(operate, this.selected);
             }).catch(error=>{
                 this.$refs.noticeInfo.doShow({}, error.message);
             });
         },
         // 道岔解封
         unblock(selectType) {
-            commitOperate(menuOperate.Switch.unblock, {switchCode:selectType.code}, 3).then(({valid, operate})=>{
-                // this.$refs.switchUnLock.doShow(data.operate, this.selected);
+            let code = selectType.code;
+            let type = 3;
+            if (!code) {
+                code = this.selected.code;
+                type = 0;
+            }
+            commitOperate(menuOperate.Switch.unblock, {switchCode: code}, type).then(({valid, operate})=>{
+                !selectType.code && this.$refs.switchUnLock.doShow(operate, this.selected);
             }).catch(error=>{
                 this.$refs.noticeInfo.doShow({}, error.message);
             });
diff --git a/src/jmapNew/theme/foshan_01/menusPlan/addTask.vue b/src/jmapNew/theme/foshan_01/menusPlan/addTask.vue
deleted file mode 100644
index 7393eadc4..000000000
--- a/src/jmapNew/theme/foshan_01/menusPlan/addTask.vue
+++ /dev/null
@@ -1,175 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="foshan-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 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();
-		}
-	}
-};
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-    @import "src/styles/mixin.scss";
-
-    /deep/ {
-        .el-button {
-            margin-left: 40px !important;
-            margin-right: 40px !important;
-        }
-
-        .el-row {
-            margin-bottom: 5px !important;
-        }
-
-        .el-input__inner {
-            height: 20px !important;
-            line-height: 20px !important;
-        }
-    }
-</style>
diff --git a/src/jmapNew/theme/foshan_01/menusPlan/chooseTemplatePlan.vue b/src/jmapNew/theme/foshan_01/menusPlan/chooseTemplatePlan.vue
deleted file mode 100644
index 67b408088..000000000
--- a/src/jmapNew/theme/foshan_01/menusPlan/chooseTemplatePlan.vue
+++ /dev/null
@@ -1,115 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    :title="title"
-    class="foshan-01__schedule choose-plan-template"
-    :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 } from '@/api/runplan';
-import { listPublishMap } from '@/api/jmap/map';
-
-export default {
-    name: 'ChooseTemplatePlan',
-    data() {
-        return {
-            dialogShow: false,
-            loading: false,
-            mapList: [],
-            pagerConfig: {
-                pageSize: 'pageSize',
-                pageIndex: 'pageNum'
-            },
-            queryForm: {
-                reset: true,
-                labelWidth: '100px',
-                queryObject: {
-                    name: {
-                        type: 'text',
-                        label: '运行图名称'
-                    }
-                }
-            },
-            queryList: {
-                query: this.queryFunction,
-                selectCheckShow: false,
-                radioShow: true,
-                columns: [
-                    {
-                        title: '运行图名称',
-                        prop: 'name'
-                    },
-                    {
-                        title: '地图名称',
-                        prop: 'mapId',
-                        type: 'tag',
-                        columnValue: (row) => {
-                            return this.$convertField(row.mapId, this.mapList, ['id', 'name']);
-                        },
-                        tagType: (row) => { return 'success'; }
-                    }
-                ]
-            },
-
-            currentModel: {}
-        };
-    },
-    computed: {
-        title() {
-            return '选择模板运行图';
-        }
-    },
-    methods: {
-        loadInitData() {
-            this.mapList = [];
-            listPublishMap().then(response => {
-                this.mapList = response.data;
-            });
-        },
-        doShow() {
-            this.loading = false;
-            this.dialogShow = true;
-            this.loadInitData();
-        },
-        doClose() {
-            this.dialogShow = false;
-        },
-        queryFunction(params) {
-            if (this.$store.state.map && this.$store.state.map.map) {
-                params['mapId'] = this.$route.query.mapId;
-                // params['lineCode'] = this.$store.getters['map/lineCode'];
-            }
-            return runPlanTemplateList(params);
-        },
-        handleConfirm() {
-            this.doClose();
-            if (this.$refs && this.$refs.pageRules) {
-                const choose = this.$refs.pageRules.currentChoose();
-                if (choose) {
-                    this.$emit('chooseConfirm', choose);
-                } else {
-                    this.$messageBox(`请选择模板运行图`);
-                }
-            }
-        },
-        reloadTable() {
-            this.queryList.reload();
-        }
-    }
-};
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-    @import "src/styles/mixin.scss";
-</style>
diff --git a/src/jmapNew/theme/foshan_01/menusPlan/components/dataTable.vue b/src/jmapNew/theme/foshan_01/menusPlan/components/dataTable.vue
deleted file mode 100644
index fa98a48e7..000000000
--- a/src/jmapNew/theme/foshan_01/menusPlan/components/dataTable.vue
+++ /dev/null
@@ -1,206 +0,0 @@
-<template>
-  <div v-if="show">
-    <template v-if="maxmini">
-      <div class="nav">
-        <div v-show="config.showClose" class="cls-status" @click="touch('Close')"><span /></div>
-        <div class="min-status" @click="touch('Minim')"><span /></div>
-      </div>
-      <el-table
-        ref="table"
-        :data="config.data"
-        :highlight-current-row="config.highlightCurrentRow"
-        :height="height"
-        border
-        @current-change="handleChange"
-      >
-        <template v-for="(item,index) in config.columns">
-          <el-table-column :key="index" :prop="item.prop" :label="item.label" :width="item.width" />
-        </template>
-      </el-table>
-    </template>
-    <template v-else>
-      <div class="nav">
-        <div class=" max-status" @click="touch('Maxim')"><span /></div>
-      </div>
-    </template>
-  </div>
-</template>
-
-<script>
-export default {
-	name: 'DataTable',
-	props: {
-		height: {
-			type: Number,
-			required: true
-		},
-		config: {
-			type: Object,
-			required: true
-		}
-	},
-	data() {
-		return {
-			show: true,
-			maxmini: true,
-			touchStrategy: {
-				'Close': [false, true],
-				'Minim': [true, false],
-				'Maxim': [true, true]
-			}
-		};
-	},
-	methods: {
-		handleChange(row) {
-			if (this.config.handleChange) {
-				this.config.handleChange(row);
-			}
-		},
-		setCurrentRow(row) {
-			this.$refs.table.setCurrentRow(row);
-		},
-		touch(operate) {
-			this.$nextTick(() => {
-				[this.show, this.maxmini] = this.touchStrategy[operate];
-				this.$emit('touch', this.maxmini);
-			});
-		}
-	}
-};
-</script>
-
-<style scoped rel="stylesheet/scss" lang="scss" >
-    @import "src/styles/mixin.scss";
-    $height: 20px;
-    $width: 20px;
-
-    .nav {
-        display: table;
-        float: right;
-        width: 100%;
-        color: #0000;
-        background: -webkit-linear-gradient(#FDFDFE, #B1CBF3);
-        background: -o-linear-gradient(#FDFDFE, #B1CBF3);
-        background: -moz-linear-gradient(#FDFDFE, #B1CBF3);
-        background: linear-gradient(#FDFDFE, #B1CBF3);
-        border: 1px solid #B6BCCC !important;
-        border-bottom: 2px solid #B6BCCC !important;
-        list-style: none;
-        height: $height;
-        line-height: $height;
-    }
-
-    /deep/ {
-        .el-table--border th.gutter {
-            background: #EBEADB !important;
-        }
-
-        .el-table {
-            overflow-y: hidden;
-            width: 100%;
-
-            th.is-leaf {
-                padding: 0px 0;
-                background: #EBEADB;
-                border-right: none !important;
-                border-left: 1px solid #D1CDBD !important;
-                border-top: 1px solid #D1CDBD !important;
-                border-bottom: 1px inset #D1CDBD !important;
-                color: #000;
-
-                .cell {
-                    height: $height;
-                    line-height: $height;
-                }
-            }
-
-            td {
-                padding: 0px 0;
-
-                .cell {
-                    height: $height;
-                    line-height: $height;
-                    font-size: smaller !important;
-                }
-
-            }
-
-            .current-row>td {
-                background: #316AC5 !important;
-                color: #fff !important;
-            }
-        }
-
-        .cls-status {
-            float: right;
-            width: 12px;
-            height: 100%;
-            line-height: 100%;
-            margin-left: 5px;
-            cursor: pointer;
-
-            span {
-                display: inline-block;
-                content: '/';
-                background: black;
-                width: 2px;
-                height: 12px;
-                vertical-align: middle;
-               transform: rotate(45deg);
-            }
-
-            span::after {
-                display: block;
-                content: '/';
-                background: black;
-                width: 2px;
-                height: 12px;
-               transform: rotate(-90deg);
-            }
-        }
-
-        .min-status {
-            float: right;
-            width: 20px;
-            height: 100%;
-            line-height: 100%;
-            cursor: pointer;
-
-            span {
-                display: inline-block;
-                content: '-';
-                background: black;
-                width: 2px;
-                height: 12px;
-                vertical-align: middle;
-               transform: rotate(-90deg);
-            }
-        }
-
-        .max-status {
-            float: right;
-            width: 20px;
-            height: 100%;
-            line-height: 100%;
-            cursor: pointer;
-
-            span {
-                display: inline-block;
-                content: '';
-                background: black;
-                width: 2px;
-                height: 12px;
-                transform: rotate(0deg);
-            }
-
-            span::after {
-                display: block;
-                content: '';
-                background: black;
-                width: 2px;
-                height: 12px;
-               transform: rotate(90deg);
-            }
-        }
-    }
-</style>
diff --git a/src/jmapNew/theme/foshan_01/menusPlan/createTodayPlan.vue b/src/jmapNew/theme/foshan_01/menusPlan/createTodayPlan.vue
deleted file mode 100644
index d0e6f8303..000000000
--- a/src/jmapNew/theme/foshan_01/menusPlan/createTodayPlan.vue
+++ /dev/null
@@ -1,134 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    :title="title"
-    class="foshan-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 } from '@/api/runplan';
-import { getStationList } from '@/api/runplan';
-import { getEveryDayRunPlanData, generateDayRunPlan } from '@/api/simulation';
-import { getPublishMapInfo } from '@/api/jmap/map';
-
-export default {
-    name: 'ReloadTodayPlan',
-    data() {
-        return {
-            dialogShow: false,
-            loading: false,
-            pagerConfig: {
-                pageSize: 'pageSize',
-                pageIndex: 'pageNum'
-            },
-            queryForm: {
-                reset: true,
-                labelWidth: '100px',
-                queryObject: {
-                    name: {
-                        type: 'text',
-                        label: '运行图名称'
-                    }
-                }
-            },
-            queryList: {
-                query: this.queryFunction,
-                selectCheckShow: false,
-                radioShow: true,
-                columns: [
-                    {
-                        title: '运行图名称',
-                        prop: 'name'
-                    }
-                ]
-            },
-
-            currentModel: {}
-        };
-    },
-    computed: {
-        title() {
-            return '加载当天计划';
-        }
-    },
-    methods: {
-        doShow() {
-            this.loading = false;
-            this.dialogShow = true;
-        },
-        doClose() {
-            this.dialogShow = false;
-        },
-        queryFunction(params) {
-            if (this.$store.state.map && this.$store.state.map.map) {
-                // params['lineCode'] = this.$store.getters['map/lineCode'];
-                params['mapId'] = this.$route.query.mapId;
-            }
-            return runPlanTemplateList(params);
-        },
-        // 生成每日运行图
-        handleConfirm() {
-            if (this.$refs && this.$refs.pageRules) {
-                const choose = this.$refs.pageRules.currentChoose();
-                if (choose && choose.id) {
-                    this.loading = true;
-                    generateDayRunPlan(choose.id, this.$route.query.group).then(response => {
-                        this.loading = false;
-                        this.reloadTable();
-                        this.loadRunData();
-                        this.doClose();
-                        this.$message.success(`生成用户每日运行图成功`);
-                    }).catch(() => {
-                        this.loading = false;
-                        this.reloadTable();
-                        this.$messageBox(`生成用户每日运行图失败`);
-                    });
-                } else {
-                    this.$messageBox(`请选择需要加载的运行图`);
-                }
-            }
-        },
-        loadRunData() {
-            // const skinCode = this.$route.query.skinCode;
-            const mapId = this.$route.query.mapId;
-            this.$store.dispatch('runPlan/clear');
-            if (mapId) {
-                getStationList(mapId).then(response => {
-                    const stations = response.data;
-                    getPublishMapInfo(this.$route.query.mapId).then(res=>{
-                        this.PlanConvert = this.$theme.loadPlanConvert(res.data.lineCode);
-                        this.$store.dispatch('runPlan/setStations', stations).then(() => {
-                            getEveryDayRunPlanData(this.$route.query.group).then(resp => {
-                                this.$store.dispatch('runPlan/setPlanData', resp.data);
-                            }).catch(() => {
-                                this.$store.dispatch('runPlan/setPlanData', []);
-                                this.$messageBox(`获取运行图数据失败`);
-                            });
-                        });
-                    });
-                }).catch(() => {
-                    this.$messageBox(`获取车站列表失败`);
-                });
-            }
-        },
-        reloadTable() {
-            this.queryList.reload();
-        }
-    }
-};
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-    @import "src/styles/mixin.scss";
-</style>
diff --git a/src/jmapNew/theme/foshan_01/menusPlan/createWeekPlan.vue b/src/jmapNew/theme/foshan_01/menusPlan/createWeekPlan.vue
deleted file mode 100644
index 3b7892577..000000000
--- a/src/jmapNew/theme/foshan_01/menusPlan/createWeekPlan.vue
+++ /dev/null
@@ -1,137 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="foshan-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';
-
-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 {
-				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";
-
-    .card-box {
-        padding-top: 10px;
-    }
-
-    /deep/ {
-        .el-row {
-            margin: 10px;
-        }
-    }
-</style>
diff --git a/src/jmapNew/theme/foshan_01/menusPlan/deleteTask.vue b/src/jmapNew/theme/foshan_01/menusPlan/deleteTask.vue
deleted file mode 100644
index a4b46a39f..000000000
--- a/src/jmapNew/theme/foshan_01/menusPlan/deleteTask.vue
+++ /dev/null
@@ -1,73 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="foshan-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();
-		}
-	}
-};
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-    @import "src/styles/mixin.scss";
-
-    /deep/ {
-        .el-row {
-            margin: 10px;
-        }
-    }
-</style>
diff --git a/src/jmapNew/theme/foshan_01/menusPlan/deleteTodayPlan.vue b/src/jmapNew/theme/foshan_01/menusPlan/deleteTodayPlan.vue
deleted file mode 100644
index d4ec6f572..000000000
--- a/src/jmapNew/theme/foshan_01/menusPlan/deleteTodayPlan.vue
+++ /dev/null
@@ -1,62 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="foshan-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();
-		}
-	}
-};
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-    @import "src/styles/mixin.scss";
-
-    /deep/ {
-        .el-row {
-            margin: 10px;
-        }
-    }
-</style>
diff --git a/src/jmapNew/theme/foshan_01/menusPlan/managePlanList.vue b/src/jmapNew/theme/foshan_01/menusPlan/managePlanList.vue
deleted file mode 100644
index 5dde228f9..000000000
--- a/src/jmapNew/theme/foshan_01/menusPlan/managePlanList.vue
+++ /dev/null
@@ -1,143 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="foshan-01__schedule manage-plan-list"
-    :title="title"
-    :visible.sync="dialogShow"
-    width="80%"
-    :before-close="doClose"
-    :z-index="2000"
-    :modal="false"
-    :close-on-click-modal="false"
-  >
-    <QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
-  </el-dialog>
-</template>
-
-<script>
-import { getRunPlanLoadList, deleteRunPlanLoad, listAllTempLateRunPlan } from '@/api/runplan';
-import { getPublishMapListOnline } from '@/api/jmap/map';
-
-export default {
-    name: 'ManagePlanList',
-    data() {
-        return {
-            dialogShow: false,
-            loading: false,
-            pagerConfig: {
-                pageSize: 'pageSize',
-                pageIndex: 'pageNum'
-            },
-            queryForm: {
-                labelWidth: '140px',
-                reset: true
-            },
-            queryList: {
-                query: this.queryFunction,
-                selectCheckShow: false,
-                indexShow: true,
-                columns: [
-                    {
-                        title: this.$t('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 '运行图计划表';
-        }
-    },
-    mounted() {
-        this.loadPageData();
-    },
-    methods: {
-        loadPageData() {
-            this.mapList = [];
-            getPublishMapListOnline().then(resp => {
-                this.mapList = resp.data;
-            });
-            this.templatePlanList = [];
-            listAllTempLateRunPlan().then(resp => {
-                this.templatePlanList = resp.data;
-            });
-        },
-        queryFunction(params) {
-            if (this.$route.query.mapId) {
-                params['mapId'] = this.$route.query.mapId;
-            }
-
-            if (this.$store.state.user.id) {
-                params['userId'] = this.$store.state.user.id;
-            }
-
-            return getRunPlanLoadList(params);
-        },
-        handleDelete(index, row) {
-            this.$confirm('此操作将删除次日加载的运行图, 是否继续?', '提示', {
-                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>
diff --git a/src/jmapNew/theme/foshan_01/menusPlan/modifyingPlan.vue b/src/jmapNew/theme/foshan_01/menusPlan/modifyingPlan.vue
deleted file mode 100644
index 9b5740f84..000000000
--- a/src/jmapNew/theme/foshan_01/menusPlan/modifyingPlan.vue
+++ /dev/null
@@ -1,177 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="foshan-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 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-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';
-
-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";
-
-    .view-button {
-        display: list-item;
-        width: 150px !important;
-        margin-left: 0px;
-    }
-
-    .view-label {
-        height: 32px;
-        line-height: 32px;
-    }
-
-    .view-box {
-        padding: 10px 0px;
-        border: 1px inset gray;
-        border-top: 1px outset gray;
-        border-left: 1px outset gray;
-    }
-
-    /deep/ {
-        .el-row {
-            margin: 5px 20px;
-        }
-    }
-</style>
diff --git a/src/jmapNew/theme/foshan_01/menusPlan/modifyingTask.vue b/src/jmapNew/theme/foshan_01/menusPlan/modifyingTask.vue
deleted file mode 100644
index f581724d8..000000000
--- a/src/jmapNew/theme/foshan_01/menusPlan/modifyingTask.vue
+++ /dev/null
@@ -1,327 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="foshan-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-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-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-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-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';
-
-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 tripNumberList = Object.keys(editData.trainMap).sort((a, b) => { return editData.trainMap[a].oldIndex - editData.trainMap[b].oldIndex; });
-				const trainInfo = editData.trainMap[params.tripNumber];
-				const lastIndex = trainInfo.stationTimeList.length - 1;
-				const taskObj = {
-					tripNumber: params.tripNumber,
-					beginStationCode: trainInfo.stationTimeList[0].stationCode,
-					beginStationStandCode: '',
-					endStationCode: trainInfo.stationTimeList[lastIndex].stationCode,
-					endStationStandCode: ''
-				};
-				this.model.route.push(taskObj);
-
-				trainInfo.stationTimeList.forEach((elem, index) => {
-					const stationObj = {
-						stationCode: elem.stationCode,
-						startTime: index == 0 ? null : trainInfo.stationTimeList[index - 1].secondTime,
-						stopTime: index == 0 ? null : elem.secondTime - trainInfo.stationTimeList[index - 1].secondTime,
-						endTime: elem.secondTime,
-						level: ''
-					};
-					this.model.detail.push(stationObj);
-				});
-			}
-		},
-		doShow(params) {
-			this.loadInitData(params);
-			this.dialogShow = true;
-		},
-		doClose() {
-			this.loading = false;
-			this.dialogShow = false;
-		},
-		handleCommit() {
-		}
-	}
-};
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-    @import "src/styles/mixin.scss";
-
-    /deep/ {
-        .el-button {
-            margin-left: 40px !important;
-            margin-right: 40px !important;
-        }
-
-        .el-row {
-            margin-bottom: 5px !important;
-        }
-
-        .el-input__inner {
-            height: 20px !important;
-            line-height: 20px !important;
-        }
-
-        .el-input {
-            width: 110px !important;
-        }
-    }
-</style>
diff --git a/src/jmapNew/theme/foshan_01/model.js b/src/jmapNew/theme/foshan_01/model.js
index ed34da08c..dd040cf61 100644
--- a/src/jmapNew/theme/foshan_01/model.js
+++ b/src/jmapNew/theme/foshan_01/model.js
@@ -14,6 +14,9 @@ class Model {
         this['private'][deviceType.StationControl] = {
             indicatorShow: true									// 标识灯名称显示
         };
+        this['private'][deviceType.Station] = {
+            kmPostShow: true									// 公里标显示
+        };
         this['private'][deviceType.Switch] = {
             nameShow: true
         };
diff --git a/src/jmapNew/theme/foshan_01/planSchedule/index.vue b/src/jmapNew/theme/foshan_01/planSchedule/index.vue
deleted file mode 100644
index 4dd59696b..000000000
--- a/src/jmapNew/theme/foshan_01/planSchedule/index.vue
+++ /dev/null
@@ -1,403 +0,0 @@
-<template>
-  <div class="plan-schedule" style="width: 100%">
-    <title-bar ref="titleBar" @back="back" />
-    <menu-bar ref="menuBar" :line-code="lineCode" @dispatchDialog="dispatchDialog" />
-    <schedule ref="schedule" :group="group" :line-code="lineCode" :max-height="height" :max-width="width" />
-    <status-bar ref="statusBar" :max-top="height" @setPosition="setPosition" />
-
-    <manage-plan-list ref="managePlanList" @dispatchDialog="dispatchDialog" />
-    <create-week-plan ref="createWeekPlan" @reloadTable="reloadTable" />
-    <create-today-plan ref="createTodayPlan" />
-    <modifying-plan ref="modifyingPlan" @dispatchDialog="dispatchDialog" />
-    <add-task ref="addTask" />
-    <delete-task ref="deleteTask" />
-    <modifying-task ref="modifyingTask" />
-  </div>
-</template>
-
-<script>
-import TitleBar from './titleBar';
-import MenuBar from './menuBar';
-import StatusBar from './statusBar';
-import Schedule from './schedule';
-import ManagePlanList from '../menusPlan/managePlanList';
-import CreateWeekPlan from '../menusPlan/createWeekPlan';
-import CreateTodayPlan from '../menusPlan/createTodayPlan';
-import ModifyingPlan from '../menusPlan/modifyingPlan';
-import AddTask from '../menusPlan/addTask';
-import DeleteTask from '../menusPlan/deleteTask';
-import ModifyingTask from '../menusPlan/modifyingTask';
-
-export default {
-    name: 'Menus',
-    components: {
-        TitleBar,
-        MenuBar,
-        StatusBar,
-        Schedule,
-        ManagePlanList,
-        CreateWeekPlan,
-        CreateTodayPlan,
-        ModifyingPlan,
-        AddTask,
-        DeleteTask,
-        ModifyingTask
-    },
-    props: {
-        group: {
-            type: String,
-            required: true
-        }
-    },
-    data() {
-        return {
-        };
-    },
-    computed: {
-        lineCode() {
-            return this.$route.query.lineCode || '02';
-        },
-        width() {
-            return this.$store.state.app.width;
-        },
-        height() {
-            return this.$store.state.app.height;
-        }
-    },
-    methods: {
-        setPosition() {
-            this.$nextTick(() => {
-                this.$refs.schedule.setPosition();
-            });
-        },
-        dispatchDialog(dialogObj) {
-            this.$nextTick(() => {
-                if (this.$refs[dialogObj.name]) {
-                    this.$refs[dialogObj.name].doShow(dialogObj.params);
-                }
-            });
-        },
-        reloadTable(dialogObj) {
-            if (this.$refs[dialogObj.name]) {
-                this.$refs[dialogObj.name].reloadTable();
-            }
-        },
-        confirm(params) {
-        },
-        back() {
-            this.$emit('back');
-        }
-    }
-};
-</script>
-
-<style>
-    .plan-schedule {
-        position: absolute;
-        background: gray;
-    }
-
-    .plan-schedule .pop-menu {
-        background: #F0F0F0;
-    }
-
-    .plan-schedule .pop-menu span {
-        color: #000;
-    }
-
-    .plan-schedule .system-close {
-        cursor: pointer;
-        position: absolute;
-        right: 0px;
-        background: -webkit-linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
-        background: -o-linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
-        background: -moz-linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
-        background: linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
-        border: 1px solid white;
-        border-radius: 4px;
-    }
-
-    .plan-schedule .system-close::before {
-        position: absolute;
-        height: 22px;
-        line-height: 22px;
-        top: 0px;
-        left: 0px;
-        font-size: x-large;
-    }
-
-    .plan-schedule .pop-menu .is-disabled span {
-        color: #B4B3B8;
-    }
-
-    .foshan-01__schedule {
-        overflow: hidden !important;
-    }
-
-    .foshan-01__schedule .el-dialog {
-        background: linear-gradient(to bottom, #9BB6D3, #B8D0EA);
-        box-shadow: 1px hsla(240, 0%, 100%, 0.5) inset;
-        border: 2px solid #727375;
-        border-radius: 4px;
-        color: #000;
-        font-size: 14px;
-    }
-
-    .foshan-01__schedule .el-dialog .el-dialog__header {
-        height: 30px;
-        padding: 5px;
-    }
-
-    .foshan-01__schedule .el-dialog .el-dialog__footer {
-        background: #ECE9D8;
-        opacity: 1;
-    }
-
-    .foshan-01__schedule .el-dialog .el-dialog__body {
-        padding-top: 10px;
-        padding-bottom: 10px;
-        padding-left: 5px;
-        padding-right: 5px;
-        margin: 0px 3px 3px 3px;
-        border: 2px solid rgba(120, 121, 123, 0.5);
-        box-shadow: 1px hsla(240, 0%, 100%, 0.5) inset;
-        color: #000;
-        background: #ECE9D8;
-        opacity: 1;
-    }
-
-    .foshan-01__schedule .el-dialog .el-dialog__title {
-        font-size: 16px;
-    }
-
-    .foshan-01__schedule .el-dialog .el-dialog__headerbtn {
-        background: -webkit-linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
-        background: -o-linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
-        background: -moz-linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
-        background: linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
-        border: 1px solid white;
-        border-radius: 4px;
-        top: 0px;
-        right: 3px;
-        line-height: 26px;
-        width: 26px;
-    }
-
-    .foshan-01__schedule .el-dialog .el-dialog__headerbtn .el-icon-close:before {
-        font-size: 16px;
-    }
-
-    .foshan-01__schedule .el-dialog .el-dialog__headerbtn .el-dialog__close {
-        color: #fff;
-    }
-
-    .foshan-01__schedule .el-dialog .el-form {
-        background: #ECE9D8 !important;
-    }
-
-    .foshan-01__schedule .el-dialog .el-card {
-        background: #ECE9D8 !important;
-    }
-
-    .foshan-01__schedule .el-dialog .el-button {
-        height: 32px;
-        line-height: 32px;
-        padding: 0px;
-        width: 80px;
-        border: 2px outset #E2E2E2;
-        border-radius: 0px !important;
-        color: #000;
-        background: #ECE9D8;
-    }
-
-    .foshan-01__schedule .el-dialog .expand {
-        width: 120px;
-    }
-
-    .foshan-01__schedule .el-dialog .el-button:focus span {
-        border: 1px dashed gray;
-    }
-
-    .foshan-01__schedule .el-dialog .el-button:active {
-        border: 2px inset #E2E2E2;
-    }
-
-    .foshan-01__schedule .el-dialog .el-button:disabled {
-        border: 2px inset #E2E2E2;
-    }
-
-    .foshan-01__schedule .el-dialog .el-button:disabled span {
-        border: 0px;
-    }
-
-    .foshan-01__schedule .el-dialog .button-group {
-        margin: 0px 5px;
-        text-align: center !important;
-    }
-
-    .foshan-01__schedule .el-dialog .el-input {
-        border: 2px inset #E9E9E9;
-    }
-
-    .foshan-01__schedule .el-dialog .el-input .el-input__inner {
-        color: #000;
-        background: #fff !important;
-        border: 0px;
-        border-radius: 0px !important;
-        box-sizing: border-box;
-    }
-
-    .foshan-01__schedule .el-dialog .el-input.is-disabled .el-input__inner {
-        background: #F0F0F0 !important;
-    }
-
-    .foshan-01__schedule .el-dialog .el-textarea {
-        border: 2px inset #E9E9E9;
-        border-radius: 0px;
-    }
-
-    .foshan-01__schedule .el-dialog .el-textarea .el-textarea__inner {
-        color: #000;
-        background: #fff !important;
-        border: 0px;
-        border-radius: 0px !important;
-        box-sizing: border-box;
-    }
-
-    .foshan-01__schedule .el-dialog .el-textarea.is-disabled .el-textarea__inner {
-        background: #F0F0F0 !important;
-    }
-
-    .foshan-01__schedule .el-dialog .el-table {
-        border: 2px inset #E9E9E9;
-        color: #000 !important;
-    }
-
-    .foshan-01__schedule .el-dialog .el-table .cell {
-        line-height: unset !important;
-    }
-
-    .foshan-01__schedule .el-dialog .el-table th.is-leaf {
-        background: #ECE9D8 !important;
-        border-right: 1px solid #BDBDBD !important;
-        border-bottom: 1px solid #BDBDBD !important;
-        color: #000 !important;
-        height: 20px !important;
-        padding: 0px;
-    }
-
-    .foshan-01__schedule .el-dialog .el-table tr td {
-        height: 20px !important;
-        padding: 0px;
-    }
-
-    .foshan-01__schedule .el-dialog .el-table .el-table__empty-text {
-        top: 15px !important;
-    }
-
-    .foshan-01__schedule .el-dialog .current-row>td {
-        background: #316AC5 !important;
-        color: #fff !important;
-    }
-
-    .foshan-01__schedule .el-dialog .el-checkbox__inner {
-        border: 1px inset #dcdfe6 !important;
-    }
-
-    .foshan-01__schedule .el-dialog .el-checkbox__label {
-        color: #000 !important;
-    }
-
-    .foshan-01__schedule .el-dialog .el-checkbox.is-disabled .el-checkbox__inner {
-        background: #E6E6E6 !important;
-    }
-
-    .foshan-01__schedule .el-dialog .el-checkbox.is-disabled .el-checkbox__label {
-        color: #C5C9CC !important;
-    }
-
-    .foshan-01__schedule .el-dialog .el-checkbox__input.is-checked .el-checkbox__inner {
-        background: #fff !important;
-        border: 1px inset #dcdfe6 !important;
-    }
-
-    .foshan-01__schedule .el-dialog .el-checkbox__input.is-checked .el-checkbox__inner::after {
-        position: absolute;
-        -webkit-box-sizing: content-box;
-        box-sizing: content-box;
-        content: "";
-        border: 1px solid #000;
-        border-left: 0;
-        border-top: 0;
-        height: 7px;
-        left: 4px;
-        top: 1px;
-    }
-
-    .foshan-01__schedule .el-dialog .el-radio__inner {
-        border: 1px inset #dcdfe6 !important;
-    }
-
-    .foshan-01__schedule .el-dialog .el-radio__label {
-        color: #000 !important;
-    }
-
-    .foshan-01__schedule .el-dialog .el-radio__input.is-checked .el-radio__inner {
-        background: #fff !important;
-        border: 1px inset #dcdfe6 !important;
-    }
-
-    .foshan-01__schedule .el-dialog .el-radio__input.is-checked .el-radio__inner::after {
-        width: 4px;
-        height: 4px;
-        border-radius: 100%;
-        background-color: #000 !important;
-        position: absolute;
-        left: 50%;
-        top: 50%;
-    }
-
-    .foshan-01__schedule .el-dialog .el-radio.is-disabled .el-radio__inner {
-        background: #E6E6E6 !important;
-    }
-
-    .foshan-01__schedule .el-dialog .el-radio.is-disabled .el-radio__label {
-        color: #C5C9CC !important;
-    }
-
-    .foshan-01__schedule .el-dialog .base-label {
-        background: rgba(0, 0, 0, x);
-        position: relative;
-        left: -15px;
-        top: -18px;
-    }
-
-    .foshan-01__schedule .el-dialog .el-form-item label {
-        font-weight: normal !important;
-        color: #000 !important;
-    }
-
-    .foshan-01__schedule .el-dialog .context {
-        height: 100px;
-        border: 2px inset #E2E2E2;
-        overflow-y: scroll;
-    }
-
-    .foshan-01__schedule .el-dialog .table {
-        margin-top: 10px;
-    }
-
-    .foshan-01__schedule .el-dialog .notice {
-        margin-left: 62px;
-        line-height: 30px;
-    }
-
-    .foshan-01__schedule .el-dialog .button-group {
-        margin-top: 10px;
-    }
-
-    .foshan-01__schedule .el-dialog .el-tree__empty-block {
-        background: #E9E9E9 !important;
-        color: #000 !important;
-    }
-</style>
diff --git a/src/jmapNew/theme/foshan_01/planSchedule/menuBar.vue b/src/jmapNew/theme/foshan_01/planSchedule/menuBar.vue
deleted file mode 100644
index e64ae3063..000000000
--- a/src/jmapNew/theme/foshan_01/planSchedule/menuBar.vue
+++ /dev/null
@@ -1,514 +0,0 @@
-<template>
-  <div id="PlanMenuBar">
-    <div class="nav">
-      <template v-for="(item,i) in menu">
-        <template v-if="noShowingChildren(item.children)">
-          <li class="nav-li" @click="hookClick(item)">
-            <span class="nav-li-text">{{ item.title }}</span>
-          </li>
-        </template>
-        <template v-else>
-          <li class="nav-li" @click.stop="popupMenuA(item, i)">
-            <span class="nav-li-text">{{ item.title }}</span>
-            <ul class="nav-ul" :class="{'active' :i==classA}">
-              <template v-for="(child,j) in item.children">
-                <template
-                  v-if="child.children&&child.children.length>0&&hasShowingChildren(child.children)"
-                >
-                  <li v-if="child.type === 'separator'" class="menu-separator">
-                    <span class="status">&ensp;</span>
-                    <span class="separator">&ensp;</span>
-                  </li>
-                  <li v-else-if="child.type === 'file'" class="menu-li">
-                    <div class="menu-li-block">
-                      <span class="menu-li-text">
-                        <span class="status">&ensp;</span>
-                        <el-button type="text" class="button" :disabled="child.disabled">
-                          <input
-                            :ref="child.label"
-                            type="file"
-                            accept=".csv, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel"
-                            @change="openLoadFile(child)"
-                          >
-                          {{ child.title }}
-                        </el-button>
-                      </span>
-                    </div>
-                  </li>
-                  <li v-else class="menu-li" @click.stop="popupMenuB(child, j)">
-                    <div class="menu-li-block">
-                      <span class="menu-li-text">
-                        <span class="status">&ensp;</span>
-                        <span class="label">{{ child.title }}</span>
-                      </span>
-                    </div>
-                    <ul class="menu-ul" :class="{'active' :j==classB}">
-                      <template v-for="(grandchild,k) in child.children">
-                        <li v-if="grandchild.type === 'separator'" class="menu-separator">
-                          <span class="status">&ensp;</span>
-                          <span class="separator">&ensp;</span>
-                        </li>
-                        <li v-else-if="grandchild.type === 'file'" class="menu-li">
-                          <div class="menu-li-block">
-                            <span class="menu-li-text">
-                              <span class="status">&ensp;</span>
-                              <el-button
-                                type="text"
-                                class="button"
-                                :disabled="grandchild.disabled"
-                              >
-                                <input
-                                  :ref="grandchild.label"
-                                  type="file"
-                                  accept=".csv, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel"
-                                  @change="openLoadFile(grandchild)"
-                                >
-                                {{ grandchild.title }}
-                              </el-button>
-                            </span>
-                          </div>
-                        </li>
-                        <li v-else class="menu-li" @click.stop="hookClick(grandchild)">
-                          <div class="menu-li-block">
-                            <span class="menu-li-text">
-                              <span class="status">&ensp;</span>
-                              <span class="label">{{ grandchild.title }}</span>
-                            </span>
-                          </div>
-                        </li>
-                      </template>
-                    </ul>
-                  </li>
-                </template>
-                <template v-else>
-                  <li v-if="child.type === 'separator'" class="menu-separator">
-                    <span class="status">&ensp;</span>
-                    <span class="separator">&ensp;</span>
-                  </li>
-                  <li v-else-if="child.type === 'file'" class="menu-li">
-                    <div class="menu-li-block">
-                      <span class="menu-li-text">
-                        <span class="status">&ensp;</span>
-                        <el-button type="text" class="button" :disabled="child.disabled">
-                          <input
-                            :ref="child.title"
-                            type="file"
-                            accept=".csv, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel"
-                            @change="openLoadFile(child)"
-                          >
-                          {{ child.title }}
-                        </el-button>
-                      </span>
-                    </div>
-                  </li>
-                  <li v-else class="menu-li" @click.stop="hookClick(child)">
-                    <div class="menu-li-block">
-                      <span class="menu-li-text">
-                        <span class="status">&ensp;</span>
-                        <span class="label">{{ child.title }}</span>
-                      </span>
-                    </div>
-                  </li>
-                </template>
-              </template>
-            </ul>
-          </li>
-        </template>
-      </template>
-    </div>
-  </div>
-</template>
-<script>
-import { mapGetters } from 'vuex';
-import { EventBus } from '@/scripts/event-bus';
-
-export default {
-    name: 'PlanMenuBar',
-    props: {
-        lineCode: {
-            type: String,
-            required: true
-        }
-    },
-    data() {
-        return {
-            classA: -1,
-            classB: -1,
-            tempClassA: -1,
-            tempClassB: -1,
-            menu: [
-                {
-                    title: '文件（F）',
-                    children: [
-                    ]
-                },
-                {
-                    title: '显示（V）',
-                    children: [
-                        // {
-                        //     title: '缩放',
-                        // },
-                        // {
-                        //     title: '单色显示历史计划',
-                        // },
-                        // {
-                        //     title: '彩色显示历史计划'
-                        // }
-                    ]
-                },
-                {
-                    title: '编辑（E）',
-                    children: [
-                        // {
-                        //     title: '修改',
-                        //     click: this.handleEditPlanningTrain
-                        // },
-                        // {
-                        //     title: '加任务',
-                        //     click: this.handleAddTask
-                        // },
-                        // {
-                        //     title: '删任务',
-                        //     click: this.handleDeleteTask
-                        // },
-                        // {
-                        //     title: '改表号',
-                        //     click: this.handleModifyingPlanId
-                        // },
-                        // {
-                        //     title: '平移多辆车',
-                        //     click: this.handleTranslationalMulTrain
-                        // }
-                    ]
-                },
-                {
-                    title: '工具（T）',
-                    children: [
-                        {
-                            title: '查看计划列表',
-                            click: this.handleViewPlanSchedule
-                        },
-                        {
-                            title: '创建一周计划',
-                            click: this.handleCreateWeekPlan
-                        },
-                        {
-                            title: '加载当天计划',
-                            click: this.handleReloadTodayPlan
-                        }
-                        // {
-                        //     title: '有效性检查',
-                        //     click: this.handleValidityCheck
-                        // }
-                    ]
-                },
-                {
-                    title: '帮助（H）',
-                    children: [
-                    ]
-                }
-            ]
-        };
-    },
-    computed: {
-        ...mapGetters('training', [
-            'mode'
-        ]),
-        ...mapGetters('map', [
-            'stationList'
-        ])
-    },
-    watch: {
-        tempClassA() {
-            this.classA = this.$store.state.menuOperation.break ? -1 : this.tempClassA;
-        },
-        tempClassB() {
-            this.classB = this.$store.state.menuOperation.break ? -1 : this.tempClassB;
-        },
-        '$store.state.menuOperation.break': function (val) {
-            if (val) {
-                this.classA = this.classB = -1;
-            } else {
-                this.classA = this.tempClassA;
-                this.classB = this.tempClassB;
-            }
-        }
-    },
-    mounted() {
-        this.initMenu();
-    },
-    methods: {
-        initMenu() {
-            this.clickEvent();
-            this.closeMenu();
-        },
-        clickEvent() {
-            const self = this;
-            window.onclick = function (e) {
-                self.closeMenu(false);
-            };
-        },
-        noShowingChildren(children) {
-            if (!children || children.length <= 0) {
-                return true;
-            }
-            return false;
-        },
-        hasShowingChildren(children) {
-            if (children && children.length > 0) {
-                return true;
-            }
-            return false;
-        },
-        closeMenu() {
-            this.classA = this.tempClassA = -1;
-            this.classB = this.tempClassB = -1;
-        },
-        hookClick(item, event) {
-            this.closeMenu();
-            setTimeout(() => {
-                if (item && typeof item.click == 'function') {
-                    item.click();
-                }
-            }, 500);
-        },
-        popupMenuA(item, index) {
-            this.clickEvent();
-            this.tempClassA = index;
-            this.tempClassB = -1;
-        },
-        popupMenuB(item, index) {
-            this.tempClassB = index;
-        },
-        openLoadFile(item) {
-            const obj = this.$refs[item.title][0];
-            if (obj.files) {
-                const file = obj.files[0];
-                item.click(file);
-                obj.value = '';
-            }
-        },
-        doClose() {
-            this.$nextTick(() => {
-                EventBus.$emit('closeMenu');
-            });
-        },
-        // 刷新
-        refresh() {
-            this.closeMenu(true);
-            EventBus.$emit('refresh');
-        },
-        undeveloped() {
-            this.doClose();
-            this.$alert('实现中......', '提示', {
-                confirmButtonText: '确定',
-                callback: action => {
-                }
-            });
-        },
-        // 修改计划
-        handleEditPlanningTrain() {
-            this.$emit('dispatchDialog', { name: 'modifyingPlan' });
-        },
-        // 添加任务
-        handleAddTask() {
-            const params = this.$store.state.runPlan.selected;
-            this.$emit('dispatchDialog', { name: 'addTask', params });
-        },
-        // 删除任务
-        handleDeleteTask() {
-            const params = this.$store.state.runPlan.selected;
-            this.$emit('dispatchDialog', { name: 'deleteTask', params });
-        },
-        // 修改任务
-        handleModifyingTask() {
-            const params = this.$store.state.runPlan.selected;
-            this.$emit('dispatchDialog', { name: 'modifyingTask', params });
-        },
-        // 改表号
-        handleModifyingPlanId() {
-            this.$emit('dispatchDialog', { name: 'modifyingPlanId' });
-        },
-        // 平移多辆车
-        handleTranslationalMulTrain() {
-            this.$emit('dispatchDialog', { name: 'translationalMulTrain' });
-        },
-        // 查看计划列表
-        handleViewPlanSchedule() {
-            this.$emit('dispatchDialog', { name: 'managePlanList' });
-        },
-        // 创建一周计划
-        handleCreateWeekPlan() {
-            this.$emit('dispatchDialog', { name: 'createWeekPlan' });
-        },
-        // 创建当天计划
-        handleReloadTodayPlan() {
-            this.$emit('dispatchDialog', { name: 'createTodayPlan' });
-        },
-        // 有效性检查
-        handleValidityCheck() {
-        }
-    }
-};
-</script>
-
-<style scoped rel="stylesheet/scss" lang="scss">
-    @import "src/styles/mixin.scss";
-    $top: 25px;
-    $width: 30px;
-    $height: 20px;
-    $menuPadding: 10px;
-    $menuItemHeight: 30px;
-    $menuItemWidth: 160px;
-    $menuItemPadding: 5px;
-
-    #PlanMenuBar {
-        z-index: 10;
-        position: absolute;
-        top: $top;
-        width: 100%;
-        height: $height;
-        line-height: $height;
-    }
-
-    .nav {
-        display: block;
-        cursor: pointer;
-        color: #0000;
-        background: #EBEADB;
-        list-style: none;
-        border: 1px solid #B6BCCC !important;
-    }
-
-    .nav-li {
-        position: relative;
-        display: inline-block;
-        padding-left: $menuPadding;
-        padding-right: $menuPadding;
-    }
-
-    .nav-li:active {
-        background: #C9D0E1;
-        border-radius: 4px;
-    }
-
-    .nav-li-text {
-        font-size: 13px;
-        color: #000;
-        text-align: center;
-        text-decoration: none;
-    }
-
-    .nav-ul {
-        display: none;
-        position: absolute;
-        list-style: none;
-        border: 1px solid gray;
-        width: $menuItemWidth;
-        padding: 0px;
-        margin: 0px;
-    }
-
-    .menu-ul {
-        display: none;
-        list-style: none;
-        background: #F0F0F0;
-        line-height: $menuItemHeight;
-        width: $menuItemWidth;
-        bottom: $menuItemHeight;
-    }
-
-    .active {
-        position: absolute;
-        display: block !important;
-    }
-
-    .menu-ul-text {
-        font-size: 14px;
-        color: #000;
-        letter-spacing: 0;
-        height: $menuItemHeight;
-        line-height: $menuItemHeight;
-        border-left: 1px solid #000;
-        border-right: 1px solid #000;
-    }
-
-    .menu-separator {
-        text-align: left;
-        background: #F0F0F0;
-        height: 2px;
-        line-height: 2px;
-    }
-
-    .menu-separator .status {
-        display: inline-block;
-        border-right: 1px inset #CACACA;
-        width: $width;
-        height: 100%;
-        background: #EFECDE;
-    }
-
-    .menu-separator .separator {
-        display: inline-block;
-        background: #CACACA;
-        margin-left: 5px;
-        height: 2px;
-        width: $menuItemWidth - $width - 30px;
-    }
-
-    .menu-li {
-        text-align: left;
-        background: #F0F0F0;
-        height: $menuItemHeight;
-        line-height: $menuItemHeight;
-    }
-
-    .menu-li-block {
-        letter-spacing: 0;
-        height: $menuItemHeight;
-        line-height: $menuItemHeight;
-    }
-
-    .menu-li-text {
-        font-size: 14px;
-        color: #000;
-    }
-
-    .menu-li-text .status {
-        display: inline-block;
-        border-right: 1px inset #CACACA;
-        width: $width;
-        background: #EFECDE;
-    }
-
-    .menu-li-text .label {
-        display: inline-block;
-        margin-left: 5px;
-    }
-
-    .menu-li-text .button {
-        position: relative;
-        overflow: hidden;
-        margin-left: 10px;
-        line-height: 0px;
-        width: $menuItemWidth - $width;
-        top: -$menuItemHeight;
-        color: #000;
-        cursor: pointer;
-
-        input {
-            opacity: 0;
-            cursor: pointer;
-            position: absolute;
-            top: 0px;
-            width: $menuItemWidth - $width - 10px;
-        }
-    }
-
-    .menu-li-block:hover {
-        background: #C9DEF7;
-        box-sizing: border-box;
-        -moz-box-sizing: border-box;
-        -webkit-box-sizing: border-box;
-    }
-</style>
diff --git a/src/jmapNew/theme/foshan_01/planSchedule/menuTool.vue b/src/jmapNew/theme/foshan_01/planSchedule/menuTool.vue
deleted file mode 100644
index d3ecde016..000000000
--- a/src/jmapNew/theme/foshan_01/planSchedule/menuTool.vue
+++ /dev/null
@@ -1,172 +0,0 @@
-<template>
-    <div id="PlanMenuTool">
-        <div class="nav">
-            <div class="tool" v-for="(item,index) in tools" :key="index">
-                <img :src="item.src" :alt="item.title" />
-            </div>
-        </div>
-    </div>
-</template>
-<script>
-    import { mapGetters } from 'vuex';
-    import { prefixIntrger } from '@/utils/date';
-    import logo_ from '@/assets/logo_.png';
-
-
-    export default {
-        name: 'PlanMenuTool',
-        data() {
-            return {
-                tools: [
-                    {
-                        title: '服务器1',
-                        operate: '',
-                        src: logo_,
-                        click: this.undeveloped,
-                    },
-                    {
-                        title: '服务器2',
-                        operate: '',
-                        src: '',
-                        click: this.undeveloped,
-                    },
-                    {
-                        title: '前置机1',
-                        operate: '',
-                        src: '',
-                        click: this.undeveloped,
-                    },
-                    {
-                        title: '前置机2',
-                        operate: '',
-                        src: '',
-                        click: this.undeveloped,
-                    },
-                    {
-                        title: '主调',
-                        operate: '',
-                        src: '',
-                        click: this.undeveloped,
-                    },
-                    {
-                        title: '调度台1',
-                        operate: '',
-                        src: '',
-                        click: this.undeveloped,
-                    },
-                    {
-                        title: '调度台2',
-                        operate: '',
-                        src: '',
-                        click: this.undeveloped,
-                    },
-                    {
-                        title: '调度台3',
-                        operate: '',
-                        src: '',
-                        click: this.undeveloped,
-                    },
-                    {
-                        title: '大屏',
-                        operate: '',
-                        src: '',
-                        click: this.undeveloped,
-                    },
-                    {
-                        title: '维护工作站',
-                        operate: '',
-                        src: '',
-                        click: this.undeveloped,
-                    },
-                    {
-                        title: '运行图显示人工站',
-                        operate: '',
-                        src: '',
-                        click: this.undeveloped,
-                    },
-                    {
-                        title: '跳停',
-                        operate: '',
-                        src: '',
-                        click: this.undeveloped,
-                    },
-                    {
-                        title: '扣车',
-                        operate: '',
-                        src: '',
-                        click: this.undeveloped,
-                    },
-                    {
-                        title: '列车报警',
-                        operate: '',
-                        src: logo_,
-                        click: this.undeveloped,
-                    }
-                ]
-            }
-        },
-        watch: {
-            '$store.state.training.initTime': function (initTime) {
-                let date = new Date(initTime);
-                this.time = `${prefixIntrger(date.getHours(), 2)}:${prefixIntrger(date.getMinutes(), 2)}${prefixIntrger(date.getSeconds(), 2)}`
-            }
-        },
-        computed: {
-            isShowSystemTime() {
-                return this.$route.params.mode == 'demon' || this.$route.params.mode === 'dp' || !this.$route.params.mode;
-            }
-        },
-        mounted() {
-            this.initTools();
-        },
-        methods: {
-            initTools() {
-                this.tools = [];
-            }
-        }
-    }
-</script>
-
-<style scoped rel="stylesheet/scss" lang="scss" scoped>
-    @import "src/styles/mixin.scss";
-    $top: 48px;
-    $width: 25px;
-    $height: 25px;
-
-    #PlanMenuTool {
-        z-index: 5;
-        position: absolute;
-        width: 100%;
-        top: $top;
-    }
-
-    .nav {
-        display: block;
-        color: #0000;
-        background: #EBEADB;
-        border: 1px solid #B6BCCC !important;
-        border-bottom: 2px solid #B6BCCC !important;
-        list-style: none;
-        height: $height;
-        line-height: $height;
-    }
-
-    .tool {
-        padding-left: 10px;
-        display: flex;
-        justify-content: center;
-        cursor: pointer;
-        position: relative;
-        float: left;
-        margin: 1px;
-        width: $width;
-
-        img {
-            display: block;
-            text-align: center;
-            padding-top: 2px;
-            height: $height - 5;
-            width: $width - 5;
-        }
-    }
-</style>
\ No newline at end of file
diff --git a/src/jmapNew/theme/foshan_01/planSchedule/schedule.vue b/src/jmapNew/theme/foshan_01/planSchedule/schedule.vue
deleted file mode 100644
index 82a3c9ed3..000000000
--- a/src/jmapNew/theme/foshan_01/planSchedule/schedule.vue
+++ /dev/null
@@ -1,468 +0,0 @@
-<template>
-  <div id="PlanSchedule" :style="{top: top+'px', height: height+'px'}">
-    <div class="left">
-      <div :id="runPlanId" />
-    </div>
-    <div class="right">
-      <data-table
-        ref="serviceTable"
-        :height="height/2"
-        :config="serviceNumberConfig"
-        :style="{top: top-height/2+'px'}"
-        @touch="scheduleTouch"
-      />
-      <data-table
-        ref="tripTable"
-        :height="height/2"
-        :config="tripNumberConfig"
-        :style="{top: top-height/2+'px'}"
-        @touch="trainNumTouch"
-      />
-    </div>
-  </div>
-</template>
-
-<script>
-import { mapGetters } from 'vuex';
-import { timeFormat } from '@/utils/date';
-import {toTimeStamp, formatDuring} from '@/utils/date';
-import DataTable from '../menusPlan/components/dataTable';
-import echarts from 'echarts';
-
-export default {
-    name: 'PlanSchedule',
-    components: {
-        DataTable
-    },
-    props: {
-        group: {
-            type: String,
-            required: true
-        },
-        lineCode: {
-            type: String,
-            required: true
-        },
-        maxWidth: {
-            type: Number,
-            require: true
-        },
-        maxHeight: {
-            type: Number,
-            required: true
-        }
-    },
-    data() {
-        return {
-            top: 0,
-            height: 0,
-            heights: [100, 100],
-            runPlanId: 'plan-schedule-id',
-            myChart: null,
-            PlanConvert: {},
-            serviceNumberConfig: {
-                data: [],
-                highlightCurrentRow: true,
-                handleChange: this.serviceNumberChange,
-                showClose: false,
-                columns: [
-                    {
-                        prop: 'serviceNumber',
-                        label: '表号'
-                    },
-                    {
-                        width: 40
-                    }
-                ]
-            },
-            tripNumberConfig: {
-                data: [],
-                highlightCurrentRow: true,
-                handleChange: this.tripNumberChange,
-                showClose: false,
-                columns: [
-                    {
-                        prop: 'tripNumber',
-                        label: '车次号'
-                    },
-                    {
-                        width: 40
-                    }
-                ]
-            },
-            realData: {},
-            kmRangeCoordMap: {},
-            option: {
-                title: {
-                    text: '',
-                    left: 'center'
-                },
-                grid: {
-                    top: '30px',
-                    left: '120px',
-                    right: '40px',
-                    bottom: '65px',
-                    containLabel: true,
-                    backgroundColor: 'floralwhite'
-                },
-                toolbox: {
-                    // right: '30px',
-                    // feature: {
-                    //     dataZoom: {
-                    //         yAxisIndex: 'none'
-                    //     },
-                    //     restore: {},
-                    //     saveAsImage: {}
-                    // }
-                },
-                tooltip: {
-                    axisPointer: {
-                        trigger: 'item',
-                        type: 'cross'
-                    },
-                    formatter: this.axisTooltip,
-                    borderWidth: 1
-                },
-                xAxis: [
-                    {
-                        type: 'category',
-                        boundaryGap: false,
-                        data: [],
-                        axisLine: {
-                            onZero: false,
-                            lineStyle: {
-                                width: 2,
-                                color: '#d14a61'
-                            }
-                        },
-                        axisLabel: {
-                            formatter: this.xAxisLableFormat,
-                            textStyle: {
-                                color: '#333'
-                            }
-                        },
-                        axisPointer: {
-                            snap: true,
-                            label: {
-                                formatter: this.xAxisPointFormat,
-                                backgroundColor: 'rgb(255,0,0,0.5)',
-                                color: 'white'
-                            }
-                        }
-                    }
-                ],
-                yAxis: {
-                    type: 'value',
-                    splitLine: {
-                        show: false
-                    },
-                    axisTick: {
-                        show: false
-                    },
-                    axisLine: {
-                        onZero: false,
-                        lineStyle: {
-                            width: 2,
-                            color: '#d14a61'
-                        }
-                    },
-                    axisLabel: {
-                        interval: 'auto',
-                        formatter: this.yAxisLableFormat
-                    },
-                    axisPointer: {
-                        xAxisIndex: 'all',
-                        label: {
-                            formatter: this.yAxisPointFormat,
-                            backgroundColor: 'rgb(0,100,0,0.5)',
-                            color: 'white'
-                        }
-                    },
-                    min: 0,
-                    max: 0
-                },
-                series: [],
-                dataZoom: [
-                    {
-                        type: 'inside'
-                    },
-                    {
-                        fiterMode: 'filter',
-                        handleIcon: 'M10.7,11.9v-1.3H9.3v1.3c-4.9,0.3-8.8,4.4-8.8,9.4c0,5,3.9,9.1,8.8,9.4v1.3h1.3v-1.3c4.9-0.3,8.8-4.4,8.8-9.4C19.5,16.3,15.6,12.2,10.7,11.9z M13.3,24.4H6.7V23h6.6V24.4z M13.3,19.6H6.7v-1.4h6.6V19.6z',
-                        handleSize: '80%',
-                        handleStyle: {
-                            color: '#fff',
-                            shadowBlur: 3,
-                            shadowColor: 'rgba(0, 0, 0, 0.6)',
-                            shadowOffsetX: 2,
-                            shadowOffsetY: 2
-                        },
-                        bottom: '20px'
-                    }
-                ]
-            },
-            absoluteTime: 2 * 3600,
-            indexKmRangeMap: {}
-        };
-    },
-    computed: {
-        ...mapGetters('runPlan', [
-            'stations'
-        ])
-    },
-    watch: {
-        maxWidth() {
-            this.setPosition();
-        },
-        maxHeight() {
-            this.setPosition();
-        },
-        '$store.state.runPlan.planLoadedCount': async function () {
-            await this.loadChartPage();
-        },
-        '$store.state.runPlan.planSizeCount': function () {
-            this.reSize({ width: this.$store.state.runPlan.width, height: this.$store.state.runPlan.height });
-        },
-        '$store.state.runPlan.selected.serviceNumber': function (val) {
-            const index = this.serviceNumberConfig.data.findIndex(elem => {
-                return elem.serviceNumber == val;
-            });
-
-            this.$refs.serviceTable.setCurrentRow(this.serviceNumberConfig.data[index]);
-        },
-        '$store.state.runPlan.selected.tripNumber': function (val) {
-            const index = this.tripNumberConfig.data.findIndex(elem => {
-                return elem.tripNumber == val;
-            });
-            this.$refs.tripTable.setCurrentRow(this.tripNumberConfig.data[index]);
-        }
-    },
-    mounted() {
-        this.PlanConvert = this.$theme.loadPlanConvert(this.lineCode);
-    },
-    beforeDestroy() {
-        this.destroy();
-    },
-    methods: {
-        serviceNumberChange(row) {
-            if (row) {
-                this.$store.dispatch('runPlan/setSelected', { serviceNumber: row.serviceNumber, tripNumber: null });
-                const serviceObj = this.$store.state.runPlan.editData[row.serviceNumber];
-                if (serviceObj) {
-                    this.analyticalTripNumber(serviceObj.trainMap);
-                }
-            }
-        },
-        tripNumberChange(row) {
-            if (row) {
-                this.$store.dispatch('runPlan/setSelected', { serviceNumber: this.$store.state.runPlan.selected.serviceNumber, tripNumber: row.tripNumber });
-            }
-        },
-        async analyticalServiceNumber(data) {
-            this.serviceNumberConfig.data = Object.keys(data || {})
-                .sort((a, b) => { return data[a].oldIndex - data[b].oldIndex; })
-                .map(serviceNumber => { return { serviceNumber }; });
-        },
-        async analyticalTripNumber(data) {
-            this.tripNumberConfig.data = Object.keys(data || {})
-                .sort((a, b) => { return data[a].oldIndex - data[b].oldIndex; })
-                .map(tripNumber => { return { tripNumber }; });
-        },
-        async setPosition() {
-            this.$nextTick(() => {
-                let top = 3;
-                const width = this.maxWidth * 0.85;
-                let height = this.maxHeight;
-
-                const titleBar = document.getElementById('PlanTitleBar');
-                const menuBar = document.getElementById('PlanMenuBar');
-                const menuTool = document.getElementById('PlanMenuTool');
-                const statusBar = document.getElementById('PlanStatusBar');
-
-                if (titleBar) {
-                    top += (titleBar.offsetHeight || 0);
-                }
-
-                if (menuBar) {
-                    top += (menuBar.offsetHeight || 0);
-                }
-
-                if (menuTool) {
-                    top += (menuTool.offsetHeight || 0);
-                }
-
-                if (statusBar) {
-                    height -= (statusBar.offsetHeight || 0);
-                }
-
-                height = height - top;
-                this.$store.dispatch('runPlan/resize', { width, height });
-
-                if (this.top != top) {
-                    this.top = top;
-                }
-
-                if (this.height != height) {
-                    this.height = height - 20 * 2;
-                }
-            });
-        },
-        async loadChartPage() {
-            try {
-                let series = [];
-                const stations = this.$store.state.runPlan.stations;
-                const planData = this.$store.state.runPlan.planData;
-
-                this.viewDisabled = true;
-                this.kmRangeCoordMap = this.PlanConvert.convertStationsToMap(stations);
-                series = this.pushModels(series, [this.PlanConvert.initializeYaxis(stations)]);
-                series = this.pushModels(series, this.PlanConvert.convertDataToModels(planData, stations, this.kmRangeCoordMap, { color: '#000', width: 0.5 }));
-                await this.loadInitData(series);
-                await this.analyticalServiceNumber(this.$store.state.runPlan.editData);
-                this.viewDisabled = false;
-
-            } catch (error) {
-                this.viewDisabled = false;
-                this.$messageBox(`加载运行图数据失败`);
-            }
-        },
-        async loadInitData(series) {
-            this.myChart && this.myChart.showLoading();
-            await this.xAxisInit();
-            await this.yAxisInit();
-            await this.loadInitChart(series);
-            this.myChart && this.myChart.hideLoading();
-        },
-        pushModels(series, models) {
-            if (models && models.length) {
-                models.forEach(elem => {
-                    if (elem) {
-                        series.push(elem);
-                    }
-                });
-            }
-
-            return series;
-        },
-        loadInitChart(series) {
-            return new Promise((resolve, reject) => {
-                try {
-                    this.destroy();
-                    let startValue = 3600 + this.PlanConvert.TranslationTime;
-                    const offsetTime = 3600;
-                    const initTime = toTimeStamp(formatDuring(this.$store.state.training.initTime));
-                    startValue = initTime - this.PlanConvert.TranslationTime;
-                    this.option.dataZoom[0].startValue = this.option.dataZoom[1].startValue = startValue - offsetTime;
-                    this.option.dataZoom[0].endValue = this.option.dataZoom[1].endValue = startValue + offsetTime;
-                    this.option.series = series;
-                    this.myChart = echarts.init(document.getElementById(this.runPlanId));
-                    if (this.myChart) {
-                        this.myChart.setOption(this.option);
-                        this.reSize({ width: this.$store.state.runPlan.width, height: this.$store.state.runPlan.height });
-                        this.myChart.on('click', this.mouseClick);
-                    }
-                    resolve(true);
-                } catch (error) {
-                    reject(error);
-                }
-            });
-
-        },
-        xAxisPointFormat(params) {
-            return timeFormat(params.value);
-        },
-        yAxisPointFormat(params) {
-            return this.PlanConvert.computedFormatYAxis(this.stations, params);
-        },
-        xAxisLableFormat(value, index) {
-            if (value % 60 === 0) {
-                return timeFormat(value);
-            }
-        },
-        yAxisLableFormat(value, index) {
-            return '';
-        },
-        xAxisInit() {
-            const list = [];
-            for (var time = 0 + this.PlanConvert.TranslationTime; time < 3600 * 24 + this.PlanConvert.TranslationTime; time++) {
-                list.push(time);
-            }
-
-            const startValue = 3600 * 6;
-            const offsetTime = 3600 * 1;
-
-            this.option.xAxis[0].data = list;
-            if (!this.option.dataZoom[0].startValue) {
-                this.option.dataZoom[0].startValue = this.option.dataZoom[1].startValue = startValue - offsetTime;
-            }
-
-            if (!this.option.dataZoom[0].endValue) {
-                this.option.dataZoom[0].endValue = this.option.dataZoom[1].endValue = startValue + offsetTime;
-            }
-        },
-        yAxisInit() {
-            if (Object.keys(this.PlanConvert).length) {
-                this.option.yAxis.min = this.PlanConvert.computedYaxisMinValue(this.stations);
-                this.option.yAxis.max = this.PlanConvert.computedYaxisMaxValue(this.stations);
-            }
-        },
-        axisTooltip(param) {
-            const station = this.stations[Math.floor((param.data[1] - this.PlanConvert.EdgeHeight) / this.PlanConvert.CoordMultiple)] || { name: '', kmRange: '' };
-            return [
-                `Point Data <hr size=1 style=" margin: 3px 0">`,
-                `车站名称: ${station.name}<br>`,
-                `车站公里标: ${station.kmRange} km <br>`,
-                `到站时间: ${timeFormat(param.data[0] + this.PlanConvert.TranslationTime)} (${param.data[0]})<br>`
-            ].join('');
-        },
-        mouseClick(params) {
-            const model = {
-                serviceNumber: params.seriesName
-            };
-            this.$store.dispatch('runPlan/setSelected', model);
-        },
-        reSize(opt) {
-            if (this.myChart) {
-                this.myChart.resize({
-                    width: opt.width,
-                    height: opt.height,
-                    silent: false
-                });
-            }
-        },
-        destroy() {
-            if (this.myChart && this.myChart.isDisposed) {
-                this.myChart.dispose();
-                this.myChart = null;
-            }
-        },
-        scheduleTouch() {
-
-        },
-        trainNumTouch() {
-
-        }
-    }
-};
-</script>
-<style scoped rel="stylesheet/scss" lang="scss">
-    @import "src/styles/mixin.scss";
-
-    #PlanSchedule {
-        z-index: 5;
-        position: absolute;
-        width: 100%;
-
-        .left {
-            height: 100%;
-            width: 85%;
-            float: left;
-        }
-
-        .right {
-            height: 100%;
-            width: 15%;
-            float: right;
-        }
-    }
-</style>
diff --git a/src/jmapNew/theme/foshan_01/planSchedule/statusBar.vue b/src/jmapNew/theme/foshan_01/planSchedule/statusBar.vue
deleted file mode 100644
index 4c1418fb3..000000000
--- a/src/jmapNew/theme/foshan_01/planSchedule/statusBar.vue
+++ /dev/null
@@ -1,107 +0,0 @@
-<template>
-  <data-table
-    id="PlanStatusBar"
-    ref="dataTable"
-    :height="height-11"
-    :config="stationListConfig"
-    :close="false"
-    :style="{top: maxmini? maxTop-110+'px':maxTop-21+'px'}"
-    @touch="touch"
-  />
-</template>
-
-<script>
-import DataTable from '../menusPlan/components/dataTable';
-import { formatTime, formatName } from '@/utils/runPlan';
-
-export default {
-	name: 'PlanStatusBar',
-	components: {
-		DataTable
-	},
-	props: {
-		maxTop: {
-			type: Number,
-			required: true
-		}
-	},
-	data() {
-		return {
-			maxmini: true,
-			height: 100,
-			stationListConfig: {
-				data: [],
-				showClose: true,
-				highlightCurrentRow: true,
-				columns: [
-					{
-						prop: 'stationName',
-						label: '站台',
-						width: 400
-					},
-					{
-						prop: 'startTime',
-						label: '到点'
-					},
-					{
-						prop: 'stopTime',
-						label: '停站时间'
-					},
-					{
-						prop: 'endTime',
-						label: '发点'
-					},
-					{
-						prop: 'level',
-						label: '运行等级'
-
-					}
-				]
-			}
-		};
-	},
-	watch: {
-		'$store.state.runPlan.selected': function (select) {
-			this.stationListConfig.data = [];
-			const serviceObj = this.$store.state.runPlan.editData[select.serviceNumber];
-			if (serviceObj) {
-				const trainMap = serviceObj.trainMap;
-				if (trainMap) {
-					const trainObj = trainMap[select.tripNumber];
-					if (trainObj) {
-						const stationTimeList = trainObj.stationTimeList;
-						if (stationTimeList && stationTimeList.length) {
-							stationTimeList.forEach((elem, index) => {
-								const stationObj = {
-									stationName: formatName(elem.stationCode),
-									startTime: formatTime(index == 0 ? null : stationTimeList[index - 1].secondTime),
-									stopTime: formatTime(index == 0 ? null : elem.secondTime - stationTimeList[index - 1].secondTime),
-									endTime: formatTime(elem.secondTime),
-									level: ''
-								};
-								this.stationListConfig.data.push(stationObj);
-							});
-						}
-					}
-				}
-			}
-		}
-	},
-	methods: {
-		touch(maxmini) {
-			this.maxmini = maxmini;
-			this.$emit('setPosition');
-		}
-	}
-};
-</script>
-
-<style scoped rel="stylesheet/scss" lang="scss">
-    @import "src/styles/mixin.scss";
-
-    #PlanStatusBar {
-        z-index: 5;
-        position: absolute;
-        width: 100%;
-    }
-</style>
diff --git a/src/jmapNew/theme/foshan_01/planSchedule/titleBar.vue b/src/jmapNew/theme/foshan_01/planSchedule/titleBar.vue
deleted file mode 100644
index 689c3486a..000000000
--- a/src/jmapNew/theme/foshan_01/planSchedule/titleBar.vue
+++ /dev/null
@@ -1,75 +0,0 @@
-<template>
-    <div id="PlanTitleBar">
-        <img class="logo" :src="logoImg" />
-        <span> {{mapName}} &ensp;</span>
-        <span v-if="runPlanName">({{runPlanName}})</span>
-        <span class="system-close el-icon-close" @click="back"></span>
-    </div>
-</template>
-
-<script>
-    import logo_ from '@/assets/logo_.png';
-    import { getPublishMapInfo } from '@/api/jmap/map';
-
-    export default {
-        name: 'PlanTitleBar',
-        data() {
-            return {
-                mapName: '',
-                logoImg: logo_
-            }
-        },
-        computed: {
-            runPlanName() {
-                return this.$route.query.planName || '';
-            }
-        },
-        mounted() {
-            if (this.$route.query.mapId) {
-                getPublishMapInfo(this.$route.query.mapId).then(resp => {
-                    this.mapName = resp.data.name;
-                })
-            }
-        },
-        methods: {
-            back() {
-                this.$emit('back');
-            }
-        }
-    }
-</script>
-<style scoped rel="stylesheet/scss" lang="scss" scoped>
-    @import "src/styles/mixin.scss";
-    $width: 25px;
-    $height: 25px;
-
-    #PlanTitleBar {
-        z-index: 10;
-        display: flex;
-        position: absolute;
-        width: 100%;
-        height: $height;
-        line-height: $height;
-        background: -webkit-linear-gradient(#0055E8, #0099F8);
-        background: -o-linear-gradient(#0055E8, #0099F8);
-        background: -moz-linear-gradient(#0055E8, #0099F8);
-        background: linear-gradient(#0055E8, #0099F8);
-        color: white;
-        font: bold;
-        font-size: 16px;
-
-        .logo {
-            display: inline-block;
-            width: $width;
-            height: $height;
-            padding-right: 5px;
-        }
-
-        .system-close {
-            width: 25px;
-            height: 25px;
-            position: absolute;
-            right: 1px;
-        }
-    }
-</style>
\ No newline at end of file
diff --git a/src/jmapNew/theme/fuzhou_01/menusPlan/addTask.vue b/src/jmapNew/theme/fuzhou_01/menusPlan/addTask.vue
deleted file mode 100644
index b9e6c42e8..000000000
--- a/src/jmapNew/theme/fuzhou_01/menusPlan/addTask.vue
+++ /dev/null
@@ -1,175 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="fuzhou-01__schedule add-task"
-    :title="title"
-    :visible.sync="dialogShow"
-    width="800px"
-    :before-close="doClose"
-    :z-index="2000"
-    :modal="false"
-    :close-on-click-modal="false"
-  >
-    <div style="margin: 10px">
-      <el-row>
-        <el-col :span="3">
-          <el-radio v-model="model.type" label="1">{{ $t('menu.addToTheFront') }}</el-radio>
-        </el-col>
-        <el-col :span="2" :offset="1">
-          <span>{{ $t('menu.tripNumber') + $t('global.colon') }}</span>
-        </el-col>
-        <el-col :span="5">
-          <el-select v-model="model.tripNumber" :placeholder="this.$t('global.choose')">
-            <el-option
-              v-for="item in tripNumberList"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            />
-          </el-select>
-        </el-col>
-        <el-col :span="3" :offset="1">
-          <span>{{ $t('global.startTime') + $t('global.colon') }}</span>
-        </el-col>
-        <el-col :span="5">
-          <el-select v-model="model.startTime" :placeholder="this.$t('global.choose')">
-            <el-option
-              v-for="item in tripNumberList"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            />
-          </el-select>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="3">
-          <el-radio v-model="model.type" label="2">{{ $t('menu.addToTheEnd') }}</el-radio>
-        </el-col>
-        <el-col :span="2" :offset="1">
-          <span>{{ $t('menu.tripNumber') + $t('global.colon') }}</span>
-        </el-col>
-        <el-col :span="5">
-          <el-select v-model="model.tripNumber" :placeholder="this.$t('global.choose')">
-            <el-option
-              v-for="item in tripNumberList"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            />
-          </el-select>
-        </el-col>
-        <el-col :span="3" :offset="1">
-          <span>{{ $t('global.startTime') + $t('global.colon') }}</span>
-        </el-col>
-        <el-col :span="5">
-          <el-select v-model="model.startTime" :placeholder="this.$t('global.choose')">
-            <el-option
-              v-for="item in tripNumberList"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            />
-          </el-select>
-        </el-col>
-
-      </el-row>
-      <el-row style="margin-bottom: 5px;">
-        {{ $t('menu.crossing') + $t('global.colon') }}
-      </el-row>
-      <el-row>
-        <el-table :data="model.route" border :height="180">
-          <el-table-column prop="date" :label="this.$t('menu.date')" width="180" />
-          <el-table-column prop="name" :label="this.$t('menu.name')" width="180" />
-          <el-table-column prop="address" :label="this.$t('menu.address')" />
-          <el-table-column width="20" />
-        </el-table>
-      </el-row>
-      <el-row style=" margin-bottom: 5px;margin-top: 10px;">
-        {{ $t('global.details') + $t('global.colon') }}
-      </el-row>
-      <el-row>
-        <el-table :data="model.detail" border :height="180">
-          <el-table-column prop="date" :label="this.$t('menu.date')" width="180" />
-          <el-table-column prop="name" :label="this.$t('menu.name')" width="180" />
-          <el-table-column prop="address" :label="this.$t('menu.address')" />
-          <el-table-column width="20" />
-        </el-table>
-      </el-row>
-      <el-row>
-        <el-col :offset="16">
-          <el-checkbox v-model="model.default">{{ $t('menu.displaysDefaultStopTimesAndRunLevels') }}</el-checkbox>
-        </el-col>
-      </el-row>
-    </div>
-    <el-row type="flex" justify="center" class="button-group">
-      <el-button @click="commit">{{ $t('global.confirm') }}</el-button>
-      <el-button @click="doClose">{{ $t('global.cancel') }}</el-button>
-    </el-row>
-  </el-dialog>
-</template>
-
-<script>
-
-export default {
-    name: 'AddTask',
-    components: {
-    },
-    data() {
-        return {
-            dialogShow: false,
-            loading: false,
-            model: {
-                type: '1',
-                serviceNumber: '',
-                tripNumber: '',
-                startTime: '',
-                default: false,
-                route: [],
-                detail: []
-            },
-            tripNumberList: []
-        };
-    },
-    computed: {
-        title() {
-            return this.$t('menu.addTask');
-        }
-    },
-    mounted() {
-    },
-    methods: {
-        doShow(params) {
-            this.model.serviceNumber = params.serviceNumber;
-            this.model.tripNumber = params.tripNumber;
-            this.dialogShow = true;
-        },
-        doClose() {
-            this.loading = false;
-            this.dialogShow = false;
-        },
-        commit() {
-            this.doClose();
-        }
-    }
-};
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-    @import "src/styles/mixin.scss";
-
-    /deep/ {
-        .el-button {
-            margin-left: 40px !important;
-            margin-right: 40px !important;
-        }
-
-        .el-row {
-            margin-bottom: 5px !important;
-        }
-
-        .el-input__inner {
-            height: 20px !important;
-            line-height: 20px !important;
-        }
-    }
-</style>
diff --git a/src/jmapNew/theme/fuzhou_01/menusPlan/chooseTemplatePlan.vue b/src/jmapNew/theme/fuzhou_01/menusPlan/chooseTemplatePlan.vue
deleted file mode 100644
index 78abc470e..000000000
--- a/src/jmapNew/theme/fuzhou_01/menusPlan/chooseTemplatePlan.vue
+++ /dev/null
@@ -1,115 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    :title="title"
-    class="fuzhou-01__schedule choose-plan-template"
-    :visible.sync="dialogShow"
-    width="70%"
-    :before-close="doClose"
-    :modal="false"
-    :close-on-click-modal="false"
-  >
-    <QueryListPage ref="pageRules" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
-    <el-row type="flex" justify="center" class="button-group">
-      <el-button type="primary" :loading="loading" @click="handleConfirm">{{ $t('global.select') }}</el-button>
-      <el-button @click="dialogShow = false">{{ $t('global.cancel') }}</el-button>
-    </el-row>
-  </el-dialog>
-</template>
-
-<script>
-import { runPlanTemplateList } from '@/api/runplan';
-import { listPublishMap } from '@/api/jmap/map';
-
-export default {
-    name: 'ChooseTemplatePlan',
-    data() {
-        return {
-            dialogShow: false,
-            loading: false,
-            mapList: [],
-            pagerConfig: {
-                pageSize: 'pageSize',
-                pageIndex: 'pageNum'
-            },
-            queryForm: {
-                reset: true,
-                labelWidth: '120px',
-                queryObject: {
-                    name: {
-                        type: 'text',
-                        label: this.$t('menu.runGraphName')
-                    }
-                }
-            },
-            queryList: {
-                query: this.queryFunction,
-                selectCheckShow: false,
-                radioShow: true,
-                columns: [
-                    {
-                        title: this.$t('menu.runGraphName'),
-                        prop: 'name'
-                    },
-                    {
-                        title: this.$t('menu.mapName'),
-                        prop: 'mapId',
-                        type: 'tag',
-                        columnValue: (row) => {
-                            return this.$convertField(row.mapId, this.mapList, ['id', 'name']);
-                        },
-                        tagType: (row) => { return 'success'; }
-                    }
-                ]
-            },
-
-            currentModel: {}
-        };
-    },
-    computed: {
-        title() {
-            return this.$t('menu.selectTemplateRunGraph');
-        }
-    },
-    methods: {
-        loadInitData() {
-            this.mapList = [];
-            listPublishMap().then(response => {
-                this.mapList = response.data;
-            });
-        },
-        doShow() {
-            this.loading = false;
-            this.dialogShow = true;
-            this.loadInitData();
-        },
-        doClose() {
-            this.dialogShow = false;
-        },
-        queryFunction(params) {
-            if (this.$store.state.map && this.$store.state.map.map) {
-                // params['lineCode'] = this.$store.getters['map/lineCode'];
-                params['mapId'] = this.$route.query.mapId;
-            }
-            return runPlanTemplateList(params);
-        },
-        handleConfirm() {
-            if (this.$refs && this.$refs.pageRules) {
-                const choose = this.$refs.pageRules.currentChoose();
-                if (choose) {
-                    this.$emit('chooseConfirm', choose);
-                    this.doClose();
-                } else {
-                    this.$messageBox(this.$t('menu.pleaseSelectTemplateRunGraph'));
-                }
-            }
-        },
-        reloadTable() {
-            this.queryList.reload();
-        }
-    }
-};
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-    @import "src/styles/mixin.scss";
-</style>
diff --git a/src/jmapNew/theme/fuzhou_01/menusPlan/components/dataTable.vue b/src/jmapNew/theme/fuzhou_01/menusPlan/components/dataTable.vue
deleted file mode 100644
index cfaac866d..000000000
--- a/src/jmapNew/theme/fuzhou_01/menusPlan/components/dataTable.vue
+++ /dev/null
@@ -1,206 +0,0 @@
-<template>
-  <div v-if="show">
-    <template v-if="maxmini">
-      <div class="nav">
-        <div v-show="config.showClose" class="cls-status" @click="touch('Close')"><span /></div>
-        <div class="min-status" @click="touch('Minim')"><span /></div>
-      </div>
-      <el-table
-        ref="table"
-        :data="config.data"
-        :highlight-current-row="config.highlightCurrentRow"
-        :height="height"
-        border
-        @current-change="handleChange"
-      >
-        <template v-for="(item,index) in config.columns">
-          <el-table-column :key="index" :prop="item.prop" :label="item.label" :width="item.width" />
-        </template>
-      </el-table>
-    </template>
-    <template v-else>
-      <div class="nav">
-        <div class=" max-status" @click="touch('Maxim')"><span /></div>
-      </div>
-    </template>
-  </div>
-</template>
-
-<script>
-export default {
-    name: 'DataTable',
-    props: {
-        height: {
-            type: Number,
-            required: true
-        },
-        config: {
-            type: Object,
-            required: true
-        }
-    },
-    data() {
-        return {
-            show: true,
-            maxmini: true,
-            touchStrategy: {
-                'Close': [false, true],
-                'Minim': [true, false],
-                'Maxim': [true, true]
-            }
-        };
-    },
-    methods: {
-        handleChange(row) {
-            if (this.config.handleChange) {
-                this.config.handleChange(row);
-            }
-        },
-        setCurrentRow(row) {
-            this.$refs.table.setCurrentRow(row);
-        },
-        touch(operate) {
-            this.$nextTick(() => {
-                [this.show, this.maxmini] = this.touchStrategy[operate];
-                this.$emit('touch', this.maxmini);
-            });
-        }
-    }
-};
-</script>
-
-<style scoped rel="stylesheet/scss" lang="scss">
-    @import "src/styles/mixin.scss";
-    $height: 20px;
-    $width: 20px;
-
-    .nav {
-        display: table;
-        float: right;
-        width: 100%;
-        color: #0000;
-        background: -webkit-linear-gradient(#FDFDFE, #B1CBF3);
-        background: -o-linear-gradient(#FDFDFE, #B1CBF3);
-        background: -moz-linear-gradient(#FDFDFE, #B1CBF3);
-        background: linear-gradient(#FDFDFE, #B1CBF3);
-        border: 1px solid #B6BCCC !important;
-        border-bottom: 2px solid #B6BCCC !important;
-        list-style: none;
-        height: $height;
-        line-height: $height;
-    }
-
-    /deep/ {
-        .el-table--border th.gutter {
-            background: #EBEADB !important;
-        }
-
-        .el-table {
-            overflow-y: hidden;
-            width: 100%;
-
-            th.is-leaf {
-                padding: 0px 0;
-                background: #EBEADB;
-                border-right: none !important;
-                border-left: 1px solid #D1CDBD !important;
-                border-top: 1px solid #D1CDBD !important;
-                border-bottom: 1px inset #D1CDBD !important;
-                color: #000;
-
-                .cell {
-                    height: $height;
-                    line-height: $height;
-                }
-            }
-
-            td {
-                padding: 0px 0;
-
-                .cell {
-                    height: $height;
-                    line-height: $height;
-                    font-size: smaller !important;
-                }
-
-            }
-
-            .current-row>td {
-                background: #316AC5 !important;
-                color: #fff !important;
-            }
-        }
-
-        .cls-status {
-            float: right;
-            width: 12px;
-            height: 100%;
-            line-height: 100%;
-            margin-left: 5px;
-            cursor: pointer;
-
-            span {
-                display: inline-block;
-                content: '/';
-                background: black;
-                width: 2px;
-                height: 12px;
-                vertical-align: middle;
-               transform: rotate(45deg);
-            }
-
-            span::after {
-                display: block;
-                content: '/';
-                background: black;
-                width: 2px;
-                height: 12px;
-               transform: rotate(-90deg);
-            }
-        }
-
-        .min-status {
-            float: right;
-            width: 20px;
-            height: 100%;
-            line-height: 100%;
-            cursor: pointer;
-
-            span {
-                display: inline-block;
-                content: '-';
-                background: black;
-                width: 2px;
-                height: 12px;
-                vertical-align: middle;
-               transform: rotate(-90deg);
-            }
-        }
-
-        .max-status {
-            float: right;
-            width: 20px;
-            height: 100%;
-            line-height: 100%;
-            cursor: pointer;
-
-            span {
-                display: inline-block;
-                content: '';
-                background: black;
-                width: 2px;
-                height: 12px;
-                transform: rotate(0deg);
-            }
-
-            span::after {
-                display: block;
-                content: '';
-                background: black;
-                width: 2px;
-                height: 12px;
-               transform: rotate(90deg);
-            }
-        }
-    }
-</style>
diff --git a/src/jmapNew/theme/fuzhou_01/menusPlan/createTodayPlan.vue b/src/jmapNew/theme/fuzhou_01/menusPlan/createTodayPlan.vue
deleted file mode 100644
index e1616fa86..000000000
--- a/src/jmapNew/theme/fuzhou_01/menusPlan/createTodayPlan.vue
+++ /dev/null
@@ -1,135 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    :title="title"
-    class="fuzhou-01__schedule reload-today-plan"
-    :visible.sync="dialogShow"
-    width="80%"
-    :before-close="doClose"
-    :modal="false"
-    :close-on-click-modal="false"
-  >
-    <QueryListPage ref="pageRules" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
-    <el-row type="flex" justify="center" class="button-group">
-      <el-button type="primary" :loading="loading" @click="handleConfirm">{{ $t('menu.load') }}</el-button>
-      <el-button @click="dialogShow = false">{{ $t('global.cancel') }}</el-button>
-    </el-row>
-  </el-dialog>
-</template>
-
-<script>
-import { runPlanTemplateList } from '@/api/runplan';
-import { getStationList } from '@/api/runplan';
-import { getEveryDayRunPlanData, generateDayRunPlan } from '@/api/simulation';
-import { getPublishMapInfo } from '@/api/jmap/map';
-
-export default {
-    name: 'ReloadTodayPlan',
-    data() {
-        return {
-            dialogShow: false,
-            loading: false,
-            pagerConfig: {
-                pageSize: 'pageSize',
-                pageIndex: 'pageNum'
-            },
-            queryForm: {
-                reset: true,
-                labelWidth: '120px',
-                queryObject: {
-                    name: {
-                        type: 'text',
-                        label: this.$t('menu.runGraphName')
-                    }
-                }
-            },
-            queryList: {
-                query: this.queryFunction,
-                selectCheckShow: false,
-                radioShow: true,
-                columns: [
-                    {
-                        title: this.$t('menu.runGraphName'),
-                        prop: 'name'
-                    }
-                ]
-            },
-
-            currentModel: {}
-        };
-    },
-    computed: {
-        title() {
-            return this.$t('menu.loadTheDayPlan');
-        }
-    },
-    methods: {
-        doShow() {
-            this.loading = false;
-            this.dialogShow = true;
-        },
-        doClose() {
-            this.dialogShow = false;
-        },
-        queryFunction(params) {
-            if (this.$store.state.map && this.$store.state.map.map) {
-                // params['lineCode'] = this.$store.getters['map/lineCode'];
-                params['mapId'] = this.$route.query.mapId;
-            }
-            return runPlanTemplateList(params);
-        },
-        // 生成每日运行图
-        handleConfirm() {
-            if (this.$refs && this.$refs.pageRules) {
-                const choose = this.$refs.pageRules.currentChoose();
-                if (choose && choose.id) {
-                    this.loading = true;
-                    generateDayRunPlan(choose.id, this.$route.query.group).then(response => {
-                        this.loading = false;
-                        this.reloadTable();
-                        this.loadRunData();
-                        this.doClose();
-                        this.$message.success(this.$t('tip.generateUserDailyRunGraphSuccessfully'));
-                    }).catch(() => {
-                        this.loading = false;
-                        this.reloadTable();
-                        this.$messageBox(this.$t('tip.generateUserDailyRunGraphFailed'));
-                    });
-                } else {
-                    this.$messageBox(this.$t('rules.selectTheRunningDiagramToBeLoaded'));
-                }
-            }
-        },
-        loadRunData() {
-            // const skinCode = this.$route.query.skinCode;
-            const mapId = this.$route.query.mapId;
-            this.$store.dispatch('runPlan/clear');
-            if (mapId) {
-                getStationList(mapId).then(response => {
-                    const stations = response.data;
-                    getPublishMapInfo(this.$route.query.mapId).then(res=>{
-                        this.PlanConvert = this.$theme.loadPlanConvert(res.data.lineCode);
-                        this.$store.dispatch('runPlan/setStations', stations).then(() => {
-                            getEveryDayRunPlanData(this.$route.query.group).then(resp => {
-                                this.$store.dispatch('runPlan/setPlanData', resp.data);
-                            }).catch(() => {
-                                this.$store.dispatch('runPlan/setPlanData', []);
-                                this.$messageBox(this.$t('error.getRunGraphDataFailed'));
-                            });
-                        });
-                    });
-
-                }).catch(() => {
-                    this.$messageBox(this.$t('error.getStationListFail'));
-                });
-            }
-        },
-        reloadTable() {
-            this.queryList.reload();
-        }
-    }
-};
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-    @import "src/styles/mixin.scss";
-</style>
diff --git a/src/jmapNew/theme/fuzhou_01/menusPlan/createWeekPlan.vue b/src/jmapNew/theme/fuzhou_01/menusPlan/createWeekPlan.vue
deleted file mode 100644
index 469fd37d6..000000000
--- a/src/jmapNew/theme/fuzhou_01/menusPlan/createWeekPlan.vue
+++ /dev/null
@@ -1,137 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="fuzhou-01__schedule create-week-plan"
-    :title="title"
-    :visible.sync="dialogShow"
-    width="800px"
-    :before-close="doClose"
-    :z-index="2000"
-    :modal="false"
-    :close-on-click-modal="false"
-  >
-    <el-row>
-      <el-form ref="form" :model="model" :rules="rules" label-width="150px" size="small">
-        <el-form-item :label="this.$t('menu.runGraphName') + this.$t('global.colon')" prop="planId">
-          <el-row>
-            <el-col :span="19">
-              <el-input v-model="model.planName" :readonly="true" />
-            </el-col>
-            <el-col :span="4" :offset="1">
-              <el-button @click="handleChoose">{{ this.$t('global.select') }}</el-button>
-            </el-col>
-          </el-row>
-        </el-form-item>
-        <el-form-item :label="this.$t('menu.plannedDateRange') + this.$t('global.colon')" prop="dateList">
-          <el-row>
-            <el-date-picker
-              v-model="model.dateList"
-              type="dates"
-              :clearable="false"
-              :placeholder="this.$t('rules.selectOneOrMoreDates')"
-              value-format="yyyy-MM-dd"
-            />
-          </el-row>
-        </el-form-item>
-      </el-form>
-    </el-row>
-    <el-row type="flex" justify="center" class="button-group">
-      <el-button @click="create">{{ $t('global.confirm') }}</el-button>
-      <el-button @click="doClose">{{ $t('global.cancel') }}</el-button>
-    </el-row>
-    <choose-template-plan ref="choose" @chooseConfirm="chooseConfirm" />
-  </el-dialog>
-</template>
-
-<script>
-import { createRunPlanLoad } from '@/api/runplan';
-import ChooseTemplatePlan from './chooseTemplatePlan';
-
-export default {
-    name: 'CreateWeekPlan',
-    components: {
-        ChooseTemplatePlan
-    },
-    data() {
-        return {
-            dialogShow: false,
-            loading: false,
-            model: {
-                planId: '',
-                planName: '',
-                dateList: []
-            }
-        };
-    },
-    computed: {
-        title() {
-            return this.$t('menu.createAWeekPlan');
-        },
-        rules() {
-            const rules = {
-                planId: [
-                    { required: true, message: this.$t('rules.inputTemplateRunPlan'), trigger: 'blur' }
-                ],
-                dateList: [
-                    { required: true, message: this.$t('rules.selectAPlannedDateRange'), trigger: 'change' }
-                ]
-            };
-
-            return rules;
-        }
-    },
-    mounted() {
-    },
-    methods: {
-        doShow(params) {
-            this.dialogShow = true;
-        },
-        doClose() {
-            this.loading = false;
-            this.dialogShow = false;
-        },
-        handleChoose() {
-            this.$refs.choose.doShow();
-        },
-        chooseConfirm(choose) {
-            if (choose) {
-                this.model.planId = choose.id;
-                this.model.planName = choose.name;
-            }
-        },
-        buildModel() {
-            return {
-                planDateList: this.model.dateList,
-                mapId: this.$route.query.mapId,
-                templatePlanId: this.model.planId
-            };
-        },
-        create() {
-            this.$refs['form'].validate((valid) => {
-                if (valid) {
-                    createRunPlanLoad(this.buildModel()).then(response => {
-                        this.$message.success(this.$t('tip.createRunChartPlanSuccessfully'));
-                        this.doClose();
-                    }).catch(() => {
-                        this.doClose();
-                        this.$messageBox(this.$t('tip.createRunChartPlanFailed'));
-                    });
-                }
-            });
-        }
-    }
-};
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-    @import "src/styles/mixin.scss";
-
-    .card-box {
-        padding-top: 10px;
-    }
-
-    /deep/ {
-        .el-row {
-            margin: 10px;
-        }
-    }
-</style>
diff --git a/src/jmapNew/theme/fuzhou_01/menusPlan/deleteTask.vue b/src/jmapNew/theme/fuzhou_01/menusPlan/deleteTask.vue
deleted file mode 100644
index 363f3c8ab..000000000
--- a/src/jmapNew/theme/fuzhou_01/menusPlan/deleteTask.vue
+++ /dev/null
@@ -1,73 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="fuzhou-01__schedule delete-task"
-    :title="title"
-    :visible.sync="dialogShow"
-    width="400px"
-    :before-close="doClose"
-    :z-index="2000"
-    :modal="false"
-    :close-on-click-modal="false"
-  >
-    <el-row>
-      <el-radio v-model="type" :label="1">{{ $t('menu.deleteAllPreviousTasks') }}</el-radio>
-    </el-row>
-    <el-row>
-      <el-radio v-model="type" :label="2">{{ $t('menu.deleteAllSubsequentTasks') }}</el-radio>
-    </el-row>
-    <el-row type="flex" justify="center" class="button-group">
-      <el-button @click="commit">{{ $t('global.confirm') }}</el-button>
-      <el-button @click="doClose">{{ $t('global.cancel') }}</el-button>
-    </el-row>
-  </el-dialog>
-</template>
-
-<script>
-
-export default {
-    name: 'DeleteTask',
-    components: {
-    },
-    data() {
-        return {
-            dialogShow: false,
-            loading: false,
-            tripNumber: '',
-            serviceNumber: '',
-            type: '1'
-        };
-    },
-    computed: {
-        title() {
-            return this.$t('menu.deleteTask');
-        }
-    },
-    mounted() {
-    },
-    methods: {
-        doShow(params) {
-            this.tripNumber = params.tripNumber;
-            this.serviceNumber = params.serviceNumber;
-            this.dialogShow = true;
-        },
-        doClose() {
-            this.loading = false;
-            this.dialogShow = false;
-        },
-        commit() {
-            // this.tripNumber
-            this.doClose();
-        }
-    }
-};
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-    @import "src/styles/mixin.scss";
-
-    /deep/ {
-        .el-row {
-            margin: 10px;
-        }
-    }
-</style>
diff --git a/src/jmapNew/theme/fuzhou_01/menusPlan/deleteTodayPlan.vue b/src/jmapNew/theme/fuzhou_01/menusPlan/deleteTodayPlan.vue
deleted file mode 100644
index be003663e..000000000
--- a/src/jmapNew/theme/fuzhou_01/menusPlan/deleteTodayPlan.vue
+++ /dev/null
@@ -1,62 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="fuzhou-01__schedule create-week-plan"
-    :title="title"
-    :visible.sync="dialogShow"
-    width="400px"
-    :before-close="doClose"
-    :z-index="2000"
-    :modal="false"
-    :close-on-click-modal="false"
-  >
-    <el-row type="flex" justify="center" class="button-group">
-      <el-button @click="commit">{{ $t('global.confirm') }}</el-button>
-      <el-button @click="doClose">{{ $t('global.cancel') }}</el-button>
-    </el-row>
-  </el-dialog>
-</template>
-
-<script>
-
-export default {
-    name: 'DeleteTodayPlan',
-    components: {
-    },
-    data() {
-        return {
-            dialogShow: false,
-            loading: false
-        };
-    },
-    computed: {
-        title() {
-            return this.$t('menu.deleteTheDayPlan');
-        }
-    },
-    mounted() {
-    },
-    methods: {
-        doShow(params) {
-            this.dialogShow = true;
-        },
-        doClose() {
-            this.loading = false;
-            this.dialogShow = false;
-        },
-        commit() {
-            // this.tripNumber
-            this.doClose();
-        }
-    }
-};
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-    @import "src/styles/mixin.scss";
-
-    /deep/ {
-        .el-row {
-            margin: 10px;
-        }
-    }
-</style>
diff --git a/src/jmapNew/theme/fuzhou_01/menusPlan/managePlanList.vue b/src/jmapNew/theme/fuzhou_01/menusPlan/managePlanList.vue
deleted file mode 100644
index 7ad2e21bd..000000000
--- a/src/jmapNew/theme/fuzhou_01/menusPlan/managePlanList.vue
+++ /dev/null
@@ -1,143 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="fuzhou-01__schedule manage-plan-list"
-    :title="title"
-    :visible.sync="dialogShow"
-    width="80%"
-    :before-close="doClose"
-    :z-index="2000"
-    :modal="false"
-    :close-on-click-modal="false"
-  >
-    <QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
-  </el-dialog>
-</template>
-
-<script>
-import { getRunPlanLoadList, deleteRunPlanLoad, listAllTempLateRunPlan } from '@/api/runplan';
-import { getPublishMapListOnline } from '@/api/jmap/map';
-
-export default {
-    name: 'ManagePlanList',
-    data() {
-        return {
-            dialogShow: false,
-            loading: false,
-            pagerConfig: {
-                pageSize: 'pageSize',
-                pageIndex: 'pageNum'
-            },
-            queryForm: {
-                labelWidth: '140px',
-                reset: true
-            },
-            queryList: {
-                query: this.queryFunction,
-                selectCheckShow: false,
-                indexShow: true,
-                columns: [
-                    {
-                        title: this.$t('menu.mapName'),
-                        prop: 'mapId',
-                        type: 'tag',
-                        columnValue: (row) => { return this.$convertField(row.mapId, this.mapList, ['id', 'name']); },
-                        tagType: (row) => { return ''; }
-                    },
-                    {
-                        title: this.$t('menu.runGraphName'),
-                        prop: 'templatePlanId',
-                        type: 'tag',
-                        columnValue: (row) => { return this.$convertField(row.templatePlanId, this.templatePlanList, ['id', 'name']); },
-                        tagType: (row) => { return 'success'; }
-                    },
-                    {
-                        title: this.$t('menu.loadDate'),
-                        prop: 'loadTime'
-                    },
-                    {
-                        type: 'button',
-                        title: this.$t('global.operate'),
-                        width: '100',
-                        buttons: [
-                            {
-                                name: this.$t('global.delete'),
-                                handleClick: this.handleDelete,
-                                type: 'danger'
-                            }
-                        ]
-                    }
-                ],
-                actions: [
-                    { text: this.$t('global.create'), btnCode: 'employee_insert', handler: this.handleCreateRunPlan }
-                ]
-            },
-
-            currentModel: {}
-        };
-    },
-    computed: {
-        title() {
-            return this.$t('menu.operationChartSchedule');
-        }
-    },
-    mounted() {
-        this.loadPageData();
-    },
-    methods: {
-        loadPageData() {
-            this.mapList = [];
-            getPublishMapListOnline().then(resp => {
-                this.mapList = resp.data;
-            });
-            this.templatePlanList = [];
-            listAllTempLateRunPlan().then(resp => {
-                this.templatePlanList = resp.data;
-            });
-        },
-        queryFunction(params) {
-            if (this.$route.query.mapId) {
-                params['mapId'] = this.$route.query.mapId;
-            }
-
-            if (this.$store.state.user.id) {
-                params['userId'] = this.$store.state.user.id;
-            }
-
-            return getRunPlanLoadList(params);
-        },
-        handleDelete(index, row) {
-            this.$confirm(this.$t('tip.deleteTheRunningGraphLoadedTheNextDay'), this.$t('tip.hint'), {
-                confirmButtonText: this.$t('global.confirm'),
-                cancelButtonText: this.$t('global.cancel'),
-                type: 'warning'
-            }).then(() => {
-                deleteRunPlanLoad(row.id).then(response => {
-                    this.$message.success(this.$t('global.successfullyDelete'));
-                    this.reloadTable();
-                }).catch(() => {
-                    this.reloadTable();
-                    this.$messageBox(this.$t('global.failDelete'));
-                });
-            }).catch(() => { });
-        },
-        handleCreateRunPlan() {
-            this.$emit('dispatchDialog', { name: 'createWeekPlan' });
-        },
-        doShow() {
-            this.dialogShow = true;
-            this.$nextTick(()=> { this.reloadTable(); });
-        },
-        doClose() {
-            this.loading = false;
-            this.dialogShow = false;
-        },
-        reloadTable() {
-            this.queryList.reload();
-        }
-    }
-};
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-    @import "src/styles/mixin.scss";
-</style>
diff --git a/src/jmapNew/theme/fuzhou_01/menusPlan/modifyingPlan.vue b/src/jmapNew/theme/fuzhou_01/menusPlan/modifyingPlan.vue
deleted file mode 100644
index 6cba11edc..000000000
--- a/src/jmapNew/theme/fuzhou_01/menusPlan/modifyingPlan.vue
+++ /dev/null
@@ -1,177 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="fuzhou-01__schedule edit-planning-train"
-    :title="title"
-    :visible.sync="dialogShow"
-    width="800px"
-    :before-close="doClose"
-    :z-index="2000"
-    :modal="false"
-    :close-on-click-modal="false"
-  >
-    <el-row>
-      <el-col :offset="10">{{ $t('menu.trainLine') }}</el-col>
-    </el-row>
-    <el-row>
-      <el-col :span="17">
-        <el-table :data="serviceData" border style="width: 100%" height="160">
-          <el-table-column prop="startStationCode" :label="this.$t('menu.startStation')" />
-          <el-table-column prop="startStationStandCode" :label="this.$t('menu.startPlatform')" />
-          <el-table-column prop="endStationCode" :label="this.$t('menu.terminal')" />
-          <el-table-column prop="endStationStandCode" :label="this.$t('menu.endPlatform')" />
-        </el-table>
-      </el-col>
-      <el-col :span="6" :offset="1">
-        <el-row type="flex" justify="center">
-          <el-button class="view-button" @click="handleAddTask">{{ this.$t('menu.addTask2') }}</el-button>
-        </el-row>
-        <el-row type="flex" justify="center">
-          <el-button class="view-button" @click="handleReplace">{{ this.$t('menu.replace') }}</el-button>
-        </el-row>
-        <el-row type="flex" justify="center">
-          <el-button class="view-button" @click="handleDeleteTask">{{ this.$t('menu.deleteTask2') }}</el-button>
-        </el-row>
-        <div class="view-box">
-          <el-row type="flex" justify="center">
-            <el-radio-group v-model="storeInOut">
-              <el-radio :label="1">{{ this.$t('menu.inTheLibrary') }}</el-radio>
-              <el-radio :label="2">{{ this.$t('menu.outOfTheLibrary') }}</el-radio>
-            </el-radio-group>
-          </el-row>
-        </div>
-      </el-col>
-    </el-row>
-    <el-row class="view-box">
-      <el-col :span="9" style="padding-left: 10px">
-        <el-input v-model="oldServiceNumber" size="small" :disabled="true" />
-      </el-col>
-      <el-col :span="9" style="padding-left: 20px">
-        <el-input v-model="newServiceNumber" size="small" />
-      </el-col>
-      <el-col :span="5" style="padding-left: 20px">
-        <el-button style="width: 150px;" @click="handleModifyingTripNumber">{{ $t('menu.changeTripNumber') }}</el-button>
-      </el-col>
-    </el-row>
-    <el-row style="margin-top: 10px">
-      <el-col :span="4"><span class="view-label">{{ $t('menu.lineStartTime') }}</span></el-col>
-      <el-col :span="8">
-        <el-time-select v-model="serviceStartTime" size="small" />
-      </el-col>
-      <el-col :span="4"><span class="view-label">{{ $t('menu.lineEndTime') }}</span></el-col>
-      <el-col :span="8">
-        <el-time-select v-model="serviceEndTime" size="small" />
-      </el-col>
-    </el-row>
-    <el-row style="margin-top: 20px">
-      <el-col :offset="10">{{ $t('menu.lineDetails') }}</el-col>
-    </el-row>
-    <el-row>
-      <el-table :data="tripData" border style="width: 100%" height="200">
-        <el-table-column prop="arriveTime" :label="this.$t('menu.arrivalTime2')" />
-        <el-table-column prop="stationCode" :label="this.$t('menu.station')" />
-        <el-table-column prop="stationStandCode" :label="this.$t('menu.platform')" />
-        <el-table-column prop="stopTime" :label="this.$t('menu.stopTime')" />
-        <el-table-column prop="level" :label="this.$t('menu.runLevel')" />
-      </el-table>
-    </el-row>
-    <el-row style="margin-top: 20px">
-      <el-checkbox v-model="effect">{{ $t('menu.affectSubsequentTasks') }}</el-checkbox>
-    </el-row>
-    <el-row type="flex" justify="center">
-      <el-button @click="commit">{{ $t('global.confirm') }}</el-button>
-      <el-button @click="doClose">{{ $t('global.cancel') }}</el-button>
-    </el-row>
-  </el-dialog>
-</template>
-
-<script>
-import { formatTime, formatName } from '@/utils/runPlan';
-
-export default {
-    name: 'ModifyingPlan',
-    data() {
-        return {
-            dialogShow: false,
-            loading: false,
-            effect: false,
-            storeInOut: '1',
-            oldServiceNumber: '',
-            newServiceNumber: '',
-            serviceStartTime: '',
-            serviceEndTime: '',
-            serviceData: [],
-            tripData: []
-        };
-    },
-    computed: {
-        title() {
-            return this.$t('global.modify');
-        }
-    },
-    mounted() {
-    },
-    methods: {
-        formatTime(time) {
-            return formatTime(time);
-        },
-        formatName(code) {
-            return formatName(code);
-        },
-        doShow() {
-            this.dialogShow = true;
-        },
-        doClose() {
-            this.loading = false;
-            this.dialogShow = false;
-        },
-        // 加任务
-        handleAddTask() {
-            this.$emit('dispatchDialog', { name: 'addTask', params: {} });
-        },
-        // 替换
-        handleReplace() {
-            this.$emit('dispatchDialog', { name: 'modifyingTask', params: {} });
-        },
-        // 删任务
-        handleDeleteTask() {
-            this.$emit('dispatchDialog', { name: 'deleteTask', params: {} });
-        },
-        // 改车次号
-        handleModifyingTripNumber() {
-            this.$emit('dispatchDialog', { name: 'modifyingTripNumber', params: {} });
-        },
-        // 确定修改
-        commit() {
-            this.doClose();
-        }
-    }
-};
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-    @import "src/styles/mixin.scss";
-
-    .view-button {
-        display: list-item;
-        width: 150px !important;
-        margin-left: 0px;
-    }
-
-    .view-label {
-        height: 32px;
-        line-height: 32px;
-    }
-
-    .view-box {
-        padding: 10px 0px;
-        border: 1px inset gray;
-        border-top: 1px outset gray;
-        border-left: 1px outset gray;
-    }
-
-    /deep/ {
-        .el-row {
-            margin: 5px 20px;
-        }
-    }
-</style>
diff --git a/src/jmapNew/theme/fuzhou_01/menusPlan/modifyingTask.vue b/src/jmapNew/theme/fuzhou_01/menusPlan/modifyingTask.vue
deleted file mode 100644
index 2ebad67a8..000000000
--- a/src/jmapNew/theme/fuzhou_01/menusPlan/modifyingTask.vue
+++ /dev/null
@@ -1,326 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="fuzhou-01__schedule add-task"
-    :title="title"
-    :visible.sync="dialogShow"
-    width="1000px"
-    :before-close="doClose"
-    :z-index="2000"
-    :modal="false"
-    :close-on-click-modal="false"
-  >
-    <div style="margin: 10px">
-      <el-row>
-        <el-col :span="4">
-          <el-row>
-            <el-col :span="9">
-              <span>{{ $t('menu.tripNumber') + $t('global.colon') }}</span>
-            </el-col>
-            <el-col :span="15">
-              <el-select v-model="model.tripNumber" style="display: inline-black" :placeholder="this.$t('global.choose')">
-                <el-option
-                  v-for="item in tripNumberList"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                />
-              </el-select>
-            </el-col>
-          </el-row>
-        </el-col>
-        <el-col :span="2">
-          <el-row>
-            <el-col :offset="4">
-              <el-checkbox v-model="model.trainManual">{{ this.$t('menu.manual') }}</el-checkbox>
-            </el-col>
-          </el-row>
-        </el-col>
-        <el-col :span="5">
-          <el-row>
-            <el-col :span="12">
-              <span>{{ $t('menu.defaultStopTime') + $t('global.colon') }}</span>
-            </el-col>
-            <el-col :span="12">
-              <el-select v-model="model.time" style="display: inline-black" :placeholder="this.$t('global.choose')">
-                <el-option
-                  v-for="item in timeList"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                />
-              </el-select>
-            </el-col>
-          </el-row>
-        </el-col>
-        <el-col :span="5">
-          <el-row>
-            <el-col :span="9" :offset="2">
-              <span>{{ $t('menu.serviceNumber') + $t('global.colon') }}</span>
-            </el-col>
-            <el-col :span="13">
-              <el-input v-model="model.serviceNumber" />
-            </el-col>
-          </el-row>
-        </el-col>
-        <el-col :span="8">
-          <el-row>
-            <el-col :span="22" :offset="2">
-              <el-row>
-                <el-col :span="6">
-                  <el-checkbox v-model="model.clearGuest">{{ $t('menu.clearGuest') }}</el-checkbox>
-                </el-col>
-                <el-col :span="8">
-                  <el-checkbox v-model="model.continuationPlan">{{ $t('menu.continuationPlan') }}</el-checkbox>
-                </el-col>
-                <el-col :span="6">
-                  <el-checkbox v-model="model.firstTrain">{{ $t('menu.firstTrain') }}</el-checkbox>
-                </el-col>
-              </el-row>
-            </el-col>
-          </el-row>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="4">
-          <el-row>
-            <el-col :span="9">
-              <span>{{ $t('menu.serialNumber') + $t('global.colon') }}</span>
-            </el-col>
-            <el-col :span="15">
-              <el-select v-model="model.serialNumber" style="display: inline-black" :placeholder="this.$t('global.choose')">
-                <el-option
-                  v-for="item in serialNumberList"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="model.value"
-                />
-              </el-select>
-            </el-col>
-          </el-row>
-        </el-col>
-        <el-col :span="2">
-          <el-row>
-            <el-col :offset="4">
-              <el-checkbox v-model="model.serialManual">{{ this.$t('menu.manual') }}</el-checkbox>
-            </el-col>
-          </el-row>
-        </el-col>
-        <el-col :span="5">
-          <el-row>
-            <el-col :span="12">
-              <span>{{ $t('menu.defaultRunLevel') + $t('global.colon') }}</span>
-            </el-col>
-            <el-col :span="12">
-              <el-select v-model="model.level" style="display: inline-black" :placeholder="this.$t('global.choose')">
-                <el-option
-                  v-for="item in levelList"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                />
-              </el-select>
-            </el-col>
-          </el-row>
-        </el-col>
-        <el-col :span="5">
-          <el-row>
-            <el-col :span="9" :offset="2">
-              <span>{{ $t('global.startTime') + $t('global.colon') }}</span>
-            </el-col>
-            <el-col :span="13">
-              <el-time-select v-model="model.startTime" :placeholder="this.$t('global.selectionTime')" :clearable="false" />
-            </el-col>
-          </el-row>
-        </el-col>
-        <el-col :span="8">
-          <el-row>
-            <el-col :span="22" :offset="2">
-              <el-row>
-                <el-col :span="6">
-                  <el-checkbox v-model="model.inStock">{{ $t('menu.inTheLibrary') }}</el-checkbox>
-                </el-col>
-                <el-col :span="8">
-                  <el-checkbox v-model="model.outStock">{{ $t('menu.outOfTheLibrary') }}</el-checkbox>
-                </el-col>
-                <el-col :span="6">
-                  <el-checkbox v-model="model.lastTrain">{{ $t('menu.lastTrain') }}</el-checkbox>
-                </el-col>
-              </el-row>
-            </el-col>
-          </el-row>
-        </el-col>
-      </el-row>
-      <el-row style="margin-bottom: 5px;">
-        {{ $t('menu.crossing') + $t('global.colon') }}
-      </el-row>
-      <el-row>
-        <el-table :data="model.route" border :height="140">
-          <el-table-column prop="beginStationCode" :label="this.$t('menu.startStation')">
-            <template slot-scope="scope">
-              {{ formatName(scope.row.beginStationCode) }}
-            </template>
-          </el-table-column>
-          <el-table-column prop="beginStationStandCode" :label="this.$t('menu.startPlatform')" />
-          <el-table-column prop="endStationCode" :label="this.$t('menu.terminal')">
-            <template slot-scope="scope">
-              {{ formatName(scope.row.endStationCode) }}
-            </template>
-          </el-table-column>
-          <el-table-column prop="endStationStandCode" :label="this.$t('menu.endPlatform')" />
-          <el-table-column prop="describe" :label="this.$t('menu.description')" :width="280" />
-          <el-table-column :width="40" />
-        </el-table>
-      </el-row>
-      <el-row style=" margin-bottom: 5px;margin-top: 10px;">
-        {{ $t('global.details') + $t('global.colon') }}
-      </el-row>
-      <el-row>
-        <el-table :data="model.detail" border :height="140">
-          <el-table-column prop="stationCode" :label="this.$t('menu.platform')" :width="160">
-            <template slot-scope="scope">
-              {{ formatName(scope.row.stationCode) }}
-            </template>
-          </el-table-column>
-          <el-table-column prop="startTime" :label="this.$t('menu.arrivalTime')">
-            <template slot-scope="scope">
-              {{ formatTime(scope.row.startTime) }}
-            </template>
-          </el-table-column>
-          <el-table-column prop="stopTime" :label="this.$t('menu.stopTime')">
-            <template slot-scope="scope">
-              {{ formatTime(scope.row.stopTime) }}
-            </template>
-          </el-table-column>
-          <el-table-column prop="endTime" :label="this.$t('menu.departureTime')">
-            <template slot-scope="scope">
-              {{ formatTime(scope.row.endTime) }}
-            </template>
-          </el-table-column>
-          <el-table-column prop="level" :label="this.$t('menu.runLevel')" />
-          <el-table-column width="280" />
-        </el-table>
-      </el-row>
-      <el-row>
-        <el-col :offset="16">
-          <el-checkbox v-model="model.default">{{ $t('menu.displaysDefaultStopTimesAndRunLevels') }}</el-checkbox>
-        </el-col>
-      </el-row>
-    </div>
-    <el-row type="flex" justify="center" class="button-group">
-      <el-button @click="commit">{{ $t('global.confirm') }}</el-button>
-      <el-button @click="doClose">{{ $t('global.cancel') }}</el-button>
-    </el-row>
-  </el-dialog>
-</template>
-
-<script>
-import { formatTime, formatName } from '@/utils/runPlan';
-
-export default {
-    name: 'ModifyingTask',
-    components: {
-    },
-    data() {
-        return {
-            dialogShow: false,
-            loading: false,
-            model: {
-                tripNumber: '',
-                serialNumber: '',
-                trainManual: false,
-                serialManual: false,
-                clearGuest: false,
-                continuationPlan: false,
-                firstTrain: false,
-                lastTrain: false,
-                inStock: false,
-                outStock: false,
-                startTime: '',
-                route: [],
-                detail: []
-            },
-            timeList: [],
-            levelList: [],
-            tripNumberList: [],
-            serialNumberList: []
-        };
-    },
-    computed: {
-        title() {
-            return this.$t('menu.modifyTask');
-        }
-    },
-    mounted() {
-    },
-    methods: {
-        formatTime(time) {
-            return formatTime(time);
-        },
-        formatName(code) {
-            return formatName(code);
-        },
-        loadInitData(params) {
-            this.model.tripNumber = params.tripNumber;
-            this.model.serviceNumber = params.serviceNumber;
-            const editData = this.$store.state.runPlan.editData[params.serviceNumber];
-            if (editData) {
-                const trainInfo = editData.trainMap[params.tripNumber];
-                const lastIndex = trainInfo.stationTimeList.length - 1;
-                const taskObj = {
-                    tripNumber: params.tripNumber,
-                    beginStationCode: trainInfo.stationTimeList[0].stationCode,
-                    beginStationStandCode: '',
-                    endStationCode: trainInfo.stationTimeList[lastIndex].stationCode,
-                    endStationStandCode: ''
-                };
-                this.model.route.push(taskObj);
-
-                trainInfo.stationTimeList.forEach((elem, index) => {
-                    const stationObj = {
-                        stationCode: elem.stationCode,
-                        startTime: index == 0 ? null : trainInfo.stationTimeList[index - 1].secondTime,
-                        stopTime: index == 0 ? null : elem.secondTime - trainInfo.stationTimeList[index - 1].secondTime,
-                        endTime: elem.secondTime,
-                        level: ''
-                    };
-                    this.model.detail.push(stationObj);
-                });
-            }
-        },
-        doShow(params) {
-            this.loadInitData(params);
-            this.dialogShow = true;
-        },
-        doClose() {
-            this.loading = false;
-            this.dialogShow = false;
-        },
-        commit() {
-        }
-    }
-};
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-    @import "src/styles/mixin.scss";
-
-    /deep/ {
-        .el-button {
-            margin-left: 40px !important;
-            margin-right: 40px !important;
-        }
-
-        .el-row {
-            margin-bottom: 5px !important;
-        }
-
-        .el-input__inner {
-            height: 20px !important;
-            line-height: 20px !important;
-        }
-
-        .el-input {
-            width: 110px !important;
-        }
-    }
-</style>
diff --git a/src/jmapNew/theme/fuzhou_01/model.js b/src/jmapNew/theme/fuzhou_01/model.js
index ed34da08c..dd040cf61 100644
--- a/src/jmapNew/theme/fuzhou_01/model.js
+++ b/src/jmapNew/theme/fuzhou_01/model.js
@@ -14,6 +14,9 @@ class Model {
         this['private'][deviceType.StationControl] = {
             indicatorShow: true									// 标识灯名称显示
         };
+        this['private'][deviceType.Station] = {
+            kmPostShow: true									// 公里标显示
+        };
         this['private'][deviceType.Switch] = {
             nameShow: true
         };
diff --git a/src/jmapNew/theme/fuzhou_01/planSchedule/index.vue b/src/jmapNew/theme/fuzhou_01/planSchedule/index.vue
deleted file mode 100644
index 0555c8878..000000000
--- a/src/jmapNew/theme/fuzhou_01/planSchedule/index.vue
+++ /dev/null
@@ -1,403 +0,0 @@
-<template>
-  <div class="plan-schedule" style="width: 100%">
-    <title-bar ref="titleBar" @back="back" />
-    <menu-bar ref="menuBar" :line-code="lineCode" @dispatchDialog="dispatchDialog" />
-    <schedule ref="schedule" :line-code="lineCode" :group="group" :max-height="height" :max-width="width" />
-    <status-bar ref="statusBar" :max-top="height" @setPosition="setPosition" />
-
-    <manage-plan-list ref="managePlanList" @dispatchDialog="dispatchDialog" />
-    <create-week-plan ref="createWeekPlan" @reloadTable="reloadTable" />
-    <create-today-plan ref="createTodayPlan" />
-    <modifying-plan ref="modifyingPlan" @dispatchDialog="dispatchDialog" />
-    <add-task ref="addTask" />
-    <delete-task ref="deleteTask" />
-    <modifying-task ref="modifyingTask" />
-  </div>
-</template>
-
-<script>
-import TitleBar from './titleBar';
-import MenuBar from './menuBar';
-import StatusBar from './statusBar';
-import Schedule from './schedule';
-import ManagePlanList from '../menusPlan/managePlanList';
-import CreateWeekPlan from '../menusPlan/createWeekPlan';
-import CreateTodayPlan from '../menusPlan/createTodayPlan';
-import ModifyingPlan from '../menusPlan/modifyingPlan';
-import AddTask from '../menusPlan/addTask';
-import DeleteTask from '../menusPlan/deleteTask';
-import ModifyingTask from '../menusPlan/modifyingTask';
-
-export default {
-    name: 'Menus',
-    components: {
-        TitleBar,
-        MenuBar,
-        StatusBar,
-        Schedule,
-        ManagePlanList,
-        CreateWeekPlan,
-        CreateTodayPlan,
-        ModifyingPlan,
-        AddTask,
-        DeleteTask,
-        ModifyingTask
-    },
-    props: {
-        group: {
-            type: String,
-            required: true
-        }
-    },
-    data() {
-        return {
-        };
-    },
-    computed: {
-        lineCode() {
-            return this.$route.query.lineCode || '02';
-        },
-        width() {
-            return this.$store.state.app.width;
-        },
-        height() {
-            return this.$store.state.app.height;
-        }
-    },
-    methods: {
-        setPosition() {
-            this.$nextTick(() => {
-                this.$refs.schedule.setPosition();
-            });
-        },
-        dispatchDialog(dialogObj) {
-            this.$nextTick(() => {
-                if (this.$refs[dialogObj.name]) {
-                    this.$refs[dialogObj.name].doShow(dialogObj.params);
-                }
-            });
-        },
-        reloadTable(dialogObj) {
-            if (this.$refs[dialogObj.name]) {
-                this.$refs[dialogObj.name].reloadTable();
-            }
-        },
-        confirm(params) {
-        },
-        back() {
-            this.$emit('back');
-        }
-    }
-};
-</script>
-
-<style>
-    .plan-schedule {
-        position: absolute;
-        background: gray;
-    }
-
-    .plan-schedule .pop-menu {
-        background: #F0F0F0;
-    }
-
-    .plan-schedule .pop-menu span {
-        color: #000;
-    }
-
-    .plan-schedule .system-close {
-        cursor: pointer;
-        position: absolute;
-        right: 0px;
-        background: -webkit-linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
-        background: -o-linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
-        background: -moz-linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
-        background: linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
-        border: 1px solid white;
-        border-radius: 4px;
-    }
-
-    .plan-schedule .system-close::before {
-        position: absolute;
-        height: 22px;
-        line-height: 22px;
-        top: 0px;
-        left: 0px;
-        font-size: x-large;
-    }
-
-    .plan-schedule .pop-menu .is-disabled span {
-        color: #B4B3B8;
-    }
-
-    .fuzhou-01__schedule {
-        overflow: hidden !important;
-    }
-
-    .fuzhou-01__schedule .el-dialog {
-        background: rgba(0, 85, 231, 1);
-        box-shadow: 1px hsla(240, 0%, 100%, 0.5) inset;
-        border: 2px solid #727375;
-        border-radius: 4px;
-        color: #000;
-        font-size: 14px;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-dialog__header {
-        height: 30px;
-        padding: 5px;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-dialog__footer {
-        background: #ECE9D8;
-        opacity: 1;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-dialog__body {
-        padding-top: 10px;
-        padding-bottom: 10px;
-        padding-left: 5px;
-        padding-right: 5px;
-        margin: 0px 3px 3px 3px;
-        border: 2px solid rgba(120, 121, 123, 0.5);
-        box-shadow: 1px hsla(240, 0%, 100%, 0.5) inset;
-        color: #000;
-        background: #ECE9D8;
-        opacity: 1;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-dialog__title {
-        font-size: 16px;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-dialog__headerbtn {
-        background: -webkit-linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
-        background: -o-linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
-        background: -moz-linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
-        background: linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
-        border: 1px solid white;
-        border-radius: 4px;
-        top: 0px;
-        right: 3px;
-        line-height: 26px;
-        width: 26px;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-dialog__headerbtn .el-icon-close:before {
-        font-size: 16px;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-dialog__headerbtn .el-dialog__close {
-        color: #fff;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-form {
-        background: #ECE9D8 !important;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-card {
-        background: #ECE9D8 !important;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-button {
-        height: 32px;
-        line-height: 32px;
-        padding: 0px;
-        width: 80px;
-        border: 2px outset #E2E2E2;
-        border-radius: 0px !important;
-        color: #000;
-        background: #ECE9D8;
-    }
-
-    .fuzhou-01__schedule .el-dialog .expand {
-        width: 120px;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-button:focus span {
-        border: 1px dashed gray;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-button:active {
-        border: 2px inset #E2E2E2;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-button:disabled {
-        border: 2px inset #E2E2E2;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-button:disabled span {
-        border: 0px;
-    }
-
-    .fuzhou-01__schedule .el-dialog .button-group {
-        margin: 0px 5px;
-        text-align: center !important;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-input {
-        border: 2px inset #E9E9E9;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-input .el-input__inner {
-        color: #000;
-        background: #fff !important;
-        border: 0px;
-        border-radius: 0px !important;
-        box-sizing: border-box;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-input.is-disabled .el-input__inner {
-        background: #F0F0F0 !important;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-textarea {
-        border: 2px inset #E9E9E9;
-        border-radius: 0px;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-textarea .el-textarea__inner {
-        color: #000;
-        background: #fff !important;
-        border: 0px;
-        border-radius: 0px !important;
-        box-sizing: border-box;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-textarea.is-disabled .el-textarea__inner {
-        background: #F0F0F0 !important;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-table {
-        border: 2px inset #E9E9E9;
-        color: #000 !important;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-table .cell {
-        line-height: unset !important;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-table th.is-leaf {
-        background: #ECE9D8 !important;
-        border-right: 1px solid #BDBDBD !important;
-        border-bottom: 1px solid #BDBDBD !important;
-        color: #000 !important;
-        height: 20px !important;
-        padding: 0px;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-table tr td {
-        height: 20px !important;
-        padding: 0px;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-table .el-table__empty-text {
-        top: 15px !important;
-    }
-
-    .fuzhou-01__schedule .el-dialog .current-row>td {
-        background: #316AC5 !important;
-        color: #fff !important;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-checkbox__inner {
-        border: 1px inset #dcdfe6 !important;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-checkbox__label {
-        color: #000 !important;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-checkbox.is-disabled .el-checkbox__inner {
-        background: #E6E6E6 !important;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-checkbox.is-disabled .el-checkbox__label {
-        color: #C5C9CC !important;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-checkbox__input.is-checked .el-checkbox__inner {
-        background: #fff !important;
-        border: 1px inset #dcdfe6 !important;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-checkbox__input.is-checked .el-checkbox__inner::after {
-        position: absolute;
-        -webkit-box-sizing: content-box;
-        box-sizing: content-box;
-        content: "";
-        border: 1px solid #000;
-        border-left: 0;
-        border-top: 0;
-        height: 7px;
-        left: 4px;
-        top: 1px;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-radio__inner {
-        border: 1px inset #dcdfe6 !important;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-radio__label {
-        color: #000 !important;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-radio__input.is-checked .el-radio__inner {
-        background: #fff !important;
-        border: 1px inset #dcdfe6 !important;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-radio__input.is-checked .el-radio__inner::after {
-        width: 4px;
-        height: 4px;
-        border-radius: 100%;
-        background-color: #000 !important;
-        position: absolute;
-        left: 50%;
-        top: 50%;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-radio.is-disabled .el-radio__inner {
-        background: #E6E6E6 !important;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-radio.is-disabled .el-radio__label {
-        color: #C5C9CC !important;
-    }
-
-    .fuzhou-01__schedule .el-dialog .base-label {
-        background: rgba(0, 0, 0, x);
-        position: relative;
-        left: -15px;
-        top: -18px;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-form-item label {
-        font-weight: normal !important;
-        color: #000 !important;
-    }
-
-    .fuzhou-01__schedule .el-dialog .context {
-        height: 100px;
-        border: 2px inset #E2E2E2;
-        overflow-y: scroll;
-    }
-
-    .fuzhou-01__schedule .el-dialog .table {
-        margin-top: 10px;
-    }
-
-    .fuzhou-01__schedule .el-dialog .notice {
-        margin-left: 62px;
-        line-height: 30px;
-    }
-
-    .fuzhou-01__schedule .el-dialog .button-group {
-        margin-top: 10px;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-tree__empty-block {
-        background: #E9E9E9 !important;
-        color: #000 !important;
-    }
-</style>
diff --git a/src/jmapNew/theme/fuzhou_01/planSchedule/menuBar.vue b/src/jmapNew/theme/fuzhou_01/planSchedule/menuBar.vue
deleted file mode 100644
index b58115ead..000000000
--- a/src/jmapNew/theme/fuzhou_01/planSchedule/menuBar.vue
+++ /dev/null
@@ -1,518 +0,0 @@
-<template>
-  <div id="PlanMenuBar">
-    <div class="nav">
-      <template v-for="(item,i) in menu">
-        <template v-if="noShowingChildren(item.children)">
-          <li :key="i" class="nav-li" @click="hookClick(item)">
-            <span class="nav-li-text">{{ item.title }}</span>
-          </li>
-        </template>
-        <template v-else>
-          <li :key="i" class="nav-li" @click.stop="popupMenuA(item, i)">
-            <span class="nav-li-text">{{ item.title }}</span>
-            <ul class="nav-ul" :class="{'active' :i==classA}">
-              <template v-for="(child,j) in item.children">
-                <template
-                  v-if="child.children&&child.children.length>0&&hasShowingChildren(child.children)"
-                >
-                  <li v-if="child.type === 'separator'" :key="j" class="menu-separator">
-                    <span class="status">&ensp;</span>
-                    <span class="separator">&ensp;</span>
-                  </li>
-                  <li v-else-if="child.type === 'file'" :key="j" class="menu-li">
-                    <div class="menu-li-block">
-                      <span class="menu-li-text">
-                        <span class="status">&ensp;</span>
-                        <el-button type="text" class="button" :disabled="child.disabled">
-                          <input
-                            :ref="child.label"
-                            type="file"
-                            accept=".csv, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel"
-                            @change="openLoadFile(child)"
-                          >
-                          {{ child.title }}
-                        </el-button>
-                      </span>
-                    </div>
-                  </li>
-                  <li v-else :key="j" class="menu-li" @click.stop="popupMenuB(child, j)">
-                    <div class="menu-li-block">
-                      <span class="menu-li-text">
-                        <span class="status">&ensp;</span>
-                        <span class="label">{{ child.title }}</span>
-                      </span>
-                    </div>
-                    <ul class="menu-ul" :class="{'active' :j==classB}">
-                      <template v-for="(grandchild,k) in child.children">
-                        <li v-if="grandchild.type === 'separator'" :key="k" class="menu-separator">
-                          <span class="status">&ensp;</span>
-                          <span class="separator">&ensp;</span>
-                        </li>
-                        <li v-else-if="grandchild.type === 'file'" :key="k" class="menu-li">
-                          <div class="menu-li-block">
-                            <span class="menu-li-text">
-                              <span class="status">&ensp;</span>
-                              <el-button
-                                type="text"
-                                class="button"
-                                :disabled="grandchild.disabled"
-                              >
-                                <input
-                                  :ref="grandchild.label"
-                                  type="file"
-                                  accept=".csv, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel"
-                                  @change="openLoadFile(grandchild)"
-                                >
-                                {{ grandchild.title }}
-                              </el-button>
-                            </span>
-                          </div>
-                        </li>
-                        <li v-else :key="k" class="menu-li" @click.stop="hookClick(grandchild)">
-                          <div class="menu-li-block">
-                            <span class="menu-li-text">
-                              <span class="status">&ensp;</span>
-                              <span class="label">{{ grandchild.title }}</span>
-                            </span>
-                          </div>
-                        </li>
-                      </template>
-                    </ul>
-                  </li>
-                </template>
-                <template v-else>
-                  <li v-if="child.type === 'separator'" :key="j" class="menu-separator">
-                    <span class="status">&ensp;</span>
-                    <span class="separator">&ensp;</span>
-                  </li>
-                  <li v-else-if="child.type === 'file'" :key="j" class="menu-li">
-                    <div class="menu-li-block">
-                      <span class="menu-li-text">
-                        <span class="status">&ensp;</span>
-                        <el-button type="text" class="button" :disabled="child.disabled">
-                          <input
-                            :ref="child.title"
-                            type="file"
-                            accept=".csv, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel"
-                            @change="openLoadFile(child)"
-                          >
-                          {{ child.title }}
-                        </el-button>
-                      </span>
-                    </div>
-                  </li>
-                  <li v-else :key="j" class="menu-li" @click.stop="hookClick(child)">
-                    <div class="menu-li-block">
-                      <span class="menu-li-text">
-                        <span class="status">&ensp;</span>
-                        <span class="label">{{ child.title }}</span>
-                      </span>
-                    </div>
-                  </li>
-                </template>
-              </template>
-            </ul>
-          </li>
-        </template>
-      </template>
-    </div>
-  </div>
-</template>
-<script>
-import { mapGetters } from 'vuex';
-import { EventBus } from '@/scripts/event-bus';
-
-export default {
-    name: 'PlanMenuBar',
-    props: {
-        lineCode: {
-            type: String,
-            required: true
-        }
-    },
-    data() {
-        return {
-            classA: -1,
-            classB: -1,
-            tempClassA: -1,
-            tempClassB: -1,
-            menu: [
-                {
-                    title: this.$t('menu.file'),
-                    children: [
-                    ]
-                },
-                {
-                    title: this.$t('menu.view'),
-                    children: [
-                        // {
-                        //     title: '缩放',
-                        // },
-                        // {
-                        //     title: '单色显示历史计划',
-                        // },
-                        // {
-                        //     title: '彩色显示历史计划'
-                        // }
-                    ]
-                },
-                {
-                    title: this.$t('menu.edit'),
-                    children: [
-                        // {
-                        //     title: '修改',
-                        //     click: this.handleEditPlanningTrain
-                        // },
-                        // {
-                        //     title: '加任务',
-                        //     click: this.handleAddTask
-                        // },
-                        // {
-                        //     title: '删任务',
-                        //     click: this.handleDeleteTask
-                        // },
-                        // {
-                        //     title: '改表号',
-                        //     click: this.handleModifyingPlanId
-                        // },
-                        // {
-                        //     title: '平移多辆车',
-                        //     click: this.handleTranslationalMulTrain
-                        // }
-                    ]
-                },
-                {
-                    title: this.$t('menu.tool'),
-                    children: [
-                        {
-                            title: this.$t('menu.viewPlanList'),
-                            click: this.handleViewPlanSchedule,
-                            width: 150
-                        },
-                        {
-                            title: this.$t('menu.createAWeekPlan'),
-                            click: this.handleCreateWeekPlan,
-                            width: 150
-                        },
-                        {
-                            title: this.$t('menu.loadTheDayPlan'),
-                            click: this.handleReloadTodayPlan,
-                            width: 150
-                        }
-                        // {
-                        //     title: '有效性检查',
-                        //     click: this.handleValidityCheck
-                        // }
-                    ]
-                },
-                {
-                    title: this.$t('menu.help'),
-                    children: [
-                    ]
-                }
-            ]
-        };
-    },
-    computed: {
-        ...mapGetters('training', [
-            'mode'
-        ]),
-        ...mapGetters('map', [
-            'stationList'
-        ])
-    },
-    watch: {
-        tempClassA() {
-            this.classA = this.$store.state.menuOperation.break ? -1 : this.tempClassA;
-        },
-        tempClassB() {
-            this.classB = this.$store.state.menuOperation.break ? -1 : this.tempClassB;
-        },
-        '$store.state.menuOperation.break': function (val) {
-            if (val) {
-                this.classA = this.classB = -1;
-            } else {
-                this.classA = this.tempClassA;
-                this.classB = this.tempClassB;
-            }
-        }
-    },
-    mounted() {
-        this.initMenu();
-    },
-    methods: {
-        initMenu() {
-            this.clickEvent();
-            this.closeMenu();
-        },
-        clickEvent() {
-            const self = this;
-            window.onclick = function (e) {
-                self.closeMenu(false);
-            };
-        },
-        noShowingChildren(children) {
-            if (!children || children.length <= 0) {
-                return true;
-            }
-            return false;
-        },
-        hasShowingChildren(children) {
-            if (children && children.length > 0) {
-                return true;
-            }
-            return false;
-        },
-        closeMenu() {
-            this.classA = this.tempClassA = -1;
-            this.classB = this.tempClassB = -1;
-        },
-        hookClick(item, event) {
-            this.closeMenu();
-            // launchFullscreen();
-            setTimeout(() => {
-                if (item && typeof item.click == 'function') {
-                    item.click();
-                }
-            }, 500);
-        },
-        popupMenuA(item, index) {
-            this.clickEvent();
-            this.tempClassA = index;
-            this.tempClassB = -1;
-        },
-        popupMenuB(item, index) {
-            this.tempClassB = index;
-        },
-        openLoadFile(item) {
-            const obj = this.$refs[item.title][0];
-            if (obj.files) {
-                const file = obj.files[0];
-                item.click(file);
-                obj.value = '';
-            }
-        },
-        doClose() {
-            this.$nextTick(() => {
-                EventBus.$emit('closeMenu');
-            });
-        },
-        // 刷新
-        refresh() {
-            this.closeMenu(true);
-            EventBus.$emit('refresh');
-        },
-        undeveloped() {
-            this.doClose();
-            this.$alert(this.$t('menu.achieving'), this.$t('tip.hint'), {
-                confirmButtonText: this.$t('tip.confirm'),
-                callback: action => {
-                }
-            });
-        },
-        // 修改计划
-        handleEditPlanningTrain() {
-            this.$emit('dispatchDialog', { name: 'modifyingPlan' });
-        },
-        // 添加任务
-        handleAddTask() {
-            const params = this.$store.state.runPlan.selected;
-            this.$emit('dispatchDialog', { name: 'addTask', params });
-        },
-        // 删除任务
-        handleDeleteTask() {
-            const params = this.$store.state.runPlan.selected;
-            this.$emit('dispatchDialog', { name: 'deleteTask', params });
-        },
-        // 修改任务
-        handleModifyingTask() {
-            const params = this.$store.state.runPlan.selected;
-            this.$emit('dispatchDialog', { name: 'modifyingTask', params });
-        },
-        // 改表号
-        handleModifyingPlanId() {
-            this.$emit('dispatchDialog', { name: 'modifyingPlanId' });
-        },
-        // 平移多辆车
-        handleTranslationalMulTrain() {
-            this.$emit('dispatchDialog', { name: 'translationalMulTrain' });
-        },
-        // 查看计划列表
-        handleViewPlanSchedule() {
-            this.$emit('dispatchDialog', { name: 'managePlanList' });
-        },
-        // 创建一周计划
-        handleCreateWeekPlan() {
-            this.$emit('dispatchDialog', { name: 'createWeekPlan' });
-        },
-        // 创建当天计划
-        handleReloadTodayPlan() {
-            this.$emit('dispatchDialog', { name: 'createTodayPlan' });
-        },
-        // 有效性检查
-        handleValidityCheck() {
-        }
-    }
-};
-</script>
-
-<style scoped rel="stylesheet/scss" lang="scss">
-    @import "src/styles/mixin.scss";
-    $top: 25px;
-    $width: 30px;
-    $height: 20px;
-    $menuPadding: 10px;
-    $menuItemHeight: 30px;
-    $menuItemWidth: 170px;
-    $menuItemPadding: 5px;
-
-    #PlanMenuBar {
-        z-index: 10;
-        position: absolute;
-        top: $top;
-        width: 100%;
-        height: $height;
-        line-height: $height;
-    }
-
-    .nav {
-        display: block;
-        cursor: pointer;
-        color: #0000;
-        background: #EBEADB;
-        list-style: none;
-        border: 1px solid #B6BCCC !important;
-    }
-
-    .nav-li {
-        position: relative;
-        display: inline-block;
-        padding-left: $menuPadding;
-        padding-right: $menuPadding;
-    }
-
-    .nav-li:active {
-        background: #C9D0E1;
-        border-radius: 4px;
-    }
-
-    .nav-li-text {
-        font-size: 13px;
-        color: #000;
-        text-align: center;
-        text-decoration: none;
-    }
-
-    .nav-ul {
-        display: none;
-        position: absolute;
-        list-style: none;
-        border: 1px solid gray;
-        width: $menuItemWidth;
-        padding: 0px;
-        margin: 0px;
-    }
-
-    .menu-ul {
-        display: none;
-        list-style: none;
-        background: #F0F0F0;
-        line-height: $menuItemHeight;
-        width: $menuItemWidth;
-        bottom: $menuItemHeight;
-    }
-
-    .active {
-        position: absolute;
-        display: block !important;
-    }
-
-    .menu-ul-text {
-        font-size: 14px;
-        color: #000;
-        letter-spacing: 0;
-        height: $menuItemHeight;
-        line-height: $menuItemHeight;
-        border-left: 1px solid #000;
-        border-right: 1px solid #000;
-    }
-
-    .menu-separator {
-        text-align: left;
-        background: #F0F0F0;
-        height: 2px;
-        line-height: 2px;
-    }
-
-    .menu-separator .status {
-        display: inline-block;
-        border-right: 1px inset #CACACA;
-        width: $width;
-        height: 100%;
-        background: #EFECDE;
-    }
-
-    .menu-separator .separator {
-        display: inline-block;
-        background: #CACACA;
-        margin-left: 5px;
-        height: 2px;
-        width: $menuItemWidth - $width - 30px;
-    }
-
-    .menu-li {
-        text-align: left;
-        background: #F0F0F0;
-        height: $menuItemHeight;
-        line-height: $menuItemHeight;
-    }
-
-    .menu-li-block {
-        letter-spacing: 0;
-        height: $menuItemHeight;
-        line-height: $menuItemHeight;
-    }
-
-    .menu-li-text {
-        font-size: 14px;
-        color: #000;
-    }
-
-    .menu-li-text .status {
-        display: inline-block;
-        border-right: 1px inset #CACACA;
-        width: $width;
-        background: #EFECDE;
-    }
-
-    .menu-li-text .label {
-        display: inline-block;
-        margin-left: 5px;
-    }
-
-    .menu-li-text .button {
-        position: relative;
-        overflow: hidden;
-        margin-left: 10px;
-        line-height: 0px;
-        width: $menuItemWidth - $width;
-        top: -$menuItemHeight;
-        color: #000;
-        cursor: pointer;
-
-        input {
-            opacity: 0;
-            cursor: pointer;
-            position: absolute;
-            top: 0px;
-            width: $menuItemWidth - $width - 10px;
-        }
-    }
-
-    .menu-li-block:hover {
-        background: #C9DEF7;
-        box-sizing: border-box;
-        -moz-box-sizing: border-box;
-        -webkit-box-sizing: border-box;
-    }
-</style>
diff --git a/src/jmapNew/theme/fuzhou_01/planSchedule/schedule.vue b/src/jmapNew/theme/fuzhou_01/planSchedule/schedule.vue
deleted file mode 100644
index d157b4e01..000000000
--- a/src/jmapNew/theme/fuzhou_01/planSchedule/schedule.vue
+++ /dev/null
@@ -1,482 +0,0 @@
-<template>
-  <div id="PlanSchedule" :style="{top: top+'px', height: height+'px'}">
-    <div class="left">
-      <div :id="runPlanId" />
-    </div>
-    <div class="right">
-      <data-table
-        ref="serviceTable"
-        :height="height/2"
-        :config="serviceNumberConfig"
-        :style="{top: top-height/2+'px'}"
-        @touch="scheduleTouch"
-      />
-      <data-table
-        ref="tripTable"
-        :height="height/2"
-        :config="tripNumberConfig"
-        :style="{top: top-height/2+'px'}"
-        @touch="trainNumTouch"
-      />
-    </div>
-  </div>
-</template>
-
-<script>
-import { mapGetters } from 'vuex';
-import { timeFormat } from '@/utils/date';
-import { runDiagramGetTime } from '@/api/simulation';
-import DataTable from '../menusPlan/components/dataTable';
-import echarts from 'echarts';
-
-export default {
-    name: 'PlanSchedule',
-    components: {
-        DataTable
-    },
-    props: {
-        group: {
-            type: String,
-            required: true
-        },
-        lineCode: {
-            type: String,
-            required: true
-        },
-        maxWidth: {
-            type: Number,
-            required: true
-        },
-        maxHeight: {
-            type: Number,
-            required: true
-        }
-    },
-    data() {
-        return {
-            top: 0,
-            height: 0,
-            heights: [100, 100],
-            runPlanId: 'plan-schedule-id',
-            myChart: null,
-            PlanConvert: {},
-            serviceNumberConfig: {
-                data: [],
-                highlightCurrentRow: true,
-                handleChange: this.serviceNumberChange,
-                showClose: false,
-                columns: [
-                    {
-                        prop: 'serviceNumber',
-                        label: this.$t('menu.serviceNumber')
-                    },
-                    {
-                        width: 40
-                    }
-                ]
-            },
-            tripNumberConfig: {
-                data: [],
-                highlightCurrentRow: true,
-                handleChange: this.tripNumberChange,
-                showClose: false,
-                columns: [
-                    {
-                        prop: 'tripNumber',
-                        label: this.$t('menu.tripNumber')
-                    },
-                    {
-                        width: 40
-                    }
-                ]
-            },
-            realData: {},
-            kmRangeCoordMap: {},
-            option: {
-                title: {
-                    text: '',
-                    left: 'center'
-                },
-                grid: {
-                    top: '30px',
-                    left: '120px',
-                    right: '40px',
-                    bottom: '65px',
-                    containLabel: true,
-                    backgroundColor: 'floralwhite'
-                },
-                toolbox: {
-                    // right: '30px',
-                    // feature: {
-                    //     dataZoom: {
-                    //         yAxisIndex: 'none'
-                    //     },
-                    //     restore: {},
-                    //     saveAsImage: {}
-                    // }
-                },
-                tooltip: {
-                    axisPointer: {
-                        trigger: 'item',
-                        type: 'cross'
-                    },
-                    formatter: this.axisTooltip,
-                    borderWidth: 1
-                },
-                xAxis: [
-                    {
-                        type: 'category',
-                        boundaryGap: false,
-                        data: [],
-                        axisLine: {
-                            onZero: false,
-                            lineStyle: {
-                                width: 2,
-                                color: '#d14a61'
-                            }
-                        },
-                        axisLabel: {
-                            formatter: this.xAxisLableFormat,
-                            textStyle: {
-                                color: '#333'
-                            }
-                        },
-                        axisPointer: {
-                            snap: true,
-                            label: {
-                                formatter: this.xAxisPointFormat,
-                                backgroundColor: 'rgb(255,0,0,0.5)',
-                                color: 'white'
-                            }
-                        }
-                    }
-                ],
-                yAxis: {
-                    type: 'value',
-                    splitLine: {
-                        show: false
-                    },
-                    axisTick: {
-                        show: false
-                    },
-                    axisLine: {
-                        onZero: false,
-                        lineStyle: {
-                            width: 2,
-                            color: '#d14a61'
-                        }
-                    },
-                    axisLabel: {
-                        interval: 'auto',
-                        formatter: this.yAxisLableFormat
-                    },
-                    axisPointer: {
-                        xAxisIndex: 'all',
-                        label: {
-                            formatter: this.yAxisPointFormat,
-                            backgroundColor: 'rgb(0,100,0,0.5)',
-                            color: 'white'
-                        }
-                    },
-                    min: 0,
-                    max: 0
-                },
-                series: [],
-                dataZoom: [
-                    {
-                        type: 'inside'
-                    },
-                    {
-                        fiterMode: 'filter',
-                        handleIcon: 'M10.7,11.9v-1.3H9.3v1.3c-4.9,0.3-8.8,4.4-8.8,9.4c0,5,3.9,9.1,8.8,9.4v1.3h1.3v-1.3c4.9-0.3,8.8-4.4,8.8-9.4C19.5,16.3,15.6,12.2,10.7,11.9z M13.3,24.4H6.7V23h6.6V24.4z M13.3,19.6H6.7v-1.4h6.6V19.6z',
-                        handleSize: '80%',
-                        handleStyle: {
-                            color: '#fff',
-                            shadowBlur: 3,
-                            shadowColor: 'rgba(0, 0, 0, 0.6)',
-                            shadowOffsetX: 2,
-                            shadowOffsetY: 2
-                        },
-                        bottom: '20px'
-                    }
-                ]
-            },
-            absoluteTime: 2 * 3600,
-            indexKmRangeMap: {}
-        };
-    },
-    computed: {
-        ...mapGetters('runPlan', [
-            'stations'
-        ])
-    },
-    watch: {
-        maxWidth() {
-            this.setPosition();
-        },
-        maxHeight() {
-            this.setPosition();
-        },
-        '$store.state.runPlan.planLoadedCount': async function () {
-            await this.loadChartPage();
-        },
-        '$store.state.runPlan.planSizeCount': function () {
-            this.reSize({ width: this.$store.state.runPlan.width, height: this.$store.state.runPlan.height });
-        },
-        '$store.state.runPlan.selected.serviceNumber': function (val) {
-            const index = this.serviceNumberConfig.data.findIndex(elem => {
-                return elem.serviceNumber == val;
-            });
-
-            this.$refs.serviceTable.setCurrentRow(this.serviceNumberConfig.data[index]);
-        },
-        '$store.state.runPlan.selected.tripNumber': function (val) {
-            const index = this.tripNumberConfig.data.findIndex(elem => {
-                return elem.tripNumber == val;
-            });
-            this.$refs.tripTable.setCurrentRow(this.tripNumberConfig.data[index]);
-        }
-    },
-    mounted() {
-        this.PlanConvert = this.$theme.loadPlanConvert(this.lineCode);
-    },
-    beforeDestroy() {
-        this.destroy();
-    },
-    methods: {
-        serviceNumberChange(row) {
-            if (row) {
-                this.$store.dispatch('runPlan/setSelected', { serviceNumber: row.serviceNumber, tripNumber: null });
-                const serviceObj = this.$store.state.runPlan.editData[row.serviceNumber];
-                if (serviceObj) {
-                    this.analyticalTripNumber(serviceObj.trainMap);
-                }
-            }
-        },
-        tripNumberChange(row) {
-            if (row) {
-                this.$store.dispatch('runPlan/setSelected', { serviceNumber: this.$store.state.runPlan.selected.serviceNumber, tripNumber: row.tripNumber });
-            }
-        },
-        async analyticalServiceNumber(data) {
-            this.serviceNumberConfig.data = Object.keys(data || {})
-                .sort((a, b) => { return data[a].oldIndex - data[b].oldIndex; })
-                .map(serviceNumber => { return { serviceNumber }; });
-        },
-        async analyticalTripNumber(data) {
-            this.tripNumberConfig.data = Object.keys(data || {})
-                .sort((a, b) => { return data[a].oldIndex - data[b].oldIndex; })
-                .map(tripNumber => { return { tripNumber }; });
-        },
-        async setPosition() {
-            this.$nextTick(() => {
-                let top = 3;
-                const width = this.maxWidth * 0.85;
-                let height = this.maxHeight;
-
-                const titleBar = document.getElementById('PlanTitleBar');
-                const menuBar = document.getElementById('PlanMenuBar');
-                const menuTool = document.getElementById('PlanMenuTool');
-                const statusBar = document.getElementById('PlanStatusBar');
-
-                if (titleBar) {
-                    top += (titleBar.offsetHeight || 0);
-                }
-
-                if (menuBar) {
-                    top += (menuBar.offsetHeight || 0);
-                }
-
-                if (menuTool) {
-                    top += (menuTool.offsetHeight || 0);
-                }
-
-                if (statusBar) {
-                    height -= (statusBar.offsetHeight || 0);
-                }
-
-                height = height - top;
-                this.$store.dispatch('runPlan/resize', { width, height });
-
-                if (this.top != top) {
-                    this.top = top;
-                }
-
-                if (this.height != height) {
-                    this.height = height - 20 * 2;
-                }
-            });
-        },
-        async loadChartPage() {
-            try {
-                let series = [];
-                const planData = this.$store.state.runPlan.planData || [];
-                const stations = this.$store.state.runPlan.stations || [];
-
-                this.viewDisabled = true;
-                this.kmRangeCoordMap = this.PlanConvert.convertStationsToMap(stations);
-                series = this.pushModels(series, [this.PlanConvert.initializeYaxis(stations)]);
-                series = this.pushModels(series, this.PlanConvert.convertDataToModels(planData, stations, this.kmRangeCoordMap, { width: 0.5 }));
-                await this.loadInitData(series);
-                await this.analyticalServiceNumber(this.$store.state.runPlan.editData);
-                this.viewDisabled = false;
-
-            } catch (error) {
-                this.viewDisabled = false;
-                this.$messageBox(this.$t('error.loadingOperationGraphFailed'));
-            }
-        },
-        async loadInitData(series) {
-            this.myChart && this.myChart.showLoading();
-            await this.xAxisInit();
-            await this.yAxisInit();
-            await this.loadInitChart(series);
-            this.myChart && this.myChart.hideLoading();
-        },
-        pushModels(series, models) {
-            if (models && models.length) {
-                models.forEach(elem => {
-                    if (elem) {
-                        series.push(elem);
-                    }
-                });
-            }
-
-            return series;
-        },
-        popModels(series, models) {
-            if (models && models.length) {
-                models.forEach(elem => {
-                    const index = series.indexOf(elem);
-                    if (index >= 0) {
-                        series.split(index, 1);
-                    }
-                });
-            }
-
-            return series;
-        },
-        loadInitChart(series) {
-            return new Promise((resolve, reject) => {
-                try {
-                    this.destroy();
-
-                    let startValue = 3600 + this.PlanConvert.TranslationTime;
-                    const offsetTime = 3600;
-
-                    runDiagramGetTime(this.group).then(resp => {
-                        startValue = resp.data - this.PlanConvert.TranslationTime;
-                        this.option.dataZoom[0].startValue = this.option.dataZoom[1].startValue = startValue - offsetTime;
-                        this.option.dataZoom[0].endValue = this.option.dataZoom[1].endValue = startValue + offsetTime;
-                        this.option.series = series;
-                        this.myChart = echarts.init(document.getElementById(this.runPlanId));
-                        if (this.myChart) {
-                            this.myChart.setOption(this.option);
-                            this.reSize({ width: this.$store.state.runPlan.width, height: this.$store.state.runPlan.height });
-                            this.myChart.on('click', this.mouseClick);
-                        }
-                    });
-                    resolve(true);
-                } catch (error) {
-                    reject(error);
-                }
-            });
-        },
-        xAxisPointFormat(params) {
-            return timeFormat(params.value);
-        },
-        yAxisPointFormat(params) {
-            return this.PlanConvert.computedFormatYAxis(this.stations, params);
-        },
-        xAxisLableFormat(value, index) {
-            if (value % 60 === 0) {
-                return timeFormat(value);
-            }
-        },
-        yAxisLableFormat(value, index) {
-            return '';
-        },
-        xAxisInit() {
-            const list = [];
-            for (var time = 0 + this.PlanConvert.TranslationTime; time < 3600 * 24 + this.PlanConvert.TranslationTime; time++) {
-                list.push(time);
-            }
-
-            const startValue = 3600 * 6;
-            const offsetTime = 3600 * 1;
-
-            this.option.xAxis[0].data = list;
-            if (!this.option.dataZoom[0].startValue) {
-                this.option.dataZoom[0].startValue = this.option.dataZoom[1].startValue = startValue - offsetTime;
-            }
-
-            if (!this.option.dataZoom[0].endValue) {
-                this.option.dataZoom[0].endValue = this.option.dataZoom[1].endValue = startValue + offsetTime;
-            }
-        },
-        yAxisInit() {
-            if (Object.keys(this.PlanConvert).length) {
-                this.option.yAxis.min = this.PlanConvert.computedYaxisMinValue(this.stations);
-                this.option.yAxis.max = this.PlanConvert.computedYaxisMaxValue(this.stations);
-            }
-        },
-        axisTooltip(param) {
-            const station = this.stations[Math.floor((param.data[1] - this.PlanConvert.EdgeHeight) / this.PlanConvert.CoordMultiple)] || { name: '', kmRange: '' };
-            return [
-                `Point Data <hr size=1 style=" margin: 3px 0">`,
-                `${this.$t('menu.stationName') + station.name}<br>`,
-                `${this.$t('menu.stationKilometerMark') + station.kmRange} km <br>`,
-                `${this.$t('menu.arrivalTime2') + timeFormat(param.data[0] + this.PlanConvert.TranslationTime)} (${param.data[0]})<br>`
-            ].join('');
-        },
-        mouseClick(params) {
-            const model = {
-                serviceNumber: params.seriesName
-            };
-            this.$store.dispatch('runPlan/setSelected', model);
-        },
-        reSize(opt) {
-            if (this.myChart) {
-                this.myChart.resize({
-                    width: opt.width,
-                    height: opt.height,
-                    silent: false
-                });
-            }
-        },
-        destroy() {
-            if (this.myChart && this.myChart.isDisposed) {
-                this.myChart.dispose();
-                this.myChart = null;
-            }
-        },
-        scheduleTouch() {
-
-        },
-        trainNumTouch() {
-
-        }
-    }
-};
-</script>
-<style scoped rel="stylesheet/scss" lang="scss">
-    @import "src/styles/mixin.scss";
-
-    #PlanSchedule {
-        z-index: 5;
-        position: absolute;
-        width: 100%;
-
-        .left {
-            height: 100%;
-            width: 85%;
-            float: left;
-        }
-
-        .right {
-            height: 100%;
-            width: 15%;
-            float: right;
-        }
-    }
-</style>
diff --git a/src/jmapNew/theme/fuzhou_01/planSchedule/statusBar.vue b/src/jmapNew/theme/fuzhou_01/planSchedule/statusBar.vue
deleted file mode 100644
index d21265950..000000000
--- a/src/jmapNew/theme/fuzhou_01/planSchedule/statusBar.vue
+++ /dev/null
@@ -1,107 +0,0 @@
-<template>
-  <data-table
-    id="PlanStatusBar"
-    ref="dataTable"
-    :height="height-11"
-    :config="stationListConfig"
-    :close="false"
-    :style="{top: maxmini? maxTop-110+'px':maxTop-21+'px'}"
-    @touch="touch"
-  />
-</template>
-
-<script>
-import DataTable from '../menusPlan/components/dataTable';
-import { formatTime, formatName } from '@/utils/runPlan';
-
-export default {
-    name: 'PlanStatusBar',
-    components: {
-        DataTable
-    },
-    props: {
-        maxTop: {
-            type: Number,
-            required: true
-        }
-    },
-    data() {
-        return {
-            maxmini: true,
-            height: 100,
-            stationListConfig: {
-                data: [],
-                showClose: true,
-                highlightCurrentRow: true,
-                columns: [
-                    {
-                        prop: 'stationName',
-                        label: this.$t('menu.platform'),
-                        width: 400
-                    },
-                    {
-                        prop: 'startTime',
-                        label: this.$t('menu.arrivalTime')
-                    },
-                    {
-                        prop: 'stopTime',
-                        label: this.$t('menu.stopTime')
-                    },
-                    {
-                        prop: 'endTime',
-                        label: this.$t('menu.departureTime')
-                    },
-                    {
-                        prop: 'level',
-                        label: this.$t('menu.runLevel')
-
-                    }
-                ]
-            }
-        };
-    },
-    watch: {
-        '$store.state.runPlan.selected': function (select) {
-            this.stationListConfig.data = [];
-            const serviceObj = this.$store.state.runPlan.editData[select.serviceNumber];
-            if (serviceObj) {
-                const trainMap = serviceObj.trainMap;
-                if (trainMap) {
-                    const trainObj = trainMap[select.tripNumber];
-                    if (trainObj) {
-                        const stationTimeList = trainObj.stationTimeList;
-                        if (stationTimeList && stationTimeList.length) {
-                            stationTimeList.forEach((elem, index) => {
-                                const stationObj = {
-                                    stationName: formatName(elem.stationCode),
-                                    startTime: formatTime(index == 0 ? null : stationTimeList[index - 1].secondTime),
-                                    stopTime: formatTime(index == 0 ? null : elem.secondTime - stationTimeList[index - 1].secondTime),
-                                    endTime: formatTime(elem.secondTime),
-                                    level: ''
-                                };
-                                this.stationListConfig.data.push(stationObj);
-                            });
-                        }
-                    }
-                }
-            }
-        }
-    },
-    methods: {
-        touch(maxmini) {
-            this.maxmini = maxmini;
-            this.$emit('setPosition');
-        }
-    }
-};
-</script>
-
-<style scoped rel="stylesheet/scss" lang="scss">
-    @import "src/styles/mixin.scss";
-
-    #PlanStatusBar {
-        z-index: 5;
-        position: absolute;
-        width: 100%;
-    }
-</style>
diff --git a/src/jmapNew/theme/haerbin_01/menusPlan/addTask.vue b/src/jmapNew/theme/haerbin_01/menusPlan/addTask.vue
deleted file mode 100644
index b9e6c42e8..000000000
--- a/src/jmapNew/theme/haerbin_01/menusPlan/addTask.vue
+++ /dev/null
@@ -1,175 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="fuzhou-01__schedule add-task"
-    :title="title"
-    :visible.sync="dialogShow"
-    width="800px"
-    :before-close="doClose"
-    :z-index="2000"
-    :modal="false"
-    :close-on-click-modal="false"
-  >
-    <div style="margin: 10px">
-      <el-row>
-        <el-col :span="3">
-          <el-radio v-model="model.type" label="1">{{ $t('menu.addToTheFront') }}</el-radio>
-        </el-col>
-        <el-col :span="2" :offset="1">
-          <span>{{ $t('menu.tripNumber') + $t('global.colon') }}</span>
-        </el-col>
-        <el-col :span="5">
-          <el-select v-model="model.tripNumber" :placeholder="this.$t('global.choose')">
-            <el-option
-              v-for="item in tripNumberList"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            />
-          </el-select>
-        </el-col>
-        <el-col :span="3" :offset="1">
-          <span>{{ $t('global.startTime') + $t('global.colon') }}</span>
-        </el-col>
-        <el-col :span="5">
-          <el-select v-model="model.startTime" :placeholder="this.$t('global.choose')">
-            <el-option
-              v-for="item in tripNumberList"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            />
-          </el-select>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="3">
-          <el-radio v-model="model.type" label="2">{{ $t('menu.addToTheEnd') }}</el-radio>
-        </el-col>
-        <el-col :span="2" :offset="1">
-          <span>{{ $t('menu.tripNumber') + $t('global.colon') }}</span>
-        </el-col>
-        <el-col :span="5">
-          <el-select v-model="model.tripNumber" :placeholder="this.$t('global.choose')">
-            <el-option
-              v-for="item in tripNumberList"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            />
-          </el-select>
-        </el-col>
-        <el-col :span="3" :offset="1">
-          <span>{{ $t('global.startTime') + $t('global.colon') }}</span>
-        </el-col>
-        <el-col :span="5">
-          <el-select v-model="model.startTime" :placeholder="this.$t('global.choose')">
-            <el-option
-              v-for="item in tripNumberList"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            />
-          </el-select>
-        </el-col>
-
-      </el-row>
-      <el-row style="margin-bottom: 5px;">
-        {{ $t('menu.crossing') + $t('global.colon') }}
-      </el-row>
-      <el-row>
-        <el-table :data="model.route" border :height="180">
-          <el-table-column prop="date" :label="this.$t('menu.date')" width="180" />
-          <el-table-column prop="name" :label="this.$t('menu.name')" width="180" />
-          <el-table-column prop="address" :label="this.$t('menu.address')" />
-          <el-table-column width="20" />
-        </el-table>
-      </el-row>
-      <el-row style=" margin-bottom: 5px;margin-top: 10px;">
-        {{ $t('global.details') + $t('global.colon') }}
-      </el-row>
-      <el-row>
-        <el-table :data="model.detail" border :height="180">
-          <el-table-column prop="date" :label="this.$t('menu.date')" width="180" />
-          <el-table-column prop="name" :label="this.$t('menu.name')" width="180" />
-          <el-table-column prop="address" :label="this.$t('menu.address')" />
-          <el-table-column width="20" />
-        </el-table>
-      </el-row>
-      <el-row>
-        <el-col :offset="16">
-          <el-checkbox v-model="model.default">{{ $t('menu.displaysDefaultStopTimesAndRunLevels') }}</el-checkbox>
-        </el-col>
-      </el-row>
-    </div>
-    <el-row type="flex" justify="center" class="button-group">
-      <el-button @click="commit">{{ $t('global.confirm') }}</el-button>
-      <el-button @click="doClose">{{ $t('global.cancel') }}</el-button>
-    </el-row>
-  </el-dialog>
-</template>
-
-<script>
-
-export default {
-    name: 'AddTask',
-    components: {
-    },
-    data() {
-        return {
-            dialogShow: false,
-            loading: false,
-            model: {
-                type: '1',
-                serviceNumber: '',
-                tripNumber: '',
-                startTime: '',
-                default: false,
-                route: [],
-                detail: []
-            },
-            tripNumberList: []
-        };
-    },
-    computed: {
-        title() {
-            return this.$t('menu.addTask');
-        }
-    },
-    mounted() {
-    },
-    methods: {
-        doShow(params) {
-            this.model.serviceNumber = params.serviceNumber;
-            this.model.tripNumber = params.tripNumber;
-            this.dialogShow = true;
-        },
-        doClose() {
-            this.loading = false;
-            this.dialogShow = false;
-        },
-        commit() {
-            this.doClose();
-        }
-    }
-};
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-    @import "src/styles/mixin.scss";
-
-    /deep/ {
-        .el-button {
-            margin-left: 40px !important;
-            margin-right: 40px !important;
-        }
-
-        .el-row {
-            margin-bottom: 5px !important;
-        }
-
-        .el-input__inner {
-            height: 20px !important;
-            line-height: 20px !important;
-        }
-    }
-</style>
diff --git a/src/jmapNew/theme/haerbin_01/menusPlan/chooseTemplatePlan.vue b/src/jmapNew/theme/haerbin_01/menusPlan/chooseTemplatePlan.vue
deleted file mode 100644
index 78abc470e..000000000
--- a/src/jmapNew/theme/haerbin_01/menusPlan/chooseTemplatePlan.vue
+++ /dev/null
@@ -1,115 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    :title="title"
-    class="fuzhou-01__schedule choose-plan-template"
-    :visible.sync="dialogShow"
-    width="70%"
-    :before-close="doClose"
-    :modal="false"
-    :close-on-click-modal="false"
-  >
-    <QueryListPage ref="pageRules" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
-    <el-row type="flex" justify="center" class="button-group">
-      <el-button type="primary" :loading="loading" @click="handleConfirm">{{ $t('global.select') }}</el-button>
-      <el-button @click="dialogShow = false">{{ $t('global.cancel') }}</el-button>
-    </el-row>
-  </el-dialog>
-</template>
-
-<script>
-import { runPlanTemplateList } from '@/api/runplan';
-import { listPublishMap } from '@/api/jmap/map';
-
-export default {
-    name: 'ChooseTemplatePlan',
-    data() {
-        return {
-            dialogShow: false,
-            loading: false,
-            mapList: [],
-            pagerConfig: {
-                pageSize: 'pageSize',
-                pageIndex: 'pageNum'
-            },
-            queryForm: {
-                reset: true,
-                labelWidth: '120px',
-                queryObject: {
-                    name: {
-                        type: 'text',
-                        label: this.$t('menu.runGraphName')
-                    }
-                }
-            },
-            queryList: {
-                query: this.queryFunction,
-                selectCheckShow: false,
-                radioShow: true,
-                columns: [
-                    {
-                        title: this.$t('menu.runGraphName'),
-                        prop: 'name'
-                    },
-                    {
-                        title: this.$t('menu.mapName'),
-                        prop: 'mapId',
-                        type: 'tag',
-                        columnValue: (row) => {
-                            return this.$convertField(row.mapId, this.mapList, ['id', 'name']);
-                        },
-                        tagType: (row) => { return 'success'; }
-                    }
-                ]
-            },
-
-            currentModel: {}
-        };
-    },
-    computed: {
-        title() {
-            return this.$t('menu.selectTemplateRunGraph');
-        }
-    },
-    methods: {
-        loadInitData() {
-            this.mapList = [];
-            listPublishMap().then(response => {
-                this.mapList = response.data;
-            });
-        },
-        doShow() {
-            this.loading = false;
-            this.dialogShow = true;
-            this.loadInitData();
-        },
-        doClose() {
-            this.dialogShow = false;
-        },
-        queryFunction(params) {
-            if (this.$store.state.map && this.$store.state.map.map) {
-                // params['lineCode'] = this.$store.getters['map/lineCode'];
-                params['mapId'] = this.$route.query.mapId;
-            }
-            return runPlanTemplateList(params);
-        },
-        handleConfirm() {
-            if (this.$refs && this.$refs.pageRules) {
-                const choose = this.$refs.pageRules.currentChoose();
-                if (choose) {
-                    this.$emit('chooseConfirm', choose);
-                    this.doClose();
-                } else {
-                    this.$messageBox(this.$t('menu.pleaseSelectTemplateRunGraph'));
-                }
-            }
-        },
-        reloadTable() {
-            this.queryList.reload();
-        }
-    }
-};
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-    @import "src/styles/mixin.scss";
-</style>
diff --git a/src/jmapNew/theme/haerbin_01/menusPlan/components/dataTable.vue b/src/jmapNew/theme/haerbin_01/menusPlan/components/dataTable.vue
deleted file mode 100644
index cfaac866d..000000000
--- a/src/jmapNew/theme/haerbin_01/menusPlan/components/dataTable.vue
+++ /dev/null
@@ -1,206 +0,0 @@
-<template>
-  <div v-if="show">
-    <template v-if="maxmini">
-      <div class="nav">
-        <div v-show="config.showClose" class="cls-status" @click="touch('Close')"><span /></div>
-        <div class="min-status" @click="touch('Minim')"><span /></div>
-      </div>
-      <el-table
-        ref="table"
-        :data="config.data"
-        :highlight-current-row="config.highlightCurrentRow"
-        :height="height"
-        border
-        @current-change="handleChange"
-      >
-        <template v-for="(item,index) in config.columns">
-          <el-table-column :key="index" :prop="item.prop" :label="item.label" :width="item.width" />
-        </template>
-      </el-table>
-    </template>
-    <template v-else>
-      <div class="nav">
-        <div class=" max-status" @click="touch('Maxim')"><span /></div>
-      </div>
-    </template>
-  </div>
-</template>
-
-<script>
-export default {
-    name: 'DataTable',
-    props: {
-        height: {
-            type: Number,
-            required: true
-        },
-        config: {
-            type: Object,
-            required: true
-        }
-    },
-    data() {
-        return {
-            show: true,
-            maxmini: true,
-            touchStrategy: {
-                'Close': [false, true],
-                'Minim': [true, false],
-                'Maxim': [true, true]
-            }
-        };
-    },
-    methods: {
-        handleChange(row) {
-            if (this.config.handleChange) {
-                this.config.handleChange(row);
-            }
-        },
-        setCurrentRow(row) {
-            this.$refs.table.setCurrentRow(row);
-        },
-        touch(operate) {
-            this.$nextTick(() => {
-                [this.show, this.maxmini] = this.touchStrategy[operate];
-                this.$emit('touch', this.maxmini);
-            });
-        }
-    }
-};
-</script>
-
-<style scoped rel="stylesheet/scss" lang="scss">
-    @import "src/styles/mixin.scss";
-    $height: 20px;
-    $width: 20px;
-
-    .nav {
-        display: table;
-        float: right;
-        width: 100%;
-        color: #0000;
-        background: -webkit-linear-gradient(#FDFDFE, #B1CBF3);
-        background: -o-linear-gradient(#FDFDFE, #B1CBF3);
-        background: -moz-linear-gradient(#FDFDFE, #B1CBF3);
-        background: linear-gradient(#FDFDFE, #B1CBF3);
-        border: 1px solid #B6BCCC !important;
-        border-bottom: 2px solid #B6BCCC !important;
-        list-style: none;
-        height: $height;
-        line-height: $height;
-    }
-
-    /deep/ {
-        .el-table--border th.gutter {
-            background: #EBEADB !important;
-        }
-
-        .el-table {
-            overflow-y: hidden;
-            width: 100%;
-
-            th.is-leaf {
-                padding: 0px 0;
-                background: #EBEADB;
-                border-right: none !important;
-                border-left: 1px solid #D1CDBD !important;
-                border-top: 1px solid #D1CDBD !important;
-                border-bottom: 1px inset #D1CDBD !important;
-                color: #000;
-
-                .cell {
-                    height: $height;
-                    line-height: $height;
-                }
-            }
-
-            td {
-                padding: 0px 0;
-
-                .cell {
-                    height: $height;
-                    line-height: $height;
-                    font-size: smaller !important;
-                }
-
-            }
-
-            .current-row>td {
-                background: #316AC5 !important;
-                color: #fff !important;
-            }
-        }
-
-        .cls-status {
-            float: right;
-            width: 12px;
-            height: 100%;
-            line-height: 100%;
-            margin-left: 5px;
-            cursor: pointer;
-
-            span {
-                display: inline-block;
-                content: '/';
-                background: black;
-                width: 2px;
-                height: 12px;
-                vertical-align: middle;
-               transform: rotate(45deg);
-            }
-
-            span::after {
-                display: block;
-                content: '/';
-                background: black;
-                width: 2px;
-                height: 12px;
-               transform: rotate(-90deg);
-            }
-        }
-
-        .min-status {
-            float: right;
-            width: 20px;
-            height: 100%;
-            line-height: 100%;
-            cursor: pointer;
-
-            span {
-                display: inline-block;
-                content: '-';
-                background: black;
-                width: 2px;
-                height: 12px;
-                vertical-align: middle;
-               transform: rotate(-90deg);
-            }
-        }
-
-        .max-status {
-            float: right;
-            width: 20px;
-            height: 100%;
-            line-height: 100%;
-            cursor: pointer;
-
-            span {
-                display: inline-block;
-                content: '';
-                background: black;
-                width: 2px;
-                height: 12px;
-                transform: rotate(0deg);
-            }
-
-            span::after {
-                display: block;
-                content: '';
-                background: black;
-                width: 2px;
-                height: 12px;
-               transform: rotate(90deg);
-            }
-        }
-    }
-</style>
diff --git a/src/jmapNew/theme/haerbin_01/menusPlan/createTodayPlan.vue b/src/jmapNew/theme/haerbin_01/menusPlan/createTodayPlan.vue
deleted file mode 100644
index e1616fa86..000000000
--- a/src/jmapNew/theme/haerbin_01/menusPlan/createTodayPlan.vue
+++ /dev/null
@@ -1,135 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    :title="title"
-    class="fuzhou-01__schedule reload-today-plan"
-    :visible.sync="dialogShow"
-    width="80%"
-    :before-close="doClose"
-    :modal="false"
-    :close-on-click-modal="false"
-  >
-    <QueryListPage ref="pageRules" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
-    <el-row type="flex" justify="center" class="button-group">
-      <el-button type="primary" :loading="loading" @click="handleConfirm">{{ $t('menu.load') }}</el-button>
-      <el-button @click="dialogShow = false">{{ $t('global.cancel') }}</el-button>
-    </el-row>
-  </el-dialog>
-</template>
-
-<script>
-import { runPlanTemplateList } from '@/api/runplan';
-import { getStationList } from '@/api/runplan';
-import { getEveryDayRunPlanData, generateDayRunPlan } from '@/api/simulation';
-import { getPublishMapInfo } from '@/api/jmap/map';
-
-export default {
-    name: 'ReloadTodayPlan',
-    data() {
-        return {
-            dialogShow: false,
-            loading: false,
-            pagerConfig: {
-                pageSize: 'pageSize',
-                pageIndex: 'pageNum'
-            },
-            queryForm: {
-                reset: true,
-                labelWidth: '120px',
-                queryObject: {
-                    name: {
-                        type: 'text',
-                        label: this.$t('menu.runGraphName')
-                    }
-                }
-            },
-            queryList: {
-                query: this.queryFunction,
-                selectCheckShow: false,
-                radioShow: true,
-                columns: [
-                    {
-                        title: this.$t('menu.runGraphName'),
-                        prop: 'name'
-                    }
-                ]
-            },
-
-            currentModel: {}
-        };
-    },
-    computed: {
-        title() {
-            return this.$t('menu.loadTheDayPlan');
-        }
-    },
-    methods: {
-        doShow() {
-            this.loading = false;
-            this.dialogShow = true;
-        },
-        doClose() {
-            this.dialogShow = false;
-        },
-        queryFunction(params) {
-            if (this.$store.state.map && this.$store.state.map.map) {
-                // params['lineCode'] = this.$store.getters['map/lineCode'];
-                params['mapId'] = this.$route.query.mapId;
-            }
-            return runPlanTemplateList(params);
-        },
-        // 生成每日运行图
-        handleConfirm() {
-            if (this.$refs && this.$refs.pageRules) {
-                const choose = this.$refs.pageRules.currentChoose();
-                if (choose && choose.id) {
-                    this.loading = true;
-                    generateDayRunPlan(choose.id, this.$route.query.group).then(response => {
-                        this.loading = false;
-                        this.reloadTable();
-                        this.loadRunData();
-                        this.doClose();
-                        this.$message.success(this.$t('tip.generateUserDailyRunGraphSuccessfully'));
-                    }).catch(() => {
-                        this.loading = false;
-                        this.reloadTable();
-                        this.$messageBox(this.$t('tip.generateUserDailyRunGraphFailed'));
-                    });
-                } else {
-                    this.$messageBox(this.$t('rules.selectTheRunningDiagramToBeLoaded'));
-                }
-            }
-        },
-        loadRunData() {
-            // const skinCode = this.$route.query.skinCode;
-            const mapId = this.$route.query.mapId;
-            this.$store.dispatch('runPlan/clear');
-            if (mapId) {
-                getStationList(mapId).then(response => {
-                    const stations = response.data;
-                    getPublishMapInfo(this.$route.query.mapId).then(res=>{
-                        this.PlanConvert = this.$theme.loadPlanConvert(res.data.lineCode);
-                        this.$store.dispatch('runPlan/setStations', stations).then(() => {
-                            getEveryDayRunPlanData(this.$route.query.group).then(resp => {
-                                this.$store.dispatch('runPlan/setPlanData', resp.data);
-                            }).catch(() => {
-                                this.$store.dispatch('runPlan/setPlanData', []);
-                                this.$messageBox(this.$t('error.getRunGraphDataFailed'));
-                            });
-                        });
-                    });
-
-                }).catch(() => {
-                    this.$messageBox(this.$t('error.getStationListFail'));
-                });
-            }
-        },
-        reloadTable() {
-            this.queryList.reload();
-        }
-    }
-};
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-    @import "src/styles/mixin.scss";
-</style>
diff --git a/src/jmapNew/theme/haerbin_01/menusPlan/deleteTask.vue b/src/jmapNew/theme/haerbin_01/menusPlan/deleteTask.vue
deleted file mode 100644
index 363f3c8ab..000000000
--- a/src/jmapNew/theme/haerbin_01/menusPlan/deleteTask.vue
+++ /dev/null
@@ -1,73 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="fuzhou-01__schedule delete-task"
-    :title="title"
-    :visible.sync="dialogShow"
-    width="400px"
-    :before-close="doClose"
-    :z-index="2000"
-    :modal="false"
-    :close-on-click-modal="false"
-  >
-    <el-row>
-      <el-radio v-model="type" :label="1">{{ $t('menu.deleteAllPreviousTasks') }}</el-radio>
-    </el-row>
-    <el-row>
-      <el-radio v-model="type" :label="2">{{ $t('menu.deleteAllSubsequentTasks') }}</el-radio>
-    </el-row>
-    <el-row type="flex" justify="center" class="button-group">
-      <el-button @click="commit">{{ $t('global.confirm') }}</el-button>
-      <el-button @click="doClose">{{ $t('global.cancel') }}</el-button>
-    </el-row>
-  </el-dialog>
-</template>
-
-<script>
-
-export default {
-    name: 'DeleteTask',
-    components: {
-    },
-    data() {
-        return {
-            dialogShow: false,
-            loading: false,
-            tripNumber: '',
-            serviceNumber: '',
-            type: '1'
-        };
-    },
-    computed: {
-        title() {
-            return this.$t('menu.deleteTask');
-        }
-    },
-    mounted() {
-    },
-    methods: {
-        doShow(params) {
-            this.tripNumber = params.tripNumber;
-            this.serviceNumber = params.serviceNumber;
-            this.dialogShow = true;
-        },
-        doClose() {
-            this.loading = false;
-            this.dialogShow = false;
-        },
-        commit() {
-            // this.tripNumber
-            this.doClose();
-        }
-    }
-};
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-    @import "src/styles/mixin.scss";
-
-    /deep/ {
-        .el-row {
-            margin: 10px;
-        }
-    }
-</style>
diff --git a/src/jmapNew/theme/haerbin_01/menusPlan/deleteTodayPlan.vue b/src/jmapNew/theme/haerbin_01/menusPlan/deleteTodayPlan.vue
deleted file mode 100644
index be003663e..000000000
--- a/src/jmapNew/theme/haerbin_01/menusPlan/deleteTodayPlan.vue
+++ /dev/null
@@ -1,62 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="fuzhou-01__schedule create-week-plan"
-    :title="title"
-    :visible.sync="dialogShow"
-    width="400px"
-    :before-close="doClose"
-    :z-index="2000"
-    :modal="false"
-    :close-on-click-modal="false"
-  >
-    <el-row type="flex" justify="center" class="button-group">
-      <el-button @click="commit">{{ $t('global.confirm') }}</el-button>
-      <el-button @click="doClose">{{ $t('global.cancel') }}</el-button>
-    </el-row>
-  </el-dialog>
-</template>
-
-<script>
-
-export default {
-    name: 'DeleteTodayPlan',
-    components: {
-    },
-    data() {
-        return {
-            dialogShow: false,
-            loading: false
-        };
-    },
-    computed: {
-        title() {
-            return this.$t('menu.deleteTheDayPlan');
-        }
-    },
-    mounted() {
-    },
-    methods: {
-        doShow(params) {
-            this.dialogShow = true;
-        },
-        doClose() {
-            this.loading = false;
-            this.dialogShow = false;
-        },
-        commit() {
-            // this.tripNumber
-            this.doClose();
-        }
-    }
-};
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-    @import "src/styles/mixin.scss";
-
-    /deep/ {
-        .el-row {
-            margin: 10px;
-        }
-    }
-</style>
diff --git a/src/jmapNew/theme/haerbin_01/menusPlan/managePlanList.vue b/src/jmapNew/theme/haerbin_01/menusPlan/managePlanList.vue
deleted file mode 100644
index 7ad2e21bd..000000000
--- a/src/jmapNew/theme/haerbin_01/menusPlan/managePlanList.vue
+++ /dev/null
@@ -1,143 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="fuzhou-01__schedule manage-plan-list"
-    :title="title"
-    :visible.sync="dialogShow"
-    width="80%"
-    :before-close="doClose"
-    :z-index="2000"
-    :modal="false"
-    :close-on-click-modal="false"
-  >
-    <QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
-  </el-dialog>
-</template>
-
-<script>
-import { getRunPlanLoadList, deleteRunPlanLoad, listAllTempLateRunPlan } from '@/api/runplan';
-import { getPublishMapListOnline } from '@/api/jmap/map';
-
-export default {
-    name: 'ManagePlanList',
-    data() {
-        return {
-            dialogShow: false,
-            loading: false,
-            pagerConfig: {
-                pageSize: 'pageSize',
-                pageIndex: 'pageNum'
-            },
-            queryForm: {
-                labelWidth: '140px',
-                reset: true
-            },
-            queryList: {
-                query: this.queryFunction,
-                selectCheckShow: false,
-                indexShow: true,
-                columns: [
-                    {
-                        title: this.$t('menu.mapName'),
-                        prop: 'mapId',
-                        type: 'tag',
-                        columnValue: (row) => { return this.$convertField(row.mapId, this.mapList, ['id', 'name']); },
-                        tagType: (row) => { return ''; }
-                    },
-                    {
-                        title: this.$t('menu.runGraphName'),
-                        prop: 'templatePlanId',
-                        type: 'tag',
-                        columnValue: (row) => { return this.$convertField(row.templatePlanId, this.templatePlanList, ['id', 'name']); },
-                        tagType: (row) => { return 'success'; }
-                    },
-                    {
-                        title: this.$t('menu.loadDate'),
-                        prop: 'loadTime'
-                    },
-                    {
-                        type: 'button',
-                        title: this.$t('global.operate'),
-                        width: '100',
-                        buttons: [
-                            {
-                                name: this.$t('global.delete'),
-                                handleClick: this.handleDelete,
-                                type: 'danger'
-                            }
-                        ]
-                    }
-                ],
-                actions: [
-                    { text: this.$t('global.create'), btnCode: 'employee_insert', handler: this.handleCreateRunPlan }
-                ]
-            },
-
-            currentModel: {}
-        };
-    },
-    computed: {
-        title() {
-            return this.$t('menu.operationChartSchedule');
-        }
-    },
-    mounted() {
-        this.loadPageData();
-    },
-    methods: {
-        loadPageData() {
-            this.mapList = [];
-            getPublishMapListOnline().then(resp => {
-                this.mapList = resp.data;
-            });
-            this.templatePlanList = [];
-            listAllTempLateRunPlan().then(resp => {
-                this.templatePlanList = resp.data;
-            });
-        },
-        queryFunction(params) {
-            if (this.$route.query.mapId) {
-                params['mapId'] = this.$route.query.mapId;
-            }
-
-            if (this.$store.state.user.id) {
-                params['userId'] = this.$store.state.user.id;
-            }
-
-            return getRunPlanLoadList(params);
-        },
-        handleDelete(index, row) {
-            this.$confirm(this.$t('tip.deleteTheRunningGraphLoadedTheNextDay'), this.$t('tip.hint'), {
-                confirmButtonText: this.$t('global.confirm'),
-                cancelButtonText: this.$t('global.cancel'),
-                type: 'warning'
-            }).then(() => {
-                deleteRunPlanLoad(row.id).then(response => {
-                    this.$message.success(this.$t('global.successfullyDelete'));
-                    this.reloadTable();
-                }).catch(() => {
-                    this.reloadTable();
-                    this.$messageBox(this.$t('global.failDelete'));
-                });
-            }).catch(() => { });
-        },
-        handleCreateRunPlan() {
-            this.$emit('dispatchDialog', { name: 'createWeekPlan' });
-        },
-        doShow() {
-            this.dialogShow = true;
-            this.$nextTick(()=> { this.reloadTable(); });
-        },
-        doClose() {
-            this.loading = false;
-            this.dialogShow = false;
-        },
-        reloadTable() {
-            this.queryList.reload();
-        }
-    }
-};
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-    @import "src/styles/mixin.scss";
-</style>
diff --git a/src/jmapNew/theme/haerbin_01/menusPlan/modifyingPlan.vue b/src/jmapNew/theme/haerbin_01/menusPlan/modifyingPlan.vue
deleted file mode 100644
index 6cba11edc..000000000
--- a/src/jmapNew/theme/haerbin_01/menusPlan/modifyingPlan.vue
+++ /dev/null
@@ -1,177 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="fuzhou-01__schedule edit-planning-train"
-    :title="title"
-    :visible.sync="dialogShow"
-    width="800px"
-    :before-close="doClose"
-    :z-index="2000"
-    :modal="false"
-    :close-on-click-modal="false"
-  >
-    <el-row>
-      <el-col :offset="10">{{ $t('menu.trainLine') }}</el-col>
-    </el-row>
-    <el-row>
-      <el-col :span="17">
-        <el-table :data="serviceData" border style="width: 100%" height="160">
-          <el-table-column prop="startStationCode" :label="this.$t('menu.startStation')" />
-          <el-table-column prop="startStationStandCode" :label="this.$t('menu.startPlatform')" />
-          <el-table-column prop="endStationCode" :label="this.$t('menu.terminal')" />
-          <el-table-column prop="endStationStandCode" :label="this.$t('menu.endPlatform')" />
-        </el-table>
-      </el-col>
-      <el-col :span="6" :offset="1">
-        <el-row type="flex" justify="center">
-          <el-button class="view-button" @click="handleAddTask">{{ this.$t('menu.addTask2') }}</el-button>
-        </el-row>
-        <el-row type="flex" justify="center">
-          <el-button class="view-button" @click="handleReplace">{{ this.$t('menu.replace') }}</el-button>
-        </el-row>
-        <el-row type="flex" justify="center">
-          <el-button class="view-button" @click="handleDeleteTask">{{ this.$t('menu.deleteTask2') }}</el-button>
-        </el-row>
-        <div class="view-box">
-          <el-row type="flex" justify="center">
-            <el-radio-group v-model="storeInOut">
-              <el-radio :label="1">{{ this.$t('menu.inTheLibrary') }}</el-radio>
-              <el-radio :label="2">{{ this.$t('menu.outOfTheLibrary') }}</el-radio>
-            </el-radio-group>
-          </el-row>
-        </div>
-      </el-col>
-    </el-row>
-    <el-row class="view-box">
-      <el-col :span="9" style="padding-left: 10px">
-        <el-input v-model="oldServiceNumber" size="small" :disabled="true" />
-      </el-col>
-      <el-col :span="9" style="padding-left: 20px">
-        <el-input v-model="newServiceNumber" size="small" />
-      </el-col>
-      <el-col :span="5" style="padding-left: 20px">
-        <el-button style="width: 150px;" @click="handleModifyingTripNumber">{{ $t('menu.changeTripNumber') }}</el-button>
-      </el-col>
-    </el-row>
-    <el-row style="margin-top: 10px">
-      <el-col :span="4"><span class="view-label">{{ $t('menu.lineStartTime') }}</span></el-col>
-      <el-col :span="8">
-        <el-time-select v-model="serviceStartTime" size="small" />
-      </el-col>
-      <el-col :span="4"><span class="view-label">{{ $t('menu.lineEndTime') }}</span></el-col>
-      <el-col :span="8">
-        <el-time-select v-model="serviceEndTime" size="small" />
-      </el-col>
-    </el-row>
-    <el-row style="margin-top: 20px">
-      <el-col :offset="10">{{ $t('menu.lineDetails') }}</el-col>
-    </el-row>
-    <el-row>
-      <el-table :data="tripData" border style="width: 100%" height="200">
-        <el-table-column prop="arriveTime" :label="this.$t('menu.arrivalTime2')" />
-        <el-table-column prop="stationCode" :label="this.$t('menu.station')" />
-        <el-table-column prop="stationStandCode" :label="this.$t('menu.platform')" />
-        <el-table-column prop="stopTime" :label="this.$t('menu.stopTime')" />
-        <el-table-column prop="level" :label="this.$t('menu.runLevel')" />
-      </el-table>
-    </el-row>
-    <el-row style="margin-top: 20px">
-      <el-checkbox v-model="effect">{{ $t('menu.affectSubsequentTasks') }}</el-checkbox>
-    </el-row>
-    <el-row type="flex" justify="center">
-      <el-button @click="commit">{{ $t('global.confirm') }}</el-button>
-      <el-button @click="doClose">{{ $t('global.cancel') }}</el-button>
-    </el-row>
-  </el-dialog>
-</template>
-
-<script>
-import { formatTime, formatName } from '@/utils/runPlan';
-
-export default {
-    name: 'ModifyingPlan',
-    data() {
-        return {
-            dialogShow: false,
-            loading: false,
-            effect: false,
-            storeInOut: '1',
-            oldServiceNumber: '',
-            newServiceNumber: '',
-            serviceStartTime: '',
-            serviceEndTime: '',
-            serviceData: [],
-            tripData: []
-        };
-    },
-    computed: {
-        title() {
-            return this.$t('global.modify');
-        }
-    },
-    mounted() {
-    },
-    methods: {
-        formatTime(time) {
-            return formatTime(time);
-        },
-        formatName(code) {
-            return formatName(code);
-        },
-        doShow() {
-            this.dialogShow = true;
-        },
-        doClose() {
-            this.loading = false;
-            this.dialogShow = false;
-        },
-        // 加任务
-        handleAddTask() {
-            this.$emit('dispatchDialog', { name: 'addTask', params: {} });
-        },
-        // 替换
-        handleReplace() {
-            this.$emit('dispatchDialog', { name: 'modifyingTask', params: {} });
-        },
-        // 删任务
-        handleDeleteTask() {
-            this.$emit('dispatchDialog', { name: 'deleteTask', params: {} });
-        },
-        // 改车次号
-        handleModifyingTripNumber() {
-            this.$emit('dispatchDialog', { name: 'modifyingTripNumber', params: {} });
-        },
-        // 确定修改
-        commit() {
-            this.doClose();
-        }
-    }
-};
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-    @import "src/styles/mixin.scss";
-
-    .view-button {
-        display: list-item;
-        width: 150px !important;
-        margin-left: 0px;
-    }
-
-    .view-label {
-        height: 32px;
-        line-height: 32px;
-    }
-
-    .view-box {
-        padding: 10px 0px;
-        border: 1px inset gray;
-        border-top: 1px outset gray;
-        border-left: 1px outset gray;
-    }
-
-    /deep/ {
-        .el-row {
-            margin: 5px 20px;
-        }
-    }
-</style>
diff --git a/src/jmapNew/theme/haerbin_01/menusPlan/modifyingTask.vue b/src/jmapNew/theme/haerbin_01/menusPlan/modifyingTask.vue
deleted file mode 100644
index 2ebad67a8..000000000
--- a/src/jmapNew/theme/haerbin_01/menusPlan/modifyingTask.vue
+++ /dev/null
@@ -1,326 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="fuzhou-01__schedule add-task"
-    :title="title"
-    :visible.sync="dialogShow"
-    width="1000px"
-    :before-close="doClose"
-    :z-index="2000"
-    :modal="false"
-    :close-on-click-modal="false"
-  >
-    <div style="margin: 10px">
-      <el-row>
-        <el-col :span="4">
-          <el-row>
-            <el-col :span="9">
-              <span>{{ $t('menu.tripNumber') + $t('global.colon') }}</span>
-            </el-col>
-            <el-col :span="15">
-              <el-select v-model="model.tripNumber" style="display: inline-black" :placeholder="this.$t('global.choose')">
-                <el-option
-                  v-for="item in tripNumberList"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                />
-              </el-select>
-            </el-col>
-          </el-row>
-        </el-col>
-        <el-col :span="2">
-          <el-row>
-            <el-col :offset="4">
-              <el-checkbox v-model="model.trainManual">{{ this.$t('menu.manual') }}</el-checkbox>
-            </el-col>
-          </el-row>
-        </el-col>
-        <el-col :span="5">
-          <el-row>
-            <el-col :span="12">
-              <span>{{ $t('menu.defaultStopTime') + $t('global.colon') }}</span>
-            </el-col>
-            <el-col :span="12">
-              <el-select v-model="model.time" style="display: inline-black" :placeholder="this.$t('global.choose')">
-                <el-option
-                  v-for="item in timeList"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                />
-              </el-select>
-            </el-col>
-          </el-row>
-        </el-col>
-        <el-col :span="5">
-          <el-row>
-            <el-col :span="9" :offset="2">
-              <span>{{ $t('menu.serviceNumber') + $t('global.colon') }}</span>
-            </el-col>
-            <el-col :span="13">
-              <el-input v-model="model.serviceNumber" />
-            </el-col>
-          </el-row>
-        </el-col>
-        <el-col :span="8">
-          <el-row>
-            <el-col :span="22" :offset="2">
-              <el-row>
-                <el-col :span="6">
-                  <el-checkbox v-model="model.clearGuest">{{ $t('menu.clearGuest') }}</el-checkbox>
-                </el-col>
-                <el-col :span="8">
-                  <el-checkbox v-model="model.continuationPlan">{{ $t('menu.continuationPlan') }}</el-checkbox>
-                </el-col>
-                <el-col :span="6">
-                  <el-checkbox v-model="model.firstTrain">{{ $t('menu.firstTrain') }}</el-checkbox>
-                </el-col>
-              </el-row>
-            </el-col>
-          </el-row>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="4">
-          <el-row>
-            <el-col :span="9">
-              <span>{{ $t('menu.serialNumber') + $t('global.colon') }}</span>
-            </el-col>
-            <el-col :span="15">
-              <el-select v-model="model.serialNumber" style="display: inline-black" :placeholder="this.$t('global.choose')">
-                <el-option
-                  v-for="item in serialNumberList"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="model.value"
-                />
-              </el-select>
-            </el-col>
-          </el-row>
-        </el-col>
-        <el-col :span="2">
-          <el-row>
-            <el-col :offset="4">
-              <el-checkbox v-model="model.serialManual">{{ this.$t('menu.manual') }}</el-checkbox>
-            </el-col>
-          </el-row>
-        </el-col>
-        <el-col :span="5">
-          <el-row>
-            <el-col :span="12">
-              <span>{{ $t('menu.defaultRunLevel') + $t('global.colon') }}</span>
-            </el-col>
-            <el-col :span="12">
-              <el-select v-model="model.level" style="display: inline-black" :placeholder="this.$t('global.choose')">
-                <el-option
-                  v-for="item in levelList"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                />
-              </el-select>
-            </el-col>
-          </el-row>
-        </el-col>
-        <el-col :span="5">
-          <el-row>
-            <el-col :span="9" :offset="2">
-              <span>{{ $t('global.startTime') + $t('global.colon') }}</span>
-            </el-col>
-            <el-col :span="13">
-              <el-time-select v-model="model.startTime" :placeholder="this.$t('global.selectionTime')" :clearable="false" />
-            </el-col>
-          </el-row>
-        </el-col>
-        <el-col :span="8">
-          <el-row>
-            <el-col :span="22" :offset="2">
-              <el-row>
-                <el-col :span="6">
-                  <el-checkbox v-model="model.inStock">{{ $t('menu.inTheLibrary') }}</el-checkbox>
-                </el-col>
-                <el-col :span="8">
-                  <el-checkbox v-model="model.outStock">{{ $t('menu.outOfTheLibrary') }}</el-checkbox>
-                </el-col>
-                <el-col :span="6">
-                  <el-checkbox v-model="model.lastTrain">{{ $t('menu.lastTrain') }}</el-checkbox>
-                </el-col>
-              </el-row>
-            </el-col>
-          </el-row>
-        </el-col>
-      </el-row>
-      <el-row style="margin-bottom: 5px;">
-        {{ $t('menu.crossing') + $t('global.colon') }}
-      </el-row>
-      <el-row>
-        <el-table :data="model.route" border :height="140">
-          <el-table-column prop="beginStationCode" :label="this.$t('menu.startStation')">
-            <template slot-scope="scope">
-              {{ formatName(scope.row.beginStationCode) }}
-            </template>
-          </el-table-column>
-          <el-table-column prop="beginStationStandCode" :label="this.$t('menu.startPlatform')" />
-          <el-table-column prop="endStationCode" :label="this.$t('menu.terminal')">
-            <template slot-scope="scope">
-              {{ formatName(scope.row.endStationCode) }}
-            </template>
-          </el-table-column>
-          <el-table-column prop="endStationStandCode" :label="this.$t('menu.endPlatform')" />
-          <el-table-column prop="describe" :label="this.$t('menu.description')" :width="280" />
-          <el-table-column :width="40" />
-        </el-table>
-      </el-row>
-      <el-row style=" margin-bottom: 5px;margin-top: 10px;">
-        {{ $t('global.details') + $t('global.colon') }}
-      </el-row>
-      <el-row>
-        <el-table :data="model.detail" border :height="140">
-          <el-table-column prop="stationCode" :label="this.$t('menu.platform')" :width="160">
-            <template slot-scope="scope">
-              {{ formatName(scope.row.stationCode) }}
-            </template>
-          </el-table-column>
-          <el-table-column prop="startTime" :label="this.$t('menu.arrivalTime')">
-            <template slot-scope="scope">
-              {{ formatTime(scope.row.startTime) }}
-            </template>
-          </el-table-column>
-          <el-table-column prop="stopTime" :label="this.$t('menu.stopTime')">
-            <template slot-scope="scope">
-              {{ formatTime(scope.row.stopTime) }}
-            </template>
-          </el-table-column>
-          <el-table-column prop="endTime" :label="this.$t('menu.departureTime')">
-            <template slot-scope="scope">
-              {{ formatTime(scope.row.endTime) }}
-            </template>
-          </el-table-column>
-          <el-table-column prop="level" :label="this.$t('menu.runLevel')" />
-          <el-table-column width="280" />
-        </el-table>
-      </el-row>
-      <el-row>
-        <el-col :offset="16">
-          <el-checkbox v-model="model.default">{{ $t('menu.displaysDefaultStopTimesAndRunLevels') }}</el-checkbox>
-        </el-col>
-      </el-row>
-    </div>
-    <el-row type="flex" justify="center" class="button-group">
-      <el-button @click="commit">{{ $t('global.confirm') }}</el-button>
-      <el-button @click="doClose">{{ $t('global.cancel') }}</el-button>
-    </el-row>
-  </el-dialog>
-</template>
-
-<script>
-import { formatTime, formatName } from '@/utils/runPlan';
-
-export default {
-    name: 'ModifyingTask',
-    components: {
-    },
-    data() {
-        return {
-            dialogShow: false,
-            loading: false,
-            model: {
-                tripNumber: '',
-                serialNumber: '',
-                trainManual: false,
-                serialManual: false,
-                clearGuest: false,
-                continuationPlan: false,
-                firstTrain: false,
-                lastTrain: false,
-                inStock: false,
-                outStock: false,
-                startTime: '',
-                route: [],
-                detail: []
-            },
-            timeList: [],
-            levelList: [],
-            tripNumberList: [],
-            serialNumberList: []
-        };
-    },
-    computed: {
-        title() {
-            return this.$t('menu.modifyTask');
-        }
-    },
-    mounted() {
-    },
-    methods: {
-        formatTime(time) {
-            return formatTime(time);
-        },
-        formatName(code) {
-            return formatName(code);
-        },
-        loadInitData(params) {
-            this.model.tripNumber = params.tripNumber;
-            this.model.serviceNumber = params.serviceNumber;
-            const editData = this.$store.state.runPlan.editData[params.serviceNumber];
-            if (editData) {
-                const trainInfo = editData.trainMap[params.tripNumber];
-                const lastIndex = trainInfo.stationTimeList.length - 1;
-                const taskObj = {
-                    tripNumber: params.tripNumber,
-                    beginStationCode: trainInfo.stationTimeList[0].stationCode,
-                    beginStationStandCode: '',
-                    endStationCode: trainInfo.stationTimeList[lastIndex].stationCode,
-                    endStationStandCode: ''
-                };
-                this.model.route.push(taskObj);
-
-                trainInfo.stationTimeList.forEach((elem, index) => {
-                    const stationObj = {
-                        stationCode: elem.stationCode,
-                        startTime: index == 0 ? null : trainInfo.stationTimeList[index - 1].secondTime,
-                        stopTime: index == 0 ? null : elem.secondTime - trainInfo.stationTimeList[index - 1].secondTime,
-                        endTime: elem.secondTime,
-                        level: ''
-                    };
-                    this.model.detail.push(stationObj);
-                });
-            }
-        },
-        doShow(params) {
-            this.loadInitData(params);
-            this.dialogShow = true;
-        },
-        doClose() {
-            this.loading = false;
-            this.dialogShow = false;
-        },
-        commit() {
-        }
-    }
-};
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-    @import "src/styles/mixin.scss";
-
-    /deep/ {
-        .el-button {
-            margin-left: 40px !important;
-            margin-right: 40px !important;
-        }
-
-        .el-row {
-            margin-bottom: 5px !important;
-        }
-
-        .el-input__inner {
-            height: 20px !important;
-            line-height: 20px !important;
-        }
-
-        .el-input {
-            width: 110px !important;
-        }
-    }
-</style>
diff --git a/src/jmapNew/theme/haerbin_01/model.js b/src/jmapNew/theme/haerbin_01/model.js
index ed34da08c..dd040cf61 100644
--- a/src/jmapNew/theme/haerbin_01/model.js
+++ b/src/jmapNew/theme/haerbin_01/model.js
@@ -14,6 +14,9 @@ class Model {
         this['private'][deviceType.StationControl] = {
             indicatorShow: true									// 标识灯名称显示
         };
+        this['private'][deviceType.Station] = {
+            kmPostShow: true									// 公里标显示
+        };
         this['private'][deviceType.Switch] = {
             nameShow: true
         };
diff --git a/src/jmapNew/theme/haerbin_01/planSchedule/index.vue b/src/jmapNew/theme/haerbin_01/planSchedule/index.vue
deleted file mode 100644
index 0555c8878..000000000
--- a/src/jmapNew/theme/haerbin_01/planSchedule/index.vue
+++ /dev/null
@@ -1,403 +0,0 @@
-<template>
-  <div class="plan-schedule" style="width: 100%">
-    <title-bar ref="titleBar" @back="back" />
-    <menu-bar ref="menuBar" :line-code="lineCode" @dispatchDialog="dispatchDialog" />
-    <schedule ref="schedule" :line-code="lineCode" :group="group" :max-height="height" :max-width="width" />
-    <status-bar ref="statusBar" :max-top="height" @setPosition="setPosition" />
-
-    <manage-plan-list ref="managePlanList" @dispatchDialog="dispatchDialog" />
-    <create-week-plan ref="createWeekPlan" @reloadTable="reloadTable" />
-    <create-today-plan ref="createTodayPlan" />
-    <modifying-plan ref="modifyingPlan" @dispatchDialog="dispatchDialog" />
-    <add-task ref="addTask" />
-    <delete-task ref="deleteTask" />
-    <modifying-task ref="modifyingTask" />
-  </div>
-</template>
-
-<script>
-import TitleBar from './titleBar';
-import MenuBar from './menuBar';
-import StatusBar from './statusBar';
-import Schedule from './schedule';
-import ManagePlanList from '../menusPlan/managePlanList';
-import CreateWeekPlan from '../menusPlan/createWeekPlan';
-import CreateTodayPlan from '../menusPlan/createTodayPlan';
-import ModifyingPlan from '../menusPlan/modifyingPlan';
-import AddTask from '../menusPlan/addTask';
-import DeleteTask from '../menusPlan/deleteTask';
-import ModifyingTask from '../menusPlan/modifyingTask';
-
-export default {
-    name: 'Menus',
-    components: {
-        TitleBar,
-        MenuBar,
-        StatusBar,
-        Schedule,
-        ManagePlanList,
-        CreateWeekPlan,
-        CreateTodayPlan,
-        ModifyingPlan,
-        AddTask,
-        DeleteTask,
-        ModifyingTask
-    },
-    props: {
-        group: {
-            type: String,
-            required: true
-        }
-    },
-    data() {
-        return {
-        };
-    },
-    computed: {
-        lineCode() {
-            return this.$route.query.lineCode || '02';
-        },
-        width() {
-            return this.$store.state.app.width;
-        },
-        height() {
-            return this.$store.state.app.height;
-        }
-    },
-    methods: {
-        setPosition() {
-            this.$nextTick(() => {
-                this.$refs.schedule.setPosition();
-            });
-        },
-        dispatchDialog(dialogObj) {
-            this.$nextTick(() => {
-                if (this.$refs[dialogObj.name]) {
-                    this.$refs[dialogObj.name].doShow(dialogObj.params);
-                }
-            });
-        },
-        reloadTable(dialogObj) {
-            if (this.$refs[dialogObj.name]) {
-                this.$refs[dialogObj.name].reloadTable();
-            }
-        },
-        confirm(params) {
-        },
-        back() {
-            this.$emit('back');
-        }
-    }
-};
-</script>
-
-<style>
-    .plan-schedule {
-        position: absolute;
-        background: gray;
-    }
-
-    .plan-schedule .pop-menu {
-        background: #F0F0F0;
-    }
-
-    .plan-schedule .pop-menu span {
-        color: #000;
-    }
-
-    .plan-schedule .system-close {
-        cursor: pointer;
-        position: absolute;
-        right: 0px;
-        background: -webkit-linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
-        background: -o-linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
-        background: -moz-linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
-        background: linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
-        border: 1px solid white;
-        border-radius: 4px;
-    }
-
-    .plan-schedule .system-close::before {
-        position: absolute;
-        height: 22px;
-        line-height: 22px;
-        top: 0px;
-        left: 0px;
-        font-size: x-large;
-    }
-
-    .plan-schedule .pop-menu .is-disabled span {
-        color: #B4B3B8;
-    }
-
-    .fuzhou-01__schedule {
-        overflow: hidden !important;
-    }
-
-    .fuzhou-01__schedule .el-dialog {
-        background: rgba(0, 85, 231, 1);
-        box-shadow: 1px hsla(240, 0%, 100%, 0.5) inset;
-        border: 2px solid #727375;
-        border-radius: 4px;
-        color: #000;
-        font-size: 14px;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-dialog__header {
-        height: 30px;
-        padding: 5px;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-dialog__footer {
-        background: #ECE9D8;
-        opacity: 1;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-dialog__body {
-        padding-top: 10px;
-        padding-bottom: 10px;
-        padding-left: 5px;
-        padding-right: 5px;
-        margin: 0px 3px 3px 3px;
-        border: 2px solid rgba(120, 121, 123, 0.5);
-        box-shadow: 1px hsla(240, 0%, 100%, 0.5) inset;
-        color: #000;
-        background: #ECE9D8;
-        opacity: 1;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-dialog__title {
-        font-size: 16px;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-dialog__headerbtn {
-        background: -webkit-linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
-        background: -o-linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
-        background: -moz-linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
-        background: linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
-        border: 1px solid white;
-        border-radius: 4px;
-        top: 0px;
-        right: 3px;
-        line-height: 26px;
-        width: 26px;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-dialog__headerbtn .el-icon-close:before {
-        font-size: 16px;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-dialog__headerbtn .el-dialog__close {
-        color: #fff;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-form {
-        background: #ECE9D8 !important;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-card {
-        background: #ECE9D8 !important;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-button {
-        height: 32px;
-        line-height: 32px;
-        padding: 0px;
-        width: 80px;
-        border: 2px outset #E2E2E2;
-        border-radius: 0px !important;
-        color: #000;
-        background: #ECE9D8;
-    }
-
-    .fuzhou-01__schedule .el-dialog .expand {
-        width: 120px;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-button:focus span {
-        border: 1px dashed gray;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-button:active {
-        border: 2px inset #E2E2E2;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-button:disabled {
-        border: 2px inset #E2E2E2;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-button:disabled span {
-        border: 0px;
-    }
-
-    .fuzhou-01__schedule .el-dialog .button-group {
-        margin: 0px 5px;
-        text-align: center !important;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-input {
-        border: 2px inset #E9E9E9;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-input .el-input__inner {
-        color: #000;
-        background: #fff !important;
-        border: 0px;
-        border-radius: 0px !important;
-        box-sizing: border-box;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-input.is-disabled .el-input__inner {
-        background: #F0F0F0 !important;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-textarea {
-        border: 2px inset #E9E9E9;
-        border-radius: 0px;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-textarea .el-textarea__inner {
-        color: #000;
-        background: #fff !important;
-        border: 0px;
-        border-radius: 0px !important;
-        box-sizing: border-box;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-textarea.is-disabled .el-textarea__inner {
-        background: #F0F0F0 !important;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-table {
-        border: 2px inset #E9E9E9;
-        color: #000 !important;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-table .cell {
-        line-height: unset !important;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-table th.is-leaf {
-        background: #ECE9D8 !important;
-        border-right: 1px solid #BDBDBD !important;
-        border-bottom: 1px solid #BDBDBD !important;
-        color: #000 !important;
-        height: 20px !important;
-        padding: 0px;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-table tr td {
-        height: 20px !important;
-        padding: 0px;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-table .el-table__empty-text {
-        top: 15px !important;
-    }
-
-    .fuzhou-01__schedule .el-dialog .current-row>td {
-        background: #316AC5 !important;
-        color: #fff !important;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-checkbox__inner {
-        border: 1px inset #dcdfe6 !important;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-checkbox__label {
-        color: #000 !important;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-checkbox.is-disabled .el-checkbox__inner {
-        background: #E6E6E6 !important;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-checkbox.is-disabled .el-checkbox__label {
-        color: #C5C9CC !important;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-checkbox__input.is-checked .el-checkbox__inner {
-        background: #fff !important;
-        border: 1px inset #dcdfe6 !important;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-checkbox__input.is-checked .el-checkbox__inner::after {
-        position: absolute;
-        -webkit-box-sizing: content-box;
-        box-sizing: content-box;
-        content: "";
-        border: 1px solid #000;
-        border-left: 0;
-        border-top: 0;
-        height: 7px;
-        left: 4px;
-        top: 1px;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-radio__inner {
-        border: 1px inset #dcdfe6 !important;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-radio__label {
-        color: #000 !important;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-radio__input.is-checked .el-radio__inner {
-        background: #fff !important;
-        border: 1px inset #dcdfe6 !important;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-radio__input.is-checked .el-radio__inner::after {
-        width: 4px;
-        height: 4px;
-        border-radius: 100%;
-        background-color: #000 !important;
-        position: absolute;
-        left: 50%;
-        top: 50%;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-radio.is-disabled .el-radio__inner {
-        background: #E6E6E6 !important;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-radio.is-disabled .el-radio__label {
-        color: #C5C9CC !important;
-    }
-
-    .fuzhou-01__schedule .el-dialog .base-label {
-        background: rgba(0, 0, 0, x);
-        position: relative;
-        left: -15px;
-        top: -18px;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-form-item label {
-        font-weight: normal !important;
-        color: #000 !important;
-    }
-
-    .fuzhou-01__schedule .el-dialog .context {
-        height: 100px;
-        border: 2px inset #E2E2E2;
-        overflow-y: scroll;
-    }
-
-    .fuzhou-01__schedule .el-dialog .table {
-        margin-top: 10px;
-    }
-
-    .fuzhou-01__schedule .el-dialog .notice {
-        margin-left: 62px;
-        line-height: 30px;
-    }
-
-    .fuzhou-01__schedule .el-dialog .button-group {
-        margin-top: 10px;
-    }
-
-    .fuzhou-01__schedule .el-dialog .el-tree__empty-block {
-        background: #E9E9E9 !important;
-        color: #000 !important;
-    }
-</style>
diff --git a/src/jmapNew/theme/haerbin_01/planSchedule/menuBar.vue b/src/jmapNew/theme/haerbin_01/planSchedule/menuBar.vue
deleted file mode 100644
index b58115ead..000000000
--- a/src/jmapNew/theme/haerbin_01/planSchedule/menuBar.vue
+++ /dev/null
@@ -1,518 +0,0 @@
-<template>
-  <div id="PlanMenuBar">
-    <div class="nav">
-      <template v-for="(item,i) in menu">
-        <template v-if="noShowingChildren(item.children)">
-          <li :key="i" class="nav-li" @click="hookClick(item)">
-            <span class="nav-li-text">{{ item.title }}</span>
-          </li>
-        </template>
-        <template v-else>
-          <li :key="i" class="nav-li" @click.stop="popupMenuA(item, i)">
-            <span class="nav-li-text">{{ item.title }}</span>
-            <ul class="nav-ul" :class="{'active' :i==classA}">
-              <template v-for="(child,j) in item.children">
-                <template
-                  v-if="child.children&&child.children.length>0&&hasShowingChildren(child.children)"
-                >
-                  <li v-if="child.type === 'separator'" :key="j" class="menu-separator">
-                    <span class="status">&ensp;</span>
-                    <span class="separator">&ensp;</span>
-                  </li>
-                  <li v-else-if="child.type === 'file'" :key="j" class="menu-li">
-                    <div class="menu-li-block">
-                      <span class="menu-li-text">
-                        <span class="status">&ensp;</span>
-                        <el-button type="text" class="button" :disabled="child.disabled">
-                          <input
-                            :ref="child.label"
-                            type="file"
-                            accept=".csv, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel"
-                            @change="openLoadFile(child)"
-                          >
-                          {{ child.title }}
-                        </el-button>
-                      </span>
-                    </div>
-                  </li>
-                  <li v-else :key="j" class="menu-li" @click.stop="popupMenuB(child, j)">
-                    <div class="menu-li-block">
-                      <span class="menu-li-text">
-                        <span class="status">&ensp;</span>
-                        <span class="label">{{ child.title }}</span>
-                      </span>
-                    </div>
-                    <ul class="menu-ul" :class="{'active' :j==classB}">
-                      <template v-for="(grandchild,k) in child.children">
-                        <li v-if="grandchild.type === 'separator'" :key="k" class="menu-separator">
-                          <span class="status">&ensp;</span>
-                          <span class="separator">&ensp;</span>
-                        </li>
-                        <li v-else-if="grandchild.type === 'file'" :key="k" class="menu-li">
-                          <div class="menu-li-block">
-                            <span class="menu-li-text">
-                              <span class="status">&ensp;</span>
-                              <el-button
-                                type="text"
-                                class="button"
-                                :disabled="grandchild.disabled"
-                              >
-                                <input
-                                  :ref="grandchild.label"
-                                  type="file"
-                                  accept=".csv, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel"
-                                  @change="openLoadFile(grandchild)"
-                                >
-                                {{ grandchild.title }}
-                              </el-button>
-                            </span>
-                          </div>
-                        </li>
-                        <li v-else :key="k" class="menu-li" @click.stop="hookClick(grandchild)">
-                          <div class="menu-li-block">
-                            <span class="menu-li-text">
-                              <span class="status">&ensp;</span>
-                              <span class="label">{{ grandchild.title }}</span>
-                            </span>
-                          </div>
-                        </li>
-                      </template>
-                    </ul>
-                  </li>
-                </template>
-                <template v-else>
-                  <li v-if="child.type === 'separator'" :key="j" class="menu-separator">
-                    <span class="status">&ensp;</span>
-                    <span class="separator">&ensp;</span>
-                  </li>
-                  <li v-else-if="child.type === 'file'" :key="j" class="menu-li">
-                    <div class="menu-li-block">
-                      <span class="menu-li-text">
-                        <span class="status">&ensp;</span>
-                        <el-button type="text" class="button" :disabled="child.disabled">
-                          <input
-                            :ref="child.title"
-                            type="file"
-                            accept=".csv, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel"
-                            @change="openLoadFile(child)"
-                          >
-                          {{ child.title }}
-                        </el-button>
-                      </span>
-                    </div>
-                  </li>
-                  <li v-else :key="j" class="menu-li" @click.stop="hookClick(child)">
-                    <div class="menu-li-block">
-                      <span class="menu-li-text">
-                        <span class="status">&ensp;</span>
-                        <span class="label">{{ child.title }}</span>
-                      </span>
-                    </div>
-                  </li>
-                </template>
-              </template>
-            </ul>
-          </li>
-        </template>
-      </template>
-    </div>
-  </div>
-</template>
-<script>
-import { mapGetters } from 'vuex';
-import { EventBus } from '@/scripts/event-bus';
-
-export default {
-    name: 'PlanMenuBar',
-    props: {
-        lineCode: {
-            type: String,
-            required: true
-        }
-    },
-    data() {
-        return {
-            classA: -1,
-            classB: -1,
-            tempClassA: -1,
-            tempClassB: -1,
-            menu: [
-                {
-                    title: this.$t('menu.file'),
-                    children: [
-                    ]
-                },
-                {
-                    title: this.$t('menu.view'),
-                    children: [
-                        // {
-                        //     title: '缩放',
-                        // },
-                        // {
-                        //     title: '单色显示历史计划',
-                        // },
-                        // {
-                        //     title: '彩色显示历史计划'
-                        // }
-                    ]
-                },
-                {
-                    title: this.$t('menu.edit'),
-                    children: [
-                        // {
-                        //     title: '修改',
-                        //     click: this.handleEditPlanningTrain
-                        // },
-                        // {
-                        //     title: '加任务',
-                        //     click: this.handleAddTask
-                        // },
-                        // {
-                        //     title: '删任务',
-                        //     click: this.handleDeleteTask
-                        // },
-                        // {
-                        //     title: '改表号',
-                        //     click: this.handleModifyingPlanId
-                        // },
-                        // {
-                        //     title: '平移多辆车',
-                        //     click: this.handleTranslationalMulTrain
-                        // }
-                    ]
-                },
-                {
-                    title: this.$t('menu.tool'),
-                    children: [
-                        {
-                            title: this.$t('menu.viewPlanList'),
-                            click: this.handleViewPlanSchedule,
-                            width: 150
-                        },
-                        {
-                            title: this.$t('menu.createAWeekPlan'),
-                            click: this.handleCreateWeekPlan,
-                            width: 150
-                        },
-                        {
-                            title: this.$t('menu.loadTheDayPlan'),
-                            click: this.handleReloadTodayPlan,
-                            width: 150
-                        }
-                        // {
-                        //     title: '有效性检查',
-                        //     click: this.handleValidityCheck
-                        // }
-                    ]
-                },
-                {
-                    title: this.$t('menu.help'),
-                    children: [
-                    ]
-                }
-            ]
-        };
-    },
-    computed: {
-        ...mapGetters('training', [
-            'mode'
-        ]),
-        ...mapGetters('map', [
-            'stationList'
-        ])
-    },
-    watch: {
-        tempClassA() {
-            this.classA = this.$store.state.menuOperation.break ? -1 : this.tempClassA;
-        },
-        tempClassB() {
-            this.classB = this.$store.state.menuOperation.break ? -1 : this.tempClassB;
-        },
-        '$store.state.menuOperation.break': function (val) {
-            if (val) {
-                this.classA = this.classB = -1;
-            } else {
-                this.classA = this.tempClassA;
-                this.classB = this.tempClassB;
-            }
-        }
-    },
-    mounted() {
-        this.initMenu();
-    },
-    methods: {
-        initMenu() {
-            this.clickEvent();
-            this.closeMenu();
-        },
-        clickEvent() {
-            const self = this;
-            window.onclick = function (e) {
-                self.closeMenu(false);
-            };
-        },
-        noShowingChildren(children) {
-            if (!children || children.length <= 0) {
-                return true;
-            }
-            return false;
-        },
-        hasShowingChildren(children) {
-            if (children && children.length > 0) {
-                return true;
-            }
-            return false;
-        },
-        closeMenu() {
-            this.classA = this.tempClassA = -1;
-            this.classB = this.tempClassB = -1;
-        },
-        hookClick(item, event) {
-            this.closeMenu();
-            // launchFullscreen();
-            setTimeout(() => {
-                if (item && typeof item.click == 'function') {
-                    item.click();
-                }
-            }, 500);
-        },
-        popupMenuA(item, index) {
-            this.clickEvent();
-            this.tempClassA = index;
-            this.tempClassB = -1;
-        },
-        popupMenuB(item, index) {
-            this.tempClassB = index;
-        },
-        openLoadFile(item) {
-            const obj = this.$refs[item.title][0];
-            if (obj.files) {
-                const file = obj.files[0];
-                item.click(file);
-                obj.value = '';
-            }
-        },
-        doClose() {
-            this.$nextTick(() => {
-                EventBus.$emit('closeMenu');
-            });
-        },
-        // 刷新
-        refresh() {
-            this.closeMenu(true);
-            EventBus.$emit('refresh');
-        },
-        undeveloped() {
-            this.doClose();
-            this.$alert(this.$t('menu.achieving'), this.$t('tip.hint'), {
-                confirmButtonText: this.$t('tip.confirm'),
-                callback: action => {
-                }
-            });
-        },
-        // 修改计划
-        handleEditPlanningTrain() {
-            this.$emit('dispatchDialog', { name: 'modifyingPlan' });
-        },
-        // 添加任务
-        handleAddTask() {
-            const params = this.$store.state.runPlan.selected;
-            this.$emit('dispatchDialog', { name: 'addTask', params });
-        },
-        // 删除任务
-        handleDeleteTask() {
-            const params = this.$store.state.runPlan.selected;
-            this.$emit('dispatchDialog', { name: 'deleteTask', params });
-        },
-        // 修改任务
-        handleModifyingTask() {
-            const params = this.$store.state.runPlan.selected;
-            this.$emit('dispatchDialog', { name: 'modifyingTask', params });
-        },
-        // 改表号
-        handleModifyingPlanId() {
-            this.$emit('dispatchDialog', { name: 'modifyingPlanId' });
-        },
-        // 平移多辆车
-        handleTranslationalMulTrain() {
-            this.$emit('dispatchDialog', { name: 'translationalMulTrain' });
-        },
-        // 查看计划列表
-        handleViewPlanSchedule() {
-            this.$emit('dispatchDialog', { name: 'managePlanList' });
-        },
-        // 创建一周计划
-        handleCreateWeekPlan() {
-            this.$emit('dispatchDialog', { name: 'createWeekPlan' });
-        },
-        // 创建当天计划
-        handleReloadTodayPlan() {
-            this.$emit('dispatchDialog', { name: 'createTodayPlan' });
-        },
-        // 有效性检查
-        handleValidityCheck() {
-        }
-    }
-};
-</script>
-
-<style scoped rel="stylesheet/scss" lang="scss">
-    @import "src/styles/mixin.scss";
-    $top: 25px;
-    $width: 30px;
-    $height: 20px;
-    $menuPadding: 10px;
-    $menuItemHeight: 30px;
-    $menuItemWidth: 170px;
-    $menuItemPadding: 5px;
-
-    #PlanMenuBar {
-        z-index: 10;
-        position: absolute;
-        top: $top;
-        width: 100%;
-        height: $height;
-        line-height: $height;
-    }
-
-    .nav {
-        display: block;
-        cursor: pointer;
-        color: #0000;
-        background: #EBEADB;
-        list-style: none;
-        border: 1px solid #B6BCCC !important;
-    }
-
-    .nav-li {
-        position: relative;
-        display: inline-block;
-        padding-left: $menuPadding;
-        padding-right: $menuPadding;
-    }
-
-    .nav-li:active {
-        background: #C9D0E1;
-        border-radius: 4px;
-    }
-
-    .nav-li-text {
-        font-size: 13px;
-        color: #000;
-        text-align: center;
-        text-decoration: none;
-    }
-
-    .nav-ul {
-        display: none;
-        position: absolute;
-        list-style: none;
-        border: 1px solid gray;
-        width: $menuItemWidth;
-        padding: 0px;
-        margin: 0px;
-    }
-
-    .menu-ul {
-        display: none;
-        list-style: none;
-        background: #F0F0F0;
-        line-height: $menuItemHeight;
-        width: $menuItemWidth;
-        bottom: $menuItemHeight;
-    }
-
-    .active {
-        position: absolute;
-        display: block !important;
-    }
-
-    .menu-ul-text {
-        font-size: 14px;
-        color: #000;
-        letter-spacing: 0;
-        height: $menuItemHeight;
-        line-height: $menuItemHeight;
-        border-left: 1px solid #000;
-        border-right: 1px solid #000;
-    }
-
-    .menu-separator {
-        text-align: left;
-        background: #F0F0F0;
-        height: 2px;
-        line-height: 2px;
-    }
-
-    .menu-separator .status {
-        display: inline-block;
-        border-right: 1px inset #CACACA;
-        width: $width;
-        height: 100%;
-        background: #EFECDE;
-    }
-
-    .menu-separator .separator {
-        display: inline-block;
-        background: #CACACA;
-        margin-left: 5px;
-        height: 2px;
-        width: $menuItemWidth - $width - 30px;
-    }
-
-    .menu-li {
-        text-align: left;
-        background: #F0F0F0;
-        height: $menuItemHeight;
-        line-height: $menuItemHeight;
-    }
-
-    .menu-li-block {
-        letter-spacing: 0;
-        height: $menuItemHeight;
-        line-height: $menuItemHeight;
-    }
-
-    .menu-li-text {
-        font-size: 14px;
-        color: #000;
-    }
-
-    .menu-li-text .status {
-        display: inline-block;
-        border-right: 1px inset #CACACA;
-        width: $width;
-        background: #EFECDE;
-    }
-
-    .menu-li-text .label {
-        display: inline-block;
-        margin-left: 5px;
-    }
-
-    .menu-li-text .button {
-        position: relative;
-        overflow: hidden;
-        margin-left: 10px;
-        line-height: 0px;
-        width: $menuItemWidth - $width;
-        top: -$menuItemHeight;
-        color: #000;
-        cursor: pointer;
-
-        input {
-            opacity: 0;
-            cursor: pointer;
-            position: absolute;
-            top: 0px;
-            width: $menuItemWidth - $width - 10px;
-        }
-    }
-
-    .menu-li-block:hover {
-        background: #C9DEF7;
-        box-sizing: border-box;
-        -moz-box-sizing: border-box;
-        -webkit-box-sizing: border-box;
-    }
-</style>
diff --git a/src/jmapNew/theme/haerbin_01/planSchedule/schedule.vue b/src/jmapNew/theme/haerbin_01/planSchedule/schedule.vue
deleted file mode 100644
index 2f066549a..000000000
--- a/src/jmapNew/theme/haerbin_01/planSchedule/schedule.vue
+++ /dev/null
@@ -1,479 +0,0 @@
-<template>
-  <div id="PlanSchedule" :style="{top: top+'px', height: height+'px'}">
-    <div class="left">
-      <div :id="runPlanId" />
-    </div>
-    <div class="right">
-      <data-table
-        ref="serviceTable"
-        :height="height/2"
-        :config="serviceNumberConfig"
-        :style="{top: top-height/2+'px'}"
-        @touch="scheduleTouch"
-      />
-      <data-table
-        ref="tripTable"
-        :height="height/2"
-        :config="tripNumberConfig"
-        :style="{top: top-height/2+'px'}"
-        @touch="trainNumTouch"
-      />
-    </div>
-  </div>
-</template>
-
-<script>
-import { mapGetters } from 'vuex';
-import { timeFormat } from '@/utils/date';
-import {toTimeStamp, formatDuring} from '@/utils/date';
-import DataTable from '../menusPlan/components/dataTable';
-import echarts from 'echarts';
-
-export default {
-    name: 'PlanSchedule',
-    components: {
-        DataTable
-    },
-    props: {
-        group: {
-            type: String,
-            required: true
-        },
-        lineCode: {
-            type: String,
-            required: true
-        },
-        maxWidth: {
-            type: Number,
-            required: true
-        },
-        maxHeight: {
-            type: Number,
-            required: true
-        }
-    },
-    data() {
-        return {
-            top: 0,
-            height: 0,
-            heights: [100, 100],
-            runPlanId: 'plan-schedule-id',
-            myChart: null,
-            PlanConvert: {},
-            serviceNumberConfig: {
-                data: [],
-                highlightCurrentRow: true,
-                handleChange: this.serviceNumberChange,
-                showClose: false,
-                columns: [
-                    {
-                        prop: 'serviceNumber',
-                        label: this.$t('menu.serviceNumber')
-                    },
-                    {
-                        width: 40
-                    }
-                ]
-            },
-            tripNumberConfig: {
-                data: [],
-                highlightCurrentRow: true,
-                handleChange: this.tripNumberChange,
-                showClose: false,
-                columns: [
-                    {
-                        prop: 'tripNumber',
-                        label: this.$t('menu.tripNumber')
-                    },
-                    {
-                        width: 40
-                    }
-                ]
-            },
-            realData: {},
-            kmRangeCoordMap: {},
-            option: {
-                title: {
-                    text: '',
-                    left: 'center'
-                },
-                grid: {
-                    top: '30px',
-                    left: '120px',
-                    right: '40px',
-                    bottom: '65px',
-                    containLabel: true,
-                    backgroundColor: 'floralwhite'
-                },
-                toolbox: {
-                    // right: '30px',
-                    // feature: {
-                    //     dataZoom: {
-                    //         yAxisIndex: 'none'
-                    //     },
-                    //     restore: {},
-                    //     saveAsImage: {}
-                    // }
-                },
-                tooltip: {
-                    axisPointer: {
-                        trigger: 'item',
-                        type: 'cross'
-                    },
-                    formatter: this.axisTooltip,
-                    borderWidth: 1
-                },
-                xAxis: [
-                    {
-                        type: 'category',
-                        boundaryGap: false,
-                        data: [],
-                        axisLine: {
-                            onZero: false,
-                            lineStyle: {
-                                width: 2,
-                                color: '#d14a61'
-                            }
-                        },
-                        axisLabel: {
-                            formatter: this.xAxisLableFormat,
-                            textStyle: {
-                                color: '#333'
-                            }
-                        },
-                        axisPointer: {
-                            snap: true,
-                            label: {
-                                formatter: this.xAxisPointFormat,
-                                backgroundColor: 'rgb(255,0,0,0.5)',
-                                color: 'white'
-                            }
-                        }
-                    }
-                ],
-                yAxis: {
-                    type: 'value',
-                    splitLine: {
-                        show: false
-                    },
-                    axisTick: {
-                        show: false
-                    },
-                    axisLine: {
-                        onZero: false,
-                        lineStyle: {
-                            width: 2,
-                            color: '#d14a61'
-                        }
-                    },
-                    axisLabel: {
-                        interval: 'auto',
-                        formatter: this.yAxisLableFormat
-                    },
-                    axisPointer: {
-                        xAxisIndex: 'all',
-                        label: {
-                            formatter: this.yAxisPointFormat,
-                            backgroundColor: 'rgb(0,100,0,0.5)',
-                            color: 'white'
-                        }
-                    },
-                    min: 0,
-                    max: 0
-                },
-                series: [],
-                dataZoom: [
-                    {
-                        type: 'inside'
-                    },
-                    {
-                        fiterMode: 'filter',
-                        handleIcon: 'M10.7,11.9v-1.3H9.3v1.3c-4.9,0.3-8.8,4.4-8.8,9.4c0,5,3.9,9.1,8.8,9.4v1.3h1.3v-1.3c4.9-0.3,8.8-4.4,8.8-9.4C19.5,16.3,15.6,12.2,10.7,11.9z M13.3,24.4H6.7V23h6.6V24.4z M13.3,19.6H6.7v-1.4h6.6V19.6z',
-                        handleSize: '80%',
-                        handleStyle: {
-                            color: '#fff',
-                            shadowBlur: 3,
-                            shadowColor: 'rgba(0, 0, 0, 0.6)',
-                            shadowOffsetX: 2,
-                            shadowOffsetY: 2
-                        },
-                        bottom: '20px'
-                    }
-                ]
-            },
-            absoluteTime: 2 * 3600,
-            indexKmRangeMap: {}
-        };
-    },
-    computed: {
-        ...mapGetters('runPlan', [
-            'stations'
-        ])
-    },
-    watch: {
-        maxWidth() {
-            this.setPosition();
-        },
-        maxHeight() {
-            this.setPosition();
-        },
-        '$store.state.runPlan.planLoadedCount': async function () {
-            await this.loadChartPage();
-        },
-        '$store.state.runPlan.planSizeCount': function () {
-            this.reSize({ width: this.$store.state.runPlan.width, height: this.$store.state.runPlan.height });
-        },
-        '$store.state.runPlan.selected.serviceNumber': function (val) {
-            const index = this.serviceNumberConfig.data.findIndex(elem => {
-                return elem.serviceNumber == val;
-            });
-
-            this.$refs.serviceTable.setCurrentRow(this.serviceNumberConfig.data[index]);
-        },
-        '$store.state.runPlan.selected.tripNumber': function (val) {
-            const index = this.tripNumberConfig.data.findIndex(elem => {
-                return elem.tripNumber == val;
-            });
-            this.$refs.tripTable.setCurrentRow(this.tripNumberConfig.data[index]);
-        }
-    },
-    mounted() {
-        this.PlanConvert = this.$theme.loadPlanConvert(this.lineCode);
-    },
-    beforeDestroy() {
-        this.destroy();
-    },
-    methods: {
-        serviceNumberChange(row) {
-            if (row) {
-                this.$store.dispatch('runPlan/setSelected', { serviceNumber: row.serviceNumber, tripNumber: null });
-                const serviceObj = this.$store.state.runPlan.editData[row.serviceNumber];
-                if (serviceObj) {
-                    this.analyticalTripNumber(serviceObj.trainMap);
-                }
-            }
-        },
-        tripNumberChange(row) {
-            if (row) {
-                this.$store.dispatch('runPlan/setSelected', { serviceNumber: this.$store.state.runPlan.selected.serviceNumber, tripNumber: row.tripNumber });
-            }
-        },
-        async analyticalServiceNumber(data) {
-            this.serviceNumberConfig.data = Object.keys(data || {})
-                .sort((a, b) => { return data[a].oldIndex - data[b].oldIndex; })
-                .map(serviceNumber => { return { serviceNumber }; });
-        },
-        async analyticalTripNumber(data) {
-            this.tripNumberConfig.data = Object.keys(data || {})
-                .sort((a, b) => { return data[a].oldIndex - data[b].oldIndex; })
-                .map(tripNumber => { return { tripNumber }; });
-        },
-        async setPosition() {
-            this.$nextTick(() => {
-                let top = 3;
-                const width = this.maxWidth * 0.85;
-                let height = this.maxHeight;
-
-                const titleBar = document.getElementById('PlanTitleBar');
-                const menuBar = document.getElementById('PlanMenuBar');
-                const menuTool = document.getElementById('PlanMenuTool');
-                const statusBar = document.getElementById('PlanStatusBar');
-
-                if (titleBar) {
-                    top += (titleBar.offsetHeight || 0);
-                }
-
-                if (menuBar) {
-                    top += (menuBar.offsetHeight || 0);
-                }
-
-                if (menuTool) {
-                    top += (menuTool.offsetHeight || 0);
-                }
-
-                if (statusBar) {
-                    height -= (statusBar.offsetHeight || 0);
-                }
-
-                height = height - top;
-                this.$store.dispatch('runPlan/resize', { width, height });
-
-                if (this.top != top) {
-                    this.top = top;
-                }
-
-                if (this.height != height) {
-                    this.height = height - 20 * 2;
-                }
-            });
-        },
-        async loadChartPage() {
-            try {
-                let series = [];
-                const planData = this.$store.state.runPlan.planData || [];
-                const stations = this.$store.state.runPlan.stations || [];
-
-                this.viewDisabled = true;
-                this.kmRangeCoordMap = this.PlanConvert.convertStationsToMap(stations);
-                series = this.pushModels(series, [this.PlanConvert.initializeYaxis(stations)]);
-                series = this.pushModels(series, this.PlanConvert.convertDataToModels(planData, stations, this.kmRangeCoordMap, { width: 0.5 }));
-                await this.loadInitData(series);
-                await this.analyticalServiceNumber(this.$store.state.runPlan.editData);
-                this.viewDisabled = false;
-
-            } catch (error) {
-                this.viewDisabled = false;
-                this.$messageBox(this.$t('error.loadingOperationGraphFailed'));
-            }
-        },
-        async loadInitData(series) {
-            this.myChart && this.myChart.showLoading();
-            await this.xAxisInit();
-            await this.yAxisInit();
-            await this.loadInitChart(series);
-            this.myChart && this.myChart.hideLoading();
-        },
-        pushModels(series, models) {
-            if (models && models.length) {
-                models.forEach(elem => {
-                    if (elem) {
-                        series.push(elem);
-                    }
-                });
-            }
-
-            return series;
-        },
-        popModels(series, models) {
-            if (models && models.length) {
-                models.forEach(elem => {
-                    const index = series.indexOf(elem);
-                    if (index >= 0) {
-                        series.split(index, 1);
-                    }
-                });
-            }
-
-            return series;
-        },
-        loadInitChart(series) {
-            return new Promise((resolve, reject) => {
-                try {
-                    this.destroy();
-                    let startValue = 3600 + this.PlanConvert.TranslationTime;
-                    const offsetTime = 3600;
-                    const initTime = toTimeStamp(formatDuring(this.$store.state.training.initTime));
-                    startValue = initTime - this.PlanConvert.TranslationTime;
-                    this.option.dataZoom[0].startValue = this.option.dataZoom[1].startValue = startValue - offsetTime;
-                    this.option.dataZoom[0].endValue = this.option.dataZoom[1].endValue = startValue + offsetTime;
-                    this.option.series = series;
-                    this.myChart = echarts.init(document.getElementById(this.runPlanId));
-                    if (this.myChart) {
-                        this.myChart.setOption(this.option);
-                        this.reSize({ width: this.$store.state.runPlan.width, height: this.$store.state.runPlan.height });
-                        this.myChart.on('click', this.mouseClick);
-                    }
-                    resolve(true);
-                } catch (error) {
-                    reject(error);
-                }
-            });
-        },
-        xAxisPointFormat(params) {
-            return timeFormat(params.value);
-        },
-        yAxisPointFormat(params) {
-            return this.PlanConvert.computedFormatYAxis(this.stations, params);
-        },
-        xAxisLableFormat(value, index) {
-            if (value % 60 === 0) {
-                return timeFormat(value);
-            }
-        },
-        yAxisLableFormat(value, index) {
-            return '';
-        },
-        xAxisInit() {
-            const list = [];
-            for (var time = 0 + this.PlanConvert.TranslationTime; time < 3600 * 24 + this.PlanConvert.TranslationTime; time++) {
-                list.push(time);
-            }
-
-            const startValue = 3600 * 6;
-            const offsetTime = 3600 * 1;
-
-            this.option.xAxis[0].data = list;
-            if (!this.option.dataZoom[0].startValue) {
-                this.option.dataZoom[0].startValue = this.option.dataZoom[1].startValue = startValue - offsetTime;
-            }
-
-            if (!this.option.dataZoom[0].endValue) {
-                this.option.dataZoom[0].endValue = this.option.dataZoom[1].endValue = startValue + offsetTime;
-            }
-        },
-        yAxisInit() {
-            if (Object.keys(this.PlanConvert).length) {
-                this.option.yAxis.min = this.PlanConvert.computedYaxisMinValue(this.stations);
-                this.option.yAxis.max = this.PlanConvert.computedYaxisMaxValue(this.stations);
-            }
-        },
-        axisTooltip(param) {
-            const station = this.stations[Math.floor((param.data[1] - this.PlanConvert.EdgeHeight) / this.PlanConvert.CoordMultiple)] || { name: '', kmRange: '' };
-            return [
-                `Point Data <hr size=1 style=" margin: 3px 0">`,
-                `${this.$t('menu.stationName') + station.name}<br>`,
-                `${this.$t('menu.stationKilometerMark') + station.kmRange} km <br>`,
-                `${this.$t('menu.arrivalTime2') + timeFormat(param.data[0] + this.PlanConvert.TranslationTime)} (${param.data[0]})<br>`
-            ].join('');
-        },
-        mouseClick(params) {
-            const model = {
-                serviceNumber: params.seriesName
-            };
-            this.$store.dispatch('runPlan/setSelected', model);
-        },
-        reSize(opt) {
-            if (this.myChart) {
-                this.myChart.resize({
-                    width: opt.width,
-                    height: opt.height,
-                    silent: false
-                });
-            }
-        },
-        destroy() {
-            if (this.myChart && this.myChart.isDisposed) {
-                this.myChart.dispose();
-                this.myChart = null;
-            }
-        },
-        scheduleTouch() {
-
-        },
-        trainNumTouch() {
-
-        }
-    }
-};
-</script>
-<style scoped rel="stylesheet/scss" lang="scss">
-    @import "src/styles/mixin.scss";
-
-    #PlanSchedule {
-        z-index: 5;
-        position: absolute;
-        width: 100%;
-
-        .left {
-            height: 100%;
-            width: 85%;
-            float: left;
-        }
-
-        .right {
-            height: 100%;
-            width: 15%;
-            float: right;
-        }
-    }
-</style>
diff --git a/src/jmapNew/theme/haerbin_01/planSchedule/titleBar.vue b/src/jmapNew/theme/haerbin_01/planSchedule/titleBar.vue
deleted file mode 100644
index 9009885e3..000000000
--- a/src/jmapNew/theme/haerbin_01/planSchedule/titleBar.vue
+++ /dev/null
@@ -1,75 +0,0 @@
-<template>
-  <div id="PlanTitleBar">
-    <!--<img class="logo" :src="logoImg">-->
-    <span style="margin-left: 10px"> {{ mapName }} &ensp;</span>
-    <span v-if="runPlanName">({{ runPlanName }})</span>
-    <span class="system-close el-icon-close" @click="back" />
-  </div>
-</template>
-
-<script>
-/* import logo_ from '@/assets/logo_.png';*/
-import { getPublishMapInfo } from '@/api/jmap/map';
-
-export default {
-    name: 'PlanTitleBar',
-    data() {
-        return {
-            mapName: ''
-            /* logoImg: logo_*/
-        };
-    },
-    computed: {
-        runPlanName() {
-            return this.$route.query.planName || '';
-        }
-    },
-    mounted() {
-        if (this.$route.query.mapId) {
-            getPublishMapInfo(this.$route.query.mapId).then(resp => {
-                this.mapName = resp.data.name;
-            });
-        }
-    },
-    methods: {
-        back() {
-            this.$emit('back');
-        }
-    }
-};
-</script>
-<style scoped rel="stylesheet/scss" lang="scss">
-    @import "src/styles/mixin.scss";
-    $width: 25px;
-    $height: 25px;
-
-    #PlanTitleBar {
-        z-index: 10;
-        display: flex;
-        position: absolute;
-        width: 100%;
-        height: $height;
-        line-height: $height;
-        background: -webkit-linear-gradient(#0055E8, #0099F8);
-        background: -o-linear-gradient(#0055E8, #0099F8);
-        background: -moz-linear-gradient(#0055E8, #0099F8);
-        background: linear-gradient(#0055E8, #0099F8);
-        color: white;
-        font: bold;
-        font-size: 16px;
-
-        .logo {
-            display: inline-block;
-            width: $width;
-            height: $height;
-            padding-right: 5px;
-        }
-
-        .system-close {
-            width: 25px;
-            height: 25px;
-            position: absolute;
-            right: 1px;
-        }
-    }
-</style>
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/routeControl.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/routeControl.vue
index 08b613516..f06c1f6e2 100644
--- a/src/jmapNew/theme/ningbo_01/menus/dialog/routeControl.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/dialog/routeControl.vue
@@ -24,8 +24,8 @@
     </el-row>
     <div v-if="passModel">
       <div style="height: 12px" />
-      <el-radio :id="upRadioId" v-model="passRadio" label="1" style="display: block; padding-left: 10px; margin-bottom: 10px;" :disabled="passRadio == '2'" @change="changeRadio">设置自动通过</el-radio>
-      <el-radio :id="upRadioId" v-model="passRadio" label="2" style="display: block; padding-left: 10px;" :disabled="passRadio == '1'" @change="changeRadio">取消自动通过</el-radio>
+      <el-radio v-model="passRadio" label="1" style="display: block; padding-left: 10px; margin-bottom: 10px;" :disabled="passRadio == '2'" @change="changeRadio">设置自动通过</el-radio>
+      <el-radio v-model="passRadio" label="2" style="display: block; padding-left: 10px;" :disabled="passRadio == '1'" @change="changeRadio">取消自动通过</el-radio>
     </div>
     <el-row justify="center" class="button-group">
       <el-col :span="10" :offset="2">
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/stationControl.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/stationControl.vue
index 161c4ea9a..b2233e491 100644
--- a/src/jmapNew/theme/ningbo_01/menus/dialog/stationControl.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/dialog/stationControl.vue
@@ -64,7 +64,8 @@ export default {
             row: null,
             operation: '',
             stationLists: [],
-            disabledAll: false
+            disabledAll: false,
+            checked2: false
         };
     },
     computed: {
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/turnBackControl.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/turnBackControl.vue
index d5207e778..37c1a36cb 100644
--- a/src/jmapNew/theme/ningbo_01/menus/dialog/turnBackControl.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/dialog/turnBackControl.vue
@@ -24,10 +24,10 @@
     </el-row>
     <el-row style="margin: 12px 0;">
       <el-col :span="11">
-        <el-radio :id="upRadioId" v-model="passRadio" label="1" style="display: block; padding-left: 10px; margin-bottom: 10px;" :disabled="passRadio == '2'">设置</el-radio>
+        <el-radio v-model="passRadio" label="1" style="display: block; padding-left: 10px; margin-bottom: 10px;" :disabled="passRadio == '2'">设置</el-radio>
       </el-col>
       <el-col :span="11" :offset="2">
-        <el-radio :id="upRadioId" v-model="passRadio" label="2" style="display: block; padding-left: 10px;" :disabled="passRadio == '1'">取消</el-radio>
+        <el-radio v-model="passRadio" label="2" style="display: block; padding-left: 10px;" :disabled="passRadio == '1'">取消</el-radio>
       </el-col>
     </el-row>
     <el-row justify="center" class="button-group">
diff --git a/src/jmapNew/theme/ningbo_01/menusPlan/addTask.vue b/src/jmapNew/theme/ningbo_01/menusPlan/addTask.vue
deleted file mode 100644
index cf092b0ca..000000000
--- a/src/jmapNew/theme/ningbo_01/menusPlan/addTask.vue
+++ /dev/null
@@ -1,175 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="ningbo-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 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();
-		}
-	}
-};
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-    @import "src/styles/mixin.scss";
-
-    /deep/ {
-        .el-button {
-            margin-left: 40px !important;
-            margin-right: 40px !important;
-        }
-
-        .el-row {
-            margin-bottom: 5px !important;
-        }
-
-        .el-input__inner {
-            height: 20px !important;
-            line-height: 20px !important;
-        }
-    }
-</style>
diff --git a/src/jmapNew/theme/ningbo_01/menusPlan/chooseTemplatePlan.vue b/src/jmapNew/theme/ningbo_01/menusPlan/chooseTemplatePlan.vue
deleted file mode 100644
index f9ea0760d..000000000
--- a/src/jmapNew/theme/ningbo_01/menusPlan/chooseTemplatePlan.vue
+++ /dev/null
@@ -1,115 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    :title="title"
-    class="ningbo-01__schedule choose-plan-template"
-    :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 } from '@/api/runplan';
-import { listPublishMap } from '@/api/jmap/map';
-
-export default {
-    name: 'ChooseTemplatePlan',
-    data() {
-        return {
-            dialogShow: false,
-            loading: false,
-            mapList: [],
-            pagerConfig: {
-                pageSize: 'pageSize',
-                pageIndex: 'pageNum'
-            },
-            queryForm: {
-                reset: true,
-                labelWidth: '100px',
-                queryObject: {
-                    name: {
-                        type: 'text',
-                        label: '运行图名称'
-                    }
-                }
-            },
-            queryList: {
-                query: this.queryFunction,
-                selectCheckShow: false,
-                radioShow: true,
-                columns: [
-                    {
-                        title: '运行图名称',
-                        prop: 'name'
-                    },
-                    {
-                        title: '地图名称',
-                        prop: 'mapId',
-                        type: 'tag',
-                        columnValue: (row) => {
-                            return this.$convertField(row.mapId, this.mapList, ['id', 'name']);
-                        },
-                        tagType: (row) => { return 'success'; }
-                    }
-                ]
-            },
-
-            currentModel: {}
-        };
-    },
-    computed: {
-        title() {
-            return '选择模板运行图';
-        }
-    },
-    methods: {
-        loadInitData() {
-            this.mapList = [];
-            listPublishMap().then(response => {
-                this.mapList = response.data;
-            });
-        },
-        doShow() {
-            this.loading = false;
-            this.dialogShow = true;
-            this.loadInitData();
-        },
-        doClose() {
-            this.dialogShow = false;
-        },
-        queryFunction(params) {
-            if (this.$store.state.map && this.$store.state.map.map) {
-                params['mapId'] = this.$route.query.mapId;
-                // params['lineCode'] = this.$store.getters['map/lineCode'];
-            }
-            return runPlanTemplateList(params);
-        },
-        handleConfirm() {
-            this.doClose();
-            if (this.$refs && this.$refs.pageRules) {
-                const choose = this.$refs.pageRules.currentChoose();
-                if (choose) {
-                    this.$emit('chooseConfirm', choose);
-                } else {
-                    this.$messageBox(`请选择模板运行图`);
-                }
-            }
-        },
-        reloadTable() {
-            this.queryList.reload();
-        }
-    }
-};
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-    @import "src/styles/mixin.scss";
-</style>
diff --git a/src/jmapNew/theme/ningbo_01/menusPlan/components/dataTable.vue b/src/jmapNew/theme/ningbo_01/menusPlan/components/dataTable.vue
deleted file mode 100644
index fa98a48e7..000000000
--- a/src/jmapNew/theme/ningbo_01/menusPlan/components/dataTable.vue
+++ /dev/null
@@ -1,206 +0,0 @@
-<template>
-  <div v-if="show">
-    <template v-if="maxmini">
-      <div class="nav">
-        <div v-show="config.showClose" class="cls-status" @click="touch('Close')"><span /></div>
-        <div class="min-status" @click="touch('Minim')"><span /></div>
-      </div>
-      <el-table
-        ref="table"
-        :data="config.data"
-        :highlight-current-row="config.highlightCurrentRow"
-        :height="height"
-        border
-        @current-change="handleChange"
-      >
-        <template v-for="(item,index) in config.columns">
-          <el-table-column :key="index" :prop="item.prop" :label="item.label" :width="item.width" />
-        </template>
-      </el-table>
-    </template>
-    <template v-else>
-      <div class="nav">
-        <div class=" max-status" @click="touch('Maxim')"><span /></div>
-      </div>
-    </template>
-  </div>
-</template>
-
-<script>
-export default {
-	name: 'DataTable',
-	props: {
-		height: {
-			type: Number,
-			required: true
-		},
-		config: {
-			type: Object,
-			required: true
-		}
-	},
-	data() {
-		return {
-			show: true,
-			maxmini: true,
-			touchStrategy: {
-				'Close': [false, true],
-				'Minim': [true, false],
-				'Maxim': [true, true]
-			}
-		};
-	},
-	methods: {
-		handleChange(row) {
-			if (this.config.handleChange) {
-				this.config.handleChange(row);
-			}
-		},
-		setCurrentRow(row) {
-			this.$refs.table.setCurrentRow(row);
-		},
-		touch(operate) {
-			this.$nextTick(() => {
-				[this.show, this.maxmini] = this.touchStrategy[operate];
-				this.$emit('touch', this.maxmini);
-			});
-		}
-	}
-};
-</script>
-
-<style scoped rel="stylesheet/scss" lang="scss" >
-    @import "src/styles/mixin.scss";
-    $height: 20px;
-    $width: 20px;
-
-    .nav {
-        display: table;
-        float: right;
-        width: 100%;
-        color: #0000;
-        background: -webkit-linear-gradient(#FDFDFE, #B1CBF3);
-        background: -o-linear-gradient(#FDFDFE, #B1CBF3);
-        background: -moz-linear-gradient(#FDFDFE, #B1CBF3);
-        background: linear-gradient(#FDFDFE, #B1CBF3);
-        border: 1px solid #B6BCCC !important;
-        border-bottom: 2px solid #B6BCCC !important;
-        list-style: none;
-        height: $height;
-        line-height: $height;
-    }
-
-    /deep/ {
-        .el-table--border th.gutter {
-            background: #EBEADB !important;
-        }
-
-        .el-table {
-            overflow-y: hidden;
-            width: 100%;
-
-            th.is-leaf {
-                padding: 0px 0;
-                background: #EBEADB;
-                border-right: none !important;
-                border-left: 1px solid #D1CDBD !important;
-                border-top: 1px solid #D1CDBD !important;
-                border-bottom: 1px inset #D1CDBD !important;
-                color: #000;
-
-                .cell {
-                    height: $height;
-                    line-height: $height;
-                }
-            }
-
-            td {
-                padding: 0px 0;
-
-                .cell {
-                    height: $height;
-                    line-height: $height;
-                    font-size: smaller !important;
-                }
-
-            }
-
-            .current-row>td {
-                background: #316AC5 !important;
-                color: #fff !important;
-            }
-        }
-
-        .cls-status {
-            float: right;
-            width: 12px;
-            height: 100%;
-            line-height: 100%;
-            margin-left: 5px;
-            cursor: pointer;
-
-            span {
-                display: inline-block;
-                content: '/';
-                background: black;
-                width: 2px;
-                height: 12px;
-                vertical-align: middle;
-               transform: rotate(45deg);
-            }
-
-            span::after {
-                display: block;
-                content: '/';
-                background: black;
-                width: 2px;
-                height: 12px;
-               transform: rotate(-90deg);
-            }
-        }
-
-        .min-status {
-            float: right;
-            width: 20px;
-            height: 100%;
-            line-height: 100%;
-            cursor: pointer;
-
-            span {
-                display: inline-block;
-                content: '-';
-                background: black;
-                width: 2px;
-                height: 12px;
-                vertical-align: middle;
-               transform: rotate(-90deg);
-            }
-        }
-
-        .max-status {
-            float: right;
-            width: 20px;
-            height: 100%;
-            line-height: 100%;
-            cursor: pointer;
-
-            span {
-                display: inline-block;
-                content: '';
-                background: black;
-                width: 2px;
-                height: 12px;
-                transform: rotate(0deg);
-            }
-
-            span::after {
-                display: block;
-                content: '';
-                background: black;
-                width: 2px;
-                height: 12px;
-               transform: rotate(90deg);
-            }
-        }
-    }
-</style>
diff --git a/src/jmapNew/theme/ningbo_01/menusPlan/createTodayPlan.vue b/src/jmapNew/theme/ningbo_01/menusPlan/createTodayPlan.vue
deleted file mode 100644
index 27e3513d2..000000000
--- a/src/jmapNew/theme/ningbo_01/menusPlan/createTodayPlan.vue
+++ /dev/null
@@ -1,134 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    :title="title"
-    class="ningbo-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 } from '@/api/runplan';
-import { getStationList } from '@/api/runplan';
-import { getEveryDayRunPlanData, generateDayRunPlan } from '@/api/simulation';
-import { getPublishMapInfo } from '@/api/jmap/map';
-
-export default {
-    name: 'ReloadTodayPlan',
-    data() {
-        return {
-            dialogShow: false,
-            loading: false,
-            pagerConfig: {
-                pageSize: 'pageSize',
-                pageIndex: 'pageNum'
-            },
-            queryForm: {
-                reset: true,
-                labelWidth: '100px',
-                queryObject: {
-                    name: {
-                        type: 'text',
-                        label: '运行图名称'
-                    }
-                }
-            },
-            queryList: {
-                query: this.queryFunction,
-                selectCheckShow: false,
-                radioShow: true,
-                columns: [
-                    {
-                        title: '运行图名称',
-                        prop: 'name'
-                    }
-                ]
-            },
-
-            currentModel: {}
-        };
-    },
-    computed: {
-        title() {
-            return '加载当天计划';
-        }
-    },
-    methods: {
-        doShow() {
-            this.loading = false;
-            this.dialogShow = true;
-        },
-        doClose() {
-            this.dialogShow = false;
-        },
-        queryFunction(params) {
-            if (this.$store.state.map && this.$store.state.map.map) {
-                // params['lineCode'] = this.$store.getters['map/lineCode'];
-                params['mapId'] = this.$route.query.mapId;
-            }
-            return runPlanTemplateList(params);
-        },
-        // 生成每日运行图
-        handleConfirm() {
-            if (this.$refs && this.$refs.pageRules) {
-                const choose = this.$refs.pageRules.currentChoose();
-                if (choose && choose.id) {
-                    this.loading = true;
-                    generateDayRunPlan(choose.id, this.$route.query.group).then(response => {
-                        this.loading = false;
-                        this.reloadTable();
-                        this.loadRunData();
-                        this.doClose();
-                        this.$message.success(`生成用户每日运行图成功`);
-                    }).catch(() => {
-                        this.loading = false;
-                        this.reloadTable();
-                        this.$messageBox(`生成用户每日运行图失败`);
-                    });
-                } else {
-                    this.$messageBox(`请选择需要加载的运行图`);
-                }
-            }
-        },
-        loadRunData() {
-            // const skinCode = this.$route.query.skinCode;
-            const mapId = this.$route.query.mapId;
-            this.$store.dispatch('runPlan/clear');
-            if (mapId) {
-                getStationList(mapId).then(response => {
-                    const stations = response.data;
-                    getPublishMapInfo(this.$route.query.mapId).then(res=>{
-                        this.PlanConvert = this.$theme.loadPlanConvert(res.data.lineCode);
-                        this.$store.dispatch('runPlan/setStations', stations).then(() => {
-                            getEveryDayRunPlanData(this.$route.query.group).then(resp => {
-                                this.$store.dispatch('runPlan/setPlanData', resp.data);
-                            }).catch(() => {
-                                this.$store.dispatch('runPlan/setPlanData', []);
-                                this.$messageBox(`获取运行图数据失败`);
-                            });
-                        });
-                    });
-                }).catch(() => {
-                    this.$messageBox(`获取车站列表失败`);
-                });
-            }
-        },
-        reloadTable() {
-            this.queryList.reload();
-        }
-    }
-};
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-    @import "src/styles/mixin.scss";
-</style>
diff --git a/src/jmapNew/theme/ningbo_01/menusPlan/createWeekPlan.vue b/src/jmapNew/theme/ningbo_01/menusPlan/createWeekPlan.vue
deleted file mode 100644
index 48f65d60f..000000000
--- a/src/jmapNew/theme/ningbo_01/menusPlan/createWeekPlan.vue
+++ /dev/null
@@ -1,137 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="ningbo-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';
-
-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 {
-				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";
-
-    .card-box {
-        padding-top: 10px;
-    }
-
-    /deep/ {
-        .el-row {
-            margin: 10px;
-        }
-    }
-</style>
diff --git a/src/jmapNew/theme/ningbo_01/menusPlan/deleteTask.vue b/src/jmapNew/theme/ningbo_01/menusPlan/deleteTask.vue
deleted file mode 100644
index 035f23fca..000000000
--- a/src/jmapNew/theme/ningbo_01/menusPlan/deleteTask.vue
+++ /dev/null
@@ -1,73 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="ningbo-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();
-		}
-	}
-};
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-    @import "src/styles/mixin.scss";
-
-    /deep/ {
-        .el-row {
-            margin: 10px;
-        }
-    }
-</style>
diff --git a/src/jmapNew/theme/ningbo_01/menusPlan/deleteTodayPlan.vue b/src/jmapNew/theme/ningbo_01/menusPlan/deleteTodayPlan.vue
deleted file mode 100644
index 3110e2858..000000000
--- a/src/jmapNew/theme/ningbo_01/menusPlan/deleteTodayPlan.vue
+++ /dev/null
@@ -1,62 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="ningbo-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();
-		}
-	}
-};
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-    @import "src/styles/mixin.scss";
-
-    /deep/ {
-        .el-row {
-            margin: 10px;
-        }
-    }
-</style>
diff --git a/src/jmapNew/theme/ningbo_01/menusPlan/managePlanList.vue b/src/jmapNew/theme/ningbo_01/menusPlan/managePlanList.vue
deleted file mode 100644
index 034b461b6..000000000
--- a/src/jmapNew/theme/ningbo_01/menusPlan/managePlanList.vue
+++ /dev/null
@@ -1,143 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="ningbo-01__schedule manage-plan-list"
-    :title="title"
-    :visible.sync="dialogShow"
-    width="80%"
-    :before-close="doClose"
-    :z-index="2000"
-    :modal="false"
-    :close-on-click-modal="false"
-  >
-    <QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
-  </el-dialog>
-</template>
-
-<script>
-import { getRunPlanLoadList, deleteRunPlanLoad, listAllTempLateRunPlan } from '@/api/runplan';
-import { getPublishMapListOnline } from '@/api/jmap/map';
-
-export default {
-    name: 'ManagePlanList',
-    data() {
-        return {
-            dialogShow: false,
-            loading: false,
-            pagerConfig: {
-                pageSize: 'pageSize',
-                pageIndex: 'pageNum'
-            },
-            queryForm: {
-                labelWidth: '140px',
-                reset: true
-            },
-            queryList: {
-                query: this.queryFunction,
-                selectCheckShow: false,
-                indexShow: true,
-                columns: [
-                    {
-                        title: this.$t('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 '运行图计划表';
-        }
-    },
-    mounted() {
-        this.loadPageData();
-    },
-    methods: {
-        loadPageData() {
-            this.mapList = [];
-            getPublishMapListOnline().then(resp => {
-                this.mapList = resp.data;
-            });
-            this.templatePlanList = [];
-            listAllTempLateRunPlan().then(resp => {
-                this.templatePlanList = resp.data;
-            });
-        },
-        queryFunction(params) {
-            if (this.$route.query.mapId) {
-                params['mapId'] = this.$route.query.mapId;
-            }
-
-            if (this.$store.state.user.id) {
-                params['userId'] = this.$store.state.user.id;
-            }
-
-            return getRunPlanLoadList(params);
-        },
-        handleDelete(index, row) {
-            this.$confirm('此操作将删除次日加载的运行图, 是否继续?', '提示', {
-                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>
diff --git a/src/jmapNew/theme/ningbo_01/menusPlan/modifyingPlan.vue b/src/jmapNew/theme/ningbo_01/menusPlan/modifyingPlan.vue
deleted file mode 100644
index a9d25ea80..000000000
--- a/src/jmapNew/theme/ningbo_01/menusPlan/modifyingPlan.vue
+++ /dev/null
@@ -1,177 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="ningbo-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 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-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';
-
-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";
-
-    .view-button {
-        display: list-item;
-        width: 150px !important;
-        margin-left: 0px;
-    }
-
-    .view-label {
-        height: 32px;
-        line-height: 32px;
-    }
-
-    .view-box {
-        padding: 10px 0px;
-        border: 1px inset gray;
-        border-top: 1px outset gray;
-        border-left: 1px outset gray;
-    }
-
-    /deep/ {
-        .el-row {
-            margin: 5px 20px;
-        }
-    }
-</style>
diff --git a/src/jmapNew/theme/ningbo_01/menusPlan/modifyingTask.vue b/src/jmapNew/theme/ningbo_01/menusPlan/modifyingTask.vue
deleted file mode 100644
index 194534120..000000000
--- a/src/jmapNew/theme/ningbo_01/menusPlan/modifyingTask.vue
+++ /dev/null
@@ -1,327 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="ningbo-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-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-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-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-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';
-
-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 tripNumberList = Object.keys(editData.trainMap).sort((a, b) => { return editData.trainMap[a].oldIndex - editData.trainMap[b].oldIndex; });
-				const trainInfo = editData.trainMap[params.tripNumber];
-				const lastIndex = trainInfo.stationTimeList.length - 1;
-				const taskObj = {
-					tripNumber: params.tripNumber,
-					beginStationCode: trainInfo.stationTimeList[0].stationCode,
-					beginStationStandCode: '',
-					endStationCode: trainInfo.stationTimeList[lastIndex].stationCode,
-					endStationStandCode: ''
-				};
-				this.model.route.push(taskObj);
-
-				trainInfo.stationTimeList.forEach((elem, index) => {
-					const stationObj = {
-						stationCode: elem.stationCode,
-						startTime: index == 0 ? null : trainInfo.stationTimeList[index - 1].secondTime,
-						stopTime: index == 0 ? null : elem.secondTime - trainInfo.stationTimeList[index - 1].secondTime,
-						endTime: elem.secondTime,
-						level: ''
-					};
-					this.model.detail.push(stationObj);
-				});
-			}
-		},
-		doShow(params) {
-			this.loadInitData(params);
-			this.dialogShow = true;
-		},
-		doClose() {
-			this.loading = false;
-			this.dialogShow = false;
-		},
-		handleCommit() {
-		}
-	}
-};
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-    @import "src/styles/mixin.scss";
-
-    /deep/ {
-        .el-button {
-            margin-left: 40px !important;
-            margin-right: 40px !important;
-        }
-
-        .el-row {
-            margin-bottom: 5px !important;
-        }
-
-        .el-input__inner {
-            height: 20px !important;
-            line-height: 20px !important;
-        }
-
-        .el-input {
-            width: 110px !important;
-        }
-    }
-</style>
diff --git a/src/jmapNew/theme/ningbo_01/model.js b/src/jmapNew/theme/ningbo_01/model.js
index ed34da08c..dd040cf61 100644
--- a/src/jmapNew/theme/ningbo_01/model.js
+++ b/src/jmapNew/theme/ningbo_01/model.js
@@ -14,6 +14,9 @@ class Model {
         this['private'][deviceType.StationControl] = {
             indicatorShow: true									// 标识灯名称显示
         };
+        this['private'][deviceType.Station] = {
+            kmPostShow: true									// 公里标显示
+        };
         this['private'][deviceType.Switch] = {
             nameShow: true
         };
diff --git a/src/jmapNew/theme/ningbo_01/planSchedule/index.vue b/src/jmapNew/theme/ningbo_01/planSchedule/index.vue
deleted file mode 100644
index 332007bb7..000000000
--- a/src/jmapNew/theme/ningbo_01/planSchedule/index.vue
+++ /dev/null
@@ -1,403 +0,0 @@
-<template>
-  <div class="plan-schedule" style="width: 100%">
-    <title-bar ref="titleBar" @back="back" />
-    <menu-bar ref="menuBar" :line-code="lineCode" @dispatchDialog="dispatchDialog" />
-    <schedule ref="schedule" :group="group" :line-code="lineCode" :max-height="height" :max-width="width" />
-    <status-bar ref="statusBar" :max-top="height" @setPosition="setPosition" />
-
-    <manage-plan-list ref="managePlanList" @dispatchDialog="dispatchDialog" />
-    <create-week-plan ref="createWeekPlan" @reloadTable="reloadTable" />
-    <create-today-plan ref="createTodayPlan" />
-    <modifying-plan ref="modifyingPlan" @dispatchDialog="dispatchDialog" />
-    <add-task ref="addTask" />
-    <delete-task ref="deleteTask" />
-    <modifying-task ref="modifyingTask" />
-  </div>
-</template>
-
-<script>
-import TitleBar from './titleBar';
-import MenuBar from './menuBar';
-import StatusBar from './statusBar';
-import Schedule from './schedule';
-import ManagePlanList from '../menusPlan/managePlanList';
-import CreateWeekPlan from '../menusPlan/createWeekPlan';
-import CreateTodayPlan from '../menusPlan/createTodayPlan';
-import ModifyingPlan from '../menusPlan/modifyingPlan';
-import AddTask from '../menusPlan/addTask';
-import DeleteTask from '../menusPlan/deleteTask';
-import ModifyingTask from '../menusPlan/modifyingTask';
-
-export default {
-    name: 'Menus',
-    components: {
-        TitleBar,
-        MenuBar,
-        StatusBar,
-        Schedule,
-        ManagePlanList,
-        CreateWeekPlan,
-        CreateTodayPlan,
-        ModifyingPlan,
-        AddTask,
-        DeleteTask,
-        ModifyingTask
-    },
-    props: {
-        group: {
-            type: String,
-            required: true
-        }
-    },
-    data() {
-        return {
-        };
-    },
-    computed: {
-        lineCode() {
-            return this.$route.query.lineCode || '02';
-        },
-        width() {
-            return this.$store.state.app.width;
-        },
-        height() {
-            return this.$store.state.app.height;
-        }
-    },
-    methods: {
-        setPosition() {
-            this.$nextTick(() => {
-                this.$refs.schedule.setPosition();
-            });
-        },
-        dispatchDialog(dialogObj) {
-            this.$nextTick(() => {
-                if (this.$refs[dialogObj.name]) {
-                    this.$refs[dialogObj.name].doShow(dialogObj.params);
-                }
-            });
-        },
-        reloadTable(dialogObj) {
-            if (this.$refs[dialogObj.name]) {
-                this.$refs[dialogObj.name].reloadTable();
-            }
-        },
-        confirm(params) {
-        },
-        back() {
-            this.$emit('back');
-        }
-    }
-};
-</script>
-
-<style>
-    .plan-schedule {
-        position: absolute;
-        background: gray;
-    }
-
-    .plan-schedule .pop-menu {
-        background: #F0F0F0;
-    }
-
-    .plan-schedule .pop-menu span {
-        color: #000;
-    }
-
-    .plan-schedule .system-close {
-        cursor: pointer;
-        position: absolute;
-        right: 0px;
-        background: -webkit-linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
-        background: -o-linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
-        background: -moz-linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
-        background: linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
-        border: 1px solid white;
-        border-radius: 4px;
-    }
-
-    .plan-schedule .system-close::before {
-        position: absolute;
-        height: 22px;
-        line-height: 22px;
-        top: 0px;
-        left: 0px;
-        font-size: x-large;
-    }
-
-    .plan-schedule .pop-menu .is-disabled span {
-        color: #B4B3B8;
-    }
-
-    .ningbo-01__schedule {
-        overflow: hidden !important;
-    }
-
-    .ningbo-01__schedule .el-dialog {
-        background: rgba(0, 85, 231, 1);
-        box-shadow: 1px hsla(240, 0%, 100%, 0.5) inset;
-        border: 2px solid #727375;
-        border-radius: 4px;
-        color: #000;
-        font-size: 14px;
-    }
-
-    .ningbo-01__schedule .el-dialog .el-dialog__header {
-        height: 30px;
-        padding: 5px;
-    }
-
-    .ningbo-01__schedule .el-dialog .el-dialog__footer {
-        background: #ECE9D8;
-        opacity: 1;
-    }
-
-    .ningbo-01__schedule .el-dialog .el-dialog__body {
-        padding-top: 10px;
-        padding-bottom: 10px;
-        padding-left: 5px;
-        padding-right: 5px;
-        margin: 0px 3px 3px 3px;
-        border: 2px solid rgba(120, 121, 123, 0.5);
-        box-shadow: 1px hsla(240, 0%, 100%, 0.5) inset;
-        color: #000;
-        background: #ECE9D8;
-        opacity: 1;
-    }
-
-    .ningbo-01__schedule .el-dialog .el-dialog__title {
-        font-size: 16px;
-    }
-
-    .ningbo-01__schedule .el-dialog .el-dialog__headerbtn {
-        background: -webkit-linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
-        background: -o-linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
-        background: -moz-linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
-        background: linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
-        border: 1px solid white;
-        border-radius: 4px;
-        top: 0px;
-        right: 3px;
-        line-height: 26px;
-        width: 26px;
-    }
-
-    .ningbo-01__schedule .el-dialog .el-dialog__headerbtn .el-icon-close:before {
-        font-size: 16px;
-    }
-
-    .ningbo-01__schedule .el-dialog .el-dialog__headerbtn .el-dialog__close {
-        color: #fff;
-    }
-
-    .ningbo-01__schedule .el-dialog .el-form {
-        background: #ECE9D8 !important;
-    }
-
-    .ningbo-01__schedule .el-dialog .el-card {
-        background: #ECE9D8 !important;
-    }
-
-    .ningbo-01__schedule .el-dialog .el-button {
-        height: 32px;
-        line-height: 32px;
-        padding: 0px;
-        width: 80px;
-        border: 2px outset #E2E2E2;
-        border-radius: 0px !important;
-        color: #000;
-        background: #ECE9D8;
-    }
-
-    .ningbo-01__schedule .el-dialog .expand {
-        width: 120px;
-    }
-
-    .ningbo-01__schedule .el-dialog .el-button:focus span {
-        border: 1px dashed gray;
-    }
-
-    .ningbo-01__schedule .el-dialog .el-button:active {
-        border: 2px inset #E2E2E2;
-    }
-
-    .ningbo-01__schedule .el-dialog .el-button:disabled {
-        border: 2px inset #E2E2E2;
-    }
-
-    .ningbo-01__schedule .el-dialog .el-button:disabled span {
-        border: 0px;
-    }
-
-    .ningbo-01__schedule .el-dialog .button-group {
-        margin: 0px 5px;
-        text-align: center !important;
-    }
-
-    .ningbo-01__schedule .el-dialog .el-input {
-        border: 2px inset #E9E9E9;
-    }
-
-    .ningbo-01__schedule .el-dialog .el-input .el-input__inner {
-        color: #000;
-        background: #fff !important;
-        border: 0px;
-        border-radius: 0px !important;
-        box-sizing: border-box;
-    }
-
-    .ningbo-01__schedule .el-dialog .el-input.is-disabled .el-input__inner {
-        background: #F0F0F0 !important;
-    }
-
-    .ningbo-01__schedule .el-dialog .el-textarea {
-        border: 2px inset #E9E9E9;
-        border-radius: 0px;
-    }
-
-    .ningbo-01__schedule .el-dialog .el-textarea .el-textarea__inner {
-        color: #000;
-        background: #fff !important;
-        border: 0px;
-        border-radius: 0px !important;
-        box-sizing: border-box;
-    }
-
-    .ningbo-01__schedule .el-dialog .el-textarea.is-disabled .el-textarea__inner {
-        background: #F0F0F0 !important;
-    }
-
-    .ningbo-01__schedule .el-dialog .el-table {
-        border: 2px inset #E9E9E9;
-        color: #000 !important;
-    }
-
-    .ningbo-01__schedule .el-dialog .el-table .cell {
-        line-height: unset !important;
-    }
-
-    .ningbo-01__schedule .el-dialog .el-table th.is-leaf {
-        background: #ECE9D8 !important;
-        border-right: 1px solid #BDBDBD !important;
-        border-bottom: 1px solid #BDBDBD !important;
-        color: #000 !important;
-        height: 20px !important;
-        padding: 0px;
-    }
-
-    .ningbo-01__schedule .el-dialog .el-table tr td {
-        height: 20px !important;
-        padding: 0px;
-    }
-
-    .ningbo-01__schedule .el-dialog .el-table .el-table__empty-text {
-        top: 15px !important;
-    }
-
-    .ningbo-01__schedule .el-dialog .current-row>td {
-        background: #316AC5 !important;
-        color: #fff !important;
-    }
-
-    .ningbo-01__schedule .el-dialog .el-checkbox__inner {
-        border: 1px inset #dcdfe6 !important;
-    }
-
-    .ningbo-01__schedule .el-dialog .el-checkbox__label {
-        color: #000 !important;
-    }
-
-    .ningbo-01__schedule .el-dialog .el-checkbox.is-disabled .el-checkbox__inner {
-        background: #E6E6E6 !important;
-    }
-
-    .ningbo-01__schedule .el-dialog .el-checkbox.is-disabled .el-checkbox__label {
-        color: #C5C9CC !important;
-    }
-
-    .ningbo-01__schedule .el-dialog .el-checkbox__input.is-checked .el-checkbox__inner {
-        background: #fff !important;
-        border: 1px inset #dcdfe6 !important;
-    }
-
-    .ningbo-01__schedule .el-dialog .el-checkbox__input.is-checked .el-checkbox__inner::after {
-        position: absolute;
-        -webkit-box-sizing: content-box;
-        box-sizing: content-box;
-        content: "";
-        border: 1px solid #000;
-        border-left: 0;
-        border-top: 0;
-        height: 7px;
-        left: 4px;
-        top: 1px;
-    }
-
-    .ningbo-01__schedule .el-dialog .el-radio__inner {
-        border: 1px inset #dcdfe6 !important;
-    }
-
-    .ningbo-01__schedule .el-dialog .el-radio__label {
-        color: #000 !important;
-    }
-
-    .ningbo-01__schedule .el-dialog .el-radio__input.is-checked .el-radio__inner {
-        background: #fff !important;
-        border: 1px inset #dcdfe6 !important;
-    }
-
-    .ningbo-01__schedule .el-dialog .el-radio__input.is-checked .el-radio__inner::after {
-        width: 4px;
-        height: 4px;
-        border-radius: 100%;
-        background-color: #000 !important;
-        position: absolute;
-        left: 50%;
-        top: 50%;
-    }
-
-    .ningbo-01__schedule .el-dialog .el-radio.is-disabled .el-radio__inner {
-        background: #E6E6E6 !important;
-    }
-
-    .ningbo-01__schedule .el-dialog .el-radio.is-disabled .el-radio__label {
-        color: #C5C9CC !important;
-    }
-
-    .ningbo-01__schedule .el-dialog .base-label {
-        background: rgba(0, 0, 0, x);
-        position: relative;
-        left: -15px;
-        top: -18px;
-    }
-
-    .ningbo-01__schedule .el-dialog .el-form-item label {
-        font-weight: normal !important;
-        color: #000 !important;
-    }
-
-    .ningbo-01__schedule .el-dialog .context {
-        height: 100px;
-        border: 2px inset #E2E2E2;
-        overflow-y: scroll;
-    }
-
-    .ningbo-01__schedule .el-dialog .table {
-        margin-top: 10px;
-    }
-
-    .ningbo-01__schedule .el-dialog .notice {
-        margin-left: 62px;
-        line-height: 30px;
-    }
-
-    .ningbo-01__schedule .el-dialog .button-group {
-        margin-top: 10px;
-    }
-
-    .ningbo-01__schedule .el-dialog .el-tree__empty-block {
-        background: #E9E9E9 !important;
-        color: #000 !important;
-    }
-</style>
diff --git a/src/jmapNew/theme/ningbo_01/planSchedule/menuBar.vue b/src/jmapNew/theme/ningbo_01/planSchedule/menuBar.vue
deleted file mode 100644
index e64ae3063..000000000
--- a/src/jmapNew/theme/ningbo_01/planSchedule/menuBar.vue
+++ /dev/null
@@ -1,514 +0,0 @@
-<template>
-  <div id="PlanMenuBar">
-    <div class="nav">
-      <template v-for="(item,i) in menu">
-        <template v-if="noShowingChildren(item.children)">
-          <li class="nav-li" @click="hookClick(item)">
-            <span class="nav-li-text">{{ item.title }}</span>
-          </li>
-        </template>
-        <template v-else>
-          <li class="nav-li" @click.stop="popupMenuA(item, i)">
-            <span class="nav-li-text">{{ item.title }}</span>
-            <ul class="nav-ul" :class="{'active' :i==classA}">
-              <template v-for="(child,j) in item.children">
-                <template
-                  v-if="child.children&&child.children.length>0&&hasShowingChildren(child.children)"
-                >
-                  <li v-if="child.type === 'separator'" class="menu-separator">
-                    <span class="status">&ensp;</span>
-                    <span class="separator">&ensp;</span>
-                  </li>
-                  <li v-else-if="child.type === 'file'" class="menu-li">
-                    <div class="menu-li-block">
-                      <span class="menu-li-text">
-                        <span class="status">&ensp;</span>
-                        <el-button type="text" class="button" :disabled="child.disabled">
-                          <input
-                            :ref="child.label"
-                            type="file"
-                            accept=".csv, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel"
-                            @change="openLoadFile(child)"
-                          >
-                          {{ child.title }}
-                        </el-button>
-                      </span>
-                    </div>
-                  </li>
-                  <li v-else class="menu-li" @click.stop="popupMenuB(child, j)">
-                    <div class="menu-li-block">
-                      <span class="menu-li-text">
-                        <span class="status">&ensp;</span>
-                        <span class="label">{{ child.title }}</span>
-                      </span>
-                    </div>
-                    <ul class="menu-ul" :class="{'active' :j==classB}">
-                      <template v-for="(grandchild,k) in child.children">
-                        <li v-if="grandchild.type === 'separator'" class="menu-separator">
-                          <span class="status">&ensp;</span>
-                          <span class="separator">&ensp;</span>
-                        </li>
-                        <li v-else-if="grandchild.type === 'file'" class="menu-li">
-                          <div class="menu-li-block">
-                            <span class="menu-li-text">
-                              <span class="status">&ensp;</span>
-                              <el-button
-                                type="text"
-                                class="button"
-                                :disabled="grandchild.disabled"
-                              >
-                                <input
-                                  :ref="grandchild.label"
-                                  type="file"
-                                  accept=".csv, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel"
-                                  @change="openLoadFile(grandchild)"
-                                >
-                                {{ grandchild.title }}
-                              </el-button>
-                            </span>
-                          </div>
-                        </li>
-                        <li v-else class="menu-li" @click.stop="hookClick(grandchild)">
-                          <div class="menu-li-block">
-                            <span class="menu-li-text">
-                              <span class="status">&ensp;</span>
-                              <span class="label">{{ grandchild.title }}</span>
-                            </span>
-                          </div>
-                        </li>
-                      </template>
-                    </ul>
-                  </li>
-                </template>
-                <template v-else>
-                  <li v-if="child.type === 'separator'" class="menu-separator">
-                    <span class="status">&ensp;</span>
-                    <span class="separator">&ensp;</span>
-                  </li>
-                  <li v-else-if="child.type === 'file'" class="menu-li">
-                    <div class="menu-li-block">
-                      <span class="menu-li-text">
-                        <span class="status">&ensp;</span>
-                        <el-button type="text" class="button" :disabled="child.disabled">
-                          <input
-                            :ref="child.title"
-                            type="file"
-                            accept=".csv, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel"
-                            @change="openLoadFile(child)"
-                          >
-                          {{ child.title }}
-                        </el-button>
-                      </span>
-                    </div>
-                  </li>
-                  <li v-else class="menu-li" @click.stop="hookClick(child)">
-                    <div class="menu-li-block">
-                      <span class="menu-li-text">
-                        <span class="status">&ensp;</span>
-                        <span class="label">{{ child.title }}</span>
-                      </span>
-                    </div>
-                  </li>
-                </template>
-              </template>
-            </ul>
-          </li>
-        </template>
-      </template>
-    </div>
-  </div>
-</template>
-<script>
-import { mapGetters } from 'vuex';
-import { EventBus } from '@/scripts/event-bus';
-
-export default {
-    name: 'PlanMenuBar',
-    props: {
-        lineCode: {
-            type: String,
-            required: true
-        }
-    },
-    data() {
-        return {
-            classA: -1,
-            classB: -1,
-            tempClassA: -1,
-            tempClassB: -1,
-            menu: [
-                {
-                    title: '文件（F）',
-                    children: [
-                    ]
-                },
-                {
-                    title: '显示（V）',
-                    children: [
-                        // {
-                        //     title: '缩放',
-                        // },
-                        // {
-                        //     title: '单色显示历史计划',
-                        // },
-                        // {
-                        //     title: '彩色显示历史计划'
-                        // }
-                    ]
-                },
-                {
-                    title: '编辑（E）',
-                    children: [
-                        // {
-                        //     title: '修改',
-                        //     click: this.handleEditPlanningTrain
-                        // },
-                        // {
-                        //     title: '加任务',
-                        //     click: this.handleAddTask
-                        // },
-                        // {
-                        //     title: '删任务',
-                        //     click: this.handleDeleteTask
-                        // },
-                        // {
-                        //     title: '改表号',
-                        //     click: this.handleModifyingPlanId
-                        // },
-                        // {
-                        //     title: '平移多辆车',
-                        //     click: this.handleTranslationalMulTrain
-                        // }
-                    ]
-                },
-                {
-                    title: '工具（T）',
-                    children: [
-                        {
-                            title: '查看计划列表',
-                            click: this.handleViewPlanSchedule
-                        },
-                        {
-                            title: '创建一周计划',
-                            click: this.handleCreateWeekPlan
-                        },
-                        {
-                            title: '加载当天计划',
-                            click: this.handleReloadTodayPlan
-                        }
-                        // {
-                        //     title: '有效性检查',
-                        //     click: this.handleValidityCheck
-                        // }
-                    ]
-                },
-                {
-                    title: '帮助（H）',
-                    children: [
-                    ]
-                }
-            ]
-        };
-    },
-    computed: {
-        ...mapGetters('training', [
-            'mode'
-        ]),
-        ...mapGetters('map', [
-            'stationList'
-        ])
-    },
-    watch: {
-        tempClassA() {
-            this.classA = this.$store.state.menuOperation.break ? -1 : this.tempClassA;
-        },
-        tempClassB() {
-            this.classB = this.$store.state.menuOperation.break ? -1 : this.tempClassB;
-        },
-        '$store.state.menuOperation.break': function (val) {
-            if (val) {
-                this.classA = this.classB = -1;
-            } else {
-                this.classA = this.tempClassA;
-                this.classB = this.tempClassB;
-            }
-        }
-    },
-    mounted() {
-        this.initMenu();
-    },
-    methods: {
-        initMenu() {
-            this.clickEvent();
-            this.closeMenu();
-        },
-        clickEvent() {
-            const self = this;
-            window.onclick = function (e) {
-                self.closeMenu(false);
-            };
-        },
-        noShowingChildren(children) {
-            if (!children || children.length <= 0) {
-                return true;
-            }
-            return false;
-        },
-        hasShowingChildren(children) {
-            if (children && children.length > 0) {
-                return true;
-            }
-            return false;
-        },
-        closeMenu() {
-            this.classA = this.tempClassA = -1;
-            this.classB = this.tempClassB = -1;
-        },
-        hookClick(item, event) {
-            this.closeMenu();
-            setTimeout(() => {
-                if (item && typeof item.click == 'function') {
-                    item.click();
-                }
-            }, 500);
-        },
-        popupMenuA(item, index) {
-            this.clickEvent();
-            this.tempClassA = index;
-            this.tempClassB = -1;
-        },
-        popupMenuB(item, index) {
-            this.tempClassB = index;
-        },
-        openLoadFile(item) {
-            const obj = this.$refs[item.title][0];
-            if (obj.files) {
-                const file = obj.files[0];
-                item.click(file);
-                obj.value = '';
-            }
-        },
-        doClose() {
-            this.$nextTick(() => {
-                EventBus.$emit('closeMenu');
-            });
-        },
-        // 刷新
-        refresh() {
-            this.closeMenu(true);
-            EventBus.$emit('refresh');
-        },
-        undeveloped() {
-            this.doClose();
-            this.$alert('实现中......', '提示', {
-                confirmButtonText: '确定',
-                callback: action => {
-                }
-            });
-        },
-        // 修改计划
-        handleEditPlanningTrain() {
-            this.$emit('dispatchDialog', { name: 'modifyingPlan' });
-        },
-        // 添加任务
-        handleAddTask() {
-            const params = this.$store.state.runPlan.selected;
-            this.$emit('dispatchDialog', { name: 'addTask', params });
-        },
-        // 删除任务
-        handleDeleteTask() {
-            const params = this.$store.state.runPlan.selected;
-            this.$emit('dispatchDialog', { name: 'deleteTask', params });
-        },
-        // 修改任务
-        handleModifyingTask() {
-            const params = this.$store.state.runPlan.selected;
-            this.$emit('dispatchDialog', { name: 'modifyingTask', params });
-        },
-        // 改表号
-        handleModifyingPlanId() {
-            this.$emit('dispatchDialog', { name: 'modifyingPlanId' });
-        },
-        // 平移多辆车
-        handleTranslationalMulTrain() {
-            this.$emit('dispatchDialog', { name: 'translationalMulTrain' });
-        },
-        // 查看计划列表
-        handleViewPlanSchedule() {
-            this.$emit('dispatchDialog', { name: 'managePlanList' });
-        },
-        // 创建一周计划
-        handleCreateWeekPlan() {
-            this.$emit('dispatchDialog', { name: 'createWeekPlan' });
-        },
-        // 创建当天计划
-        handleReloadTodayPlan() {
-            this.$emit('dispatchDialog', { name: 'createTodayPlan' });
-        },
-        // 有效性检查
-        handleValidityCheck() {
-        }
-    }
-};
-</script>
-
-<style scoped rel="stylesheet/scss" lang="scss">
-    @import "src/styles/mixin.scss";
-    $top: 25px;
-    $width: 30px;
-    $height: 20px;
-    $menuPadding: 10px;
-    $menuItemHeight: 30px;
-    $menuItemWidth: 160px;
-    $menuItemPadding: 5px;
-
-    #PlanMenuBar {
-        z-index: 10;
-        position: absolute;
-        top: $top;
-        width: 100%;
-        height: $height;
-        line-height: $height;
-    }
-
-    .nav {
-        display: block;
-        cursor: pointer;
-        color: #0000;
-        background: #EBEADB;
-        list-style: none;
-        border: 1px solid #B6BCCC !important;
-    }
-
-    .nav-li {
-        position: relative;
-        display: inline-block;
-        padding-left: $menuPadding;
-        padding-right: $menuPadding;
-    }
-
-    .nav-li:active {
-        background: #C9D0E1;
-        border-radius: 4px;
-    }
-
-    .nav-li-text {
-        font-size: 13px;
-        color: #000;
-        text-align: center;
-        text-decoration: none;
-    }
-
-    .nav-ul {
-        display: none;
-        position: absolute;
-        list-style: none;
-        border: 1px solid gray;
-        width: $menuItemWidth;
-        padding: 0px;
-        margin: 0px;
-    }
-
-    .menu-ul {
-        display: none;
-        list-style: none;
-        background: #F0F0F0;
-        line-height: $menuItemHeight;
-        width: $menuItemWidth;
-        bottom: $menuItemHeight;
-    }
-
-    .active {
-        position: absolute;
-        display: block !important;
-    }
-
-    .menu-ul-text {
-        font-size: 14px;
-        color: #000;
-        letter-spacing: 0;
-        height: $menuItemHeight;
-        line-height: $menuItemHeight;
-        border-left: 1px solid #000;
-        border-right: 1px solid #000;
-    }
-
-    .menu-separator {
-        text-align: left;
-        background: #F0F0F0;
-        height: 2px;
-        line-height: 2px;
-    }
-
-    .menu-separator .status {
-        display: inline-block;
-        border-right: 1px inset #CACACA;
-        width: $width;
-        height: 100%;
-        background: #EFECDE;
-    }
-
-    .menu-separator .separator {
-        display: inline-block;
-        background: #CACACA;
-        margin-left: 5px;
-        height: 2px;
-        width: $menuItemWidth - $width - 30px;
-    }
-
-    .menu-li {
-        text-align: left;
-        background: #F0F0F0;
-        height: $menuItemHeight;
-        line-height: $menuItemHeight;
-    }
-
-    .menu-li-block {
-        letter-spacing: 0;
-        height: $menuItemHeight;
-        line-height: $menuItemHeight;
-    }
-
-    .menu-li-text {
-        font-size: 14px;
-        color: #000;
-    }
-
-    .menu-li-text .status {
-        display: inline-block;
-        border-right: 1px inset #CACACA;
-        width: $width;
-        background: #EFECDE;
-    }
-
-    .menu-li-text .label {
-        display: inline-block;
-        margin-left: 5px;
-    }
-
-    .menu-li-text .button {
-        position: relative;
-        overflow: hidden;
-        margin-left: 10px;
-        line-height: 0px;
-        width: $menuItemWidth - $width;
-        top: -$menuItemHeight;
-        color: #000;
-        cursor: pointer;
-
-        input {
-            opacity: 0;
-            cursor: pointer;
-            position: absolute;
-            top: 0px;
-            width: $menuItemWidth - $width - 10px;
-        }
-    }
-
-    .menu-li-block:hover {
-        background: #C9DEF7;
-        box-sizing: border-box;
-        -moz-box-sizing: border-box;
-        -webkit-box-sizing: border-box;
-    }
-</style>
diff --git a/src/jmapNew/theme/ningbo_01/planSchedule/menuTool.vue b/src/jmapNew/theme/ningbo_01/planSchedule/menuTool.vue
deleted file mode 100644
index d3ecde016..000000000
--- a/src/jmapNew/theme/ningbo_01/planSchedule/menuTool.vue
+++ /dev/null
@@ -1,172 +0,0 @@
-<template>
-    <div id="PlanMenuTool">
-        <div class="nav">
-            <div class="tool" v-for="(item,index) in tools" :key="index">
-                <img :src="item.src" :alt="item.title" />
-            </div>
-        </div>
-    </div>
-</template>
-<script>
-    import { mapGetters } from 'vuex';
-    import { prefixIntrger } from '@/utils/date';
-    import logo_ from '@/assets/logo_.png';
-
-
-    export default {
-        name: 'PlanMenuTool',
-        data() {
-            return {
-                tools: [
-                    {
-                        title: '服务器1',
-                        operate: '',
-                        src: logo_,
-                        click: this.undeveloped,
-                    },
-                    {
-                        title: '服务器2',
-                        operate: '',
-                        src: '',
-                        click: this.undeveloped,
-                    },
-                    {
-                        title: '前置机1',
-                        operate: '',
-                        src: '',
-                        click: this.undeveloped,
-                    },
-                    {
-                        title: '前置机2',
-                        operate: '',
-                        src: '',
-                        click: this.undeveloped,
-                    },
-                    {
-                        title: '主调',
-                        operate: '',
-                        src: '',
-                        click: this.undeveloped,
-                    },
-                    {
-                        title: '调度台1',
-                        operate: '',
-                        src: '',
-                        click: this.undeveloped,
-                    },
-                    {
-                        title: '调度台2',
-                        operate: '',
-                        src: '',
-                        click: this.undeveloped,
-                    },
-                    {
-                        title: '调度台3',
-                        operate: '',
-                        src: '',
-                        click: this.undeveloped,
-                    },
-                    {
-                        title: '大屏',
-                        operate: '',
-                        src: '',
-                        click: this.undeveloped,
-                    },
-                    {
-                        title: '维护工作站',
-                        operate: '',
-                        src: '',
-                        click: this.undeveloped,
-                    },
-                    {
-                        title: '运行图显示人工站',
-                        operate: '',
-                        src: '',
-                        click: this.undeveloped,
-                    },
-                    {
-                        title: '跳停',
-                        operate: '',
-                        src: '',
-                        click: this.undeveloped,
-                    },
-                    {
-                        title: '扣车',
-                        operate: '',
-                        src: '',
-                        click: this.undeveloped,
-                    },
-                    {
-                        title: '列车报警',
-                        operate: '',
-                        src: logo_,
-                        click: this.undeveloped,
-                    }
-                ]
-            }
-        },
-        watch: {
-            '$store.state.training.initTime': function (initTime) {
-                let date = new Date(initTime);
-                this.time = `${prefixIntrger(date.getHours(), 2)}:${prefixIntrger(date.getMinutes(), 2)}${prefixIntrger(date.getSeconds(), 2)}`
-            }
-        },
-        computed: {
-            isShowSystemTime() {
-                return this.$route.params.mode == 'demon' || this.$route.params.mode === 'dp' || !this.$route.params.mode;
-            }
-        },
-        mounted() {
-            this.initTools();
-        },
-        methods: {
-            initTools() {
-                this.tools = [];
-            }
-        }
-    }
-</script>
-
-<style scoped rel="stylesheet/scss" lang="scss" scoped>
-    @import "src/styles/mixin.scss";
-    $top: 48px;
-    $width: 25px;
-    $height: 25px;
-
-    #PlanMenuTool {
-        z-index: 5;
-        position: absolute;
-        width: 100%;
-        top: $top;
-    }
-
-    .nav {
-        display: block;
-        color: #0000;
-        background: #EBEADB;
-        border: 1px solid #B6BCCC !important;
-        border-bottom: 2px solid #B6BCCC !important;
-        list-style: none;
-        height: $height;
-        line-height: $height;
-    }
-
-    .tool {
-        padding-left: 10px;
-        display: flex;
-        justify-content: center;
-        cursor: pointer;
-        position: relative;
-        float: left;
-        margin: 1px;
-        width: $width;
-
-        img {
-            display: block;
-            text-align: center;
-            padding-top: 2px;
-            height: $height - 5;
-            width: $width - 5;
-        }
-    }
-</style>
\ No newline at end of file
diff --git a/src/jmapNew/theme/ningbo_01/planSchedule/schedule.vue b/src/jmapNew/theme/ningbo_01/planSchedule/schedule.vue
deleted file mode 100644
index 82a3c9ed3..000000000
--- a/src/jmapNew/theme/ningbo_01/planSchedule/schedule.vue
+++ /dev/null
@@ -1,468 +0,0 @@
-<template>
-  <div id="PlanSchedule" :style="{top: top+'px', height: height+'px'}">
-    <div class="left">
-      <div :id="runPlanId" />
-    </div>
-    <div class="right">
-      <data-table
-        ref="serviceTable"
-        :height="height/2"
-        :config="serviceNumberConfig"
-        :style="{top: top-height/2+'px'}"
-        @touch="scheduleTouch"
-      />
-      <data-table
-        ref="tripTable"
-        :height="height/2"
-        :config="tripNumberConfig"
-        :style="{top: top-height/2+'px'}"
-        @touch="trainNumTouch"
-      />
-    </div>
-  </div>
-</template>
-
-<script>
-import { mapGetters } from 'vuex';
-import { timeFormat } from '@/utils/date';
-import {toTimeStamp, formatDuring} from '@/utils/date';
-import DataTable from '../menusPlan/components/dataTable';
-import echarts from 'echarts';
-
-export default {
-    name: 'PlanSchedule',
-    components: {
-        DataTable
-    },
-    props: {
-        group: {
-            type: String,
-            required: true
-        },
-        lineCode: {
-            type: String,
-            required: true
-        },
-        maxWidth: {
-            type: Number,
-            require: true
-        },
-        maxHeight: {
-            type: Number,
-            required: true
-        }
-    },
-    data() {
-        return {
-            top: 0,
-            height: 0,
-            heights: [100, 100],
-            runPlanId: 'plan-schedule-id',
-            myChart: null,
-            PlanConvert: {},
-            serviceNumberConfig: {
-                data: [],
-                highlightCurrentRow: true,
-                handleChange: this.serviceNumberChange,
-                showClose: false,
-                columns: [
-                    {
-                        prop: 'serviceNumber',
-                        label: '表号'
-                    },
-                    {
-                        width: 40
-                    }
-                ]
-            },
-            tripNumberConfig: {
-                data: [],
-                highlightCurrentRow: true,
-                handleChange: this.tripNumberChange,
-                showClose: false,
-                columns: [
-                    {
-                        prop: 'tripNumber',
-                        label: '车次号'
-                    },
-                    {
-                        width: 40
-                    }
-                ]
-            },
-            realData: {},
-            kmRangeCoordMap: {},
-            option: {
-                title: {
-                    text: '',
-                    left: 'center'
-                },
-                grid: {
-                    top: '30px',
-                    left: '120px',
-                    right: '40px',
-                    bottom: '65px',
-                    containLabel: true,
-                    backgroundColor: 'floralwhite'
-                },
-                toolbox: {
-                    // right: '30px',
-                    // feature: {
-                    //     dataZoom: {
-                    //         yAxisIndex: 'none'
-                    //     },
-                    //     restore: {},
-                    //     saveAsImage: {}
-                    // }
-                },
-                tooltip: {
-                    axisPointer: {
-                        trigger: 'item',
-                        type: 'cross'
-                    },
-                    formatter: this.axisTooltip,
-                    borderWidth: 1
-                },
-                xAxis: [
-                    {
-                        type: 'category',
-                        boundaryGap: false,
-                        data: [],
-                        axisLine: {
-                            onZero: false,
-                            lineStyle: {
-                                width: 2,
-                                color: '#d14a61'
-                            }
-                        },
-                        axisLabel: {
-                            formatter: this.xAxisLableFormat,
-                            textStyle: {
-                                color: '#333'
-                            }
-                        },
-                        axisPointer: {
-                            snap: true,
-                            label: {
-                                formatter: this.xAxisPointFormat,
-                                backgroundColor: 'rgb(255,0,0,0.5)',
-                                color: 'white'
-                            }
-                        }
-                    }
-                ],
-                yAxis: {
-                    type: 'value',
-                    splitLine: {
-                        show: false
-                    },
-                    axisTick: {
-                        show: false
-                    },
-                    axisLine: {
-                        onZero: false,
-                        lineStyle: {
-                            width: 2,
-                            color: '#d14a61'
-                        }
-                    },
-                    axisLabel: {
-                        interval: 'auto',
-                        formatter: this.yAxisLableFormat
-                    },
-                    axisPointer: {
-                        xAxisIndex: 'all',
-                        label: {
-                            formatter: this.yAxisPointFormat,
-                            backgroundColor: 'rgb(0,100,0,0.5)',
-                            color: 'white'
-                        }
-                    },
-                    min: 0,
-                    max: 0
-                },
-                series: [],
-                dataZoom: [
-                    {
-                        type: 'inside'
-                    },
-                    {
-                        fiterMode: 'filter',
-                        handleIcon: 'M10.7,11.9v-1.3H9.3v1.3c-4.9,0.3-8.8,4.4-8.8,9.4c0,5,3.9,9.1,8.8,9.4v1.3h1.3v-1.3c4.9-0.3,8.8-4.4,8.8-9.4C19.5,16.3,15.6,12.2,10.7,11.9z M13.3,24.4H6.7V23h6.6V24.4z M13.3,19.6H6.7v-1.4h6.6V19.6z',
-                        handleSize: '80%',
-                        handleStyle: {
-                            color: '#fff',
-                            shadowBlur: 3,
-                            shadowColor: 'rgba(0, 0, 0, 0.6)',
-                            shadowOffsetX: 2,
-                            shadowOffsetY: 2
-                        },
-                        bottom: '20px'
-                    }
-                ]
-            },
-            absoluteTime: 2 * 3600,
-            indexKmRangeMap: {}
-        };
-    },
-    computed: {
-        ...mapGetters('runPlan', [
-            'stations'
-        ])
-    },
-    watch: {
-        maxWidth() {
-            this.setPosition();
-        },
-        maxHeight() {
-            this.setPosition();
-        },
-        '$store.state.runPlan.planLoadedCount': async function () {
-            await this.loadChartPage();
-        },
-        '$store.state.runPlan.planSizeCount': function () {
-            this.reSize({ width: this.$store.state.runPlan.width, height: this.$store.state.runPlan.height });
-        },
-        '$store.state.runPlan.selected.serviceNumber': function (val) {
-            const index = this.serviceNumberConfig.data.findIndex(elem => {
-                return elem.serviceNumber == val;
-            });
-
-            this.$refs.serviceTable.setCurrentRow(this.serviceNumberConfig.data[index]);
-        },
-        '$store.state.runPlan.selected.tripNumber': function (val) {
-            const index = this.tripNumberConfig.data.findIndex(elem => {
-                return elem.tripNumber == val;
-            });
-            this.$refs.tripTable.setCurrentRow(this.tripNumberConfig.data[index]);
-        }
-    },
-    mounted() {
-        this.PlanConvert = this.$theme.loadPlanConvert(this.lineCode);
-    },
-    beforeDestroy() {
-        this.destroy();
-    },
-    methods: {
-        serviceNumberChange(row) {
-            if (row) {
-                this.$store.dispatch('runPlan/setSelected', { serviceNumber: row.serviceNumber, tripNumber: null });
-                const serviceObj = this.$store.state.runPlan.editData[row.serviceNumber];
-                if (serviceObj) {
-                    this.analyticalTripNumber(serviceObj.trainMap);
-                }
-            }
-        },
-        tripNumberChange(row) {
-            if (row) {
-                this.$store.dispatch('runPlan/setSelected', { serviceNumber: this.$store.state.runPlan.selected.serviceNumber, tripNumber: row.tripNumber });
-            }
-        },
-        async analyticalServiceNumber(data) {
-            this.serviceNumberConfig.data = Object.keys(data || {})
-                .sort((a, b) => { return data[a].oldIndex - data[b].oldIndex; })
-                .map(serviceNumber => { return { serviceNumber }; });
-        },
-        async analyticalTripNumber(data) {
-            this.tripNumberConfig.data = Object.keys(data || {})
-                .sort((a, b) => { return data[a].oldIndex - data[b].oldIndex; })
-                .map(tripNumber => { return { tripNumber }; });
-        },
-        async setPosition() {
-            this.$nextTick(() => {
-                let top = 3;
-                const width = this.maxWidth * 0.85;
-                let height = this.maxHeight;
-
-                const titleBar = document.getElementById('PlanTitleBar');
-                const menuBar = document.getElementById('PlanMenuBar');
-                const menuTool = document.getElementById('PlanMenuTool');
-                const statusBar = document.getElementById('PlanStatusBar');
-
-                if (titleBar) {
-                    top += (titleBar.offsetHeight || 0);
-                }
-
-                if (menuBar) {
-                    top += (menuBar.offsetHeight || 0);
-                }
-
-                if (menuTool) {
-                    top += (menuTool.offsetHeight || 0);
-                }
-
-                if (statusBar) {
-                    height -= (statusBar.offsetHeight || 0);
-                }
-
-                height = height - top;
-                this.$store.dispatch('runPlan/resize', { width, height });
-
-                if (this.top != top) {
-                    this.top = top;
-                }
-
-                if (this.height != height) {
-                    this.height = height - 20 * 2;
-                }
-            });
-        },
-        async loadChartPage() {
-            try {
-                let series = [];
-                const stations = this.$store.state.runPlan.stations;
-                const planData = this.$store.state.runPlan.planData;
-
-                this.viewDisabled = true;
-                this.kmRangeCoordMap = this.PlanConvert.convertStationsToMap(stations);
-                series = this.pushModels(series, [this.PlanConvert.initializeYaxis(stations)]);
-                series = this.pushModels(series, this.PlanConvert.convertDataToModels(planData, stations, this.kmRangeCoordMap, { color: '#000', width: 0.5 }));
-                await this.loadInitData(series);
-                await this.analyticalServiceNumber(this.$store.state.runPlan.editData);
-                this.viewDisabled = false;
-
-            } catch (error) {
-                this.viewDisabled = false;
-                this.$messageBox(`加载运行图数据失败`);
-            }
-        },
-        async loadInitData(series) {
-            this.myChart && this.myChart.showLoading();
-            await this.xAxisInit();
-            await this.yAxisInit();
-            await this.loadInitChart(series);
-            this.myChart && this.myChart.hideLoading();
-        },
-        pushModels(series, models) {
-            if (models && models.length) {
-                models.forEach(elem => {
-                    if (elem) {
-                        series.push(elem);
-                    }
-                });
-            }
-
-            return series;
-        },
-        loadInitChart(series) {
-            return new Promise((resolve, reject) => {
-                try {
-                    this.destroy();
-                    let startValue = 3600 + this.PlanConvert.TranslationTime;
-                    const offsetTime = 3600;
-                    const initTime = toTimeStamp(formatDuring(this.$store.state.training.initTime));
-                    startValue = initTime - this.PlanConvert.TranslationTime;
-                    this.option.dataZoom[0].startValue = this.option.dataZoom[1].startValue = startValue - offsetTime;
-                    this.option.dataZoom[0].endValue = this.option.dataZoom[1].endValue = startValue + offsetTime;
-                    this.option.series = series;
-                    this.myChart = echarts.init(document.getElementById(this.runPlanId));
-                    if (this.myChart) {
-                        this.myChart.setOption(this.option);
-                        this.reSize({ width: this.$store.state.runPlan.width, height: this.$store.state.runPlan.height });
-                        this.myChart.on('click', this.mouseClick);
-                    }
-                    resolve(true);
-                } catch (error) {
-                    reject(error);
-                }
-            });
-
-        },
-        xAxisPointFormat(params) {
-            return timeFormat(params.value);
-        },
-        yAxisPointFormat(params) {
-            return this.PlanConvert.computedFormatYAxis(this.stations, params);
-        },
-        xAxisLableFormat(value, index) {
-            if (value % 60 === 0) {
-                return timeFormat(value);
-            }
-        },
-        yAxisLableFormat(value, index) {
-            return '';
-        },
-        xAxisInit() {
-            const list = [];
-            for (var time = 0 + this.PlanConvert.TranslationTime; time < 3600 * 24 + this.PlanConvert.TranslationTime; time++) {
-                list.push(time);
-            }
-
-            const startValue = 3600 * 6;
-            const offsetTime = 3600 * 1;
-
-            this.option.xAxis[0].data = list;
-            if (!this.option.dataZoom[0].startValue) {
-                this.option.dataZoom[0].startValue = this.option.dataZoom[1].startValue = startValue - offsetTime;
-            }
-
-            if (!this.option.dataZoom[0].endValue) {
-                this.option.dataZoom[0].endValue = this.option.dataZoom[1].endValue = startValue + offsetTime;
-            }
-        },
-        yAxisInit() {
-            if (Object.keys(this.PlanConvert).length) {
-                this.option.yAxis.min = this.PlanConvert.computedYaxisMinValue(this.stations);
-                this.option.yAxis.max = this.PlanConvert.computedYaxisMaxValue(this.stations);
-            }
-        },
-        axisTooltip(param) {
-            const station = this.stations[Math.floor((param.data[1] - this.PlanConvert.EdgeHeight) / this.PlanConvert.CoordMultiple)] || { name: '', kmRange: '' };
-            return [
-                `Point Data <hr size=1 style=" margin: 3px 0">`,
-                `车站名称: ${station.name}<br>`,
-                `车站公里标: ${station.kmRange} km <br>`,
-                `到站时间: ${timeFormat(param.data[0] + this.PlanConvert.TranslationTime)} (${param.data[0]})<br>`
-            ].join('');
-        },
-        mouseClick(params) {
-            const model = {
-                serviceNumber: params.seriesName
-            };
-            this.$store.dispatch('runPlan/setSelected', model);
-        },
-        reSize(opt) {
-            if (this.myChart) {
-                this.myChart.resize({
-                    width: opt.width,
-                    height: opt.height,
-                    silent: false
-                });
-            }
-        },
-        destroy() {
-            if (this.myChart && this.myChart.isDisposed) {
-                this.myChart.dispose();
-                this.myChart = null;
-            }
-        },
-        scheduleTouch() {
-
-        },
-        trainNumTouch() {
-
-        }
-    }
-};
-</script>
-<style scoped rel="stylesheet/scss" lang="scss">
-    @import "src/styles/mixin.scss";
-
-    #PlanSchedule {
-        z-index: 5;
-        position: absolute;
-        width: 100%;
-
-        .left {
-            height: 100%;
-            width: 85%;
-            float: left;
-        }
-
-        .right {
-            height: 100%;
-            width: 15%;
-            float: right;
-        }
-    }
-</style>
diff --git a/src/jmapNew/theme/ningbo_01/planSchedule/statusBar.vue b/src/jmapNew/theme/ningbo_01/planSchedule/statusBar.vue
deleted file mode 100644
index 4c1418fb3..000000000
--- a/src/jmapNew/theme/ningbo_01/planSchedule/statusBar.vue
+++ /dev/null
@@ -1,107 +0,0 @@
-<template>
-  <data-table
-    id="PlanStatusBar"
-    ref="dataTable"
-    :height="height-11"
-    :config="stationListConfig"
-    :close="false"
-    :style="{top: maxmini? maxTop-110+'px':maxTop-21+'px'}"
-    @touch="touch"
-  />
-</template>
-
-<script>
-import DataTable from '../menusPlan/components/dataTable';
-import { formatTime, formatName } from '@/utils/runPlan';
-
-export default {
-	name: 'PlanStatusBar',
-	components: {
-		DataTable
-	},
-	props: {
-		maxTop: {
-			type: Number,
-			required: true
-		}
-	},
-	data() {
-		return {
-			maxmini: true,
-			height: 100,
-			stationListConfig: {
-				data: [],
-				showClose: true,
-				highlightCurrentRow: true,
-				columns: [
-					{
-						prop: 'stationName',
-						label: '站台',
-						width: 400
-					},
-					{
-						prop: 'startTime',
-						label: '到点'
-					},
-					{
-						prop: 'stopTime',
-						label: '停站时间'
-					},
-					{
-						prop: 'endTime',
-						label: '发点'
-					},
-					{
-						prop: 'level',
-						label: '运行等级'
-
-					}
-				]
-			}
-		};
-	},
-	watch: {
-		'$store.state.runPlan.selected': function (select) {
-			this.stationListConfig.data = [];
-			const serviceObj = this.$store.state.runPlan.editData[select.serviceNumber];
-			if (serviceObj) {
-				const trainMap = serviceObj.trainMap;
-				if (trainMap) {
-					const trainObj = trainMap[select.tripNumber];
-					if (trainObj) {
-						const stationTimeList = trainObj.stationTimeList;
-						if (stationTimeList && stationTimeList.length) {
-							stationTimeList.forEach((elem, index) => {
-								const stationObj = {
-									stationName: formatName(elem.stationCode),
-									startTime: formatTime(index == 0 ? null : stationTimeList[index - 1].secondTime),
-									stopTime: formatTime(index == 0 ? null : elem.secondTime - stationTimeList[index - 1].secondTime),
-									endTime: formatTime(elem.secondTime),
-									level: ''
-								};
-								this.stationListConfig.data.push(stationObj);
-							});
-						}
-					}
-				}
-			}
-		}
-	},
-	methods: {
-		touch(maxmini) {
-			this.maxmini = maxmini;
-			this.$emit('setPosition');
-		}
-	}
-};
-</script>
-
-<style scoped rel="stylesheet/scss" lang="scss">
-    @import "src/styles/mixin.scss";
-
-    #PlanStatusBar {
-        z-index: 5;
-        position: absolute;
-        width: 100%;
-    }
-</style>
diff --git a/src/jmapNew/theme/ningbo_01/planSchedule/titleBar.vue b/src/jmapNew/theme/ningbo_01/planSchedule/titleBar.vue
deleted file mode 100644
index 689c3486a..000000000
--- a/src/jmapNew/theme/ningbo_01/planSchedule/titleBar.vue
+++ /dev/null
@@ -1,75 +0,0 @@
-<template>
-    <div id="PlanTitleBar">
-        <img class="logo" :src="logoImg" />
-        <span> {{mapName}} &ensp;</span>
-        <span v-if="runPlanName">({{runPlanName}})</span>
-        <span class="system-close el-icon-close" @click="back"></span>
-    </div>
-</template>
-
-<script>
-    import logo_ from '@/assets/logo_.png';
-    import { getPublishMapInfo } from '@/api/jmap/map';
-
-    export default {
-        name: 'PlanTitleBar',
-        data() {
-            return {
-                mapName: '',
-                logoImg: logo_
-            }
-        },
-        computed: {
-            runPlanName() {
-                return this.$route.query.planName || '';
-            }
-        },
-        mounted() {
-            if (this.$route.query.mapId) {
-                getPublishMapInfo(this.$route.query.mapId).then(resp => {
-                    this.mapName = resp.data.name;
-                })
-            }
-        },
-        methods: {
-            back() {
-                this.$emit('back');
-            }
-        }
-    }
-</script>
-<style scoped rel="stylesheet/scss" lang="scss" scoped>
-    @import "src/styles/mixin.scss";
-    $width: 25px;
-    $height: 25px;
-
-    #PlanTitleBar {
-        z-index: 10;
-        display: flex;
-        position: absolute;
-        width: 100%;
-        height: $height;
-        line-height: $height;
-        background: -webkit-linear-gradient(#0055E8, #0099F8);
-        background: -o-linear-gradient(#0055E8, #0099F8);
-        background: -moz-linear-gradient(#0055E8, #0099F8);
-        background: linear-gradient(#0055E8, #0099F8);
-        color: white;
-        font: bold;
-        font-size: 16px;
-
-        .logo {
-            display: inline-block;
-            width: $width;
-            height: $height;
-            padding-right: 5px;
-        }
-
-        .system-close {
-            width: 25px;
-            height: 25px;
-            position: absolute;
-            right: 1px;
-        }
-    }
-</style>
\ No newline at end of file
diff --git a/src/jmapNew/theme/xian_01/menus/dialog/childDialog/childDialog/noticeInfo.vue b/src/jmapNew/theme/xian_01/menus/dialog/childDialog/childDialog/noticeInfo.vue
new file mode 100644
index 000000000..534acb41e
--- /dev/null
+++ b/src/jmapNew/theme/xian_01/menus/dialog/childDialog/childDialog/noticeInfo.vue
@@ -0,0 +1,86 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    class="fuzhou-01__systerm notice-info"
+    :title="title"
+    :visible.sync="show"
+    width="360px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+    append-to-body
+  >
+    <div class="context">
+      <template v-for="(message,index) in messages">
+        <div :key="index">{{ message }}</div>
+      </template>
+    </div>
+    <el-row justify="center" class="button-group">
+      <el-col :span="10" :offset="8">
+        <el-button :id="domIdSure" type="primary" @click="commit">{{ $t('global.confirm') }}</el-button>
+      </el-col>
+    </el-row>
+  </el-dialog>
+</template>
+
+<script>
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+
+export default {
+    name: 'NoticeInfo',
+    data() {
+        return {
+            dialogShow: false,
+            messages: [this.$t('tip.commandFailed')],
+            operate: null
+        };
+    },
+    computed: {
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
+        },
+        title() {
+            return this.$t('tip.hint');
+        },
+        domIdSure() {
+            return this.dialogShow ? OperationEvent.Command.close.notice.domId : '';
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(operate, messages) {
+            this.operate = operate || {};
+            this.dialogShow = true;
+            this.messages = [this.$t('tip.commandFailed')];
+            if (messages && messages != 'null') {
+                this.messages.push(messages);
+            }
+            this.$nextTick(function () {
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
+        doClose() {
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+        },
+        commit() {
+            this.doClose();
+        },
+        cancel() {
+            this.doClose();
+        }
+    }
+};
+
+</script>
+<style>
+    .notice-info .context {
+        padding-bottom: 40px !important;
+        border: 1px solid lightgray;
+    }
+</style>
diff --git a/src/jmapNew/theme/xian_01/menus/dialog/childDialog/confirmControl.vue b/src/jmapNew/theme/xian_01/menus/dialog/childDialog/confirmControl.vue
new file mode 100644
index 000000000..db0298ce5
--- /dev/null
+++ b/src/jmapNew/theme/xian_01/menus/dialog/childDialog/confirmControl.vue
@@ -0,0 +1,361 @@
+<template>
+  <el-dialog v-dialogDrag class="fuzhou-01__systerm confirm-control" :title="title" :visible.sync="show" width="360px" :before-close="doClose" :z-index="2000" :modal="false" :close-on-click-modal="false" append-to-body>
+    <div class="context">
+      <template v-for="(message,index) in messages">
+        <span :key="index">{{ message }}</span>
+      </template>
+    </div>
+    <el-row justify="center" class="button-group">
+      <el-col :span="10" :offset="2">
+        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">{{ $t('global.confirm') }}</el-button>
+      </el-col>
+      <el-col :span="8" :offset="4">
+        <el-button :id="domIdCancel" @click="cancel">{{ $t('global.cancel') }}</el-button>
+      </el-col>
+    </el-row>
+    <notice-info ref="noticeInfo" />
+  </el-dialog>
+</template>
+
+<script>
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
+import NoticeInfo from './childDialog/noticeInfo';
+
+export default {
+    name: 'ConfirmControl',
+    components: {
+        NoticeInfo
+    },
+    data() {
+        return {
+            dialogShow: false,
+            loading: false,
+            operate: {},
+            messages: '',
+            operation: null
+        };
+    },
+    computed: {
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
+        },
+        title() {
+            if (this.operation === OperationEvent.Signal.arrangementRoute.menu.operation) {
+                return this.$t('menu.accessSetting');
+            } else if (this.operation === OperationEvent.Signal.signalClose.menu.operation) {
+                return this.$t('menu.menuSignal.signalOff');
+            } else if (this.operation === OperationEvent.Signal.reopenSignal.menu.operation) {
+                return this.$t('menu.menuSignal.signalReopen');
+            } else if (this.operation === OperationEvent.Signal.cancelTrainRoute.menu.operation) {
+                return this.$t('menu.cancelTheWay');
+            } else if (this.operation === OperationEvent.Signal.humanControl.menu.operation) {
+                return this.$t('menu.approachManualControl');
+            } else if (this.operation === OperationEvent.Signal.atsAutoControl.menu.operation) {
+                return this.$t('menu.accessToATSAutomaticControl');
+            } else if (this.operation === OperationEvent.StationStand.setRunLevel.menu.operation) {
+                return this.$t('menu.menuStationStand.setRunLevel');
+            } else if (this.operation === OperationEvent.StationStand.setStopTime.menu.operation) {
+                return this.$t('menu.stopTime');
+            } else if (this.operation === OperationEvent.StationStand.setBackStrategy.menu.operation) {
+                return this.$t('menu.setSwitchbackStrategy');
+            }
+            return '';
+        },
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+        },
+        domIdConfirm() {
+            if (this.dialogShow) {
+                if (this.operation === OperationEvent.Signal.arrangementRoute.menu.operation) {
+                    /** 进路设置*/
+                    return OperationEvent.Signal.arrangementRoute.confirm.domId;
+                } else if (this.operation === OperationEvent.Signal.signalClose.menu.operation) {
+                    /** 信号关灯*/
+                    return OperationEvent.Signal.signalClose.confirm.domId;
+                } else if (this.operation === OperationEvent.Signal.reopenSignal.menu.operation) {
+                    /** 信号重开*/
+                    return OperationEvent.Signal.reopenSignal.confirm.domId;
+                } else if (this.operation === OperationEvent.Signal.cancelTrainRoute.menu.operation) {
+                    /** 取消进路*/
+                    return OperationEvent.Signal.cancelTrainRoute.confirm.domId;
+                } else if (this.operation === OperationEvent.Signal.humanControl.menu.operation) {
+                    /** 进路交人工控*/
+                    return OperationEvent.Signal.humanControl.confirm.domId;
+                } else if (this.operation === OperationEvent.Signal.atsAutoControl.menu.operation) {
+                    /** 进路交ATS自动控*/
+                    return OperationEvent.Signal.atsAutoControl.confirm.domId;
+                } else if (this.operation === OperationEvent.StationStand.setRunLevel.menu.operation) {
+                    /** 设置运行等级*/
+                    return OperationEvent.StationStand.setRunLevel.confirm.domId;
+                } else if (this.operation === OperationEvent.StationStand.setStopTime.menu.operation) {
+                    /** 设置停站时间*/
+                    return OperationEvent.StationStand.setStopTime.confirm.domId;
+                } else if (this.operation === OperationEvent.StationStand.setBackStrategy.menu.operation) {
+                    /** 设置折返策略*/
+                    return OperationEvent.StationStand.setBackStrategy.confirm.domId;
+                }
+            }
+            return '';
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(operate) {
+            if (!this.dialogShow) {
+                this.loading = false;
+                this.operate = operate || {};
+                this.messages = operate.messages;
+                this.operation = operate.operation;
+            }
+
+            this.dialogShow = true;
+            this.$nextTick(function () {
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+        },
+        commit() {
+            if (this.operation === OperationEvent.Signal.arrangementRoute.menu.operation) {
+                /** 进路设置*/
+                this.routeSetting();
+            } else if (this.operation === OperationEvent.Signal.signalClose.menu.operation) {
+                /** 信号关灯*/
+                this.signalClose();
+            } else if (this.operation === OperationEvent.Signal.reopenSignal.menu.operation) {
+                /** 信号重开*/
+                this.reopenSignal();
+            } else if (this.operation === OperationEvent.Signal.cancelTrainRoute.menu.operation) {
+                /** 取消进路*/
+                this.cancelTrainRoute();
+            } else if (this.operation === OperationEvent.Signal.humanControl.menu.operation) {
+                /** 进路交人工控*/
+                this.humanControl();
+            } else if (this.operation === OperationEvent.Signal.atsAutoControl.menu.operation) {
+                /** 进路交ATS自动控*/
+                this.atsAutoControl();
+            } else if (this.operation === OperationEvent.StationStand.setRunLevel.menu.operation) {
+                /** 设置运行等级*/
+                this.setRunLevel();
+            } else if (this.operation === OperationEvent.StationStand.setStopTime.menu.operation) {
+                /** 停站时间*/
+                this.setStopTime();
+            } else if (this.operation === OperationEvent.StationStand.setBackStrategy.menu.operation) {
+                /** 设置折返策略*/
+                this.setBackStrategy();
+            }
+        },
+        // 进路设置
+        routeSetting() {
+            const operate = {
+                over: true,
+                operation: OperationEvent.Signal.arrangementRoute.confirm.operation,
+                cmdType: CMD.Signal.CMD_SIGNAL_SET_ROUTE
+            };
+
+            this.loading = true;
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.loading = false;
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => {
+                this.loading = false;
+                this.doClose();
+                this.$refs.noticeInfo.doShow(operate);
+            });
+        },
+        // 信号关灯
+        signalClose() {
+            const operate = {
+                over: true,
+                operation: OperationEvent.Signal.signalClose.confirm.operation,
+                cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_SIGNAL
+            };
+
+            this.loading = true;
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.loading = false;
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => {
+                this.loading = false;
+                this.doClose();
+                this.$refs.noticeInfo.doShow(operate);
+            });
+        },
+        // 信号重开
+        reopenSignal() {
+            const operate = {
+                over: true,
+                operation: OperationEvent.Signal.reopenSignal.confirm.operation,
+                cmdType: CMD.Signal.CMD_SIGNAL_REOPEN_SIGNAL
+            };
+
+            this.loading = true;
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.loading = false;
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => {
+                this.loading = false;
+                this.doClose();
+                this.$refs.noticeInfo.doShow(operate);
+            });
+        },
+        // 取消进路
+        cancelTrainRoute() {
+            const operate = {
+                over: true,
+                operation: OperationEvent.Signal.cancelTrainRoute.confirm.operation,
+                cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE
+            };
+
+            this.loading = true;
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.loading = false;
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => {
+                this.loading = false;
+                this.doClose();
+                this.$refs.noticeInfo.doShow(operate);
+            });
+        },
+        // 进路交人工控
+        humanControl() {
+            const operate = {
+                over: true,
+                operation: OperationEvent.Signal.humanControl.menu.operation,
+                cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO
+            };
+
+            this.loading = true;
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.loading = false;
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => {
+                this.loading = false;
+                this.doClose();
+                this.$refs.noticeInfo.doShow(operate);
+            });
+        },
+        // 进路交ATS自动控
+        atsAutoControl() {
+            const operate = {
+                over: true,
+                operation: OperationEvent.Signal.atsAutoControl.menu.operation,
+                cmdType: CMD.Signal.CMD_SIGNAL_SET_CI_AUTO
+            };
+
+            this.loading = true;
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.loading = false;
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => {
+                this.loading = false;
+                this.doClose();
+                this.$refs.noticeInfo.doShow(operate);
+            });
+        },
+        // 设置运行等级
+        setRunLevel() {
+            const operate = {
+                over: true,
+                operation: OperationEvent.StationStand.setRunLevel.confirm.operation,
+                cmdType: CMD.Stand.CMD_STAND_SET_RUN_TIME,
+                val: this.operate.val
+            };
+
+            this.loading = true;
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.loading = false;
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => {
+                this.loading = false;
+                this.doClose();
+                this.$refs.noticeInfo.doShow(operate);
+            });
+        },
+        // 停站时间
+        setStopTime() {
+            const operate = {
+                over: true,
+                operation: OperationEvent.StationStand.setStopTime.confirm.operation,
+                cmdType: CMD.Stand.CMD_STAND_SET_PARK_TIME,
+                val: this.operate.val
+            };
+
+            this.loading = true;
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.loading = false;
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => {
+                this.loading = false;
+                this.doClose();
+                this.$refs.noticeInfo.doShow(operate);
+            });
+        },
+        // 设置折返策略
+        setBackStrategy() {
+            const operate = {
+                over: true,
+                operation: OperationEvent.StationStand.setBackStrategy.confirm.operation,
+                cmdType: CMD.Stand.CMD_STAND_SET_REENTRY_STRATEGY,
+                val: this.operate.val
+            };
+
+            this.loading = true;
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.loading = false;
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => {
+                this.loading = false;
+                this.doClose();
+                this.$refs.noticeInfo.doShow(operate);
+            });
+        },
+        cancel() {
+            const operate = {
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
+
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => {
+                this.doClose();
+            });
+        }
+    }
+};
+
+</script>
+<style>
+    .confirm-control .context {
+        padding-bottom: 40px !important;
+        border: 1px solid lightgray;
+    }
+</style>
diff --git a/src/jmapNew/theme/xian_01/menus/dialog/childDialog/confirmControlSpeed.vue b/src/jmapNew/theme/xian_01/menus/dialog/childDialog/confirmControlSpeed.vue
new file mode 100644
index 000000000..a7dbc79db
--- /dev/null
+++ b/src/jmapNew/theme/xian_01/menus/dialog/childDialog/confirmControlSpeed.vue
@@ -0,0 +1,144 @@
+<template>
+  <el-dialog v-dialogDrag class="fuzhou-01__systerm confirm-control-speed" :title="title" :visible.sync="show" width="540px" :before-close="doClose" :z-index="2000" :modal="false" :close-on-click-modal="false" append-to-body>
+    <div style="height: 60px; padding-left: 20px">
+      <span style="font-size: 18px">{{ message }}</span>
+    </div>
+    <el-row justify="center" class="button-group">
+      <el-col :span="6" :offset="6">
+        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">{{ $t('global.confirm') }}</el-button>
+      </el-col>
+      <el-col :span="10" :offset="2">
+        <el-button :id="domIdCancel" @click="cancel">{{ $t('global.cancel') }}</el-button>
+      </el-col>
+    </el-row>
+  </el-dialog>
+</template>
+
+<script>
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+
+export default {
+    name: 'ConfirmControlSpeed',
+    data() {
+        return {
+            dialogShow: false,
+            loading: false,
+            operation: '',
+            message: ''
+        };
+    },
+    computed: {
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
+        },
+        title() {
+            if (this.dialogShow) {
+                if (this.operation === OperationEvent.Section.setSpeed.order.operation) {
+                    return this.$t('menu.menuSection.sectionSetSpeedLimit');
+                } else if (this.operation === OperationEvent.Section.cancelSpeed.order.operation) {
+                    return this.$t('menu.menuSection.sectionCancelSpeedLimit');
+                } else if (this.operation === OperationEvent.Switch.setSpeed.order.operation) {
+                    return this.$t('menu.switchSettingSpeedLimit');
+                } else if (this.operation === OperationEvent.Switch.cancelSpeed.order.operation) {
+                    return this.$t('menu.menuSection.sectionCancelSpeedLimit');
+                }
+            }
+            return '';
+        },
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+        },
+        domIdConfirm() {
+            if (this.dialogShow) {
+                if (this.operation === OperationEvent.Section.setSpeed.order.operation) {
+                    return OperationEvent.Section.setSpeed.confirm.domId; // 区段设置限速
+                } else if (this.operation === OperationEvent.Section.cancelSpeed.order.operation) {
+                    return OperationEvent.Section.cancelSpeed.confirm.domId; // 区段取消限速
+                } else if (this.operation === OperationEvent.Switch.setSpeed.order.operation) {
+                    return OperationEvent.Switch.setSpeed.confirm.domId; // 道岔设置限速
+                } else if (this.operation === OperationEvent.Switch.cancelSpeed.order.operation) {
+                    return OperationEvent.Switch.cancelSpeed.confirm.domId; // 道岔取消限速
+                }
+            }
+            return '';
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(operate) {
+            if (!this.dialogShow) {
+                this.operation = operate.operation;
+                this.message = operate.message;
+            }
+
+            this.loading = false;
+            this.dialogShow = true;
+            this.$nextTick(function () {
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+        },
+        commit() {
+            const operate = {};
+
+            if (this.operation === OperationEvent.Section.setSpeed.order.operation) {
+                /** 区段设置限速*/
+                operate.operation = OperationEvent.Section.setSpeed.confirm.operation;
+            } else if (this.operation === OperationEvent.Section.cancelSpeed.order.operation) {
+                /** 区段取消限速*/
+                operate.operation = OperationEvent.Section.cancelSpeed.confirm.operation;
+            } else if (this.operation === OperationEvent.Switch.setSpeed.order.operation) {
+                /** 道岔设置限速*/
+                operate.operation = OperationEvent.Switch.setSpeed.confirm.operation;
+            } else if (this.operation === OperationEvent.Switch.cancelSpeed.order.operation) {
+                /** 道岔取消限速*/
+                operate.operation = OperationEvent.Switch.cancelSpeed.confirm.operation;
+            }
+
+            this.loading = true;
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.loading = false;
+                this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                if (valid) {
+                    this.$emit('setOperate', { step: 1, success: true });
+                    this.doClose();
+                }
+            }).catch(() => {
+                this.$emit('setOperate', { step: 0, success: false });
+                this.doClose();
+            });
+        },
+        cancel() {
+            const operate = {
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
+
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                if (valid) {
+                    this.$emit('setOperate', { step: 0, success: false });
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.doClose();
+                }
+            }).catch(() => {
+                this.doClose();
+            });
+        }
+    }
+};
+
+</script>
+<style>
+    .confirm-control-speed .context {
+        padding-bottom: 40px !important;
+        border: 1px solid lightgray;
+    }
+</style>
diff --git a/src/jmapNew/theme/xian_01/menus/dialog/childDialog/confirmSignalUnlock.vue b/src/jmapNew/theme/xian_01/menus/dialog/childDialog/confirmSignalUnlock.vue
new file mode 100644
index 000000000..c4fe8cf20
--- /dev/null
+++ b/src/jmapNew/theme/xian_01/menus/dialog/childDialog/confirmSignalUnlock.vue
@@ -0,0 +1,126 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    class="fuzhou-01__systerm route-unlock-confirm"
+    :title="title"
+    :visible.sync="show"
+    width="500px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+    append-to-body
+  >
+    <div style="height: 60px; padding-left: 20px">
+      <span>{{ $t('menu.in') }}{{ stationName }}【{{ signalName }}】{{ $t('menu.signalConfirmed') }}</span>
+    </div>
+    <el-row justify="center" class="button-group">
+      <el-col :span="6" :offset="6">
+        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">{{ $t('global.confirm') }}</el-button>
+      </el-col>
+      <el-col :span="10" :offset="2">
+        <el-button :id="domIdCancel" @click="cancel">{{ $t('global.cancel') }}</el-button>
+      </el-col>
+    </el-row>
+  </el-dialog>
+</template>
+
+<script>
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+
+export default {
+    name: 'RouteUnlockConfirm',
+    data() {
+        return {
+            dialogShow: false,
+            loading: false,
+            signalName: '',
+            stationName: ''
+        };
+    },
+    computed: {
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
+        },
+        title() {
+            return this.$t('menu.signalDeblocking');
+        },
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+        },
+        domIdConfirm() {
+            return this.dialogShow ? OperationEvent.Signal.unlock.confirm.domId : '';
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(operate, selected) {
+            this.stationName = '';
+            this.signalName = '';
+            if (selected) {
+                this.signalName = selected.name;
+                const station = this.$store.getters['map/getDeviceByCode'](selected.stationCode);
+                if (station) {
+                    this.stationName = station.name;
+                }
+            }
+
+            this.loading = false;
+            this.dialogShow = true;
+            this.$nextTick(function () {
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+        },
+        commit() {
+            const operate = {
+                operation: OperationEvent.Signal.unlock.confirm.operation
+            };
+
+            this.loading = true;
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.loading = false;
+                this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                if (valid) {
+                    this.$emit('setOperate', { step: 1, success: true });
+                    this.doClose();
+                }
+            }).catch(() => {
+                this.loading = false;
+                this.$emit('setOperate', { step: 0, success: false });
+                this.doClose();
+            });
+        },
+        cancel() {
+            const operate = {
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
+
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                if (valid) {
+                    this.$emit('setOperate', { step: 0, success: false });
+                    this.doClose();
+                }
+            }).catch(() => {
+                this.doClose();
+            });
+        }
+    }
+};
+
+</script>
+<style>
+    .route-unlock-confirm .context {
+        padding-bottom: 40px !important;
+        border: 1px solid lightgray;
+    }
+</style>
diff --git a/src/jmapNew/theme/xian_01/menus/dialog/childDialog/confirmTrain.vue b/src/jmapNew/theme/xian_01/menus/dialog/childDialog/confirmTrain.vue
new file mode 100644
index 000000000..ac4e2b65e
--- /dev/null
+++ b/src/jmapNew/theme/xian_01/menus/dialog/childDialog/confirmTrain.vue
@@ -0,0 +1,180 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    class="fuzhou-01__systerm confirm-control"
+    :title="title"
+    :visible.sync="show"
+    width="360px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+    append-to-body
+  >
+    <div class="context">
+      <template v-for="(message,index) in messages">
+        <span :key="index">{{ message }}</span>
+      </template>
+    </div>
+    <el-row justify="center" class="button-group">
+      <el-col :span="10" :offset="2">
+        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">{{ $t('global.confirm') }}</el-button>
+      </el-col>
+      <el-col :span="8" :offset="4">
+        <el-button :id="domIdCancel" @click="cancel">{{ $t('global.cancel') }}</el-button>
+      </el-col>
+    </el-row>
+    <notice-info ref="noticeInfo" />
+  </el-dialog>
+</template>
+
+<script>
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import NoticeInfo from './childDialog/noticeInfo';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
+
+export default {
+    name: 'ConfirmTrain',
+    components: {
+        NoticeInfo
+    },
+    data() {
+        return {
+            dialogShow: false,
+            loading: false,
+            operate: {},
+            messages: '',
+            operation: null
+        };
+    },
+    computed: {
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
+        },
+        title() {
+            if (this.operation === OperationEvent.Train.addTrainId.menu.operation) {
+                return this.$t('menu.menuTrain.addTrainId');
+            } else if (this.operation === OperationEvent.Train.editTrainId.menu.operation) {
+                return this.$t('menu.menuTrain.editTrainId');
+            } else if (this.operation === OperationEvent.Train.delTrainId.menu.operation) {
+                return this.$t('menu.menuTrain.deleteTrainId');
+            } else if (this.operation === OperationEvent.Train.moveTrainId.menu.operation) {
+                return this.$t('menu.menuTrain.moveTrainId');
+            } else if (this.operation === OperationEvent.Train.switchTrainId.menu.operation) {
+                return this.$t('menu.menuTrain.switchTrainId');
+            } else if (this.operation === OperationEvent.Train.editTrainNo.menu.operation) {
+                return this.$t('menu.menuTrain.editTrainNo');
+            }
+            return '';
+        },
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+        },
+        domIdConfirm() {
+            if (this.dialogShow) {
+                if (this.operation === OperationEvent.Train.addTrainId.menu.operation) {
+                    /** 添加列车识别号*/
+                    return OperationEvent.Train.addTrainId.confirm.domId;
+                } else if (this.operation === OperationEvent.Train.editTrainId.menu.operation) {
+                    /** 修改列车识别号*/
+                    return OperationEvent.Train.editTrainId.confirm.domId;
+                } else if (this.operation === OperationEvent.Train.delTrainId.menu.operation) {
+                    /** 删除列车识别号*/
+                    return OperationEvent.Train.delTrainId.confirm.domId;
+                } else if (this.operation === OperationEvent.Train.moveTrainId.menu.operation) {
+                    /** 移动列车识别号*/
+                    return OperationEvent.Train.moveTrainId.confirm.domId;
+                } else if (this.operation === OperationEvent.Train.switchTrainId.menu.operation) {
+                    /** 交换列车识别号*/
+                    return OperationEvent.Train.switchTrainId.confirm.domId;
+                } else if (this.operation === OperationEvent.Train.editTrainNo.menu.operation) {
+                    /** 修改车组号*/
+                    return OperationEvent.Train.editTrainNo.confirm.domId;
+                }
+            }
+            return '';
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(operate) {
+            if (!this.dialogShow) {
+                this.loading = false;
+                this.operate = operate || {};
+                this.messages = operate.messages;
+                this.operation = operate.operation;
+            }
+
+            this.dialogShow = true;
+            this.$nextTick(function () {
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.$store.dispatch('map/setTrainWindowShow', false);
+            this.$store.dispatch('training/emitTipFresh');
+        },
+        commit() {
+            if (this.operation === OperationEvent.Train.addTrainId.menu.operation) {
+                this.routeSetting();
+            } else if (this.operation === OperationEvent.Train.editTrainId.menu.operation) {
+                this.routeSetting();
+            } else if (this.operation === OperationEvent.Train.delTrainId.menu.operation) {
+                this.routeSetting();
+            } else if (this.operation === OperationEvent.Train.moveTrainId.menu.operation) {
+                this.routeSetting();
+            } else if (this.operation === OperationEvent.Train.switchTrainId.menu.operation) {
+                this.routeSetting();
+            } else if (this.operation === OperationEvent.Train.editTrainNo.menu.operation) {
+                this.routeSetting();
+            }
+        },
+        // 进路设置
+        routeSetting() {
+            const operate = {
+                over: true,
+                operation: OperationEvent.Train.addTrainId.confirm.operation,
+                cmdType: CMD.Train.CMD_ADD_TRAIN_ID
+            };
+
+            this.loading = true;
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.loading = false;
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => {
+                this.loading = false;
+                this.doClose();
+                this.$refs.noticeInfo.doShow(operate);
+            });
+        },
+        cancel() {
+            const operate = {
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
+
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => {
+                this.doClose();
+            });
+        }
+    }
+};
+
+</script>
+<style>
+    .confirm-control .context {
+        padding-bottom: 40px !important;
+        border: 1px solid lightgray;
+    }
+</style>
diff --git a/src/jmapNew/theme/xian_01/menus/dialog/routeCmdControl.vue b/src/jmapNew/theme/xian_01/menus/dialog/routeCmdControl.vue
new file mode 100644
index 000000000..258096dfb
--- /dev/null
+++ b/src/jmapNew/theme/xian_01/menus/dialog/routeCmdControl.vue
@@ -0,0 +1,450 @@
+<template>
+  <div>
+    <el-dialog
+      v-dialogDrag
+      class="fuzhou-01__systerm route-cmd-control"
+      :title="title"
+      :visible.sync="show"
+      width="840px"
+      :before-close="doClose"
+      :z-index="2000"
+      :modal="false"
+      :close-on-click-modal="false"
+    >
+      <div style="padding: 10px 20px; border: 1px solid lightgray;">
+        <span class="base-label">{{ $t('menu.commandInformation') }}</span>
+        <el-form label-position="center" size="mini">
+          <el-row>
+            <el-col :span="8">
+              <el-form-item :label="this.$t('menu.type')" label-width="40px">
+                <el-select v-model="operation" size="small" disabled>
+                  <el-option
+                    v-for="option in typeList"
+                    :key="option.code"
+                    :label="option.name"
+                    :value="option.code"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item :label="this.$t('menu.stationName')" label-width="80px">
+                <el-input v-model="stationName" size="small" disabled />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item :label="this.$t('menu.signalName')" label-width="100px">
+                <el-input v-model="signalName" size="small" disabled />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+      <el-table
+        ref="tempData"
+        class="table"
+        :data="tempData"
+        border
+        style="width: 100%"
+        size="mini"
+        highlight-current-row
+        height="200"
+      >
+        <el-table-column prop="order" :width="110" :label="this.$t('menu.serialNumber2')" />
+        <el-table-column prop="date" :width="160" :label="this.$t('menu.time')" />
+        <el-table-column prop="context" :width="180" :label="this.$t('menu.implementationProcess')" />
+        <el-table-column prop="result" :label="this.$t('menu.executionResult')" />
+      </el-table>
+      <span class="notice">{{ message }}</span>
+      <el-row class="button-group">
+        <el-col :span="2" :offset="3">
+          <el-button :id="domIdCommand" type="primary" :disabled="cmdDisabled[0]" @click="command">{{ $t('menu.release') }}<span
+            v-show="timeCountCommand>0"
+          >({{ timeCountCommand }})</span></el-button>
+        </el-col>
+        <el-col :span="2" :offset="1">
+          <el-button :id="domIdConfirm1" style="width:120px;" type="primary" :disabled="cmdDisabled[1]" @click="confirm1">{{ $t('menu.firstConfirm') }}
+          </el-button>
+        </el-col>
+        <el-col :span="2" :offset="2">
+          <el-button :id="domIdConfirm2" type="primary" style="width:120px;" :disabled="cmdDisabled[2]" @click="confirm2">{{ $t('menu.secondConfirm') }}<span
+            v-show="timeCountConfirm>0"
+          >({{ timeCountConfirm }})</span></el-button>
+        </el-col>
+        <el-col :span="2" :offset="2">
+          <el-button :id="domIdStop" type="primary" :disabled="stpDisabled" @click="stop">{{ $t('menu.suspend') }}</el-button>
+        </el-col>
+        <el-col :span="2" :offset="1">
+          <el-button :id="domIdClose" @click="close">{{ $t('global.close') }}</el-button>
+        </el-col>
+      </el-row>
+    </el-dialog>
+    <confirm-signal-unlock ref="confirmSignalUnlock" @setOperate="getOperate" />
+  </div>
+</template>
+<script>
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import { now } from '@/utils/date';
+import ConfirmSignalUnlock from './childDialog/confirmSignalUnlock';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
+
+export default {
+    name: 'RouteCmdControl',
+    components: {
+        ConfirmSignalUnlock
+    },
+    data() {
+        return {
+            dialogShow: false,
+            backOperate: '',
+            selected: '',
+            order: 0,
+            row: null,
+            timer: null,
+            operation: '',
+            cmdDisabled: [true, true, true],
+            stpDisabled: true,
+            tempData: [],
+            message: '',
+            timeCountCommand: -1,
+            timeCountConfirm: -1,
+            stationName: '',
+            signalName: ''
+        };
+    },
+    computed: {
+        typeList() {
+            return [
+                { code: OperationEvent.Signal.unlock.menu.operation, name: this.$t('menu.menuSignal.signalDeblock') },
+                { code: OperationEvent.Signal.guide.menu.operation, name: this.$t('menu.menuSignal.guideRouteHandle') }
+            ];
+        },
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
+        },
+        domIdCommand() {
+            if (this.dialogShow) {
+                if (this.operation == OperationEvent.Signal.unlock.menu.operation) {
+                    /** 信号解封*/
+                    return OperationEvent.Signal.unlock.order.domId;
+                } else if (this.operation == OperationEvent.Signal.guide.menu.operation) {
+                    /** 办理引导进路*/
+                    return OperationEvent.Signal.guide.order.domId;
+                }
+            }
+            return '';
+        },
+        domIdConfirm1() {
+            if (this.dialogShow) {
+                if (this.operation == OperationEvent.Signal.unlock.menu.operation) {
+                    /** 信号解封*/
+                    return OperationEvent.Signal.unlock.confirm1.domId;
+                } else if (this.operation == OperationEvent.Signal.guide.menu.operation) {
+                    /** 办理引导进路*/
+                    return OperationEvent.Signal.guide.confirm1.domId;
+                }
+            }
+            return '';
+        },
+        domIdConfirm2() {
+            if (this.dialogShow) {
+                if (this.operation == OperationEvent.Signal.unlock.menu.operation) {
+                    /** 信号解封*/
+                    return OperationEvent.Signal.unlock.confirm2.domId;
+                } else if (this.operation == OperationEvent.Signal.guide.menu.operation) {
+                    /** 办理引导进路*/
+                    return OperationEvent.Signal.guide.confirm2.domId;
+                }
+            }
+            return '';
+        },
+        domIdStop() {
+            if (this.dialogShow) {
+                if (this.operation == OperationEvent.Signal.unlock.menu.operation) {
+                    /** 信号解封*/
+                    return OperationEvent.Signal.unlock.stop.domId;
+                } else if (this.operation == OperationEvent.Signal.guide.menu.operation) {
+                    /** 办理引导进路*/
+                    return OperationEvent.Signal.guide.stop.domId;
+                }
+            }
+            return '';
+        },
+        domIdClose() {
+            if (this.dialogShow) {
+                return OperationEvent.Command.close.menu.domId;
+            }
+            return '';
+        },
+        title() {
+            if (this.dialogShow) {
+                if (this.operation == OperationEvent.Signal.unlock.menu.operation) {
+                    return '信号解封';
+                } else if (this.operation == OperationEvent.Signal.guide.menu.operation) {
+                    return '办理引导进路';
+                }
+            }
+            return '';
+        }
+    },
+    watch: {
+        cmdDisabled: {
+            handler(val, oldVal) {
+                this.stpDisabled = true;
+                val.forEach((elem, index) => {
+                    // 在确定1之前的操作才可以终止
+                    if (elem == false && index >= 1 && index <= 2) {
+                        this.stpDisabled = false;
+                    }
+                });
+            },
+            deep: true
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+        this.timer = setInterval(() => {
+            if (!this.$store.state.menuOperation.break) {
+                if (this.timeCountCommand > 0) {
+                    this.timeCountCommand--;
+                } else if (this.timeCountCommand == 0) {
+                    this.setButtonEnable({ step: 0 });
+                    this.timeCountCommand = -1;
+                }
+                if (this.timeCountConfirm > 0) {
+                    this.timeCountConfirm--;
+                } else if (this.timeCountConfirm == 0) {
+                    this.setButtonEnable({ step: 0 });
+                    this.timeCountConfirm = -1;
+                }
+            }
+        }, 1000);
+    },
+    beforeDestroy() {
+        clearInterval(this.timer);
+        this.timer = null;
+    },
+    methods: {
+        doShow(operate, selected) {
+            if (!this.dialogShow) {
+                this.signalName = '';
+                this.stationName = '';
+                if (selected && selected._type.toUpperCase() === 'Signal'.toUpperCase()) {
+                    this.signalName = selected.name;
+                    const station = this.$store.getters['map/getDeviceByCode'](selected.stationCode);
+                    if (station) {
+                        this.stationName = station.name;
+                    }
+                    this.selected = selected;
+                }
+
+                this.order = 0;
+                this.operation = operate.operation;
+
+                this.tempData = [];
+                this.timeCountCommand = -1;
+                this.timeCountConfirm = -1;
+                this.cmdDisabled = [false, true, true];
+            }
+            this.dialogShow = true;
+            this.stpDisabled = true;
+            this.setMessage(this.$t('tip.releaseTip'));
+            this.$nextTick(function () {
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
+        doClose() {
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+        },
+        command() {
+            if (this.operation == OperationEvent.Signal.unlock.menu.operation) {
+                /** 第一步带弹框处理*/
+                this.commandHasPopUp();
+            } else if (this.operation == OperationEvent.Signal.guide.menu.operation) {
+                /** 第一步不带弹框处理*/
+                this.commandNoPopUp();
+            }
+        },
+        commandHasPopUp() {
+            const operate = {
+            };
+
+            if (this.operation == OperationEvent.Signal.unlock.menu.operation) {
+                /** 信号解封*/
+                operate.operation = OperationEvent.Signal.unlock.order.operation;
+            }
+
+            this.setMessage(this.$t('tip.firstConfirmTip'));
+            this.writeRecord({ order: ++this.order, date: now(), context: this.$t('menu.clickReleaseCommand'), result: '' });
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    if (this.operation == OperationEvent.Signal.unlock.menu.operation) {
+                        this.$refs.confirmSignalUnlock.doShow(operate, this.selected);
+                    }
+                }
+            });
+        },
+        commandNoPopUp() {
+            const operate = {
+            };
+
+            if (this.operation == OperationEvent.Signal.guide.menu.operation) {
+                /** 办理引导进路*/
+                operate.operation = OperationEvent.Signal.guide.order.operation;
+            }
+
+            this.setMessage(this.$t('tip.firstConfirmTip'));
+            this.writeRecord({ order: ++this.order, date: now(), context: this.$t('menu.clickReleaseCommand'), result: '' });
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.setButtonEnable({ step: 1 });
+                    this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickReleaseCommand'), result: this.$t('tip.executionSucceed') });
+                } else {
+                    this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickReleaseCommand'), result: this.$t('tip.executionFailed') });
+                }
+            }).catch(() => {
+                this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickReleaseCommand'), result: this.$t('tip.executionException') });
+            });
+        },
+        confirm1() {
+            const operate = {
+            };
+
+            if (this.operation == OperationEvent.Signal.unlock.menu.operation) {
+                /** 信号解封*/
+                operate.operation = OperationEvent.Signal.unlock.confirm1.operation;
+            } else if (this.operation == OperationEvent.Signal.guide.menu.operation) {
+                /** 办理引导进路*/
+                operate.operation = OperationEvent.Signal.guide.confirm1.operation;
+            }
+
+            this.setMessage(this.$t('tip.secondConfirmTip'));
+            this.writeRecord({ order: ++this.order, date: now(), context: this.$t('menu.clickFirstConfirm'), result: '' });
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.timeCountCommand = -1;
+                    this.timeCountConfirm = 10;
+                    this.setButtonEnable({ step: 2 });
+                    this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickFirstConfirm'), result: this.$t('tip.executionSucceed') });
+                } else {
+                    this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickFirstConfirm'), result: this.$t('tip.executionFailed') });
+                }
+            }).catch(() => {
+                this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickFirstConfirm'), result: this.$t('tip.executionException') });
+            });
+        },
+        confirm2() {
+            const operate = {
+                over: true
+            };
+
+            if (this.operation == OperationEvent.Signal.unlock.menu.operation) {
+                /** 信号解封*/
+                operate.operation = OperationEvent.Signal.unlock.confirm2.operation;
+                operate.cmdType = CMD.Signal.CMD_SIGNAL_UNBLOCK;
+            } else if (this.operation == OperationEvent.Signal.guide.menu.operation) {
+                /** 办理引导进路*/
+                operate.operation = OperationEvent.Signal.guide.confirm2.operation;
+                operate.cmdType = CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE;
+            }
+            this.setMessage('');
+            this.writeRecord({ order: ++this.order, date: now(), context: this.$t('menu.clickSecondConfirm'), result: '' });
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.timeCountCommand = -1;
+                this.timeCountConfirm = -1;
+                this.setButtonEnable({ step: -1 });
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickSecondConfirm'), result: this.$t('tip.executionSucceed') });
+                } else {
+                    this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickSecondConfirm'), result: this.$t('tip.executionFailed') });
+                }
+            }).catch(() => {
+                this.timeCountCommand = -1;
+                this.timeCountConfirm = -1;
+                this.setButtonEnable({ step: -1 });
+                this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickSecondConfirm'), result: this.$t('tip.executionException') });
+            });
+        },
+        stop() {
+            const operate = {
+            };
+
+            if (this.operation == OperationEvent.Signal.unlock.menu.operation) {
+                /** 信号解封*/
+                operate.operation = OperationEvent.Signal.unlock.stop.operation;
+            } else if (this.operation == OperationEvent.Signal.guide.menu.operation) {
+                /** 办理引导进路*/
+                operate.operation = OperationEvent.Signal.guide.stop.operation;
+            }
+
+            this.writeRecord({ order: ++this.order, date: now(), context: this.$t('menu.clickSuspend'), result: '' });
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.setButtonEnable({ step: 0 });
+                    this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickSuspend'), result: this.$t('tip.executionSucceed') });
+                } else {
+                    this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickSuspend'), result: this.$t('tip.executionFailed') });
+                }
+            }).catch(() => {
+                this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickSuspend'), result: this.$t('tip.executionException') });
+            });
+        },
+        close() {
+            const operate = {
+                operation: OperationEvent.Command.close.menu.operation
+            };
+
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => {
+                this.doClose();
+            });
+        },
+        getOperate(operate) {
+            /** 弹框返回值处理*/
+            if (this.operation == OperationEvent.Signal.unlock.menu.operation) {
+                /** 信号解封*/
+                this.backOperate = operate;
+                this.setButtonEnable(operate);
+                if (operate.success) {
+                    this.timeCountCommand = 30;
+                    this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickReleaseCommand'), result: this.$t('tip.confirmedSuccess') });
+                } else {
+                    this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickReleaseCommand'), result: this.$t('tip.cancelSuccess') });
+                }
+            }
+        },
+        setButtonEnable(param) {
+            this.cmdDisabled = [true, true, true];
+            if (param && param.step >= 0) {
+                this.cmdDisabled[param.step] = false;
+            }
+        },
+        setMessage(message) {
+            this.message = message;
+        },
+        writeRecord(param) {
+            this.tempData.push(param);
+        },
+        editRecord(param) {
+            this.tempData.forEach(elem => {
+                if (elem.order == param.order) {
+                    for (var prop in param) {
+                        elem[prop] = param[prop];
+                    }
+                }
+            });
+        }
+    }
+};
+</script>
diff --git a/src/jmapNew/theme/xian_01/menus/dialog/routeControl.vue b/src/jmapNew/theme/xian_01/menus/dialog/routeControl.vue
new file mode 100644
index 000000000..63e732f6b
--- /dev/null
+++ b/src/jmapNew/theme/xian_01/menus/dialog/routeControl.vue
@@ -0,0 +1,332 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    class="fuzhou-01__systerm signal-control"
+    :title="title"
+    :visible.sync="show"
+    width="300px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <el-row class="header">
+      <el-col :span="11"><span>{{ $t('menu.stationName') }}</span></el-col>
+      <el-col :span="11" :offset="2"><span>{{ $t('menu.signal') }}</span></el-col>
+    </el-row>
+    <el-row>
+      <el-col :span="11">
+        <el-input v-model="stationName" size="small" disabled />
+      </el-col>
+      <el-col :span="11" :offset="2">
+        <el-input v-model="signalName" size="small" disabled />
+      </el-col>
+    </el-row>
+    <el-row justify="center" class="button-group">
+      <el-col :span="10" :offset="2">
+        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">{{ $t('menu.confirm') }}</el-button>
+      </el-col>
+      <el-col :span="8" :offset="4">
+        <el-button :id="domIdCancel" @click="cancel">{{ $t('menu.cancel') }}</el-button>
+      </el-col>
+    </el-row>
+    <confirm-control ref="confirmControl" />
+    <notice-info ref="noticeInfo" />
+  </el-dialog>
+</template>
+
+<script>
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
+import ConfirmControl from './childDialog/confirmControl';
+import NoticeInfo from './childDialog/childDialog/noticeInfo';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
+
+export default {
+    name: 'RouteControl',
+    components: {
+        ConfirmControl,
+        NoticeInfo
+    },
+    data() {
+        return {
+            dialogShow: false,
+            loading: false,
+            selected: null,
+            operation: null,
+            stationName: '',
+            signalName: ''
+
+        };
+    },
+    computed: {
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
+        },
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.close.menu.domId : '';
+        },
+        domIdConfirm() {
+            return this.dialogShow ? OperationHandler.getDomIdByOperation(this.operation) : '';
+        },
+        title() {
+            if (this.operation == OperationEvent.Signal.cancelTrainRoute.menu.operation) {
+                return this.$t('menu.menuSignal.cancelTheTrainApproach');
+            } else if (this.operation == OperationEvent.Signal.signalClose.menu.operation) {
+                return this.$t('menu.menuSignal.signalOff');
+            } else if (this.operation == OperationEvent.Signal.reopenSignal.menu.operation) {
+                return this.$t('menu.menuSignal.reopenTrainSignal');
+            } else if (this.operation == OperationEvent.Signal.setAutoInterlock.menu.operation) {
+                return this.$t('menu.menuSignal.setInterlockAutoRoute');
+            } else if (this.operation == OperationEvent.Signal.cancelAutoInterlock.menu.operation) {
+                return this.$t('menu.menuSignal.cancelInterlockAutoRoute');
+            } else if (this.operation == OperationEvent.Signal.setAutoTrigger.menu.operation) {
+                return this.$t('menu.menuSignal.setInterlockAutoTrigger');
+            } else if (this.operation == OperationEvent.Signal.cancelAutoTrigger.menu.operation) {
+                return this.$t('menu.menuSignal.cancelInterlockAutoTrigger');
+            }
+            return '';
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(operate, selected) {
+            if (!this.dialogShow) {
+                this.signalName = '';
+                this.stationName = '';
+                if (selected && selected._type.toUpperCase() === 'Signal'.toUpperCase()) {
+                    this.signalName = selected.name;
+                    const station = this.$store.getters['map/getDeviceByCode'](selected.stationCode);
+                    if (station) {
+                        this.stationName = station.name;
+                    }
+                }
+                this.selected = selected;
+                this.operation = operate.operation;
+            }
+            this.dialogShow = true;
+            this.$nextTick(function () {
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+        },
+        commit() {
+            if (this.operation == OperationEvent.Signal.cancelTrainRoute.menu.operation) {
+                /** 取消列车进路*/
+                this.cancelTrainRoute();
+            } else if (this.operation == OperationEvent.Signal.signalClose.menu.operation) {
+                /** 信号关灯*/
+                this.signalClose();
+            } else if (this.operation == OperationEvent.Signal.reopenSignal.menu.operation) {
+                /** 信号重开*/
+                this.reopenSignal();
+            } else if (this.operation == OperationEvent.Signal.setAutoInterlock.menu.operation) {
+                /** 设置联锁自动进路*/
+                this.setAutoInterlock();
+            } else if (this.operation == OperationEvent.Signal.cancelAutoInterlock.menu.operation) {
+                /** 取消联锁自动进路*/
+                this.cancelAutoInterlock();
+            } else if (this.operation == OperationEvent.Signal.setAutoTrigger.menu.operation) {
+                /** 设置联锁自动触发*/
+                this.setAutoTrigger();
+            } else if (this.operation == OperationEvent.Signal.cancelAutoTrigger.menu.operation) {
+                /** 取消联锁自动触发*/
+                this.cancelAutoTrigger();
+            }
+        },
+        // 取消列车进路
+        cancelTrainRoute() {
+            if (this.$store.state.training.prdType == '01') {
+                /** 现地工作站*/
+                this.cancelTrainRouteByLocal();
+            } else if (this.$store.state.training.prdType == '02') {
+                /** 行调工作站*/
+                this.cancelTrainRouteByCentral();
+            }
+        },
+        // 现地工作站取消进路
+        cancelTrainRouteByLocal() {
+            const operate = {
+                over: true,
+                operation: OperationEvent.Signal.cancelTrainRoute.menu.operation,
+                cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE
+            };
+
+            this.loading = true;
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.loading = false;
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => {
+                this.loading = false;
+                this.doClose();
+                this.$refs.noticeInfo.doShow(operate);
+            });
+        },
+        // 行调工作站取消进路
+        cancelTrainRouteByCentral() {
+            const operate = {
+                over: true,
+                operation: OperationEvent.Signal.cancelTrainRoute.menu.operation,
+                cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE,
+                messages: [this.$t('tip.signalModeToManualModeTipPrefix') + this.signalName + this.$t('tip.signalModeToManualModeTipSuffix')]
+            };
+
+            this.loading = true;
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.loading = false;
+                if (valid) {
+                    this.doClose();
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.confirmControl.doShow(operate, this.selected);
+                }
+            }).catch(() => {
+                this.loading = false;
+            });
+        },
+        // 信号关灯
+        signalClose() {
+            const operate = {
+                operation: OperationEvent.Signal.signalClose.menu.operation,
+                messages: [this.$t('menu.menuSignal.signalOff') + this.$t('global.colon') + this.signalName]
+            };
+
+            this.loading = true;
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.loading = false;
+                if (valid) {
+                    this.doClose();
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.confirmControl.doShow(operate);
+                }
+            }).catch(() => {
+                this.loading = false;
+            });
+        },
+        // 信号重开
+        reopenSignal() {
+            const operate = {
+                operation: OperationEvent.Signal.reopenSignal.menu.operation,
+                messages: [this.$t('menu.menuSignal.signalReopen') + this.$t('global.colon') + this.signalName]
+            };
+
+            this.loading = true;
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.loading = false;
+                if (valid) {
+                    this.doClose();
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.confirmControl.doShow(operate);
+                }
+            }).catch(() => {
+                this.loading = false;
+            });
+        },
+        // 设置联锁自动进路
+        setAutoInterlock() {
+            const operate = {
+                over: true,
+                cmdType: CMD.Signal.CMD_SIGNAL_SET_CI_AUTO,
+                operation: OperationEvent.Signal.setAutoInterlock.menu.operation
+            };
+
+            this.loading = true;
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.loading = false;
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => {
+                this.loading = false;
+                this.doClose();
+                this.$refs.noticeInfo.doShow(operate);
+            });
+        },
+        // 取消联锁自动进路
+        cancelAutoInterlock() {
+            const operate = {
+                over: true,
+                operation: OperationEvent.Signal.cancelAutoInterlock.menu.operation,
+                cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO
+            };
+
+            this.loading = true;
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.loading = false;
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => {
+                this.loading = false;
+                this.doClose();
+                this.$refs.noticeInfo.doShow(operate);
+            });
+        },
+        // 设置联锁自动触发
+        setAutoTrigger() {
+            const operate = {
+                over: true,
+                operation: OperationEvent.Signal.setAutoTrigger.menu.operation,
+                cmdType: CMD.Signal.CMD_SIGNAL_SET_CI_AUTO_TRIGGER
+            };
+
+            this.loading = true;
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.loading = false;
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => {
+                this.loading = false;
+                this.doClose();
+                this.$refs.noticeInfo.doShow(operate);
+            });
+        },
+        // 取消联锁自动触发
+        cancelAutoTrigger() {
+            const operate = {
+                over: true,
+                operation: OperationEvent.Signal.cancelAutoTrigger.menu.operation,
+                cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO_TRIGGER
+            };
+
+            this.doClose();
+            this.loading = true;
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.loading = false;
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => {
+                this.loading = false;
+                this.doClose();
+                this.$refs.noticeInfo.doShow(operate);
+            });
+        },
+        // 取消
+        cancel() {
+            const operate = {
+                operation: OperationEvent.Command.close.menu.operation
+            };
+
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => {
+                this.doClose();
+                this.$refs.noticeInfo.doShow(operate);
+            });
+        }
+    }
+};
+</script>
diff --git a/src/jmapNew/theme/xian_01/menus/dialog/routeDetail.vue b/src/jmapNew/theme/xian_01/menus/dialog/routeDetail.vue
new file mode 100644
index 000000000..19472e077
--- /dev/null
+++ b/src/jmapNew/theme/xian_01/menus/dialog/routeDetail.vue
@@ -0,0 +1,166 @@
+<template>
+  <div>
+    <el-dialog
+      v-dialogDrag
+      class="fuzhou-01__systerm route-detail"
+      :title="title"
+      :visible.sync="show"
+      width="340px"
+      :before-close="doClose"
+      :z-index="2000"
+      :modal="false"
+      :close-on-click-modal="false"
+    >
+      <el-row class="header">
+        <el-col :span="10"><span>{{ $t('menu.stationName') }}</span></el-col>
+        <el-col :span="10" :offset="2"><span>{{ $t('menu.startSignal') }}</span></el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="10">
+          <el-input v-model="stationName" size="small" disabled />
+        </el-col>
+        <el-col :span="10" :offset="2">
+          <el-input v-model="signalName" size="small" disabled />
+        </el-col>
+      </el-row>
+      <div class="table">
+        <span>{{ $t('menu.routeList') }}</span>
+        <el-table
+          ref="tempTable"
+          :data="tempData"
+          border
+          style="width: 100%"
+          size="mini"
+          highlight-current-row
+          :height="140"
+        >
+          <el-table-column :label="this.$t('menu.route')">
+            <template slot-scope="scope">
+              <span>{{ scope.row.name }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="status" :label="this.$t('menu.controlState')" width="180">
+            <template slot-scope="scope">
+              <span v-if="scope.row.controlType == '01'">{{ $t('menu.automatic') }}</span>
+              <span v-else>{{ $t('menu.artificial') }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <el-row justify="center" class="button-group">
+        <el-col :span="10" :offset="2">
+          <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">{{ $t('global.confirm') }}</el-button>
+        </el-col>
+        <el-col :span="8" :offset="4">
+          <el-button :id="domIdCancel" @click="cancel">{{ $t('global.cancel') }}</el-button>
+        </el-col>
+      </el-row>
+      <notice-info ref="noticeInfo" />
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import NoticeInfo from './childDialog/childDialog/noticeInfo';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
+
+export default {
+    name: 'RouteDetail',
+    components: {
+        NoticeInfo
+    },
+    data() {
+        return {
+            dialogShow: false,
+            loading: false,
+            tempData: [],
+            stationName: '',
+            signalName: ''
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'signalList'
+        ]),
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
+        },
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+        },
+        domIdConfirm() {
+            return this.dialogShow ? OperationEvent.Signal.detail.menu.domId : '';
+        },
+        title() {
+            return this.$t('menu.queryAccessControlMode');
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(operate, selected, tempData) {
+            // 如果不是因为断点激活则需要，初始化菜单初始值
+            if (!this.dialogShow) {
+                this.signalName = '';
+                this.stationName = '';
+                if (selected && selected._type.toUpperCase() === 'Signal'.toUpperCase()) {
+                    this.signalName = selected.name;
+                    const station = this.$store.getters['map/getDeviceByCode'](selected.stationCode);
+                    if (station) {
+                        this.stationName = station.name;
+                    }
+                }
+                this.tempData = tempData || [];
+            }
+
+            this.dialogShow = true;
+            this.$nextTick(function () {
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+        },
+        commit() {
+            const operate = {
+                over: true,
+                operation: OperationEvent.Signal.detail.menu.operation,
+                cmdType: CMD.Signal.CMD_STAND_VIEW_STATUS
+            };
+
+            this.loading = true;
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.loading = false;
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => {
+                this.loading = false;
+                this.doClose();
+                this.$refs.noticeInfo.doShow(operate);
+            });
+        },
+        cancel() {
+            const operate = {
+
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
+
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => {
+                this.doClose();
+            });
+        }
+    }
+};
+</script>
diff --git a/src/jmapNew/theme/xian_01/menus/dialog/routeHandControl.vue b/src/jmapNew/theme/xian_01/menus/dialog/routeHandControl.vue
new file mode 100644
index 000000000..9b6715176
--- /dev/null
+++ b/src/jmapNew/theme/xian_01/menus/dialog/routeHandControl.vue
@@ -0,0 +1,316 @@
+<template>
+  <div>
+    <el-dialog
+      v-dialogDrag
+      class="fuzhou-01__systerm route-hand-control"
+      :title="title"
+      :visible.sync="show"
+      width="360px"
+      :before-close="doClose"
+      :z-index="2000"
+      :modal="false"
+      :close-on-click-modal="false"
+    >
+      <el-row class="header">
+        <el-col :span="10"><span>{{ $t('menu.stationName') }}</span></el-col>
+        <el-col :span="10" :offset="2"><span>{{ $t('menu.startSignal') }}</span></el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="10">
+          <el-input v-model="stationName" size="small" disabled />
+        </el-col>
+        <el-col :span="10" :offset="2">
+          <el-input v-model="signalName" size="small" disabled />
+        </el-col>
+      </el-row>
+      <div class="table">
+        <span>{{ $t('menu.routeList') }}</span>
+        <el-table
+          ref="tempTable"
+          :data="tempData"
+          border
+          style="width: 100%"
+          size="mini"
+          highlight-current-row
+          :height="140"
+        >
+          <el-table-column :id="domIdChoose" prop="name" :label="this.$t('menu.route')" style="margin-left:30px">
+            <template slot-scope="scope">
+              <el-checkbox v-model="scope.row.check" :disabled="scope.row.disabled" />
+              <span :style="{color: scope.row.disabled ? '#CBCBCB':'unset'}">{{ scope.row.name }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="controlType" :label="this.$t('menu.controlState')" :width="80">
+            <template slot-scope="scope">
+              <span :style="{color: scope.row.disabled ? '#CBCBCB':'unset'}">
+                <span v-if="scope.row.controlType == '01'">{{ $t('menu.automatic2') }}</span>
+                <span v-else>{{ $t('menu.artificial') }}</span>
+              </span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="conflictCheck" :label="this.$t('menu.conflictCheck')" :width="80">
+            <template slot-scope="scope">
+              <span
+                :style="{color: scope.row.disabled ? '#CBCBCB':'unset'}"
+              >{{ scope.row.conflictCheck }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <el-row justify="center" class="button-group">
+        <el-col :span="10" :offset="2">
+          <el-button
+            :id="domIdConfirm"
+            type="primary"
+            :disabled="commitDisabled"
+            :loading="loading"
+            @click="commit"
+          >{{ $t('global.confirm') }}</el-button>
+        </el-col>
+        <el-col :span="8" :offset="4">
+          <el-button :id="domIdCancel" @click="cancel">{{ $t('global.cancel') }}</el-button>
+        </el-col>
+      </el-row>
+      <confirm-control ref="confirmControl" />
+      <notice-info ref="noticeInfo" />
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
+import ConfirmControl from './childDialog/confirmControl';
+import NoticeInfo from './childDialog/childDialog/noticeInfo';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
+
+export default {
+    name: 'RouteHandControl',
+    components: {
+        ConfirmControl,
+        NoticeInfo
+    },
+    data() {
+        return {
+            dialogShow: false,
+            loading: false,
+            tempData: [],
+            operation: null,
+            selection: [],
+            stationName: '',
+            signalName: ''
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'signalList'
+        ]),
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
+        },
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+        },
+        domIdChoose() {
+            if (this.dialogShow) {
+                if (this.operation == OperationEvent.Signal.humanControl.menu.operation) {
+                    return OperationEvent.Signal.humanControl.choose.domId;
+                } else if (this.operation == OperationEvent.Signal.atsAutoControl.menu.operation) {
+                    return OperationEvent.Signal.atsAutoControl.choose.domId;
+                }
+            }
+            return '';
+        },
+        domIdConfirm() {
+            return this.dialogShow ? OperationHandler.getDomIdByOperation(this.operation) : '';
+        },
+        title() {
+            if (this.operation == OperationEvent.Signal.humanControl.menu.operation) {
+                return this.$t('menu.menuSignal.humanControl');
+            } else if (this.operation == OperationEvent.Signal.atsAutoControl.menu.operation) {
+                return this.$t('menu.menuSignal.atsAutoControl');
+            }
+            return '';
+        },
+        commitDisabled() {
+            let disabled = true;
+            if (this.selection && this.selection.length) {
+                disabled = false;
+            }
+
+            return disabled;
+        }
+    },
+    watch: {
+        // 深度数据状态
+        tempData: {
+            handler(val, oldVal) {
+                this.checkTableDataSelction(val);
+            },
+            deep: true
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(operate, selected, tempData) {
+            // 如果不是断点激活，而是第一次显示则初始化
+            if (!this.dialogShow) {
+                this.signalName = '';
+                this.stationName = '';
+                if (selected && selected._type.toUpperCase() === 'Signal'.toUpperCase()) {
+                    this.signalName = selected.name;
+                    const station = this.$store.getters['map/getDeviceByCode'](selected.stationCode);
+                    if (station) {
+                        this.stationName = station.name;
+                    }
+                }
+
+                if (tempData && tempData.length > 0) {
+                    tempData.forEach(elem => {
+                        elem.check = false;
+                        elem.disabled = false;
+                        // 设置禁用状态
+                        if (operate.operation === OperationEvent.Signal.humanControl.menu.operation &&
+                                elem.controlType != '01') {
+                            elem.disabled = true;
+                        } if (operate.operation === OperationEvent.Signal.atsAutoControl.menu.operation &&
+                                elem.controlType == '01') {
+                            elem.disabled = true;
+                        }
+                    });
+                }
+
+                this.tempData = tempData || [];
+                this.operation = operate.operation;
+            }
+            this.dialogShow = true;
+            this.$nextTick(function () {
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.$refs.tempTable.setCurrentRow();
+            this.$store.dispatch('training/emitTipFresh');
+        },
+        checkTableDataSelction(data) {
+            const selection = [];
+            if (data && data.length > 0) {
+                data.forEach(row => {
+                    if (row.check && !row.disabled) {
+                        selection.push(row);
+                    }
+                });
+            }
+
+            if (JSON.stringify(selection) !== JSON.stringify(this.selection)) {
+                this.handleChooseChange(selection);
+                this.selection = selection;
+            }
+        },
+        handleChooseChange(selection) {
+            this.selection = selection;
+            const codeList = selection.map(elem => { return elem.code; });
+            if (codeList && codeList.length) {
+                const operate = {
+                    repeat: true,
+                    operation: '',
+                    val: codeList.join('::')
+                };
+
+                if (this.operation == OperationEvent.Signal.humanControl.menu.operation) {
+                    /** 自排关*/
+                    operate.operation = OperationEvent.Signal.humanControl.choose.operation;
+                } else if (this.operation == OperationEvent.Signal.atsAutoControl.menu.operation) {
+                    /** 自排开*/
+                    operate.operation = OperationEvent.Signal.atsAutoControl.choose.operation;
+                }
+
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    if (valid) {
+                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    }
+                });
+            } else if (!selection) {
+                this.$messageBox(this.$t('tip.selectAPieceOfData'));
+            }
+        },
+        commit() {
+            if (this.operation == OperationEvent.Signal.humanControl.menu.operation) {
+                /** 自排关*/
+                this.humanControl();
+            } else if (this.operation == OperationEvent.Signal.atsAutoControl.menu.operation) {
+                /** 自排开*/
+                this.atsAutoControl();
+            }
+        },
+        // 自排关
+        humanControl() {
+            const codeList = this.selection.map(elem => { return elem.code; });
+            const operate = {
+                over: true,
+                operation: OperationEvent.Signal.humanControl.menu.operation,
+                cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_AUTO_SETTING,
+                param: {
+                    Route_Code_List: codeList
+                }
+            };
+
+            this.loading = true;
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.loading = false;
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => {
+                this.loading = false;
+                this.doClose();
+                this.$refs.noticeInfo.doShow(operate);
+            });
+        },
+        // 自排开
+        atsAutoControl() {
+            const codeList = this.selection.map(elem => { return elem.code; });
+            const operate = {
+                over: true,
+                operation: OperationEvent.Signal.atsAutoControl.menu.operation,
+                cmdType: CMD.Signal.CMD_SIGNAL_OPEN_AUTO_SETTING,
+                param: {
+                    Route_Code_List: codeList
+                }
+            };
+
+            this.loading = true;
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.loading = false;
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => {
+                this.loading = false;
+                this.doClose();
+                this.$refs.noticeInfo.doShow(operate);
+            });
+        },
+        cancel() {
+            const operate = {
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
+
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => {
+                this.doClose();
+            });
+        }
+    }
+};
+</script>
diff --git a/src/jmapNew/theme/xian_01/menus/dialog/routeLock.vue b/src/jmapNew/theme/xian_01/menus/dialog/routeLock.vue
new file mode 100644
index 000000000..eaa3d6027
--- /dev/null
+++ b/src/jmapNew/theme/xian_01/menus/dialog/routeLock.vue
@@ -0,0 +1,167 @@
+<template>
+  <div>
+    <el-dialog
+      v-dialogDrag
+      class="fuzhou-01__systerm route-lock"
+      :title="title"
+      :visible.sync="show"
+      width="340px"
+      :before-close="doClose"
+      :z-index="2000"
+      :modal="false"
+      :close-on-click-modal="false"
+    >
+      <el-row class="header">
+        <el-col :span="10"><span>{{ $t('menu.stationName') }}</span></el-col>
+        <el-col :span="10" :offset="2"><span>{{ $t('menu.signalName') }}</span></el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="10">
+          <el-input v-model="stationName" size="small" disabled />
+        </el-col>
+        <el-col :span="10" :offset="2">
+          <el-input v-model="signalName" size="small" disabled />
+        </el-col>
+      </el-row>
+      <div class="table">
+        <span>{{ $t('menu.listOfSignalButtons') }}</span>
+        <el-table
+          ref="table"
+          :data="tempData"
+          border
+          style="width: 100%"
+          size="mini"
+          highlight-current-row
+          :height="140"
+        >
+          <el-table-column prop="name" :label="this.$t('menu.buttonName')" />
+          <el-table-column prop="status" :label="this.$t('menu.buttonStatus')" />
+        </el-table>
+      </div>
+      <el-row justify="center" class="button-group">
+        <el-col :span="10" :offset="2">
+          <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">{{ $t('global.confirm') }}</el-button>
+        </el-col>
+        <el-col :span="8" :offset="4">
+          <el-button :id="domIdCancel" @click="cancel">{{ $t('global.cancel') }}</el-button>
+        </el-col>
+      </el-row>
+      <notice-info ref="noticeInfo" />
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import NoticeInfo from './childDialog/childDialog/noticeInfo';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
+
+export default {
+    name: 'RouteLock',
+    components: {
+        NoticeInfo
+    },
+    data() {
+        return {
+            dialogShow: false,
+            loading: false,
+            tempData: [],
+            operate: null,
+            stationName: '',
+            signalName: ''
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'signalList'
+        ]),
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
+        },
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+        },
+        domIdConfirm() {
+            return this.dialogShow ? OperationEvent.Signal.lock.menu.domId : '';
+        },
+        title() {
+            return this.$t('menu.blockSignalButton');
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(operate, selected) {
+            // 入股不是断点激活，而是第一次显示需要初始化
+            if (!this.dialogShow) {
+                this.signalName = '';
+                this.stationName = '';
+
+                if (selected && selected._type.toUpperCase() === 'Signal'.toUpperCase()) {
+                    this.signalName = selected.name;
+                    const station = this.$store.getters['map/getDeviceByCode'](selected.stationCode);
+                    if (station) {
+                        this.stationName = station.name;
+                    }
+                }
+
+                /** status 04:封锁*/
+                const signal = (selected || {}).status;
+                this.tempData = [{ code: selected.code, name: selected.name, status: signal.status != '04' ? this.$t('menu.unblocked') : this.$t('menu.blocked') }];
+                const timer = setInterval(() => {
+                    if (this.$refs.table) {
+                        this.$refs.table.setCurrentRow(this.tempData[0]);
+                        clearInterval(timer);
+                    }
+                }, 300);
+            }
+
+            this.dialogShow = true;
+            this.$nextTick(() => {
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+        },
+        commit() {
+            const operate = {
+                over: true,
+                operation: OperationEvent.Signal.lock.menu.operation,
+                cmdType: CMD.Signal.CMD_SIGNAL_BLOCK
+            };
+
+            this.loading = true;
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.loading = false;
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => {
+                this.loading = false;
+                this.doClose();
+                this.$refs.noticeInfo.doShow(operate);
+            });
+        },
+        cancel() {
+            const operate = {
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
+
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => {
+                this.doClose();
+            });
+        }
+    }
+};
+</script>
diff --git a/src/jmapNew/theme/xian_01/menus/dialog/routeSelection.vue b/src/jmapNew/theme/xian_01/menus/dialog/routeSelection.vue
new file mode 100644
index 000000000..14a6c0c34
--- /dev/null
+++ b/src/jmapNew/theme/xian_01/menus/dialog/routeSelection.vue
@@ -0,0 +1,239 @@
+<template>
+  <el-dialog v-dialogDrag class="fuzhou-01__systerm route-setting" :title="title" :visible.sync="show" width="500px" :before-close="doClose" :z-index="2000" :modal="false" :close-on-click-modal="false">
+    <el-row class="header">
+      <el-col :span="8"><span>{{ $t('menu.stationName') }}</span></el-col>
+      <el-col :span="8" :offset="2"><span>{{ $t('menu.startSignal') }}</span></el-col>
+    </el-row>
+    <el-row>
+      <el-col :span="8">
+        <el-input v-model="stationName" size="small" disabled />
+      </el-col>
+      <el-col :span="8" :offset="2">
+        <el-input v-model="signalName" size="small" disabled />
+      </el-col>
+    </el-row>
+    <el-table ref="table" :data="tempData" border style="width: 100%; margin-top:10px" size="mini" height="120" highlight-current-row @row-click="clickEvent">
+      <el-table-column :id="domIdChoose" prop="name" :label="this.$t('menu.route')" style="margin-left:30px" />
+      <el-table-column prop="protectedSection" :label="this.$t('menu.protectionSection')" :width="180">
+        <template slot-scope="scope">
+          <span>{{ getProtectedSectionName(scope.row) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="canSetting" :label="this.$t('global.status')" :width="100">
+        <template slot-scope="scope">
+          <span v-if="scope.row.canSetting">{{ $t('menu.allowSelection') }}</span>
+          <span v-else>{{ $t('menu.notAllowSelection') }}</span>
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-row justify="center" class="button-group">
+      <el-col :span="8" :offset="4">
+        <el-button
+          :id="domIdConfirm"
+          type="primary"
+          :loading="loading"
+          :disabled="commitDisabled"
+          @click="commit"
+        >{{ $t('global.confirm') }}</el-button>
+      </el-col>
+      <el-col :span="8" :offset="4">
+        <el-button :id="domIdCancel" @click="cancel">{{ $t('global.cancel') }}</el-button>
+      </el-col>
+    </el-row>
+    <confirm-control ref="confirmControl" />
+    <notice-info ref="noticeInfo" />
+  </el-dialog>
+</template>
+
+<script>
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import ConfirmControl from './childDialog/confirmControl';
+import NoticeInfo from './childDialog/childDialog/noticeInfo';
+
+export default {
+    name: 'RouteSelection',
+    components: {
+        ConfirmControl,
+        NoticeInfo
+    },
+    data() {
+        return {
+            tempData: [],
+            beforeSectionList: [],
+            dialogShow: false,
+            loading: false,
+            row: null,
+            operation: '',
+            display: true,
+            stationName: '',
+            signalName: ''
+        };
+    },
+    computed: {
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
+        },
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+        },
+        domIdChoose() {
+            return this.dialogShow ? OperationEvent.Signal.arrangementRoute.choose.domId : '';
+        },
+        domIdConfirm() {
+            return this.dialogShow ? OperationEvent.Signal.arrangementRoute.menu.domId : '';
+        },
+        title() {
+            return this.$t('menu.menuSignal.routeSelect');
+        },
+        commitDisabled() {
+            let disabled = true;
+            if (this.row) {
+                disabled = !this.row.canSetting;
+            }
+            return disabled;
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        getProtectedSectionName(row) {
+            let name = '';
+            if (row &&
+                    row.overlapSectionList &&
+                    row.overlapSectionList &&
+                    row.overlapSectionList.length > 0) {
+
+                const protect = row.overlapSectionList[0];
+                name = `${protect.name}`;
+                if (protect.parentName) {
+                    name = `${protect.parentName}${protect.name}`;
+                }
+                const station = this.$store.getters['map/getDeviceByCode'](protect.stationCode);
+                if (station) {
+                    name = `${name}(${station.name})`;
+                }
+            }
+            return name;
+        },
+        doShow(operate, selected, tempData) {
+            // 如果不是断点激活，而是第一次显示，则需要设置初始值
+            if (!this.dialogShow) {
+                this.signalName = '';
+                this.stationName = '';
+                if (selected && selected._type.toUpperCase() === 'Signal'.toUpperCase()) {
+                    this.signalName = selected.name;
+                    const station = this.$store.getters['map/getDeviceByCode'](selected.stationCode);
+                    if (station) {
+                        this.stationName = station.name;
+                    }
+                }
+
+                this.tempData = tempData || [];
+                this.operation = operate.operation;
+            }
+            this.dialogShow = true;
+            this.$nextTick(function () {
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.restoreBeforeDevices();
+            this.$refs.table.setCurrentRow();
+            this.$store.dispatch('training/emitTipFresh');
+        },
+        restoreBeforeDevices() {
+            // 恢复之前选中设备
+            if (this.beforeSectionList && this.beforeSectionList.length) {
+                this.beforeSectionList.forEach(elem => {
+                    elem.cutOff = false;
+                });
+            }
+
+            this.$store.dispatch('training/updateMapState', [... this.beforeSectionList]);
+            this.beforeSectionList = [];
+        },
+        clickEvent(row, event, column) {
+            this.row = row;
+            if (row) {
+                // 恢复进路区段的切除状态
+                this.restoreBeforeDevices();
+
+                if (row.canSetting) {
+                    // 设置选中区段为切除状态
+                    if (row.containSectionList && row.containSectionList.length) {
+                        // 设置新选的进路区段为切除状态
+                        row.containSectionList.forEach(elem => {
+                            elem.cutOff = true;
+                        });
+                    }
+
+                    this.$store.dispatch('training/updateMapState', [...row.containSectionList]);
+                    this.beforeSectionList = row.containSectionList || [];
+
+                    // 设置选中指令
+                    const operate = {
+                        operation: OperationEvent.Signal.arrangementRoute.choose.operation,
+                        val: row.code,
+                        param: {
+                            Route_Code: row.code
+                        }
+                    };
+
+                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                        if (valid) {
+                            this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                        }
+                    });
+                }
+            }
+        },
+        commit() {
+            if (this.row && this.row.canSetting) {
+                let names = '';
+                if (this.row.overlapSectionList && this.row.overlapSectionList.length > 0) {
+                    names = names + this.row.overlapSectionList.map(elem => { return elem.name; }).join('');
+                }
+                if (this.row.overlapSwitchList && this.row.overlapSwitchList.length > 0) {
+                    names = names + this.row.overlapSwitchList.map(elem => { return elem.name; }).join('');
+                }
+                const operate = {
+                    operation: OperationEvent.Signal.arrangementRoute.menu.operation,
+                    messages: [this.$t('menu.accessSetting') + this.$t('global.colon') + `${this.row.name}${names}(${this.row.stationName})`]
+                };
+
+                this.loading = true;
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.loading = false;
+                    if (valid) {
+                        this.doClose();
+                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                        this.$refs.confirmControl.doShow(operate);
+                    }
+                }).catch(() => {
+                    this.loading = false;
+                    this.doClose();
+                    this.$refs.noticeInfo.doShow(operate);
+                });
+            }
+        },
+        cancel() {
+            const operate = {
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
+
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => {
+                this.doClose();
+            });
+        }
+    }
+};
+</script>
diff --git a/src/jmapNew/theme/xian_01/menus/dialog/sectionCmdControl.vue b/src/jmapNew/theme/xian_01/menus/dialog/sectionCmdControl.vue
new file mode 100644
index 000000000..6d4a00fdb
--- /dev/null
+++ b/src/jmapNew/theme/xian_01/menus/dialog/sectionCmdControl.vue
@@ -0,0 +1,419 @@
+<template>
+  <div>
+    <el-dialog v-dialogDrag class="fuzhou-01__systerm section-cmd-control" :title="title" :visible.sync="show" width="840px" :before-close="doClose" :z-index="2000" :modal="false" :close-on-click-modal="false">
+      <div style="padding: 10px 20px; border: 1px solid lightgray;">
+        <span class="base-label">{{ $t('menu.commandInformation') }}</span>
+        <el-form label-position="center" size="mini">
+          <el-row>
+            <el-col :span="8">
+              <el-form-item :label="this.$t('global.status')" label-width="40px">
+                <el-select v-model="operation" size="small" disabled>
+                  <el-option v-for="option in typeList" :key="option.code" :label="option.name" :value="option.code" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item :label="this.$t('menu.stationName')" label-width="80px">
+                <el-input v-model="stationName" size="small" disabled />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item :label="this.$t('menu.sectionName')" label-width="100px">
+                <el-input v-model="sectionName" size="small" disabled />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+      <el-table :data="tempData" border style="width: 100%" size="mini" highlight-current-row height="200">
+        <el-table-column prop="order" :width="110" :label="this.$t('menu.serialNumber2')" />
+        <el-table-column prop="date" :width="160" :label="this.$t('menu.time')" />
+        <el-table-column prop="context" :width="180" :label="this.$t('menu.implementationProcess')" />
+        <el-table-column prop="result" :label="this.$t('menu.executionResult')" />
+      </el-table>
+      <span class="notice">{{ message }}</span>
+      <el-row class="button-group">
+        <el-col :span="2" :offset="3">
+          <el-button :id="domIdCommand" type="primary" :disabled="cmdDisabled[0]" @click="command">
+            {{ $t('menu.release') }}
+            <span v-show="timeCountCommand>0">({{ timeCountCommand }})</span></el-button>
+        </el-col>
+        <el-col :span="2" :offset="1">
+          <el-button :id="domIdConfirm1" type="primary" style="width:120px;" :disabled="cmdDisabled[1]" @click="confirm1">{{ $t('menu.firstConfirm') }}</el-button>
+        </el-col>
+        <el-col :span="2" :offset="2">
+          <el-button :id="domIdConfirm2" type="primary" style="width:120px;" :disabled="cmdDisabled[2]" @click="confirm2">
+            {{ $t('menu.secondConfirm') }}
+            <span v-show="timeCountConfirm>0">({{ timeCountConfirm }})</span></el-button>
+        </el-col>
+        <el-col :span="2" :offset="2">
+          <el-button :id="domIdStop" type="primary" :disabled="stpDisabled" @click="stop">{{ $t('menu.suspend') }}</el-button>
+        </el-col>
+        <el-col :span="2" :offset="1">
+          <el-button :id="domIdClose" @click="close">{{ $t('global.close') }}</el-button>
+        </el-col>
+      </el-row>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import { now } from '@/utils/date';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
+
+export default {
+    name: 'SectionCmdControl',
+    data() {
+        return {
+            dialogShow: false,
+            backOperate: '',
+            selected: '',
+            order: 0,
+            row: null,
+            timer: null,
+            operation: '',
+            cmdDisabled: [true, true, true],
+            stpDisabled: true,
+            tempData: [],
+            message: '',
+            timeCountCommand: -1,
+            timeCountConfirm: -1,
+            stationName: '',
+            sectionName: ''
+        };
+    },
+    computed: {
+        typeList() {
+            return [
+                { code: OperationEvent.Section.unlock.menu.operation, name: this.$t('menu.menuSection.sectionUnblock') },
+                { code: OperationEvent.Section.fault.menu.operation, name: this.$t('menu.menuSection.sectionFaultUnlock') },
+                { code: OperationEvent.Section.axlePreReset.menu.operation, name: this.$t('menu.menuSection.sectionAxisPreReset') }
+            ];
+        },
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
+        },
+        domIdCommand() {
+            if (this.dialogShow) {
+                if (this.operation == OperationEvent.Section.unlock.menu.operation) {
+                    return OperationEvent.Section.unlock.order.domId; // 区段解封
+                } else if (this.operation == OperationEvent.Section.fault.menu.operation) {
+                    return OperationEvent.Section.fault.order.domId; // 区段故障解锁
+                } else if (this.operation == OperationEvent.Section.axlePreReset.menu.operation) {
+                    return OperationEvent.Section.axlePreReset.order.domId; // 区段计轴预复位
+                }
+            }
+            return '';
+        },
+        domIdConfirm1() {
+            if (this.dialogShow) {
+                if (this.operation == OperationEvent.Section.unlock.menu.operation) {
+                    return OperationEvent.Section.unlock.confirm1.domId; // 区段解封
+                } else if (this.operation == OperationEvent.Section.fault.menu.operation) {
+                    return OperationEvent.Section.fault.confirm1.domId; // 区段故障解锁
+                } else if (this.operation == OperationEvent.Section.axlePreReset.menu.operation) {
+                    return OperationEvent.Section.axlePreReset.confirm1.domId; // 区段计轴预复位
+                }
+            }
+            return '';
+        },
+        domIdConfirm2() {
+            if (this.dialogShow) {
+                if (this.operation == OperationEvent.Section.unlock.menu.operation) {
+                    /** 区段解封*/
+                    return OperationEvent.Section.unlock.confirm2.domId;
+                } else if (this.operation == OperationEvent.Section.fault.menu.operation) {
+                    /** 区段故障解锁*/
+                    return OperationEvent.Section.fault.confirm2.domId;
+                } else if (this.operation == OperationEvent.Section.axlePreReset.menu.operation) {
+                    /** 区段计轴预复位*/
+                    return OperationEvent.Section.axlePreReset.confirm2.domId;
+                }
+            }
+            return '';
+        },
+        domIdStop() {
+            if (this.dialogShow) {
+                if (this.operation == OperationEvent.Section.unlock.menu.operation) {
+                    /** 区段解封*/
+                    return OperationEvent.Section.unlock.stop.domId;
+                } else if (this.operation == OperationEvent.Section.fault.menu.operation) {
+                    /** 区段故障解锁*/
+                    return OperationEvent.Section.fault.stop.domId;
+                } else if (this.operation == OperationEvent.Section.axlePreReset.menu.operation) {
+                    /** 区段计轴预复位*/
+                    return OperationEvent.Section.axlePreReset.stop.domId;
+                }
+            }
+            return '';
+        },
+        domIdClose() {
+            if (this.dialogShow) {
+                return OperationEvent.Command.close.menu.domId;
+            }
+            return '';
+        },
+        title() {
+            if (this.dialogShow) {
+                if (this.operation == OperationEvent.Section.unlock.menu.operation) {
+                    return this.$t('menu.menuSection.sectionUnblock');
+                } else if (this.operation == OperationEvent.Section.fault.menu.operation) {
+                    return this.$t('menu.menuSection.sectionFaultUnlock');
+                } else if (this.operation == OperationEvent.Section.axlePreReset.menu.operation) {
+                    return this.$t('menu.menuSection.sectionAxisPreReset');
+                }
+            }
+            return '';
+        }
+    },
+    watch: {
+        cmdDisabled: {
+            handler(val, oldVal) {
+                this.stpDisabled = true;
+                val.forEach((elem, index) => {
+                    // 在确定1之前的操作才可以终止
+                    if (elem == false && index >= 1 && index <= 2) {
+                        this.stpDisabled = false;
+                    }
+                });
+            },
+            deep: true
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+        this.timer = setInterval(() => {
+            if (!this.$store.state.menuOperation.break) {
+                if (this.timeCountCommand > 0) {
+                    this.timeCountCommand--;
+                } else if (this.timeCountCommand == 0) {
+                    this.setButtonEnable({ step: 0 });
+                    this.timeCountCommand = -1;
+                }
+                if (this.timeCountConfirm > 0) {
+                    this.timeCountConfirm--;
+                } else if (this.timeCountConfirm == 0) {
+                    this.setButtonEnable({ step: 0 });
+                    this.timeCountConfirm = -1;
+                }
+            }
+        }, 1000);
+    },
+    beforeDestroy() {
+        clearInterval(this.timer);
+        this.timer = null;
+    },
+    methods: {
+        doShow(operate, selected) {
+            if (!this.dialogShow) {
+                this.sectionName = '';
+                this.stationName = '';
+                if (selected && selected._type.toUpperCase() === 'Section'.toUpperCase()) {
+                    if (selected.type === '02') {
+                        const section = this.$store.getters['map/getDeviceByCode'](selected.parentCode);
+                        if (section) {
+                            this.sectionName += section.name;
+                        }
+                    }
+                    this.sectionName += selected.name;
+
+                    const station = this.$store.getters['map/getDeviceByCode'](selected.stationCode);
+                    if (station) {
+                        this.stationName = station.name;
+                    }
+                    this.selected = selected;
+                }
+
+                this.order = 0;
+                this.operation = operate.operation || '';
+                this.dialogShow = true;
+                this.tempData = [];
+                this.timeCountCommand = -1;
+                this.timeCountConfirm = -1;
+                this.cmdDisabled = [false, true, true];
+            }
+            this.stpDisabled = true;
+            this.setMessage(this.$t('tip.releaseTip'));
+            this.$nextTick(function () {
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
+        doClose() {
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+        },
+        command() {
+            if (this.operation == OperationEvent.Section.fault.menu.operation ||
+                    this.operation == OperationEvent.Section.unlock.menu.operation ||
+                    this.operation == OperationEvent.Section.cancelSpeed.menu.operation ||
+                    this.operation == OperationEvent.Section.axlePreReset.menu.operation) {
+                /** 第一步不带弹框处理*/
+                this.commandNoPopUp();
+            } else {
+                /** 第一步带弹框处理*/
+                this.commandHasPopUp();
+            }
+        },
+        commandHasPopUp() {
+        },
+        commandNoPopUp() {
+            const operate = {};
+
+            if (this.operation == OperationEvent.Section.unlock.menu.operation) {
+                /** 区段解封*/
+                operate.operation = OperationEvent.Section.unlock.order.operation;
+            } else if (this.operation == OperationEvent.Section.fault.menu.operation) {
+                /** 区段故障解锁*/
+                operate.operation = OperationEvent.Section.fault.order.operation;
+            } else if (this.operation == OperationEvent.Section.axlePreReset.menu.operation) {
+                /** 区段计轴预复位*/
+                operate.operation = OperationEvent.Section.axlePreReset.order.operation;
+            }
+
+            this.setMessage(this.$t('tip.firstConfirmTip'));
+            this.writeRecord({ order: ++this.order, date: now(), context: this.$t('menu.clickReleaseCommand'), result: '' });
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.setButtonEnable({ step: 1 });
+                    this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickReleaseCommand'), result: this.$t('tip.executionSucceed') });
+                } else {
+                    this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickReleaseCommand'), result: this.$t('tip.executionFailed') });
+                }
+            }).catch(() => {
+                this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickReleaseCommand'), result: this.$t('tip.executionException') });
+            });
+        },
+        confirm1() {
+            const operate = {
+            };
+
+            if (this.operation == OperationEvent.Section.unlock.menu.operation) {
+                /** 区段解封*/
+                operate.operation = OperationEvent.Section.unlock.confirm1.operation;
+            } else if (this.operation == OperationEvent.Section.fault.menu.operation) {
+                /** 区段故障解锁*/
+                operate.operation = OperationEvent.Section.fault.confirm1.operation;
+            } else if (this.operation == OperationEvent.Section.axlePreReset.menu.operation) {
+                /** 区段计轴预复位*/
+                operate.operation = OperationEvent.Section.axlePreReset.confirm1.operation;
+            }
+
+            this.setMessage(this.$t('tip.secondConfirmTip'));
+            this.writeRecord({ order: ++this.order, date: now(), context: this.$t('menu.clickFirstConfirm'), result: '' });
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.timeCountCommand = -1;
+                    this.timeCountConfirm = 10;
+                    this.setButtonEnable({ step: 2 });
+                    this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickFirstConfirm'), result: this.$t('tip.executionSucceed') });
+                } else {
+                    this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickFirstConfirm'), result: this.$t('tip.executionFailed') });
+                }
+            }).catch(() => {
+                this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickFirstConfirm'), result: this.$t('tip.executionException') });
+            });
+        },
+        confirm2() {
+            const operate = {};
+
+            if (this.operation == OperationEvent.Section.unlock.menu.operation) {
+                /** 区段解封*/
+                operate.operation = OperationEvent.Section.unlock.confirm2.operation;
+                operate.cmdType = CMD.Section.CMD_SECTION_UNBLOCK;
+            } else if (this.operation == OperationEvent.Section.fault.menu.operation) {
+                /** 区段故障解锁*/
+                operate.operation = OperationEvent.Section.fault.confirm2.operation;
+                operate.cmdType = CMD.Section.CMD_SECTION_FAULT_UNLOCK;
+            } else if (this.operation == OperationEvent.Section.axlePreReset.menu.operation) {
+                /** 区段计轴预复位*/
+                operate.operation = OperationEvent.Section.axlePreReset.confirm2.operation;
+                operate.cmdType = CMD.Section.CMD_SECTION_AXIS_PRE_RESET;
+            }
+
+            this.setMessage('');
+            this.writeRecord({ order: ++this.order, date: now(), context: this.$t('menu.clickSecondConfirm'), result: '' });
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.timeCountCommand = -1;
+                this.timeCountConfirm = -1;
+                this.setButtonEnable({ step: -1 });
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickSecondConfirm'), result: this.$t('tip.executionSucceed') });
+                } else {
+                    this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickSecondConfirm'), result: this.$t('tip.executionFailed') });
+                }
+            }).catch(() => {
+                this.timeCountCommand = -1;
+                this.timeCountConfirm = -1;
+                this.setButtonEnable({ step: -1 });
+                this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickSecondConfirm'), result: this.$t('tip.executionException') });
+            });
+        },
+        stop() {
+            const operate = {};
+
+            if (this.operation == OperationEvent.Section.unlock.menu.operation) {
+                /** 区段解封*/
+                operate.operation = OperationEvent.Section.unlock.stop.operation;
+            } else if (this.operation == OperationEvent.Section.fault.menu.operation) {
+                /** 区段故障解锁*/
+                operate.operation = OperationEvent.Section.fault.stop.operation;
+            } else if (this.operation == OperationEvent.Section.axlePreReset.menu.operation) {
+                /** 区段计轴预复位*/
+                operate.operation = OperationEvent.Section.axlePreReset.stop.operation;
+            }
+
+            this.writeRecord({ order: ++this.order, date: now(), context: this.$t('menu.clickSuspend'), result: '' });
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.setButtonEnable({ step: 0 });
+                    this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickSuspend'), result: this.$t('tip.executionSucceed') });
+                } else {
+                    this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickSuspend'), result: this.$t('tip.executionFailed') });
+                }
+            }).catch(() => {
+                this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickSuspend'), result: this.$t('tip.executionException') });
+            });
+        },
+        close() {
+            const operate = {
+                operation: OperationEvent.Command.close.menu.operation
+            };
+
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => {
+                this.doClose();
+            });
+        },
+        setButtonEnable(param) {
+            this.cmdDisabled = [true, true, true];
+            if (param && param.step >= 0) {
+                this.cmdDisabled[param.step] = false;
+            }
+        },
+        setMessage(message) {
+            this.message = message;
+        },
+        writeRecord(param) {
+            this.tempData.push(param);
+        },
+        editRecord(param) {
+            this.tempData.forEach(elem => {
+                if (elem.order == param.order) {
+                    for (var prop in param) {
+                        elem[prop] = param[prop];
+                    }
+                }
+            });
+        }
+    }
+};
+</script>
diff --git a/src/jmapNew/theme/xian_01/menus/dialog/sectionControl.vue b/src/jmapNew/theme/xian_01/menus/dialog/sectionControl.vue
new file mode 100644
index 000000000..d66d41180
--- /dev/null
+++ b/src/jmapNew/theme/xian_01/menus/dialog/sectionControl.vue
@@ -0,0 +1,167 @@
+<template>
+  <el-dialog v-dialogDrag class="fuzhou-01__systerm section-control" :title="title" :visible.sync="show" width="300px" :before-close="doClose" :z-index="2000" :modal="false" :close-on-click-modal="false">
+    <el-row class="header">
+      <el-col :span="11"><span>{{ $t('menu.stationName') }}</span></el-col>
+      <el-col :span="11" :offset="2"><span>{{ $t('menu.section') }}</span></el-col>
+    </el-row>
+    <el-row>
+      <el-col :span="11">
+        <el-input v-model="stationName" size="small" disabled />
+      </el-col>
+      <el-col :span="11" :offset="2">
+        <el-input v-model="sectionName" size="small" disabled />
+      </el-col>
+    </el-row>
+    <el-row justify="center" class="button-group">
+      <el-col :span="10" :offset="2">
+        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">{{ $t('global.confirm') }}</el-button>
+      </el-col>
+      <el-col :span="8" :offset="4">
+        <el-button :id="domIdCancel" @click="cancel">{{ $t('global.cancel') }}</el-button>
+      </el-col>
+    </el-row>
+    <notice-info ref="noticeInfo" />
+  </el-dialog>
+</template>
+
+<script>
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
+import NoticeInfo from './childDialog/childDialog/noticeInfo';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
+
+export default {
+    name: 'SectionControl',
+    components: {
+        NoticeInfo
+    },
+    data() {
+        return {
+            dialogShow: false,
+            loading: false,
+            operation: '',
+            stationName: '',
+            sectionName: ''
+        };
+    },
+    computed: {
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
+        },
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+        },
+        domIdConfirm() {
+            return this.dialogShow ? OperationHandler.getDomIdByOperation(this.operation) : '';
+        },
+        title() {
+            if (this.operation == OperationEvent.Section.lock.menu.operation) {
+                return this.$t('menu.menuSection.sectionBlockade');
+            } else if (this.operation == OperationEvent.Section.split.menu.operation) {
+                return this.$t('menu.menuSection.orbitalSectionResection');
+            } else if (this.operation == OperationEvent.Section.active.menu.operation) {
+                return this.$t('menu.menuSection.orbitalSectionActive');
+            }
+            return '';
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(operate, selected) {
+            if (!this.dialogShow) {
+                this.sectionName = '';
+                this.stationName = '';
+                if (selected && selected._type.toUpperCase() === 'Section'.toUpperCase()) {
+                    if (selected.type === '02') {
+                        const section = this.$store.getters['map/getDeviceByCode'](selected.parentCode);
+                        if (section) {
+                            this.sectionName += section.name;
+                        }
+                    }
+                    this.sectionName += selected.name;
+
+                    const station = this.$store.getters['map/getDeviceByCode'](selected.stationCode);
+                    if (station) {
+                        this.stationName = station.name;
+                    }
+                }
+                this.operation = operate.operation || '';
+            }
+            this.dialogShow = true;
+            this.$nextTick(function () {
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+        },
+        commit() {
+            if (this.operation == OperationEvent.Section.lock.menu.operation) {
+                this.lock(); // 区段封锁
+            } else if (this.operation == OperationEvent.Section.split.menu.operation) {
+                this.split(); // 轨道区段切除
+            } else if (this.operation == OperationEvent.Section.active.menu.operation) {
+                this.active(); // 轨道区段激活
+            }
+        },
+        // 区段单锁
+        lock() {
+            const operate = {
+                over: true,
+                operation: OperationEvent.Section.lock.menu.operation,
+                cmdType: CMD.Section.CMD_SECTION_BLOCK
+            };
+            this.sendCommand(operate);
+        },
+        // 轨道区段切除
+        split() {
+            const operate = {
+                over: true,
+                operation: OperationEvent.Section.split.menu.operation,
+                cmdType: CMD.Section.CMD_SECTION_CUT_OFF
+            };
+            this.sendCommand(operate);
+        },
+        // 轨道区段激活
+        active() {
+            const operate = {
+                over: true,
+                operation: OperationEvent.Section.active.menu.operation,
+                cmdType: CMD.Section.CMD_SECTION_ACTIVE
+            };
+            this.sendCommand(operate);
+        },
+        sendCommand(operate) {
+            this.loading = true;
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.loading = false;
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => {
+                this.doClose();
+                this.$refs.noticeInfo.doShow(operate);
+            });
+        },
+        cancel() {
+            const operate = {
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
+
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => {
+                this.doClose();
+            });
+        }
+    }
+};
+</script>
diff --git a/src/jmapNew/theme/xian_01/menus/dialog/speedCmdControl.vue b/src/jmapNew/theme/xian_01/menus/dialog/speedCmdControl.vue
new file mode 100644
index 000000000..0e4298f4b
--- /dev/null
+++ b/src/jmapNew/theme/xian_01/menus/dialog/speedCmdControl.vue
@@ -0,0 +1,547 @@
+<template>
+  <div>
+    <el-dialog v-dialogDrag class="fuzhou-01__systerm section-cmd-speed" :title="title" :visible.sync="show" width="840px" :before-close="doClose" :z-index="2000" :modal="false" :close-on-click-modal="false">
+      <div style="padding: 10px 20px; border: 1px solid lightgray;">
+        <span class="base-label">{{ $t('menu.commandInformation') }}</span>
+        <el-form label-position="center" size="mini">
+          <el-row>
+            <el-col :span="6">
+              <el-form-item :label="this.$t('menu.type')" label-width="40px">
+                <el-select v-model="operation" size="small" disabled>
+                  <el-option v-for="option in typeList" :key="option.code" :label="option.name" :value="option.code" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item :label="this.$t('menu.stationName')" label-width="80px">
+                <el-input v-model="stationName" size="small" disabled />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item :label="nameLabel" label-width="80px">
+                <el-input v-model="name" size="small" disabled />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item :label="this.$t('menu.speedLimitValue')" label-width="80px">
+                <el-select :id="domIdChoose" v-model="formData.SpeedLimit_Value" size="small" :disabled="spdDisabled" @change="speedSelectChange">
+                  <el-option v-for="item in speedList" :key="item" :label="item" :value="item" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+      <el-table :data="tableData" border style="width: 100%" size="mini" highlight-current-row height="200">
+        <el-table-column prop="order" :width="110" :label="this.$t('menu.serialNumber2')" />
+        <el-table-column prop="date" :width="160" :label="this.$t('menu.time')" />
+        <el-table-column prop="context" :width="180" :label="this.$t('menu.implementationProcess')" />
+        <el-table-column prop="result" :label="this.$t('menu.executionResult')" />
+      </el-table>
+      <span class="notice">{{ message }}</span>
+      <el-row class="button-group">
+        <el-col :span="2" :offset="3">
+          <el-button :id="domIdCommand" type="primary" :disabled="cmdDisabled[0]" @click="command">
+            {{ $t('menu.release') }}
+            <span v-show="timeCountCommand>0">({{ timeCountCommand }})</span></el-button>
+        </el-col>
+        <el-col :span="2" :offset="1">
+          <el-button :id="domIdConfirm1" type="primary" style="width:120px;" :disabled="cmdDisabled[1]" @click="confirm1">{{ $t('menu.firstConfirm') }}</el-button>
+        </el-col>
+        <el-col :span="2" :offset="2">
+          <el-button :id="domIdConfirm2" type="primary" style="width:120px;" :disabled="cmdDisabled[2]" @click="confirm2">
+            {{ $t('menu.secondConfirm') }}
+            <span v-show="timeCountConfirm>0">({{ timeCountConfirm }})</span></el-button>
+        </el-col>
+        <el-col :span="2" :offset="2">
+          <el-button :id="domIdStop" type="primary" :disabled="stpDisabled" @click="stop">{{ $t('menu.suspend') }}</el-button>
+        </el-col>
+        <el-col :span="2" :offset="1">
+          <el-button :id="domIdClose" @click="close">{{ $t('global.close') }}</el-button>
+        </el-col>
+      </el-row>
+    </el-dialog>
+    <confirm-control-speed ref="confirmControlSpeed" @setOperate="getOperate" />
+  </div>
+</template>
+<script>
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import ConfirmControlSpeed from './childDialog/confirmControlSpeed';
+import { now } from '@/utils/date';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
+
+export default {
+    name: 'SectionCmdSpeed',
+    components: {
+        ConfirmControlSpeed
+    },
+    data() {
+        return {
+            dialogShow: false,
+            backOperate: '',
+            selected: '',
+            order: 0,
+            row: null,
+            timer: null,
+            operation: '',
+            cmdDisabled: [true, true, true],
+            spdDisabled: false,
+            stpDisabled: true,
+            tableData: [],
+            message: '',
+            timeCountCommand: -1,
+            timeCountConfirm: -1,
+            maxSpeed: 80,
+            speedSpace: 5,
+            stationName: '',
+            name: '',
+            formData: {
+                SpeedLimit_Value: ''
+            }
+        };
+    },
+    computed: {
+        nameLabel() {
+            if (this.operation == OperationEvent.Section.setSpeed.menu.operation ||
+                this.operation == OperationEvent.Section.cancelSpeed.menu.operation) {
+                return this.$t('menu.sectionName');
+            } else if (this.operation == OperationEvent.Switch.setSpeed.menu.operation ||
+                this.operation == OperationEvent.Switch.cancelSpeed.menu.operation) {
+                return this.$t('menu.switchName');
+            }
+            return null;
+        },
+        speedList() {
+            const list = [];
+            for (var i = 0; i * this.speedSpace <= this.maxSpeed; i++) {
+                list.push(i * this.speedSpace);
+            }
+            return list;
+        },
+        typeList() {
+            return [
+                { code: OperationEvent.Section.setSpeed.menu.operation, name: this.$t('menu.menuSection.sectionSetSpeedLimit') },
+                { code: OperationEvent.Section.cancelSpeed.menu.operation, name: this.$t('menu.menuSection.sectionCancelSpeedLimit') },
+                { code: OperationEvent.Switch.setSpeed.menu.operation, name: this.$t('menu.turnoutSettingSpeedLimit') },
+                { code: OperationEvent.Switch.cancelSpeed.menu.operation, name: this.$t('menu.turnoutCancelsSpeedLimit') }
+            ];
+        },
+        title() {
+            if (this.dialogShow) {
+                if (this.operation == OperationEvent.Section.setSpeed.menu.operation) {
+                    return this.$t('menu.menuSection.sectionSetSpeedLimit');
+                } else if (this.operation == OperationEvent.Section.cancelSpeed.menu.operation) {
+                    return this.$t('menu.menuSection.sectionCancelSpeedLimit');
+                } else if (this.operation == OperationEvent.Switch.setSpeed.menu.operation) {
+                    return this.$t('menu.turnoutSettingSpeedLimit');
+                } else if (this.operation == OperationEvent.Switch.cancelSpeed.menu.operation) {
+                    return this.$t('menu.turnoutCancelsSpeedLimit');
+                }
+            }
+            return null;
+        },
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
+        },
+        domIdChoose() {
+            if (this.dialogShow) {
+                if (this.operation == OperationEvent.Section.setSpeed.menu.operation) {
+                    /** 区段设置限速*/
+                    return OperationEvent.Section.setSpeed.choose.domId;
+                } else if (this.operation == OperationEvent.Switch.setSpeed.menu.operation) {
+                    /** 道岔设置限速*/
+                    return OperationEvent.Switch.setSpeed.choose.domId;
+                }
+            }
+            return null;
+        },
+        domIdCommand() {
+            if (this.dialogShow) {
+                if (this.operation == OperationEvent.Section.setSpeed.menu.operation) {
+                    /** 区段设置限速*/
+                    return OperationEvent.Section.setSpeed.order.domId;
+                } else if (this.operation == OperationEvent.Section.cancelSpeed.menu.operation) {
+                    /** 区段取消限速*/
+                    return OperationEvent.Section.cancelSpeed.order.domId;
+                } else if (this.operation == OperationEvent.Switch.setSpeed.menu.operation) {
+                    /** 道岔设置限速*/
+                    return OperationEvent.Switch.setSpeed.order.domId;
+                } else if (this.operation == OperationEvent.Switch.cancelSpeed.menu.operation) {
+                    /** 道岔取消限速*/
+                    return OperationEvent.Switch.cancelSpeed.order.domId;
+                }
+            }
+            return null;
+        },
+        domIdConfirm1() {
+            if (this.dialogShow) {
+                if (this.operation == OperationEvent.Section.setSpeed.menu.operation) {
+                    /** 区段设置限速*/
+                    return OperationEvent.Section.setSpeed.confirm1.domId;
+                } else if (this.operation == OperationEvent.Section.cancelSpeed.menu.operation) {
+                    /** 区段取消限速*/
+                    return OperationEvent.Section.cancelSpeed.confirm1.domId;
+                } else if (this.operation == OperationEvent.Switch.setSpeed.menu.operation) {
+                    /** 道岔设置限速*/
+                    return OperationEvent.Switch.setSpeed.confirm1.domId;
+                } else if (this.operation == OperationEvent.Switch.cancelSpeed.menu.operation) {
+                    /** 道岔取消限速*/
+                    return OperationEvent.Switch.cancelSpeed.confirm1.domId;
+                }
+            }
+            return null;
+        },
+        domIdConfirm2() {
+            if (this.dialogShow) {
+                if (this.operation == OperationEvent.Section.setSpeed.menu.operation) {
+                    /** 区段设置限速*/
+                    return OperationEvent.Section.setSpeed.confirm2.domId;
+                } else if (this.operation == OperationEvent.Section.cancelSpeed.menu.operation) {
+                    /** 区段取消限速*/
+                    return OperationEvent.Section.cancelSpeed.confirm2.domId;
+                } else if (this.operation == OperationEvent.Switch.setSpeed.menu.operation) {
+                    /** 道岔设置限速*/
+                    return OperationEvent.Switch.setSpeed.confirm2.domId;
+                } else if (this.operation == OperationEvent.Switch.cancelSpeed.menu.operation) {
+                    /** 道岔设置限速*/
+                    return OperationEvent.Switch.cancelSpeed.confirm2.domId;
+                }
+            }
+            return null;
+        },
+        domIdStop() {
+            if (this.dialogShow) {
+                if (this.operation == OperationEvent.Section.setSpeed.menu.operation) {
+                    /** 区段设置限速*/
+                    return OperationEvent.Section.setSpeed.stop.domId;
+                } else if (this.operation == OperationEvent.Section.cancelSpeed.menu.operation) {
+                    /** 区段取消限速*/
+                    return OperationEvent.Section.cancelSpeed.stop.domId;
+                } else if (this.operation == OperationEvent.Switch.setSpeed.menu.operation) {
+                    /** 道岔设置限速*/
+                    return OperationEvent.Switch.setSpeed.stop.domId;
+                } else if (this.operation == OperationEvent.Switch.cancelSpeed.menu.operation) {
+                    /** 道岔取消限速*/
+                    return OperationEvent.Switch.cancelSpeed.stop.domId;
+                }
+            }
+            return null;
+        },
+        domIdClose() {
+            if (this.dialogShow) {
+                return OperationEvent.Command.close.menu.domId;
+            }
+            return null;
+        },
+        isCancelSpeed() {
+            return this.operation == OperationEvent.Section.cancelSpeed.menu.operation ||
+                    this.operation == OperationEvent.Switch.cancelSpeed.menu.operation;
+        }
+    },
+    watch: {
+        cmdDisabled: {
+            handler(val, oldVal) {
+                this.spdDisabled = false;
+                val.forEach((elem, index) => {
+                    // 取消操作禁止选择限速，并跳过该步骤
+                    if (elem == false && index >= 1 || this.isCancelSpeed) {
+                        this.spdDisabled = true;
+                    }
+
+                    // 在确定1之前的操作才可终止
+                    if (elem == false && index >= 1) {
+                        this.stpDisabled = false;
+                    }
+                });
+            },
+            deep: true
+        },
+        'formData.SpeedLimit_Value': function (val) {
+            if (val) this.cmdDisabled[0] = false;
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+        this.timer = setInterval(() => {
+            if (!this.$store.state.menuOperation.break) {
+                if (this.timeCountCommand > 0) {
+                    this.timeCountCommand--;
+                } else if (this.timeCountCommand == 0) {
+                    this.setButtonEnable({ step: 0 });
+                    this.timeCountCommand = -1;
+                }
+                if (this.timeCountConfirm > 0) {
+                    this.timeCountConfirm--;
+                } else if (this.timeCountConfirm == 0) {
+                    this.setButtonEnable({ step: 0 });
+                    this.timeCountConfirm = -1;
+                }
+            }
+        }, 1000);
+    },
+    beforeDestroy() {
+        clearInterval(this.timer);
+        this.timer = null;
+    },
+    methods: {
+        doShow(operate, selected, tempData) {
+            if (!this.dialogShow) {
+                this.name = '';
+                this.stationName = '';
+                if (selected) {
+                    if (operate.operation == OperationEvent.Section.setSpeed.menu.operation ||
+                            operate.operation == OperationEvent.Section.cancelSpeed.menu.operation) {
+                        if (selected && selected._type.toUpperCase() === 'Section'.toUpperCase()) {
+                            if (selected.type === '02') {
+                                const section = this.$store.getters['map/getDeviceByCode'](selected.parentCode);
+                                if (section) {
+                                    this.name += section.name;
+                                }
+                            }
+                            this.name += selected.name;
+                        }
+                    } else if (operate.operation == OperationEvent.Switch.setSpeed.menu.operation ||
+                            operate.operation == OperationEvent.Switch.cancelSpeed.menu.operation) {
+                        if (selected._type.toUpperCase() === 'Switch'.toUpperCase()) {
+                            this.name = selected.name;
+                        }
+                    }
+
+                    const station = this.$store.getters['map/getDeviceByCode'](selected.stationCode);
+                    if (station) {
+                        this.stationName = station.name;
+                    }
+
+                    this.formData.SpeedLimit_Value = '';
+                    this.tableData = [];
+                    this.selected = selected;
+                    this.timeCountCommand = -1;
+                    this.timeCountConfirm = -1;
+                    this.cmdDisabled = [true, true, true];
+                    this.stpDisabled = true;
+                    this.order = 0;
+                    this.operation = operate.operation;
+                    this.setMessage(this.$t('tip.selectSpeedLimitValueTip'));
+                    if (this.isCancelSpeed) {
+                        this.formData.SpeedLimit_Value = `${tempData}`;
+                        this.spdDisabled = true;
+                        this.cmdDisabled = [false, true, true];
+                    }
+                }
+
+            }
+            this.dialogShow = true;
+            this.$nextTick(function () {
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
+        doClose() {
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+        },
+        speedSelectChange(val) {
+            const operate = {
+                val: val
+            };
+
+            if (this.operation == OperationEvent.Section.setSpeed.menu.operation) {
+                /** 区段设置限速*/
+                operate.operation = OperationEvent.Section.setSpeed.choose.operation;
+            } else if (this.operation == OperationEvent.Switch.setSpeed.menu.operation) {
+                /** 道岔设置限速*/
+                operate.operation = OperationEvent.Switch.setSpeed.choose.operation;
+            }
+
+            this.setMessage(this.$t('tip.releaseTip'));
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.setButtonEnable({ step: 0 });
+                }
+            });
+        },
+        command() {
+            const operate = {};
+
+            if (this.operation == OperationEvent.Section.setSpeed.menu.operation) {
+                /** 区段设置限速*/
+                operate.operation = OperationEvent.Section.setSpeed.order.operation;
+                operate.message = this.$t('menu.in') + `【${this.name}】` + this.$t('menu.sectionSetLimitPrefix') + `${this.formData.SpeedLimit_Value}` + this.$t('menu.sectionLimitSuffix');
+            } else if (this.operation == OperationEvent.Section.cancelSpeed.menu.operation) {
+                /** 区段取消限速*/
+                operate.operation = OperationEvent.Section.cancelSpeed.order.operation;
+                operate.message = this.$t('menu.in') + `【${this.name}】` + this.$t('menu.sectionCancelLimitPrefix') + `${this.formData.SpeedLimit_Value}` + this.$t('menu.sectionLimitSuffix');
+            } else if (this.operation == OperationEvent.Switch.setSpeed.menu.operation) {
+                /** 道岔设置限速*/
+                operate.operation = OperationEvent.Switch.setSpeed.order.operation;
+                operate.message = this.$t('menu.in') + `【${this.name}】` + this.$t('menu.switchSetLimitPrefix') + `${this.formData.SpeedLimit_Value}` + this.$t('menu.sectionLimitSuffix');
+            } else if (this.operation == OperationEvent.Switch.cancelSpeed.menu.operation) {
+                /** 道岔取消限速*/
+                operate.operation = OperationEvent.Switch.cancelSpeed.order.operation;
+                operate.message = this.$t('menu.in') + `【${this.name}】` + this.$t('menu.switchCancelLimitPrefix') + `${this.formData.SpeedLimit_Value}` + this.$t('menu.sectionLimitSuffix');
+            }
+
+            this.setMessage(this.$t('tip.firstConfirmTip'));
+            this.writeRecord({ order: ++this.order, date: now(), context: this.$t('menu.clickReleaseCommand'), result: '' });
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickReleaseCommand'), result: this.$t('tip.executionSucceed') });
+                    this.$refs.confirmControlSpeed.doShow(operate, this.selected);
+                } else {
+                    this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickReleaseCommand'), result: this.$t('tip.executionFailed') });
+                }
+            }).catch(() => {
+                this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickReleaseCommand'), result: this.$t('tip.executionException') });
+            });
+        },
+        confirm1() {
+            const operate = {};
+
+            if (this.operation == OperationEvent.Section.setSpeed.menu.operation) {
+                /** 区段设置限速*/
+                operate.operation = OperationEvent.Section.setSpeed.confirm1.operation;
+            } else if (this.operation == OperationEvent.Section.cancelSpeed.menu.operation) {
+                /** 区段取消限速*/
+                operate.operation = OperationEvent.Section.cancelSpeed.confirm1.operation;
+            } else if (this.operation == OperationEvent.Switch.setSpeed.menu.operation) {
+                /** 道岔设置限速*/
+                operate.operation = OperationEvent.Switch.setSpeed.confirm1.operation;
+            } else if (this.operation == OperationEvent.Switch.cancelSpeed.menu.operation) {
+                /** 道岔取消限速*/
+                operate.operation = OperationEvent.Switch.cancelSpeed.confirm1.operation;
+            }
+
+            this.setMessage(this.$t('tip.secondConfirmTip'));
+            this.writeRecord({ order: ++this.order, date: now(), context: this.$t('menu.clickFirstConfirm'), result: '' });
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.timeCountCommand = -1;
+                    this.timeCountConfirm = 10;
+                    this.setButtonEnable({ step: 2 });
+                    this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickFirstConfirm'), result: this.$t('tip.executionSucceed') });
+                } else {
+                    this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickFirstConfirm'), result: this.$t('tip.executionFailed') });
+                }
+            }).catch(() => {
+                this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickFirstConfirm'), result: this.$t('tip.executionException') });
+            });
+        },
+        confirm2() {
+            const operate = {
+                val: this.formData.SpeedLimit_Value,
+                param: this.formData
+            };
+
+            if (this.operation == OperationEvent.Section.setSpeed.menu.operation) {
+                /** 区段设置限速*/
+                operate.operation = OperationEvent.Section.setSpeed.confirm2.operation;
+                operate.cmdType = CMD.Section.CMD_SECTION_SET_LIMIT_SPEED;
+            } else if (this.operation == OperationEvent.Section.cancelSpeed.menu.operation) {
+                /** 区段取消限速*/
+                operate.operation = OperationEvent.Section.cancelSpeed.confirm2.operation;
+                operate.cmdType = CMD.Section.CMD_SECTION_SET_LIMIT_SPEED;
+            } else if (this.operation == OperationEvent.Switch.setSpeed.menu.operation) {
+                /** 道岔设置限速*/
+                operate.operation = OperationEvent.Switch.setSpeed.confirm2.operation;
+                operate.cmdType = CMD.Switch.CMD_SWITCH_SET_LIMIT_SPEED;
+            } else if (this.operation == OperationEvent.Switch.cancelSpeed.menu.operation) {
+                /** 道岔取消限速*/
+                operate.operation = OperationEvent.Switch.cancelSpeed.confirm2.operation;
+                operate.cmdType = CMD.Switch.CMD_SWITCH_SET_LIMIT_SPEED;
+            }
+
+            this.setMessage('');
+            this.writeRecord({ order: ++this.order, date: now(), context: this.$t('menu.clickSecondConfirm'), result: '' });
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.timeCountCommand = -1;
+                this.timeCountConfirm = -1;
+                this.setButtonEnable({ step: -1 });
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickSecondConfirm'), result: this.$t('tip.executionSucceed') });
+                } else {
+                    this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickSecondConfirm'), result: this.$t('tip.executionFailed') });
+                }
+            }).catch(() => {
+                this.timeCountCommand = -1;
+                this.timeCountConfirm = -1;
+                this.setButtonEnable({ step: -1 });
+                this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickSecondConfirm'), result: this.$t('tip.executionException') });
+            });
+        },
+        stop() {
+            const operate = {};
+
+            if (this.operation == OperationEvent.Section.setSpeed.menu.operation) {
+                /** 区段设置限速*/
+                operate.operation = OperationEvent.Section.setSpeed.stop.operation;
+            } else if (this.operation == OperationEvent.Section.cancelSpeed.menu.operation) {
+                /** 区段取消限速*/
+                operate.operation = OperationEvent.Section.cancelSpeed.stop.operation;
+            } else if (this.operation == OperationEvent.Switch.setSpeed.menu.operation) {
+                /** 道岔设置限速*/
+                operate.operation = OperationEvent.Switch.setSpeed.stop.operation;
+            } else if (this.operation == OperationEvent.Switch.cancelSpeed.menu.operation) {
+                /** 道岔取消限速*/
+                operate.operation = OperationEvent.Switch.cancelSpeed.stop.operation;
+            }
+
+            this.writeRecord({ order: ++this.order, date: now(), context: this.$t('menu.clickSuspend'), result: '' });
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.setButtonEnable({ step: 0 });
+                    this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickSuspend'), result: this.$t('tip.executionSucceed') });
+                } else {
+                    this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickSuspend'), result: this.$t('tip.executionFailed') });
+                }
+            }).catch(() => {
+                this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickSuspend'), result: this.$t('tip.executionException') });
+            });
+        },
+        close() {
+            const operate = {
+                operation: OperationEvent.Command.close.menu.operation
+            };
+            this.writeRecord({ order: ++this.order, date: now(), context: this.$t('menu.clickToClose'), result: '' });
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => {
+                this.doClose();
+            });
+        },
+        getOperate(operate) {
+            if (operate.step) {
+                this.setButtonEnable({ step: operate.step });
+            }
+        },
+        setButtonEnable(param) {
+            this.cmdDisabled = [true, true, true];
+            if (param && param.step >= 0) {
+                this.cmdDisabled[param.step] = false;
+            }
+        },
+        setMessage(message) {
+            this.message = message;
+        },
+        writeRecord(param) {
+            this.tableData.push(param);
+        },
+        editRecord(param) {
+            this.tableData.forEach(elem => {
+                if (elem.order == param.order) {
+                    for (var prop in param) {
+                        elem[prop] = param[prop];
+                    }
+                }
+            });
+        }
+    }
+};
+</script>
diff --git a/src/jmapNew/theme/xian_01/menus/dialog/standBackStrategy.vue b/src/jmapNew/theme/xian_01/menus/dialog/standBackStrategy.vue
new file mode 100644
index 000000000..f3325f200
--- /dev/null
+++ b/src/jmapNew/theme/xian_01/menus/dialog/standBackStrategy.vue
@@ -0,0 +1,253 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    class="fuzhou-01__systerm stand-run-level"
+    :title="title"
+    :visible.sync="show"
+    width="500px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <el-row class="header">
+      <el-col :span="10"><span>{{ $t('menu.stationName') }}</span></el-col>
+      <el-col :span="10" :offset="2"><span>{{ $t('menu.stationStandStatus') }}</span></el-col>
+    </el-row>
+    <el-row>
+      <el-col :span="10">
+        <el-input v-model="stationName" size="small" disabled />
+      </el-col>
+      <el-col :span="10" :offset="2">
+        <div style="height: 32px;">
+          <el-radio
+            v-model="standStatus"
+            label="02"
+            style="line-height: 32px;"
+            :style="{color: standStatus == '02' ? '' : 'red'}"
+            disabled
+          >{{ $t('menu.upDirection') }}</el-radio>
+          <el-radio
+            v-model="standStatus"
+            label="01"
+            style="line-height: 32px;"
+            :style="{color: standStatus == '01' ? '' : 'red'}"
+            disabled
+          >{{ $t('menu.downDirection') }}</el-radio>
+        </div>
+      </el-col>
+    </el-row>
+    <div class="table">
+      <span>{{ $t('menu.stationStandStatus') }}</span>
+      <el-table ref="tempData" :data="tempData" border style="width: 100%; height: 170px;" size="mini">
+        <el-table-column prop="name" :width="170" :label="this.$t('menu.switchbackStation')" />
+        <el-table-column prop="station" :label="this.$t('menu.switchbackPlatform')" />
+        <el-table-column prop="strategy" :label="this.$t('menu.switchbackStrategy')">
+          <template slot-scope="scope">
+            <el-select
+              :id="domIdChoose"
+              v-model="scope.row.strategy"
+              size="mini"
+              @change="strategySelectChange"
+            >
+              <el-option
+                v-for="item in strategyList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <el-row class="button-group">
+      <span v-if="isSelect && tempData.length">{{ $t('menu.switchbackStrategyTip') }}</span>
+      <span v-if="isConfirm && tempData.length">{{ $t('menu.setSwitchbackStrategyTipPrefix') + tempData[0].name + $t('menu.setSwitchbackStrategyTipSuffix') }}</span>
+    </el-row>
+    <el-row justify="center" class="button-group">
+      <el-col :span="10" :offset="2">
+        <el-button :id="domIdConfirm" type="primary" :loading="loading" :disabled="!isConfirm" @click="commit">
+          {{ $t('global.confirm') }}</el-button>
+      </el-col>
+      <el-col :span="8" :offset="4">
+        <el-button :id="domIdCancel" @click="cancel">{{ $t('global.cancel') }}</el-button>
+      </el-col>
+    </el-row>
+    <confirm-control ref="confirmControl" />
+    <notice-info ref="noticeInfo" />
+  </el-dialog>
+</template>
+
+<script>
+import ConfirmControl from './childDialog/confirmControl';
+import NoticeInfo from './childDialog/childDialog/noticeInfo';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import { mapGetters } from 'vuex';
+
+export default {
+    name: 'StandBackStrategy',
+    components: {
+        ConfirmControl,
+        NoticeInfo
+    },
+    data() {
+        return {
+            dialogShow: false,
+            loading: false,
+            tempData: [],
+            strategyList: [
+                {
+                    value: '01',
+                    label: this.$t('menu.noSwitchback')
+                },
+                {
+                    value: '02',
+                    label: this.$t('menu.noOneSwitchback')
+                },
+                {
+                    value: '03',
+                    label: this.$t('menu.automaticChange')
+                },
+                {
+                    value: '04',
+                    label: this.$t('menu.default')
+                }
+            ],
+            stationName: '',
+            standStatus: '',
+            selection: [],
+            isSelect: true,
+            isConfirm: false,
+            strategy: ''
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'stationList'
+        ]),
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
+        },
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+        },
+        domIdConfirm() {
+            return this.dialogShow ? OperationEvent.StationStand.setBackStrategy.menu.domId : '';
+        },
+        domIdChoose() {
+            return this.dialogShow ? OperationEvent.StationStand.setBackStrategy.choose.domId : '';
+        },
+        title() {
+            return this.$t('menu.setSwitchbackStrategy');
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        loadInitData(selected, opts) {
+            this.tempData = [];
+            const station = this.stationList.find(n => n.code == selected.stationCode);
+            this.tempData.push({ name: station.name, station: selected.name, strategy: opts.reentryStrategy });
+        },
+        doShow(operate, selected, opts) {
+            if (!this.dialogShow) {
+                this.standStatus = '';
+                this.stationName = '';
+                if (selected && selected._type.toUpperCase() === 'StationStand'.toUpperCase()) {
+                    this.standStatus = selected.direction;
+                    const station = this.$store.getters['map/getDeviceByCode'](selected.stationCode);
+                    if (station) {
+                        this.stationName = station.name;
+                    }
+                }
+                this.loadInitData(selected, opts);
+            }
+
+            this.dialogShow = true;
+            this.$nextTick(function () {
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
+        checkTableDataSelction(data) {
+            const selection = [];
+            if (data && data.length > 0) {
+                data.forEach(row => {
+                    if (row.check && !row.disabled) {
+                        selection.push(row);
+                    }
+                });
+            }
+
+            this.disabledSend = !selection.length;
+            if (JSON.stringify(selection) !== JSON.stringify(this.selection)) {
+                this.selection = selection;
+            }
+        },
+        strategySelectChange(strategy) {
+            const operate = {
+                operation: OperationEvent.StationStand.setBackStrategy.choose.operation,
+                val: `${strategy}`
+            };
+
+            this.strategy = strategy;
+            this.isSelect = false;
+            this.isConfirm = true;
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                }
+            });
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+        },
+        commit() {
+            if (this.isConfirm) {
+                const operate = {
+                    over: true,
+                    operation: OperationEvent.StationStand.setBackStrategy.menu.operation,
+                    val: `${this.strategy}`,
+                    cmdType: CMD.Stand.CMD_STAND_SET_REENTRY_STRATEGY,
+                    param:{
+                        Stand_ReentryStrategy:this.strategy
+                    }
+                };
+                this.loading = true;
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.loading = false;
+                    if (valid) {
+                        this.doClose();
+                    }
+                }).catch(() => {
+                    this.loading = false;
+                    this.doClose();
+                    this.$refs.noticeInfo.doShow(operate);
+                });
+            } else {
+                this.doClose();
+            }
+        },
+        cancel() {
+            const operate = {
+                over: true,
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
+
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => {
+                this.doClose();
+            });
+        }
+    }
+};
+</script>
diff --git a/src/jmapNew/theme/xian_01/menus/dialog/standControl.vue b/src/jmapNew/theme/xian_01/menus/dialog/standControl.vue
new file mode 100644
index 000000000..185d399cf
--- /dev/null
+++ b/src/jmapNew/theme/xian_01/menus/dialog/standControl.vue
@@ -0,0 +1,271 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    class="fuzhou-01__systerm stand-detain-train"
+    :title="title"
+    :visible.sync="show"
+    width="320px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <div class="context">
+      <span>{{ preContext }}{{ standName }}</span>
+    </div>
+    <el-row class="button-group">
+      <el-col :span="10" :offset="2">
+        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">{{ $t('global.confirm') }}</el-button>
+      </el-col>
+      <el-col :span="8" :offset="4">
+        <el-button :id="domIdCancel" @click="cancel">{{ $t('global.cancel') }}</el-button>
+      </el-col>
+    </el-row>
+    <notice-info ref="noticeInfo" />
+  </el-dialog>
+</template>
+
+<script>
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
+import NoticeInfo from './childDialog/childDialog/noticeInfo';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
+
+export default {
+    name: 'StandDetainTrain',
+    components: {
+        NoticeInfo
+    },
+    data() {
+        return {
+            dialogShow: false,
+            loading: false,
+            standName: '',
+            selected: null,
+            operation: null
+        };
+    },
+    computed: {
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
+        },
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+        },
+        domIdConfirm() {
+            return this.dialogShow ? OperationHandler.getDomIdByOperation(this.operation) : '';
+        },
+        title() {
+            if (this.operation == OperationEvent.StationStand.setDetainTrain.menu.operation) {
+                return this.$t('menu.menuStationStand.detainTrain');
+            } else if (this.operation == OperationEvent.StationStand.cancelDetainTrain.menu.operation) {
+                return this.$t('menu.menuStationStand.cancelDetainTrain');
+            } else if (this.operation == OperationEvent.StationStand.cancelDetainTrainForce.menu.operation) {
+                return this.$t('menu.menuStationStand.cancelDetainTrainForce');
+            } else if (this.operation == OperationEvent.StationStand.earlyDeparture.menu.operation) {
+                return this.$t('menu.menuStationStand.earlyDeparture');
+            } else if (this.operation == OperationEvent.StationStand.setJumpStop.menu.operation) {
+                return this.$t('menu.menuStationStand.setJumpStop');
+            } else if (this.operation == OperationEvent.StationStand.cancelJumpStop.menu.operation) {
+                return this.$t('menu.menuStationStand.cancelJumpStop');
+            }
+            return '';
+        },
+        preContext() {
+            return this.title + ':';
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(step, selected) {
+            if (!this.dialogShow) {
+                this.standName = '';
+                if (selected) {
+                    this.standName = selected.name;
+                }
+
+                this.selected = selected;
+                this.operation = step.operation;
+            }
+            this.dialogShow = true;
+            this.$nextTick(function () {
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+        },
+        commit() {
+            if (this.operation == OperationEvent.StationStand.setDetainTrain.menu.operation) {
+                /** 设置扣车*/
+                this.setDetainTrain();
+            } else if (this.operation == OperationEvent.StationStand.cancelDetainTrain.menu.operation) {
+                /** 取消扣车*/
+                this.cancelDetainTrain();
+            } else if (this.operation == OperationEvent.StationStand.cancelDetainTrainForce.menu.operation) {
+                /** 强制取消扣车*/
+                this.cancelDetainTrainForce();
+            } else if (this.operation == OperationEvent.StationStand.earlyDeparture.menu.operation) {
+                /** 提前发车*/
+                this.earlyDeparture();
+            } else if (this.operation == OperationEvent.StationStand.setJumpStop.menu.operation) {
+                /** 设置跳停*/
+                this.setJumpStop();
+            } else if (this.operation == OperationEvent.StationStand.cancelJumpStop.menu.operation) {
+                /** 取消跳停*/
+                this.cancelJumpStop();
+            }
+        },
+        // 设置扣车
+        setDetainTrain() {
+            const step = {
+                over: true,
+                operation: OperationEvent.StationStand.setDetainTrain.menu.operation,
+                cmdType: CMD.Stand.CMD_STAND_SET_HOLD_TRAIN
+            };
+
+            this.loading = true;
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
+                this.loading = false;
+                this.doClose();
+                if (!valid) {
+                    this.$refs.noticeInfo.doShow(step);
+                }
+            }).catch(() => {
+                this.loading = false;
+                this.doClose();
+                this.$refs.noticeInfo.doShow(step);
+            });
+        },
+        // 取消扣车
+        cancelDetainTrain() {
+            const step = {
+                over: true,
+                operation: OperationEvent.StationStand.cancelDetainTrain.menu.operation,
+                cmdType: CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN
+            };
+
+            this.loading = true;
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
+                this.loading = false;
+                this.doClose();
+                if (!valid) {
+                    this.$refs.noticeInfo.doShow(step);
+                }
+            }).catch(() => {
+                this.loading = false;
+                this.doClose();
+                this.$refs.noticeInfo.doShow(step);
+            });
+        },
+        // 强制取消扣车
+        cancelDetainTrainForce() {
+            const step = {
+                over: true,
+                operation: OperationEvent.StationStand.cancelDetainTrainForce.menu.operation,
+                cmdType: CMD.Stand.CMD_STAND_FORCE_CANCEL_HOLD_TRAIN
+            };
+
+            this.loading = true;
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
+                this.loading = false;
+                this.doClose();
+                if (!valid) {
+                    this.$refs.noticeInfo.doShow(step);
+                }
+            }).catch(() => {
+                this.loading = false;
+                this.doClose();
+                this.$refs.noticeInfo.doShow(step);
+            });
+        },
+        // 提前发车
+        earlyDeparture() {
+            const step = {
+                over: true,
+                operation: OperationEvent.StationStand.earlyDeparture.menu.operation,
+                cmdType: CMD.Stand.CMD_STAND_EARLY_DEPART
+            };
+
+            this.loading = true;
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
+                this.loading = false;
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => {
+                this.loading = false;
+                this.doClose();
+                this.$refs.noticeInfo.doShow(step);
+            });
+        },
+        // 设置跳停
+        setJumpStop() {
+            const step = {
+                over: true,
+                operation: OperationEvent.StationStand.setJumpStop.menu.operation,
+                val: this.selected.direction, // 站台的上下行方向, 01:下行 /02:上行
+                cmdType: CMD.Stand.CMD_STAND_SET_JUMP_STOP
+            };
+
+            this.loading = true;
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
+                this.loading = false;
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => {
+                this.loading = false;
+                this.doClose();
+                this.$refs.noticeInfo.doShow(step);
+            });
+        },
+        // 取消跳停
+        cancelJumpStop() {
+            const step = {
+                over: true,
+                operation: OperationEvent.StationStand.cancelJumpStop.menu.operation,
+                val: this.selected.direction, // 站台的上下行方向, 01:下行 /02:上行
+                cmdType: CMD.Stand.CMD_STAND_CANCEL_JUMP_STOP
+            };
+
+            this.loading = true;
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
+                this.loading = false;
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => {
+                this.loading = false;
+                this.doClose();
+                this.$refs.noticeInfo.doShow(step);
+            });
+        },
+        cancel() {
+            const step = {
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
+
+            this.loading = false;
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => {
+                this.doClose();
+            });
+        }
+    }
+};
+</script>
+<style>
+    .stand-detain-train .context {
+        height: 80px !important;
+    }
+</style>
diff --git a/src/jmapNew/theme/xian_01/menus/dialog/standDetail.vue b/src/jmapNew/theme/xian_01/menus/dialog/standDetail.vue
new file mode 100644
index 000000000..cd0b5e891
--- /dev/null
+++ b/src/jmapNew/theme/xian_01/menus/dialog/standDetail.vue
@@ -0,0 +1,180 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    class="fuzhou-01__systerm stand-detail"
+    :title="title"
+    :visible.sync="show"
+    width="400px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <el-row class="header">
+      <el-col :span="10"><span>{{ $t('menu.stationName') }}</span></el-col>
+      <el-col :span="10" :offset="2"><span>{{ $t('menu.platform') }}</span></el-col>
+    </el-row>
+    <el-row>
+      <el-col :span="10">
+        <el-input v-model="stationName" size="small" disabled />
+      </el-col>
+      <el-col :span="10" :offset="2">
+        <el-input v-model="standName" size="small" disabled />
+      </el-col>
+    </el-row>
+    <div class="table">
+      <span>{{ $t('menu.stationStandStatus') }}</span>
+      <el-table ref="tempData" :data="tempData" border style="width: 100%" size="mini" highlight-current-row>
+        <el-table-column prop="item" :width="140" :label="this.$t('menu.item')" />
+        <el-table-column prop="status" :label="this.$t('global.status')" />
+      </el-table>
+    </div>
+    <el-row justify="center" class="button-group">
+      <el-col :span="10" :offset="2">
+        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">{{ $t('global.confirm') }}</el-button>
+      </el-col>
+      <el-col :span="8" :offset="4">
+        <el-button :id="domIdCancel" @click="cancel">{{ $t('global.cancel') }}</el-button>
+      </el-col>
+    </el-row>
+    <notice-info ref="noticeInfo" />
+  </el-dialog>
+</template>
+
+<script>
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import { mapGetters } from 'vuex';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
+import NoticeInfo from './childDialog/childDialog/noticeInfo';
+
+export default {
+    name: 'StandDetail',
+    components: {
+        NoticeInfo
+    },
+    data() {
+        return {
+            dialogShow: false,
+            loading: false,
+            tempData: [],
+            stationName: '',
+            standName: '',
+            strategyMap: {
+                '01': this.$t('menu.noSwitchback'),
+                '02': this.$t('menu.noOneSwitchback'),
+                '03': this.$t('menu.automaticChange'),
+                '04': this.$t('menu.default')
+            }
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'stationList'
+        ]),
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
+        },
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+        },
+        domIdConfirm() {
+            return this.dialogShow ? OperationEvent.Command.close.confirm.domId : '';
+        },
+        title() {
+            return this.$t('menu.menuStationStand.getStationStandStatus');
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        loadInitData(selected, opts) {
+            this.tempData = [];
+
+            const index = this.stationList.findIndex(n => n.code == selected.stationCode);
+            let stationStand, station;
+            if (selected.direction == '01') { // 下行
+                // 下行时，此站不是最后一站
+                if (index != 0) {
+                    stationStand = this.$store.getters['map/getDeviceByCode'](this.stationList[index - 1].code);
+                    station = this.$store.getters['map/getDeviceByCode'](stationStand.stationCode);
+                }
+            } else {
+                // 上行时，此站不是最后一站
+                if (index != this.stationList.length - 1) {
+                    stationStand = this.$store.getters['map/getDeviceByCode'](this.stationList[index + 1].code);
+                    station = this.$store.getters['map/getDeviceByCode'](stationStand.stationCode);
+                }
+            }
+
+            /** 01: 未设置扣车 02: 车站扣车 03: 中心扣车 04: 中心+车站扣车*/
+            this.tempData.push({ item: this.$t('menu.stationDetainTrain'), status: opts.holdStatus == '02' || opts.holdStatus == '04' ? this.$t('menu.hasBeenSet') : this.$t('menu.notSet') });
+            this.tempData.push({ item: this.$t('menu.centerDetainTrain'), status: opts.holdStatus == '03' || opts.holdStatus == '04' ? this.$t('menu.hasBeenSet') : this.$t('menu.notSet') });
+            this.tempData.push({ item: this.$t('menu.stopTime'), status: opts.parkingTime != -1 ? opts.parkingTime : this.$t('menu.automatic2') });
+            if (!stationStand || !station) {
+                this.tempData.push({ item: this.$t('menu.runLevel'), status: this.$t('menu.automatic2') });
+            } else {
+                this.tempData.push({ item: this.$t('menu.runLevel'), status: opts.intervalRunTime > 0 ? this.$t('menu.to') + station.name + stationStand.name + this.$t('global.colon') + this.$t('menu.artificial') : this.$t('menu.to') + station.name + stationStand.name + this.$t('menu.automatic2') });
+            }
+            this.tempData.push({ item: this.$t('menu.jumpStop'), status: opts.jumpStopStatus != '01' ? this.$t('menu.hasBeenSet') : this.$t('menu.notSet') });
+            this.tempData.push({ item: this.$t('menu.downSwitchbackStrategy'), status: this.strategyMap[opts.reentryStrategy] ? this.strategyMap[opts.reentryStrategy] : this.$t('menu.default') });
+        },
+        doShow(operate, selected, opts) {
+            if (!this.dialogShow) {
+                this.standName = '';
+                this.stationName = '';
+                if (selected && selected._type.toUpperCase() === 'StationStand'.toUpperCase()) {
+                    this.standName = selected.name;
+                    const station = this.$store.getters['map/getDeviceByCode'](selected.stationCode);
+                    if (station) {
+                        this.stationName = station.name;
+                    }
+                }
+                this.loadInitData(selected, opts);
+            }
+            this.dialogShow = true;
+            this.$nextTick(function () {
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+        },
+        commit() {
+            const operate = {
+                over: true,
+                operation: OperationEvent.Command.close.confirm.operation,
+                cmdType: CMD.Stand.CMD_STAND_VIEW_STATUS
+            };
+
+            this.loading = true;
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.loading = false;
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => {
+                this.loading = false;
+                this.doClose();
+            });
+        },
+        cancel() {
+            const operate = {
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
+
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => {
+                this.doClose();
+            });
+        }
+    }
+};
+</script>
diff --git a/src/jmapNew/theme/xian_01/menus/dialog/standDetainTrainAll.vue b/src/jmapNew/theme/xian_01/menus/dialog/standDetainTrainAll.vue
new file mode 100644
index 000000000..d5e3640f1
--- /dev/null
+++ b/src/jmapNew/theme/xian_01/menus/dialog/standDetainTrainAll.vue
@@ -0,0 +1,192 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    class="fuzhou-01__systerm stand-detain-train-all"
+    :title="title"
+    :visible.sync="show"
+    width="390px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <el-radio-group style="padding: 10px 20px; border: 1px double lightgray;width:100%;">
+      <span class="base-label" style="font-size:14px;">{{ $t('menu.range') }}</span>
+      <el-row>
+        <el-radio-group v-model="upDown" style="width:100%;" @change="choose">
+          <el-col :span="11">
+            <el-radio :id="upDown == '01' ? domIdChoose : ''" label="02">{{ $t('menu.uplinkBroadly') }}</el-radio>
+          </el-col>
+          <el-col :span="11" :offset="1">
+            <el-radio :id="upDown == '02' ? domIdChoose : ''" label="01">{{ $t('menu.downlinkBroadly') }}</el-radio>
+          </el-col>
+        </el-radio-group>
+      </el-row>
+    </el-radio-group>
+
+    <div class="table">
+      <span>{{ $t('menu.detainTrainStationList') }}</span>
+      <el-table
+        ref="tempData"
+        :data="tempData"
+        border
+        style="width: 100%"
+        size="mini"
+        :empty-text="this.$t('menu.allStationsHaveNoDetainTrainStatus')"
+        height="160"
+        highlight-current-row
+      >
+        <el-table-column prop="stationName" :label="this.$t('menu.stationName')" />
+        <el-table-column prop="standName" :width="140" :label="this.$t('menu.detainTrainStation')" />
+      </el-table>
+    </div>
+    <el-row justify="center" class="button-group">
+      <el-col :span="10" :offset="2">
+        <el-button :id="domIdConfirm" type="primary" :loading="loading" :disabled="disabled" @click="commit">{{ $t('global.confirm') }}
+        </el-button>
+      </el-col>
+      <el-col :span="8" :offset="4">
+        <el-button :id="domIdCancel" @click="cancel">{{ $t('global.cancel') }}</el-button>
+      </el-col>
+    </el-row>
+    <notice-info ref="noticeInfo" />
+  </el-dialog>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import NoticeInfo from './childDialog/childDialog/noticeInfo';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
+
+export default {
+    name: 'StandDetainTrainAll',
+    components: {
+        NoticeInfo
+    },
+    data() {
+        return {
+            dialogShow: false,
+            loading: false,
+            upDown: '01',
+            tempData: [],
+            disabled: true,
+            operation: ''
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'stationStandList'
+        ]),
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
+        },
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+        },
+        domIdChoose() {
+            return this.dialogShow ? OperationEvent.StationStand.cancelDetainTrainAll.choose.domId : '';
+        },
+        domIdConfirm() {
+            return this.dialogShow ? OperationEvent.StationStand.cancelDetainTrainAll.menu.domId : '';
+        },
+        title() {
+            if (this.operation == OperationEvent.StationStand.cancelDetainTrainAll.menu.operation) {
+                return this.$t('menu.menuStationStand.cancelDetainTrainAll');
+            } else {
+                return this.$t('menu.menuStationStand.cancelJumpStopAll');
+            }
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        loadTableData() {
+            this.tempData = [];
+            this.stationStandList.forEach(elem => {
+                /** status 01: 未扣车*/
+                const stand = (this.$store.getters['map/getDeviceByCode'](elem.code) || {}).status;
+                const station = (this.$store.getters['map/getDeviceByCode'](elem.stationCode) || {});
+                if (station && station.visible && stand && stand.holdStatus != '01' && Number(elem.direction) == Number(this.upDown)) {
+                    this.tempData.push({ stationName: station.name, standName: elem.name });
+                }
+            });
+
+            // 如果存在未扣车的情况，才可以做此操作
+            if (this.tempData.length > 0) {
+                this.disabled = false;
+            }
+        },
+        doShow(operate, selected) {
+            // 不是断点激活的菜单应该将状态初始化
+            if (!this.dialogShow) {
+                this.loading = false;
+                this.upDown = selected.direction;
+                this.loadTableData();
+                this.operation = operate.operation;
+            }
+            this.dialogShow = true;
+            this.$nextTick(function () {
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+        },
+        choose(upDown) {
+            this.loadTableData();
+            const operate = {
+                operation: OperationEvent.StationStand.cancelDetainTrainAll.choose.operation,
+                val: `${upDown}`
+            };
+
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                }
+            });
+        },
+        commit() {
+            const operate = {
+                over: true,
+                operation: OperationEvent.StationStand.cancelDetainTrainAll.menu.operation,
+                cmdType: CMD.Stand.CMD_STAND_WHOLE_LINE_CANCEL_HOLD_TRAIN,
+                val: this.upDown,
+                param: {
+                    Stand_AllLine: this.upDown
+                }
+            };
+
+            this.loading = true;
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.loading = false;
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => {
+                this.loading = false;
+                this.doClose();
+                this.$refs.noticeInfo.doShow(operate);
+            });
+        },
+        cancel() {
+            const operate = {
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
+
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => {
+                this.doClose();
+            });
+        }
+    }
+};
+</script>
diff --git a/src/jmapNew/theme/xian_01/menus/dialog/standRunLevel.vue b/src/jmapNew/theme/xian_01/menus/dialog/standRunLevel.vue
new file mode 100644
index 000000000..958656680
--- /dev/null
+++ b/src/jmapNew/theme/xian_01/menus/dialog/standRunLevel.vue
@@ -0,0 +1,276 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    class="fuzhou-01__systerm stand-run-level"
+    :title="title"
+    :visible.sync="show"
+    width="500px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <el-row class="header">
+      <el-col :span="10"><span>{{ $t('menu.stationName') }}</span></el-col>
+      <el-col :span="10" :offset="2"><span>{{ $t('menu.platform') }}</span></el-col>
+    </el-row>
+    <el-row>
+      <el-col :span="10">
+        <el-input v-model="stationName" size="small" disabled />
+      </el-col>
+      <el-col :span="10" :offset="2">
+        <el-input v-model="standName" size="small" disabled />
+      </el-col>
+    </el-row>
+    <div class="table">
+      <span>{{ $t('menu.stationStandStatus') }}</span>
+      <el-table ref="tempData" :data="tempData" border style="width: 100%; height: 170px;" size="mini">
+        <el-table-column prop="name" :width="210" :label="this.$t('menu.nextPlatform')" />
+        <el-table-column prop="time" :label="this.$t('menu.intervalRunningTime')">
+          <template slot-scope="scope">
+            <el-select :id="domIdChoose" v-model="scope.row.time" size="mini" @change="timeSelectChange">
+              <el-option
+                v-for="item in timeList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </template>
+        </el-table-column>
+        <el-table-column prop="check" :label="this.$t('menu.alwaysEffective')">
+          <template slot-scope="scope">
+            <el-checkbox :id="domIdCheck" ref="check" v-model="scope.row.check" @change="checkChange" />
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <el-row class="button-group">
+      <span v-if="isSelect && tempData.length">{{ $t('menu.setRunLevelTip') }}</span>
+      <span v-if="isConfirm && tempData.length">{{ $t('menu.setRunLevelStationTip') + tempData[0].name }}</span>
+    </el-row>
+    <el-row justify="center" class="button-group">
+      <el-col :span="10" :offset="2">
+        <el-button :id="domIdConfirm" type="primary" :loading="loading" :disabled="!isConfirm" @click="commit">
+          {{ $t('global.confirm') }}</el-button>
+      </el-col>
+      <el-col :span="8" :offset="4">
+        <el-button :id="domIdCancel" @click="cancel">{{ $t('global.cancel') }}</el-button>
+      </el-col>
+    </el-row>
+    <confirm-control ref="confirmControl" />
+  </el-dialog>
+</template>
+
+<script>
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import { mapGetters } from 'vuex';
+import ConfirmControl from './childDialog/confirmControl';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
+
+export default {
+    name: 'StandRunLevel',
+    components: {
+        ConfirmControl
+    },
+    data() {
+        return {
+            dialogShow: false,
+            loading: false,
+            tempData: [],
+            maxRunLevel: 300,
+            stationName: '',
+            standName: '',
+            selection: [],
+            isSelect: true,
+            isConfirm: false,
+            time: ''
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'stationList',
+            'stationStandList'
+        ]),
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
+        },
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+        },
+        domIdConfirm() {
+            return this.dialogShow ? OperationEvent.StationStand.setRunLevel.menu.domId : '';
+        },
+        domIdChoose() {
+            return this.dialogShow ? OperationEvent.StationStand.setRunLevel.choose.domId : '';
+        },
+        domIdCheck() {
+            return this.dialogShow ? OperationEvent.StationStand.setRunLevel.check.domId : '';
+        },
+        title() {
+            return this.$t('menu.menuStationStand.setRunLevel');
+        },
+        timeList() {
+            const list = [
+                { value: 0, label: this.$t('menu.automatic2') },
+                { value: 1, label: '1' }
+            ];
+            for (var i = 60; i <= this.maxRunLevel; i++) {
+                list.push({ value: i, label: `${i}` });
+            }
+
+            return list;
+        }
+    },
+    watch: {
+        // 深度数据状态
+        tempData: {
+            handler(val, oldVal) {
+                this.checkTableDataSelction(val);
+            },
+            deep: true
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        loadInitData(selected, opts) {
+            this.tempData = [];
+            const index = this.stationList.findIndex(n => n.code == selected.stationCode);
+            if (selected.direction == '01') { // 下行
+                // 下行时，此站不是最后一站
+                if (index != 0) {
+                    const stationStand = this.$store.getters['map/getDeviceByCode'](this.stationStandList[index + 1].code);
+                    const station = this.$store.getters['map/getDeviceByCode'](stationStand.stationCode);
+                    this.tempData.push({ name: `${stationStand.name}(${station.name})`, time: opts.intervalRunTime ? opts.intervalRunTime : 0, check: opts.intervalRunTimeValidStatus });
+                }
+            } else {
+                // 上行时，此站不是最后一站
+                if (index != this.stationList.length) {
+                    const stationStand = this.$store.getters['map/getDeviceByCode'](this.stationStandList[index + 1].code);
+                    const station = this.$store.getters['map/getDeviceByCode'](stationStand.stationCode);
+                    this.tempData.push({ name: `${stationStand.name}(${station.name})`, time: opts.intervalRunTime ? opts.intervalRunTime : 0, check: opts.intervalRunTimeValidStatus });
+                }
+            }
+        },
+        doShow(operate, selected, opts) {
+            // 如果不是断点激活窗口，而是第一次显示窗口时，需要初始化窗口数据
+            if (!this.dialogShow) {
+                this.standName = '';
+                this.stationName = '';
+                if (selected && selected._type.toUpperCase() === 'StationStand'.toUpperCase()) {
+                    this.standName = selected.name;
+                    const station = this.$store.getters['map/getDeviceByCode'](selected.stationCode);
+                    if (station) {
+                        this.stationName = station.name;
+                    }
+                }
+                this.loadInitData(selected, opts);
+            }
+
+            this.dialogShow = true;
+            this.$nextTick(function () {
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
+        checkTableDataSelction(data) {
+            const selection = [];
+            if (data && data.length > 0) {
+                data.forEach(row => {
+                    if (row.check && !row.disabled) {
+                        selection.push(row);
+                    }
+                });
+            }
+
+            this.disabledSend = !selection.length;
+            if (JSON.stringify(selection) !== JSON.stringify(this.selection)) {
+                this.selection = selection;
+            }
+        },
+        timeSelectChange(time) {
+            const operate = {
+                operation: OperationEvent.StationStand.setRunLevel.choose.operation,
+                val: time.toString(),
+                param: {
+                    Stand_RunLevel: time
+                }
+            };
+
+            this.time = time;
+            this.isSelect = false;
+            this.isConfirm = true;
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                }
+            });
+        },
+        checkChange(check) {
+            const operate = {
+                operation: OperationEvent.StationStand.setRunLevel.check.operation,
+                val: check.toString(),
+                param: {
+                    Stand_AlwaysValid: !!this.tempData[0].check
+                }
+            };
+
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                }
+            });
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+        },
+        commit() {
+            if (this.isConfirm) {
+                const forver = !!this.tempData[0].check;
+                const operate = {
+                    operation: OperationEvent.StationStand.setRunLevel.menu.operation,
+                    val: [this.time, forver].join('::'),
+                    param:{
+                        Stand_AlwaysValid:forver,
+                        Stand_RunLevel:this.time
+                    },
+                    messages: [`${this.$t('menu.menuStationStand.setRunLevel')}${this.$t('global.colon')}${this.tempData[0].name}-${this.standName},${this.tempData[0].time == 0 ? this.$t('menu.runTimeAutomatically') : `${this.$t('menu.runningTimeIs')}${this.tempData[0].time}s`},${this.$t('menu.effectiveFrequencyIs')}${this.tempData[0].check ? this.$t('menu.alwaysEffective') : this.$t('menu.onceEffective')}`]
+                };
+
+                this.loading = true;
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.loading = false;
+                    if (valid) {
+                        this.doClose();
+                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                        this.$refs.confirmControl.doShow(operate);
+                    }
+                }).catch(() => {
+                    this.loading = false;
+                    this.doClose();
+                });
+            } else {
+                this.doClose();
+            }
+        },
+        cancel() {
+            const operate = {
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
+
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => {
+                this.doClose();
+            });
+        }
+    }
+};
+</script>
diff --git a/src/jmapNew/theme/xian_01/menus/dialog/standStopTime.vue b/src/jmapNew/theme/xian_01/menus/dialog/standStopTime.vue
new file mode 100644
index 000000000..11ec73b92
--- /dev/null
+++ b/src/jmapNew/theme/xian_01/menus/dialog/standStopTime.vue
@@ -0,0 +1,265 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    class="fuzhou-01__systerm stand-stop-time"
+    :title="title"
+    :visible.sync="show"
+    width="430px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <el-row class="header">
+      <el-col :span="11"><span>{{ $t('menu.stationName') }}</span></el-col>
+      <el-col :span="11" :offset="2"><span>{{ $t('menu.platformName') }}</span></el-col>
+    </el-row>
+    <el-row>
+      <el-col :span="11">
+        <el-input v-model="stationName" size="small" disabled />
+      </el-col>
+      <el-col :span="11" :offset="2">
+        <el-input v-model="standName" size="small" disabled />
+      </el-col>
+    </el-row>
+    <div style="padding: 10px 15px; border: 1px double lightgray; margin: 20px 0px; height: 60px;">
+      <span class="base-label">{{ $t('menu.controlMode') }}</span>
+      <div style=" position: relative; top:-10px;">
+        <el-radio-group v-model="control" @change="chooseControl">
+          <el-radio :id="control === '01'? '': domIdChoose1" label="01">{{ $t('menu.automatic2') }}</el-radio>
+          <el-radio :id="control === '02'? '': domIdChoose1" label="02">{{ $t('menu.artificial') }}</el-radio>
+        </el-radio-group>
+        <el-input-number
+          :id="domIdInput"
+          v-model="time"
+          :disabled="disabledInput"
+          controls-position="right"
+          :min="0"
+          size="mini"
+          style="width: 125px; padding-left:25px"
+          @change="inputTime"
+        /><span>&nbsp;{{ $t('global.second') }}</span>
+      </div>
+    </div>
+    <div style="padding: 0px 15px;  height: 30px;">
+      <div style=" position: relative; top:-5px;">
+        <el-radio-group v-model="direction">
+          <el-radio label="02" :disabled="disabledUp">{{ $t('menu.upDirection') }}</el-radio>
+          <el-radio label="01" :disabled="disabledDown">{{ $t('menu.downDirection') }}</el-radio>
+        </el-radio-group>
+      </div>
+    </div>
+    <div style="padding: 10px 15px; border: 1px double lightgray;  height: 60px;">
+      <span class="base-label">{{ $t('menu.effectiveNumber') }}</span>
+      <div style=" position: relative; top:-10px;">
+        <el-radio-group v-model="effective" :disabled="disabledTime" @change="chooseEffective">
+          <el-radio :id="effective === false? '': domIdChoose2" :label="false">{{ $t('menu.onceEffective') }}</el-radio>
+          <el-radio :id="effective === true? '': domIdChoose2" :label="true">{{ $t('menu.alwaysEffective') }}</el-radio>
+        </el-radio-group>
+      </div>
+    </div>
+    <el-row justify="center" class="button-group">
+      <el-col :span="10" :offset="2">
+        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">{{ $t('global.confirm') }}</el-button>
+      </el-col>
+      <el-col :span="8" :offset="4">
+        <el-button :id="domIdCancel" @click="cancel">{{ $t('global.cancel') }}</el-button>
+      </el-col>
+    </el-row>
+    <confirm-control ref="confirmControl" />
+    <notice-info ref="noticeInfo" />
+  </el-dialog>
+</template>
+
+<script>
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import ConfirmControl from './childDialog/confirmControl';
+import NoticeInfo from './childDialog/childDialog/noticeInfo';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
+
+export default {
+    name: 'StandStopTime',
+    components: {
+        ConfirmControl,
+        NoticeInfo
+    },
+    data() {
+        return {
+            dialogShow: false,
+            loading: false,
+            time: 0,
+            control: '01',
+            direction: '01',
+            effective: false,
+            selected: null,
+            standName: '',
+            stationName: ''
+        };
+    },
+    computed: {
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
+        },
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.close.menu.domId : '';
+        },
+        domIdConfirm() {
+            return this.dialogShow ? OperationEvent.StationStand.setStopTime.menu.domId : '';
+        },
+        domIdChoose1() {
+            return this.dialogShow ? OperationEvent.StationStand.setStopTime.choose1.domId : '';
+        },
+        domIdChoose2() {
+            return this.dialogShow ? OperationEvent.StationStand.setStopTime.choose2.domId : '';
+        },
+        domIdInput() {
+            return this.dialogShow ? OperationEvent.StationStand.setStopTime.input.domId : '';
+        },
+        disabledUp() {
+            if (this.selected) {
+                return this.selected.direction !== '02';
+            }
+            return true;
+        },
+        disabledDown() {
+            if (this.selected) {
+                return this.selected.direction !== '01';
+            }
+            return true;
+        },
+        disabledInput() {
+            return this.control === '01'; // 如果是自动则不可以设置
+        },
+        disabledTime() {
+            return this.control === '01'; // 如果是自动则不可以设置
+        },
+        title() {
+            return this.$t('menu.stopTime');
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(operate, selected, tempDate) {
+            // 如果不是断点激活，则需要对初始值进行初始化
+            if (!this.dialogShow) {
+                this.standName = '';
+                this.stationName = '';
+                if (selected && selected._type.toUpperCase() === 'StationStand'.toUpperCase()) {
+                    this.standName = selected.name;
+                    const station = this.$store.getters['map/getDeviceByCode'](selected.stationCode);
+                    if (station) {
+                        this.stationName = station.name;
+                    }
+                }
+
+                this.control = Number(tempDate.parkingTime) === -1 ? '01' : '02';
+                this.time = Number(tempDate.parkingTime) === -1 ? 15 : Number(tempDate.parkingTime);
+                this.effective = !!tempDate.parkingValidStatus;
+                this.direction = selected.direction;
+                this.selected = selected || {};
+            }
+            this.dialogShow = true;
+            this.$nextTick(function () {
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+        },
+        chooseControl(control) {
+            /** 自动时的默认时间*/
+            if (control == '01') {
+                this.inputTime = 15;
+                this.effective = true;
+            }
+
+            const operate = {
+                operation: OperationEvent.StationStand.setStopTime.choose1.operation,
+                val: `${control}`,
+                param: {
+                    Stand_StopControl: `${control}`
+                }
+            };
+
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                }
+            });
+        },
+        chooseEffective(effective) {
+            const operate = {
+                operation: OperationEvent.StationStand.setStopTime.choose2.operation,
+                val: `${effective}`,
+                param: {
+                    Stand_AlwaysValid: `${effective}`
+                }
+            };
+
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                }
+            });
+        },
+        inputTime(time) {
+            const operate = {
+                repeat: true,
+                operation: OperationEvent.StationStand.setStopTime.input.operation,
+                val: `${time}`,
+                param: {
+                    Stand_StopTime: `${time}`
+                }
+            };
+
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                }
+            });
+        },
+        commit() {
+            const operate = {
+                operation: OperationEvent.StationStand.setStopTime.menu.operation,
+                val: [`${this.control}`, this.time, this.effective].join('::'),
+                param:{
+                    Stand_StopControl:this.control,
+                    Stand_AlwaysValid:this.effective,
+                    Stand_StopTime:this.time
+                },
+                messages: [`${this.$t('menu.stopTime') + this.$t('global.colon') + this.stationName} - ${this.standName}, ${this.$t('menu.stopTimeIs')}${this.control == '01' ? this.$t('menu.automatic2') : this.time + this.$t('global.second')}, ${this.$t('menu.effectiveFrequencyIs')}${this.effective == false ? this.$t('menu.alwaysEffective') : this.$t('menu.onceEffective')}`]
+            };
+
+            this.loading = true;
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.loading = false;
+                if (valid) {
+                    this.doClose();
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.confirmControl.doShow(operate);
+                }
+            }).catch(() => {
+                this.loading = false;
+                this.doClose();
+            });
+        },
+        cancel() {
+            const operate = {
+                operation: OperationEvent.Command.close.menu.operation
+            };
+
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => { this.doClose(); });
+        }
+    }
+};
+</script>
diff --git a/src/jmapNew/theme/xian_01/menus/dialog/stationCmdControl.vue b/src/jmapNew/theme/xian_01/menus/dialog/stationCmdControl.vue
new file mode 100644
index 000000000..a25a8d7ac
--- /dev/null
+++ b/src/jmapNew/theme/xian_01/menus/dialog/stationCmdControl.vue
@@ -0,0 +1,406 @@
+<template>
+  <div>
+    <el-dialog
+      v-dialogDrag
+      class="fuzhou-01__systerm station-cmd-control"
+      :title="title"
+      :visible.sync="show"
+      width="840px"
+      :before-close="doClose"
+      :z-index="2000"
+      :modal="false"
+      :close-on-click-modal="false"
+    >
+      <div style="padding: 10px 20px; border: 1px solid lightgray;">
+        <span class="base-label">{{ $t('menu.commandInformation') }}</span>
+        <el-form label-position="center" size="mini">
+          <el-row>
+            <el-col :span="11">
+              <el-form-item :label="this.$t('menu.type')" label-width="40px">
+                <el-select v-model="operation" size="small" disabled style="width:230px">
+                  <el-option
+                    v-for="option in typeList"
+                    :key="option.code"
+                    :label="option.name"
+                    :value="option.code"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="11">
+              <el-form-item :label="this.$t('menu.stationName')" label-width="100px">
+                <el-input v-model="stationName" size="small" disabled />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+      <el-table
+        ref="tempData"
+        class="table"
+        :data="tempData"
+        border
+        style="width: 100%"
+        size="mini"
+        highlight-current-row
+        height="200"
+      >
+        <el-table-column prop="order" :width="110" :label="this.$t('menu.serialNumber2')" />
+        <el-table-column prop="date" :width="160" :label="this.$t('menu.time')" />
+        <el-table-column prop="context" :width="180" :label="this.$t('menu.implementationProcess')" />
+        <el-table-column prop="result" :label="this.$t('menu.executionResult')" />
+      </el-table>
+      <span class="notice">{{ message }}</span>
+      <el-row class="button-group">
+        <el-col :span="2" :offset="3">
+          <el-button :id="domIdCommand" type="primary" :disabled="cmdDisabled[0]" @click="command">{{ $t('menu.release') }}<span
+            v-show="timeCountCommand>0"
+          >({{ timeCountCommand }})</span></el-button>
+        </el-col>
+        <el-col :span="2" :offset="1">
+          <el-button :id="domIdConfirm1" type="primary" style="width:120px;" :disabled="cmdDisabled[1]" @click="confirm1">{{ $t('menu.firstConfirm') }}
+          </el-button>
+        </el-col>
+        <el-col :span="2" :offset="2">
+          <el-button :id="domIdConfirm2" type="primary" style="width:120px;" :disabled="cmdDisabled[2]" @click="confirm2">{{ $t('menu.secondConfirm') }}<span
+            v-show="timeCountConfirm>0"
+          >({{ timeCountConfirm }})</span></el-button>
+        </el-col>
+        <el-col :span="2" :offset="2">
+          <el-button :id="domIdStop" type="primary" :disabled="stpDisabled" @click="stop">{{ $t('menu.suspend') }}</el-button>
+        </el-col>
+        <el-col :span="2" :offset="1">
+          <el-button :id="domIdClose" @click="close">{{ $t('global.close') }}</el-button>
+        </el-col>
+      </el-row>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import { now } from '@/utils/date';
+
+export default {
+    name: 'StationCmdControl',
+    data() {
+        return {
+            dialogShow: false,
+            backOperate: '',
+            order: 0,
+            row: null,
+            timer: null,
+            operation: '',
+            cmdDisabled: [true, true, true],
+            stpDisabled: true,
+            tempData: [],
+            message: '',
+            timeCountCommand: -1,
+            timeCountConfirm: -1,
+            stationName: ''
+        };
+    },
+    computed: {
+        typeList() {
+            return [
+                { code: OperationEvent.Station.powerUnLock.menu.operation, name: this.$t('menu.menuStation.powerUnLock') },
+                { code: OperationEvent.Station.execKeyOperationTest.menu.operation, name: this.$t('menu.menuStation.execKeyOperationTest') }
+            ];
+        },
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
+        },
+        domIdCommand() {
+            if (this.dialogShow) {
+                if (this.operation == OperationEvent.Station.powerUnLock.menu.operation) {
+                    /** 上电解锁*/
+                    return OperationEvent.Station.powerUnLock.order.domId;
+                } else if (this.operation == OperationEvent.Station.execKeyOperationTest.menu.operation) {
+                    /** 执行关键操作测试*/
+                    return OperationEvent.Station.execKeyOperationTest.order.domId;
+                }
+            }
+            return '';
+        },
+        domIdConfirm1() {
+            if (this.dialogShow) {
+                if (this.operation == OperationEvent.Station.powerUnLock.menu.operation) {
+                    /** 上电解锁*/
+                    return OperationEvent.Station.powerUnLock.confirm1.domId;
+                } else if (this.operation == OperationEvent.Station.execKeyOperationTest.menu.operation) {
+                    /** 执行关键操作测试*/
+                    return OperationEvent.Station.execKeyOperationTest.confirm1.domId;
+                }
+            }
+            return '';
+        },
+        domIdConfirm2() {
+            if (this.dialogShow) {
+                if (this.operation == OperationEvent.Station.powerUnLock.menu.operation) {
+                    /** 上电解锁*/
+                    return OperationEvent.Station.powerUnLock.confirm2.domId;
+                } else if (this.operation == OperationEvent.Station.execKeyOperationTest.menu.operation) {
+                    /** 执行关键操作测试*/
+                    return OperationEvent.Station.execKeyOperationTest.confirm2.domId;
+                }
+            }
+            return '';
+        },
+        domIdStop() {
+            if (this.dialogShow) {
+                if (this.operation == OperationEvent.Station.powerUnLock.menu.operation) {
+                    /** 上电解锁*/
+                    return OperationEvent.Station.powerUnLock.stop.domId;
+                } else if (this.operation == OperationEvent.Station.execKeyOperationTest.menu.operation) {
+                    /** 执行关键操作测试*/
+                    return OperationEvent.Station.execKeyOperationTest.stop.domId;
+                }
+            }
+            return '';
+        },
+        domIdClose() {
+            if (this.dialogShow) {
+                return OperationEvent.Command.close.menu.domId;
+            }
+            return '';
+        },
+        title() {
+            if (this.dialogShow) {
+                if (this.operation == OperationEvent.Station.powerUnLock.menu.operation) {
+                    return this.$t('menu.signalDeblocking');
+                } else if (this.operation == OperationEvent.Station.execKeyOperationTest.menu.operation) {
+                    return this.$t('menu.menuStation.execKeyOperationTest');
+                }
+            }
+            return '';
+        }
+    },
+    watch: {
+        cmdDisabled: {
+            handler(val, oldVal) {
+                this.stpDisabled = true;
+                val.forEach((elem, index) => {
+                    // 在确定1之前的操作才可以终止
+                    if (elem == false && index >= 1 && index <= 2) {
+                        this.stpDisabled = false;
+                    }
+                });
+            },
+            deep: true
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+        this.timer = setInterval(() => {
+            if (!this.$store.state.menuOperation.break) {
+                if (this.timeCountCommand > 0) {
+                    this.timeCountCommand--;
+                } else if (this.timeCountCommand == 0) {
+                    this.setButtonEnable({ step: 0 });
+                    this.timeCountCommand = -1;
+                }
+                if (this.timeCountConfirm > 0) {
+                    this.timeCountConfirm--;
+                } else if (this.timeCountConfirm == 0) {
+                    this.setButtonEnable({ step: 0 });
+                    this.timeCountConfirm = -1;
+                }
+            }
+        }, 1000);
+    },
+    beforeDestroy() {
+        clearInterval(this.timer);
+        this.timer = null;
+    },
+    methods: {
+        doShow(operate, selected) {
+            if (!this.dialogShow) {
+                this.stationName = '';
+                if (selected && selected._type.toUpperCase() === 'Station'.toUpperCase()) {
+                    this.stationName = selected.name;
+                }
+
+                this.order = 0;
+                this.operation = operate.operation;
+                this.tempData = [];
+                this.timeCountCommand = -1;
+                this.timeCountConfirm = -1;
+                this.cmdDisabled = [false, true, true];
+            }
+            this.stpDisabled = true;
+            this.dialogShow = true;
+            this.setMessage(this.$t('tip.releaseTip'));
+            this.$nextTick(function () {
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
+        doClose() {
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+        },
+        command() {
+            if (this.operation == OperationEvent.Station.powerUnLock.menu.operation ||
+                    this.operation == OperationEvent.Station.execKeyOperationTest.menu.operation) {
+                /** 第一步不带弹框处理*/
+                this.commandNoPopUp();
+            } else {
+                /** 第一步带弹框处理*/
+                this.commandHasPopUp();
+            }
+        },
+        commandHasPopUp() {
+        },
+        commandNoPopUp() {
+            const operate = {
+            };
+
+            if (this.operation == OperationEvent.Station.powerUnLock.menu.operation) {
+                /** 上电解锁*/
+                operate.operation = OperationEvent.Station.powerUnLock.order.operation;
+            } else if (this.operation == OperationEvent.Station.execKeyOperationTest.menu.operation) {
+                /** 执行关键操作测试*/
+                operate.operation = OperationEvent.Station.execKeyOperationTest.order.operation;
+            }
+
+            this.setMessage(this.$t('tip.firstConfirmTip'));
+            this.writeRecord({ order: ++this.order, date: now(), context: this.$t('menu.clickReleaseCommand'), result: '' });
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.setButtonEnable({ step: 1 });
+                    this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickReleaseCommand'), result: this.$t('tip.executionSucceed') });
+                } else {
+                    this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickReleaseCommand'), result: this.$t('tip.executionFailed') });
+                }
+            }).catch(() => {
+                this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickReleaseCommand'), result: this.$t('tip.executionException') });
+            });
+        },
+        confirm1() {
+            const operate = {
+            };
+
+            if (this.operation == OperationEvent.Station.powerUnLock.menu.operation) {
+                /** 上电解锁*/
+                operate.operation = OperationEvent.Station.powerUnLock.confirm1.operation;
+            } else if (this.operation == OperationEvent.Station.execKeyOperationTest.menu.operation) {
+                /** 执行关键操作测试*/
+                operate.operation = OperationEvent.Station.execKeyOperationTest.confirm1.operation;
+            }
+
+            this.setMessage(this.$t('tip.secondConfirmTip'));
+            this.writeRecord({ order: ++this.order, date: now(), context: this.$t('menu.clickFirstConfirm'), result: '' });
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.timeCountCommand = -1;
+                    this.timeCountConfirm = 10;
+                    this.setButtonEnable({ step: 2 });
+                    this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickFirstConfirm'), result: this.$t('tip.executionSucceed') });
+                } else {
+                    this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickFirstConfirm'), result: this.$t('tip.executionFailed') });
+                }
+            }).catch(() => {
+                this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickFirstConfirm'), result: this.$t('tip.executionException') });
+            });
+        },
+        confirm2() {
+            const operate = {
+                over: true
+            };
+
+            if (this.operation == OperationEvent.Station.powerUnLock.menu.operation) {
+                /** 上电解锁*/
+                operate.operation = OperationEvent.Station.powerUnLock.confirm2.operation;
+                // operate.cmdType = CMD.Station.powerUnLock;
+            } else if (this.operation == OperationEvent.Station.execKeyOperationTest.menu.operation) {
+                /** 执行关键操作测试*/
+                operate.operation = OperationEvent.Station.execKeyOperationTest.confirm2.operation;
+                // operate.cmdType = CMD.Station.execKeyOperationTest;
+            }
+
+            this.setMessage('');
+            this.writeRecord({ order: ++this.order, date: now(), context: this.$t('menu.clickSecondConfirm'), result: '' });
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.timeCountCommand = -1;
+                this.timeCountConfirm = -1;
+                this.setButtonEnable({ step: -1 });
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickSecondConfirm'), result: this.$t('tip.executionSucceed') });
+                } else {
+                    this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickSecondConfirm'), result: this.$t('tip.executionFailed') });
+                }
+            }).catch(() => {
+                this.timeCountCommand = -1;
+                this.timeCountConfirm = -1;
+                this.setButtonEnable({ step: -1 });
+                this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickSecondConfirm'), result: this.$t('tip.executionException') });
+            });
+        },
+        stop() {
+            const operate = {
+            };
+
+            if (this.operation == OperationEvent.Station.powerUnLock.menu.operation) {
+                /** 上电解锁*/
+                operate.operation = OperationEvent.Station.powerUnLock.stop.operation;
+            } else if (this.operation == OperationEvent.Station.execKeyOperationTest.menu.operation) {
+                /** 执行关键操作测试*/
+                operate.operation = OperationEvent.Station.execKeyOperationTest.stop.operation;
+            }
+
+            this.writeRecord({ order: ++this.order, date: now(), context: this.$t('menu.clickSuspend'), result: '' });
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.setButtonEnable({ step: 0 });
+                    this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickSuspend'), result: this.$t('tip.executionSucceed') });
+                } else {
+                    this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickSuspend'), result: this.$t('tip.executionFailed') });
+                }
+            }).catch(() => {
+                this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickSuspend'), result: this.$t('tip.executionException') });
+            });
+        },
+        close() {
+            const operate = {
+                operation: OperationEvent.Command.close.menu.operation
+            };
+
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => {
+                this.doClose();
+            });
+        },
+        getOperate(operate) {
+            /** 弹框返回值处理*/
+        },
+        setButtonEnable(param) {
+            this.cmdDisabled = [true, true, true];
+            if (param && param.step >= 0) {
+                this.cmdDisabled[param.step] = false;
+            }
+        },
+        setMessage(message) {
+            this.message = message;
+        },
+        writeRecord(param) {
+            this.tempData.push(param);
+        },
+        editRecord(param) {
+            this.tempData.forEach(elem => {
+                if (elem.order == param.order) {
+                    for (var prop in param) {
+                        elem[prop] = param[prop];
+                    }
+                }
+            });
+        }
+    }
+};
+</script>
diff --git a/src/jmapNew/theme/xian_01/menus/dialog/stationHumanControlAll.vue b/src/jmapNew/theme/xian_01/menus/dialog/stationHumanControlAll.vue
new file mode 100644
index 000000000..4fe701445
--- /dev/null
+++ b/src/jmapNew/theme/xian_01/menus/dialog/stationHumanControlAll.vue
@@ -0,0 +1,123 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    class="fuzhou-01__systerm station-human-control-all"
+    :title="title"
+    :visible.sync="show"
+    width="430px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+    append-to-body
+  >
+    <div class="context">
+      <span>{{ title }}</span>
+    </div>
+    <el-row justify="center" class="button-group">
+      <el-col :span="10" :offset="2">
+        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">{{ $t('global.confirm') }}</el-button>
+      </el-col>
+      <el-col :span="8" :offset="4">
+        <el-button :id="domIdCancel" @click="cancel">{{ $t('global.cancel') }}</el-button>
+      </el-col>
+    </el-row>
+    <notice-info ref="noticeInfo" />
+  </el-dialog>
+</template>
+
+<script>
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import NoticeInfo from './childDialog/childDialog/noticeInfo';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
+
+export default {
+    name: 'StationHumanControlAll',
+    components: {
+        NoticeInfo
+    },
+    data() {
+        return {
+            dialogShow: false,
+            loading: false,
+            operation: null
+        };
+    },
+    computed: {
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
+        },
+        title() {
+            return this.$t('menu.fullConcentrationStationAccessManualControl');
+        },
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+        },
+        domIdConfirm() {
+            return this.dialogShow ? OperationEvent.Station.humanControlALL.menu.domId : '';
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(operate) {
+            if (!this.dialogShow) {
+                this.loading = false;
+                this.operation = operate.operation;
+            }
+
+            this.dialogShow = true;
+            this.$nextTick(function () {
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+        },
+        commit() {
+            const operate = {
+                over: true,
+                operation: OperationEvent.Station.humanControlALL.menu.operation,
+                cmdType: CMD.Station.CMD_STATION_CLOSE_AUTO_SETTING
+            };
+
+            this.loading = true;
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.loading = false;
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => {
+                this.loading = false;
+                this.doClose();
+                this.$refs.noticeInfo.doShow(operate);
+            });
+        },
+        cancel() {
+            const operate = {
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
+
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => {
+                this.doClose();
+            });
+        }
+    }
+};
+
+</script>
+<style>
+    .station-human-control-all .context {
+        padding-bottom: 40px !important;
+        border: 1px solid lightgray;
+    }
+</style>
diff --git a/src/jmapNew/theme/xian_01/menus/dialog/stationSetRouteControlAll.vue b/src/jmapNew/theme/xian_01/menus/dialog/stationSetRouteControlAll.vue
new file mode 100644
index 000000000..40a952722
--- /dev/null
+++ b/src/jmapNew/theme/xian_01/menus/dialog/stationSetRouteControlAll.vue
@@ -0,0 +1,145 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    class="fuzhou-01__systerm station-set-route-control-all"
+    :title="title"
+    :visible.sync="show"
+    width="450px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+    append-to-body
+  >
+    <div style="padding: 0px 10px">
+      <el-form ref="form" size="small" label-width="110px" label-position="left">
+        <el-form-item :label="this.$t('menu.concentratedStationName')" prop="stationName">
+          <el-input v-model="stationName" size="small" disabled />
+        </el-form-item>
+      </el-form>
+      <el-radio-group v-model="mode">
+        <el-row>
+          <el-radio :label="true">{{ $t('menu.checkConflict') }}</el-radio>
+        </el-row>
+        <el-row style="margin-top: 20px">
+          <el-radio :label="false">{{ $t('menu.notCheckConflict') }}</el-radio>
+        </el-row>
+      </el-radio-group>
+    </div>
+    <el-row justify="center" class="button-group">
+      <el-col :span="10" :offset="2">
+        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">{{ $t('global.confirm') }}</el-button>
+      </el-col>
+      <el-col :span="8" :offset="4">
+        <el-button :id="domIdCancel" @click="cancel">{{ $t('global.cancel') }}</el-button>
+      </el-col>
+    </el-row>
+    <notice-info ref="noticeInfo" />
+  </el-dialog>
+</template>
+
+<script>
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import NoticeInfo from './childDialog/childDialog/noticeInfo';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
+
+export default {
+    name: 'StationSetRouteControlAll',
+    components: {
+        NoticeInfo
+    },
+    data() {
+        return {
+            dialogShow: false,
+            loading: false,
+            operation: null,
+            stationName: '',
+            mode: true
+        };
+    },
+    computed: {
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
+        },
+        title() {
+            return this.$t('menu.fullConcentrationStationSettingAccessControlMode');
+        },
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+        },
+        domIdConfirm() {
+            return this.dialogShow ? OperationEvent.Station.atsAutoControlALL.menu.domId : '';
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(operate, selected) {
+            if (!this.dialogShow) {
+                this.loading = false;
+                this.operation = operate.operation;
+                this.stationName = '';
+                if (selected) {
+                    this.stationName = selected.name;
+                }
+            }
+
+            this.dialogShow = true;
+            this.$nextTick(function () {
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+        },
+        commit() {
+            const operate = {
+                over: true,
+                operation: OperationEvent.Station.atsAutoControlALL.menu.operation,
+                cmdType: CMD.Station.CMD_STATION_OPEN_AUTO_SETTING,
+                val: this.mode,
+                param: {
+                    CheckConflict: this.mode
+                }
+            };
+
+            this.loading = true;
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.loading = false;
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => {
+                this.loading = false;
+                this.doClose();
+                this.$refs.noticeInfo.doShow(operate);
+            });
+        },
+        cancel() {
+            const operate = {
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
+
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => {
+                this.doClose();
+            });
+        }
+    }
+};
+
+</script>
+<style>
+    .station-set-route-control-all .context {
+        padding-bottom: 40px !important;
+        border: 1px solid lightgray;
+    }
+</style>
diff --git a/src/jmapNew/theme/xian_01/menus/dialog/switchCmdControl.vue b/src/jmapNew/theme/xian_01/menus/dialog/switchCmdControl.vue
new file mode 100644
index 000000000..f55a1a53d
--- /dev/null
+++ b/src/jmapNew/theme/xian_01/menus/dialog/switchCmdControl.vue
@@ -0,0 +1,482 @@
+<template>
+  <div>
+    <el-dialog
+      v-dialogDrag
+      class="fuzhou-01__systerm switch-cmd-control"
+      :title="title"
+      :visible.sync="show"
+      width="840px"
+      :before-close="doClose"
+      :z-index="2000"
+      :modal="false"
+      :close-on-click-modal="false"
+    >
+      <div style="padding: 10px 20px; border: 1px solid lightgray;">
+        <span class="base-label">{{ $t('menu.commandInformation') }}</span>
+        <el-form label-position="center" size="mini">
+          <el-row>
+            <el-col :span="8">
+              <el-form-item :label="this.$t('menu.type')" label-width="40px">
+                <el-select v-model="operation" size="small" disabled>
+                  <el-option
+                    v-for="option in typeList"
+                    :key="option.code"
+                    :label="option.name"
+                    :value="option.code"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item :label="this.$t('menu.stationName')" label-width="80px">
+                <el-input v-model="stationName" size="small" disabled />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item :label="this.$t('menu.switchName')" label-width="80px">
+                <el-input v-model="switchName" size="small" disabled />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+      <el-table
+        ref="tempData"
+        class="table"
+        :data="tempData"
+        border
+        style="width: 100%"
+        size="mini"
+        highlight-current-row
+        height="200"
+      >
+        <el-table-column prop="order" :width="110" :label="this.$t('menu.serialNumber2')" />
+        <el-table-column prop="date" :width="160" :label="this.$t('menu.time')" />
+        <el-table-column prop="context" :width="180" :label="this.$t('menu.implementationProcess')" />
+        <el-table-column prop="result" :label="this.$t('menu.executionResult')" />
+      </el-table>
+      <span class="notice">{{ message }}</span>
+      <el-row class="button-group">
+        <el-col :span="2" :offset="3">
+          <el-button :id="domIdCommand" type="primary" :disabled="cmdDisabled[0]" @click="command">{{ $t('menu.release') }}<span
+            v-show="timeCountCommand>0"
+          >({{ timeCountCommand }})</span></el-button>
+        </el-col>
+        <el-col :span="2" :offset="1">
+          <el-button :id="domIdConfirm1" type="primary" style="width:120px;" :disabled="cmdDisabled[1]" @click="confirm1">{{ $t('menu.firstConfirm') }}
+          </el-button>
+        </el-col>
+        <el-col :span="2" :offset="2">
+          <el-button :id="domIdConfirm2" type="primary" style="width:120px;" :disabled="cmdDisabled[2]" @click="confirm2">{{ $t('menu.secondConfirm') }}<span
+            v-show="timeCountConfirm>0"
+          >({{ timeCountConfirm }})</span></el-button>
+        </el-col>
+        <el-col :span="2" :offset="2">
+          <el-button :id="domIdStop" type="primary" :disabled="stpDisabled" @click="stop">{{ $t('menu.suspend') }}</el-button>
+        </el-col>
+        <el-col :span="2" :offset="1">
+          <el-button :id="domIdClose" @click="close">{{ $t('global.close') }}</el-button>
+        </el-col>
+      </el-row>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import { now } from '@/utils/date';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
+
+export default {
+    name: 'SwitchCmdControl',
+    data() {
+        return {
+            dialogShow: false,
+            backOperate: '',
+            selected: '',
+            order: 0,
+            row: null,
+            timer: null,
+            operation: '',
+            cmdDisabled: [true, true, true],
+            stpDisabled: true,
+            tempData: [],
+            message: '',
+            timeCountCommand: -1,
+            timeCountConfirm: -1,
+            stationName: '',
+            switchName: ''
+        };
+    },
+    computed: {
+        typeList() {
+            return [
+                { code: OperationEvent.Switch.unlock.menu.operation, name: this.$t('menu.menuSwitch.switchUnlock') },
+                { code: OperationEvent.Switch.unblock.menu.operation, name: this.$t('menu.menuSwitch.switchSectionUnblock') },
+                { code: OperationEvent.Switch.fault.menu.operation, name: this.$t('menu.menuSwitch.switchMalfunctionUnlock') },
+                { code: OperationEvent.Switch.axlePreReset.menu.operation, name: this.$t('menu.menuSwitch.switchSectionAxisPreReset') }
+            ];
+        },
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
+        },
+        domIdCommand() {
+            if (this.dialogShow) {
+                if (this.operation == OperationEvent.Switch.unlock.menu.operation) {
+                    /** 道岔单解*/
+                    return OperationEvent.Switch.unlock.order.domId;
+                } else if (this.operation == OperationEvent.Switch.unblock.menu.operation) {
+                    /** 道岔解封*/
+                    return OperationEvent.Switch.unblock.order.domId;
+                } else if (this.operation == OperationEvent.Switch.fault.menu.operation) {
+                    /** 道岔故障解锁*/
+                    return OperationEvent.Switch.fault.order.domId;
+                } else if (this.operation == OperationEvent.Switch.axlePreReset.menu.operation) {
+                    /** 道岔计轴复位*/
+                    return OperationEvent.Switch.axlePreReset.order.domId;
+                }
+            }
+            return '';
+        },
+        domIdConfirm1() {
+            if (this.dialogShow) {
+                if (this.operation == OperationEvent.Switch.unlock.menu.operation) {
+                    /** 道岔单解*/
+                    return OperationEvent.Switch.unlock.confirm1.domId;
+                } else if (this.operation == OperationEvent.Switch.unblock.menu.operation) {
+                    /** 道岔解封*/
+                    return OperationEvent.Switch.unblock.confirm1.domId;
+                } else if (this.operation == OperationEvent.Switch.fault.menu.operation) {
+                    /** 道岔故障解锁*/
+                    return OperationEvent.Switch.fault.confirm1.domId;
+                } else if (this.operation == OperationEvent.Switch.axlePreReset.menu.operation) {
+                    /** 道岔计轴复位*/
+                    return OperationEvent.Switch.axlePreReset.confirm1.domId;
+                }
+            }
+            return '';
+        },
+        domIdConfirm2() {
+            if (this.dialogShow) {
+                if (this.operation == OperationEvent.Switch.unlock.menu.operation) {
+                    /** 道岔单解*/
+                    return OperationEvent.Switch.unlock.confirm2.domId;
+                } else if (this.operation == OperationEvent.Switch.unblock.menu.operation) {
+                    /** 道岔解封*/
+                    return OperationEvent.Switch.unblock.confirm2.domId;
+                } else if (this.operation == OperationEvent.Switch.fault.menu.operation) {
+                    /** 道岔故障解锁*/
+                    return OperationEvent.Switch.fault.confirm2.domId;
+                } else if (this.operation == OperationEvent.Switch.axlePreReset.menu.operation) {
+                    /** 道岔计轴复位*/
+                    return OperationEvent.Switch.axlePreReset.confirm2.domId;
+                }
+            }
+            return '';
+        },
+        domIdStop() {
+            if (this.dialogShow) {
+                if (this.operation == OperationEvent.Switch.unlock.menu.operation) {
+                    /** 道岔单解*/
+                    return OperationEvent.Switch.unlock.stop.domId;
+                } else if (this.operation == OperationEvent.Switch.unblock.menu.operation) {
+                    /** 道岔解封*/
+                    return OperationEvent.Switch.unblock.stop.domId;
+                } else if (this.operation == OperationEvent.Switch.fault.menu.operation) {
+                    /** 道岔故障解锁*/
+                    return OperationEvent.Switch.fault.stop.domId;
+                } else if (this.operation == OperationEvent.Switch.axlePreReset.menu.operation) {
+                    /** 道岔计轴复位*/
+                    return OperationEvent.Switch.axlePreReset.stop.domId;
+                }
+            }
+            return '';
+        },
+        domIdClose() {
+            if (this.dialogShow) {
+                return OperationEvent.Command.close.menu.domId;
+            }
+            return '';
+        },
+        title() {
+            if (this.dialogShow) {
+                if (this.operation == OperationEvent.Switch.unlock.menu.operation) {
+                    return '道岔单解';
+                } else if (this.operation == OperationEvent.Switch.unblock.menu.operation) {
+                    return '道岔解封';
+                } else if (this.operation == OperationEvent.Switch.fault.menu.operation) {
+                    return '道岔故障解锁';
+                } else if (this.operation == OperationEvent.Switch.axlePreReset.menu.operation) {
+                    return '道岔计轴复位';
+                }
+            }
+            return '';
+        }
+    },
+    watch: {
+        cmdDisabled: {
+            handler(val, oldVal) {
+                this.stpDisabled = true;
+                val.forEach((elem, index) => {
+                    // 在确定1之前的操作才可以终止
+                    if (elem == false && index >= 1 && index <= 2) {
+                        this.stpDisabled = false;
+                    }
+                });
+            },
+            deep: true
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+        this.timer = setInterval(() => {
+            if (!this.$store.state.menuOperation.break) {
+                if (this.timeCountCommand > 0) {
+                    this.timeCountCommand--;
+                } else if (this.timeCountCommand == 0) {
+                    this.setButtonEnable({ step: 0 });
+                    this.timeCountCommand = -1;
+                }
+                if (this.timeCountConfirm > 0) {
+                    this.timeCountConfirm--;
+                } else if (this.timeCountConfirm == 0) {
+                    this.setButtonEnable({ step: 0 });
+                    this.timeCountConfirm = -1;
+                }
+            }
+        }, 1000);
+    },
+    beforeDestroy() {
+        clearInterval(this.timer);
+        this.timer = null;
+    },
+    methods: {
+        doShow(operate, selected) {
+            if (!this.dialogShow) {
+                this.switchName = '';
+                this.stationName = '';
+                if (selected && selected._type.toUpperCase() === 'Switch'.toUpperCase()) {
+                    this.switchName = selected.name;
+                    const station = this.$store.getters['map/getDeviceByCode'](selected.stationCode);
+                    if (station) {
+                        this.stationName = station.name;
+                    }
+                    this.selected = selected;
+                }
+
+                this.order = 0;
+                this.operation = operate.operation;
+                this.dialogShow = true;
+                this.tempData = [];
+                this.timeCountCommand = -1;
+                this.timeCountConfirm = -1;
+                this.cmdDisabled = [false, true, true];
+            }
+            this.stpDisabled = true;
+            this.setMessage(this.$t('tip.releaseTip'));
+            this.$nextTick(function () {
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
+        doClose() {
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+        },
+        command() {
+            /** 道岔单解/道岔解封/道岔故障解锁/道岔计轴复位*/
+            if (this.operation == OperationEvent.Switch.unlock.menu.operation ||
+                    this.operation == OperationEvent.Switch.unblock.menu.operation ||
+                    this.operation == OperationEvent.Switch.fault.menu.operation ||
+                    this.operation == OperationEvent.Switch.axlePreReset.menu.operation ||
+                    this.operation == OperationEvent.Switch.cancelSpeed.menu.operation) {
+                /** 第一步不带弹框处理*/
+                this.commandNoPopUp();
+            } else {
+                /** 第一步带弹框处理*/
+                this.commandHasPopUp();
+            }
+        },
+        commandHasPopUp() {
+
+        },
+        commandNoPopUp() {
+            const operate = {
+
+            };
+
+            if (this.operation == OperationEvent.Switch.unlock.menu.operation) {
+                /** 道岔单解*/
+                operate.operation = OperationEvent.Switch.unlock.order.operation;
+            } else if (this.operation == OperationEvent.Switch.unblock.menu.operation) {
+                /** 道岔解封*/
+                operate.operation = OperationEvent.Switch.unblock.order.operation;
+            } else if (this.operation == OperationEvent.Switch.fault.menu.operation) {
+                /** 道岔故障解锁*/
+                operate.operation = OperationEvent.Switch.fault.order.operation;
+            } else if (this.operation == OperationEvent.Switch.axlePreReset.menu.operation) {
+                /** 道岔计轴复位*/
+                operate.operation = OperationEvent.Switch.axlePreReset.order.operation;
+            }
+
+            this.setMessage(this.$t('tip.firstConfirmTip'));
+            this.writeRecord({ order: ++this.order, date: now(), context: this.$t('menu.clickReleaseCommand'), result: '' });
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.setButtonEnable({ step: 1 });
+                    this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickReleaseCommand'), result: this.$t('tip.executionSucceed') });
+                } else {
+                    this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickReleaseCommand'), result: this.$t('tip.executionFailed') });
+                }
+            }).catch(() => {
+                this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickReleaseCommand'), result: this.$t('tip.executionException') });
+            });
+        },
+        confirm1() {
+            const operate = {
+
+            };
+
+            if (this.operation == OperationEvent.Switch.unlock.menu.operation) {
+                /** 道岔单解*/
+                operate.operation = OperationEvent.Switch.unlock.confirm1.operation;
+            } else if (this.operation == OperationEvent.Switch.unblock.menu.operation) {
+                /** 道岔解封*/
+                operate.operation = OperationEvent.Switch.unblock.confirm1.operation;
+            } else if (this.operation == OperationEvent.Switch.fault.menu.operation) {
+                /** 道岔故障解锁*/
+                operate.operation = OperationEvent.Switch.fault.confirm1.operation;
+            } else if (this.operation == OperationEvent.Switch.axlePreReset.menu.operation) {
+                /** 道岔计轴复位*/
+                operate.operation = OperationEvent.Switch.axlePreReset.confirm1.operation;
+            }
+
+            this.setMessage(this.$t('tip.secondConfirmTip'));
+            this.writeRecord({ order: ++this.order, date: now(), context: this.$t('menu.clickFirstConfirm'), result: '' });
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.timeCountCommand = -1;
+                    this.timeCountConfirm = 10;
+                    this.setButtonEnable({ step: 2 });
+                    this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickFirstConfirm'), result: this.$t('tip.executionSucceed') });
+                } else {
+                    this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickFirstConfirm'), result: this.$t('tip.executionFailed') });
+                }
+            }).catch(() => {
+                this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickFirstConfirm'), result: this.$t('tip.executionException') });
+            });
+        },
+        confirm2() {
+            const operate = {
+                over: true
+            };
+
+            if (this.operation == OperationEvent.Switch.unlock.menu.operation) {
+                /** 道岔单解*/
+                operate.operation = OperationEvent.Switch.unlock.confirm2.operation;
+                operate.cmdType = CMD.Switch.CMD_SWITCH_SINGLE_UNLOCK;
+            } else if (this.operation == OperationEvent.Switch.unblock.menu.operation) {
+                /** 道岔解封*/
+                operate.operation = OperationEvent.Switch.unblock.confirm2.operation;
+                operate.cmdType = CMD.Switch.CMD_SWITCH_UNBLOCK;
+            } else if (this.operation == OperationEvent.Switch.fault.menu.operation) {
+                /** 道岔故障解锁*/
+                operate.operation = OperationEvent.Switch.fault.confirm2.operation;
+                operate.cmdType = CMD.Switch.CMD_SWITCH_FAULT_UNLOCK;
+            } else if (this.operation == OperationEvent.Switch.axlePreReset.menu.operation) {
+                /** 道岔计轴复位*/
+                operate.operation = OperationEvent.Switch.axlePreReset.confirm2.operation;
+                operate.cmdType = CMD.Switch.CMD_SWITCH_AXIS_PRE_RESET;
+            }
+            this.setMessage('');
+            this.writeRecord({ order: ++this.order, date: now(), context: this.$t('menu.clickSecondConfirm'), result: '' });
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.timeCountCommand = -1;
+                this.timeCountConfirm = -1;
+                this.setButtonEnable({ step: -1 });
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickSecondConfirm'), result: this.$t('tip.executionSucceed') });
+                } else {
+                    this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickSecondConfirm'), result: this.$t('tip.executionFailed') });
+                }
+            }).catch(() => {
+                this.timeCountCommand = -1;
+                this.timeCountConfirm = -1;
+                this.setButtonEnable({ step: -1 });
+                this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickSecondConfirm'), result: this.$t('tip.executionException') });
+            });
+        },
+        stop() {
+            const operate = {
+            };
+
+            if (this.operation == OperationEvent.Switch.unlock.menu.operation) {
+                /** 道岔单解*/
+                operate.operation = OperationEvent.Switch.unlock.stop.operation;
+            } else if (this.operation == OperationEvent.Switch.unblock.menu.operation) {
+                /** 道岔解封*/
+                operate.operation = OperationEvent.Switch.unblock.stop.operation;
+            } else if (this.operation == OperationEvent.Switch.fault.menu.operation) {
+                /** 道岔故障解锁*/
+                operate.operation = OperationEvent.Switch.fault.stop.operation;
+            } else if (this.operation == OperationEvent.Switch.axlePreReset.menu.operation) {
+                /** 道岔计轴复位*/
+                operate.operation = OperationEvent.Switch.axlePreReset.stop.operation;
+            }
+
+            this.writeRecord({ order: ++this.order, date: now(), context: this.$t('menu.clickSuspend'), result: '' });
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.setButtonEnable({ step: 0 });
+                    this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickSuspend'), result: this.$t('tip.executionSucceed') });
+                } else {
+                    this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickSuspend'), result: this.$t('tip.executionFailed') });
+                }
+            }).catch(() => {
+                this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickSuspend'), result: this.$t('tip.executionException') });
+            });
+        },
+        close() {
+            const operate = {
+                operation: OperationEvent.Command.close.menu.operation
+            };
+
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => {
+                this.doClose();
+            });
+        },
+        getOperate(operate) {
+            /** 弹框返回值处理*/
+        },
+        setButtonEnable(param) {
+            this.cmdDisabled = [true, true, true];
+            if (param && param.step >= 0) {
+                this.cmdDisabled[param.step] = false;
+            }
+        },
+        setMessage(message) {
+            this.message = message;
+        },
+        writeRecord(param) {
+            this.tempData.push(param);
+        },
+        editRecord(param) {
+            this.tempData.forEach(elem => {
+                if (elem.order == param.order) {
+                    for (var prop in param) {
+                        elem[prop] = param[prop];
+                    }
+                }
+            });
+        }
+    }
+};
+</script>
diff --git a/src/jmapNew/theme/xian_01/menus/dialog/switchControl.vue b/src/jmapNew/theme/xian_01/menus/dialog/switchControl.vue
new file mode 100644
index 000000000..acdfa7ced
--- /dev/null
+++ b/src/jmapNew/theme/xian_01/menus/dialog/switchControl.vue
@@ -0,0 +1,286 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    class="fuzhou-01__systerm switch-control"
+    :title="title"
+    :visible.sync="show"
+    width="300px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <el-row class="header">
+      <el-col :span="11"><span>{{ $t('menu.stationName') }}</span></el-col>
+      <el-col :span="11" :offset="2"><span>{{ $t('menu.switch') }}</span></el-col>
+    </el-row>
+    <el-row>
+      <el-col :span="11">
+        <el-input v-model="stationName" size="small" disabled />
+      </el-col>
+      <el-col :span="11" :offset="2">
+        <el-input v-model="switchName" size="small" disabled />
+      </el-col>
+    </el-row>
+    <el-row v-if="activeShow" style="margin-top: 10px;">
+      <el-col :span="11">
+        <el-radio v-model="radio" label="1" :disabled="radio == 2" style="display: block; text-align: center;">
+          {{ $t('menu.activation') }}</el-radio>
+      </el-col>
+      <el-col :span="11" :offset="2">
+        <el-radio v-model="radio" label="2" :disabled="radio == 1" style="display: block; text-align: center;">
+          {{ $t('menu.resection') }}</el-radio>
+      </el-col>
+    </el-row>
+    <el-row justify="center" class="button-group">
+      <el-col :span="10" :offset="2">
+        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">{{ $t('global.confirm') }}</el-button>
+      </el-col>
+      <el-col :span="8" :offset="4">
+        <el-button :id="domIdCancel" @click="cancel">{{ $t('global.cancel') }}</el-button>
+      </el-col>
+    </el-row>
+    <notice-info ref="noticeInfo" />
+  </el-dialog>
+</template>
+
+<script>
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
+import NoticeInfo from './childDialog/childDialog/noticeInfo';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
+
+export default {
+    name: 'SwitchControl',
+    components: {
+        NoticeInfo
+    },
+    data() {
+        return {
+            dialogShow: false,
+            loading: false,
+            operation: '',
+            stationName: '',
+            switchName: '',
+            radio: 1,
+            activeShow: false
+        };
+    },
+    computed: {
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
+        },
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+        },
+        domIdConfirm() {
+            return this.dialogShow ? OperationHandler.getDomIdByOperation(this.operation) : '';
+        },
+        title() {
+            if (this.operation == OperationEvent.Switch.lock.menu.operation) {
+                return this.$t('menu.menuSwitch.switchLock');
+            } else if (this.operation == OperationEvent.Switch.block.menu.operation) {
+                return this.$t('menu.menuSwitch.switchBlockade');
+            } else if (this.operation == OperationEvent.Switch.turnout.menu.operation) {
+                return this.$t('menu.menuSwitch.switchTurnout');
+            } else if (this.operation == OperationEvent.Switch.turnoutForce.menu.operation) {
+                return this.$t('menu.menuSwitch.switchForcedPull');
+            } else if (this.operation == OperationEvent.Switch.split.menu.operation) {
+                return this.$t('menu.menuSwitch.sectionResection');
+            } else if (this.operation == OperationEvent.Switch.active.menu.operation) {
+                return this.$t('menu.menuSwitch.sectionActive');
+            }
+            return '';
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(operate, selected) {
+            if (!this.dialogShow) {
+                this.switchName = '';
+                this.stationName = '';
+                if (selected && selected._type.toUpperCase() === 'Switch'.toUpperCase()) {
+                    this.switchName = selected.name;
+                    const station = this.$store.getters['map/getDeviceByCode'](selected.stationCode);
+                    if (station) {
+                        this.stationName = station.name;
+                    }
+                }
+
+                this.operation = operate.operation;
+                if (this.operation == OperationEvent.Switch.split.menu.operation) {
+                    this.activeShow = true;
+                    this.radio = '2';
+                } else if (this.operation == OperationEvent.Switch.active.menu.operation) {
+                    this.activeShow = true;
+                    this.radio = '1';
+                }
+            }
+            this.dialogShow = true;
+            this.$nextTick(function () {
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+        },
+        commit() {
+            if (this.operation == OperationEvent.Switch.lock.menu.operation) {
+                /** 道岔单锁*/
+                this.lock();
+            } else if (this.operation == OperationEvent.Switch.block.menu.operation) {
+                /** 道岔封锁*/
+                this.block();
+            } else if (this.operation == OperationEvent.Switch.turnout.menu.operation) {
+                /** 道岔转动*/
+                this.turnout(this.operation);
+            } else if (this.operation == OperationEvent.Switch.turnoutForce.menu.operation) {
+                /** 道岔强扳*/
+                this.turnoutForce();
+            } else if (this.operation == OperationEvent.Switch.split.menu.operation) {
+                /** 区段激活*/
+                this.split();
+            } else if (this.operation == OperationEvent.Switch.active.menu.operation) {
+                /** 区段激活*/
+                this.active();
+            }
+        },
+        // 道岔单锁
+        lock() {
+            const operate = {
+                over: true,
+                operation: OperationEvent.Switch.lock.menu.operation,
+                cmdType: CMD.Switch.CMD_SWITCH_SINGLE_LOCK
+            };
+
+            this.loading = true;
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.loading = false;
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => {
+                this.loading = false;
+                this.doClose();
+                this.$refs.noticeInfo.doShow(operate);
+            });
+        },
+        // 道岔封锁
+        block() {
+            const operate = {
+                over: true,
+                operation: OperationEvent.Switch.block.menu.operation,
+                cmdType: CMD.Switch.CMD_SWITCH_BLOCK
+            };
+
+            this.loading = true;
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.loading = false;
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => {
+                this.loading = false;
+                this.doClose();
+                this.$refs.noticeInfo.doShow(operate);
+            });
+        },
+        // 道岔转动
+        turnout(operation) {
+            const operate = {
+                over: true,
+                operation: OperationEvent.Switch.turnout.menu.operation,
+                cmdType: CMD.Switch.CMD_SWITCH_TURN
+            };
+
+            this.loading = true;
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.loading = false;
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => {
+                this.loading = false;
+                this.doClose();
+                this.$refs.noticeInfo.doShow(operate);
+            });
+        },
+        // 道岔强扮
+        turnoutForce() {
+            const operate = {
+                over: true,
+                operation: OperationEvent.Switch.turnoutForce.menu.operation,
+                cmdType: CMD.Switch.CMD_SWITCH_FORCE_TURN
+            };
+            this.loading = true;
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.loading = false;
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => {
+                this.loading = false;
+                this.doClose();
+                this.$refs.noticeInfo.doShow(operate);
+            });
+        },
+        // 区段切除
+        split() {
+            const operate = {
+                over: true,
+                operation: OperationEvent.Switch.split.menu.operation,
+                cmdType: CMD.Switch.CMD_SWITCH_CUT_OFF
+            };
+            this.loading = true;
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.loading = false;
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => {
+                this.loading = false;
+                this.doClose();
+                this.$refs.noticeInfo.doShow(operate);
+            });
+        },
+        // 区段激活
+        active() {
+            const operate = {
+                over: true,
+                operation: OperationEvent.Switch.active.menu.operation,
+                cmdType: CMD.Switch.CMD_SWITCH_ACTIVE
+            };
+            this.loading = true;
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.loading = false;
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => {
+                this.loading = false;
+                this.doClose();
+                this.$refs.noticeInfo.doShow(operate);
+            });
+        },
+        cancel() {
+            const operate = {
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
+
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => {
+                this.doClose();
+            });
+        }
+    }
+};
+</script>
diff --git a/src/jmapNew/theme/xian_01/menus/dialog/trainControl.vue b/src/jmapNew/theme/xian_01/menus/dialog/trainControl.vue
new file mode 100644
index 000000000..87286986a
--- /dev/null
+++ b/src/jmapNew/theme/xian_01/menus/dialog/trainControl.vue
@@ -0,0 +1,472 @@
+<template>
+  <el-dialog v-dialogDrag class="fuzhou-01__systerm train-control" :title="title" :visible.sync="show" width="370px" :before-close="doClose" :z-index="2000" :modal="false" :close-on-click-modal="false">
+    <el-form ref="form" size="small" label-width="120px" :model="formModel" :rules="rules">
+      <el-form-item :label="this.$t('menu.groupNumber')+this.$t('global.colon')" prop="groupNumber">
+        <el-select
+          :id="domIdTrainNumber"
+          v-model="formModel.groupNumber"
+          filterable
+          :disabled="trainNumberIsDisabled"
+          @change="trainNumberChange"
+        >
+          <el-option
+            v-for="train in trainList"
+            :key="train.groupNumber"
+            :label="train.groupNumber"
+            :value="train.groupNumber"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item prop="trainType" label-width="0px">
+        <el-radio-group
+          :id="domIdTrainType"
+          v-model="formModel.trainType"
+          style="margin-left: 15px;"
+          @change="trainTypeChange"
+        >
+          <el-radio :label="'01'">{{ $t('menu.planTrain') }}</el-radio>
+          <el-radio :label="'02'">{{ $t('menu.headCodeTrain') }}</el-radio>
+          <el-radio :label="'03'" style="margin-top:5px;">{{ $t('menu.artificialTrain') }}</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item v-if="formModel.trainType == '01'" prop="serviceNumber">
+        <span slot="label">{{ $t('menu.serviceNumber') }}</span>
+        <el-input
+          :id="domIdServerNo"
+          v-model="formModel.serviceNumber"
+          :disabled="serverNoIsDisabled"
+        />
+      </el-form-item>
+      <el-form-item v-if="formModel.trainType == '01'" :label="this.$t('menu.tripNumber')+this.$t('global.colon')" prop="tripNumber">
+        <el-input
+          :id="domIdTrainNo"
+          v-model="formModel.tripNumber"
+          :disabled="trainNoIsDisabled"
+          maxlength="4"
+        />
+      </el-form-item>
+      <el-form-item v-if="formModel.trainType == '01'" :label="this.$t('menu.targetCode')+this.$t('global.colon')" prop="targetCode">
+        <el-input
+          :id="domIdTargetCode"
+          v-model="formModel.targetCode"
+          :disabled="targetCodeIsDisabled"
+        />
+      </el-form-item>
+      <el-form-item v-if="formModel.trainType == '03'" :label="this.$t('menu.category')+this.$t('global.colon')" prop="category">
+        <el-select
+          :id="domIdTrainNumber"
+          v-model="formModel.category"
+          filterable
+          :disabled="true"
+        >
+          <el-option
+            v-for="item in categoryList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+    </el-form>
+    <el-row justify="center" class="button-group">
+      <el-col :span="10" :offset="2">
+        <el-button :id="domIdConfirm" type="primary" :loading="loading" :disabled="istargetCode" @click="commit">{{ $t('global.confirm') }}</el-button>
+      </el-col>
+      <el-col :span="8" :offset="4">
+        <el-button :id="domIdCancel" @click="cancel">{{ $t('global.cancel') }}</el-button>
+      </el-col>
+    </el-row>
+    <confirm-train ref="confirmTrain" />
+    <notice-info ref="noticeInfo" />
+  </el-dialog>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
+import ConfirmTrain from './childDialog/confirmTrain';
+import NoticeInfo from './childDialog/childDialog/noticeInfo';
+import Handler from '@/scripts/cmdPlugin/Handler';
+
+export default {
+    name: 'TrainControl',
+    components: {
+        ConfirmTrain,
+        NoticeInfo
+    },
+    data() {
+        return {
+            trainList: [],
+            categoryList: [
+                { name: 'MM', value: '01' }
+            ],
+            formModel: {
+                tripNumber: '',
+                groupNumber: '',
+                trainType: '01',
+                serviceNumber: '',
+                targetCode: '',
+                category: 'MM'
+            },
+
+            rules: {
+                groupNumber: [
+                    { required: true, message: this.$t('rules.selectGroupNumber'), trigger: 'change' }
+                ],
+                trainType: [
+                    { required: true, message: this.$t('rules.selectATrainType'), trigger: 'change' }
+                ],
+                serviceNumber: [
+                    { required: true, message: this.$t('rules.enterTheServiceNumber'), trigger: 'blur' }
+                ],
+                tripNumber: [
+                    { required: true, message: this.$t('rules.enterTheTripNumber'), trigger: 'blur' }
+                ],
+                targetCode: [
+                    { required: true, message: this.$t('rules.enterTheTargetCode'), trigger: 'blur' }
+                ]
+            },
+            operation: null,
+            dialogShow: false,
+            loading: false,
+            direction: 0
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'map'
+        ]),
+        trainNoIsDisabled() {
+            return false;
+        },
+        serverNoIsDisabled() {
+            return true;
+        },
+        targetCodeIsDisabled() {
+            return true;
+        },
+        trainNumberIsDisabled() {
+            if (this.operation != OperationEvent.Train.addTrainId.menu.operation) {
+                return true;
+            }
+            return '';
+        },
+        // trainTypeIsDisabled() {
+        // 	if (this.operation != OperationEvent.Train.addTrainId.menu.operation) {
+        // 		return true;
+        // 	}
+        // 	return '';
+        // },
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
+        },
+        domIdTrainNumber() {
+            if (this.dialogShow) {
+                if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
+                    /** 添加列车识别号*/
+                    return OperationEvent.Train.addTrainId.trainNumberChange.domId;
+                } else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
+                    /** 修改列车识别号*/
+                    return OperationEvent.Train.editTrainId.trainNumberChange.domId;
+                }
+            }
+            return '';
+        },
+        domIdTrainNo() {
+            if (this.dialogShow) {
+                if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
+                    /** 添加列车识别号*/
+                    return OperationEvent.Train.addTrainId.trainNoChange.domId;
+                } else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
+                    /** 修改列车识别号*/
+                    return OperationEvent.Train.editTrainId.trainNoChange.domId;
+                }
+            }
+            return '';
+        },
+        domIdTrainType() {
+            if (this.dialogShow) {
+                if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
+                    /** 添加列车识别号*/
+                    return OperationEvent.Train.addTrainId.trainTypeChange.domId;
+                } else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
+                    /** 修改列车识别号*/
+                    return OperationEvent.Train.editTrainId.trainTypeChange.domId;
+                }
+            }
+            return '';
+        },
+        domIdServerNo() {
+            if (this.dialogShow) {
+                if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
+                    /** 添加列车识别号*/
+                    return OperationEvent.Train.addTrainId.serverNoChange.domId;
+                } else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
+                    /** 修改列车识别号*/
+                    return OperationEvent.Train.editTrainId.serverNoChange.domId;
+                }
+            }
+            return '';
+        },
+        domIdTargetCode() {
+            if (this.dialogShow) {
+                if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
+                    /** 添加列车识别号*/
+                    return OperationEvent.Train.addTrainId.targetCodeChange.domId;
+                } else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
+                    /** 修改列车识别号*/
+                    return OperationEvent.Train.editTrainId.targetCodeChange.domId;
+                }
+            }
+            return '';
+        },
+        domIdConfirm() {
+            if (this.dialogShow) {
+                if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
+                    /** 添加列车识别号*/
+                    return OperationEvent.Train.addTrainId.menu.domId;
+                } else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
+                    /** 修改列车识别号*/
+                    return OperationEvent.Train.editTrainId.menu.domId;
+                }
+            }
+            return '';
+        },
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+        },
+        title() {
+            if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
+                return this.$t('menu.menuTrain.addTrainId');
+            } else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
+                return this.$t('menu.menuTrain.editTrainId');
+            }
+            return '';
+        },
+        istargetCode() {
+            if (this.formModel.serviceNumber && this.formModel.targetCode) {
+                return false;
+            }
+            return true;
+        }
+    },
+    watch: {
+        'formModel.tripNumber': function(val) {
+            if (val.length == 4) {
+                this.trainNoChange(val);
+            } else {
+                this.formModel = {
+                    groupNumber: this.formModel.groupNumber,
+                    tripNumber: val,
+                    trainType: this.formModel.trainType,
+                    serviceNumber: '',
+                    targetCode: '',
+                    category: 'MM'
+                };
+            }
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        loadInitData(map) {},
+        doShow(operate, selected) {
+            // 如果不是断点激活，则需要对初始值进行初始化
+            if (!this.dialogShow) {
+                this.operation = operate.operation;
+            }
+            const model = this.$store.getters['map/getDeviceByCode'](selected.code);
+            this.formModel = {
+                groupNumber: model.groupNumber,
+                tripNumber: `${model.directionCode}${model.tripNumber}`,
+                trainType: model.type,
+                serviceNumber: model.serviceNumber,
+                targetCode: model.targetCode,
+                category: 'MM'
+            };
+
+            /** 加载列车数据*/
+            this.loadInitData(this.map);
+            this.dialogShow = true;
+            this.$nextTick(function () {
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+            this.$store.dispatch('map/setTrainWindowShow', false);
+        },
+        trainNumberChange(groupNumber) {
+            const operate = {
+                
+                val: `${groupNumber}`,
+                operation: ''
+            };
+
+            if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
+                operate.operation = OperationEvent.Train.addTrainId.trainNumberChange.operation;
+            } else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
+                operate.operation = OperationEvent.Train.editTrainId.trainNumberChange.operation;
+            }
+
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                }
+            });
+        },
+        trainTypeChange(trainType) {
+            const operate = {
+                
+                val: `${trainType}`,
+                operation: ''
+            };
+
+            if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
+                operate.operation = OperationEvent.Train.addTrainId.trainTypeChange.operation;
+            } else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
+                operate.operation = OperationEvent.Train.editTrainId.trainTypeChange.operation;
+            }
+
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                }
+            });
+        },
+        trainNoChange(tripNumber) {
+            const operate = {
+                send: true,
+                
+                val: tripNumber,
+                operation: ''
+            };
+
+            if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
+                operate.operation = OperationEvent.Train.addTrainId.trainNoChange.operation;
+                operate.cmdType = CMD.Train.addTrainId;
+            } else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
+                operate.operation = OperationEvent.Train.editTrainId.trainNoChange.operation;
+                operate.cmdType = CMD.Train.editTrainId;
+            }
+            Handler.undo(1);
+            this.$store.dispatch('training/next', operate).then(({ valid, response }) => {
+                if (valid) {
+                    if (response.data) {
+                        this.formModel = {
+                            groupNumber: this.formModel.groupNumber,
+                            tripNumber: tripNumber,
+                            trainType: this.formModel.trainType,
+                            serviceNumber: response.data.serviceNumber,
+                            targetCode: response.data.targetCode,
+                            category: 'MM'
+                        };
+                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    } else {
+                        this.formModel = {
+                            groupNumber: this.formModel.groupNumber,
+                            tripNumber: tripNumber,
+                            trainType: this.formModel.trainType,
+                            serviceNumber: '',
+                            targetCode: '',
+                            category: 'MM'
+                        };
+                    }
+                }
+            });
+        },
+        commit() {
+            if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
+                /** 增加列车识别号*/
+                this.addTrainId();
+            } else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
+                /** 修改列车识别号*/
+                this.editTrainId();
+            }
+        },
+        // 增加列车识别号
+        addTrainId() {
+            this.$refs['form'].validate((valid) => {
+                if (valid) {
+                    const model = this.formModel;
+                    const operate = {
+                        send: true,
+                        
+                        operation: OperationEvent.Train.addTrainId.menu.operation,
+                        cmdType: CMD.Train.CMD_ADD_TRAIN_ID,
+                        messages: [this.$t('tip.addTrainIdTip')],
+                        val: `${model.groupNumber}::${model.trainType}::${model.serviceNumber}::${model.tripNumber}::${model.targetCode}`
+                    };
+
+                    this.loading = true;
+                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                        this.loading = false;
+                        if (valid) {
+                            this.doClose();
+                            this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                            this.$refs.confirmTrain.doShow(operate);
+                        }
+                    }).catch(() => {
+                        this.loading = false;
+                        this.doClose();
+                        this.$refs.noticeInfo.doShow(operate);
+                    });
+                } else {
+                    return false;
+                }
+            });
+        },
+        // 修改列车识别号
+        editTrainId() {
+            this.$refs['form'].validate((valid) => {
+                if (valid) {
+                    const operate = {
+                        send: true,
+                        
+                        operation: OperationEvent.Train.editTrainId.menu.operation,
+                        cmdType: CMD.Train.CMD_EDIT_TRAIN_ID,
+                        messages: [this.$t('tip.editTrainIdTip')],
+                        val: `${this.formModel.trainType}::${this.formModel.tripNumber}`
+                    };
+
+                    this.loading = true;
+                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                        this.loading = false;
+                        if (valid) {
+                            this.doClose();
+                            this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                            this.$refs.confirmTrain.doShow(operate);
+                        }
+                    }).catch(() => {
+                        this.loading = false;
+                        this.doClose();
+                        this.$refs.noticeInfo.doShow(operate);
+                    });
+                } else {
+                    return false;
+                }
+            });
+        },
+        cancel() {
+            const operate = {
+                
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
+
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => {
+                this.doClose();
+            });
+        }
+    }
+};
+</script>
diff --git a/src/jmapNew/theme/xian_01/menus/dialog/trainCreate.vue b/src/jmapNew/theme/xian_01/menus/dialog/trainCreate.vue
new file mode 100644
index 000000000..c6e00382c
--- /dev/null
+++ b/src/jmapNew/theme/xian_01/menus/dialog/trainCreate.vue
@@ -0,0 +1,155 @@
+<template>
+  <el-dialog v-dialogDrag class="fuzhou-01__systerm route-create" :title="title" :visible.sync="show" width="380px" label-position="top" :before-close="doClose" :z-index="2000" :modal="false" :close-on-click-modal="false">
+    <div style="padding: 10px 20px; border: 1px solid lightgray;">
+      <el-form size="small" label-width="100px">
+        <el-form-item :label="this.$t('menu.train')+this.$t('global.colon')" prop="trainCode">
+          <el-select v-model="trainCode" filterable :placeholder="this.$t('menu.train')">
+            <el-option
+              v-for="item in trainList"
+              :key="item.code"
+              :label="item.groupNumber"
+              :value="item.code"
+            />
+          </el-select>
+        </el-form-item>
+        <!-- <el-form-item label="列车车次:" prop="tripNumber">
+                    <el-select v-model="tripNumber" filterable placeholder="列车车次">
+                        <el-option v-for="no in trainNoList" :key="no" :label="no" :value="no"></el-option>
+                    </el-select>
+                    <div style="font-size: 12px;">(上行路线车次号选择偶数，下行路线车次号选择基数)</div>
+                </el-form-item> -->
+        <el-form-item :label="this.$t('menu.trainDirection')+this.$t('global.colon')" prop="direction">
+          <el-select v-model="direction" filterable :placeholder="this.$t('menu.trainDirection')">
+            <el-option v-for="no in directionList" :key="no.value" :label="no.label" :value="no.value" />
+          </el-select>
+          <!-- <div style="font-size: 12px;">(上行路线车次号选择偶数，下行路线车次号选择基数)</div> -->
+        </el-form-item>
+      </el-form>
+      <el-row>
+        <el-col style="text-align: right;">
+          <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">{{ this.$t('global.confirm') }}</el-button>
+          <el-button :id="domIdCancel" @click="cancel">{{ this.$t('global.cancel') }}</el-button>
+        </el-col>
+      </el-row>
+    </div>
+    <notice-info ref="noticeInfo" />
+  </el-dialog>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import NoticeInfo from './childDialog/childDialog/noticeInfo';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
+
+export default {
+    name: 'RouteCreate',
+    components: {
+        NoticeInfo
+    },
+    data() {
+        return {
+            dialogShow: false,
+            loading: false,
+            trainList: [],
+            trainNoList: [],
+            directionList: [
+                {
+                    value: '2',
+                    label: this.$t('menu.up')
+                },
+                {
+                    value: '1',
+                    label: this.$t('menu.down')
+                }
+            ],
+            trainCode: '',
+            tripNumber: '',
+            direction: '',
+            selected: null
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'map'
+        ]),
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
+        },
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+        },
+        domIdConfirm() {
+            return OperationEvent.Section.newtrain.menu.domId;
+        },
+        title() {
+            return this.$t('menu.settingTrain');
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        loadInitData(map) {
+            if (map.trainList.length) {
+                this.trainList = map.trainList;
+            } else {
+                this.$messageBox(this.$t('error.getTrainListFailed'));
+            }
+        },
+        doShow(operate, selected) {
+            this.dialogShow = true;
+            this.selected = selected;
+            /** 加载列车数据*/
+            this.loadInitData(this.map);
+
+            this.$nextTick(function () {
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
+        doClose() {
+            this.trainCode = '';
+            this.direction = '';
+            this.loading = false;
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+        },
+        commit() {
+            const operate = {
+                send: true,
+                
+                operation: OperationEvent.Section.newtrain.menu.operation,
+                cmdType: CMD.Section.CMD_NEW_TRAIN,
+                val: '' + this.direction + '::' + this.trainCode
+            };
+            this.loading = true;
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.loading = false;
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => {
+                this.loading = false;
+                this.doClose();
+                this.$refs.noticeInfo.doShow(operate);
+            });
+        },
+        cancel() {
+            const operate = {
+                
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
+
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => {
+                this.doClose();
+            });
+        }
+    }
+};
+</script>
diff --git a/src/jmapNew/theme/xian_01/menus/dialog/trainDelete.vue b/src/jmapNew/theme/xian_01/menus/dialog/trainDelete.vue
new file mode 100644
index 000000000..448f7fd28
--- /dev/null
+++ b/src/jmapNew/theme/xian_01/menus/dialog/trainDelete.vue
@@ -0,0 +1,167 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    class="fuzhou-01__systerm stand-stop-time"
+    :title="title"
+    :visible.sync="show"
+    width="320px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <el-form ref="form" size="small" label-width="90px" :model="formModel" :rules="rules">
+      <el-form-item :label="this.$t('menu.groupNumber')+this.$t('global.colon')" prop="groupNumber">
+        <el-input :id="domIdTrainNumber" v-model="formModel.groupNumber" @change="trainNumberChange" />
+      </el-form-item>
+    </el-form>
+    <el-row justify="center" class="button-group">
+      <el-col :span="10" :offset="2">
+        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">{{ $t('global.confirm') }}</el-button>
+      </el-col>
+      <el-col :span="8" :offset="4">
+        <el-button :id="domIdCancel" @click="cancel">{{ $t('global.cancel') }}</el-button>
+      </el-col>
+    </el-row>
+    <confirm-control ref="confirmControl" />
+    <notice-info ref="noticeInfo" />
+  </el-dialog>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+// import { getPublishMapTrainNos } from '@/api/runplan';
+import ConfirmControl from './childDialog/confirmControl';
+import NoticeInfo from './childDialog/childDialog/noticeInfo';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
+
+export default {
+    name: 'TrainDelete',
+    components: {
+        ConfirmControl,
+        NoticeInfo
+    },
+    data() {
+        return {
+            trainNoList: [],
+            formModel: {
+                groupNumber: ''
+            },
+
+            rules: {
+                groupNumber: [
+                    { required: true, message: this.$t('rules.selectGroupNumber'), 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 this.$t('menu.menuTrain.deleteTrainId');
+        }
+    },
+    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 = {
+                
+                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) {
+                    const operate = {
+                        send: true,
+                        
+                        operation: OperationEvent.Train.delTrainId.menu.operation,
+                        cmdType: CMD.Train.CMD_DEL_TRAIN_ID,
+                        val: this.formModel.groupNumber
+                    };
+
+                    this.loading = true;
+                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                        this.loading = false;
+                        if (valid) {
+                            this.doClose();
+                        }
+                    }).catch(() => {
+                        this.loading = false;
+                        this.doClose();
+                        this.$refs.noticeInfo.doShow(operate);
+                    });
+                } else {
+                    return false;
+                }
+            });
+        },
+        cancel() {
+            const operate = {
+                
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
+
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => { this.doClose(); });
+        }
+    }
+};
+</script>
diff --git a/src/jmapNew/theme/xian_01/menus/dialog/trainEditNumber.vue b/src/jmapNew/theme/xian_01/menus/dialog/trainEditNumber.vue
new file mode 100644
index 000000000..fe924739b
--- /dev/null
+++ b/src/jmapNew/theme/xian_01/menus/dialog/trainEditNumber.vue
@@ -0,0 +1,138 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    class="fuzhou-01__systerm stand-stop-time"
+    :title="title"
+    :visible.sync="show"
+    width="320px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <el-form ref="form" size="small" label-width="120px" :model="addModel" :rules="rules">
+      <el-form-item :label="this.$t('menu.groupNumber')+this.$t('global.colon')" label-width="120px" prop="tripNumber">
+        <el-input v-model="addModel.tripNumber" />
+      </el-form-item>
+    </el-form>
+    <el-row justify="center" class="button-group">
+      <el-col :span="10" :offset="2">
+        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">{{ $t('global.confirm') }}</el-button>
+      </el-col>
+      <el-col :span="8" :offset="4">
+        <el-button :id="domIdCancel" @click="cancel">{{ $t('global.cancel') }}</el-button>
+      </el-col>
+    </el-row>
+  </el-dialog>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
+
+export default {
+    name: 'TrainMove',
+    components: {
+    },
+    data() {
+        return {
+            trainNoList: [],
+            addModel: {
+                tripNumber: ''
+            },
+
+            rules: {
+                tripNumber: [
+                    { required: true, message: this.$t('rules.selectGroupNumber'), trigger: 'blur' }
+                ]
+            },
+            dialogShow: false,
+            loading: false
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'stationStandList'
+        ]),
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
+        },
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+        },
+        domIdConfirm() {
+            return this.dialogShow ? OperationEvent.Train.editTrainNo.menu.domId : '';
+        },
+        title() {
+            return this.$t('menu.menuTrain.editTrainNo');
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(operate, selected) {
+            this.dialogShow = true;
+            this.$nextTick(function () {
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+            this.$store.dispatch('map/setTrainWindowShow', false);
+        },
+        commit() {
+            this.$refs['form'].validate((valid) => {
+                if (valid) {
+                    const operate = {
+                        send: true,
+                        
+                        operation: OperationEvent.Train.editTrainNo.menu.operation,
+                        cmdType: CMD.Train.CMD_EDIT_TRAIN_NO
+                    };
+
+                    this.loading = true;
+                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                        this.loading = false;
+                        if (valid) {
+                            this.doClose();
+                        }
+                    }).catch(() => {
+                        this.loading = false;
+                        this.doClose();
+                    });
+                } else {
+                    return false;
+                }
+            });
+        },
+        cancel() {
+            const operate = {
+                
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
+
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => { this.doClose(); });
+        }
+    }
+};
+</script>
+<style scoped>
+    .fuzhou-01__systerm .el-dialog .base-label {
+        background: rgba(0, 0, 0, x);
+        position: relative;
+        left: -5px;
+        top: -18px;
+        padding: 0 5px;
+        background-color: #F0F0F0;
+    }
+</style>
diff --git a/src/jmapNew/theme/xian_01/menus/dialog/trainMove.vue b/src/jmapNew/theme/xian_01/menus/dialog/trainMove.vue
new file mode 100644
index 000000000..845e76b56
--- /dev/null
+++ b/src/jmapNew/theme/xian_01/menus/dialog/trainMove.vue
@@ -0,0 +1,201 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    class="fuzhou-01__systerm stand-stop-time"
+    :title="title"
+    :visible.sync="show"
+    width="640px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <el-form ref="form" size="small" label-width="80px" :model="addModel" :rules="rules">
+      <div style="width: 46%;">
+        <el-form-item :label="this.$t('menu.groupNumber')+this.$t('global.colon')" label-width="95px" prop="tripNumber">
+          <el-input v-model="addModel.tripNumber" disabled />
+        </el-form-item>
+      </div>
+      <div style="overflow: hidden;">
+        <div
+          style="width: 48%; float: left; padding: 10px 15px; border: 1px double lightgray; margin: 20px 0px; height: 120px; margin-right: 4%;"
+        >
+          <span class="base-label">{{ $t('menu.sourceTrainWindow') }}</span>
+          <div style="position: relative; top:-10px;">
+            <el-form-item prop="stationStandSource">
+              <span slot="label">{{ $t('menu.station') + $t('global.colon') }}</span>
+              <el-select v-model="addModel.stationStandSource" filterable :placeholder="this.$t('global.choose')">
+                <el-option
+                  v-for="item in stationStandList"
+                  :key="item.code"
+                  :label="item.name"
+                  :value="item.code"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item :label="this.$t('menu.trainWindow')+this.$t('global.colon')" prop="trainSource">
+              <el-input v-model="addModel.trainSource" />
+            </el-form-item>
+          </div>
+        </div>
+        <div
+          style="width: 48%; float: left; padding: 10px 15px; border: 1px double lightgray; margin: 20px 0px; height: 120px;"
+        >
+          <span class="base-label">{{ $t('menu.targetTrainWindow') }}</span>
+          <div style="position: relative; top:-10px;">
+            <el-form-item prop="stationStandGoal">
+              <span slot="label">{{ $t('menu.station') + $t('global.colon') }}</span>
+              <el-select v-model="addModel.stationStandGoal" filterable :placeholder="this.$t('global.choose')">
+                <el-option
+                  v-for="item in stationStandList"
+                  :key="item.code"
+                  :label="item.name"
+                  :value="item.code"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item :label="this.$t('menu.trainWindow')+this.$t('global.colon')" prop="trainGoal">
+              <el-input v-model="addModel.trainGoal" />
+            </el-form-item>
+          </div>
+        </div>
+      </div>
+    </el-form>
+    <el-row justify="center" class="button-group">
+      <el-col :span="10" :offset="2">
+        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">{{ $t('global.confirm') }}</el-button>
+      </el-col>
+      <el-col :span="8" :offset="4">
+        <el-button :id="domIdCancel" @click="cancel">{{ $t('global.cancel') }}</el-button>
+      </el-col>
+    </el-row>
+  </el-dialog>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
+
+export default {
+    name: 'TrainMove',
+    components: {
+    },
+    data() {
+        return {
+            trainNoList: [],
+            addModel: {
+                tripNumber: '',
+                trainSource: '',
+                stationStandSource: '',
+                trainGoal: '',
+                stationStandGoal: ''
+            },
+
+            rules: {
+                tripNumber: [
+                    { required: true, message: this.$t('rules.selectGroupNumber'), trigger: 'blur' }
+                ],
+                trainSource: [
+                    { required: true, message: this.$t('rules.enterTheTripNumber'), trigger: 'blur' }
+                ],
+                stationStandSource: [
+                    { required: true, message: this.$t('rules.selectStation'), trigger: 'change' }
+                ],
+                trainGoal: [
+                    { required: true, message: this.$t('rules.enterTheTripNumber'), trigger: 'blur' }
+                ],
+                stationStandGoal: [
+                    { required: true, message: this.$t('rules.selectStation'), trigger: 'change' }
+                ]
+            },
+            dialogShow: false,
+            loading: false
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'stationStandList'
+        ]),
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
+        },
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+        },
+        domIdConfirm() {
+            return this.dialogShow ? OperationEvent.Train.moveTrainId.menu.domId : '';
+        },
+        title() {
+            return this.$t('menu.menuTrain.moveTrainId');
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(operate, selected) {
+            this.dialogShow = true;
+            this.$nextTick(function () {
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+            this.$store.dispatch('map/setTrainWindowShow', false);
+        },
+        commit() {
+            this.$refs['form'].validate((valid) => {
+                if (valid) {
+                    const operate = {
+                        send: true,
+                        
+                        operation: OperationEvent.Train.moveTrainId.menu.operation,
+                        cmdType: CMD.Train.CMD_MOVE_TRAIN_ID
+                    };
+
+                    this.loading = true;
+                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                        this.loading = false;
+                        if (valid) {
+                            this.doClose();
+                        }
+                    }).catch(() => {
+                        this.loading = false;
+                        this.doClose();
+                        // this.$refs.noticeInfo.doShow(operate);
+                    });
+                } else {
+                    return false;
+                }
+            });
+        },
+        cancel() {
+            const operate = {
+                
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
+
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => { this.doClose(); });
+        }
+    }
+};
+</script>
+<style scoped>
+    .fuzhou-01__systerm .el-dialog .base-label {
+        background: rgba(0, 0, 0, x);
+        position: relative;
+        left: -5px;
+        top: -18px;
+        padding: 0 5px;
+        background-color: #F0F0F0;
+    }
+</style>
diff --git a/src/jmapNew/theme/xian_01/menus/dialog/trainSwitch.vue b/src/jmapNew/theme/xian_01/menus/dialog/trainSwitch.vue
new file mode 100644
index 000000000..c7cb6d580
--- /dev/null
+++ b/src/jmapNew/theme/xian_01/menus/dialog/trainSwitch.vue
@@ -0,0 +1,206 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    class="fuzhou-01__systerm stand-stop-time"
+    :title="title"
+    :visible.sync="show"
+    width="640px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <el-form ref="form" size="small" label-width="80px" :model="addModel" :rules="rules">
+      <div style="overflow: hidden;">
+        <div
+          style="width: 48%; float: left; padding: 10px 15px; border: 1px double lightgray; margin: 20px 0px; height: 177px; margin-right: 4%;"
+        >
+          <span class="base-label">{{ $t('menu.sourceTrainWindow') }}</span>
+          <div style="position: relative; top:-10px;">
+            <el-form-item :label="this.$t('menu.groupNumber')+this.$t('global.colon')" prop="trainNumberSource">
+              <el-input v-model="addModel.trainNumberSource" />
+            </el-form-item>
+            <el-form-item prop="stationStandSource">
+              <span slot="label">{{ $t('menu.station') + $t('global.colon') }}</span>
+              <el-select v-model="addModel.stationStandSource" filterable :placeholder="this.$t('global.choose')">
+                <el-option
+                  v-for="item in stationStandList"
+                  :key="item.code"
+                  :label="item.name"
+                  :value="item.code"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item :label="this.$t('menu.trainWindow')+this.$t('global.colon')" prop="trainSource">
+              <el-input v-model="addModel.trainSource" />
+            </el-form-item>
+          </div>
+        </div>
+        <div
+          style="width: 48%; float: left; padding: 10px 15px; border: 1px double lightgray; margin: 20px 0px; height: 177px;"
+        >
+          <span class="base-label">{{ $t('menu.targetTrainWindow') }}</span>
+          <div style="position: relative; top:-10px;">
+            <el-form-item :label="this.$t('menu.groupNumber')+this.$t('global.colon')" prop="trainNumberGoal">
+              <el-input v-model="addModel.trainNumberGoal" />
+            </el-form-item>
+            <el-form-item prop="stationStandGoal">
+              <span slot="label">{{ $t('menu.station') + $t('global.colon') }}</span>
+              <el-select v-model="addModel.stationStandGoal" filterable :placeholder="this.$t('global.choose')">
+                <el-option
+                  v-for="item in stationStandList"
+                  :key="item.code"
+                  :label="item.name"
+                  :value="item.code"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item :label="this.$t('menu.trainWindow')+this.$t('global.colon')" prop="trainGoal">
+              <el-input v-model="addModel.trainGoal" />
+            </el-form-item>
+          </div>
+        </div>
+      </div>
+    </el-form>
+    <el-row justify="center" class="button-group">
+      <el-col :span="10" :offset="2">
+        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">{{ $t('global.confirm') }}</el-button>
+      </el-col>
+      <el-col :span="8" :offset="4">
+        <el-button :id="domIdCancel" @click="cancel">{{ $t('global.cancel') }}</el-button>
+      </el-col>
+    </el-row>
+  </el-dialog>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
+
+export default {
+    name: 'TrainSwitch',
+    components: {
+    },
+    data() {
+        return {
+            trainNoList: [],
+            addModel: {
+                trainNumberSource: '',
+                trainSource: '',
+                stationStandSource: '',
+                trainGoal: '',
+                stationStandGoal: '',
+                trainNumberGoal: ''
+            },
+
+            rules: {
+                trainNumberSource: [
+                    { required: true, message: this.$t('rules.selectGroupNumber'), trigger: 'blur' }
+                ],
+                trainSource: [
+                    { required: true, message: this.$t('rules.enterTheTripNumber'), trigger: 'blur' }
+                ],
+                stationStandSource: [
+                    { required: true, message: this.$t('rules.selectStation'), trigger: 'change' }
+                ],
+                trainNumberGoal: [
+                    { required: true, message: this.$t('rules.selectGroupNumber'), trigger: 'blur' }
+                ],
+                trainGoal: [
+                    { required: true, message: this.$t('rules.enterTheTripNumber'), trigger: 'blur' }
+                ],
+                stationStandGoal: [
+                    { required: true, message: this.$t('rules.selectStation'), trigger: 'change' }
+                ]
+            },
+            dialogShow: false,
+            loading: false
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'stationStandList'
+        ]),
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
+        },
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+        },
+        domIdConfirm() {
+            return this.dialogShow ? OperationEvent.Train.moveTrainId.menu.domId : '';
+        },
+        title() {
+            return this.$t('menu.menuTrain.switchTrainId');
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(operate, selected) {
+            this.dialogShow = true;
+            this.$nextTick(function () {
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+            this.$store.dispatch('map/setTrainWindowShow', false);
+        },
+        commit() {
+            this.$refs['form'].validate((valid) => {
+                if (valid) {
+                    const operate = {
+                        send: true,
+                        
+                        operation: OperationEvent.Train.moveTrainId.menu.operation,
+                        cmdType: CMD.Train.CMD_MOVE_TRAIN_ID
+                    };
+
+                    this.loading = true;
+                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                        this.loading = false;
+                        if (valid) {
+                            this.doClose();
+                        }
+                    }).catch(() => {
+                        this.loading = false;
+                        this.doClose();
+                        // this.$refs.noticeInfo.doShow(operate);
+                    });
+                } else {
+                    return false;
+                }
+            });
+        },
+        cancel() {
+            const operate = {
+                
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
+
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => { this.doClose(); });
+        }
+    }
+};
+</script>
+<style scoped>
+    .fuzhou-01__systerm .el-dialog .base-label {
+        background: rgba(0, 0, 0, x);
+        position: relative;
+        left: -5px;
+        top: -18px;
+        padding: 0 5px;
+        background-color: #F0F0F0;
+    }
+</style>
diff --git a/src/jmapNew/theme/xian_01/menus/index.vue b/src/jmapNew/theme/xian_01/menus/index.vue
new file mode 100644
index 000000000..0dfd8757e
--- /dev/null
+++ b/src/jmapNew/theme/xian_01/menus/index.vue
@@ -0,0 +1,356 @@
+<template>
+  <div class="menus" :style="{width: width + 'px'}">
+    <menu-cancel ref="menuCancel" />
+    <template v-show="isShowAll">
+      <menu-bar v-show="isShowBar" ref="menuBar" :selected="selected" />
+      <menu-station-stand ref="menuStationStand" :selected="selected" />
+      <menu-switch ref="menuSwitch" :selected="selected" />
+      <menu-signal ref="menuSignal" :selected="selected" />
+      <menu-section ref="menuSection" :selected="selected" />
+      <menu-train ref="menuTrain" :selected="selected" />
+      <menu-station ref="menuStation" :selected="selected" />
+      <passive-alarm ref="passiveAlarm" />
+      <passive-contorl ref="passiveControl" />
+      <passive-Timeout ref="passiveTimeout" />
+    </template>
+  </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+import MenuCancel from './menuCancel';
+import MenuSignal from './menuSignal';
+import MenuStationStand from './menuStationStand';
+import MenuSwitch from './menuSwitch';
+import MenuSection from './menuSection';
+import MenuTrain from './menuTrain';
+import MenuStation from './menuStation';
+import MenuBar from './menuBar';
+import PassiveAlarm from './passiveDialog/alarm';
+import PassiveContorl from './passiveDialog/control';
+import PassiveTimeout from './passiveDialog/timeout';
+
+export default {
+    name: 'Menus',
+    components: {
+        MenuBar,
+        MenuCancel,
+        MenuSignal,
+        MenuSwitch,
+        MenuSection,
+        MenuStationStand,
+        MenuStation,
+        MenuTrain,
+        PassiveAlarm,
+        PassiveContorl,
+        PassiveTimeout
+    },
+    props: {
+        selected: {
+            type: Object,
+            default() {
+                return null;
+            }
+        }
+    },
+    computed: {
+        ...mapGetters('config', [
+            'width'
+        ]),
+        isShowAll() {
+            return this.$route.params.mode != 'dp' &&
+                    this.$route.params.mode != 'plan' &&
+                    this.$store.state.training.roles != 'BigScreen';
+        },
+        isShowBar() {
+            return this.$store.state.training.prdType;
+        }
+    },
+    watch: {
+        isShowBar(val) {
+            val && this.$store.dispatch('config/updateMenuBar');
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('config/updateMenuBar');
+        });
+    }
+};
+</script>
+
+<style>
+    .menus .pop-menu {
+        background: #F0F0F0;
+    }
+
+    .menus .pop-menu span {
+        color: #000;
+    }
+
+    .menus .pop-menu .is-disabled span {
+        color: #B4B3B8;
+    }
+
+    .fuzhou-01__systerm {
+        overflow: hidden !important;
+    }
+
+    .fuzhou-01__systerm .el-dialog {
+        background: rgba(100, 100, 100, 0.3);
+        border: 2px solid rgb(144, 144, 144, 0.8);
+        border-radius: 6px;
+        color: #000;
+        font-size: 14px;
+    }
+
+    .fuzhou-01__systerm .el-dialog .el-dialog__header {
+        padding: 5px;
+        height: 26px;
+    }
+
+    .fuzhou-01__systerm .el-dialog .el-dialog__footer {
+        background: #F0F0F0;
+        opacity: 1;
+    }
+
+    .fuzhou-01__systerm .el-dialog .el-dialog__body {
+        padding-top: 10px;
+        padding-bottom: 10px;
+        padding-left: 5px;
+        padding-right: 5px;
+        margin: 0px 5px 5px;
+        border: 2px solid rgba(120, 121, 123, 0.5);
+        box-shadow: 1px hsla(240, 0%, 100%, 0.5) inset;
+        background: #F0F0F0;
+        opacity: 1;
+    }
+
+    .fuzhou-01__systerm .el-dialog .el-dialog__title {
+        position: absolute;
+        top: 4px;
+        color: #000;
+        border-radius: 4px;
+        padding: 0px 2px;
+        height: 20px;
+        line-height: 20px
+    }
+
+    .fuzhou-01__systerm .el-dialog .el-dialog__title::before {
+        content: '';
+        position: absolute;
+        top: 0;
+        left: 0;
+        -webkit-filter: blur(10px);
+        filter: blur(10px);
+        height: 20px;
+        width: -webkit-fill-available;
+        background: rgba(128, 128, 128, 0.8);
+        z-index: -1;
+    }
+
+    .fuzhou-01__systerm .el-dialog .el-dialog__headerbtn {
+        background: linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
+        border: 1px solid #fff;
+        border-radius: 4px;
+        top: 4px;
+        right: 5px;
+        line-height: 16px;
+    }
+
+    .fuzhou-01__systerm .el-dialog .el-dialog__headerbtn .el-icon-close:before {
+        font-size: 16px;
+    }
+
+    .fuzhou-01__systerm .el-dialog .el-dialog__headerbtn .el-dialog__close {
+        color: #fff;
+    }
+
+    .fuzhou-01__systerm .el-dialog .el-button {
+        height: 32px;
+        line-height: 32px;
+        padding: 0px;
+        width: 80px;
+        border: 2px outset #E2E2E2;
+        border-radius: 0px !important;
+        color: #000;
+        background: #F0F0F0;
+    }
+
+    .fuzhou-01__systerm .el-dialog .el-button:focus span {
+        border: 1px dashed gray;
+    }
+
+    .fuzhou-01__systerm .el-dialog .el-button:active {
+        border: 2px inset #E2E2E2;
+    }
+
+    .fuzhou-01__systerm .el-dialog .el-button:disabled {
+        border: 2px inset #E2E2E2;
+    }
+
+    .fuzhou-01__systerm .el-dialog .el-button:disabled span {
+        border: 0px;
+    }
+
+    .fuzhou-01__systerm .el-dialog .el-input {
+        border: 2px inset #E9E9E9;
+    }
+
+    .fuzhou-01__systerm .el-dialog .el-input .el-input__inner {
+        color: #000;
+        background: #fff !important;
+        border: 0px;
+        border-radius: 0px !important;
+        box-sizing: border-box;
+    }
+
+    .fuzhou-01__systerm .el-dialog .el-input.is-disabled .el-input__inner {
+        background: #F0F0F0 !important;
+    }
+
+    .fuzhou-01__systerm .el-dialog .el-textarea {
+        border: 2px inset #E9E9E9;
+        border-radius: 0px;
+    }
+
+    .fuzhou-01__systerm .el-dialog .el-textarea .el-textarea__inner {
+        color: #000;
+        background: #fff !important;
+        border: 0px;
+        border-radius: 0px !important;
+        box-sizing: border-box;
+    }
+
+    .fuzhou-01__systerm .el-dialog .el-textarea.is-disabled .el-textarea__inner {
+        background: #F0F0F0 !important;
+    }
+
+    .fuzhou-01__systerm .el-dialog .el-table {
+        border: 2px inset #E9E9E9;
+        color: #000 !important;
+    }
+
+    .fuzhou-01__systerm .el-dialog .el-table .cell {
+        line-height: unset !important;
+    }
+
+    .fuzhou-01__systerm .el-dialog .el-table th.is-leaf {
+        background: #F0F0F0 !important;
+        border-right: 1px solid #BDBDBD !important;
+        border-bottom: 1px solid #BDBDBD !important;
+        color: #000 !important;
+        height: 20px !important;
+        padding: 0px;
+    }
+
+    .fuzhou-01__systerm .el-dialog .el-table tr td {
+        height: 20px !important;
+        padding: 0px;
+    }
+
+    .fuzhou-01__systerm .el-dialog .el-table .el-table__empty-text {
+        top: 15px !important;
+    }
+
+    .fuzhou-01__systerm .el-dialog .current-row>td {
+        background: #3399FF !important;
+        color: #fff !important;
+    }
+
+    .fuzhou-01__systerm .el-dialog .el-checkbox__inner {
+        border: 1px inset #dcdfe6 !important;
+    }
+
+    .fuzhou-01__systerm .el-dialog .el-checkbox__label {
+        color: #000 !important;
+    }
+
+    .fuzhou-01__systerm .el-dialog .el-checkbox.is-disabled .el-checkbox__inner {
+        background: #E6E6E6 !important;
+    }
+
+    .fuzhou-01__systerm .el-dialog .el-checkbox.is-disabled .el-checkbox__label {
+        color: #C5C9CC !important;
+    }
+
+    .fuzhou-01__systerm .el-dialog .el-checkbox__input.is-checked .el-checkbox__inner {
+        background: #fff !important;
+        border: 1px inset #dcdfe6 !important;
+    }
+
+    .fuzhou-01__systerm .el-dialog .el-checkbox__input.is-checked .el-checkbox__inner::after {
+        position: absolute;
+        -webkit-box-sizing: content-box;
+        box-sizing: content-box;
+        content: "";
+        border: 1px solid #000;
+        border-left: 0;
+        border-top: 0;
+        height: 7px;
+        left: 4px;
+        top: 1px;
+    }
+
+    .fuzhou-01__systerm .el-dialog .el-radio__inner {
+        border: 1px inset #dcdfe6 !important;
+    }
+
+    .fuzhou-01__systerm .el-dialog .el-radio__label {
+        color: #000 !important;
+    }
+
+    .fuzhou-01__systerm .el-dialog .el-radio__input.is-checked .el-radio__inner {
+        background: #fff !important;
+        border: 1px inset #dcdfe6 !important;
+    }
+
+    .fuzhou-01__systerm .el-dialog .el-radio__input.is-checked .el-radio__inner::after {
+        width: 4px;
+        height: 4px;
+        border-radius: 100%;
+        background-color: #000 !important;
+        position: absolute;
+        left: 50%;
+        top: 50%;
+    }
+
+    .fuzhou-01__systerm .el-dialog .el-radio.is-disabled .el-radio__inner {
+        background: #E6E6E6 !important;
+    }
+
+    .fuzhou-01__systerm .el-dialog .el-radio.is-disabled .el-radio__label {
+        color: #C5C9CC !important;
+    }
+
+    .fuzhou-01__systerm .el-dialog .base-label {
+        background: rgba(0, 0, 0, x);
+        position: relative;
+        left: -15px;
+        top: -18px;
+    }
+
+    .fuzhou-01__systerm .el-dialog .el-form-item label {
+        font-weight: normal !important;
+        color: #000 !important;
+    }
+
+    .fuzhou-01__systerm .el-dialog .context {
+        height: 100px;
+        border: 2px inset #E2E2E2;
+        overflow-y: scroll;
+    }
+
+    .fuzhou-01__systerm .el-dialog .table {
+        margin-top: 10px;
+    }
+
+    .fuzhou-01__systerm .el-dialog .notice {
+        margin-left: 62px;
+        line-height: 30px;
+    }
+
+    .fuzhou-01__systerm .el-dialog .button-group {
+        margin-top: 10px;
+    }
+</style>
diff --git a/src/jmapNew/theme/xian_01/menus/menuBar.vue b/src/jmapNew/theme/xian_01/menus/menuBar.vue
new file mode 100644
index 000000000..e59b47d55
--- /dev/null
+++ b/src/jmapNew/theme/xian_01/menus/menuBar.vue
@@ -0,0 +1,813 @@
+<template>
+  <div id="menuBar">
+    <div class="nav">
+      <template v-for="(item,i) in menu">
+        <template v-if="noShowingChildren(item.children)">
+          <li :id="item.operate.domId" :key="i" class="nav-li" @click="hookClick(item)">
+            <span class="nav-li-text">{{ item.title }}</span>
+          </li>
+        </template>
+        <template v-else>
+          <li :id="item.operate.domId" :key="i" class="nav-li" @click.stop="selectedClassA(item, i)">
+            <span class="nav-li-text">{{ item.title }}</span>
+            <ul class="nav-ul" :class="{'active' :i==classA}">
+              <template v-for="(child,j) in item.children">
+                <template v-if="child.children&&child.children.length>0&&hasShowingChildren(child.children)">
+                  <li
+                    :id="child.operate.domId"
+                    :key="j"
+                    class="menu-li"
+                    @click.stop="selectedClassB(child, j)"
+                  >
+                    <div class="menu-li-block">
+                      <span class="menu-li-text">
+                        <span class="status">&ensp;</span>
+                        <span class="label">{{ child.title }}</span>
+                      </span>
+                    </div>
+                    <ul class="menu-ul" :class="{'active' :j==classB}">
+                      <template v-for="(grandchild,k) in child.children">
+                        <li
+                          v-if="grandchild.show"
+                          :id="grandchild.operate.domId"
+                          :key="k"
+                          class="menu-li"
+                          @click.stop="hookClick(grandchild)"
+                        >
+                          <div class="menu-li-block">
+                            <span class="menu-li-text">
+                              <span class="status">&ensp;</span>
+                              <span class="label">{{ grandchild.title }}</span>
+                            </span>
+                          </div>
+                        </li>
+                      </template>
+                    </ul>
+                  </li>
+                </template>
+                <template v-else>
+                  <li
+                    v-if="child.show"
+                    :id="child.operate.domId"
+                    :key="j"
+                    class="menu-li"
+                    @click.stop="hookClick(child)"
+                  >
+                    <div class="menu-li-block">
+                      <span class="menu-li-text">
+                        <span class="status">&ensp;</span>
+                        <span class="label">{{ child.title }}</span>
+                      </span>
+                    </div>
+                  </li>
+                </template>
+              </template>
+            </ul>
+          </li>
+        </template>
+      </template>
+    </div>
+    <station-control-convert ref="stationControlConvert" />
+    <password-box ref="passwordBox" @setLoginResult="getLoginResult" />
+    <view-train-id ref="viewTrainId" />
+    <view-name ref="viewName" />
+    <view-device ref="viewDevice" />
+    <notice-info ref="noticeInfo" />
+    <train-add ref="trainAdd" />
+    <train-transtalet ref="trainTranstalet" />
+    <train-delete ref="trainDelete" />
+    <manage-user ref="manageUser" />
+    <help-about ref="helpAbout" />
+  </div>
+</template>
+<script>
+import { mapGetters } from 'vuex';
+import { TrainingMode } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler.js';
+import { State2SimulationMap } from '@/scripts/cmdPlugin/Config.js';
+import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
+import StationControlConvert from './menuDialog/stationControlConvert';
+import TrainAdd from './menuDialog/trainAdd';
+import TrainTranstalet from './menuDialog/trainTranstalet';
+import TrainDelete from './menuDialog/trainDelete';
+import PasswordBox from './menuDialog/passwordBox';
+import ViewTrainId from './menuDialog/viewTrainId';
+import ViewName from './menuDialog/viewName';
+import ViewDevice from './menuDialog/viewDevice';
+import ManageUser from './menuDialog/manageUser';
+import HelpAbout from './menuDialog/helpAbout';
+import NoticeInfo from './dialog/childDialog/childDialog/noticeInfo';
+import { EventBus } from '@/scripts/event-bus';
+
+export default {
+    name: 'MenuBar',
+    components: {
+        NoticeInfo,
+        StationControlConvert,
+        PasswordBox,
+        ViewTrainId,
+        ViewName,
+        ViewDevice,
+        TrainAdd,
+        TrainTranstalet,
+        TrainDelete,
+        ManageUser,
+        HelpAbout
+    },
+    props: {
+        selected: {
+            type: Object,
+            default() {
+                return null;
+            }
+        }
+    },
+    data() {
+        return {
+            classA: -1,
+            classB: -1,
+            tempClassA: -1,
+            tempClassB: -1,
+            valid: true,
+            menu: [],
+            menuNormal: {
+                Local: [
+                    {
+                        title: this.$t('menu.menuBar.system'),
+                        operate: OperationEvent.Command.mBar.system,
+                        click: this.undeveloped,
+                        children: [
+                        ]
+                    },
+                    {
+                        title: this.$t('menu.menuBar.view'),
+                        operate: OperationEvent.Command.mBar.check,
+                        click: this.undeveloped,
+                        children: [
+                        ]
+                    },
+                    {
+                        title: this.$t('menu.menuBar.refresh'),
+                        operate: OperationEvent.Command.mBar.fresh,
+                        click: this.refresh,
+                        children: [
+                        ]
+                    },
+                    {
+                        title: this.$t('menu.menuBar.display'),
+                        operate: OperationEvent.Command.mBar.view,
+                        children: [
+                            {
+                                title: this.$t('menu.menuBar.setTrainIdDisplay'),
+                                click: this.setTrainIdDisplay,
+                                operate: OperationEvent.Command.view.setTrainIdDisplay
+                            },
+                            {
+                                title: this.$t('menu.menuBar.setNameDisplay'),
+                                click: this.setNameDisplay,
+                                operate: OperationEvent.Command.view.setNameDisplay
+                            },
+                            {
+                                title: this.$t('menu.menuBar.setDeviceDisplay'),
+                                click: this.setDeviceDisplay,
+                                operate: OperationEvent.Command.view.setDeviceDisplay
+                            }
+                        ]
+                    },
+                    {
+                        title: this.$t('menu.menuBar.stationMapSwitch'),
+                        operate: '',
+                        click: this.undeveloped,
+                        children: [
+                        ]
+                    },
+                    {
+                        title: this.$t('menu.menuBar.controlModeSwitch'),
+                        operate: OperationEvent.Command.mBar.remoteControl,
+                        children: [
+                            {
+                                title: this.$t('menu.menuBar.toStationControl'),
+                                click: this.turnToStationControl,
+                                operate: OperationEvent.StationControl.requestStationControl.mbar
+                            },
+                            {
+                                title: this.$t('menu.menuBar.forcedStationControl'),
+                                click: this.mandatoryStationControl,
+                                operate: OperationEvent.StationControl.forcedStationControl.password
+                            },
+                            {
+                                title: this.$t('menu.menuBar.toCentralControl'),
+                                click: this.conterStationControl,
+                                operate: OperationEvent.StationControl.requestCentralControl.mbar,
+                                froce: true
+                            }
+                        ]
+                    },
+                    {
+                        title: this.$t('menu.menuBar.requestOperationArea'),
+                        operate: OperationEvent.Command.mBar.requestZone,
+                        click: this.undeveloped,
+                        children: [
+                        ]
+                    },
+                    {
+                        title: this.$t('menu.menuBar.historyQuery'),
+                        operate: OperationEvent.Command.mBar.historyQuery,
+                        click: this.undeveloped,
+                        children: [
+                        ]
+                    },
+                    {
+                        title: this.$t('menu.menuBar.userManage'),
+                        operate: OperationEvent.Command.mBar.userManage,
+                        children: [
+                            {
+                                title: this.$t('menu.menuBar.userManage'),
+                                click: this.userManage,
+                                operate: OperationEvent.Command.manage.userManage
+                            }
+                        ]
+                    },
+                    {
+                        title: this.$t('menu.menuBar.help'),
+                        operate: OperationEvent.Command.mBar.help,
+                        children: [
+                            {
+                                title: this.$t('menu.menuBar.about'),
+                                click: this.about,
+                                operate: OperationEvent.Command.help.about
+                            }
+                        ]
+                    }
+                ],
+                Center: [
+                    {
+                        title: this.$t('menu.menuBar.system'),
+                        operate: OperationEvent.Command.mBar.system,
+                        click: this.undeveloped,
+                        children: [
+                        ]
+                    },
+                    {
+                        title: this.$t('menu.menuBar.view'),
+                        operate: OperationEvent.Command.mBar.check,
+                        click: this.undeveloped,
+                        children: [
+                        ]
+                    },
+                    {
+                        title: this.$t('menu.menuBar.refresh'),
+                        operate: OperationEvent.Command.mBar.fresh,
+                        click: this.refresh,
+                        children: [
+                        ]
+                    },
+                    {
+                        title: this.$t('menu.menuBar.display'),
+                        operate: OperationEvent.Command.mBar.view,
+                        children: [
+                            {
+                                title: this.$t('menu.menuBar.setTrainIdDisplay'),
+                                click: this.setTrainIdDisplay,
+                                operate: OperationEvent.Command.view.setTrainIdDisplay
+                            },
+                            {
+                                title: this.$t('menu.menuBar.setNameDisplay'),
+                                click: this.setNameDisplay,
+                                operate: OperationEvent.Command.view.setNameDisplay
+                            },
+                            {
+                                title: this.$t('menu.menuBar.setDeviceDisplay'),
+                                click: this.setDeviceDisplay,
+                                operate: OperationEvent.Command.view.setDeviceDisplay
+                            }
+                        ]
+                    },
+                    {
+                        title: this.$t('menu.menuBar.stationMapSwitch'),
+                        operate: '',
+                        click: this.undeveloped,
+                        children: [
+                        ]
+                    },
+                    {
+                        title: this.$t('menu.menuBar.planCarOperation'),
+                        operate: OperationEvent.Command.mBar.planTrain,
+                        children: [
+                            {
+                                title: this.$t('menu.menuBar.addPlanCar'),
+                                click: this.addPlanTrain,
+                                operate: OperationEvent.Command.planTrain.addPlanTrain
+                            },
+                            {
+                                title: this.$t('menu.menuBar.panPlanCar'),
+                                click: this.translatPlanTrain,
+                                operate: OperationEvent.Command.planTrain.translatPlanTrain
+                            },
+                            {
+                                title: this.$t('menu.menuBar.deletePlanCar'),
+                                click: this.delPlanTrain,
+                                operate: OperationEvent.Command.planTrain.delPlanTrain
+                            }
+                        ]
+                    },
+                    {
+                        title: this.$t('menu.menuBar.trainNumberMaintenance'),
+                        operate: '',
+                        click: this.undeveloped,
+                        children: [
+                        ]
+                    },
+                    {
+                        title: this.$t('menu.menuBar.controlModeSwitch'),
+                        operate: OperationEvent.Command.mBar.remoteControl,
+                        children: [
+                            {
+                                title: this.$t('menu.menuBar.toStationControl'),
+                                click: this.turnToStationControl,
+                                operate: OperationEvent.StationControl.requestStationControl.mbar,
+                                froce: true
+                            },
+                            {
+                                title: this.$t('menu.menuBar.forcedStationControl'),
+                                click: this.mandatoryStationControl,
+                                operate: OperationEvent.StationControl.forcedStationControl.password,
+                                froce: true
+                            },
+                            {
+                                title: this.$t('menu.menuBar.toCentralControl'),
+                                click: this.conterStationControl,
+                                operate: OperationEvent.StationControl.requestCentralControl.mbar
+                            }
+                        ]
+                    },
+                    {
+                        title: this.$t('menu.menuBar.requestOperationArea'),
+                        operate: OperationEvent.Command.mBar.requestZone,
+                        click: this.undeveloped,
+                        children: [
+                        ]
+                    },
+                    {
+                        title: this.$t('menu.menuBar.schedulingLog'),
+                        operate: '',
+                        click: this.undeveloped,
+                        children: [
+                        ]
+                    },
+                    {
+                        title: this.$t('menu.menuBar.systemAnalysis'),
+                        operate: '',
+                        click: this.undeveloped,
+                        children: [
+                        ]
+                    },
+                    {
+                        title: this.$t('menu.menuBar.userManage'),
+                        operate: OperationEvent.Command.mBar.userManage,
+                        children: [
+                            {
+                                title: this.$t('menu.menuBar.userManage'),
+                                click: this.userManage,
+                                operate: OperationEvent.Command.manage.userManage
+                            }
+                        ]
+                    },
+                    {
+                        title: this.$t('menu.menuBar.historyQuery'),
+                        operate: OperationEvent.Command.mBar.historyQuery,
+                        click: this.undeveloped,
+                        children: [
+                        ]
+                    },
+                    {
+                        title: this.$t('menu.menuBar.help'),
+                        operate: OperationEvent.Command.mBar.help,
+                        children: [
+                            {
+                                title: this.$t('menu.menuBar.about'),
+                                click: this.about,
+                                operate: OperationEvent.Command.help.about
+                            }
+                        ]
+                    }
+                ]
+            }
+        };
+    },
+    computed: {
+        ...mapGetters('training', [
+            'mode',
+            'started',
+            'steps',
+            'order',
+            'mode'
+        ]),
+        ...mapGetters('map', [
+            'stationList'
+        ])
+    },
+    watch: {
+        tempClassA() {
+            this.classA = this.$store.state.menuOperation.break ? -1 : this.tempClassA;
+        },
+        tempClassB() {
+            this.classB = this.$store.state.menuOperation.break ? -1 : this.tempClassB;
+        },
+        '$store.state.menuOperation.break': function (val) {
+            if (val) {
+                this.classA = this.classB = -1;
+            } else {
+                this.classA = this.tempClassA;
+                this.classB = this.tempClassB;
+            }
+        },
+        '$store.state.training.operatemode': function (mode) {
+            this.initMenu();
+        },
+        '$store.state.training.started': function (val) {
+            this.closeMenu(true);
+        },
+        '$store.state.training.prdType': function () {
+            this.initMenu();
+        }
+    },
+    mounted() {
+        this.initMenu();
+    },
+    methods: {
+        initMenu(menu) {
+            this.menu = MenuContextHandler.menuBarConvert(this.menuNormal[State2SimulationMap[this.$store.state.training.prdType]], this.$store.state.training.operatemode);
+            this.clickEvent();
+            this.closeMenu(true);
+        },
+        clickEvent() {
+            const self = this;
+            window.onclick = function (e) {
+                if (document.getElementById('menuBar')) {
+                    self.closeMenu(false);
+                }
+            };
+        },
+        noShowingChildren(children) {
+            if (!children || children.length <= 0) {
+                return true;
+            }
+            return false;
+        },
+        hasShowingChildren(children) {
+            if (children && children.length > 0) {
+                return true;
+            }
+            return false;
+        },
+        closeMenu(flag) {
+            if (flag || (this.mode !== TrainingMode.EDIT && this.mode !== TrainingMode.TEACH)) {
+                this.classA = this.tempClassA = -1;
+                this.classB = this.tempClassB = -1;
+            }
+        },
+        hookClick(item, event) {
+            this.$store.dispatch('menuOperation/setPopMenu', { position: null, menu: null });
+            if (item && typeof item.click == 'function') {
+                item.click(item.operate);
+            }
+        },
+        selectedClassA(item, index) {
+            const order = this.order || 0;
+            if (this.mode !== TrainingMode.TEACH) { // 编辑模式下可显示
+                this.popupMenuA(item, index);
+            } else if (this.steps[order] && this.steps[order].type == 'bar') { // 操作步骤没有顶部操作顶部菜单都不可显示
+                this.popupMenuA(item, index);
+            }
+        },
+        // 弹出顶部菜单操作
+        popupMenuA(item, index) {
+            this.$store.dispatch('menuOperation/setPopMenu', { position: null, menu: null });
+            this.clickEvent();
+            const operate = {
+                operation: item.operate.operation
+            };
+            this.tempClassA = index;
+            this.tempClassB = -1;
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                }
+            });
+        },
+        selectedClassB(item, index) {
+            const order = this.order || 0;
+            if (this.mode !== TrainingMode.TEACH) { // 编辑模式下可显示
+                this.popupMenuB(item, index);
+            } else if (this.steps[order] && this.steps[order].type == 'bar') { // 操作步骤没有顶部操作顶部菜单都不可显示
+                this.popupMenuB(item, index);
+            }
+        },
+        popupMenuB(item, index) {
+            this.$store.dispatch('menuOperation/setPopMenu', { position: null, menu: null });
+            const operate = {
+                operation: item.operate.operation
+            };
+            this.tempClassB = index;
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                }
+            });
+        },
+        // 转为站控
+        turnToStationControl(order) {
+            const operate = {
+                operation: order.operation
+            };
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.closeMenu(true);
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.stationControlConvert.doShow(operate);
+                }
+            });
+        },
+        // 强制转为站控
+        mandatoryStationControl(order) {
+            const operate = {
+                operation: order.operation
+            };
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.closeMenu(true);
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.passwordBox.doShow(operate);
+                }
+            });
+        },
+        // 请求中控
+        conterStationControl(order) {
+            const operate = {
+                operation: order.operation
+            };
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.closeMenu(true);
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.stationControlConvert.doShow(operate);
+                }
+            });
+        },
+        // 设置列车识别号显示
+        setTrainIdDisplay(order) {
+            const operate = {
+                operation: order.operation
+            };
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.closeMenu(true);
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.viewTrainId.doShow(operate);
+                }
+            });
+        },
+        // 设置设备显示
+        setNameDisplay(order) {
+            const operate = {
+                operation: order.operation
+            };
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.closeMenu(true);
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.viewName.doShow(operate);
+                }
+            });
+        },
+        // 设置名称显示
+        setDeviceDisplay(order) {
+            const operate = {
+                operation: order.operation
+            };
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.closeMenu(true);
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.viewDevice.doShow(operate);
+                }
+            });
+        },
+        // 添加计划车
+        addPlanTrain(order) {
+            const operate = {
+                operation: order.operation
+            };
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.closeMenu(true);
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.trainAdd.doShow(operate);
+                }
+            });
+        },
+        // 平移计划车
+        translatPlanTrain(order) {
+            const operate = {
+                operation: order.operation
+            };
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.closeMenu(true);
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.trainTranstalet.doShow(operate);
+                }
+            });
+        },
+        // 删除计划车
+        delPlanTrain(order) {
+            const operate = {
+                operation: order.operation
+            };
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.closeMenu(true);
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.trainDelete.doShow(operate);
+                }
+            });
+        },
+        // 用户管理
+        userManage(order) {
+            const operate = {
+                operation: order.operation
+            };
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.closeMenu(true);
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.manageUser.doShow(operate);
+                }
+            });
+        },
+        // 关于
+        about(order) {
+            const operate = {
+                operation: order.operation
+            };
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.closeMenu(true);
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.helpAbout.doShow(operate);
+                }
+            });
+        },
+        // 刷新
+        refresh() {
+            this.closeMenu(true);
+            EventBus.$emit('refresh');
+        },
+        getLoginResult(operate) {
+            /** 密码校验*/
+            if (operate.operation == OperationEvent.StationControl.forcedStationControl.passwordConfirm.operation) {
+                if (operate.success) {
+                    /** 校验成功*/
+                    this.$refs.stationControlConvert.doShow({ operation: OperationEvent.StationControl.forcedStationControl.mbar.operation });
+                }
+            }
+        },
+        undeveloped() {
+            this.doClose();
+
+            this.$alert(this.$t('menu.menuBar.implemented'), this.$t('global.tips'), {
+                confirmButtonText: this.$t('global.confirm'),
+                callback: action => {
+                }
+            });
+        },
+        doClose() {
+            this.$nextTick(() => {
+                EventBus.$emit('closeMenu');
+            });
+        }
+    }
+};
+</script>
+
+<style scoped rel="stylesheet/scss" lang="scss">
+    @import "src/styles/mixin.scss";
+    $width: 30px;
+    $height: 30px;
+    $menuPadding: 10px;
+    $menuItemHeight: 30px;
+    $menuItemWidth: 190px;
+    $menuItemPadding: 5px;
+
+    #menuBar {
+        z-index: 10;
+        position: absolute;
+        width: inherit;
+        height: $height;
+        line-height: $height;
+    }
+
+    .nav {
+        display: block;
+        cursor: pointer;
+        color: #0000;
+        background: -webkit-linear-gradient(#FDFDFE, #DEE3F3);
+        background: -o-linear-gradient(#FDFDFE, #DEE3F3);
+        background: -moz-linear-gradient(#FDFDFE, #DEE3F3);
+        background: linear-gradient(#FDFDFE, #DEE3F3);
+        border: 1px solid #B6BCCC !important;
+        border-bottom: 2px solid #B6BCCC !important;
+        list-style: none;
+    }
+
+    .nav-li {
+        position: relative;
+        display: inline-block;
+        padding-left: $menuPadding;
+        padding-right: $menuPadding;
+    }
+
+    .nav-li:active {
+        background: #C9D0E1;
+        border-radius: 4px;
+    }
+
+    .nav-li-text {
+        font-size: 13px;
+        color: #000;
+        text-align: center;
+        text-decoration: none;
+    }
+
+    .nav-ul {
+        display: none;
+        position: absolute;
+        list-style: none;
+        border: 1px solid gray !important;
+        line-height: $menuItemHeight;
+        width: $menuItemWidth;
+        padding: 0px;
+        margin: 0px;
+    }
+
+    .menu-ul {
+        display: none;
+        list-style: none;
+        background: #F0F0F0;
+        line-height: $menuItemHeight;
+        width: $menuItemWidth;
+        bottom: $menuItemHeight;
+    }
+
+    .active {
+        position: absolute;
+        display: block !important;
+    }
+
+    .menu-ul-text {
+        font-size: 14px;
+        color: #000;
+        letter-spacing: 0;
+        height: $menuItemHeight;
+        line-height: $menuItemHeight;
+    }
+
+    .menu-li {
+        text-align: left;
+        background: #F0F0F0;
+        height: $menuItemHeight;
+        line-height: $menuItemHeight;
+    }
+
+    .menu-li-block {
+        display: flex;
+        letter-spacing: 0;
+        height: $menuItemHeight;
+        line-height: $menuItemHeight;
+    }
+
+    .menu-li-text {
+        font-size: 14px;
+        color: #000;
+    }
+
+    .menu-li-text .status {
+        display: block;
+		float: left;
+        border-right: 1px inset #CACACA;
+        width: $width;
+    }
+
+    .menu-li-text .label {
+        display: block;
+		float: left;
+    }
+
+    .menu-li-block:hover {
+        background: #C9DEF7;
+        box-sizing: border-box;
+        -moz-box-sizing: border-box;
+        -webkit-box-sizing: border-box;
+    }
+</style>
diff --git a/src/jmapNew/theme/xian_01/menus/menuCancel.vue b/src/jmapNew/theme/xian_01/menus/menuCancel.vue
new file mode 100644
index 000000000..c977cd799
--- /dev/null
+++ b/src/jmapNew/theme/xian_01/menus/menuCancel.vue
@@ -0,0 +1,130 @@
+<template>
+  <div>
+    <pop-menu ref="popMenu" :menu="menu" />
+  </div>
+</template>
+
+<script>
+import PopMenu from '@/components/PopMenu';
+import { Notification } from 'element-ui';
+import { mapGetters } from 'vuex';
+import { DeviceMenu } from '@/scripts/ConstDic';
+import { exitFullscreen } from '@/utils/screen';
+
+export default {
+    name: 'CancelMenu',
+    components: {
+        PopMenu
+    },
+    data() {
+        return {
+            menu: [],
+            menuNormal: [],
+            menuScreen: [
+                {
+                    label: this.$t('menu.menuCancle.zoomIn'),
+                    handler: this.magnifyMap,
+                    disabled: false
+                },
+                {
+                    label: this.$t('menu.menuCancle.zoomOut'),
+                    handler: this.shrinkMap,
+                    disabled: false
+                },
+                {
+                    label: this.$t('menu.menuCancle.back'),
+                    handler: this.back,
+                    disabled: false
+                }
+            ]
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'stationList'
+        ])
+    },
+    watch: {
+        '$store.state.menuOperation.menuCount': function (val) {
+            if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.Cancel)) {
+                this.doShow(this.$store.state.menuOperation.menuPosition);
+            } else {
+                this.doClose();
+            }
+        }
+    },
+    methods: {
+        clickEvent() {
+            const self = this;
+            window.onclick = function (e) {
+                self.doClose();
+            };
+        },
+        initMenu() {
+            this.menuNormal = [];
+            this.stationList.forEach(station => {
+                if (station.code === station.concentrateStationCode) {
+                    const node = {
+                        label: station.name,
+                        children: []
+                    };
+
+                    this.stationList.forEach(elem => {
+                        if (elem.visible) {
+                            let next = elem;
+                            while (next.code != next.concentrateStationCode || !next.concentrateStationCode) {
+                                next = this.$store.getters['map/getDeviceByCode'](next.concentrateStationCode);
+                            }
+
+                            if (station.code == next.code) {
+                                node.children.push({
+                                    code: elem.code,
+                                    label: elem.name,
+                                    handler: this.mapLocation
+                                });
+                            }
+                        }
+                    });
+
+                    this.menuNormal.push(node);
+                }
+            });
+
+            this.menu = [...this.menuNormal];
+        },
+        doShow(point) {
+            this.clickEvent();
+            this.initMenu();
+            if (this.$refs && this.$refs.popMenu && this.menu && this.menu.length) {
+                this.$refs.popMenu.resetShowPosition(point);
+            }
+        },
+        doClose() {
+            if (this.$refs && this.$refs.popMenu) {
+                this.$refs.popMenu.close();
+            }
+        },
+        // 设置地图定位
+        mapLocation(item) {
+            if (item) {
+                this.$store.dispatch('training/updateOffsetStationCode', { offsetStationCode: item.code });
+                this.doClose();
+            }
+        },
+        // 放大地图
+        magnifyMap() {
+            this.$store.dispatch('menuOperation/handleMagnifyCount');
+        },
+        // 缩小地图
+        shrinkMap() {
+            this.$store.dispatch('menuOperation/handleShrinkCount');
+        },
+        // 返回
+        async back() {
+            history.go(-1);
+            Notification.closeAll();
+            exitFullscreen();
+        }
+    }
+};
+</script>
diff --git a/src/jmapNew/theme/xian_01/menus/menuDialog/childDialog/twoConfirmation.vue b/src/jmapNew/theme/xian_01/menus/menuDialog/childDialog/twoConfirmation.vue
new file mode 100644
index 000000000..309fb8c00
--- /dev/null
+++ b/src/jmapNew/theme/xian_01/menus/menuDialog/childDialog/twoConfirmation.vue
@@ -0,0 +1,142 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    class="fuzhou-01__systerm two-confirmation"
+    :title="$t('menu.menuChildDialog.secondaryConfirmation')"
+    :visible.sync="show"
+    width="360px"
+    :before-close="doClose"
+    :show-close="false"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+    append-to-body
+  >
+    <div class="context">
+      <template v-for="(message,index) in messages">
+        <span :key="index">{{ message }}</span>
+      </template>
+    </div>
+    <el-row class="button-group">
+      <el-col :span="10" :offset="3">
+        <el-button :id="show? domIdConfirm: ''" :loading="loading" @click="commit">{{ $t('menu.menuChildDialog.confirm') }}</el-button>
+      </el-col>
+      <el-col :span="6" :offset="4">
+        <el-button :id="domIdCancel" @click="cancel">{{ $t('menu.menuChildDialog.close') }}</el-button>
+      </el-col>
+    </el-row>
+    <notice-info ref="noticeInfo" />
+  </el-dialog>
+</template>
+
+<script>
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
+import NoticeInfo from '../../dialog/childDialog/childDialog/noticeInfo';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
+
+export default {
+    name: 'TwoConfirmation',
+    components: {
+        NoticeInfo
+    },
+    data() {
+        return {
+            dialogShow: false,
+            loading: false,
+            operate: '',
+            timer: null,
+            domIdConfirm: ''
+        };
+    },
+    computed: {
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
+        },
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.close.confirm.domId : '';
+        },
+        messages() {
+            if (this.operate) {
+                return this.operate.messages;
+            }
+            return [];
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(operate) {
+            this.domIdConfirm = '';
+            if (OperationHandler.checkOperationIsCurrentOperate(operate.operation, OperationEvent.StationControl.forcedStationControl)) {
+                this.domIdConfirm = OperationEvent.StationControl.forcedStationControl.confirm.domId;
+            } else if (OperationHandler.checkOperationIsCurrentOperate(operate.operation, OperationEvent.StationControl.requestStationControl)) {
+                this.domIdConfirm = OperationEvent.StationControl.requestStationControl.confirm.domId;
+            } else if (OperationHandler.checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.requestCentralControl)) {
+                this.domIdConfirm = OperationEvent.StationControl.requestCentralControl.confirm.domId;
+            }
+
+            this.operate = operate || {};
+            this.dialogShow = true;
+            this.$nextTick(function () {
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
+        doClose() {
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+        },
+        cancel() {
+            const operate = {
+                operation: OperationEvent.Command.close.confirm.operation
+            };
+
+            this.$emit('setOperate', { selection: this.operate.selection, cancel: true });
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.doClose();
+                }
+            });
+        },
+        commit() {
+            if (this.operate) {
+                this.loading = true;
+                (this.operate.selection || []).forEach(elem => {
+                    const operate = {
+                        val: elem.code,
+                        param: {
+                            ControlMode_Code: elem.code
+                        }
+                    };
+
+                    if (OperationHandler.checkOperationIsCurrentOperate(this.operate.operation, OperationEvent.StationControl.forcedStationControl)) {
+                        operate.operation = OperationEvent.StationControl.forcedStationControl.confirm.operation;
+                        operate.cmdType = CMD.ControlConvertMenu.CMD_CM_FORCE_STATION_CONTROL;
+                    } else if (OperationHandler.checkOperationIsCurrentOperate(this.operate.operation, OperationEvent.StationControl.requestStationControl)) {
+                        operate.operation = OperationEvent.StationControl.requestStationControl.confirm.operation;
+                        operate.cmdType = CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_STATION_CONTROL;
+                    } else if (OperationHandler.checkOperationIsCurrentOperate(this.operate.operation, OperationEvent.StationControl.requestCentralControl)) {
+                        operate.operation = OperationEvent.StationControl.requestCentralControl.confirm.operation;
+                        operate.cmdType = CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_CENTER_CONTROL;
+                    }
+
+                    this.doClose();
+                    this.$emit('setOperate', { selection: this.operate.selection, commit: true });
+                    this.$store.dispatch('training/next', operate).then(({ valid, response }) => {
+                        if (valid) {
+                            this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                        }
+                    }).catch(() => {
+                        this.$refs.noticeInfo.doShow(operate);
+                    });
+                });
+                this.loading = false;
+            }
+        }
+    }
+};
+</script>
diff --git a/src/jmapNew/theme/xian_01/menus/menuDialog/childDialog/userAdd.vue b/src/jmapNew/theme/xian_01/menus/menuDialog/childDialog/userAdd.vue
new file mode 100644
index 000000000..d2467898d
--- /dev/null
+++ b/src/jmapNew/theme/xian_01/menus/menuDialog/childDialog/userAdd.vue
@@ -0,0 +1,172 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    class="fuzhou-01__systerm user-add"
+    :title="title"
+    :visible.sync="show"
+    width="420px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+    append-to-body
+  >
+    <div style="padding: 15px 40px; border: 1px double lightgray; margin: 20px 10px; ">
+      <el-form ref="form" size="small" label-width="90px" :model="model" label-position="left" :rules="rules">
+        <el-form-item :label="$t('menu.menuChildDialog.jobNumber')" prop="jobNumber">
+          <el-input v-model="model.jobNumber" />
+        </el-form-item>
+        <el-form-item :label="$t('menu.menuChildDialog.userName')" prop="userName">
+          <el-input v-model="model.userName" />
+        </el-form-item>
+        <el-form-item :label="$t('menu.menuChildDialog.password')" prop="password">
+          <el-input v-model="model.password" type="password" />
+        </el-form-item>
+        <el-form-item :label="$t('menu.menuChildDialog.confirmPassword')" prop="confirm">
+          <el-input v-model="model.confirm" type="password" />
+        </el-form-item>
+
+      </el-form>
+    </div>
+    <el-row justify="center" class="button-group">
+      <el-col :span="8" :offset="6">
+        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">{{ $t('menu.menuChildDialog.determine') }}</el-button>
+      </el-col>
+      <el-col :span="8" :offset="0">
+        <el-button :id="domIdCancel" @click="cancel">{{ $t('menu.menuChildDialog.cancel') }}</el-button>
+      </el-col>
+    </el-row>
+  </el-dialog>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+
+export default {
+    name: 'UserAdd',
+    components: {
+    },
+    data() {
+        return {
+            operate: {},
+            operation: null,
+            dialogShow: false,
+            loading: false,
+            model: {
+                type: 'ADD',
+                jobNumber: '',
+                userName: '',
+                password: '',
+                confirm: ''
+            },
+            rules: {
+                jobNumber: [
+                    { required: true, message: this.$t('menu.menuChildDialog.inputJobNumber'), trigger: 'blur' }
+                ],
+                userName: [
+                    { required: true, message: this.$t('menu.menuChildDialog.inputUserName'), trigger: 'blur' }
+                ],
+                password: [
+                    { required: true, message: this.$t('menu.menuChildDialog.inputPassword'), trigger: 'change' }
+                ],
+                confirm: [
+                    { required: true, message: this.$t('menu.menuChildDialog.inputPasswordAgain'), trigger: 'change' }
+                ]
+            }
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'stationStandList'
+        ]),
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
+        },
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+        },
+        domIdConfirm() {
+            return this.dialogShow ? OperationEvent.Command.close.confirm.domId : '';
+        },
+        title() {
+            return this.$t('menu.menuChildDialog.addUser');
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(operate) {
+            // 非断电激活时设置初始值
+            if (!this.dialogShow) {
+                this.loading = false;
+                this.operate = operate || {};
+                this.operation = operate.operation;
+                this.$nextTick(() => {
+                    this.$refs.form.resetFields();
+                });
+            }
+
+            this.dialogShow = true;
+            this.$nextTick(function () {
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+        },
+        commit() {
+            this.$refs['form'].validate((valid) => {
+                if (valid) {
+                    const operate = {
+                        type: this.operate.type,
+                        operation: OperationEvent.Command.close.confirm.operation
+                    };
+
+                    this.loading = true;
+                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                        this.loading = false;
+                        if (valid) {
+                            if (this.model.password === this.model.confirm) {
+                                this.doClose();
+                                this.$emit('operateUser', this.model);
+                            } else {
+                                this.$messageBox(this.$t('menu.menuChildDialog.passwordInconsistent'));
+                            }
+                        }
+                    });
+                } else {
+                    return false;
+                }
+            });
+        },
+        cancel() {
+            const operate = {
+                type: this.operate.type,
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
+
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => { this.doClose(); this.model; });
+        }
+    }
+};
+</script>
+<style scoped>
+    .fuzhou-01__systerm .el-dialog .base-label {
+        background: rgba(0, 0, 0, x);
+        position: relative;
+        left: -5px;
+        top: -10px;
+        padding: 0 5px;
+        background-color: #F0F0F0;
+    }
+</style>
diff --git a/src/jmapNew/theme/xian_01/menus/menuDialog/childDialog/userDelete.vue b/src/jmapNew/theme/xian_01/menus/menuDialog/childDialog/userDelete.vue
new file mode 100644
index 000000000..f0fb7cdc1
--- /dev/null
+++ b/src/jmapNew/theme/xian_01/menus/menuDialog/childDialog/userDelete.vue
@@ -0,0 +1,143 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    class="fuzhou-01__systerm user-delete"
+    :title="title"
+    :visible.sync="show"
+    width="260px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+    append-to-body
+  >
+    <div style="padding-left: 10px; padding-bottom: 10px">
+      <i class="el-icon-info" />
+      <template v-for="(message,index) in messages">
+        <span :key="index">{{ message }}</span>
+      </template>
+    </div>
+    <el-row justify="center" class="button-group">
+      <el-col :span="8" :offset="3">
+        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">{{ $t('menu.menuChildDialog.determine') }}</el-button>
+      </el-col>
+      <el-col :span="8" :offset="2">
+        <el-button :id="domIdCancel" @click="cancel">{{ $t('menu.menuChildDialog.cancel') }}</el-button>
+      </el-col>
+    </el-row>
+  </el-dialog>
+</template>
+<script>
+import { mapGetters } from 'vuex';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+
+export default {
+    name: 'UserDelete',
+    components: {
+    },
+    data() {
+        return {
+            operate: {},
+            messages: [],
+            model: {
+                type: 'DELETE',
+                jobNumber: '',
+                userName: ''
+            },
+            operation: null,
+            dialogShow: false,
+            loading: false
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'stationStandList'
+        ]),
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
+        },
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+        },
+        domIdConfirm() {
+            return this.dialogShow ? OperationEvent.Command.close.confirm.domId : '';
+        },
+        title() {
+            return this.$t('menu.menuChildDialog.deleteUser');
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(operate, selected) {
+            // 非断电激活时设置初始值
+            if (!this.dialogShow) {
+                this.loading = false;
+                this.operate = operate || {};
+                this.operation = operate.operation;
+                this.messages = operate.messages;
+                this.model.userName = '';
+                this.model.jobNumber = '';
+                if (selected) {
+                    this.model.userName = selected.userName;
+                    this.model.jobNumber = selected.jobNumber;
+                }
+            }
+
+            this.dialogShow = true;
+            this.$nextTick(function () {
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+        },
+        commit() {
+            if (this.model.userName && this.model.jobNumber) {
+                const operate = {
+                    type: this.operate.type,
+                    operation: OperationEvent.Command.close.confirm.operation
+                };
+
+                this.loading = true;
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.loading = false;
+                    if (valid) {
+                        this.doClose();
+                        this.$emit('operateUser', this.model);
+                    }
+                });
+            } else {
+                this.$messageBox(this.$t('menu.menuChildDialog.selectTips'));
+            }
+        },
+        cancel() {
+            const operate = {
+                type: this.operate.type,
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
+
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => { this.doClose(); });
+        }
+    }
+};
+</script>
+<style scoped>
+    .fuzhou-01__systerm .el-dialog .base-label {
+        background: rgba(0, 0, 0, x);
+        position: relative;
+        left: -5px;
+        top: -10px;
+        padding: 0 5px;
+        background-color: #F0F0F0;
+    }
+</style>
diff --git a/src/jmapNew/theme/xian_01/menus/menuDialog/childDialog/userEdit.vue b/src/jmapNew/theme/xian_01/menus/menuDialog/childDialog/userEdit.vue
new file mode 100644
index 000000000..a39351cd4
--- /dev/null
+++ b/src/jmapNew/theme/xian_01/menus/menuDialog/childDialog/userEdit.vue
@@ -0,0 +1,189 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    class="fuzhou-01__systerm user-edit"
+    :title="title"
+    :visible.sync="show"
+    width="420px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+    append-to-body
+  >
+    <div style="padding: 15px 40px; border: 1px double lightgray; margin: 20px 10px; ">
+      <el-form ref="form" size="small" label-width="90px" :model="model" label-position="left" :rules="rules">
+        <el-form-item :label="$t('menu.menuChildDialog.jobNumber')" prop="jobNumber">
+          <el-input v-model="model.jobNumber" disabled />
+        </el-form-item>
+        <el-form-item :label="$t('menu.menuChildDialog.userName')" prop="userName">
+          <el-input v-model="model.userName" disabled />
+        </el-form-item>
+        <el-form-item :label="$t('menu.menuChildDialog.originalPassword')" prop="oldPassword">
+          <el-input v-model="model.oldPassword" type="password" />
+        </el-form-item>
+        <el-form-item :label="$t('menu.menuChildDialog.password')" prop="password">
+          <el-input v-model="model.password" type="password" />
+        </el-form-item>
+        <el-form-item :label="$t('menu.menuChildDialog.confirmPassword')" prop="confirm">
+          <el-input v-model="model.confirm" type="password" />
+        </el-form-item>
+
+      </el-form>
+    </div>
+    <el-row justify="center" class="button-group">
+      <el-col :span="8" :offset="6">
+        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">{{ $t('menu.menuChildDialog.determine') }}</el-button>
+      </el-col>
+      <el-col :span="8" :offset="0">
+        <el-button :id="domIdCancel" @click="cancel">{{ $t('menu.menuChildDialog.cancel') }}</el-button>
+      </el-col>
+    </el-row>
+  </el-dialog>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+
+export default {
+    name: 'UserEdit',
+    components: {
+    },
+    data() {
+        return {
+            operate: {},
+            selected: {},
+            operation: null,
+            dialogShow: false,
+            loading: false,
+            model: {
+                type: 'EDIT',
+                jobNumber: '',
+                userName: '',
+                oldPassword: '',
+                password: '',
+                confirm: ''
+            },
+            rules: {
+                jobNumber: [
+                    { required: true, message: this.$t('menu.menuChildDialog.inputJobNumber'), trigger: 'blur' }
+                ],
+                userName: [
+                    { required: true, message: this.$t('menu.menuChildDialog.inputUserName'), trigger: 'blur' }
+                ],
+                oldPassword: [
+                    { required: true, message: this.$t('menu.menuChildDialog.inputOriginal'), trigger: 'change' }
+                ],
+                password: [
+                    { required: true, message: this.$t('menu.menuChildDialog.inputNewPassword'), trigger: 'change' }
+                ],
+                confirm: [
+                    { required: true, message: this.$t('menu.menuChildDialog.inputNewAgain'), trigger: 'change' }
+                ]
+            }
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'stationStandList'
+        ]),
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
+        },
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+        },
+        domIdConfirm() {
+            return this.dialogShow ? OperationEvent.Command.close.confirm.domId : '';
+        },
+        title() {
+            return this.$t('menu.menuChildDialog.userEditPage');
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(operate, selected) {
+            // 非断电激活时设置初始值
+            if (!this.dialogShow) {
+                this.loading = false;
+                this.operate = operate || {};
+                this.operation = operate.operation;
+                this.$nextTick(() => {
+                    this.$refs.form.resetFields();
+                    this.selected = selected;
+                    if (selected) {
+                        this.model.jobNumber = selected.jobNumber;
+                        this.model.userName = selected.userName;
+                    }
+                });
+            }
+
+            this.dialogShow = true;
+            this.$nextTick(function () {
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+        },
+        commit() {
+            this.$refs['form'].validate((valid) => {
+                if (valid) {
+                    const operate = {
+                        type: this.operate.type,
+                        operation: OperationEvent.Command.close.confirm.operation
+                    };
+
+                    this.loading = true;
+                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                        this.loading = false;
+                        if (valid) {
+                            if (this.selected.password !== this.model.oldPassword) {
+                                this.$messageBox(this.$t('menu.menuChildDialog.originalPasswordError'));
+                            } else if (this.model.password !== this.model.confirm) {
+                                this.$messageBox(this.$t('menu.menuChildDialog.passwordError'));
+                            } else if (this.model.oldPassword === this.model.password) {
+                                this.$messageBox(this.$t('menu.menuChildDialog.passwordSame'));
+                            } else {
+                                this.doClose();
+                                this.$emit('operateUser', this.model);
+                            }
+                        }
+                    });
+                } else {
+                    return false;
+                }
+            });
+        },
+        cancel() {
+            const operate = {
+                type: this.operate.type,
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
+
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => { this.doClose(); });
+        }
+    }
+};
+</script>
+<style scoped>
+    .fuzhou-01__systerm .el-dialog .base-label {
+        background: rgba(0, 0, 0, x);
+        position: relative;
+        left: -5px;
+        top: -10px;
+        padding: 0 5px;
+        background-color: #F0F0F0;
+    }
+</style>
diff --git a/src/jmapNew/theme/xian_01/menus/menuDialog/helpAbout.vue b/src/jmapNew/theme/xian_01/menus/menuDialog/helpAbout.vue
new file mode 100644
index 000000000..688174504
--- /dev/null
+++ b/src/jmapNew/theme/xian_01/menus/menuDialog/helpAbout.vue
@@ -0,0 +1,140 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    class="fuzhou-01__systerm manage-user"
+    :title="title"
+    :visible.sync="show"
+    width="600px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <div style="height: 70px;">
+      <div style="position: relative; left: 10px;" />
+      <div style="position: relative; left: 80px;">
+        <div style="width:100%">
+          <span style="padding-left: 60px">{{ $t('menu.menuDialog.versionName') }}</span>
+          <el-button
+            :id="domIdConfirm"
+            style="position: absolute; right: 95px;"
+            type="primary"
+            :loading="loading"
+            @click="commit"
+          >{{ $t('menu.menuDialog.confirm') }}</el-button>
+        </div>
+        <div style="width:100%; padding-top: 20px">
+          <span> {{ $t('menu.menuDialog.copyright') }}</span>
+        </div>
+      </div>
+    </div>
+    <div style="padding: 10px;  margin: 5px; ">
+      <el-table :data="tableData" style="width: 100%;" height="400">
+        <el-table-column prop="moduleName" :label="$t('menu.menuDialog.moduleName')" width="180" />
+        <el-table-column prop="version" :label="$t('menu.menuDialog.version')" width="180" />
+        <el-table-column prop="updateDate" :label="$t('menu.menuDialog.modifyDate')" />
+      </el-table>
+    </div>
+  </el-dialog>
+</template>
+<script>
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+
+export default {
+    name: 'ManageUser',
+    data() {
+        return {
+            tableData: [
+                {
+                    moduleName: this.$t('menu.menuDialog.mainProgramVersion'),
+                    version: '123',
+                    updateDate: '123'
+                }
+            ],
+            operate: {},
+            operation: null,
+            dialogShow: false,
+            loading: false,
+            selected: null
+        };
+    },
+    computed: {
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
+        },
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+        },
+        domIdConfirm() {
+            return this.dialogShow ? OperationEvent.Command.close.menu.domId : '';
+        },
+        title() {
+            return this.$t('menu.menuDialog.about');
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(operate) {
+            // 非断电激活时设置初始值
+            if (!this.dialogShow) {
+                this.loading = false;
+                this.operate = operate || {};
+                this.operation = operate.operation;
+            }
+
+            this.dialogShow = true;
+            this.$nextTick(function () {
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+        },
+        commit() {
+            const operate = {
+                type: this.operate.type,
+                operation: OperationEvent.Command.close.menu.operation
+            };
+
+            this.loading = true;
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.loading = false;
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => {
+                this.loading = false;
+                this.doClose();
+            });
+        },
+        cancel() {
+            const operate = {
+                type: this.operate.type,
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
+
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => { this.doClose(); });
+        }
+    }
+};
+</script>
+<style scoped>
+    .fuzhou-01__systerm .el-dialog .base-label {
+        background: rgba(0, 0, 0, x);
+        position: relative;
+        left: -5px;
+        top: -10px;
+        padding: 0 5px;
+        background-color: #F0F0F0;
+    }
+</style>
diff --git a/src/jmapNew/theme/xian_01/menus/menuDialog/manageUser.vue b/src/jmapNew/theme/xian_01/menus/menuDialog/manageUser.vue
new file mode 100644
index 000000000..996630adf
--- /dev/null
+++ b/src/jmapNew/theme/xian_01/menus/menuDialog/manageUser.vue
@@ -0,0 +1,309 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    class="fuzhou-01__systerm manage-user"
+    :title="title"
+    :visible.sync="show"
+    width="420px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <div style="padding: 5px 5px; border: 1px double lightgray; margin: 20px 0px; ">
+      <span class="base-label">{{ $t('menu.menuDialog.userList') }}</span>
+      <el-row>
+        <el-col :span="18">
+          <el-table
+            ref="multipleTable"
+            :data="tableData"
+            border
+            row-key="code"
+            style="width: 100%"
+            height="450"
+            center
+            size="mini"
+            highlight-current-row
+            @row-click="chooseUser"
+          >
+            <el-table-column prop="jobNumber" :label="$t('menu.menuDialog.jobNumber')" width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.jobNumber }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="userName" :label="$t('menu.menuDialog.userName')">
+              <template slot-scope="scope">
+                <span>{{ scope.row.userName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column width="20" />
+          </el-table>
+        </el-col>
+        <el-col :span="4">
+          <el-button :id="domIdFreshUser" style="margin-top: 140px; margin-left: 10px;" @click="freshUser">{{ $t('menu.menuDialog.refresh') }}
+          </el-button>
+          <el-button :id="domIdAddUser" style="margin-top: 30px; margin-left: 10px;" @click="addUser">{{ $t('menu.menuDialog.add') }}
+          </el-button>
+          <el-button :id="domIdEditUser" style="margin-top: 30px; margin-left: 10px;" @click="editUser">{{ $t('menu.menuDialog.modify') }}
+          </el-button>
+          <el-button :id="domIdDelUser" style="margin-top: 30px; margin-left: 10px;" @click="delUser">{{ $t('menu.menuDialog.delete') }}
+          </el-button>
+        </el-col>
+      </el-row>
+    </div>
+    <el-row justify="center" class="button-group">
+      <el-col :span="8" :offset="6">
+        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">{{ $t('menu.menuDialog.confirm') }}</el-button>
+      </el-col>
+      <el-col :span="8" :offset="0">
+        <el-button :id="domIdCancel" @click="cancel">{{ $t('menu.menuDialog.cancel') }}</el-button>
+      </el-col>
+    </el-row>
+    <user-add ref="userAdd" @operateUser="operateUser" />
+    <user-edit ref="userEdit" @operateUser="operateUser" />
+    <user-delete ref="userDelete" @operateUser="operateUser" />
+  </el-dialog>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+import UserAdd from './childDialog/userAdd';
+import UserEdit from './childDialog/userEdit';
+import UserDelete from './childDialog/userDelete';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+
+export default {
+    name: 'ManageUser',
+    components: {
+        UserAdd,
+        UserEdit,
+        UserDelete
+    },
+    data() {
+        return {
+            tableData: [],
+            operate: {},
+            operation: null,
+            dialogShow: false,
+            loading: false,
+            selected: null
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'stationStandList'
+        ]),
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
+        },
+        domIdAddUser() {
+            return this.dialogShow ? OperationEvent.Command.manage.addUser.domId : '';
+        },
+        domIdEditUser() {
+            return this.dialogShow ? OperationEvent.Command.manage.editUser.domId : '';
+        },
+        domIdDelUser() {
+            return this.dialogShow ? OperationEvent.Command.manage.delUser.domId : '';
+        },
+        domIdFreshUser() {
+            return this.dialogShow ? OperationEvent.Command.manage.freshUser.domId : '';
+        },
+        domIdChooseUser() {
+            return this.dialogShow ? OperationEvent.Command.manage.chooseUser.domId : '';
+        },
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+        },
+        domIdConfirm() {
+            return this.dialogShow ? OperationEvent.Command.close.menu.domId : '';
+        },
+        title() {
+            return this.$t('menu.menuDialog.userManage');
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(operate) {
+            // 非断电激活时设置初始值
+            if (!this.dialogShow) {
+                this.loading = false;
+                this.operate = operate || {};
+                this.operation = operate.operation;
+            }
+
+            this.dialogShow = true;
+            this.$nextTick(function () {
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+        },
+        // 添加用户
+        addUser() {
+            const operate = {
+                type: this.operate.type,
+                operation: OperationEvent.Command.manage.addUser.operation
+            };
+
+            this.loading = true;
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.loading = false;
+                if (valid) {
+                    this.$refs.userAdd.doShow(operate);
+                }
+            }).catch(() => {
+                this.loading = false;
+            });
+        },
+        // 编辑用户
+        editUser() {
+            if (this.selected) {
+                const operate = {
+                    type: this.operate.type,
+                    operation: OperationEvent.Command.manage.editUser.operation
+                };
+
+                this.loading = true;
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.loading = false;
+                    if (valid) {
+                        this.$refs.userEdit.doShow(operate, this.selected);
+                    }
+                }).catch(() => {
+                    this.loading = false;
+                });
+            } else {
+                this.$messageBox(this.$t('menu.menuDialog.selectUser'));
+            }
+        },
+        // 删除用户
+        delUser() {
+            if (this.selected) {
+                const operate = {
+                    type: this.operate.type,
+                    operation: OperationEvent.Command.manage.delUser.operation,
+                    messages: [`${this.$t('menu.menuDialog.deleteMessageOne')} ${this.selected.userName} ${this.$t('menu.menuDialog.deleteMessageTwo')}`]
+                };
+
+                this.loading = true;
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.loading = false;
+                    if (valid) {
+                        this.$refs.userDelete.doShow(operate, this.selected);
+                    }
+                }).catch(() => {
+                    this.loading = false;
+                });
+            } else {
+                this.$messageBox(this.$t('menu.menuDialog.selectUser'));
+            }
+        },
+        // 刷新用户
+        freshUser() {
+            const operate = {
+                type: this.operate.type,
+                operation: OperationEvent.Command.manage.freshUser.operation
+            };
+
+            this.loading = true;
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.loading = false;
+            }).catch(() => {
+                this.loading = false;
+            });
+        },
+        // 选择用户
+        chooseUser(row) {
+            const operate = {
+                type: this.operate.type,
+                operation: OperationEvent.Command.manage.chooseUser.operation
+            };
+
+            this.loading = true;
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.loading = false;
+                this.selected = row;
+            }).catch(() => {
+                this.loading = false;
+            });
+        },
+        commit() {
+            const operate = {
+                type: this.operate.type,
+                operation: OperationEvent.Command.close.menu.operation
+            };
+
+            this.loading = true;
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.loading = false;
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => {
+                this.loading = false;
+                this.doClose();
+            });
+        },
+        cancel() {
+            const operate = {
+                type: this.operate.type,
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
+
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => { this.doClose(); });
+        },
+        // 增删改函数处理
+        operateUser(data) {
+            if (data && data.type === 'ADD') {
+                const index = this.tableData.indexOf(this.tableData.find(elem => { return elem.jobNumber === data.jobNumber; }));
+                if (index < 0) {
+                    this.tableData.push({
+                        jobNumber: data.jobNumber,
+                        userName: data.userName,
+                        password: data.password
+                    });
+                } else {
+                    this.$messageBox(this.$t('menu.menuDialog.addFail'));
+                }
+            } else if (data && data.type === 'EDIT') {
+                const index = this.tableData.indexOf(this.tableData.find(elem => { return elem.jobNumber === data.jobNumber; }));
+                if (index >= 0) {
+                    this.tableData[index].password = data.password;
+                    this.tableData[index].userName = data.userName;
+                } else {
+                    this.$messageBox(this.$t('menu.menuDialog.modifyFail'));
+                }
+            } else if (data && data.type === 'DELETE') {
+                const index = this.tableData.indexOf(this.tableData.find(elem => { return elem.jobNumber === data.jobNumber; }));
+                if (index >= 0) {
+                    this.tableData.splice(index, 1);
+                    this.selected = null;
+                } else {
+                    this.$messageBox(this.$t('menu.menuDialog.deleteFail'));
+                }
+            }
+        }
+    }
+};
+</script>
+<style scoped>
+    .fuzhou-01__systerm .el-dialog .base-label {
+        background: rgba(0, 0, 0, x);
+        position: relative;
+        left: -5px;
+        top: -10px;
+        padding: 0 5px;
+        background-color: #F0F0F0;
+    }
+</style>
diff --git a/src/jmapNew/theme/xian_01/menus/menuDialog/passwordBox.vue b/src/jmapNew/theme/xian_01/menus/menuDialog/passwordBox.vue
new file mode 100644
index 000000000..dd3767489
--- /dev/null
+++ b/src/jmapNew/theme/xian_01/menus/menuDialog/passwordBox.vue
@@ -0,0 +1,228 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    class="fuzhou-01__systerm password-box"
+    :title="$t('menu.menuDialog.passwordBox')"
+    :visible.sync="show"
+    width="320px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <div class="context" style="overflow:hidden">
+      <el-form label-width="80px" size="mini">
+        <el-form-item prop="username">
+          <span slot="label">{{ $t('menu.menuDialog.userNameLabel') }}</span>
+          <el-input v-model="model.username" disabled />
+        </el-form-item>
+        <el-form-item prop="password">
+          <span slot="label">{{ $t('menu.menuDialog.password') }}</span>
+          <el-input v-model="model.password" type="password" />
+        </el-form-item>
+      </el-form>
+      <div class="operate">
+        <el-button-group v-model="key" class="left" size="mini">
+          <el-button size="mini" @click="click(1)">1</el-button>
+          <el-button size="mini" @click="click(2)">2</el-button>
+          <el-button size="mini" @click="click(3)">3</el-button>
+          <el-button size="mini" @click="click(4)">4</el-button>
+          <el-button size="mini" @click="click(5)">5</el-button>
+        </el-button-group>
+        <el-button-group v-model="key" class="right" size="mini">
+          <el-button @click="esc">{{ $t('menu.menuDialog.back') }}</el-button>
+        </el-button-group>
+        <el-button-group v-model="key" class="left" size="mini">
+          <el-button size="mini" @click="click(6)">6</el-button>
+          <el-button size="mini" @click="click(7)">7</el-button>
+          <el-button size="mini" @click="click(8)">8</el-button>
+          <el-button size="mini" @click="click(9)">9</el-button>
+          <el-button size="mini" @click="click(0)">0</el-button>
+        </el-button-group>
+        <el-button-group v-model="key" class="right" size="mini">
+          <el-button @click="clr">{{ $t('menu.menuDialog.clear') }}</el-button>
+        </el-button-group>
+      </div>
+    </div>
+    <el-row class="button-group">
+      <el-col :span="6" :offset="4">
+        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">{{ $t('menu.menuDialog.confirm') }}</el-button>
+      </el-col>
+      <el-col :span="6" :offset="4">
+        <el-button :id="domIdCancel" @click="cancel">{{ $t('menu.menuDialog.cancel') }}</el-button>
+      </el-col>
+    </el-row>
+    <notice-info ref="noticeInfo" />
+  </el-dialog>
+</template>
+
+<script>
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
+import NoticeInfo from '../dialog/childDialog/childDialog/noticeInfo';
+
+export default {
+    name: 'PasswordBox',
+    components: {
+        NoticeInfo
+    },
+    data() {
+        return {
+            dialogShow: false,
+            loading: false,
+            operate: null,
+            operation: null,
+            model: {
+                username: '',
+                password: ''
+            },
+            key: ''
+        };
+    },
+    computed: {
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
+        },
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.close.password.domId : '';
+        },
+        domIdConfirm() {
+            if (this.dialogShow) {
+                if (OperationHandler.checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.forcedStationControl)) {
+                    /** 强制站控*/
+                    return OperationEvent.StationControl.forcedStationControl.passwordConfirm.domId;
+                }
+            }
+            return '';
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        loadInitData(operate) {
+            this.model.username = '';
+            this.model.password = '';
+            this.operate = operate || {};
+            this.operation = operate.operation;
+            this.model.username = this.$store.state.user.nickname;
+        },
+        doShow(operate) {
+            /** 如果不是断点激活，而是第一次显示需要初始化数据*/
+            if (!this.dialogShow) {
+                this.loadInitData(operate);
+            }
+            this.dialogShow = true;
+            this.$nextTick(function () {
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
+        doClose() {
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+        },
+        cancel() {
+            const operate = {
+                operation: OperationEvent.Command.close.password.operation
+            };
+
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
+                }
+            });
+        },
+        commit() {
+            const operate = {
+            };
+
+            if (OperationHandler.checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.forcedStationControl)) {
+                /** 强制站控*/
+                operate.operation = OperationEvent.StationControl.forcedStationControl.passwordConfirm.operation;
+            }
+
+            if (this.model.password == '123456') {
+                this.loading = true;
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.loading = false;
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+
+                    if (valid) {
+                        this.$emit('setLoginResult', {
+                            operation: operate.operation,
+                            success: valid
+                        });
+                        this.doClose();
+                    }
+                }).catch(() => {
+                    this.loading = false;
+                    this.$emit('setLoginResult', {
+                        operation: operate.operation,
+                        success: false
+                    });
+                });
+            } else {
+                this.$refs.noticeInfo.doShow(operate, [this.$t('menu.menuDialog.IncorrectPassword')]);
+
+            }
+        },
+        click(key) {
+            if (!this.model.password) {
+                this.model.password = '';
+            }
+            this.model.password += key;
+        },
+        esc() {
+            if (this.model.password) {
+                this.model.password = this.model.password.substring(0, this.model.password.length - 1);
+            }
+        },
+        clr() {
+            this.model.password = '';
+        }
+
+    }
+};
+
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+    @import "src/styles/mixin.scss";
+
+    .password-box .el-form {
+        margin-top: 10px !important;
+        margin-right: 20px !important;
+    }
+
+    .password-box .el-form-item {
+        margin-bottom: 5px !important;
+    }
+
+    .password-box .context {
+        height: 170px !important;
+    }
+
+    .password-box .operate {
+        margin-top: 10px !important;
+        padding-bottom: 10px !important;
+    }
+
+    .password-box .left {
+        margin-left: 10px !important;
+    }
+
+    .password-box .left .el-button {
+        color: #000;
+        background: #F0F0F0;
+        text-align: center;
+        width: 30px !important;
+    }
+
+    .password-box .right {
+        color: #000;
+        margin-left: 10px !important;
+        background: #F0F0F0;
+        width: 80px !important;
+    }
+</style>
diff --git a/src/jmapNew/theme/xian_01/menus/menuDialog/stationControlConvert.vue b/src/jmapNew/theme/xian_01/menus/menuDialog/stationControlConvert.vue
new file mode 100644
index 000000000..ea48fd5ea
--- /dev/null
+++ b/src/jmapNew/theme/xian_01/menus/menuDialog/stationControlConvert.vue
@@ -0,0 +1,463 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    class="fuzhou-01__systerm station-control-convert"
+    :title="$t('menu.menuDialog.controlModeConversion')"
+    :visible.sync="show"
+    width="700px"
+    :before-close="doClose"
+    :show-close="true"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <el-table
+      ref="multipleTable"
+      :data="tableData"
+      border
+      row-key="code"
+      style="width: 100%"
+      height="250"
+      center
+      size="mini"
+      highlight-current-row
+    >
+      <el-table-column :id="domIdChoose" prop="check" :label="$t('menu.menuDialog.select')" width="60" style="margin-left:30px">
+        <template slot-scope="scope">
+          <el-checkbox ref="check" v-model="scope.row.check" :disabled="scope.row.disabled" />
+        </template>
+      </el-table-column>
+      <el-table-column prop="operate" :label="$t('menu.menuDialog.operatingArea')" width="140">
+        <template slot-scope="scope">
+          <span :style="{color: scope.row.disabled ? '#CBCBCB':'unset'}">{{ scope.row.operate }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="control" :label="$t('menu.menuDialog.controlMode')" width="80">
+        <template slot-scope="scope">
+          <span :style="{color: scope.row.disabled ? '#CBCBCB':'unset'}">{{ scope.row.control }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="status" :label="$t('menu.menuDialog.centerStationCommunicationStatus')" width="140">
+        <template slot-scope="scope">
+          <span :style="{color: scope.row.disabled ? '#CBCBCB':'unset'}">{{ scope.row.status }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="result" :label="$t('menu.menuDialog.transferExecutionStatus')">
+        <template slot-scope="scope">
+          <span :style="{color: scope.row.disabled ? '#CBCBCB':'unset'}">{{ scope.row.result }}</span>
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-row class="button-group">
+      <el-col :span="10" :offset="3" class="control_button">
+        <el-button v-if="isFork" :id="domIdFork" :disabled="disabledCommit" @click="forkCommit">{{ $t('menu.menuDialog.forcedStationControl') }}</el-button>
+        <el-button v-if="isRequest" :id="domIdRequest" :disabled="disabledCommit" @click="requestCommit">{{ $t('menu.menuDialog.requestStationControl') }}
+        </el-button>
+        <el-button v-if="isConter" :id="domIdConter" :disabled="disabledCommit" @click="conterCommit">{{ $t('menu.menuDialog.requestInTheControl') }}
+        </el-button>
+      </el-col>
+      <el-col :span="6" :offset="4">
+        <el-button :id="domIdCancel" :disabled="disabledClose" @click="cancel">{{ $t('menu.menuDialog.close') }}
+        </el-button>
+      </el-col>
+    </el-row>
+    <two-confirmation ref="twoConfirmation" @setOperate="getOperate" />
+  </el-dialog>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
+import TwoConfirmation from './childDialog/twoConfirmation';
+
+export default {
+    name: 'StationControlConvert',
+    components: {
+        TwoConfirmation
+    },
+    data() {
+        return {
+            operate: null,
+            dialogShow: false,
+            disabledSend: false,
+            disabledSure: false,
+            disabledClose: false,
+            operation: '',
+            controlProps: {
+                '01': this.$t('menu.menuDialog.inTheControl'),
+                '02': this.$t('menu.menuDialog.stationControl')
+            },
+            selection: [],
+            tableData: [],
+            timer: null,
+            count: 0,
+            flagListBit: [],
+            backOperate: '',
+            timeout: 61,
+            counts: 0
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'stationList',
+            'stationControlList'
+        ]),
+        ...mapGetters('training', [
+            'mode',
+            'started'
+        ]),
+        disabledCommit() {
+            return this.disabledSend || this.disabledSure;
+        },
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
+        },
+        isFork() {
+            if (this.dialogShow) {
+                return OperationHandler.checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.forcedStationControl);
+            }
+            return false;
+        },
+        isRequest() {
+            if (this.dialogShow) {
+                return OperationHandler.checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.requestStationControl);
+            }
+            return false;
+        },
+        isConter() {
+            if (this.dialogShow) {
+                return OperationHandler.checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.requestCentralControl);
+            }
+            return false;
+        },
+        domIdChoose() {
+            if (this.dialogShow) {
+                if (OperationHandler.checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.forcedStationControl)) {
+                    return OperationEvent.StationControl.forcedStationControl.choose.domId;
+                } else if (OperationHandler.checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.requestStationControl)) {
+                    return OperationEvent.StationControl.requestStationControl.choose.domId;
+                } else if (OperationHandler.checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.requestCentralControl)) {
+                    return OperationEvent.StationControl.requestCentralControl.choose.domId;
+                }
+            }
+            return false;
+        },
+        domIdConter() {
+            return this.dialogShow ? OperationEvent.StationControl.requestCentralControl.menu.domId : '';
+        },
+        domIdFork() {
+            return this.dialogShow ? OperationEvent.StationControl.forcedStationControl.menu.domId : '';
+        },
+        domIdRequest() {
+            return this.dialogShow ? OperationEvent.StationControl.requestStationControl.menu.domId : '';
+        },
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+        }
+    },
+    watch: {
+        '$store.state.socket.msgHead': function (elem) {
+            if (elem) {
+                this.flagListBit[this.selection.forEach(elem => { return elem.stationControlCode == elem.code; })] = false;
+                if (elem.hasOwnProperty('timeout')) {
+                    this.updateTableValue(elem.stationControlCode, { result: this.$t('menu.menuDialog.acceptConversionResponseTimeout') }, false);
+                } else if (elem.hasOwnProperty('agree')) {
+                    if (elem.agree) {
+                        this.updateTableValue(elem.stationControlCode, { result: this.$t('menu.menuDialog.controlModeTransfersuccees') }, true);
+                    } else {
+                        this.updateTableValue(elem.stationControlCode, { result: this.$t('menu.menuDialog.controlModeTransferFailed') }, false);
+                    }
+                }
+                this.disabledClose = false;
+                this.disabledSure = false;
+            }
+        },
+        backOperate: function (operate) {
+            if (this.dialogShow && operate) {
+                if (operate.selection && operate.selection.length) {
+                    operate.selection.forEach(elem => {
+                        if (operate.commit) {
+                            this.updateTableValue(elem.code, { result: `${this.$t('menu.menuDialog.senedMessageOne')}${this.timeout} ${this.$t('menu.menuDialog.senedMessageTwo')}` }, false);
+                        } else if (operate.cancel) {
+                            this.updateTableValue(elem.code, { result: '' }, false);
+                        }
+                    });
+                }
+            }
+        },
+        // 深度数据状态
+        tableData: {
+            handler(val, oldVal) {
+                this.checkTableDataSelction(val);
+            },
+            deep: true
+        }
+    },
+    mounted() {
+        this.loadTableData();
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        updateTableValue(code, result, success) {
+            this.tableData.forEach((row, index) => {
+                if (row.code == code) {
+                    for (const prop in result) {
+                        row[prop] = result[prop];
+                    }
+                    if (success) {
+                        if (OperationHandler.checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.forcedStationControl) || OperationHandler.checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.requestStationControl)) {
+                            row.control = this.controlProps['02']; // 01:中控， 02:站控
+                        } else if (OperationHandler.checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.requestCentralControl)) {
+                            row.control = this.controlProps['01']; // 01:中控， 02:站控
+                        }
+                        row.disabled = true;
+                        row.check = false;
+                    }
+                }
+            });
+        },
+        checkTableDataSelction(data) {
+            const selection = [];
+            if (data && data.length > 0) {
+                data.forEach(row => {
+                    if (row.check && !row.disabled) {
+                        selection.push(row);
+                    }
+                });
+            }
+
+            this.disabledSend = !selection.length;
+            if (JSON.stringify(selection) !== JSON.stringify(this.selection)) {
+                this.handleChooseChange(selection);
+                this.selection = selection;
+            }
+        },
+        checkBoxDisabled(row) {
+            const control = (this.$store.getters['map/getDeviceByCode'](row.code) || {});
+            if (OperationHandler.checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.forcedStationControl) || OperationHandler.checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.requestStationControl)) {
+                if (control && control.status == '02') { // 01:中控， 02:站控
+                    return true;
+                }
+            } else if (OperationHandler.checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.requestCentralControl)) {
+                if (control && control.status == '01') { // 01:中控， 02:站控
+                    return true;
+                }
+            }
+
+        },
+        loadTableData() {
+            this.tableData = [];
+            this.stationControlList.forEach(control => {
+                const station = this.$store.getters['map/getDeviceByCode'](control.stationCode);
+                this.tableData.push({
+                    code: control.code,
+                    operate: station.name || '',
+                    control: '',
+                    check: false,
+                    disabled: false,
+                    status: this.$t('menu.menuDialog.normal'),
+                    result: ''
+                });
+            });
+        },
+        initTableDataStatus() {
+            this.tableData.forEach(row => {
+                row.disabled = this.checkBoxDisabled(row);
+                row.check = false;
+                row.result = '';
+                const control = this.$store.getters['map/getDeviceByCode'](row.code);
+                if (control) {
+                    row.control = this.controlProps[control.status];
+                }
+            });
+        },
+        doShow(operate) {
+            if (!this.dialogShow) {
+                this.operate = operate || {};
+                this.operation = operate.operation;
+                this.disabledSure = false;
+                this.initTableDataStatus();
+            }
+            this.dialogShow = true;
+            this.$store.dispatch('training/emitTipFresh');
+        },
+        doClose() {
+            if (this.dialogShow) {
+                this.$store.dispatch('socket/shiftMsgQueue');
+            }
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+            this.$refs.multipleTable.setCurrentRow();
+        },
+        cancel() {
+            const operate = {
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
+
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
+                }
+            });
+        },
+        setTimer() {
+            this.clearTimer();
+            this.flagListBit = new Array(this.selection.length).fill(true);
+            this.timer = setInterval(() => {
+                (this.selection || []).forEach((elem, index) => {
+                    if (this.flagListBit[index]) {
+                        elem['count'] = (elem['count'] || 0) + 1;
+                        elem['count'] > this.timeout && (
+                            this.flagListBit[index] = false,
+                            this.setRequestTimeout(elem)
+                        );
+                    }
+                });
+
+                this.flagListBit.findIndex(elem => { return elem; }) < 0 && this.clearTimer();
+            }, 1000);
+        },
+        clearTimer() {
+            this.count = 0;
+            if (this.timer) {
+                clearInterval(this.timer);
+                this.timer = null;
+            }
+        },
+        setRequestTimeout(elem) {
+            elem['count'] = 0;
+            this.$store.dispatch('socket/pushMsgQueue',
+                { type: 'resp', timeout: 'true', stationControlCode: elem.code }
+            );
+        },
+        handleChooseChange(selection) {
+            this.selection = selection;
+            const stationCodeList = selection.map(elem => { return elem.code; });
+            if (selection && selection.length) {
+                const operate = {
+                    operation: '',
+                    val: stationCodeList.join('::'),
+                    selection: selection
+                };
+
+                if (OperationHandler.checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.forcedStationControl)) {
+                    operate.operation = OperationEvent.StationControl.forcedStationControl.choose.operation;
+                } else if (OperationHandler.checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.requestStationControl)) {
+                    operate.operation = OperationEvent.StationControl.requestStationControl.choose.operation;
+                } else if (OperationHandler.checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.requestCentralControl)) {
+                    operate.operation = OperationEvent.StationControl.requestCentralControl.choose.operation;
+                }
+
+                this.disabledSure = true;
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    if (valid) {
+                        this.disabledSure = false;
+                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    }
+                });
+            } else if (!selection) {
+                this.$messageBox(this.$t('menu.menuDialog.selectData'));
+            }
+        },
+        requestCommit() {
+            const stationCodeList = this.selection.map(elem => { return elem.code; });
+            const operate = {
+                messages: [this.$t('menu.menuDialog.confirmStationControlTip')],
+                operation: OperationEvent.StationControl.requestStationControl.menu.operation,
+                val: stationCodeList.join('::'),
+                selection: this.selection
+            };
+
+            this.selection.forEach((elem, index) => {
+                operate.messages.push(`${this.$t('menu.menuDialog.operatingArea')} ${index + 1}:${elem.operate}`);
+            });
+
+            this.disabledSure = true;
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.twoConfirmation.doShow(operate);
+                } else {
+                    this.disabledSure = false;
+                }
+            }).catch(() => {
+                this.disabledSure = false;
+            });
+        },
+        forkCommit() {
+            const stationCodeList = this.selection.map(elem => { return elem.code; });
+            const operate = {
+                messages: [this.$t('menu.menuDialog.confirmInTheControlTip')],
+                operation: OperationEvent.StationControl.forcedStationControl.menu.operation,
+                val: stationCodeList.join('::'),
+                selection: this.selection
+            };
+
+            this.selection.forEach((elem, index) => {
+                operate.messages.push(`${this.$t('menu.menuDialog.operatingArea')} ${index + 1}:${elem.operate}`);
+            });
+
+            this.disabledSure = true;
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.twoConfirmation.doShow(operate);
+                } else {
+                    this.disabledSure = false;
+                }
+            }).catch(() => {
+                this.disabledSure = false;
+            });
+        },
+        conterCommit() {
+            const stationCodeList = this.selection.map(elem => { return elem.code; });
+            const operate = {
+                messages: [this.$t('menu.menuDialog.confirmInTheControlTip')],
+                operation: OperationEvent.StationControl.requestCentralControl.menu.operation,
+                val: stationCodeList.join('::'),
+                selection: this.selection
+            };
+
+            this.selection.forEach((elem, index) => {
+                operate.messages.push(`${this.$t('menu.menuDialog.operatingArea')} ${index + 1}:${elem.operate}`);
+            });
+
+            this.disabledSure = true;
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.twoConfirmation.doShow(operate);
+                } else {
+                    this.disabledSure = false;
+                }
+            }).catch(() => {
+                this.disabledSure = false;
+            });
+        },
+        getOperate(operate) {
+            this.backOperate = operate;
+            if (operate.cancel) {
+                this.disabledSure = this.disabledSend = false;
+            }
+            if (operate.commit || operate.timeout) {
+                this.disabledSend = this.disabledSure = true;
+            }
+            this.setTimer();
+            this.disabledClose = true;
+            this.counts = 1;
+        }
+    }
+};
+</script>
+<style lang="scss" scoped>
+    .fuzhou-01__systerm .el-dialog .control_button button{
+        max-width:180px;
+        width:auto ;
+        padding-left: 5px ;
+        padding-right: 5px ;
+        min-width: 80px;
+    }
+</style>
diff --git a/src/jmapNew/theme/xian_01/menus/menuDialog/trainAdd.vue b/src/jmapNew/theme/xian_01/menus/menuDialog/trainAdd.vue
new file mode 100644
index 000000000..89055de36
--- /dev/null
+++ b/src/jmapNew/theme/xian_01/menus/menuDialog/trainAdd.vue
@@ -0,0 +1,179 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    class="fuzhou-01__systerm stand-stop-time"
+    :title="title"
+    :visible.sync="show"
+    width="320px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <el-form ref="form" size="small" label-width="100px" :model="addModel" :rules="rules">
+      <div style="padding: 10px 15px; border: 1px double lightgray; margin: 20px 0px; height: 120px;">
+        <span class="base-label">{{ $t('menu.menuDialog.addLocation') }}</span>
+        <div style="position: relative; top:-10px;">
+          <el-form-item prop="stationStandCode">
+            <span slot="label">{{ $t('menu.menuDialog.terminalOne') }}</span>
+            <el-select v-model="addModel.stationStandCode" filterable :placeholder="$t('menu.menuDialog.pleaseSelect')">
+              <el-option
+                v-for="item in stationStandList"
+                :key="item.code"
+                :label="item.name"
+                :value="item.code"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item prop="trainNumberLimber">
+            <span id="frontTrainNumber" slot="label">{{ $t('menu.menuDialog.frontTrainNumber') }}</span>
+            <el-input v-model="addModel.trainNumberLimber" />
+          </el-form-item>
+        </div>
+      </div>
+      <el-form-item id="groupNumber" :label="$t('menu.menuDialog.addTrainNumber')" label-width="115px" prop="groupNumber">
+        <el-input v-model="addModel.groupNumber" />
+      </el-form-item>
+    </el-form>
+    <el-row justify="center" class="button-group">
+      <el-col :span="10" :offset="2">
+        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">{{ $t('menu.menuDialog.confirm') }}</el-button>
+      </el-col>
+      <el-col :span="8" :offset="4">
+        <el-button :id="domIdCancel" @click="cancel">{{ $t('menu.menuDialog.cancel') }}</el-button>
+      </el-col>
+    </el-row>
+  </el-dialog>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+
+export default {
+    name: 'TrainAdd',
+    components: {
+    },
+    data() {
+        return {
+            trainNoList: [],
+            addModel: {
+                groupNumber: '',
+                stationStandCode: '',
+                trainNumberLimber: ''
+            },
+
+            rules: {
+                groupNumber: [
+                    { required: true, message: this.$t('menu.menuDialog.inputTrainNumber'), trigger: 'blur' }
+                ],
+                // trainNumberLimber: [
+                //     { required: true, message: '请输入前车车次号', trigger: 'blur' }
+                // ],
+                stationStandCode: [
+                    { required: true, message: this.$t('menu.menuDialog.selectTerminal'), trigger: 'change' }
+                ]
+            },
+            operation: null,
+            dialogShow: false,
+            loading: false
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'stationStandList'
+        ]),
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
+        },
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+        },
+        domIdConfirm() {
+            return this.dialogShow ? OperationEvent.Command.planTrain.addPlanTrain.domId : '';
+        },
+        title() {
+            return this.$t('menu.menuDialog.addPlanTrain');
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(operate) {
+            this.operate = operate || {};
+            this.operation = operate.operation;
+
+            // 非断电激活时设置初始值
+            if (!this.dialogShow) {
+                this.loading = false;
+            }
+
+            this.dialogShow = true;
+            this.$nextTick(function () {
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+        },
+        commit() {
+            this.$refs['form'].validate((valid) => {
+                if (valid) {
+                    const operate = {
+                        send: true,
+                        
+                        operation: OperationEvent.Command.planTrain.addPlanTrain.operation
+                    };
+
+                    this.loading = true;
+                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                        this.loading = false;
+                        if (valid) {
+                            this.doClose();
+                        } else {
+                            // this.$refs.noticeInfo.doShow(operate);
+                        }
+                    }).catch(() => {
+                        this.loading = false;
+                        this.doClose();
+                        // this.$refs.noticeInfo.doShow(operate);
+                    });
+                } else {
+                    return false;
+                }
+            });
+        },
+        cancel() {
+            const operate = {
+                
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
+
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => { this.doClose(); });
+        }
+    }
+};
+</script>
+<style scoped>
+    .fuzhou-01__systerm .el-dialog .base-label {
+        background: rgba(0, 0, 0, x);
+        position: relative;
+        left: -5px;
+        top: -18px;
+        padding: 0 5px;
+        background-color: #F0F0F0;
+    }
+    #frontTrainNumber,#groupNumber label{
+        line-height: 100%;
+        display: inline-block;
+    }
+</style>
diff --git a/src/jmapNew/theme/xian_01/menus/menuDialog/trainDelete.vue b/src/jmapNew/theme/xian_01/menus/menuDialog/trainDelete.vue
new file mode 100644
index 000000000..7e947d735
--- /dev/null
+++ b/src/jmapNew/theme/xian_01/menus/menuDialog/trainDelete.vue
@@ -0,0 +1,157 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    class="fuzhou-01__systerm stand-stop-time"
+    :title="title"
+    :visible.sync="show"
+    width="320px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <el-form ref="form" size="small" label-width="100px" :model="addModel" :rules="rules">
+      <el-form-item prop="stationStandCode">
+        <span slot="label">{{ $t('menu.menuDialog.terminalTwo') }}</span>
+        <el-select v-model="addModel.stationStandCode" filterable :placeholder="$t('menu.menuDialog.pleaseSelect')">
+          <el-option v-for="item in stationStandList" :key="item.code" :label="item.name" :value="item.code" />
+        </el-select>
+      </el-form-item>
+      <el-form-item :label="$t('menu.menuDialog.trainNumber')" prop="groupNumber">
+        <el-input v-model="addModel.groupNumber" />
+      </el-form-item>
+    </el-form>
+    <el-row justify="center" class="button-group">
+      <el-col :span="10" :offset="2">
+        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">{{ $t('menu.menuDialog.confirm') }}</el-button>
+      </el-col>
+      <el-col :span="8" :offset="4">
+        <el-button :id="domIdCancel" @click="cancel">{{ $t('menu.menuDialog.cancel') }}</el-button>
+      </el-col>
+    </el-row>
+  </el-dialog>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+
+export default {
+    name: 'TrainAdd',
+    components: {
+    },
+    data() {
+        return {
+            trainNoList: [],
+            addModel: {
+                groupNumber: '',
+                stationStandCode: ''
+            },
+
+            rules: {
+                groupNumber: [
+                    { required: true, message: this.$t('menu.menuDialog.inputTrainNumber'), trigger: 'blur' }
+                ],
+                stationStandCode: [
+                    { required: true, message: this.$t('menu.menuDialog.selectTerminal'), trigger: 'change' }
+                ]
+            },
+            operation: null,
+            dialogShow: false,
+            loading: false
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'stationStandList'
+        ]),
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
+        },
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+        },
+        domIdConfirm() {
+            return this.dialogShow ? OperationEvent.Command.planTrain.delPlanTrain.domId : '';
+        },
+        title() {
+            return this.$t('menu.menuDialog.deletePlanTrain');
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(operate) {
+            this.operate = operate || {};
+            this.operation = operate.operation;
+
+            // 非断电激活时设置初始值
+            if (!this.dialogShow) {
+                this.loading = false;
+            }
+
+            this.dialogShow = true;
+            this.$nextTick(function () {
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+        },
+        commit() {
+            this.$refs['form'].validate((valid) => {
+                if (valid) {
+                    const operate = {
+                        send: true,
+                        
+                        operation: OperationEvent.Command.planTrain.delPlanTrain.operation
+                    };
+
+                    this.loading = true;
+                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                        this.loading = false;
+                        if (valid) {
+                            this.doClose();
+                        } else {
+                            // this.$refs.noticeInfo.doShow(operate);
+                        }
+                    }).catch(() => {
+                        this.loading = false;
+                        this.doClose();
+                        // this.$refs.noticeInfo.doShow(operate);
+                    });
+                } else {
+                    return false;
+                }
+            });
+        },
+        cancel() {
+            const operate = {
+                
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
+
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => { this.doClose(); });
+        }
+    }
+};
+</script>
+<style scoped>
+    .fuzhou-01__systerm .el-dialog .base-label {
+        background: rgba(0, 0, 0, x);
+        position: relative;
+        left: -5px;
+        top: -18px;
+        padding: 0 5px;
+        background-color: #F0F0F0;
+    }
+</style>
diff --git a/src/jmapNew/theme/xian_01/menus/menuDialog/trainTranstalet.vue b/src/jmapNew/theme/xian_01/menus/menuDialog/trainTranstalet.vue
new file mode 100644
index 000000000..60da613b0
--- /dev/null
+++ b/src/jmapNew/theme/xian_01/menus/menuDialog/trainTranstalet.vue
@@ -0,0 +1,164 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    class="fuzhou-01__systerm stand-stop-time"
+    :title="title"
+    :visible.sync="show"
+    width="320px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <el-form ref="form" size="small" label-width="100px" :model="addModel" :rules="rules">
+      <el-form-item :label="$t('menu.menuDialog.trainNumber')" label-width="115px" prop="groupNumber">
+        <el-input v-model="addModel.groupNumber" />
+      </el-form-item>
+      <div style="padding: 10px 15px; border: 1px double lightgray; margin: 20px 0px; height: 120px;">
+        <span class="base-label">{{ $t('menu.menuDialog.purpose') }}</span>
+        <div style="position: relative; top:-10px;">
+          <el-form-item prop="stationStandCode">
+            <span slot="label">{{ $t('menu.menuDialog.terminalTwo') }}</span>
+            <el-select v-model="addModel.stationStandCode" filterable :placeholder="$t('menu.menuDialog.pleaseSelect')">
+              <el-option
+                v-for="item in stationStandList"
+                :key="item.code"
+                :label="item.name"
+                :value="item.code"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item :label="$t('menu.menuDialog.trainNumber')" prop="trainNumberLimber">
+            <el-input v-model="addModel.trainNumberLimber" />
+          </el-form-item>
+        </div>
+      </div>
+    </el-form>
+    <el-row justify="center" class="button-group">
+      <el-col :span="10" :offset="2">
+        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">{{ $t('menu.menuDialog.confirm') }}</el-button>
+      </el-col>
+      <el-col :span="8" :offset="4">
+        <el-button :id="domIdCancel" @click="cancel">{{ $t('menu.menuDialog.cancel') }}</el-button>
+      </el-col>
+    </el-row>
+  </el-dialog>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+
+export default {
+    name: 'TrainTranstalet',
+    components: {
+    },
+    data() {
+        return {
+            trainNoList: [],
+            addModel: {
+                groupNumber: '',
+                stationStandCode: '',
+                trainNumberLimber: ''
+            },
+
+            rules: {
+                groupNumber: [
+                    { required: true, message: this.$t('menu.menuDialog.inputTrainNumber'), trigger: 'blur' }
+                ],
+                trainNumberLimber: [
+                    { required: true, message: this.$t('menu.menuDialog.inputFrontNumber'), trigger: 'blur' }
+                ],
+                stationStandCode: [
+                    { required: true, message: this.$t('menu.menuDialog.selectTerminal'), trigger: 'change' }
+                ]
+            },
+            operation: null,
+            dialogShow: false,
+            loading: false
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'stationStandList'
+        ]),
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
+        },
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+        },
+        domIdConfirm() {
+            return this.dialogShow ? OperationEvent.Command.planTrain.translatPlanTrain.domId : '';
+        },
+        title() {
+            return this.$t('menu.menuDialog.panPlanCar');
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(operate) {
+            this.operate = operate || {};
+            this.operation = operate.operation;
+
+            // 非断电激活时设置初始值
+            if (!this.dialogShow) {
+                this.loading = false;
+            }
+
+            this.dialogShow = true;
+            this.$nextTick(function () {
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+        },
+        commit() {
+            this.$refs['form'].validate((valid) => {
+                if (valid) {
+                    const operate = {
+                        send: true,
+                        
+                        operation: OperationEvent.Command.planTrain.translatPlanTrain.operation
+                    };
+
+                    this.loading = true;
+                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                        this.loading = false;
+                        if (valid) {
+                            this.doClose();
+                        } else {
+                            // this.$refs.noticeInfo.doShow(operate);
+                        }
+                    }).catch(() => {
+                        this.loading = false;
+                        this.doClose();
+                        // this.$refs.noticeInfo.doShow(operate);
+                    });
+                } else {
+                    return false;
+                }
+            });
+        },
+        cancel() {
+            const operate = {
+                
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
+
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => { this.doClose(); });
+        }
+    }
+};
+</script>
diff --git a/src/jmapNew/theme/xian_01/menus/menuDialog/viewDevice.vue b/src/jmapNew/theme/xian_01/menus/menuDialog/viewDevice.vue
new file mode 100644
index 000000000..3b4b101da
--- /dev/null
+++ b/src/jmapNew/theme/xian_01/menus/menuDialog/viewDevice.vue
@@ -0,0 +1,166 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    class="fuzhou-01__systerm view-display"
+    :title="$t('menu.menuDialog.deviceDisplaySettings')"
+    :visible.sync="show"
+    width="340px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <el-checkbox-group v-model="deviceLevels">
+      <div>
+        <el-checkbox :label="1">{{ $t('menu.menuDialog.trainWindow') }}</el-checkbox>
+      </div>
+      <div>
+        <el-checkbox :label="2">{{ $t('menu.menuDialog.sectionBoundary') }}</el-checkbox>
+      </div>
+      <div>
+        <el-checkbox :label="3">{{ $t('menu.menuDialog.linkageAutoRouteShow') }}</el-checkbox>
+      </div>
+      <div>
+        <el-checkbox :label="4">{{ $t('menu.menuDialog.atsAutoTriggerShow') }}</el-checkbox>
+      </div>
+    </el-checkbox-group>
+    <el-row class="button-group">
+      <el-col :span="8" :offset="2">
+        <el-button :id="domIdConfirm" class="commit" type="primary" :loading="loading" @click="commit">{{ $t('menu.menuDialog.confirm') }}
+        </el-button>
+      </el-col>
+      <el-col :span="8" :offset="3">
+        <el-button :id="domIdCancel" class="cancal" @click="cancel">{{ $t('menu.menuDialog.cancel') }}</el-button>
+      </el-col>
+    </el-row>
+    <notice-info ref="noticeInfo" />
+  </el-dialog>
+</template>
+
+<script>
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import NoticeInfo from '../dialog/childDialog/childDialog/noticeInfo';
+
+export default {
+    name: 'ViewDevice',
+    components: {
+        NoticeInfo
+    },
+    data() {
+        return {
+            dialogShow: false,
+            loading: false,
+            operate: null,
+            operation: '',
+            deviceLevels: [2, 3, 4, 5]
+        };
+    },
+    computed: {
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
+        },
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+        },
+        domIdConfirm() {
+            return this.dialogShow ? OperationEvent.Command.close.confirm.domId : '';
+        }
+
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.setDeviceDisplay();
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(operate) {
+            // 如果不是断点激活，而是第一次显示，需要初始化数据
+            if (!this.dialogShow) {
+                this.operate = operate || {};
+                this.operation = operate.operation;
+            }
+
+            this.dialogShow = true;
+            this.$nextTick(function () {
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+        },
+        cancel() {
+            const operate = {
+                type: this.operate.type,
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
+
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
+                }
+            });
+        },
+        commit() {
+            const operate = {
+                over: true,
+                type: this.operate.type,
+                operation: OperationEvent.Command.close.confirm.operation,
+                val: this.deviceLevels.sort().join('::')
+            };
+
+            this.loading = true;
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.loading = false;
+                if (valid) {
+                    this.doClose();
+                    this.setDeviceDisplay();
+                }
+            }).catch(() => {
+                this.loading = false;
+            });
+        },
+        setDeviceDisplay() {
+            const deviceList = [];
+
+            // 区段边界设置
+            const borderBorderShow = this.deviceLevels.indexOf(2) !== -1;
+            const sectionList = this.$store.getters['map/sectionList'];
+            if (sectionList && sectionList.length > 0) {
+                sectionList.forEach(elem => {
+                    // 区段边界
+                    deviceList.push(Object.assign(this.$jlmap.getDeviceByCode(elem.code), {borderBorderShow }));
+                });
+            }
+
+            // 车次窗设置
+            const trainWindowShow = this.deviceLevels.indexOf(1) !== -1;
+            const trainWindowList = this.$store.getters['map/trainWindowList'];
+            if (trainWindowList && trainWindowList.length > 0) {
+                trainWindowList.forEach(elem => {
+                    // 车次窗
+                    deviceList.push(Object.assign(this.$jlmap.getDeviceByCode(elem.code), {trainWindowShow }));
+                });
+            }
+
+            // 联锁自动进路表示灯和ATS自动触发表示灯设置
+            const linkageAutoRouteShow = this.deviceLevels.indexOf(3) !== -1; // 联锁自动进路表示灯
+            const atsAutoTriggerShow = this.deviceLevels.indexOf(4) !== -1; // ATS自动触发表示灯
+            const signalList = this.$store.getters['map/signalList'];
+            if (signalList && signalList.length > 0) {
+                signalList.forEach(elem => {
+                    deviceList.push(Object.assign(this.$jlmap.getDeviceByCode(elem.code), { linkageAutoRouteShow, atsAutoTriggerShow }));
+                });
+            }
+
+            this.$store.dispatch('map/updateMapDevices', deviceList);
+        }
+    }
+};
+
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+    @import "src/styles/mixin.scss";
+</style>
diff --git a/src/jmapNew/theme/xian_01/menus/menuDialog/viewName.vue b/src/jmapNew/theme/xian_01/menus/menuDialog/viewName.vue
new file mode 100644
index 000000000..9191ba0fc
--- /dev/null
+++ b/src/jmapNew/theme/xian_01/menus/menuDialog/viewName.vue
@@ -0,0 +1,248 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    class="fuzhou-01__systerm view-name"
+    :title="$t('menu.menuDialog.nameDisplaySetting')"
+    :visible.sync="show"
+    width="400px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <el-checkbox-group v-model="nameLevels">
+      <el-row>
+        <el-col :span="10">
+          <el-checkbox :label="1">{{ $t('menu.menuDialog.signalName') }}</el-checkbox>
+        </el-col>
+        <el-col :span="10" :offset="4">
+          <el-checkbox :label="2">{{ $t('menu.menuDialog.standTrackName') }}</el-checkbox>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="10">
+          <el-checkbox :label="3" disabled>{{ $t('menu.menuDialog.buttonName') }}</el-checkbox>
+        </el-col>
+        <el-col :span="10" :offset="4">
+          <el-checkbox :label="4">{{ $t('menu.menuDialog.reentryTrackName') }}</el-checkbox>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="10">
+          <el-checkbox :label="5">{{ $t('menu.menuDialog.trackName') }}</el-checkbox>
+        </el-col>
+        <el-col :span="10" :offset="4">
+          <el-checkbox dio :label="6">{{ $t('menu.menuDialog.transferTrackName') }}</el-checkbox>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="10">
+          <el-checkbox :label="7">{{ $t('menu.menuDialog.turnoutName') }}</el-checkbox>
+        </el-col>
+        <el-col :span="10" :offset="4">
+          <el-checkbox dio :label="8">{{ $t('menu.menuDialog.indicatorName') }}</el-checkbox>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="10">
+          <el-checkbox :label="9">{{ $t('menu.menuDialog.turnoutSectionName') }}</el-checkbox>
+        </el-col>
+        <el-col :span="10" :offset="4">
+          <el-checkbox dio :label="10">{{ $t('menu.menuDialog.destinationName') }}</el-checkbox>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="10">
+          <el-checkbox :label="11">{{ $t('menu.menuDialog.axisSectionName') }}</el-checkbox>
+        </el-col>
+        <el-col :span="10" :offset="4">
+          <el-checkbox dio :label="12">{{ $t('menu.menuDialog.kmPost') }}</el-checkbox>
+        </el-col>
+      </el-row>
+    </el-checkbox-group>
+    <el-row class="button-group">
+      <el-col :span="6" :offset="2">
+        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">{{ $t('menu.menuDialog.confirm') }}</el-button>
+      </el-col>
+      <el-col :span="4" :offset="8">
+        <el-button :id="domIdCancel" @click="cancel">{{ $t('menu.menuDialog.cancel') }}</el-button>
+      </el-col>
+    </el-row>
+    <notice-info ref="noticeInfo" />
+  </el-dialog>
+</template>
+
+<script>
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import deviceType from '@/jmap/constant/deviceType';
+import NoticeInfo from '../dialog/childDialog/childDialog/noticeInfo';
+
+export default {
+    name: 'ViewName',
+    components: {
+        NoticeInfo
+    },
+    data() {
+        return {
+            dialogShow: false,
+            loading: false,
+            operate: null,
+            nameLevels: [1, 2, 4, 5, 6, 7, 8, 9, 10, 11, 12]
+        };
+    },
+    computed: {
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
+        },
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+        },
+        domIdConfirm() {
+            return this.dialogShow ? OperationEvent.Command.close.confirm.domId : '';
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.setNameDisplay();
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(operate) {
+            // 如果不是断点激活显示，而是第一次显示时，需要初始化参数
+            if (!this.dialogShow) {
+                this.operate = operate || {};
+                this.operation = operate.operation;
+            }
+
+            this.dialogShow = true;
+            this.$nextTick(function () {
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+        },
+        cancel() {
+            const operate = {
+                type: this.operate.type,
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
+
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
+                }
+            });
+        },
+        commit() {
+            const operate = {
+                over: true,
+                type: this.operate.type,
+                operation: OperationEvent.Command.close.confirm.operation,
+                val: this.nameLevels.sort().join('::')
+            };
+
+            this.loading = true;
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.loading = false;
+                if (valid) {
+                    this.doClose();
+                    this.setNameDisplay();
+                }
+            }).catch(() => {
+                this.loading = false;
+            });
+        },
+        setNameDisplay() {
+            const deviceList = [];
+
+            // 信号机
+            let nameShow = this.nameLevels.indexOf(1) !== -1;
+            const signalList = this.$store.getters['map/signalList'];
+            if (signalList && signalList.length > 0) {
+                signalList.forEach(elem => {
+                    deviceList.push(Object.assign(this.$jlmap.getDeviceByCode(elem.code), { nameShow }));
+                });
+            }
+
+            // 道岔
+            nameShow = this.nameLevels.indexOf(7) !== -1;				// 道岔名称
+            const switchSectionNameShow = this.nameLevels.indexOf(9) !== -1;	// 道岔轨名称
+            const switchList = this.$store.getters['map/switchList'];
+            if (switchList && switchList.length > 0) {
+                switchList.forEach(elem => {
+                    deviceList.push(Object.assign(this.$jlmap.getDeviceByCode(elem.code), {nameShow, switchSectionNameShow }));
+                });
+            }
+
+            // 控制模式
+            const indicatorShow = this.nameLevels.indexOf(8) !== -1;
+            const control = this.$store.getters['map/stationControlList'];
+            if (control && control.length > 0) {
+                control.forEach(elem => {
+                    // 标识灯名称
+                    deviceList.push(Object.assign(this.$jlmap.getDeviceByCode(elem.code), { indicatorShow }));
+                });
+            }
+
+            // 区段
+            nameShow = false;
+            let standTrackNameShow = false;
+            let reentryTrackNameShow = false;
+            let transferTrackNameShow = false;
+            const sectionList = this.$store.getters['map/sectionList'];
+            if (sectionList && sectionList.length > 0) {
+                sectionList.forEach(elem => {
+                    elem._type = deviceType.Section;
+                    if (elem.isSwitchSection && elem.parentCode) {
+                        // 道岔轨的区段名称默认不显示
+                        nameShow = false;
+                    } else {
+                        if (elem.type === '01') {
+                            // 计轴区段名称
+                            nameShow = this.nameLevels.indexOf(11) !== -1;
+                        } else if (elem.type === '02') {
+                            // 轨道轨名称
+                            nameShow = this.nameLevels.indexOf(5) !== -1;
+                        } else if (elem.type === '03') {
+                            // 道岔区段名称
+                            nameShow = this.nameLevels.indexOf(9) !== -1;
+                        }
+                    }
+
+                    // 站台轨名称
+                    if (elem.isStandTrack) {
+                        standTrackNameShow = this.nameLevels.indexOf(2) !== -1;
+                    }
+
+                    // 折返轨名称
+                    if (elem.isReentryTrack) {
+                        reentryTrackNameShow = this.nameLevels.indexOf(4) !== -1;
+                    }
+
+                    // 转换轨名称
+                    if (elem.isTransferTrack) {
+                        transferTrackNameShow = this.nameLevels.indexOf(6) !== -1;
+                    }
+
+                    deviceList.push(Object.assign(this.$jlmap.getDeviceByCode(elem.code), { nameShow, standTrackNameShow, reentryTrackNameShow, transferTrackNameShow }));
+                });
+            }
+
+            // 车站
+            const kmPostShow = this.nameLevels.indexOf(12) !== -1;
+            const stationList = this.$store.getters['map/stationList'];
+            if (stationList && stationList.length > 0) {
+                stationList.forEach(elem => {
+                    deviceList.push(Object.assign(this.$jlmap.getDeviceByCode(elem.code), { kmPostShow })); // 公里标
+                });
+            }
+
+            this.$store.dispatch('map/updateMapDevices', deviceList);
+        }
+    }
+};
+</script>
diff --git a/src/jmapNew/theme/xian_01/menus/menuDialog/viewTrainId.vue b/src/jmapNew/theme/xian_01/menus/menuDialog/viewTrainId.vue
new file mode 100644
index 000000000..c5e38fab9
--- /dev/null
+++ b/src/jmapNew/theme/xian_01/menus/menuDialog/viewTrainId.vue
@@ -0,0 +1,209 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    class="fuzhou-01__systerm view-train-id"
+    :title="$t('menu.menuDialog.trainIDDisplaySetting')"
+    :visible.sync="show"
+    width="420px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <div style="padding: 10px 20px; border: 1px double lightgray;">
+      <span class="base-label">{{ $t('menu.menuDialog.plantrainDisplayMode') }}</span>
+      <el-radio-group v-model="planMode">
+        <el-row>
+          <el-col :span="10">
+            <el-radio :label="1">{{ $t('menu.menuDialog.serviceNumber') }} + {{ $t('menu.menuDialog.tripNumber') }}</el-radio>
+          </el-col>
+          <el-col :span="10" :offset="4">
+            <el-radio :label="2">{{ $t('menu.menuDialog.serviceNumber') }} + {{ $t('menu.menuDialog.groupNumber') }}</el-radio>
+          </el-col>
+        </el-row>
+        <el-row class="elrow">
+          <el-col :span="10">
+            <el-radio :label="3">{{ $t('menu.menuDialog.targetNumber') }} + {{ $t('menu.menuDialog.tripNumber') }}</el-radio>
+          </el-col>
+          <el-col :span="10" :offset="4">
+            <el-radio :label="4">{{ $t('menu.menuDialog.targetNumber') }} + {{ $t('menu.menuDialog.groupNumber') }}</el-radio>
+          </el-col>
+        </el-row>
+        <el-row class="elrow">
+          <el-col :span="10">
+            <el-radio :label="5">{{ $t('menu.menuDialog.targetNumber') }} + {{ $t('menu.menuDialog.serviceNumber') }} + {{ $t('menu.menuDialog.tripNumber') }}</el-radio>
+          </el-col>
+          <el-col :span="10" :offset="4">
+            <el-radio :label="6">{{ $t('menu.menuDialog.targetNumber') }} + {{ $t('menu.menuDialog.serviceNumber') }} + {{ $t('menu.menuDialog.groupNumber') }}</el-radio>
+          </el-col>
+        </el-row>
+      </el-radio-group>
+    </div>
+    <div style="padding: 10px 20px; border: 1px double lightgray; margin: 20px 0px;">
+      <span class="base-label">{{ $t('menu.menuDialog.headCodeStationDisplayMode') }}</span>
+      <el-radio-group v-model="headMode">
+        <el-row>
+          <el-col :span="10">
+            <el-radio :label="3">{{ $t('menu.menuDialog.targetNumber') }} + {{ $t('menu.menuDialog.tripNumber') }}</el-radio>
+          </el-col>
+          <el-col :span="6" :offset="4">
+            <el-radio :label="4">{{ $t('menu.menuDialog.targetNumber') }} + {{ $t('menu.menuDialog.groupNumber') }}</el-radio>
+          </el-col>
+        </el-row>
+      </el-radio-group>
+    </div>
+    <div style="padding: 10px 20px; border: 1px double lightgray;">
+      <span class="base-label">{{ $t('menu.menuDialog.fontSize') }}</span>
+      <el-row>
+        <el-col :span="10">
+          <el-input v-model="fontSize" size="small" min="16" max="99" />
+        </el-col>
+        <el-col :span="10" :offset="1">
+          <span style="height:32px; line-height:32px;">{{ $t('menu.menuDialog.range') }}</span>
+        </el-col>
+      </el-row>
+    </div>
+    <el-row class="button-group">
+      <el-col :span="6" :offset="2">
+        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">{{ $t('menu.menuDialog.confirm') }}</el-button>
+      </el-col>
+      <el-col :span="4" :offset="8">
+        <el-button :id="domIdCancel" @click="cancel">{{ $t('menu.menuDialog.cancel') }}</el-button>
+      </el-col>
+    </el-row>
+    <notice-info ref="noticeInfo" />
+  </el-dialog>
+</template>
+
+<script>
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+// import deviceType from '@/jmap/constant/deviceType';
+import NoticeInfo from '../dialog/childDialog/childDialog/noticeInfo';
+
+export default {
+    name: 'ViewTrainId',
+    components: {
+        NoticeInfo
+    },
+    data() {
+        return {
+            dialogShow: false,
+            loading: false,
+            operate: null,
+            operation: '',
+            planMode: 5,
+            headMode: 5,
+            fontSize: 16
+        };
+    },
+    computed: {
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
+        },
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+        },
+        domIdConfirm() {
+            return this.dialogShow ? OperationEvent.Command.close.confirm.domId : '';
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.setTrainDispaly();
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(operate) {
+            this.operate = operate || {};
+            this.operation = operate.operation;
+
+            // 非断电激活时设置初始值
+            if (!this.dialogShow) {
+                this.loading = false;
+            }
+
+            this.dialogShow = true;
+            this.$nextTick(function () {
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+        },
+        cancel() {
+            const operate = {
+                type: this.operate.type,
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
+
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
+                }
+            });
+        },
+        commit() {
+            const operate = {
+                over: true,
+                type: this.operate.type,
+                operation: OperationEvent.Command.close.confirm.operation,
+                val: [this.planMode, this.headMode, this.fontSize].join('::')
+            };
+
+            this.loading = true;
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.loading = false;
+                if (valid) {
+                    this.setTrainDispaly();
+                    this.doClose();
+                }
+            }).catch(() => {
+                this.loading = false;
+            });
+        },
+        setTrainDispaly() {
+            const updatlist = [];
+            const trainList = this.$store.getters['training/viewTrainList']();
+            if (trainList && trainList.length > 0) {
+                const nameFormat = this.trainNameFormatBy(this.planMode);
+                const nameFontSize = this.fontSize;
+                trainList.forEach(elem => {
+                    updatlist.push(Object.assign(this.$jlmap.getDeviceByCode(elem.code), {nameFormat, nameFontSize }));
+                });
+
+                this.$store.dispatch('map/updateMapDevices', updatlist);
+            }
+        },
+        trainNameFormatBy(mode) {
+            switch (mode.toString()) {
+            case '1': return 'serviceNumber:tripNumber'; // 表号+车次号
+            case '2': return 'serviceNumber:groupNumber'; // 表号+车组号
+            case '3': return 'targetCode:tripNumber'; // 目的地号+车次号
+            case '4': return 'targetCode:groupNumber'; // 目的地号+车组号
+            case '5': return 'targetCode:serviceNumber:tripNumber'; // 目的地号+表号+车次号
+            case '6': return 'targetCode:serviceNumber:groupNumber'; // 目的地号+表号+车组号
+            }
+
+            return ''; // 无格式类型
+        }
+    }
+};
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+	/deep/ {
+        .el-dialog .el-radio__label{
+			width: 150px ;
+			white-space: pre-wrap ;
+			display: inline-block ;
+		}
+		.el-radio__input{
+			vertical-align: top;
+		}
+    }
+	.elrow{
+		margin-top:4px;
+	}
+</style>
diff --git a/src/jmapNew/theme/xian_01/menus/menuSection.vue b/src/jmapNew/theme/xian_01/menus/menuSection.vue
new file mode 100644
index 000000000..885bda462
--- /dev/null
+++ b/src/jmapNew/theme/xian_01/menus/menuSection.vue
@@ -0,0 +1,370 @@
+<template>
+  <div>
+    <pop-menu ref="popMenu" :menu="menu" />
+    <section-control ref="sectionControl" />
+    <section-cmd-control ref="sectionCmdControl" />
+    <speed-cmd-control ref="speedCmdControl" />
+    <notice-info ref="noticeInfo" />
+  </div>
+</template>
+
+<script>
+import PopMenu from '@/components/PopMenu';
+import SectionControl from './dialog/sectionControl';
+import SectionCmdControl from './dialog/sectionCmdControl';
+import SpeedCmdControl from './dialog/speedCmdControl';
+import NoticeInfo from './dialog/childDialog/childDialog/noticeInfo';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
+import Handler from '@/scripts/cmdPlugin/Handler';
+import { mapGetters } from 'vuex';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
+import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
+
+export default {
+    name: 'SectionMenu',
+    components: {
+        PopMenu,
+        SectionControl,
+        SectionCmdControl,
+        SpeedCmdControl,
+        NoticeInfo
+    },
+    props: {
+        selected: {
+            type: Object,
+            default() {
+                return null;
+            }
+        }
+    },
+    data() {
+        return {
+            menu: [],
+            menuNormal: {
+                Local: [
+                    {
+                        label: this.$t('menu.menuSection.sectionFaultUnlock'),
+                        handler: this.fault,
+                        cmdType: CMD.Section.CMD_SECTION_FAULT_UNLOCK
+                    },
+                    {
+                        label: this.$t('menu.menuSection.sectionResection'),
+                        handler: this.split,
+                        cmdType: CMD.Section.CMD_SECTION_CUT_OFF
+                    },
+                    {
+                        label: this.$t('menu.menuSection.sectionActive'),
+                        handler: this.active,
+                        cmdType: CMD.Section.CMD_SECTION_ACTIVE
+                    },
+                    {
+                        label: this.$t('menu.menuSection.sectionAxisPreReset'),
+                        handler: this.axlePreReset,
+                        cmdType: CMD.Section.CMD_SECTION_AXIS_PRE_RESET
+                    },
+                    {
+                        label: this.$t('menu.menuSection.sectionBlockade'),
+                        handler: this.lock,
+                        cmdType: CMD.Section.CMD_SECTION_BLOCK
+                    },
+                    {
+                        label: this.$t('menu.menuSection.sectionUnblock'),
+                        handler: this.unlock,
+                        cmdType: CMD.Section.CMD_SECTION_UNBLOCK
+                    },
+                    {
+                        label: this.$t('menu.menuSection.sectionSetSpeedLimit'),
+                        handler: this.setSpeed,
+                        cmdType: CMD.Section.CMD_SECTION_SET_LIMIT_SPEED
+
+                    },
+                    {
+                        label: this.$t('menu.menuSection.sectionCancelSpeedLimit'),
+                        handler: this.cancelSpeed,
+                        cmdType: CMD.Section.CMD_SECTION_CANCEL_LIMIT_SPEED
+                    }
+                ],
+                Center: [
+                    {
+                        label: this.$t('menu.menuSection.sectionFaultUnlock'),
+                        handler: this.fault,
+                        cmdType: CMD.Section.CMD_SECTION_FAULT_UNLOCK
+                    },
+                    {
+                        label: this.$t('menu.menuSection.sectionResection'),
+                        handler: this.split,
+                        cmdType: CMD.Section.CMD_SECTION_CUT_OFF
+                    },
+                    {
+                        label: this.$t('menu.menuSection.sectionActive'),
+                        handler: this.active,
+                        cmdType: CMD.Section.CMD_SECTION_ACTIVE
+                    },
+                    {
+                        label: this.$t('menu.menuSection.sectionBlockade'),
+                        handler: this.lock,
+                        cmdType: CMD.Section.CMD_SECTION_BLOCK
+                    },
+                    {
+                        label: this.$t('menu.menuSection.sectionUnblock'),
+                        handler: this.unlock,
+                        cmdType: CMD.Section.CMD_SECTION_UNBLOCK
+                    },
+                    {
+                        label: this.$t('menu.menuSection.sectionSetSpeedLimit'),
+                        handler: this.setSpeed,
+                        cmdType: CMD.Section.CMD_SECTION_SET_LIMIT_SPEED
+                    },
+                    {
+                        label: this.$t('menu.menuSection.sectionCancelSpeedLimit'),
+                        handler: this.cancelSpeed,
+                        cmdType: CMD.Section.CMD_SECTION_CANCEL_LIMIT_SPEED
+                    }
+                ]
+            },
+            menuForce: [
+                {
+                    label: this.$t('menu.menuSection.setFault'),
+                    handler: this.setStoppage,
+                    cmdType: CMD.Section.CMD_SECTION_ADD_FAULT
+                },
+                {
+                    label: this.$t('menu.menuSection.cancelFault'),
+                    handler: this.cancelStoppage,
+                    cmdType: CMD.Section.CMD_SECTION_REMOVE_FAULT
+                }
+            ]
+        };
+    },
+    computed: {
+        ...mapGetters('training', [
+            'mode',
+            'operatemode'
+        ]),
+        ...mapGetters('menuOperation', [
+            'buttonOperation'
+        ])
+    },
+    watch: {
+        '$store.state.menuOperation.menuCount': function (val) {
+            if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.Section) && !this.buttonOperation) {
+                this.doShow(this.$store.state.menuOperation.menuPosition);
+            } else {
+                this.doClose();
+            }
+        }
+    },
+    methods: {
+        clickEvent() {
+            const self = this;
+            window.onclick = function (e) {
+                self.doClose();
+            };
+        },
+        initMenu() {
+            // 编辑模式菜单列表
+            this.menu = MenuContextHandler.covert(this.menuNormal);
+
+            // 故障模式菜单列表
+            if (this.operatemode === OperateMode.FAULT) {
+                this.menu = this.menuForce;
+            }
+        },
+        doShow(point) {
+            this.clickEvent();
+            this.initMenu();
+            if (this.$refs && this.$refs.popMenu && this.menu && this.menu.length) {
+                this.$refs.popMenu.resetShowPosition(point);
+            }
+        },
+        doClose() {
+            if (this.$refs && this.$refs.popMenu) {
+                this.$refs.popMenu.close();
+            }
+        },
+        // 设置故障
+        setStoppage() {
+            const step = {
+                start: true,
+                code: `${this.selected.code}`,
+                operation: OperationEvent.Section.stoppage.menu.operation,
+                cmdType: CMD.Section.CMD_SECTION_ADD_FAULT,
+                param: {
+                    Section_Code: `${this.selected.code}`
+                }
+            };
+
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                } else {
+                    this.$refs.noticeInfo.doShow(step);
+                }
+            }).catch(() => {
+                this.$refs.noticeInfo.doShow(step);
+            });
+        },
+        // 取消故障
+        cancelStoppage() {
+            const step = {
+                start: true,
+                code: `${this.selected.code}`,
+                operation: OperationEvent.Section.cancelStoppage.menu.operation,
+                cmdType: CMD.Section.CMD_SECTION_REMOVE_FAULT,
+                param: {
+                    Section_Code: `${this.selected.code}`
+                }
+            };
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                } else {
+                    this.$refs.noticeInfo.doShow(step);
+                }
+            }).catch(() => {
+                this.$refs.noticeInfo.doShow(step);
+            });
+        },
+        // 故障解锁
+        fault() {
+            const step = {
+                start: true,
+                code: `${this.selected.code}`,
+                operation: OperationEvent.Section.fault.menu.operation,
+                param: {
+                    Section_Code: `${this.selected.code}`
+                }
+            };
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.sectionCmdControl.doShow(step, this.selected);
+                }
+            });
+        },
+        // 切除
+        split() {
+            const step = {
+                start: true,
+                code: `${this.selected.code}`,
+                operation: OperationEvent.Section.split.menu.operation,
+                param: {
+                    Section_Code: `${this.selected.code}`
+                }
+            };
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.sectionControl.doShow(step, this.selected);
+                }
+            });
+        },
+        // 激活
+        active() {
+            const step = {
+                start: true,
+                code: `${this.selected.code}`,
+                operation: OperationEvent.Section.active.menu.operation,
+                param: {
+                    Section_Code: `${this.selected.code}`
+                }
+            };
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.sectionControl.doShow(step, this.selected);
+                }
+            });
+        },
+        // 区段计轴预复位
+        axlePreReset() {
+            const step = {
+                start: true,
+                code: `${this.selected.code}`,
+                operation: OperationEvent.Section.axlePreReset.menu.operation,
+                param: {
+                    Section_Code: `${this.selected.code}`
+                }
+            };
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.sectionCmdControl.doShow(step, this.selected);
+                }
+            });
+        },
+        // 区段解锁
+        lock() {
+            const step = {
+                start: true,
+                code: `${this.selected.code}`,
+                operation: OperationEvent.Section.lock.menu.operation,
+                param: {
+                    Section_Code: `${this.selected.code}`
+                }
+            };
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.sectionControl.doShow(step, this.selected);
+                }
+            });
+        },
+        // 区段封锁
+        unlock() {
+            const step = {
+                start: true,
+                code: `${this.selected.code}`,
+                operation: OperationEvent.Section.unlock.menu.operation,
+                param: {
+                    Section_Code: `${this.selected.code}`
+                }
+            };
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.sectionCmdControl.doShow(step, this.selected);
+                }
+            });
+        },
+        // 设置速度
+        setSpeed() {
+            const step = {
+                start: true,
+                code: `${this.selected.code}`,
+                operation: OperationEvent.Section.setSpeed.menu.operation,
+                param: {
+                    Section_Code: `${this.selected.code}`
+                }
+            };
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.speedCmdControl.doShow(step, this.selected);
+                }
+            });
+        },
+        // 取消速度
+        cancelSpeed() {
+            const step = {
+                start: true,
+                code: `${this.selected.code}`,
+                operation: OperationEvent.Section.cancelSpeed.menu.operation,
+                param: {
+                    Section_Code: `${this.selected.code}`
+                }
+            };
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    Handler.execute(CMD.Section.CMD_QUERY, {}).then(resp => {
+                        const tempData = resp.data;
+                        this.$refs.speedCmdControl.doShow(step, this.selected, tempData);
+                    });
+                }
+            });
+        }
+    }
+};
+</script>
diff --git a/src/jmapNew/theme/xian_01/menus/menuSignal.vue b/src/jmapNew/theme/xian_01/menus/menuSignal.vue
new file mode 100644
index 000000000..958cd69f1
--- /dev/null
+++ b/src/jmapNew/theme/xian_01/menus/menuSignal.vue
@@ -0,0 +1,516 @@
+<template>
+  <div>
+    <pop-menu ref="popMenu" :menu="menu" />
+    <route-selection ref="routeSelection" />
+    <route-lock ref="routeLock" />
+    <route-control ref="routeControl" />
+    <route-cmd-control ref="routeCmdControl" />
+    <route-hand-control ref="routeHandControl" />
+    <route-detail ref="routeDetail" />
+    <notice-info ref="noticeInfo" />
+  </div>
+</template>
+
+<script>
+import PopMenu from '@/components/PopMenu';
+import RouteControl from './dialog/routeControl';
+import RouteSelection from './dialog/routeSelection';
+import RouteLock from './dialog/routeLock';
+import RouteCmdControl from './dialog/routeCmdControl';
+import RouteHandControl from './dialog/routeHandControl';
+import RouteDetail from './dialog/routeDetail';
+import NoticeInfo from './dialog/childDialog/childDialog/noticeInfo';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
+import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
+import { mapGetters } from 'vuex';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
+import { querySignalStatus } from '@/api/simulation';
+
+export default {
+    name: 'SignalMenu',
+    components: {
+        PopMenu,
+        RouteControl,
+        RouteSelection,
+        RouteLock,
+        RouteCmdControl,
+        RouteHandControl,
+        RouteDetail,
+        NoticeInfo
+    },
+    props: {
+        selected: {
+            type: Object,
+            default() {
+                return null;
+            }
+        }
+    },
+    data() {
+        return {
+            menu: [],
+            menuNormal: {
+                Local: [
+                    {
+                        label: this.$t('menu.menuSignal.routeSelect'),
+                        handler: this.arrangementRoute,
+                        cmdType: CMD.Signal.CMD_SIGNAL_SET_ROUTE
+                    },
+                    {
+                        label: this.$t('menu.menuSignal.routeCancel'),
+                        handler: this.cancelTrainRoute,
+                        cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE
+                    },
+                    {
+                        label: this.$t('menu.menuSignal.signalBlock'),
+                        handler: this.lock,
+                        cmdType: CMD.Signal.CMD_SIGNAL_BLOCK
+                    },
+                    {
+                        label: this.$t('menu.menuSignal.signalDeblock'),
+                        handler: this.unlock,
+                        cmdType: CMD.Signal.CMD_SIGNAL_UNBLOCK
+                    },
+                    {
+                        label: this.$t('menu.menuSignal.signalReopen'),
+                        handler: this.reopenSignal,
+                        cmdType: CMD.Signal.CMD_SIGNAL_REOPEN_SIGNAL
+                    },
+                    {
+                        label: this.$t('menu.menuSignal.guideRouteHandle'),
+                        handler: this.guide,
+                        cmdType: CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE
+                    },
+                    {
+                        label: this.$t('menu.menuSignal.setInterlockAutoRoute'),
+                        handler: this.setAutoInterlock,
+                        cmdType: CMD.Signal.CMD_SIGNAL_SET_CI_AUTO
+                    },
+                    {
+                        label: this.$t('menu.menuSignal.cancelInterlockAutoRoute'),
+                        handler: this.cancelAutoInterlock,
+                        cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO
+                    },
+                    {
+                        label: this.$t('menu.menuSignal.setInterlockAutoTrigger'),
+                        handler: this.setAutoTrigger,
+                        cmdType: CMD.Signal.CMD_SIGNAL_SET_CI_AUTO_TRIGGER
+                    },
+                    {
+                        label: this.$t('menu.menuSignal.cancelInterlockAutoTrigger'),
+                        handler: this.cancelAutoTrigger,
+                        cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO_TRIGGER
+                    },
+                    {
+                        label: this.$t('menu.menuSignal.signalOff'),
+                        handler: this.signalClose,
+                        cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_SIGNAL
+                    }
+                ],
+                Center: [
+                    {
+                        label: this.$t('menu.menuSignal.routeSelect'),
+                        handler: this.arrangementRoute,
+                        cmdType: CMD.Signal.CMD_SIGNAL_SET_ROUTE
+                    },
+                    {
+                        label: this.$t('menu.menuSignal.routeCancel'),
+                        handler: this.cancelTrainRoute,
+                        cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE
+                    },
+                    {
+                        label: this.$t('menu.menuSignal.signalBlock'),
+                        handler: this.lock,
+                        cmdType: CMD.Signal.CMD_SIGNAL_BLOCK
+                    },
+                    {
+                        label: this.$t('menu.menuSignal.signalDeblock'),
+                        handler: this.unlock,
+                        cmdType: CMD.Signal.CMD_SIGNAL_UNBLOCK
+                    },
+                    {
+                        label: this.$t('menu.menuSignal.signalOff'),
+                        handler: this.signalClose,
+                        cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_SIGNAL
+                    },
+                    {
+                        label: this.$t('menu.menuSignal.signalReopen'),
+                        handler: this.reopenSignal,
+                        cmdType: CMD.Signal.CMD_SIGNAL_REOPEN_SIGNAL
+                    },
+                    {
+                        label: this.$t('menu.menuSignal.humanControl'),
+                        handler: this.humanControl,
+                        cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_AUTO_SETTING
+                    },
+                    {
+                        label: this.$t('menu.menuSignal.atsAutoControl'),
+                        handler: this.atsAutoControl,
+                        cmdType: CMD.Signal.CMD_SIGNAL_OPEN_AUTO_SETTING
+                    }
+                ]
+            },
+            menuForce: [
+                {
+                    label: this.$t('menu.menuSignal.setFault'),
+                    handler: this.setStoppage,
+                    cmdType: CMD.Signal.CMD_SIGNAL_ADD_FAULT
+                },
+                {
+                    label: this.$t('menu.menuSignal.cancelFault'),
+                    handler: this.cancelStoppage,
+                    cmdType: CMD.Signal.CMD_SIGNAL_REMOVE_FAULT
+                }
+            ]
+        };
+    },
+    computed: {
+        ...mapGetters('training', [
+            'mode',
+            'operatemode'
+        ]),
+        ...mapGetters('menuOperation', [
+            'buttonOperation'
+        ]),
+        group() {
+            return this.$route.query.group;
+        }
+    },
+    watch: {
+        '$store.state.menuOperation.menuCount': function (val) {
+            if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.Signal) && !this.buttonOperation) {
+                this.doShow(this.$store.state.menuOperation.menuPosition);
+            } else {
+                this.doClose();
+            }
+        }
+    },
+    methods: {
+        clickEvent() {
+            const self = this;
+            window.onclick = function (e) {
+                self.doClose();
+            };
+        },
+        initMenu() {
+            this.menu = MenuContextHandler.covert(this.menuNormal);
+            // 故障模式菜单列表
+            if (this.operatemode === OperateMode.FAULT) {
+                this.menu = this.menuForce;
+            }
+        },
+        doShow(point) {
+            this.clickEvent();
+            this.initMenu();
+            if (this.$refs && this.$refs.popMenu && this.menu && this.menu.length) {
+                this.$refs.popMenu.resetShowPosition(point);
+            }
+        },
+        doClose() {
+            if (this.$refs && this.$refs.popMenu) {
+                this.$refs.popMenu.close();
+            }
+        },
+        // 设置故障
+        setStoppage() {
+            const step = {
+                start: true,
+                code: `${this.selected.code}`,
+                operation: OperationEvent.Signal.stoppage.menu.operation,
+                cmdType: CMD.Signal.CMD_SIGNAL_ADD_FAULT,
+                param: {
+                    Signal_Code: `${this.selected.code}`
+                }
+            };
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                } else {
+                    this.$refs.noticeInfo.doShow(step);
+                }
+            }).catch(() => {
+                this.$refs.noticeInfo.doShow(step);
+            });
+        },
+        // 取消故障
+        cancelStoppage() {
+            const step = {
+                start: true,
+                code: `${this.selected.code}`,
+                operation: OperationEvent.Signal.cancelStoppage.menu.operation,
+                cmdType: CMD.Signal.CMD_SIGNAL_REMOVE_FAULT,
+                param: {
+                    Signal_Code: `${this.selected.code}`
+                }
+            };
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                } else {
+                    this.$refs.noticeInfo.doShow(step);
+                }
+            }).catch(() => {
+                this.$refs.noticeInfo.doShow(step);
+            });
+        },
+        // 排列进路
+        arrangementRoute() {
+            const step = {
+                start: true,
+                code: `${this.selected.code}`,
+                operation: OperationEvent.Signal.arrangementRoute.menu.operation,
+                param: {
+                    Signal_Code: `${this.selected.code}`
+                }
+            };
+
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
+                this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                if (valid) {
+                    querySignalStatus(this.group, {signalCode: `${this.selected.code}`}).then(resp => {
+                        const tempData = resp.data;
+                        this.$refs.routeSelection.doShow(step.operation, this.selected, tempData);
+                    });
+                }
+            }).catch(() => {
+                this.$refs.noticeInfo.doShow(step);
+            });
+        },
+        // 取消进路
+        cancelTrainRoute() {
+            const step = {
+                start: true,
+                code: `${this.selected.code}`,
+                operation: OperationEvent.Signal.cancelTrainRoute.menu.operation,
+                param: {
+                    Signal_Code: `${this.selected.code}`
+                }
+            };
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
+                this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                if (valid) {
+                    this.$refs.routeControl.doShow(step, this.selected);
+                }
+            });
+        },
+        // 信号封锁
+        lock() {
+            const step = {
+                start: true,
+                code: `${this.selected.code}`,
+                operation: OperationEvent.Signal.lock.menu.operation,
+                param: {
+                    Signal_Code: `${this.selected.code}`
+                }
+            };
+
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.routeLock.doShow(step.operation, this.selected);
+                }
+            }).catch(() => {
+                this.$refs.noticeInfo.doShow(step);
+            });
+        },
+        // 信号解封
+        unlock() {
+            const step = {
+                start: true,
+                code: `${this.selected.code}`,
+                operation: OperationEvent.Signal.unlock.menu.operation,
+                param: {
+                    Signal_Code: `${this.selected.code}`
+                }
+            };
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.routeCmdControl.doShow(step, this.selected);
+                }
+            });
+        },
+        // 信号重开
+        reopenSignal() {
+            const step = {
+                start: true,
+                code: `${this.selected.code}`,
+                operation: OperationEvent.Signal.reopenSignal.menu.operation,
+                param: {
+                    Signal_Code: `${this.selected.code}`
+                }
+            };
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.routeControl.doShow(step, this.selected);
+                }
+            });
+        },
+        // 进路引导
+        guide() {
+            const step = {
+                start: true,
+                code: `${this.selected.code}`,
+                operation: OperationEvent.Signal.guide.menu.operation,
+                param: {
+                    Signal_Code: `${this.selected.code}`
+                }
+            };
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
+                this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                if (valid) {
+                    this.$refs.routeCmdControl.doShow(step, this.selected);
+                }
+            });
+        },
+        // 设置联锁自动进路
+        setAutoInterlock() {
+            const step = {
+                start: true,
+                code: `${this.selected.code}`,
+                operation: OperationEvent.Signal.setAutoInterlock.menu.operation,
+                param: {
+                    Signal_Code: `${this.selected.code}`
+                }
+            };
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.routeControl.doShow(step, this.selected);
+                }
+            });
+        },
+        // 取消联锁自动进路
+        cancelAutoInterlock() {
+            const step = {
+                start: true,
+                code: `${this.selected.code}`,
+                operation: OperationEvent.Signal.cancelAutoInterlock.menu.operation,
+                param: {
+                    Signal_Code: `${this.selected.code}`
+                }
+            };
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.routeControl.doShow(step, this.selected);
+                }
+            });
+        },
+        // 设置联锁自动触发
+        setAutoTrigger() {
+            const step = {
+                start: true,
+                code: `${this.selected.code}`,
+                operation: OperationEvent.Signal.setAutoTrigger.menu.operation,
+                param: {
+                    Signal_Code: `${this.selected.code}`
+                }
+            };
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.routeControl.doShow(step, this.selected);
+                }
+            });
+        },
+        // 取消联锁自动触发
+        cancelAutoTrigger() {
+            const step = {
+                start: true,
+                code: `${this.selected.code}`,
+                operation: OperationEvent.Signal.cancelAutoTrigger.menu.operation,
+                param: {
+                    Signal_Code: `${this.selected.code}`
+                }
+            };
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.routeControl.doShow(step, this.selected);
+                }
+            });
+        },
+        // 信号关灯
+        signalClose() {
+            const step = {
+                start: true,
+                code: `${this.selected.code}`,
+                operation: OperationEvent.Signal.signalClose.menu.operation,
+                param: {
+                    Signal_Code: `${this.selected.code}`
+                }
+            };
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.routeControl.doShow(step, this.selected);
+                }
+            });
+        },
+        // 自排关(进路交人工控)
+        humanControl() {
+            const step = {
+                start: true,
+                code: `${this.selected.code}`,
+                operation: OperationEvent.Signal.humanControl.menu.operation,
+                param: {
+                    Signal_Code: `${this.selected.code}`
+                }
+            };
+            this.$store.dispatch('training/next', step).then(({ valid, response }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    querySignalStatus(this.group, {signalCode: `${this.selected.code}`}).then(resp => {
+                        const tempData = resp.data;
+                        this.$refs.routeHandControl.doShow(step, this.selected, tempData);
+                    });
+                }
+            });
+        },
+        // 自排关（进路交ATS自动控）
+        atsAutoControl() {
+            const step = {
+                start: true,
+                Signal_Code: `${this.selected.code}`,
+                code: `${this.selected.code}`,
+                operation: OperationEvent.Signal.atsAutoControl.menu.operation,
+                param: {
+                    Signal_Code: `${this.selected.code}`
+                }
+            };
+            this.$store.dispatch('training/next', step).then(({ valid, response }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    querySignalStatus(this.group, {signalCode: `${this.selected.code}`}).then(resp => {
+                        const tempData = resp.data;
+                        this.$refs.routeHandControl.doShow(step, this.selected, tempData);
+                    });
+                }
+            });
+        }
+        // 查询进路状态
+        // detail() {
+        //     const step = {
+        //         start: true,
+        //         code: `${this.selected.code}`,
+        //         operation: OperationEvent.Signal.detail.menu.operation,
+        //         param: {
+        //             Signal_Code: `${this.selected.code}`
+        //         }
+        //     };
+        //     this.$store.dispatch('training/next', step).then(({ valid }) => {
+        //         if (valid) {
+        //             this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+        //             querySignalStatus(this.group, {signalCode: `${this.selected.code}`}).then(resp => {
+        //                 const tempData = resp.data;
+        //                 this.$refs.routeDetail.doShow(step, this.selected, tempData);
+        //             });
+        //         }
+        //     });
+        // }
+    }
+};
+</script>
diff --git a/src/jmapNew/theme/xian_01/menus/menuStation.vue b/src/jmapNew/theme/xian_01/menus/menuStation.vue
new file mode 100644
index 000000000..0efa0bfed
--- /dev/null
+++ b/src/jmapNew/theme/xian_01/menus/menuStation.vue
@@ -0,0 +1,309 @@
+<template>
+  <div>
+    <pop-menu ref="popMenu" :menu="menu" />
+    <station-cmd-control ref="stationCmdControl" />
+    <station-human-control-all ref="stationHumanControlAll" />
+    <station-set-route-control-all ref="stationSetRouteControlAll" />
+    <notice-info ref="noticeInfo" />
+  </div>
+</template>
+
+<script>
+import PopMenu from '@/components/PopMenu';
+import StationCmdControl from './dialog/stationCmdControl';
+import StationHumanControlAll from './dialog/stationHumanControlAll';
+import StationSetRouteControlAll from './dialog/stationSetRouteControlAll';
+import NoticeInfo from './dialog/childDialog/childDialog/noticeInfo';
+import { mapGetters } from 'vuex';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
+import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
+
+export default {
+    name: 'StationMenu',
+    components: {
+        PopMenu,
+        StationCmdControl,
+        StationHumanControlAll,
+        StationSetRouteControlAll,
+        NoticeInfo
+    },
+    props: {
+        selected: {
+            type: Object,
+            default() {
+                return null;
+            }
+        }
+    },
+    data() {
+        return {
+            menu: [],
+            menuNormal: {
+                Local: [
+                    {
+                        label: this.$t('menu.menuStation.fullSiteSetInterlockAutoTrigger'),
+                        handler: this.setAutoTrigger,
+                        cmdType: CMD.Station.CMD_STATION_SET_CI_AUTO_TRIGGER
+                    },
+                    {
+                        label: this.$t('menu.menuStation.fullSiteCancelInterlockAutoTrigger'),
+                        handler: this.cancelAutoTrigger,
+                        cmdType: CMD.Station.CMD_STATION_CANCEL_CI_AUTO_TRIGGER
+                    }
+                    // {
+                    //     label: this.$t('menu.menuStation.powerUnLock'),
+                    //     handler: this.powerUnLock,
+                    //     auth: { station: true, center: false }
+                    //     // cmdType: CMD.Station.
+                    // },
+                    // {
+                    //     label: this.$t('menu.menuStation.execKeyOperationTest'),
+                    //     handler: this.execKeyOperationTest,
+                    //     auth: { station: true, center: false }
+                    //     // cmdType: CMD.Station.
+                    // }
+                ],
+                Center: [
+                    {
+                        label: this.$t('menu.menuStation.allHumanControl'),
+                        handler: this.humanControlALL,
+                        cmdType: CMD.Station.CMD_STATION_CLOSE_AUTO_SETTING
+                    },
+                    {
+                        label: this.$t('menu.menuStation.allATSAutoControl'),
+                        handler: this.atsAutoControlALL,
+                        cmdType: CMD.Station.CMD_STATION_OPEN_AUTO_SETTING
+                    }
+                    // {
+                    //     label: this.$t('menu.menuStation.execKeyOperationTest'),
+                    //     handler: this.execKeyOperationTest,
+                    //     auth: { station: false, center: true },
+                    //     cmdType: CMD.Station.CMD_STATION_OPEN_AUTO_SETTING
+                    //     // cmdType: CMD.Section.
+                    // }
+                ]
+            },
+            menuForce: [
+                {
+                    label: this.$t('menu.menuStation.setStoppage'),
+                    handler: this.setStoppage,
+                    cmdType: CMD.Station.CMD_STATION_ADD_FAULT
+                },
+                {
+                    label: this.$t('menu.menuStation.cancelStoppage'),
+                    handler: this.cancelStoppage,
+                    cmdType: CMD.Station.CMD_STATION_REMOVE_FAULT
+                }
+            ]
+        };
+    },
+    computed: {
+        ...mapGetters('training', [
+            'mode',
+            'operatemode'
+        ]),
+        ...mapGetters('menuOperation', [
+            'buttonOperation'
+        ])
+    },
+    watch: {
+        '$store.state.menuOperation.menuCount': function (val) {
+            if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.Station) && !this.buttonOperation) {
+                this.doShow(this.$store.state.menuOperation.menuPosition);
+            } else {
+                this.doClose();
+            }
+        }
+    },
+    methods: {
+        clickEvent() {
+            const self = this;
+            window.onclick = function (e) {
+                self.doClose();
+            };
+        },
+        initMenu() {
+            this.menu = [];
+            if (this.selected.concentrateStationCode == this.selected.code) {
+                // 编辑模式菜单列表
+                // this.menu = MenuContextHandler.menuFiltration(this.menuNormal);
+                this.menu = MenuContextHandler.covert(this.menuNormal);
+                if (this.operatemode === OperateMode.ADMIN) {
+                    this.menu = [...this.menu, ...this.menuForce];
+                }
+            }
+
+            if (this.selected.centralized) {
+                // 故障模式菜单列表
+                if (this.operatemode === OperateMode.FAULT) {
+                    this.menu = [...this.menuForce];
+                }
+            }
+
+            // this.menu = MenuContextHandler.covert(this.menu);
+        },
+        doShow(point) {
+            this.clickEvent();
+            this.initMenu();
+            if (this.$refs && this.$refs.popMenu && this.menu && this.menu.length) {
+                this.$refs.popMenu.resetShowPosition(point);
+            }
+        },
+        doClose() {
+            if (this.$refs && this.$refs.popMenu) {
+                this.$refs.popMenu.close();
+            }
+        },
+        // 设置故障
+        setStoppage() {
+            const step = {
+                start: true,
+                code: `${this.selected.code}`,
+                operation: OperationEvent.Station.stoppage.menu.operation,
+                cmdType: CMD.Station.CMD_STOPPAGE,
+                param: {
+                    Station_Code: `${this.selected.code}`
+                }
+            };
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                } else {
+                    this.$refs.noticeInfo.doShow(step);
+                }
+            }).catch(() => {
+                this.$refs.noticeInfo.doShow(step);
+            });
+        },
+        // 取消故障
+        cancelStoppage() {
+            const step = {
+                start: true,
+                code: `${this.selected.code}`,
+                operation: OperationEvent.Station.cancelStoppage.menu.operation,
+                cmdType: CMD.Station.CMD_CANCEL_STOPPAGE,
+                param: {
+                    Station_Code: `${this.selected.code}`
+                }
+            };
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                } else {
+                    this.$refs.noticeInfo.doShow(step);
+                }
+            }).catch(() => {
+                this.$refs.noticeInfo.doShow(step);
+            });
+        },
+        // 全站设置联锁自动触发
+        setAutoTrigger() {
+            const step = {
+                start: true,
+                code: `${this.selected.code}`,
+                operation: OperationEvent.Station.setAutoTrigger.menu.operation,
+                cmdType: CMD.Station.CMD_STATION_SET_CI_AUTO_TRIGGER,
+                param: {
+                    Station_Code: `${this.selected.code}`
+                }
+            };
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                }
+            }).catch(() => {
+                this.$refs.noticeInfo.doShow(step);
+            });
+        },
+        // 全站取消联锁自动触发
+        cancelAutoTrigger() {
+            const step = {
+                start: true,
+                code: `${this.selected.code}`,
+                operation: OperationEvent.Station.cancelAutoTrigger.menu.operation,
+                cmdType: CMD.Station.CMD_STATION_CANCEL_CI_AUTO_TRIGGER,
+                param: {
+                    Station_Code: `${this.selected.code}`
+                }
+            };
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                }
+            }).catch(() => {
+                this.$refs.noticeInfo.doShow(step);
+            });
+        },
+        // 上电解锁
+        powerUnLock() {
+            const step = {
+                start: true,
+                code: `${this.selected.code}`,
+                operation: OperationEvent.Station.powerUnLock.menu.operation,
+                param: {
+                    Station_Code: `${this.selected.code}`
+                }
+            };
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.stationCmdControl.doShow(step, this.selected);
+                }
+            });
+        },
+        // 执行关键操作测试
+        execKeyOperationTest() {
+            const step = {
+                start: true,
+                code: `${this.selected.code}`,
+                operation: OperationEvent.Station.execKeyOperationTest.menu.operation,
+                param: {
+                    Station_Code: `${this.selected.code}`
+                }
+            };
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.stationCmdControl.doShow(step, this.selected);
+                }
+            });
+        },
+        // 所有进路自排关
+        humanControlALL() {
+            const step = {
+                start: true,
+                code: `${this.selected.code}`,
+                operation: OperationEvent.Station.humanControlALL.menu.operation,
+                param: {
+                    Station_Code: `${this.selected.code}`
+                }
+            };
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.stationHumanControlAll.doShow(step);
+                }
+            });
+        },
+        // 所有进路自排开
+        atsAutoControlALL() {
+            const step = {
+                start: true,
+                code: `${this.selected.code}`,
+                operation: OperationEvent.Station.atsAutoControlALL.menu.operation,
+                param: {
+                    Station_Code: `${this.selected.code}`
+                }
+            };
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.stationSetRouteControlAll.doShow(step, this.selected);
+                }
+            });
+        }
+    }
+};
+</script>
diff --git a/src/jmapNew/theme/xian_01/menus/menuStationStand.vue b/src/jmapNew/theme/xian_01/menus/menuStationStand.vue
new file mode 100644
index 000000000..f96f1ebd0
--- /dev/null
+++ b/src/jmapNew/theme/xian_01/menus/menuStationStand.vue
@@ -0,0 +1,473 @@
+<template>
+  <div>
+    <pop-menu ref="popMenu" :menu="menu" />
+    <stand-control ref="standControl" />
+    <stand-detail ref="standDetail" />
+    <stand-run-level ref="standRunLevel" />
+    <stand-stop-time ref="standStopTime" />
+    <stand-detain-train-all ref="standDetainTrainAll" />
+    <notice-info ref="noticeInfo" />
+    <stand-back-strategy ref="standBackStrategy" />
+  </div>
+</template>
+
+<script>
+import PopMenu from '@/components/PopMenu';
+import StandControl from './dialog/standControl';
+import StandBackStrategy from './dialog/standBackStrategy';
+import StandDetail from './dialog/standDetail';
+import StandRunLevel from './dialog/standRunLevel';
+import StandStopTime from './dialog/standStopTime';
+import StandDetainTrainAll from './dialog/standDetainTrainAll';
+import NoticeInfo from './dialog/childDialog/childDialog/noticeInfo';
+import Handler from '@/scripts/cmdPlugin/Handler';
+import { mapGetters } from 'vuex';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
+import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
+
+export default {
+    name: 'StationStandMenu',
+    components: {
+        PopMenu,
+        StandControl,
+        StandDetail,
+        StandRunLevel,
+        NoticeInfo,
+        StandBackStrategy,
+        StandStopTime,
+        StandDetainTrainAll
+    },
+    props: {
+        selected: {
+            type: Object,
+            default() {
+                return null;
+            }
+        }
+    },
+    data() {
+        return {
+            menu: [],
+            menuNormal: {
+                Local: [
+                    {
+                        label: this.$t('menu.menuStationStand.detainTrain'),
+                        handler: this.setDetainTrain,
+                        cmdType:CMD.Stand.CMD_STAND_SET_HOLD_TRAIN
+                    },
+                    {
+                        label: this.$t('menu.menuStationStand.cancelDetainTrain'),
+                        handler: this.cancelDetainTrain,
+                        cmdType:CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN
+                    },
+                    {
+                        label: this.$t('menu.menuStationStand.cancelDetainTrainForce'),
+                        handler: this.cancelDetainTrainForce,
+                        cmdType:CMD.Stand.CMD_STAND_FORCE_CANCEL_HOLD_TRAIN
+                    },
+                    {
+                        label: this.$t('menu.menuStationStand.jumpStop'),
+                        handler: this.setJumpStop,
+                        cmdType:CMD.Stand.CMD_STAND_SET_JUMP_STOP
+                    },
+                    {
+                        label: this.$t('menu.menuStationStand.cancelJumpStop'),
+                        handler: this.cancelJumpStop,
+                        cmdType:CMD.Stand.CMD_STAND_CANCEL_JUMP_STOP
+                    },
+                    {
+                        label: this.$t('menu.menuStationStand.setRunLevel'),
+                        handler: this.setRunLevel,
+                        cmdType:CMD.Stand.CMD_STAND_SET_RUN_TIME
+                    },
+                    {
+                        label: this.$t('menu.menuStationStand.setEarlyDeparture'),
+                        handler: this.earlyDeparture,
+                        cmdType:CMD.Stand.CMD_STAND_EARLY_DEPART
+                    },
+                    {
+                        label: this.$t('menu.menuStationStand.setBackStrategy'),
+                        handler: this.setBackStrategy,
+                        cmdType:CMD.Stand.CMD_STAND_SET_REENTRY_STRATEGY
+                    },
+                    {
+                        label: this.$t('menu.menuStationStand.getStationStandStatus'),
+                        handler: this.detail,
+                        cmdType:CMD.Stand.CMD_STAND_VIEW_STATUS
+                    }
+                ],
+                Center: [
+                    {
+                        label: this.$t('menu.menuStationStand.detainTrain'),
+                        handler: this.setDetainTrain,
+                        cmdType:CMD.Stand.CMD_STAND_SET_HOLD_TRAIN
+                    },
+                    {
+                        label: this.$t('menu.menuStationStand.cancelDetainTrain'),
+                        handler: this.cancelDetainTrain,
+                        cmdType:CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN
+                    },
+                    {
+                        label: this.$t('menu.menuStationStand.cancelDetainTrainAll'),
+                        handler: this.cancelDetainTrainAll,
+                        cmdType:CMD.Stand.CMD_STAND_WHOLE_LINE_CANCEL_HOLD_TRAIN
+                    },
+                    {
+                        label: this.$t('menu.menuStationStand.jumpStop'),
+                        handler: this.setJumpStop,
+                        cmdType:CMD.Stand.CMD_STAND_SET_JUMP_STOP
+                    },
+                    {
+                        label: this.$t('menu.menuStationStand.cancelJumpStop'),
+                        handler: this.cancelJumpStop,
+                        cmdType:CMD.Stand.CMD_STAND_CANCEL_JUMP_STOP
+                    },
+                    {
+                        label: this.$t('menu.menuStationStand.setStopTime'),
+                        handler: this.setStopTime,
+                        cmdType:CMD.Stand.CMD_STAND_SET_PARK_TIME
+                    },
+                    {
+                        label: this.$t('menu.menuStationStand.setRunLevel'),
+                        handler: this.setRunLevel,
+                        cmdType:CMD.Stand.CMD_STAND_SET_RUN_TIME
+                    },
+                    {
+                        label: this.$t('menu.menuStationStand.setEarlyDeparture'),
+                        handler: this.earlyDeparture,
+                        cmdType:CMD.Stand.CMD_STAND_EARLY_DEPART
+                    },
+                    {
+                        label: this.$t('menu.menuStationStand.setBackStrategy'),
+                        handler: this.setBackStrategy,
+                        cmdType:CMD.Stand.CMD_STAND_SET_REENTRY_STRATEGY
+                    },
+                    {
+                        label: this.$t('menu.menuStationStand.getStationStandStatus'),
+                        handler: this.detail,
+                        cmdType:CMD.Stand.CMD_STAND_VIEW_STATUS
+                    }
+                ]
+            },
+            menuForce: [
+                {
+                    label: this.$t('menu.menuStationStand.setFault'),
+                    handler: this.setStoppage,
+                    cmdType:CMD.Stand.CMD_STAND_ADD_FAULT
+                },
+                {
+                    label: this.$t('menu.menuStationStand.cancelFault'),
+                    handler: this.cancelStoppage,
+                    cmdType:CMD.Stand.CMD_STAND_REMOVE_FAULT
+                }
+            ]
+        };
+    },
+    computed: {
+        ...mapGetters('training', [
+            'mode',
+            'operatemode'
+        ]),
+        ...mapGetters('menuOperation', [
+            'buttonOperation'
+        ])
+    },
+    watch: {
+        '$store.state.menuOperation.menuCount': function (val) {
+            if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.StationStand) && !this.buttonOperation) {
+                this.doShow(this.$store.state.menuOperation.menuPosition);
+            } else {
+                this.doClose();
+            }
+        }
+    },
+    methods: {
+        clickEvent() {
+            const self = this;
+            window.onclick = function (e) {
+                self.doClose();
+            };
+        },
+        initMenu() {
+            // 编辑模式菜单列表
+            this.menu = MenuContextHandler.covert(this.menuNormal);
+            // this.menu = MenuContextHandler.menuFiltration(this.menuNormal);
+            if (this.operatemode === OperateMode.ADMIN) {
+                this.menu = [...this.menu, ...this.menuForce];
+            }
+
+            // 故障模式菜单列表
+            if (this.operatemode === OperateMode.FAULT) {
+                this.menu = this.menuForce;
+            }
+
+            // this.menu = MenuContextHandler.covert(this.menu);
+        },
+        doShow(point) {
+            this.clickEvent();
+            this.initMenu();
+            if (this.$refs && this.$refs.popMenu && this.menu && this.menu.length) {
+                this.$refs.popMenu.resetShowPosition(point);
+            }
+        },
+        doClose() {
+            if (this.$refs && this.$refs.popMenu) {
+                this.$refs.popMenu.close();
+            }
+        },
+        // 设置故障
+        setStoppage() {
+            const step = {
+                start: true,
+                code: `${this.selected.code}`,
+                operation: OperationEvent.StationStand.stoppage.menu.operation,
+                cmdType: CMD.Stand.CMD_STAND_ADD_FAULT,
+                param: {
+                    StationStand_Code: `${this.selected.code}`
+                }
+            };
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                } else {
+                    this.$refs.noticeInfo.doShow(step);
+                }
+            }).catch(() => {
+                this.$refs.noticeInfo.doShow(step);
+            });
+        },
+        // 取消故障
+        cancelStoppage() {
+            const step = {
+                start: true,
+                code: `${this.selected.code}`,
+                operation: OperationEvent.StationStand.cancelStoppage.menu.operation,
+                cmdType: CMD.Stand.CMD_STAND_REMOVE_FAULT,
+                param: {
+                    StationStand_Code: `${this.selected.code}`
+                }
+            };
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                } else {
+                    this.$refs.noticeInfo.doShow(step);
+                }
+            }).catch(() => {
+                this.$refs.noticeInfo.doShow(step);
+            });
+        },
+        // 设置扣车
+        setDetainTrain() {
+            const step = {
+                start: true,
+                code: `${this.selected.code}`,
+                operation: OperationEvent.StationStand.setDetainTrain.menu.operation,
+                param: {
+                    StationStand_Code: `${this.selected.code}`
+                }
+            };
+
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.standControl.doShow(step, this.selected);
+                }
+            });
+        },
+        // 取消扣车
+        cancelDetainTrain() {
+            const step = {
+                start: true,
+                code: `${this.selected.code}`,
+                operation: OperationEvent.StationStand.cancelDetainTrain.menu.operation,
+                param: {
+                    StationStand_Code: `${this.selected.code}`
+                }
+            };
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.standControl.doShow(step, this.selected);
+                }
+            });
+        },
+        // 强制取消扣车
+        cancelDetainTrainForce() {
+            const step = {
+                start: true,
+                code: `${this.selected.code}`,
+                operation: OperationEvent.StationStand.cancelDetainTrainForce.menu.operation,
+                param: {
+                    StationStand_Code: `${this.selected.code}`
+                }
+            };
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.standControl.doShow(step, this.selected);
+                }
+            });
+        },
+        // 全线取消扣车
+        cancelDetainTrainAll() {
+            const step = {
+                start: true,
+                code: `${this.selected.code}`,
+                operation: OperationEvent.StationStand.cancelDetainTrainAll.menu.operation,
+                param: {
+                    StationStand_Code: `${this.selected.code}`
+                }
+            };
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.standDetainTrainAll.doShow(step, this.selected);
+                }
+            });
+        },
+        // 设置跳停
+        setJumpStop() {
+            const step = {
+                start: true,
+                code: `${this.selected.code}`,
+                operation: OperationEvent.StationStand.setJumpStop.menu.operation,
+                param: {
+                    StationStand_Code: `${this.selected.code}`
+                }
+            };
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.standControl.doShow(step, this.selected);
+                }
+            });
+        },
+        // 取消跳停
+        cancelJumpStop() {
+            const step = {
+                start: true,
+                code: `${this.selected.code}`,
+                operation: OperationEvent.StationStand.cancelJumpStop.menu.operation,
+                param: {
+                    StationStand_Code: `${this.selected.code}`
+                }
+            };
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.standControl.doShow(step, this.selected);
+                }
+            });
+        },
+        // 设置停站时间
+        setStopTime() {
+            const step = {
+                start: true,
+                code: `${this.selected.code}`,
+                operation: OperationEvent.StationStand.setStopTime.menu.operation,
+                param: {
+                    StationStand_Code: `${this.selected.code}`
+                }
+            };
+            this.$store.dispatch('training/next', step).then(({ valid, response }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    Handler.execute(CMD.Stand.CMD_STAND_VIEW_STATUS, {StationStand_Code: `${this.selected.code}`}).then(resp => {
+                        const tempData = resp.data;
+                        this.$refs.standStopTime.doShow(step, this.selected, tempData);
+                    });
+                }
+            }).catch(() => {
+                this.$refs.noticeInfo.doShow(step);
+            });
+        },
+        // 设置运行等级
+        setRunLevel() {
+            const step = {
+                start: true,
+                code: `${this.selected.code}`,
+                operation: OperationEvent.StationStand.setRunLevel.menu.operation,
+                param: {
+                    StationStand_Code: `${this.selected.code}`
+                }
+            };
+            this.$store.dispatch('training/next', step).then(({ valid, response }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    Handler.execute(CMD.Stand.CMD_STAND_VIEW_STATUS, {StationStand_Code: `${this.selected.code}`}).then(resp => {
+                        const tempData = resp.data;
+                        this.$refs.standRunLevel.doShow(step, this.selected, tempData);
+                    });
+                }
+            }).catch(() => {
+                this.$refs.noticeInfo.doShow(step);
+            });
+        },
+        // 设置提前发车
+        earlyDeparture() {
+            const step = {
+                start: true,
+                code: `${this.selected.code}`,
+                operation: OperationEvent.StationStand.earlyDeparture.menu.operation,
+                param: {
+                    StationStand_Code: `${this.selected.code}`
+                }
+            };
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.standControl.doShow(step, this.selected);
+                }
+            });
+        },
+        // 设置折返策略
+        setBackStrategy() {
+            const step = {
+                start: true,
+                code: `${this.selected.code}`,
+                operation: OperationEvent.StationStand.setBackStrategy.menu.operation,
+                param: {
+                    StationStand_Code: `${this.selected.code}`
+                }
+            };
+
+            this.$store.dispatch('training/next', step).then(({ valid, response }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    Handler.execute(CMD.Stand.CMD_STAND_VIEW_STATUS, {StationStand_Code: `${this.selected.code}`}).then(resp => {
+                        const tempData = resp.data;
+                        this.$refs.standBackStrategy.doShow(step, this.selected, tempData);
+                    });
+                }
+            }).catch(() => {
+                this.$refs.noticeInfo.doShow(step);
+            });
+        },
+        // 查询站台状态
+        detail() {
+            const step = {
+                start: true,
+                code: `${this.selected.code}`,
+                operation: OperationEvent.StationStand.detail.menu.operation,
+                param: {
+                    StationStand_Code: `${this.selected.code}`
+                }
+            };
+            this.$store.dispatch('training/next', step).then(({ valid, response }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    Handler.execute(CMD.Stand.CMD_STAND_VIEW_STATUS, {StationStand_Code: `${this.selected.code}`}).then(resp => {
+                        const tempData = resp.data;
+                        this.$refs.standDetail.doShow(step, this.selected, tempData);
+                    });
+                }
+            }).catch(() => {
+                this.$refs.noticeInfo.doShow(step);
+            });
+        }
+    }
+};
+</script>
diff --git a/src/jmapNew/theme/xian_01/menus/menuSwitch.vue b/src/jmapNew/theme/xian_01/menus/menuSwitch.vue
new file mode 100644
index 000000000..2ae658968
--- /dev/null
+++ b/src/jmapNew/theme/xian_01/menus/menuSwitch.vue
@@ -0,0 +1,484 @@
+<template>
+  <div>
+    <pop-menu ref="popMenu" :menu="menu" />
+    <switch-control ref="switchControl" />
+    <switch-cmd-control ref="switchCmdControl" />
+    <speed-cmd-control ref="speedCmdControl" />
+    <notice-info ref="noticeInfo" />
+  </div>
+</template>
+
+<script>
+import PopMenu from '@/components/PopMenu';
+import SwitchControl from './dialog/switchControl';
+import SwitchCmdControl from './dialog/switchCmdControl';
+import SpeedCmdControl from './dialog/speedCmdControl';
+import NoticeInfo from './dialog/childDialog/childDialog/noticeInfo';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
+import { mapGetters } from 'vuex';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
+import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
+
+export default {
+    name: 'SwitchMenu',
+    components: {
+        PopMenu,
+        SwitchControl,
+        SwitchCmdControl,
+        SpeedCmdControl,
+        NoticeInfo
+    },
+    props: {
+        selected: {
+            type: Object,
+            default() {
+                return null;
+            }
+        }
+    },
+    data() {
+        return {
+            menu: [],
+            menuNormal: {
+                Local: [
+                    {
+                        label: this.$t('menu.menuSwitch.switchLock'),
+                        handler: this.lock,
+                        auth: { station: true, center: false },
+                        cmdType:CMD.Switch.CMD_SWITCH_SINGLE_LOCK
+                    },
+                    {
+                        label: this.$t('menu.menuSwitch.switchUnlock'),
+                        handler: this.unlock,
+                        auth: { station: true, center: false },
+                        cmdType:CMD.Switch.CMD_SWITCH_SINGLE_UNLOCK
+                    },
+                    {
+                        label: this.$t('menu.menuSwitch.switchSectionBlockade'),
+                        handler: this.block,
+                        auth: { station: true, center: false },
+                        cmdType:CMD.Switch.CMD_SWITCH_BLOCK
+                    },
+                    {
+                        label: this.$t('menu.menuSwitch.switchSectionUnblock'),
+                        handler: this.unblock,
+                        auth: { station: true, center: false },
+                        cmdType:CMD.Switch.CMD_SWITCH_UNBLOCK
+                    },
+                    {
+                        label: this.$t('menu.menuSwitch.switchTurnout'),
+                        handler: this.switchTurnout,
+                        auth: { station: true, center: false },
+                        cmdType:CMD.Switch.CMD_SWITCH_TURN
+                    },
+                    {
+                        label: this.$t('menu.menuSwitch.switchSectionFaultUnlock'),
+                        handler: this.fault,
+                        auth: { station: true, center: false },
+                        cmdType:CMD.Switch.CMD_SWITCH_FAULT_UNLOCK
+                    },
+                    {
+                        label: this.$t('menu.menuSwitch.switchSectionAxisPreReset'),
+                        handler: this.axlePreReset,
+                        auth: { station: true, center: false },
+                        cmdType:CMD.Switch.CMD_SWITCH_AXIS_PRE_RESET
+                    },
+                    {
+                        label: this.$t('menu.menuSwitch.sectionResection'),
+                        handler: this.split,
+                        auth: { station: true, center: false },
+                        cmdType:CMD.Switch.CMD_SWITCH_CUT_OFF
+                    },
+                    {
+                        label: this.$t('menu.menuSwitch.sectionActive'),
+                        handler: this.active,
+                        auth: { station: true, center: false },
+                        cmdType:CMD.Switch.CMD_SWITCH_ACTIVE
+                    },
+                    {
+                        label: this.$t('menu.menuSwitch.switchSectionSetSpeedLimit'),
+                        handler: this.setSpeed,
+                        auth: { station: true, center: false },
+                        cmdType:CMD.Switch.CMD_SWITCH_SET_LIMIT_SPEED
+                    },
+                    {
+                        label: this.$t('menu.menuSwitch.switchSectionCancelSpeedLimit'),
+                        handler: this.cancelSpeed,
+                        auth: { station: true, center: false },
+                        cmdType:CMD.Switch.CMD_SWITCH_CANCEL_LIMIT_SPEED
+                    }
+                ],
+                Center: [
+                    {
+                        label: this.$t('menu.menuSwitch.switchLock'),
+                        handler: this.lock,
+                        auth: { station: false, center: true },
+                        cmdType:CMD.Switch.CMD_SWITCH_SINGLE_LOCK
+                    },
+                    {
+                        label: this.$t('menu.menuSwitch.switchUnlock'),
+                        handler: this.unlock,
+                        auth: { station: false, center: true },
+                        cmdType:CMD.Switch.CMD_SWITCH_SINGLE_UNLOCK
+                    },
+                    {
+                        label: this.$t('menu.menuSwitch.switchSectionBlockade'),
+                        handler: this.block,
+                        auth: { station: false, center: true },
+                        cmdType:CMD.Switch.CMD_SWITCH_BLOCK
+                    },
+                    {
+                        label: this.$t('menu.menuSwitch.switchSectionUnblock'),
+                        handler: this.unblock,
+                        auth: { station: false, center: true },
+                        cmdType:CMD.Switch.CMD_SWITCH_UNBLOCK
+                    },
+                    {
+                        label: this.$t('menu.menuSwitch.switchTurnout'),
+                        handler: this.switchTurnout,
+                        auth: { station: false, center: true },
+                        cmdType:CMD.Switch.CMD_SWITCH_TURN
+                    },
+                    {
+                        label: this.$t('menu.menuSwitch.switchSectionFaultUnlock'),
+                        handler: this.fault,
+                        auth: { station: false, center: true },
+                        cmdType:CMD.Switch.CMD_SWITCH_FAULT_UNLOCK
+                    },
+                    {
+                        label: this.$t('menu.menuSwitch.sectionResection'),
+                        handler: this.split,
+                        auth: { station: true, center: true },
+                        cmdType:CMD.Switch.CMD_SWITCH_CUT_OFF
+                    },
+                    {
+                        label: this.$t('menu.menuSwitch.sectionActive'),
+                        handler: this.active,
+                        auth: { station: true, center: true },
+                        cmdType:CMD.Switch.CMD_SWITCH_ACTIVE
+                    },
+                    {
+                        label: this.$t('menu.menuSwitch.switchSectionSetSpeedLimit'),
+                        handler: this.setSpeed,
+                        cmdType:CMD.Switch.CMD_SWITCH_SET_LIMIT_SPEED
+                    },
+                    {
+                        label: this.$t('menu.menuSwitch.switchSectionCancelSpeedLimit'),
+                        handler: this.cancelSpeed,
+                        cmdType:CMD.Switch.CMD_SWITCH_CANCEL_LIMIT_SPEED
+                    }
+                ]
+            },
+            menuForce: [
+                {
+                    label: this.$t('menu.menuSwitch.setFault'),
+                    handler: this.setStoppage,
+                    auth: {
+
+                    },
+                    cmdType:CMD.Switch.CMD_SWITCH_ADD_FAULT
+                },
+                {
+                    label: this.$t('menu.menuSwitch.cancelFault'),
+                    handler: this.cancelStoppage,
+                    auth: {
+
+                    },
+                    cmdType:CMD.Switch.CMD_SWITCH_REMOVE_FAULT
+                }
+            ]
+        };
+    },
+    computed: {
+        ...mapGetters('training', [
+            'mode',
+            'operatemode'
+        ]),
+        ...mapGetters('menuOperation', [
+            'buttonOperation'
+        ])
+    },
+    watch: {
+        '$store.state.menuOperation.menuCount': function (val) {
+            if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.Switch) && !this.buttonOperation) {
+                this.doShow(this.$store.state.menuOperation.menuPosition);
+            } else {
+                this.doClose();
+            }
+        }
+    },
+    methods: {
+        clickEvent() {
+            const self = this;
+            window.onclick = function (e) {
+                self.doClose();
+            };
+        },
+        initMenu() {
+            // 编辑模式菜单列表
+            this.menu = MenuContextHandler.covert(this.menuNormal);
+            // this.menu = MenuContextHandler.menuFiltration(this.menuNormal);
+            if (this.operatemode === OperateMode.ADMIN) {
+                this.menu = [...this.menu, ...this.menuForce];
+            }
+
+            // 故障模式菜单列表
+            if (this.operatemode === OperateMode.FAULT) {
+                this.menu = this.menuForce;
+            }
+
+            // this.menu = MenuContextHandler.covert(this.menu);
+        },
+        doShow(point) {
+            this.clickEvent();
+            this.initMenu();
+            if (this.$refs && this.$refs.popMenu && this.menu && this.menu.length) {
+                this.$refs.popMenu.resetShowPosition(point);
+            }
+        },
+        doClose() {
+            if (this.$refs && this.$refs.popMenu) {
+                this.$refs.popMenu.close();
+            }
+        },
+        // 设置故障
+        setStoppage() {
+            const step = {
+                start: true,
+                operation: OperationEvent.Switch.stoppage.menu.operation,
+                cmdType: CMD.Switch.CMD_STOPPAGE,
+                param: {
+                    Switch_Code: this.selected.code
+                }
+            };
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                } else {
+                    this.$refs.noticeInfo.doShow(step);
+                }
+            }).catch(() => {
+                this.$refs.noticeInfo.doShow(step);
+            });
+        },
+        // 取消故障
+        cancelStoppage() {
+            const step = {
+                start: true,
+                operation: OperationEvent.Switch.cancelStoppage.menu.operation,
+                cmdType: CMD.Switch.CMD_CANCEL_STOPPAGE,
+                param: {
+                    Switch_Code: this.selected.code
+                }
+            };
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                } else {
+                    this.$refs.noticeInfo.doShow(step);
+                }
+            }).catch(() => {
+                this.$refs.noticeInfo.doShow(step);
+            });
+        },
+        // 道岔单锁
+        lock() {
+            const step = {
+                start: true,
+                operation: OperationEvent.Switch.lock.menu.operation,
+                param: {
+                    Switch_Code: this.selected.code
+                }
+            };
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.switchControl.doShow(step, this.selected);
+                }
+            });
+        },
+        // 道岔解封
+        unlock() {
+            const step = {
+                start: true,
+                operation: OperationEvent.Switch.unlock.menu.operation,
+                param: {
+                    Switch_Code: this.selected.code
+                }
+            };
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.switchCmdControl.doShow(step, this.selected);
+                }
+            });
+        },
+        // 道岔封锁
+        block() {
+            const step = {
+                start: true,
+                operation: OperationEvent.Switch.block.menu.operation,
+                param: {
+                    Switch_Code: this.selected.code
+                }
+            };
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.switchControl.doShow(step, this.selected);
+                }
+            });
+        },
+        // 道岔解封
+        unblock() {
+            const step = {
+                start: true,
+                operation: OperationEvent.Switch.unblock.menu.operation,
+                param: {
+                    Switch_Code: this.selected.code
+                }
+            };
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.switchCmdControl.doShow(step, this.selected);
+                }
+            });
+        },
+        // 道岔强扳
+        switchTurnoutForce() {
+            const step = {
+                start: true,
+                operation: OperationEvent.Switch.turnoutForce.menu.operation,
+                param: {
+                    Switch_Code: this.selected.code
+                }
+            };
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.switchControl.doShow(step, this.selected);
+                }
+            });
+        },
+        // 道岔转动
+        switchTurnout() {
+            const step = {
+                start: true,
+                operation: OperationEvent.Switch.turnout.menu.operation,
+                param: {
+                    Switch_Code: this.selected.code
+                }
+            };
+
+            if (step.operation) {
+                this.$store.dispatch('training/next', step).then(({ valid }) => {
+                    if (valid) {
+                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                        this.$refs.switchControl.doShow(step, this.selected);
+                    }
+                });
+            }
+        },
+        // 道岔故障解锁
+        fault() {
+            const step = {
+                start: true,
+                operation: OperationEvent.Switch.fault.menu.operation,
+                param: {
+                    Switch_Code: this.selected.code
+                }
+            };
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.switchCmdControl.doShow(step, this.selected);
+                }
+            });
+        },
+        // 道岔计轴预复位
+        axlePreReset() {
+            const step = {
+                start: true,
+                operation: OperationEvent.Switch.axlePreReset.menu.operation,
+                param: {
+                    Switch_Code: this.selected.code
+                }
+            };
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.switchCmdControl.doShow(step, this.selected);
+                }
+            });
+        },
+        // 区段切除
+        split() {
+            const step = {
+                start: true,
+                operation: OperationEvent.Switch.split.menu.operation,
+                param: {
+                    Switch_Code: this.selected.code
+                }
+            };
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.switchControl.doShow(step, this.selected);
+                }
+            });
+        },
+        // 区段激活
+        active() {
+            const step = {
+                start: true,
+                operation: OperationEvent.Switch.active.menu.operation,
+                param: {
+                    Switch_Code: this.selected.code
+                }
+            };
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.switchControl.doShow(step, this.selected);
+                }
+            });
+        },
+        // 道岔设置速度
+        setSpeed() {
+            const step = {
+                start: true,
+                operation: OperationEvent.Switch.setSpeed.menu.operation,
+                param: {
+                    Switch_Code: this.selected.code
+                }
+            };
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.speedCmdControl.doShow(step, this.selected);
+                }
+            });
+        },
+        // 道岔取消速度
+        cancelSpeed() {
+            const step = {
+                start: true,
+                operation: OperationEvent.Switch.cancelSpeed.menu.operation,
+                cmdType: CMD.Switch.CMD_CANCEL_SPEED,
+                param: {
+                    Switch_Code: this.selected.code
+                }
+            };
+            this.$store.dispatch('training/next', step).then(({ valid, response }) => {
+                if (valid) {
+                    const tempData = response.data;
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.speedCmdControl.doShow(step, this.selected, tempData);
+                }
+            });
+        }
+    }
+};
+</script>
diff --git a/src/jmapNew/theme/xian_01/menus/menuTrain.vue b/src/jmapNew/theme/xian_01/menus/menuTrain.vue
new file mode 100644
index 000000000..7f215a543
--- /dev/null
+++ b/src/jmapNew/theme/xian_01/menus/menuTrain.vue
@@ -0,0 +1,332 @@
+<template>
+  <div>
+    <pop-menu ref="popMenu" :menu="menu" />
+    <notice-info ref="noticeInfo" />
+    <train-control ref="trainControl" />
+    <train-delete ref="trainDelete" />
+    <train-move ref="trainMove" />
+    <train-switch ref="trainSwitch" />
+    <train-edit-number ref="trainEditNumber" />
+  </div>
+</template>
+
+<script>
+import PopMenu from '@/components/PopMenu';
+import NoticeInfo from './dialog/childDialog/childDialog/noticeInfo';
+import { mapGetters } from 'vuex';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
+import TrainControl from './dialog/trainControl';
+import TrainDelete from './dialog/trainDelete';
+import TrainMove from './dialog/trainMove';
+import TrainSwitch from './dialog/trainSwitch';
+import TrainEditNumber from './dialog/trainEditNumber';
+import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
+
+export default {
+    name: 'MenuTrain',
+    components: {
+        PopMenu,
+        NoticeInfo,
+        TrainControl,
+        TrainDelete,
+        TrainMove,
+        TrainSwitch,
+        TrainEditNumber
+    },
+    props: {
+        selected: {
+            type: Object,
+            default() {
+                return null;
+            }
+        }
+    },
+    data() {
+        return {
+            menu: [],
+            menuNormal: {
+                Local: [],
+                Center: [
+                    // {
+                    //     label: this.$t('menu.menuTrain.addTrainId'),
+                    //     handler: this.addTrainId,
+                    //     auth: { station: true, center: true },
+                    //     cmdType:CMD.Train.CMD_SWITCH_REMOVE_FAULT
+                    // },
+                    // {
+                    //     label: this.$t('menu.menuTrain.deleteTrainId'),
+                    //     handler: this.delTrainId,
+                    //     auth: { station: true, center: true },
+                    //     cmdType:CMD.Train.CMD_SWITCH_REMOVE_FAULT
+                    // },
+                    // {
+                    //     label: this.$t('menu.menuTrain.editTrainId'),
+                    //     handler: this.editTrainId,
+                    //     auth: { station: true, center: true },
+                    //     cmdType:CMD.Train.CMD_SWITCH_REMOVE_FAULT
+                    // },
+                    // {
+                    //     label: this.$t('menu.menuTrain.editTrainNo'),
+                    //     handler: this.editTrainNo,
+                    //     auth: { station: true, center: true },
+                    //     cmdType:CMD.Train.CMD_SWITCH_REMOVE_FAULT
+                    // },
+                    // {
+                    //     label: this.$t('menu.menuTrain.moveTrainId'),
+                    //     handler: this.moveTrainId,
+                    //     auth: { station: true, center: true },
+                    //     cmdType:CMD.Train.CMD_SWITCH_REMOVE_FAULT
+                    // },
+                    // {
+                    //     label: this.$t('menu.menuTrain.switchTrainId'),
+                    //     handler: this.switchTrainId,
+                    //     auth: { station: true, center: true },
+                    //     cmdType:CMD.Train.CMD_SWITCH_REMOVE_FAULT
+                    // }
+                ]
+            },
+            menuForce: [
+                {
+                    label: this.$t('menu.menuTrain.setCommunicationFault'),
+                    handler: this.setStoppage,
+                    cmdType:CMD.Train.CMD_TRAIN_ADD_FAULT
+                },
+                {
+                    label: this.$t('menu.menuTrain.cancelCommunicationFault'),
+                    handler: this.cancelStoppage,
+                    cmdType:CMD.Train.CMD_TRAIN_REMOVE_FAULT
+                }
+            ],
+            menuSpeed: [
+                {
+                    label: this.$t('menu.menuTrain.confirmRunToFrontStation'),
+                    handler: this.limitSpeed,
+                    cmdType:CMD.Train.CMD_TRAIN_MANUAL_LIMIT_DRIVE
+                }
+            ]
+        };
+    },
+    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 = MenuContextHandler.menuFiltration(this.menuNormal);
+            this.menu = MenuContextHandler.covert(this.menuNormal);
+            if (this.operatemode === OperateMode.ADMIN) {
+                this.menu = [...this.menu, ...this.menuForce, ...this.menuSpeed];
+            }
+
+            // 故障模式菜单列表
+            if (this.operatemode === OperateMode.FAULT) {
+                this.menu = [...this.menuForce, ...this.menuSpeed];
+            }
+
+            // this.menu = MenuContextHandler.covert(this.menu);
+        },
+        doShow(point) {
+            this.clickEvent();
+            this.initMenu();
+
+            if (this.$refs && this.$refs.popMenu && this.menu && this.menu.length) {
+                this.$refs.popMenu.resetShowPosition(point);
+            }
+        },
+        doClose() {
+            if (this.$refs && this.$refs.popMenu) {
+                this.$refs.popMenu.close();
+                // this.$store.dispatch('map/setTrainWindowShow', false);
+            }
+        },
+        // 设置故障
+        setStoppage() {
+            const step = {
+                start: true,
+
+                operation: OperationEvent.Train.stoppage.menu.operation,
+                cmdType: CMD.Train.CMD_STOPPAGE,
+                param: {
+                    code: this.selected.code
+                }
+            };
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                } else {
+                    this.$refs.noticeInfo.doShow(step);
+                }
+            }).catch(() => {
+                this.$refs.noticeInfo.doShow(step);
+            });
+        },
+        // 取消故障
+        cancelStoppage() {
+            const step = {
+                start: true,
+
+                operation: OperationEvent.Train.cancelStoppage.menu.operation,
+                cmdType: CMD.Train.CMD_CANCEL_STOPPAGE,
+                param: {
+                    code: this.selected.code
+                }
+            };
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                } else {
+                    this.$refs.noticeInfo.doShow(step);
+                }
+            }).catch(() => {
+                this.$refs.noticeInfo.doShow(step);
+            });
+        },
+        // 限速行驶
+        limitSpeed() {
+            const step = {
+                start: true,
+
+                operation: OperationEvent.Train.limitSpeed.menu.operation,
+                cmdType: CMD.Train.CMD_LIMIT_SPEED,
+                param: {
+                    code: this.selected.code
+                }
+            };
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                } else {
+                    this.$refs.noticeInfo.doShow(step);
+                }
+            }).catch(() => {
+                this.$refs.noticeInfo.doShow(step);
+            });
+        },
+        // 添加列车识别号
+        addTrainId() {
+            const step = {
+                start: true,
+
+                operation: OperationEvent.Train.addTrainId.menu.operation,
+                param: {
+                    code: this.selected.code
+                }
+            };
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.trainControl.doShow(step, this.selected);
+                }
+            });
+        },
+        // 删除列车识别号
+        delTrainId() {
+            const step = {
+                start: true,
+
+                operation: OperationEvent.Train.delTrainId.menu.operation,
+                param: {
+                    code: this.selected.code
+                }
+            };
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.trainDelete.doShow(step, this.selected);
+                }
+            });
+        },
+        // 修改列车识别号
+        editTrainId() {
+            const step = {
+                start: true,
+
+                operation: OperationEvent.Train.editTrainId.menu.operation,
+                param: {
+                    code: this.selected.code
+                }
+            };
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.trainControl.doShow(step, this.selected);
+                }
+            });
+        },
+        // 修改车组号
+        editTrainNo() {
+            const step = {
+                start: true,
+
+                operation: OperationEvent.Train.editTrainNo.menu.operation,
+                param: {
+                    code: this.selected.code
+                }
+            };
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.trainEditNumber.doShow(step, this.selected);
+                }
+            });
+        },
+        // 移动列车识别号
+        moveTrainId() {
+            const step = {
+                start: true,
+
+                operation: OperationEvent.Train.moveTrainId.menu.operation,
+                param: {
+                    code: this.selected.code
+                }
+            };
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.trainMove.doShow(step, this.selected);
+                }
+            });
+        },
+        // 交换列车识别号
+        switchTrainId() {
+            const step = {
+                start: true,
+
+                operation: OperationEvent.Train.switchTrainId.menu.operation,
+                param: {
+                    code: this.selected.code
+                }
+            };
+            this.$store.dispatch('training/next', step).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.trainSwitch.doShow(step, this.selected);
+                }
+            });
+        }
+    }
+};
+</script>
diff --git a/src/jmapNew/theme/xian_01/menus/passiveDialog/alarm.vue b/src/jmapNew/theme/xian_01/menus/passiveDialog/alarm.vue
new file mode 100644
index 000000000..471f03888
--- /dev/null
+++ b/src/jmapNew/theme/xian_01/menus/passiveDialog/alarm.vue
@@ -0,0 +1,218 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    class="fuzhou-01__systerm alarm-detail"
+    :title="level+$t('menu.passiveDialog.alarmDetailInformation')"
+    :visible.sync="show"
+    width="760px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <el-form label-width="80px" size="mini">
+      <el-row>
+        <el-col :span="8">
+          <el-form-item :label="$t('menu.passiveDialog.lineName')">
+            <el-input v-model="model.lineName" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item :label="$t('menu.passiveDialog.unitName')">
+            <el-input v-model="model.unitName" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item :label="$t('menu.passiveDialog.moduleName')">
+            <el-input v-model="model.moduleName" disabled />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="9">
+          <el-form-item :label="$t('menu.passiveDialog.alarmDate')">
+            <el-date-picker v-model="model.alarmDate" type="datetime" :placeholder="$t('menu.passiveDialog.selectDate')" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="7">
+          <el-form-item>
+            <span slot="label">{{ $t('menu.passiveDialog.level') }}</span>
+            <el-input v-model="model.level" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item :label="$t('menu.passiveDialog.confirmStatus')">
+            <el-input v-model="model.confirm" disabled />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="9" class="alarm-type">
+          <el-form-item>
+            <span slot="label">{{ $t('menu.passiveDialog.type') }}</span>
+            <el-input v-model="model.type" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="15" class="alarm-child-type">
+          <el-form-item :label="$t('menu.passiveDialog.childType')">
+            <el-input v-model="model.childType" disabled />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-form-item :label="$t('menu.passiveDialog.timeSummary')">
+        <el-input v-model="model.timeSummary" disabled />
+      </el-form-item>
+      <el-form-item :label="$t('menu.passiveDialog.recommendedOperation')">
+        <el-input v-model="model.recommendedOperation" disabled />
+      </el-form-item>
+      <div class="alarm-detail-description">
+        <span>{{ $t('menu.passiveDialog.alarmDetailedDescription') }}</span><br>
+        <el-input v-model="model.alarmDetail" type="textarea" :rows="5" :placeholder="$t('menu.passiveDialog.inputContent')" disabled />
+      </div>
+    </el-form>
+    <el-row class="button-group">
+      <el-col :span="3" :offset="9">
+        <el-button :id="domIdCancel" type="primary" :loading="loading" @click="commit">{{ $t('menu.passiveDialog.confirm') }}</el-button>
+      </el-col>
+      <el-col :span="10">
+        <span style="line-height:26px">{{ $t('menu.passiveDialog.unconfirmedMessageOne') }}{{ level }}{{ $t('menu.passiveDialog.unconfirmedMessageTwo') }}</span>
+      </el-col>
+    </el-row>
+  </el-dialog>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+
+export default {
+    name: 'AlarmDetail',
+    data() {
+        return {
+            dialogShow: false,
+            loading: false,
+            level: 0,
+            operate: null,
+            controlProps: {
+                '01': this.$t('menu.passiveDialog.centralControl'),
+                '02': this.$t('menu.passiveDialog.stationControl')
+            },
+            model: {
+                lineName: '',
+                unitName: '',
+                moduleName: '',
+                level: '',
+                confirm: '',
+                alarmDate: '',
+                type: '',
+                childType: '',
+                timeSummary: '',
+                recommendedOperation: '',
+                alarmDetail: ''
+            }
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'name'
+        ]),
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
+        },
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.close.alarm.domId : '';
+        }
+    },
+    watch: {
+        '$store.state.socket.msgHead': function (elem) {
+            if (elem && elem.type == 'resp' && elem.agree) {
+                if (elem.agree) {
+                    const operate = this.$store.state.training.operate;
+                    const control = this.$store.getters['map/getDeviceByCode'](elem.stationControlCode);
+                    const station = this.$store.getters['map/getDeviceByCode'](control.stationCode);
+                    const newOperate = {
+                        type: operate.type,
+                        name: station.name,
+                        currentMode: elem.currentMode
+                    };
+
+                    this.doShow(newOperate);
+                }
+            }
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(operate) {
+            this.operate = operate || {};
+            this.model = {
+                lineName: this.name,
+                unitName: this.operate.name,
+                moduleName: this.$t('menu.passiveDialog.cmmControlModeConversionMode'),
+                level: this.$t('menu.passiveDialog.zeroLevelAlarm'),
+                confirm: this.$t('menu.passiveDialog.confirmStatus'),
+                alarmDate: new Date(),
+                type: this.$t('menu.passiveDialog.systemEvent'),
+                childType: this.$t('menu.passiveDialog.childTypeTips'),
+                timeSummary: this.$t('menu.passiveDialog.controlModeSummary'),
+                recommendedOperation: '',
+                alarmDetail: `${this.$t('menu.passiveDialog.controlModeTransfer')} ${this.operate.name}${this.$t('menu.passiveDialog.alarmDetailOne')}${operate.currentMode == '01' ? this.$t('menu.passiveDialog.stationToCentral') : this.$t('menu.passiveDialog.centralToStation')}！`
+            };
+            this.dialogShow = true;
+            this.$nextTick(function () {
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
+        doClose() {
+            if (this.dialogShow) {
+                this.$store.dispatch('socket/shiftMsgQueue');
+            }
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+        },
+        cancel() {
+            const operate = {
+                operation: OperationEvent.Command.close.alarm.operation
+            };
+
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                if (valid) {
+                    this.doClose();
+                }
+            });
+        },
+        commit() {
+            const operate = {
+                operation: OperationEvent.Command.close.alarm.operation
+            };
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                if (valid) {
+                    this.doClose();
+                }
+            });
+        },
+        isClose() {
+            return this.dialogShow;
+        }
+    }
+};
+
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+    @import "src/styles/mixin.scss";
+
+    .alarm-type .el-input {
+        width: 220px;
+    }
+
+    .alarm-detail-description {
+        padding-left: 12px;
+        text-align: left;
+    }
+</style>
diff --git a/src/jmapNew/theme/xian_01/menus/passiveDialog/control.vue b/src/jmapNew/theme/xian_01/menus/passiveDialog/control.vue
new file mode 100644
index 000000000..9e5752284
--- /dev/null
+++ b/src/jmapNew/theme/xian_01/menus/passiveDialog/control.vue
@@ -0,0 +1,309 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    class="fuzhou-01__systerm passive-control"
+    :title="$t('menu.passiveDialog.controlModeRequest')"
+    :visible.sync="show"
+    width="700px"
+    :before-close="doClose"
+    :show-close="true"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <span class="control-label">{{ `${requestInfo}${$t('menu.passiveDialog.requestAreaControlMode')}` }}</span>
+    <el-table
+      ref="multipleTable"
+      :data="tableData"
+      border
+      row-key="code"
+      style="width: 100%"
+      height="250"
+      center
+      size="mini"
+      highlight-current-row
+    >
+      <el-table-column prop="operate" :label="$t('menu.passiveDialog.operatingArea')">
+        <template slot-scope="scope">
+          <span :style="{color: scope.row.disabled ? '#CBCBCB':'unset'}">{{ scope.row.operate }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="control" :label="$t('menu.passiveDialog.currentControlMode')" width="120">
+        <template slot-scope="scope">
+          <span :style="{color: scope.row.disabled ? '#CBCBCB':'unset'}">{{ scope.row.control.name }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="target" :label="$t('menu.passiveDialog.requestControlMode')" width="120">
+        <template slot-scope="scope">
+          <span :style="{color: scope.row.disabled ? '#CBCBCB':'unset'}">{{ scope.row.target.name }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="agree" :label="$t('menu.passiveDialog.isAgree')" width="140">
+        <template slot-scope="scope">
+          <el-checkbox ref="agree" v-model="scope.row.agree" :disabled="scope.row.disabled" />
+        </template>
+      </el-table-column>
+    </el-table>
+    <span class="control-label">{{ $t('menu.passiveDialog.messageOne') }} {{ count }} {{ $t('menu.passiveDialog.messageTwo') }}</span>
+    <el-row class="button-group">
+      <el-col :span="10" :offset="3">
+        <el-button :id="domAgree" :disabled="disabledAgree" @click="agree">{{ $t('menu.passiveDialog.agree') }}
+        </el-button>
+      </el-col>
+      <el-col :span="6" :offset="4">
+        <el-button :id="domIdRefuse" :disabled="disabledRefuse" @click="refuse">{{ $t('menu.passiveDialog.refuse') }}</el-button>
+      </el-col>
+    </el-row>
+    <notice-info ref="noticeInfo" />
+  </el-dialog>
+</template>
+
+<script>
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import NoticeInfo from '../dialog/childDialog/childDialog/noticeInfo';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
+
+export default {
+    name: 'RequestControl',
+    components: {
+        NoticeInfo
+    },
+    data() {
+        return {
+            dialogShow: false,
+            disabledAgree: false,
+            disabledRefuse: false,
+            requestInfo: this.$t('menu.passiveDialog.dispatcherWorkstation'),
+            controlProps: {
+                '01': this.$t('menu.passiveDialog.inTheControl'),
+                '02': this.$t('menu.passiveDialog.stationControl')
+            },
+            selection: [],
+            tableData: [],
+            timer: null,
+            timeout: 61,
+            count: 0,
+            commandId: ''
+        };
+    },
+    computed: {
+        targetStatus() {
+            if (this.$store.state.training.prdType == '01') {
+                return '01';
+            }
+            if (this.$store.state.training.prdType == '02') {
+                return '02';
+            }
+            return '';
+        },
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
+        },
+        domIdChoose() {
+            return this.dialogShow ? OperationEvent.StationControl.controlResponse.choose.domId : '';
+        },
+        domAgree() {
+            return this.dialogShow ? OperationEvent.StationControl.controlResponse.agree.domId : '';
+        },
+        domIdRefuse() {
+            return this.dialogShow ? OperationEvent.StationControl.controlResponse.refuse.domId : '';
+        }
+    },
+    watch: {
+        tableData: {
+            handler(val, oldVal) {
+                this.checkTableDataSelction(val);
+            },
+            deep: true
+        },
+        '$store.state.socket.msgHead': function (elem) {
+            if (elem && elem.type == 'req') {
+                if (elem.stationControlCode) {
+                    this.doShow(elem);
+                    this.commandId = elem.commandId;
+                }
+            }
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        createTimer() {
+            this.count = this.timeout;
+            this.timer = setInterval(() => {
+                if (this.count <= 0) {
+                    this.doClose();
+                    return;
+                }
+                this.count = this.count - 1;
+            }, 1000);
+        },
+        clearTimer() {
+            if (this.timer) {
+                clearInterval(this.timer);
+                this.timer = null;
+            }
+        },
+        checkTableDataSelction(data) {
+            const selection = [];
+            if (data && data.length > 0) {
+                data.forEach(row => {
+                    if (row.agree && !row.disabled) {
+                        selection.push(row);
+                    }
+                });
+            }
+
+            this.disabledSend = !selection.length;
+            if (JSON.stringify(selection) !== JSON.stringify(this.selection)) {
+                this.handleChooseChange(selection);
+                this.selection = selection;
+                this.disabledAgree = this.selection.length <= 0;
+            }
+        },
+        updateTableData(code) {
+            this.tableData = [];
+
+            const model = {
+                code: code,
+                operate: '',
+                control: { code: '', name: '' },
+                target: { code: '', name: '' },
+                agree: false,
+                disabled: false
+            };
+
+            const device = this.$store.getters['map/getDeviceByCode'](code);
+            if (device) {
+                const control = (device || {}).state;
+                if (control) {
+                    model.control = { status: control.status, name: this.controlProps[control.status] };
+                    model.target = { status: this.targetStatus, name: this.controlProps[this.targetStatus] };
+                }
+
+                const station = this.$store.getters['map/getDeviceByCode'](device.stationCode);
+                if (station) {
+                    model.operate = station.name || '';
+                }
+            }
+
+            this.tableData.push(model);
+        },
+        doShow(msgHead) {
+            this.requestInfo = `${msgHead.fromMember.deviceName}`;
+            if (msgHead.fromMember.nickName) {
+                this.requestInfo = `${msgHead.fromMember.deviceName}(${msgHead.fromMember.nickName})`;
+            }
+            this.dialogShow = true;
+            this.disabledAgree = true;
+            this.createTimer();
+            this.updateTableData(msgHead.stationControlCode);
+
+            const operate = {
+                start: true,
+                operation: OperationEvent.StationControl.controlResponse.menu.operation
+            };
+
+            this.$store.dispatch('training/emitTipFresh');
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                }
+            });
+
+        },
+        doClose() {
+            this.disabledAgree = false;
+            if (this.dialogShow) {
+                this.$store.dispatch('socket/shiftMsgQueue');
+            }
+
+            this.count = 0;
+            this.dialogShow = false;
+            this.clearTimer();
+            this.$store.dispatch('training/emitTipFresh');
+            this.$refs.multipleTable.setCurrentRow();
+        },
+        handleChooseChange(selection) {
+            this.selection = selection;
+            if (selection && selection.length) {
+                const codeList = selection.map(elem => { return elem.code; });
+                const operate = {
+                    operation: OperationEvent.StationControl.controlResponse.choose.operation,
+                    val: codeList.join('::')
+                };
+
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    if (valid) {
+                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    }
+                });
+            } else if (!selection) {
+                this.$messageBox(this.$t('menu.passiveDialog.selectData'));
+
+            }
+        },
+        agree() {
+            const operate = {
+                start: true,
+                operation: OperationEvent.StationControl.controlResponse.agree.operation,
+                code: this.tableData[0].code,
+                val: this.commandId,
+                cmdType: this.$store.state.training.prdType == '01' ? CMD.ControlConvertMenu.CMD_CM_REPLY_CENTER_CONTROL : CMD.ControlConvertMenu.CMD_CM_REPLY_STATION_CONTROL,
+                param: {
+                    ControlMode_Code: this.tableData[0].code,
+                    Reply_Command_Id: this.commandId,
+                    ControlMode_Reply: true
+                }
+            };
+
+            this.clearTimer();
+            this.disabledAgree = true;
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.doClose();
+                }
+            }).catch(() => {
+                this.$refs.noticeInfo.doShow(operate);
+            });
+        },
+        refuse() {
+            const operate = {
+                start: true,
+                operation: OperationEvent.StationControl.controlResponse.refuse.operation,
+                code: this.tableData[0].code,
+                val: this.commandId,
+                cmdType:  this.$store.state.training.prdType == '01' ? CMD.ControlConvertMenu.CMD_CM_REPLY_CENTER_CONTROL : CMD.ControlConvertMenu.CMD_CM_REPLY_STATION_CONTROL,
+                param: {
+                    ControlMode_Code: this.tableData[0].code,
+                    Reply_Command_Id: this.commandId,
+                    ControlMode_Reply: false
+                }
+            };
+
+            this.clearTimer();
+            this.disabledAgree = true;
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => {
+                this.$refs.noticeInfo.doShow(operate);
+            });
+        }
+    }
+};
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+    @import "src/styles/mixin.scss";
+
+    .control-label {
+        line-height: 30px;
+        font-size: 18px;
+    }
+</style>
diff --git a/src/jmapNew/theme/xian_01/menus/passiveDialog/timeout.vue b/src/jmapNew/theme/xian_01/menus/passiveDialog/timeout.vue
new file mode 100644
index 000000000..2b87d09de
--- /dev/null
+++ b/src/jmapNew/theme/xian_01/menus/passiveDialog/timeout.vue
@@ -0,0 +1,111 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    class="fuzhou-01__systerm cmd-notice"
+    :title="$t('menu.passiveDialog.operationCommandTips')"
+    :visible.sync="show"
+    width="400px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <span>{{ name }}，{{ msg }}!</span>
+    <el-row class="button-group">
+      <el-button :id="domIdCancel" type="primary" :loading="loading" @click="commit">{{ $t('menu.passiveDialog.operationConfirm') }}</el-button>
+    </el-row>
+  </el-dialog>
+</template>
+
+<script>
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+export default {
+    name: 'CmdNotice',
+    data() {
+        return {
+            dialogShow: false,
+            loading: false,
+            operate: null,
+            name: '',
+            msg: ''
+        };
+    },
+    computed: {
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
+        },
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.close.notice.domId : '';
+        }
+    },
+    watch: {
+        '$store.state.socket.msgHead': function (elem) {
+            if (elem && elem.type == 'resp' && (elem.timeout || !elem.agree)) {
+                const control = this.$store.getters['map/getDeviceByCode'](elem.stationControlCode);
+                const station = this.$store.getters['map/getDeviceByCode'](control.stationCode);
+                const newOperate = {
+                    name: station.name
+                };
+
+                if (elem.timeout) {
+                    newOperate['msg'] = this.$t('menu.passiveDialog.requestTimedOut');
+                    this.doShow(newOperate);
+                } else if (!elem.agree) {
+                    newOperate['msg'] = this.$t('menu.passiveDialog.requestRejection');
+                    this.doShow(newOperate);
+                }
+            }
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(operate) {
+            this.operate = operate || {};
+            this.name = this.operate.name || '';
+            this.msg = this.operate.msg || '';
+            this.dialogShow = true;
+            this.$nextTick(function () {
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
+        doClose() {
+            if (this.dialogShow) {
+                this.$store.dispatch('socket/shiftMsgQueue');
+            }
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+        },
+        cancel() {
+            const operate = {
+                operation: OperationEvent.Command.close.notice.operation
+            };
+
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                if (valid) {
+                    this.doClose();
+                }
+            });
+        },
+        commit() {
+            const operate = {
+                operation: OperationEvent.Command.close.notice.operation
+            };
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                if (valid) {
+                    this.doClose();
+                }
+            });
+        },
+        isClose() {
+            return this.dialogShow;
+        }
+    }
+};
+
+</script>
diff --git a/src/jmapNew/theme/xian_01/menus/statusDownTrainDetail.vue b/src/jmapNew/theme/xian_01/menus/statusDownTrainDetail.vue
new file mode 100644
index 000000000..ac712152d
--- /dev/null
+++ b/src/jmapNew/theme/xian_01/menus/statusDownTrainDetail.vue
@@ -0,0 +1,25 @@
+<template>
+  <div id="statusDownTrainDetail" />
+</template>
+
+<script>
+export default {
+    name: 'StatusDownTrainDetail',
+    props: {
+        selected: {
+            type: Object,
+            default() {
+                return null;
+            }
+        }
+    },
+    data() {
+        return {
+        };
+    },
+    mounted() {
+    }
+};
+</script>
+<style>
+</style>
diff --git a/src/jmapNew/theme/xian_01/menus/statusUpTrainDetail.vue b/src/jmapNew/theme/xian_01/menus/statusUpTrainDetail.vue
new file mode 100644
index 000000000..bb1e0cee3
--- /dev/null
+++ b/src/jmapNew/theme/xian_01/menus/statusUpTrainDetail.vue
@@ -0,0 +1,26 @@
+<template>
+  <div id="statusUpTrainDetail" />
+</template>
+
+<script>
+export default {
+    name: 'StatusUpTrainDetail',
+    props: {
+        selected: {
+            type: Object,
+            default() {
+                return null;
+            }
+        }
+    },
+    data() {
+        return {
+        };
+    },
+    mounted() {
+    }
+};
+</script>
+<style>
+
+</style>
diff --git a/src/jmapNew/theme/xian_01/menus/utils/menuItemStatus.js b/src/jmapNew/theme/xian_01/menus/utils/menuItemStatus.js
new file mode 100644
index 000000000..6263f872b
--- /dev/null
+++ b/src/jmapNew/theme/xian_01/menus/utils/menuItemStatus.js
@@ -0,0 +1,570 @@
+import store from '@/store/index_APP_TARGET';
+import deviceState from '@/jmap/constant/deviceState';
+import { OperateMode } from '@/scripts/ConstDic';
+
+export function getCurrentStateObject() {
+    return store.getters['menuOperation/selected'];
+}
+
+/** 系统类型 */
+export const State2SimulationMap = {
+    '01': 'local',		// 现地工作站
+    '02': 'central'		// 中心调度工作站
+};
+
+export const State2ControlMap = {
+    '01': 'center', 	// 中控
+    '02': 'station',	// 站控
+    '03': 'station'
+};
+
+// 控制禁用
+export const MenuDisabledState = {
+    Section: {
+        // 故障解锁
+        fault() {
+        },
+        // 切除
+        split() {
+            const device = getCurrentStateObject();
+            if (device && device.cutOff != deviceState.Section.cutOff.Default) {
+                return true;
+            }
+        },
+        // 激活
+        active() {
+            const device = getCurrentStateObject();
+            if (device && device.cutOff == deviceState.Section.cutOff.Default) {
+                return true;
+            }
+        },
+        // 区段封锁
+        lock() {
+            const device = getCurrentStateObject();
+            if (device && device.status == deviceState.Section.status.State06) {
+                return true;
+            }
+        },
+        // 区段解禁
+        unlock() {
+            const device = getCurrentStateObject();
+            if (device && device.status != deviceState.Section.status.State06) {
+                return true;
+            }
+        },
+        // 区段设置限速
+        setSpeed() {
+            const device = getCurrentStateObject();
+            if (device && device.speedUpperLimit != deviceState.Section.speedUpperLimit.Default) {
+                return true;
+            }
+        },
+        // 区段取消限速
+        cancelSpeed() {
+            const device = getCurrentStateObject();
+            if (device && device.speedUpperLimit == deviceState.Section.speedUpperLimit.Default) {
+                return true;
+            }
+        },
+        // 新建列车
+        newTrain() {
+        },
+        // 计轴预复位
+        axlePreReset() {
+        },
+        // 设置故障
+        setStoppage() {
+            const device = getCurrentStateObject();
+            if (device && device.fault) {
+                return true;
+            }
+        },
+        // 取消故障
+        cancelStoppage() {
+            const device = getCurrentStateObject();
+            if (device && !device.fault) {
+                return true;
+            }
+        }
+    },
+    Signal: {
+        // 进路选排
+        arrangementRoute() {
+
+        },
+        // 进路取消
+        cancelTrainRoute() {
+        },
+        // 信号封闭
+        lock() {
+            const device = getCurrentStateObject();
+            if (device && device.status == deviceState.Signal.status.State05) {
+                return true;
+            }
+        },
+        // 信号解封
+        unlock() {
+            const device = getCurrentStateObject();
+            if (device && device.status != deviceState.Signal.status.State05) {
+                return true;
+            }
+        },
+        // 信号重开
+        reopenSignal() {
+        },
+        // 进路引导
+        guide() {
+        },
+        // 设置联锁自动进路
+        setAutoInterlock() {
+        },
+        // 取消联锁自动进路
+        cancelAutoInterlock() {
+        },
+        // 设置联锁自动触发
+        setAutoTrigger() {
+        },
+        // 取消联锁自动触发
+        cancelAutoTrigger() {
+        },
+        // 关灯
+        signalClose() {
+            const device = getCurrentStateObject();
+            if (device && device.status == deviceState.Signal.status.State01) {
+                return true;
+            }
+        },
+        // 人工控
+        humanControl() {
+        },
+        // ats自动控
+        atsAutoControl() {
+        },
+        // 查询进路状态
+        detail() {
+        },
+        // 设置故障
+        setStoppage() {
+            const device = getCurrentStateObject();
+            if (device && device.fault) {
+                return true;
+            }
+        },
+        // 取消故障
+        cancelStoppage() {
+            const device = getCurrentStateObject();
+            if (device && !device.fault) {
+                return true;
+            }
+        }
+    },
+    Station: {
+        // 全站设置联锁自动触发
+        setAutoTrigger() {
+        },
+        // 全站取消联锁自动触发
+        cancelAutoTrigger() {
+        },
+        // 上电解锁
+        powerUnLock() {
+        },
+        // 执行关键操作测试
+        execKeyOperationTest() {
+        },
+        // 所有进路自排开
+        atsAutoControlALL() {
+        },
+        // 所有进路自排关
+        humanControlALL() {
+        },
+        // 设置ZC故障
+        setStoppage() {
+            const device = getCurrentStateObject();
+            if (device && device.fault) {
+                return true;
+            }
+        },
+        // 取消ZC故障
+        cancelStoppage() {
+            const device = getCurrentStateObject();
+            if (device && !device.fault) {
+                return true;
+            }
+        }
+    },
+    StationControl: {
+        // 紧急站控
+        emergencyStationControl() {
+            const device = getCurrentStateObject();
+            if (device && device.status == deviceState.StationControl.status.State03) {
+                return true;
+            }
+        },
+        // 请求站控
+        requestStationControl() {
+            const device = getCurrentStateObject();
+            if (device && device.status == deviceState.StationControl.status.State02) {
+                return true;
+            }
+        },
+        // 强行站控
+        forcedStationControl() {
+            const device = getCurrentStateObject();
+            if (device && device.status == deviceState.StationControl.status.State02) {
+                return true;
+            }
+        },
+        // 请求中控
+        requestCentralControl() {
+            const device = getCurrentStateObject();
+            if (device && device.status == deviceState.StationControl.status.State01) {
+                return true;
+            }
+        },
+        // 设置故障
+        setStoppage() {
+            const device = getCurrentStateObject();
+            if (device && device.fault) {
+                return true;
+            }
+        },
+        // 取消故障
+        cancelStoppage() {
+            const device = getCurrentStateObject();
+            if (device && !device.fault) {
+                return true;
+            }
+        }
+    },
+    StationStand: {
+        // 设置扣车
+        setDetainTrain() {
+            const device = getCurrentStateObject();
+            if (store.state.training.prdType == '02') { // 中心行调模式
+                if (device && device.holdStatus == deviceState.StationStand.holdStatus.State04) {
+                    return true;
+                } else if (device && device.holdStatus == deviceState.StationStand.holdStatus.State03) {
+                    return true;
+                }
+            } else { // 现地模式
+                if (device && device.holdStatus == deviceState.StationStand.holdStatus.State04) {
+                    return true;
+                } else if (device && device.holdStatus == deviceState.StationStand.holdStatus.State02) {
+                    return true;
+                }
+            }
+        },
+        // 取消扣车
+        cancelDetainTrain() {
+            const device = getCurrentStateObject();
+            if (store.state.training.prdType == '02') {
+                if (device && device.holdStatus == deviceState.StationStand.holdStatus.State04) {
+                    return false;
+                } else if (device && device.holdStatus != deviceState.StationStand.holdStatus.State03) {
+                    return true;
+                }
+            } else {
+                if (device && device.holdStatus == deviceState.StationStand.holdStatus.State04) {
+                    return false;
+                } else if (device && device.holdStatus != deviceState.StationStand.holdStatus.State02) {
+                    return true;
+                }
+            }
+        },
+        // 强制取消扣车
+        cancelDetainTrainForce() {
+            const device = getCurrentStateObject();
+            if (device && device.holdStatus == deviceState.StationStand.holdStatus.State01) {
+                return true;
+            }
+        },
+        // 设置全站扣车
+        cancelDetainTrainAll() {
+        },
+        // 设置运行等级
+        setRunLevel() {
+        },
+        // 设置停站时间
+        setStopTime() {
+        },
+        // 设置跳停
+        setJumpStop() {
+            const device = getCurrentStateObject();
+            if (device && device.jumpStopStatus != deviceState.StationStand.jumpStopStatus.State01) {
+                return true;
+            }
+        },
+        // 取消跳停
+        cancelJumpStop() {
+            const device = getCurrentStateObject();
+            if (device && device.jumpStopStatus == deviceState.StationStand.jumpStopStatus.State01) {
+                return true;
+            }
+        },
+        // 提前发车
+        earlyDeparture() {
+        },
+        // 站台详细信息
+        detail() {
+        },
+        // 设置折返策略
+        setBackStrategy() {
+        },
+        // 设置故障
+        setStoppage() {
+            const device = getCurrentStateObject();
+            if (device && device.fault) {
+                return true;
+            }
+        },
+        // 取消故障
+        cancelStoppage() {
+            const device = getCurrentStateObject();
+            if (device && !device.fault) {
+                return true;
+            }
+        }
+    },
+    Switch: {
+        // 单锁
+        lock() {
+            const device = getCurrentStateObject();
+            if (device && device.status == deviceState.Switch.status.State10) {
+                return true;
+            }
+        },
+        // 解锁
+        unlock() {
+            const device = getCurrentStateObject();
+            if (device && device.status != deviceState.Switch.status.State10) {
+                return true;
+            }
+        },
+        // 封锁
+        block() {
+            const device = getCurrentStateObject();
+            if (device && device.status == deviceState.Switch.status.State14) {
+                return true;
+            }
+        },
+        // 解封
+        unblock() {
+            const device = getCurrentStateObject();
+            if (device && device.status != deviceState.Switch.status.State14) {
+                return true;
+            }
+        },
+        // 强扳
+        switchTurnoutForce() {
+        },
+        // 转动
+        switchTurnout() {
+        },
+        // 道岔故障解锁
+        fault() {
+        },
+        // 计轴预复位
+        axlePreReset() {
+        },
+        // 道岔切除
+        split() {
+        },
+        // 道岔激活
+        active() {
+        },
+        // 道岔设置速度
+        setSpeed() {
+            // const device = getCurrentStateObject();
+        },
+        // 道岔取消速度
+        cancelSpeed() {
+        },
+        // 设置故障
+        setStoppage() {
+            const device = getCurrentStateObject();
+            if (device && device.fault) {
+                return true;
+            }
+        },
+        // 取消故障
+        cancelStoppage() {
+            const device = getCurrentStateObject();
+            if (device && !device.fault) {
+                return true;
+            }
+        }
+    },
+    Train: {
+        // 添加列车识别号
+        addTrainId() {
+        },
+        // 删除列车识别号
+        delTrainId() {
+        },
+        // 修改列车识别号
+        editTrainId() {
+        },
+        // 修改车组号
+        editTrainNo() {
+        },
+        // 移动列车识别号
+        moveTrainId() {
+        },
+        // 交换列车识别号
+        switchTrainId() {
+        },
+        // 设置限速
+        limitSpeed() {
+        },
+        // 设置通信故障
+        setStoppage() {
+            const device = getCurrentStateObject();
+            if (device && device.fault) {
+                return true;
+            }
+        },
+        // 取消通信故障
+        cancelStoppage() {
+            const device = getCurrentStateObject();
+            if (device && !device.fault) {
+                return true;
+            }
+        }
+    }
+};
+
+export function checkOperationValidity() {
+    if (store.state.training.prdType == '02') {
+        return true;
+    }
+}
+
+/**
+ * 将menu的disabled属性使用disabledCallback计算并返回
+ * @param {Array} menu
+ */
+export function menuConvert(menu) {
+    if (menu.constructor === Array) {
+        menu.forEach(elem => {
+            if (elem.type === 'separator') {
+                elem.show = true;
+                return;
+            }
+
+            if (elem.disabledCallback.constructor === Function) {
+                elem.disabled = elem.defaultDisabled;
+                if (!elem.defaultDisabled) {
+                    elem.disabled = elem.disabledCallback();
+                }
+            }
+        });
+    }
+    return menu;
+}
+
+/**
+ * 根据产品类型，返回对应的menuBar
+ * @param {*} menuObj
+ */
+export function menuBarConvert(menu, mode) {
+    if (menu) {
+        if (mode === OperateMode.NORMAL) {
+            menu.forEach(item => {
+                if (item.type === 'separator') {
+                    item.show = true;
+                    return;
+                }
+
+                item.show = false;
+                if (!item.click) {
+                    item.click = () => { };
+                }
+
+                if (!item.froce) {
+                    item.show = true;
+                    if (item.children && item.children.length > 0) {
+                        menuBarConvert(item.children, mode);
+                    }
+                }
+            });
+        } else if (mode === OperateMode.ADMIN) {
+            menu.forEach(item => {
+                item.show = true;
+                if (!item.click) {
+                    item.click = () => { };
+                }
+                if (item.children && item.children.length > 0) {
+                    menuBarConvert(item.children, mode);
+                }
+            });
+        }
+    }
+    return menu || [];
+}
+
+/**
+ * 将menu的show属性过滤返回
+ * @param {Array} menu
+ */
+export function menuFiltration(menuObj) {
+    var selected = getCurrentStateObject();
+    var control;
+    var menu = [];
+
+    if (selected._type == 'StationStand') {
+        control = store.getters['map/getStationControlByStationCode'](selected.deviceStationCode);
+    } else if (selected._type == 'Station') {
+        control = store.getters['map/getStationControlByStationCode'](selected.code);
+    } else {
+        control = store.getters['map/getStationControlByStationCode'](selected.stationCode);
+    }
+
+    if (control) {
+        if (store.state.training.prdType != '') {
+            const type = State2SimulationMap[store.state.training.prdType];
+            const status = State2ControlMap[control.status];
+            menu = [...menuObj[type]];
+            if (menu.constructor === Array) {
+                menu.forEach(elem => {
+                    if (elem.type === 'separator') {
+                        elem.show = true;
+                        return;
+                    }
+
+                    if (elem.auth.constructor === Object) {
+                        elem.show = true;
+                        if (!elem.auth['station'] && !elem.auth['center']) {	// 控制不显示
+                            elem.show = false;
+                        }
+                        elem.defaultDisabled = !elem.auth[status];
+                    }
+                });
+            }
+        }
+    }
+
+    return menu;
+}
+
+/**
+ * 将train menu的show属性过滤返回
+ */
+export function trainMenuFiltration(menuObj) {
+    var menu = [];
+    if (store.state.training.prdType != '') {
+        const type = State2SimulationMap[store.state.training.prdType];
+        menu = [...menuObj[type]];
+        if (menu.constructor === Array) {
+            menu.forEach(elem => {
+                if (elem.auth.constructor === Object) {
+                    elem.show = true;
+                    if (!elem.auth['station'] && !elem.auth['center']) {	// 控制不显示
+                        elem.show = false;
+                    }
+                }
+            });
+        }
+    }
+    return menu;
+}
+
diff --git a/src/jmapNew/theme/xian_01/model.js b/src/jmapNew/theme/xian_01/model.js
new file mode 100644
index 000000000..dd040cf61
--- /dev/null
+++ b/src/jmapNew/theme/xian_01/model.js
@@ -0,0 +1,72 @@
+import deviceType from '../../constant/deviceType';
+
+class Model {
+    constructor() {
+        // 公共字段部分默认初始值
+        this['public'] = {};
+        this['public'][deviceType.Signal] = {
+            lampPositionType: '02',
+            lampPostType: '02'
+        };
+
+        // 私有字段部分默认初始值
+        this['private'] = {};
+        this['private'][deviceType.StationControl] = {
+            indicatorShow: true									// 标识灯名称显示
+        };
+        this['private'][deviceType.Station] = {
+            kmPostShow: true									// 公里标显示
+        };
+        this['private'][deviceType.Switch] = {
+            nameShow: true
+        };
+        this['private'][deviceType.Section] = {
+            nameShow: true,
+            borderBorderShow: true,								// 区段边界显示
+            destinationNameShow: true,							// 目的地码名称显示
+            standTrackNameShow: true,							// 站台轨名称显示
+            reentryTrackNameShow: true,							// 折返轨名称显示
+            transferTrackNameShow: true							// 转换轨名称显示
+        };
+        this['private'][deviceType.Signal] = {
+            nameShow: true,										// 信号机名称显示
+            linkageAutoRouteShow: true,							// 联锁自动进路表示灯显示
+            atsAutoTriggerShow: true							// ATS自动触发表示灯显示
+        };
+        this['private'][deviceType.Train] = {
+            nameFormat: 'targetCode:serviceNumber:tripNumber',	// 字体格式
+            nameFontSize: 10					 				// 字体大小
+        };
+        this['private'][deviceType.TrainWindow] = {
+            trainWindowShow: true
+        };
+    }
+
+    initPublicProps(model) {
+        if (model) {
+            var modelInitial = this.public[model._type];
+            if (modelInitial) {
+                for (var prop in modelInitial) {
+                    model[prop] = modelInitial[prop];
+                }
+            }
+        }
+
+        return model;
+    }
+
+    initPrivateProps(model) {
+        if (model) {
+            var modelInitial = this.private[model._type];
+            if (modelInitial) {
+                for (var prop in modelInitial) {
+                    model[prop] = modelInitial[prop];
+                }
+            }
+        }
+
+        return model;
+    }
+}
+
+export default new Model();
diff --git a/src/jmapNew/theme/xian_01/operationConfig.js b/src/jmapNew/theme/xian_01/operationConfig.js
new file mode 100644
index 000000000..b038248fa
--- /dev/null
+++ b/src/jmapNew/theme/xian_01/operationConfig.js
@@ -0,0 +1,849 @@
+// 操作规则定义
+// {id: "1", trainingType: "01", name: "车站名称"}
+// {id: "2", trainingType: "01", name: "车站控制模式编号"}
+// {id: "3", trainingType: "02", name: "进路名称"}
+// {id: "4", trainingType: "02", name: "进路编号"}
+// {id: "5", trainingType: "02", name: "信号机名称"}
+// {id: "6", trainingType: "02", name: "信号机编号"}
+
+// {id: "7", trainingType: "03", name: "道岔名称"}
+// {id: "17", trainingType: "03", name: "道岔编码"}
+// {id: "15", trainingType: "03", name: "道岔位置"}
+// {id: "16", trainingType: "03", name: "道岔位置(反)"}
+// {id: "21", trainingType: "03", name: "车站名称"}
+// {id: "23", trainingType: "03", name: "车站编号"}
+// {id: "24", trainingType: "03", name: "道岔计轴区段编号"}
+// {id: "25", trainingType: "03", name: "道岔计轴区段名称"}
+
+// {id: "8", trainingType: "04", name: "物理区段名称"}
+// {id: "9", trainingType: "04", name: "逻辑区段名称"}
+// {id: "18", trainingType: "04", name: "逻辑区段编码"}
+// {id: "19", trainingType: "04", name: "区段编号"}
+// {id: "20", trainingType: "04", name: "车站名称"}
+// {id: "22", trainingType: "04", name: "车站编号"}
+
+// {id: "10", trainingType: "05", name: "车站名称"}
+// {id: "11", trainingType: "05", name: "站台行驶方向编号"}
+// {id: "12", trainingType: "05", name: "站台行驶方向"}
+// {id: "13", trainingType: "05", name: "站台行驶方向编号(反)"}
+// {id: "14", trainingType: "05", name: "站台行驶方向(反)"}
+export default {
+    list: [
+        {
+            maxDuration: 20,
+            minDuration: 15,
+            operateType: '0103',
+            skinCode: '02',
+            trainingName: '转为中控({1})',
+            trainingRemark: '控制权限转换，站控转中控',
+            trainingType: '01',
+            productTypes: ['02'],
+            stepVOList: [
+                { deviceType: 'bar', orderNum: 1, operateCode: '0024', tip: '鼠标左键点击顶部菜单栏【控制模式转换】' },
+                { deviceType: 'bar', orderNum: 2, operateCode: '2041', tip: '鼠标左键点击【转为中控】' },
+                { deviceType: '05', orderNum: 3, operateCode: '2042', tip: '鼠标左键选择所需要转换的控制区域【{1}】', val: '{2}' },
+                { deviceType: '05', orderNum: 4, operateCode: '204', tip: '鼠标左键点击【请求中控】', val: '{2}' },
+                { deviceType: '05', orderNum: 5, operateCode: '2043', tip: '鼠标左键点击【确认】按钮', val: '{2}' },
+                { deviceType: '05', orderNum: 6, operateCode: '0013', tip: '鼠标左键点击【确定】按钮' },
+                { deviceType: 'bar', orderNum: 7, operateCode: '000', tip: '鼠标左键点击【关闭】按钮' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: '0101',
+            skinCode: '02',
+            trainingName: '转为站控({1})',
+            trainingRemark: '控制权限转换，中控转站控',
+            trainingType: '01',
+            productTypes: ['01'],
+            stepVOList: [
+                { deviceType: 'bar', orderNum: 1, operateCode: '0024', tip: '鼠标左键点击顶部菜单栏【控制模式转换】' },
+                { deviceType: 'bar', orderNum: 2, operateCode: '2021', tip: '鼠标左键点击【转为站控】' },
+                { deviceType: '05', orderNum: 3, operateCode: '2022', tip: '鼠标左键选择所需要转换的控制区域【{1}】', val: '{2}' },
+                { deviceType: '05', orderNum: 4, operateCode: '202', tip: '鼠标左键点击【请求站控】', val: '{2}' },
+                { deviceType: '05', orderNum: 5, operateCode: '2023', tip: '鼠标左键点击【确认】按钮', val: '{2}' },
+                { deviceType: '05', orderNum: 6, operateCode: '0013', tip: '鼠标左键点击【确定】按钮' },
+                { deviceType: 'bar', orderNum: 7, operateCode: '000', tip: '鼠标左键点击【关闭】按钮' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: '0102',
+            skinCode: '02',
+            trainingName: '强制站控({1})',
+            trainingRemark: '控制权限转换，强制站控',
+            trainingType: '01',
+            productTypes: ['01'],
+            stepVOList: [
+                { deviceType: 'bar', orderNum: 1, operateCode: '0024', tip: '鼠标左键点击顶部菜单栏【控制模式转换】' },
+                { deviceType: 'bar', orderNum: 2, operateCode: '2034', tip: '鼠标左键点击【强制站控】' },
+                { deviceType: 'bar', orderNum: 3, operateCode: '2035', tip: '鼠标左键输入默认密码【123456】后，点击【确定】按钮' },
+                { deviceType: '05', orderNum: 4, operateCode: '2032', tip: '鼠标左键选择所需要转换的控制区域【{1}】', val: '{2}' },
+                { deviceType: '05', orderNum: 5, operateCode: '203', tip: '鼠标左键点击【强制站控】', val: '{2}' },
+                { deviceType: '05', orderNum: 6, operateCode: '2033', tip: '鼠标左键点击【确认】按钮', val: '{2}' },
+                { deviceType: '05', orderNum: 7, operateCode: '0013', tip: '鼠标左键点击【确定】按钮' },
+                { deviceType: 'bar', orderNum: 8, operateCode: '000', tip: '鼠标左键点击【关闭】按钮' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: '0501',
+            skinCode: '02',
+            trainingName: '站台扣车({10}-{12}站台)',
+            trainingRemark: '设置扣车功能',
+            trainingType: '05',
+            productTypes: ['01', '02'],
+            stepVOList: [
+                { deviceType: '06', orderNum: 1, operateCode: '504', tip: '鼠标右键菜单选择【扣车】' },
+                { deviceType: '06', orderNum: 2, operateCode: '504', tip: '鼠标左键点击【确定】按钮' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: '0502',
+            skinCode: '02',
+            trainingName: '站台取消扣车({10}-{12}站台)',
+            trainingRemark: '设置取消扣车功能',
+            trainingType: '05',
+            productTypes: ['01', '02'],
+            stepVOList: [
+                { deviceType: '06', orderNum: 1, operateCode: '505', tip: '鼠标右键菜单选择【取消扣车】' },
+                { deviceType: '06', orderNum: 2, operateCode: '505', tip: '鼠标左键点击【确定】按钮' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: '0503',
+            skinCode: '02',
+            trainingName: '强制取消扣车({10}-{12}站台)',
+            trainingRemark: '强制取消扣车功能',
+            trainingType: '05',
+            productTypes: ['01'],
+            stepVOList: [
+                { deviceType: '06', orderNum: 1, operateCode: '506', tip: '鼠标右键菜单选择【强制取消扣车】' },
+                { deviceType: '06', orderNum: 2, operateCode: '506', tip: '鼠标左键点击【确定】按钮' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: '0504',
+            skinCode: '02',
+            trainingName: '全线取消扣车({10}-{12}站台)',
+            trainingRemark: '全线取消扣车功能(默认上行全线/下行全线，不做选择)',
+            trainingType: '05',
+            productTypes: ['02'],
+            stepVOList: [
+                { deviceType: '06', orderNum: 1, operateCode: '508', tip: '鼠标右键菜单选择【全线取消扣车】' },
+                { deviceType: '06', orderNum: 2, operateCode: '508', tip: '鼠标左键点击【确定】按钮', val: '{11}' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: '0504',
+            skinCode: '02',
+            trainingName: '全线取消扣车({10}-{12}站台)',
+            trainingRemark: '全线取消扣车功能(选择上/下行全线)',
+            trainingType: '05',
+            productTypes: ['02'],
+            stepVOList: [
+                { deviceType: '06', orderNum: 1, operateCode: '508', tip: '鼠标右键菜单选择【全线取消扣车】' },
+                { deviceType: '06', orderNum: 2, operateCode: '5081', tip: '鼠标右键菜单选择【{14}全线】', val: '{13}' },
+                { deviceType: '06', orderNum: 3, operateCode: '508', tip: '鼠标左键点击【确定】按钮', val: '{13}' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: '0505',
+            skinCode: '02',
+            trainingName: '站台跳停({10}-{12}站台)',
+            trainingRemark: '设置跳停功能',
+            trainingType: '05',
+            productTypes: ['01', '02'],
+            stepVOList: [
+                { deviceType: '06', orderNum: 1, operateCode: '502', tip: '鼠标右键菜单选择【跳停】' },
+                { deviceType: '06', orderNum: 2, operateCode: '502', tip: '鼠标左键点击【确定】按钮', val: '{11}' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: '0506',
+            skinCode: '02',
+            trainingName: '取消跳停({10}-{12}站台)',
+            trainingRemark: '设置取消跳停功能',
+            trainingType: '05',
+            productTypes: ['01', '02'],
+            stepVOList: [
+                { deviceType: '06', orderNum: 1, operateCode: '503', tip: '鼠标右键菜单选择【取消跳停】' },
+                { deviceType: '06', orderNum: 2, operateCode: '503', tip: '鼠标左键点击【确定】按钮', val: '{11}' }
+            ]
+        },
+        {
+            maxDuration: 8,
+            minDuration: 5,
+            operateType: '0507',
+            skinCode: '02',
+            trainingName: '查询站台状态({10}-{12}站台)',
+            trainingRemark: '查询站台状态功能',
+            trainingType: '05',
+            productTypes: ['01', '02'],
+            stepVOList: [
+                { deviceType: '06', orderNum: 1, operateCode: '507', tip: '鼠标右键菜单选择【查询站台状态】' },
+                { deviceType: '06', orderNum: 2, operateCode: '0012', tip: '鼠标左键点击【确定】按钮' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: '0508',
+            skinCode: '02',
+            trainingName: '设置停站时间({10}-{12}站台)',
+            trainingRemark: '设置停站时间(自动, 一直有效)',
+            trainingType: '05',
+            productTypes: ['02'],
+            stepVOList: [
+                { deviceType: '06', orderNum: 1, operateCode: '509', tip: '鼠标右键菜单选择【设置停站时间】' },
+                { deviceType: '06', orderNum: 2, operateCode: '5092', tip: '鼠标左键点击，选择【自动】', val: '01' },
+                { deviceType: '06', orderNum: 3, operateCode: '509', tip: '鼠标左键点击【确认】按钮', val: '01::20::true' },
+                { deviceType: '06', orderNum: 4, operateCode: '5091', tip: '鼠标左键点击【确认】按钮', val: '01::20::true' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: '0508',
+            skinCode: '02',
+            trainingName: '设置停站时间({10}-{12}站台)',
+            trainingRemark: '设置停站时间(人工, 20秒, 一直有效)',
+            trainingType: '05',
+            productTypes: ['02'],
+            stepVOList: [
+                { deviceType: '06', orderNum: 1, operateCode: '509', tip: '鼠标右键菜单选择【设置停站时间】' },
+                { deviceType: '06', orderNum: 2, operateCode: '5092', tip: '鼠标左键点击，选择【人工】', val: '02' },
+                { deviceType: '06', orderNum: 3, operateCode: '5094', tip: '输入或鼠标点击，调整为【20】', val: '20' },
+                { deviceType: '06', orderNum: 4, operateCode: '509', tip: '鼠标左键点击【确认】按钮', val: '02::20::true' },
+                { deviceType: '06', orderNum: 5, operateCode: '5091', tip: '鼠标左键点击【确认】按钮', val: '02::20::true' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: '0508',
+            skinCode: '02',
+            trainingName: '设置停站时间({10}-{12}站台)',
+            trainingRemark: '设置停站时间(人工, 20秒, 一次有效)',
+            trainingType: '05',
+            productTypes: ['02'],
+            stepVOList: [
+                { deviceType: '06', orderNum: 1, operateCode: '509', tip: '鼠标右键菜单选择【设置停站时间】' },
+                { deviceType: '06', orderNum: 2, operateCode: '5092', tip: '鼠标左键点击，选择【人工】', val: '02' },
+                { deviceType: '06', orderNum: 3, operateCode: '5094', tip: '输入或鼠标点击，调整为【20】', val: '20' },
+                { deviceType: '06', orderNum: 4, operateCode: '5093', tip: '鼠标左键点击，选择【一次有效】', val: 'false' },
+                { deviceType: '06', orderNum: 5, operateCode: '509', tip: '鼠标左键点击【确认】按钮', val: '02::20::false' },
+                { deviceType: '06', orderNum: 6, operateCode: '5091', tip: '鼠标左键点击【确认】按钮', val: '02::20::false' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: '0509',
+            skinCode: '02',
+            trainingName: '设置运行等级({10}-{12}站台)',
+            trainingRemark: '设置运行等级(设置区间运行时间为60，一直有效)',
+            trainingType: '05',
+            productTypes: ['02'],
+            stepVOList: [
+                { deviceType: '06', orderNum: 1, operateCode: '510', tip: '鼠标右键菜单选择【设置运行等级】' },
+                { deviceType: '06', orderNum: 2, operateCode: '5101', tip: '鼠标左键点击，选择【60】', val: '60' },
+                { deviceType: '06', orderNum: 3, operateCode: '510', tip: '鼠标左键点击【确认】按钮', val: '60::true' },
+                { deviceType: '06', orderNum: 4, operateCode: '5102', tip: '鼠标左键点击【确认】按钮', val: '60::true' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: '0509',
+            skinCode: '02',
+            trainingName: '设置运行等级({10}-{12}站台)',
+            trainingRemark: '设置运行等级(设置区间运行时间为60，一次有效)',
+            trainingType: '05',
+            productTypes: ['02'],
+            stepVOList: [
+                { deviceType: '06', orderNum: 1, operateCode: '510', tip: '鼠标右键菜单选择【设置运行等级】' },
+                { deviceType: '06', orderNum: 2, operateCode: '5101', tip: '鼠标左键点击，选择【60】', val: '60' },
+                { deviceType: '06', orderNum: 3, operateCode: '5103', tip: '鼠标左键点击，取消选择【一直有效】', val: 'false' },
+                { deviceType: '06', orderNum: 4, operateCode: '510', tip: '鼠标左键点击【确认】按钮', val: '60::false' },
+                { deviceType: '06', orderNum: 5, operateCode: '5102', tip: '鼠标左键点击【确认】按钮', val: '60::false' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: '0510',
+            skinCode: '02',
+            trainingName: '设置提前发车({10}-{12}站台)',
+            trainingRemark: '设置提前发车功能',
+            trainingType: '05',
+            productTypes: ['02'],
+            stepVOList: [
+                { deviceType: '06', orderNum: 1, operateCode: '501', tip: '鼠标右键菜单选择【设置提前发车】' },
+                { deviceType: '06', orderNum: 2, operateCode: '501', tip: '鼠标左键点击【确定】按钮' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: '0511',
+            skinCode: '02',
+            trainingName: '人工折返策略设置({10}-{12}站台)',
+            trainingRemark: '人工折返策略设置功能',
+            trainingType: '05',
+            productTypes: ['02'],
+            stepVOList: [
+                { deviceType: '06', orderNum: 1, operateCode: '511', tip: '鼠标右键菜单选择【人工折返策略设置】' },
+                { deviceType: '06', orderNum: 2, operateCode: '5111', tip: '鼠标左键点击，选择【无折返】', val: '01' },
+                { deviceType: '06', orderNum: 3, operateCode: '511', tip: '鼠标左键点击【确定】按钮', val: '01' }
+            ]
+        },
+
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: '0401',
+            skinCode: '02',
+            trainingName: '区段故障解锁({8}{9})',
+            trainingRemark: '故障解锁功能',
+            trainingType: '04',
+            productTypes: ['01', '02'],
+            stepVOList: [
+                { deviceType: '03', orderNum: 1, operateCode: '402', tip: '鼠标右键菜单选择【区段故障解锁】' },
+                { deviceType: '03', orderNum: 2, operateCode: '4026', tip: '鼠标左键点击【下达】按钮' },
+                { deviceType: '03', orderNum: 3, operateCode: '4024', tip: '鼠标左键点击【确认1】按钮' },
+                { deviceType: '03', orderNum: 4, operateCode: '4025', tip: '鼠标左键点击【确认2】按钮' },
+                { deviceType: '03', orderNum: 5, operateCode: '001', tip: '鼠标左键点击【关闭】按钮' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: '0402',
+            skinCode: '02',
+            trainingName: '区段切除({8}{9})',
+            trainingRemark: '区段切除',
+            trainingType: '04',
+            productTypes: ['01', '02'],
+            stepVOList: [
+                { deviceType: '03', orderNum: 1, operateCode: '405', tip: '鼠标右键菜单选择【区段切除】' },
+                { deviceType: '03', orderNum: 2, operateCode: '405', tip: '鼠标左键点击【确定】按钮' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: '0403',
+            skinCode: '02',
+            trainingName: '区段激活({8}{9})',
+            trainingRemark: '区段激活功能',
+            trainingType: '04',
+            productTypes: ['01', '02'],
+            stepVOList: [
+                { deviceType: '03', orderNum: 1, operateCode: '406', tip: '鼠标右键菜单选择【区段激活】' },
+                { deviceType: '03', orderNum: 2, operateCode: '406', tip: '鼠标左键点击【确定】按钮' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: '0404',
+            skinCode: '02',
+            trainingName: '计轴预复位({8}{9})',
+            trainingRemark: '计轴预复位功能',
+            trainingType: '04',
+            productTypes: ['01'],
+            stepVOList: [
+                { deviceType: '03', orderNum: 1, operateCode: '409', tip: '鼠标右键菜单选择【区段计轴预复位】' },
+                { deviceType: '03', orderNum: 2, operateCode: '4091', tip: '鼠标左键点击【下达】按钮' },
+                { deviceType: '03', orderNum: 3, operateCode: '4093', tip: '鼠标左键点击【确认1】按钮' },
+                { deviceType: '03', orderNum: 4, operateCode: '4094', tip: '鼠标左键点击【确认2】按钮' },
+                { deviceType: '03', orderNum: 5, operateCode: '001', tip: '鼠标左键点击【关闭】按钮' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: '0405',
+            skinCode: '02',
+            trainingName: '区段封锁({8}{9})',
+            trainingRemark: '区段封锁功能',
+            trainingType: '04',
+            productTypes: ['01', '02'],
+            stepVOList: [
+                { deviceType: '03', orderNum: 1, operateCode: '403', tip: '鼠标右键菜单选择【区段封锁】' },
+                { deviceType: '03', orderNum: 2, operateCode: '403', tip: '鼠标左键点击【确定】按钮' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: '0406',
+            skinCode: '02',
+            trainingName: '区段解封({8}{9})',
+            trainingRemark: '区段解封功能',
+            trainingType: '04',
+            productTypes: ['01', '02'],
+            stepVOList: [
+                { deviceType: '03', orderNum: 1, operateCode: '404', tip: '鼠标右键菜单选择【区段解封】' },
+                { deviceType: '03', orderNum: 2, operateCode: '4041', tip: '鼠标左键点击【下达】按钮' },
+                { deviceType: '03', orderNum: 3, operateCode: '4043', tip: '鼠标左键点击【确认1】按钮' },
+                { deviceType: '03', orderNum: 4, operateCode: '4044', tip: '鼠标左键点击【确认2】按钮' },
+                { deviceType: '03', orderNum: 5, operateCode: '001', tip: '鼠标左键点击【关闭】按钮' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: '0407',
+            skinCode: '02',
+            trainingName: '区段设置限速({8}{9})',
+            trainingRemark: '区段设置限速功能（限速值：5）',
+            trainingType: '04',
+            productTypes: ['01', '02'],
+            stepVOList: [
+                { deviceType: '03', orderNum: 1, operateCode: '407', tip: '鼠标右键菜单选择【区段设置限速】' },
+                { deviceType: '03', orderNum: 2, operateCode: '4076', tip: '鼠标左键选择【限速值5】', val: '5' },
+                { deviceType: '03', orderNum: 3, operateCode: '4071', tip: '鼠标左键点击【下达】按钮' },
+                { deviceType: '03', orderNum: 4, operateCode: '4072', tip: '鼠标左键点击【确认】按钮' },
+                { deviceType: '03', orderNum: 5, operateCode: '4073', tip: '鼠标左键点击【确认1】按钮' },
+                { deviceType: '03', orderNum: 6, operateCode: '4074', tip: '鼠标左键点击【确认2】按钮', val: '5' },
+                { deviceType: '03', orderNum: 7, operateCode: '001', tip: '鼠标左键点击【关闭】按钮' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: '0408',
+            skinCode: '02',
+            trainingName: '区段取消限速({8}{9})',
+            trainingRemark: '区段取消限速功能',
+            trainingType: '04',
+            productTypes: ['01', '02'],
+            stepVOList: [
+                { deviceType: '03', orderNum: 1, operateCode: '408', tip: '鼠标右键菜单选择【区段取消限速】' },
+                { deviceType: '03', orderNum: 2, operateCode: '4081', tip: '鼠标左键点击【下达】按钮' },
+                { deviceType: '03', orderNum: 3, operateCode: '4082', tip: '鼠标左键点击【确认】按钮' },
+                { deviceType: '03', orderNum: 4, operateCode: '4083', tip: '鼠标左键点击【确认1】按钮' },
+                { deviceType: '03', orderNum: 5, operateCode: '4084', tip: '鼠标左键点击【确认2】按钮', val: '5' },
+                { deviceType: '03', orderNum: 6, operateCode: '001', tip: '鼠标左键点击【关闭】按钮' }
+            ]
+        },
+
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: '0301',
+            skinCode: '02',
+            trainingName: '道岔单锁({7})',
+            trainingRemark: '道岔单锁功能',
+            trainingType: '03',
+            productTypes: ['01', '02'],
+            stepVOList: [
+                { deviceType: '02', orderNum: 1, operateCode: '103', tip: '鼠标右键菜单选择【道岔单锁】' },
+                { deviceType: '02', orderNum: 2, operateCode: '103', tip: '鼠标左键点击【确定】按钮' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: '0302',
+            skinCode: '02',
+            trainingName: '道岔单解({7})',
+            trainingRemark: '道岔单解功能',
+            trainingType: '03',
+            productTypes: ['01', '02'],
+            stepVOList: [
+                { deviceType: '02', orderNum: 1, operateCode: '104', tip: '鼠标右键菜单选择【道岔单解】' },
+                { deviceType: '02', orderNum: 2, operateCode: '1041', tip: '鼠标左键点击【下达】按钮' },
+                { deviceType: '02', orderNum: 3, operateCode: '1043', tip: '鼠标左键点击【确认1】按钮' },
+                { deviceType: '02', orderNum: 4, operateCode: '1044', tip: '鼠标左键点击【确认2】按钮' },
+                { deviceType: '02', orderNum: 5, operateCode: '001', tip: '鼠标左键点击【关闭】按钮' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: '0303',
+            skinCode: '02',
+            trainingName: '道岔区段封闭({7})',
+            trainingRemark: '道岔区段封闭功能',
+            trainingType: '03',
+            productTypes: ['01', '02'],
+            stepVOList: [
+                { deviceType: '02', orderNum: 1, operateCode: '105', tip: '鼠标右键菜单选择【道岔区段封闭】' },
+                { deviceType: '02', orderNum: 2, operateCode: '105', tip: '鼠标左键点击【确定】按钮' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: '0304',
+            skinCode: '02',
+            trainingName: '道岔区段解封({7})',
+            trainingRemark: '道岔区段解封功能',
+            trainingType: '03',
+            productTypes: ['01', '02'],
+            stepVOList: [
+                { deviceType: '02', orderNum: 1, operateCode: '106', tip: '鼠标右键菜单选择【道岔区段解封】' },
+                { deviceType: '02', orderNum: 2, operateCode: '1061', tip: '鼠标左键点击【下达】按钮' },
+                { deviceType: '02', orderNum: 3, operateCode: '1063', tip: '鼠标左键点击【确认1】按钮' },
+                { deviceType: '02', orderNum: 4, operateCode: '1064', tip: '鼠标左键点击【确认2】按钮' },
+                { deviceType: '02', orderNum: 5, operateCode: '001', tip: '鼠标左键点击【关闭】按钮' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: '0305',
+            skinCode: '02',
+            trainingName: '道岔转动({7})',
+            trainingRemark: '道岔转动功能({15}转{16})',
+            trainingType: '03',
+            productTypes: ['01', '02'],
+            stepVOList: [
+                { deviceType: '02', orderNum: 1, operateCode: '107', tip: '鼠标右键菜单选择【道岔转动】' },
+                { deviceType: '02', orderNum: 2, operateCode: '107', tip: '鼠标左键点击【确定】按钮' }
+            ]
+        },
+        {
+            maxDuration: 20,
+            minDuration: 10,
+            operateType: '0306',
+            skinCode: '02',
+            trainingName: '道岔区段故障解锁({7})',
+            trainingRemark: '道岔区段故障解锁功能',
+            trainingType: '03',
+            productTypes: ['01', '02'],
+            stepVOList: [
+                { deviceType: '02', orderNum: 1, operateCode: '109', tip: '鼠标右键菜单选择【道岔区段故障解锁】' },
+                { deviceType: '02', orderNum: 2, operateCode: '1091', tip: '鼠标左键点击【下达】按钮' },
+                { deviceType: '02', orderNum: 3, operateCode: '1093', tip: '鼠标左键点击【确认1】按钮' },
+                { deviceType: '02', orderNum: 4, operateCode: '1094', tip: '鼠标左键点击【确认2】按钮' },
+                { deviceType: '02', orderNum: 5, operateCode: '001', tip: '鼠标左键点击【关闭】按钮' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: '0307',
+            skinCode: '02',
+            trainingName: '道岔区段计轴预复位({7})',
+            trainingRemark: '道岔区段计轴预复位功能',
+            trainingType: '03',
+            productTypes: ['01'],
+            stepVOList: [
+                { deviceType: '02', orderNum: 1, operateCode: '110', tip: '鼠标右键菜单选择【道岔区段计轴预复位】' },
+                { deviceType: '02', orderNum: 2, operateCode: '1101', tip: '鼠标左键点击【下达】按钮' },
+                { deviceType: '02', orderNum: 3, operateCode: '1103', tip: '鼠标左键点击【确认1】按钮' },
+                { deviceType: '02', orderNum: 4, operateCode: '1104', tip: '鼠标左键点击【确认2】按钮' },
+                { deviceType: '02', orderNum: 5, operateCode: '001', tip: '鼠标左键点击【关闭】按钮' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: '0308',
+            skinCode: '02',
+            trainingName: '区段切除({7})',
+            trainingRemark: '区段切除',
+            trainingType: '03',
+            productTypes: ['01', '02'],
+            stepVOList: [
+                { deviceType: '02', orderNum: 1, operateCode: '111', tip: '鼠标右键菜单选择【区段切除】' },
+                { deviceType: '02', orderNum: 2, operateCode: '111', tip: '鼠标左键点击【确定】按钮' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: '0309',
+            skinCode: '02',
+            trainingName: '区段激活({7})',
+            trainingRemark: '区段激活功能',
+            trainingType: '03',
+            productTypes: ['01', '02'],
+            stepVOList: [
+                { deviceType: '02', orderNum: 1, operateCode: '112', tip: '鼠标右键菜单选择【区段激活】' },
+                { deviceType: '02', orderNum: 2, operateCode: '112', tip: '鼠标左键点击【确定】按钮' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: '0310',
+            skinCode: '02',
+            trainingName: '道岔区段设置限速({7})',
+            trainingRemark: '道岔区段设置限速功能（限速值：5）',
+            trainingType: '03',
+            productTypes: ['01', '02'],
+            stepVOList: [
+                { deviceType: '02', orderNum: 1, operateCode: '113', tip: '鼠标右键菜单选择【道岔区段设置限速】' },
+                { deviceType: '02', orderNum: 2, operateCode: '1136', tip: '鼠标左键选择【限速值5】', val: '5' },
+                { deviceType: '02', orderNum: 3, operateCode: '1131', tip: '鼠标左键点击【下达】按钮' },
+                { deviceType: '02', orderNum: 4, operateCode: '1132', tip: '鼠标左键点击【确认】按钮' },
+                { deviceType: '02', orderNum: 5, operateCode: '1133', tip: '鼠标左键点击【确认1】按钮' },
+                { deviceType: '02', orderNum: 6, operateCode: '1134', tip: '鼠标左键点击【确认2】按钮', val: '5' },
+                { deviceType: '02', orderNum: 7, operateCode: '001', tip: '鼠标左键点击【关闭】按钮' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: '0311',
+            skinCode: '02',
+            trainingName: '道岔区段取消限速({7})',
+            trainingRemark: '道岔区段取消限速功能',
+            trainingType: '03',
+            productTypes: ['01', '02'],
+            stepVOList: [
+                { deviceType: '02', orderNum: 1, operateCode: '114', tip: '鼠标右键菜单选择【道岔区段取消限速】' },
+                { deviceType: '02', orderNum: 2, operateCode: '1141', tip: '鼠标左键点击【下达】按钮' },
+                { deviceType: '02', orderNum: 3, operateCode: '1142', tip: '鼠标左键点击【确认】按钮' },
+                { deviceType: '02', orderNum: 4, operateCode: '1143', tip: '鼠标左键点击【确认1】按钮' },
+                { deviceType: '02', orderNum: 5, operateCode: '1144', tip: '鼠标左键点击【确认2】按钮', val: '5' },
+                { deviceType: '02', orderNum: 6, operateCode: '001', tip: '鼠标左键点击【关闭】按钮' }
+            ]
+        },
+
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: '0201',
+            skinCode: '02',
+            trainingName: '进路选排({3})',
+            trainingRemark: '选择排列进路',
+            trainingType: '02',
+            productTypes: ['01', '02'],
+            stepVOList: [
+                { deviceType: '04', orderNum: 1, operateCode: '301', tip: '鼠标右键菜单选择【进路选排】' },
+                { deviceType: '04', orderNum: 2, operateCode: '3011', tip: '鼠标左键选择进路名称【{3}】', val: '{4}' },
+                { deviceType: '04', orderNum: 3, operateCode: '301', tip: '鼠标左键点击【确定】按钮' },
+                { deviceType: '04', orderNum: 4, operateCode: '3012', tip: '鼠标左键点击【确定】按钮' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: '0202',
+            skinCode: '02',
+            trainingName: '进路取消({3})',
+            trainingRemark: '进路取消',
+            trainingType: '02',
+            productTypes: ['02'],
+            stepVOList: [
+                { deviceType: '04', orderNum: 1, operateCode: '303', tip: '鼠标右键菜单选择【进路取消】' },
+                { deviceType: '04', orderNum: 2, operateCode: '303', tip: '鼠标左键点击【确定】按钮' },
+                { deviceType: '04', orderNum: 3, operateCode: '3031', tip: '鼠标左键点击【确定】按钮' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: '0202',
+            skinCode: '02',
+            trainingName: '进路取消({3})',
+            trainingRemark: '进路取消',
+            trainingType: '02',
+            productTypes: ['01'],
+            stepVOList: [
+                { deviceType: '04', orderNum: 1, operateCode: '303', tip: '鼠标右键菜单选择【进路取消】' },
+                { deviceType: '04', orderNum: 2, operateCode: '303', tip: '鼠标左键点击【确定】按钮' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: '0203',
+            skinCode: '02',
+            trainingName: '信号封闭({5})',
+            trainingRemark: '信号封闭',
+            trainingType: '02',
+            productTypes: ['01', '02'],
+            stepVOList: [
+                { deviceType: '04', orderNum: 1, operateCode: '306', tip: '鼠标右键菜单选择【信号封闭】' },
+                { deviceType: '04', orderNum: 2, operateCode: '306', tip: '鼠标左键点击【确定】按钮' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: '0204',
+            skinCode: '02',
+            trainingName: '信号解封({5})',
+            trainingRemark: '信号解封',
+            trainingType: '02',
+            productTypes: ['01', '02'],
+            stepVOList: [
+                { deviceType: '04', orderNum: 1, operateCode: '307', tip: '鼠标右键菜单选择【信号解封】' },
+                { deviceType: '04', orderNum: 2, operateCode: '3071', tip: '鼠标左键点击【下达】按钮' },
+                { deviceType: '04', orderNum: 3, operateCode: '3072', tip: '鼠标左键点击【确认】按钮' },
+                { deviceType: '04', orderNum: 4, operateCode: '3073', tip: '鼠标左键点击【确认1】按钮' },
+                { deviceType: '04', orderNum: 5, operateCode: '3074', tip: '鼠标左键点击【确认2】按钮' },
+                { deviceType: '04', orderNum: 6, operateCode: '001', tip: '鼠标左键点击【关闭】按钮' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: '0205',
+            skinCode: '02',
+            trainingName: '信号关灯({3})',
+            trainingRemark: '信号关灯',
+            trainingType: '02',
+            productTypes: ['01', '02'],
+            stepVOList: [
+                { deviceType: '04', orderNum: 1, operateCode: '313', tip: '鼠标右键菜单选择【信号关灯】' },
+                { deviceType: '04', orderNum: 2, operateCode: '313', tip: '鼠标左键点击【确定】按钮' },
+                { deviceType: '04', orderNum: 3, operateCode: '3131', tip: '鼠标左键点击【确定】按钮' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: '0206',
+            skinCode: '02',
+            trainingName: '信号重开({3})',
+            trainingRemark: '信号重开',
+            trainingType: '02',
+            productTypes: ['01', '02'],
+            stepVOList: [
+                { deviceType: '04', orderNum: 1, operateCode: '304', tip: '鼠标右键菜单选择【信号重开】' },
+                { deviceType: '04', orderNum: 2, operateCode: '304', tip: '鼠标左键点击【确定】按钮' },
+                { deviceType: '04', orderNum: 3, operateCode: '3041', tip: '鼠标左键点击【确定】按钮' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: '0207',
+            skinCode: '02',
+            trainingName: '引导进路办理({3})',
+            trainingRemark: '进路办理信号引导',
+            trainingType: '02',
+            productTypes: ['01'],
+            stepVOList: [
+                { deviceType: '04', orderNum: 1, operateCode: '308', tip: '鼠标右键菜单选择【引导进路办理】' },
+                { deviceType: '04', orderNum: 2, operateCode: '3081', tip: '鼠标左键点击【下达】按钮' },
+                { deviceType: '04', orderNum: 3, operateCode: '3083', tip: '鼠标左键点击【确认1】按钮' },
+                { deviceType: '04', orderNum: 4, operateCode: '3084', tip: '鼠标左键点击【确认2】按钮' },
+                { deviceType: '04', orderNum: 5, operateCode: '001', tip: '鼠标左键点击【关闭】按钮' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: '0208',
+            skinCode: '02',
+            trainingName: '自排开({5})',
+            trainingRemark: '自排开',
+            trainingType: '02',
+            productTypes: ['02'],
+            stepVOList: [
+                { deviceType: '04', orderNum: 1, operateCode: '315', tip: '鼠标右键菜单选择【自排开】' },
+                { deviceType: '04', orderNum: 2, operateCode: '3151', tip: '鼠标左键选择控制状态为"人工"的进路', val: '{6}' },
+                { deviceType: '04', orderNum: 3, operateCode: '315', tip: '鼠标左键点击【确定】按钮' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: '0209',
+            skinCode: '02',
+            trainingName: '自排关({5})',
+            trainingRemark: '自排关',
+            trainingType: '02',
+            productTypes: ['02'],
+            stepVOList: [
+                { deviceType: '04', orderNum: 1, operateCode: '314', tip: '鼠标右键菜单选择【自排关】' },
+                { deviceType: '04', orderNum: 2, operateCode: '3141', tip: '鼠标左键选择第一条进路', val: '{6}' },
+                { deviceType: '04', orderNum: 3, operateCode: '314', tip: '鼠标左键点击【确定】按钮' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: '0210',
+            skinCode: '02',
+            trainingName: '查询进路控制状态({5})',
+            trainingRemark: '查询进路控制状态',
+            trainingType: '02',
+            productTypes: ['02'],
+            stepVOList: [
+                { deviceType: '04', orderNum: 1, operateCode: '316', tip: '鼠标右键菜单选择【查询进路控制模式】' },
+                { deviceType: '04', orderNum: 2, operateCode: '316', tip: '鼠标左键点击【确定】按钮' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: '0211',
+            skinCode: '02',
+            trainingName: '设置联锁自动进路({5})',
+            trainingRemark: '设置联锁自动进路',
+            trainingType: '02',
+            productTypes: ['01'],
+            stepVOList: [
+                { deviceType: '04', orderNum: 1, operateCode: '309', tip: '鼠标右键菜单选择【设置联锁自动进路】' },
+                { deviceType: '04', orderNum: 2, operateCode: '309', tip: '鼠标左键点击【确定】按钮' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: '0212',
+            skinCode: '02',
+            trainingName: '取消联锁自动进路({5})',
+            trainingRemark: '取消联锁自动进路',
+            trainingType: '02',
+            productTypes: ['01'],
+            stepVOList: [
+                { deviceType: '04', orderNum: 1, operateCode: '310', tip: '鼠标右键菜单选择【取消联锁自动进路】' },
+                { deviceType: '04', orderNum: 2, operateCode: '310', tip: '鼠标左键点击【确定】按钮' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: '0213',
+            skinCode: '02',
+            trainingName: '设置联锁自动触发({5})',
+            trainingRemark: '设置联锁自动触发',
+            trainingType: '02',
+            productTypes: ['01'],
+            stepVOList: [
+                { deviceType: '04', orderNum: 1, operateCode: '311', tip: '鼠标右键菜单选择【设置联锁自动触发】' },
+                { deviceType: '04', orderNum: 2, operateCode: '311', tip: '鼠标左键点击【确定】按钮' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: '0214',
+            skinCode: '02',
+            trainingName: '取消联锁自动触发({5})',
+            trainingRemark: '取消联锁自动触发',
+            trainingType: '02',
+            productTypes: ['01'],
+            stepVOList: [
+                { deviceType: '04', orderNum: 1, operateCode: '312', tip: '鼠标右键菜单选择【取消联锁自动触发】' },
+                { deviceType: '04', orderNum: 2, operateCode: '312', tip: '鼠标左键点击【确定】按钮' }
+            ]
+        }
+    ]
+};
diff --git a/src/jmapNew/theme/xian_01/operationConfigGlobal.js b/src/jmapNew/theme/xian_01/operationConfigGlobal.js
new file mode 100644
index 000000000..e99041826
--- /dev/null
+++ b/src/jmapNew/theme/xian_01/operationConfigGlobal.js
@@ -0,0 +1,820 @@
+export default {
+    list: [
+        {
+            maxDuration: 20,
+            minDuration: 15,
+            operateType: '0103',
+            skinCode: '05',
+            trainingName: 'Switch to central control ({1})',
+            trainingRemark: 'Control permission conversion, switch station control to central control',
+            trainingType: '01',
+            productTypes: ['02'],
+            stepVOList: [
+                { deviceType: 'bar', orderNum: 1, operateCode: '0024', tip: 'Left click the menu bar [control mode conversion]on the top' },
+                { deviceType: 'bar', orderNum: 2, operateCode: '2041', tip: 'Left click [switch to central control] ' },
+                { deviceType: '05', orderNum: 3, operateCode: '2042', tip: 'Left click to select the control area to be converted【{1}】', val: '{2}' },
+                { deviceType: '05', orderNum: 4, operateCode: '204', tip: 'Left click [request to central control] ', val: '{2}' },
+                { deviceType: '05', orderNum: 5, operateCode: '2043', tip: 'Left click [confirm]', val: '{2}' },
+                { deviceType: '05', orderNum: 6, operateCode: '0013', tip: 'Left click [confirm]' },
+                { deviceType: 'bar', orderNum: 7, operateCode: '000', tip: 'Left click [close] ' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: '0101',
+            skinCode: '05',
+            trainingName: 'Switch to station control ({1})',
+            trainingRemark: 'Control permission conversion, Force to station control',
+            trainingType: '01',
+            productTypes: ['01'],
+            stepVOList: [
+                { deviceType: 'bar', orderNum: 1, operateCode: '0024', tip: 'Left click the menu bar [control mode conversion]on the top' },
+                { deviceType: 'bar', orderNum: 2, operateCode: '2021', tip: 'Left click [switch to station control' },
+                { deviceType: '05', orderNum: 3, operateCode: '2022', tip: 'Left click to select the control area to be converted【{1}】', val: '{2}' },
+                { deviceType: '05', orderNum: 4, operateCode: '202', tip: 'Left click [request to station control', val: '{2}' },
+                { deviceType: '05', orderNum: 5, operateCode: '2023', tip: 'Left click [confirm] ', val: '{2}' },
+                { deviceType: '05', orderNum: 6, operateCode: '0013', tip: 'Left click [confirm] ' },
+                { deviceType: 'bar', orderNum: 7, operateCode: '000', tip: 'Left click [close] ' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: '0102',
+            skinCode: '05',
+            trainingName: 'Force to station control ({1})',
+            trainingRemark: 'Control permission conversion,Force to station control',
+            trainingType: '01',
+            productTypes: ['01'],
+            stepVOList: [
+                { deviceType: 'bar', orderNum: 1, operateCode: '0024', tip: 'Left click the menu bar [control mode conversion]on the top' },
+                { deviceType: 'bar', orderNum: 2, operateCode: '2034', tip: 'Left click[Force to station control]' },
+                { deviceType: 'bar', orderNum: 3, operateCode: '2035', tip: 'Left click to input the password [123456],then left click the [confirm]' },
+                { deviceType: '05', orderNum: 4, operateCode: '2032', tip: 'Left click to select the control area to be converted【{1}】', val: '{2}' },
+                { deviceType: '05', orderNum: 5, operateCode: '203', tip: 'Left click [Foece to station control', val: '{2}' },
+                { deviceType: '05', orderNum: 6, operateCode: '2033', tip: 'Left click [confirm] ', val: '{2}' },
+                { deviceType: '05', orderNum: 7, operateCode: '0013', tip: 'Left click [confirm] ' },
+                { deviceType: 'bar', orderNum: 8, operateCode: '000', tip: 'Left click [close] ' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: '0501',
+            skinCode: '05',
+            trainingName: 'Detain Train({10}-{12}station)',
+            trainingRemark: 'Set the detaining function',
+            trainingType: '05',
+            productTypes: ['01', '02'],
+            stepVOList: [
+                { deviceType: '06', orderNum: 1, operateCode: '504', tip: 'Right click to select  [Detain Train]' },
+                { deviceType: '06', orderNum: 2, operateCode: '504', tip: 'Left click  [confirm] ' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: '0502',
+            skinCode: '05',
+            trainingName: 'Cancel Detaining({10}-{12}The platform)',
+            trainingRemark: 'Set cancelling detaining function',
+            trainingType: '05',
+            productTypes: ['01', '02'],
+            stepVOList: [
+                { deviceType: '06', orderNum: 1, operateCode: '505', tip: 'Right click to select  [Cancel Detaining]]' },
+                { deviceType: '06', orderNum: 2, operateCode: '505', tip: 'Left click [confirm] ' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: '0503',
+            skinCode: '05',
+            trainingName: 'Force Canceling Detaining({10}-{12}The platform)',
+            trainingRemark: 'Force to cancel  train detaining function',
+            trainingType: '05',
+            productTypes: ['01'],
+            stepVOList: [
+                { deviceType: '06', orderNum: 1, operateCode: '506', tip: 'Right click to select [Force Canceling Detaining]' },
+                { deviceType: '06', orderNum: 2, operateCode: '506', tip: 'Left click  [confirm] ' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: '0504',
+            skinCode: '05',
+            trainingName: 'Cancel train detaining along the whole line({10}-{12}The platform)',
+            trainingRemark: 'Cancel train detaining along the whole line (default the whole uplink and downlink )',
+            trainingType: '05',
+            productTypes: ['02'],
+            stepVOList: [
+                { deviceType: '06', orderNum: 1, operateCode: '508', tip: 'Right click to select [Cancel  train detaining along the whole line]' },
+                { deviceType: '06', orderNum: 2, operateCode: '508', tip: 'Left click [confirm] ', val: '{11}' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: '0504',
+            skinCode: '05',
+            trainingName: 'Cancel train detaining along the whole line({10}-{12}The platform)',
+            trainingRemark: 'Cancel train detaining along the whole line (select the uplink or downlink ))',
+            trainingType: '05',
+            productTypes: ['02'],
+            stepVOList: [
+                { deviceType: '06', orderNum: 1, operateCode: '508', tip: 'Right click to select  [Cancel  train detaining along the whole line]' },
+                { deviceType: '06', orderNum: 2, operateCode: '5081', tip: 'Right click to select[{14}the whole line', val: '{13}' },
+                { deviceType: '06', orderNum: 3, operateCode: '508', tip: 'Left click [confirm]', val: '{13}' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: '0505',
+            skinCode: '05',
+            trainingName: 'Skip this station to continue moving({10}-{12}The platform)',
+            trainingRemark: 'Set the skip to continue moving function',
+            trainingType: '05',
+            productTypes: ['01', '02'],
+            stepVOList: [
+                { deviceType: '06', orderNum: 1, operateCode: '502', tip: 'Right click to select [Skip this station to continue moving]' },
+                { deviceType: '06', orderNum: 2, operateCode: '502', tip: 'Left click [confirm]', val: '{11}' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: '0506',
+            skinCode: '05',
+            trainingName: 'Cancel skiping({10}-{12}The platform)',
+            trainingRemark: 'Set cancelling skiping function',
+            trainingType: '05',
+            productTypes: ['01', '02'],
+            stepVOList: [
+                { deviceType: '06', orderNum: 1, operateCode: '503', tip: 'Right click to select [Cancel skiping]' },
+                { deviceType: '06', orderNum: 2, operateCode: '503', tip: 'Left click [confirm]', val: '{11}' }
+            ]
+        },
+        {
+            maxDuration: 8,
+            minDuration: 5,
+            operateType: '0507',
+            skinCode: '05',
+            trainingName: 'Query Platform status({10}-{12}The platform)',
+            trainingRemark: 'Query platform status  function',
+            trainingType: '05',
+            productTypes: ['01', '02'],
+            stepVOList: [
+                { deviceType: '06', orderNum: 1, operateCode: '507', tip: 'Right click to select [Query Platform status]' },
+                { deviceType: '06', orderNum: 2, operateCode: '0012', tip: 'Left click [confirm] ' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: '0508',
+            skinCode: '05',
+            trainingName: 'Set the stop time({10}-{12}The platform)',
+            trainingRemark: 'Set the stop time (auto, permanent validity)',
+            trainingType: '05',
+            productTypes: ['02'],
+            stepVOList: [
+                { deviceType: '06', orderNum: 1, operateCode: '509', tip: 'Right click to select [Set the stop time]' },
+                { deviceType: '06', orderNum: 2, operateCode: '5092', tip: 'Left click to select [auto]', val: '01' },
+                { deviceType: '06', orderNum: 3, operateCode: '509', tip: 'Left click [confirm] ', val: '01::20::true' },
+                { deviceType: '06', orderNum: 4, operateCode: '5091', tip: 'Left click [confirm] ', val: '01::20::true' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: '0508',
+            skinCode: '05',
+            trainingName: 'Set the stop time({10}-{12}The platform)',
+            trainingRemark: 'Set the stop time (manual, 20 seconds, permanent validity)',
+            trainingType: '05',
+            productTypes: ['02'],
+            stepVOList: [
+                { deviceType: '06', orderNum: 1, operateCode: '509', tip: 'Right click to select [Set the stop time]' },
+                { deviceType: '06', orderNum: 2, operateCode: '5092', tip: 'Left click to select  [manual]', val: '02' },
+                { deviceType: '06', orderNum: 3, operateCode: '5094', tip: 'Set time  [20]', val: '20' },
+                { deviceType: '06', orderNum: 4, operateCode: '509', tip: 'Left click  [confirm] ', val: '02::20::true' },
+                { deviceType: '06', orderNum: 5, operateCode: '5091', tip: 'Left click  [confirm]', val: '02::20::true' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: '0508',
+            skinCode: '05',
+            trainingName: 'Set the stop time({10}-{12}The platform)',
+            trainingRemark: 'Set the stop time (manual, 20 seconds, once valid )',
+            trainingType: '05',
+            productTypes: ['02'],
+            stepVOList: [
+                { deviceType: '06', orderNum: 1, operateCode: '509', tip: 'Right click to select [Set the stop time]' },
+                { deviceType: '06', orderNum: 2, operateCode: '5092', tip: 'Left click to select  [manual]', val: '02' },
+                { deviceType: '06', orderNum: 3, operateCode: '5094', tip: 'Set time  [20]', val: '20' },
+                { deviceType: '06', orderNum: 4, operateCode: '5093', tip: 'Left click to select "once valid ".', val: 'false' },
+                { deviceType: '06', orderNum: 5, operateCode: '509', tip: 'Left click  [confirm] ', val: '02::20::false' },
+                { deviceType: '06', orderNum: 6, operateCode: '5091', tip: 'Left click  [confirm] ', val: '02::20::false' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: '0509',
+            skinCode: '05',
+            trainingName: 'Set Operation speed Level({10}-{12}The platform)',
+            trainingRemark: 'Set Operation speed Level(set the interval running time to 60, permanent validity)',
+            trainingType: '05',
+            productTypes: ['02'],
+            stepVOList: [
+                { deviceType: '06', orderNum: 1, operateCode: '510', tip: 'Right click to select [Set Operation speed Level]' },
+                { deviceType: '06', orderNum: 2, operateCode: '5101', tip: 'Left click to select [60]', val: '60' },
+                { deviceType: '06', orderNum: 3, operateCode: '510', tip: 'Left click [confirm] ', val: '60::true' },
+                { deviceType: '06', orderNum: 4, operateCode: '5102', tip: 'Left click [confirm] ', val: '60::true' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: '0509',
+            skinCode: '05',
+            trainingName: 'Set Operation speed Level({10}-{12}The platform)',
+            trainingRemark: 'Set Operation speed Level (set the interval running time to 60, once valid )',
+            trainingType: '05',
+            productTypes: ['02'],
+            stepVOList: [
+                { deviceType: '06', orderNum: 1, operateCode: '510', tip: 'Right click to select [Set Operation speed Level]' },
+                { deviceType: '06', orderNum: 2, operateCode: '5101', tip: 'Left click to select [60]', val: '60' },
+                { deviceType: '06', orderNum: 3, operateCode: '5103', tip: 'Left click to cancel [permanent validity].', val: 'false' },
+                { deviceType: '06', orderNum: 4, operateCode: '510', tip: 'Left click [confirm] ', val: '60::false' },
+                { deviceType: '06', orderNum: 5, operateCode: '5102', tip: 'Left click [confirm] ', val: '60::false' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: '0510',
+            skinCode: '05',
+            trainingName: 'Set departure in advance({10}-{12}The platform)',
+            trainingRemark: 'Set  departure inadvance function',
+            trainingType: '05',
+            productTypes: ['02'],
+            stepVOList: [
+                { deviceType: '06', orderNum: 1, operateCode: '501', tip: 'Right click to select [Set departure in advance]' },
+                { deviceType: '06', orderNum: 2, operateCode: '501', tip: 'Left click [confirm] ' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: '0511',
+            skinCode: '05',
+            trainingName: 'Manual return strategy setting({10}-{12}The platform)',
+            trainingRemark: 'Manual return strategy setting function',
+            trainingType: '05',
+            productTypes: ['02'],
+            stepVOList: [
+                { deviceType: '06', orderNum: 1, operateCode: '511', tip: 'Right click to select [Manual return strategy setting]' },
+                { deviceType: '06', orderNum: 2, operateCode: '5111', tip: 'Left click to select [No return]".', val: '01' },
+                { deviceType: '06', orderNum: 3, operateCode: '511', tip: 'Left click [confirm] ', val: '01' }
+            ]
+        },
+
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: '0401',
+            skinCode: '05',
+            trainingName: 'Section fault unlocking({8}{9})',
+            trainingRemark: 'Fault unlocking',
+            trainingType: '04',
+            productTypes: ['01', '02'],
+            stepVOList: [
+                { deviceType: '03', orderNum: 1, operateCode: '402', tip: 'Right click to select [Section fault unlocking]' },
+                { deviceType: '03', orderNum: 2, operateCode: '4026', tip: 'Left click  [Execute] ' },
+                { deviceType: '03', orderNum: 3, operateCode: '4024', tip: 'Left click [ok 1] ' },
+                { deviceType: '03', orderNum: 4, operateCode: '4025', tip: 'Left click [ok 2] ' },
+                { deviceType: '03', orderNum: 5, operateCode: '001', tip: 'Left click [close] ' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: '0402',
+            skinCode: '05',
+            trainingName: 'Section resection({8}{9})',
+            trainingRemark: 'Section resection',
+            trainingType: '04',
+            productTypes: ['01', '02'],
+            stepVOList: [
+                { deviceType: '03', orderNum: 1, operateCode: '405', tip: 'Right click to select [Section resection]' },
+                { deviceType: '03', orderNum: 2, operateCode: '405', tip: 'Left click  [confirm] ' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: '0403',
+            skinCode: '05',
+            trainingName: 'Section activation({8}{9})',
+            trainingRemark: 'Section activation function',
+            trainingType: '04',
+            productTypes: ['01', '02'],
+            stepVOList: [
+                { deviceType: '03', orderNum: 1, operateCode: '406', tip: 'Right click to select [Section  activation]' },
+                { deviceType: '03', orderNum: 2, operateCode: '406', tip: 'Left click [confirm]' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: '0404',
+            skinCode: '05',
+            trainingName: 'Axis pre-reset({8}{9})',
+            trainingRemark: 'Axis pre-reset function',
+            trainingType: '04',
+            productTypes: ['01'],
+            stepVOList: [
+                { deviceType: '03', orderNum: 1, operateCode: '409', tip: 'Right click to select [Axis pre-reset]' },
+                { deviceType: '03', orderNum: 2, operateCode: '4091', tip: 'Left click  [Execute]' },
+                { deviceType: '03', orderNum: 3, operateCode: '4093', tip: 'Left click [confirm1]' },
+                { deviceType: '03', orderNum: 4, operateCode: '4094', tip: 'Left click [confirm2]' },
+                { deviceType: '03', orderNum: 5, operateCode: '001', tip: 'Left click [close]' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: '0405',
+            skinCode: '05',
+            trainingName: 'Section blockade({8}{9})',
+            trainingRemark: 'Section blockade function',
+            trainingType: '04',
+            productTypes: ['01', '02'],
+            stepVOList: [
+                { deviceType: '03', orderNum: 1, operateCode: '403', tip: 'Right click to select  [Section blockade]' },
+                { deviceType: '03', orderNum: 2, operateCode: '403', tip: 'Left click  [confirm] ' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: '0406',
+            skinCode: '05',
+            trainingName: 'Section unblockade({8}{9})',
+            trainingRemark: 'Section unblockade function',
+            trainingType: '04',
+            productTypes: ['01', '02'],
+            stepVOList: [
+                { deviceType: '03', orderNum: 1, operateCode: '404', tip: 'Right click to select [Section unblockade]' },
+                { deviceType: '03', orderNum: 2, operateCode: '4041', tip: 'Left click  [Execute]' },
+                { deviceType: '03', orderNum: 3, operateCode: '4043', tip: 'Left click [confirm1]' },
+                { deviceType: '03', orderNum: 4, operateCode: '4044', tip: 'Left click [confirm2]' },
+                { deviceType: '03', orderNum: 5, operateCode: '001', tip: 'Left click [close]' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: '0407',
+            skinCode: '05',
+            trainingName: 'Set speed limit on the section({8}{9})',
+            trainingRemark: 'Set speed limit on the section (speed limit value: 5)',
+            trainingType: '04',
+            productTypes: ['01', '02'],
+            stepVOList: [
+                { deviceType: '03', orderNum: 1, operateCode: '407', tip: 'Right click to select [Set speed limit on the section]' },
+                { deviceType: '03', orderNum: 2, operateCode: '4076', tip: 'Left click to select  [speed limit  5] ', val: '5' },
+                { deviceType: '03', orderNum: 3, operateCode: '4071', tip: 'Left click  [Execute]' },
+                { deviceType: '03', orderNum: 4, operateCode: '4072', tip: 'Left click [confirm]' },
+                { deviceType: '03', orderNum: 5, operateCode: '4073', tip: 'Left click [confirm1]' },
+                { deviceType: '03', orderNum: 6, operateCode: '4074', tip: 'Left click [confirm2]', val: '5' },
+                { deviceType: '03', orderNum: 7, operateCode: '001', tip: 'Left click [close]' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: '0408',
+            skinCode: '05',
+            trainingName: 'Cancel speed limit on the section({8}{9})',
+            trainingRemark: 'Cancel speed limit on the section',
+            trainingType: '04',
+            productTypes: ['01', '02'],
+            stepVOList: [
+                { deviceType: '03', orderNum: 1, operateCode: '408', tip: 'Right click to select [Cancel speed limit on the section]' },
+                { deviceType: '03', orderNum: 2, operateCode: '4081', tip: 'Left click  [Execute]' },
+                { deviceType: '03', orderNum: 3, operateCode: '4082', tip: 'Left click [confirm] ' },
+                { deviceType: '03', orderNum: 4, operateCode: '4083', tip: 'Left click [confirm1]' },
+                { deviceType: '03', orderNum: 5, operateCode: '4084', tip: 'Left click [confirm2]', val: '5' },
+                { deviceType: '03', orderNum: 6, operateCode: '001', tip: 'Left click [close]' }
+            ]
+        },
+
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: '0301',
+            skinCode: '05',
+            trainingName: 'Single lock of turnout({7})',
+            trainingRemark: 'Single lock of turnout',
+            trainingType: '03',
+            productTypes: ['01', '02'],
+            stepVOList: [
+                { deviceType: '02', orderNum: 1, operateCode: '103', tip: 'Right click to select [Single lock of turnout]' },
+                { deviceType: '02', orderNum: 2, operateCode: '103', tip: 'Left click  [confirm] ' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: '0302',
+            skinCode: '05',
+            trainingName: 'Single release of turnout({7})',
+            trainingRemark: 'Single release of turnout',
+            trainingType: '03',
+            productTypes: ['01', '02'],
+            stepVOList: [
+                { deviceType: '02', orderNum: 1, operateCode: '104', tip: 'Right click to select [Single release of turnout]' },
+                { deviceType: '02', orderNum: 2, operateCode: '1041', tip: 'Left click  [Execute]' },
+                { deviceType: '02', orderNum: 3, operateCode: '1043', tip: 'Left click [confirm1] ' },
+                { deviceType: '02', orderNum: 4, operateCode: '1044', tip: 'Left click [confirm2] ' },
+                { deviceType: '02', orderNum: 5, operateCode: '001', tip: 'Left click [close] '}
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: '0303',
+            skinCode: '05',
+            trainingName: 'Turnout section closure({7})',
+            trainingRemark: 'Turnout section closure ',
+            trainingType: '03',
+            productTypes: ['01', '02'],
+            stepVOList: [
+                { deviceType: '02', orderNum: 1, operateCode: '105', tip: 'Right click to select  [Turnout section closure]' },
+                { deviceType: '02', orderNum: 2, operateCode: '105', tip: 'Left click [confirm] ' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: '0304',
+            skinCode: '05',
+            trainingName: 'Turnout section unsealing({7})',
+            trainingRemark: 'Turnout section unsealing function',
+            trainingType: '03',
+            productTypes: ['01', '02'],
+            stepVOList: [
+                { deviceType: '02', orderNum: 1, operateCode: '106', tip: 'Right click to select [Turnout section unsealing]' },
+                { deviceType: '02', orderNum: 2, operateCode: '1061', tip: 'Left click  [Execute]' },
+                { deviceType: '02', orderNum: 3, operateCode: '1063', tip: 'Left click [confirm1]' },
+                { deviceType: '02', orderNum: 4, operateCode: '1064', tip: 'Left click [confirm2]' },
+                { deviceType: '02', orderNum: 5, operateCode: '001', tip: 'Left click [close]' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: '0305',
+            skinCode: '05',
+            trainingName: 'Turnout rotation({7})',
+            trainingRemark: 'Turnout rotation({15}turn{16})',
+            trainingType: '03',
+            productTypes: ['01', '02'],
+            stepVOList: [
+                { deviceType: '02', orderNum: 1, operateCode: '107', tip: 'Right click to select  [Turnout rotation]' },
+                { deviceType: '02', orderNum: 2, operateCode: '107', tip: 'Left click  [confirm] ' }
+            ]
+        },
+        {
+            maxDuration: 20,
+            minDuration: 10,
+            operateType: '0306',
+            skinCode: '05',
+            trainingName: 'Turnout section fault unlocking({7})',
+            trainingRemark: 'Turnout section fault unlocking function',
+            trainingType: '03',
+            productTypes: ['01', '02'],
+            stepVOList: [
+                { deviceType: '02', orderNum: 1, operateCode: '109', tip: 'Right click to select [Turnout section fault unlocking]' },
+                { deviceType: '02', orderNum: 2, operateCode: '1091', tip: 'Left click  [Execute]' },
+                { deviceType: '02', orderNum: 3, operateCode: '1093', tip: 'Left click [confirm1]' },
+                { deviceType: '02', orderNum: 4, operateCode: '1094', tip: 'Left click [confirm2]' },
+                { deviceType: '02', orderNum: 5, operateCode: '001', tip: 'Left click [close]' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: '0307',
+            skinCode: '05',
+            trainingName: 'Turnout section axile pre reset({7})',
+            trainingRemark: 'Turnout section axile pre reset function',
+            trainingType: '03',
+            productTypes: ['01'],
+            stepVOList: [
+                { deviceType: '02', orderNum: 1, operateCode: '110', tip: 'Right click to select [Turnout section axile pre reset]' },
+                { deviceType: '02', orderNum: 2, operateCode: '1101', tip: 'Left click  [Execute]' },
+                { deviceType: '02', orderNum: 3, operateCode: '1103', tip: 'Left click [confirm1]' },
+                { deviceType: '02', orderNum: 4, operateCode: '1104', tip: 'Left click [confirm2]' },
+                { deviceType: '02', orderNum: 5, operateCode: '001', tip: 'Left click [close]' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: '0308',
+            skinCode: '05',
+            trainingName: 'Section resection({7})',
+            trainingRemark: 'Section resection',
+            trainingType: '03',
+            productTypes: ['01', '02'],
+            stepVOList: [
+                { deviceType: '02', orderNum: 1, operateCode: '111', tip: 'Right click to select [Section resection]' },
+                { deviceType: '02', orderNum: 2, operateCode: '111', tip: 'Left click [confirm]' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: '0309',
+            skinCode: '05',
+            trainingName: 'Section activation({7})',
+            trainingRemark: 'Section activation function',
+            trainingType: '03',
+            productTypes: ['01', '02'],
+            stepVOList: [
+                { deviceType: '02', orderNum: 1, operateCode: '112', tip: 'Right click to select  [Section activation]' },
+                { deviceType: '02', orderNum: 2, operateCode: '112', tip: 'Left click [confirm] ' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: '0310',
+            skinCode: '05',
+            trainingName: 'Set speed limit on the turnout section({7})',
+            trainingRemark: 'Set speed limit on the section (speed limit value: 5)',
+            trainingType: '03',
+            productTypes: ['01', '02'],
+            stepVOList: [
+                { deviceType: '02', orderNum: 1, operateCode: '113', tip: 'Right click to select [Set speed limit on the turnout section]' },
+                { deviceType: '02', orderNum: 2, operateCode: '1136', tip: 'Left click to select  [speed limit  5] ', val: '5' },
+                { deviceType: '02', orderNum: 3, operateCode: '1131', tip: 'Left click  [Execute]' },
+                { deviceType: '02', orderNum: 4, operateCode: '1132', tip: 'Left click [confirm]' },
+                { deviceType: '02', orderNum: 5, operateCode: '1133', tip: 'Left click [confirm1]' },
+                { deviceType: '02', orderNum: 6, operateCode: '1134', tip: 'Left click [confirm2]', val: '5' },
+                { deviceType: '02', orderNum: 7, operateCode: '001', tip: 'Left click [close]' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: '0311',
+            skinCode: '05',
+            trainingName: 'Cancel speed limit on the turnout section({7})',
+            trainingRemark: 'Cancel speed limit on the turnout section',
+            trainingType: '03',
+            productTypes: ['01', '02'],
+            stepVOList: [
+                { deviceType: '02', orderNum: 1, operateCode: '114', tip: 'Right click to select [Cancel speed limit on the turnout section]' },
+                { deviceType: '02', orderNum: 2, operateCode: '1141', tip: 'Left click  [Execute]' },
+                { deviceType: '02', orderNum: 3, operateCode: '1142', tip: 'Left click [confirm] ' },
+                { deviceType: '02', orderNum: 4, operateCode: '1143', tip: 'Left click [confirm1]' },
+                { deviceType: '02', orderNum: 5, operateCode: '1144', tip: 'Left click [confirm2]', val: '5' },
+                { deviceType: '02', orderNum: 6, operateCode: '001', tip: 'Left click [close]' }
+            ]
+        },
+
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: '0201',
+            skinCode: '05',
+            trainingName: 'Route selection({3})',
+            trainingRemark: 'Route selection',
+            trainingType: '02',
+            productTypes: ['01', '02'],
+            stepVOList: [
+                { deviceType: '04', orderNum: 1, operateCode: '301', tip: 'Right click to select [Route selection]' },
+                { deviceType: '04', orderNum: 2, operateCode: '3011', tip: 'Left click to select the route name【{3}】', val: '{4}' },
+                { deviceType: '04', orderNum: 3, operateCode: '301', tip: 'Left click  [confirm] ' },
+                { deviceType: '04', orderNum: 4, operateCode: '3012', tip: 'Left click [confirm] ' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: '0202',
+            skinCode: '05',
+            trainingName: 'Cancel the route({3})',
+            trainingRemark: 'Cancel the route',
+            trainingType: '02',
+            productTypes: ['02'],
+            stepVOList: [
+                { deviceType: '04', orderNum: 1, operateCode: '303', tip: 'Right click to select [Cancel the route]' },
+                { deviceType: '04', orderNum: 2, operateCode: '303', tip: 'Left click  [confirm] ' },
+                { deviceType: '04', orderNum: 3, operateCode: '3031', tip: 'Left click  [confirm]' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: '0202',
+            skinCode: '05',
+            trainingName: 'Cancel the route({3})',
+            trainingRemark: 'Cancel the route',
+            trainingType: '02',
+            productTypes: ['01'],
+            stepVOList: [
+                { deviceType: '04', orderNum: 1, operateCode: '303', tip: 'Right click to select [Cancel the route]' },
+                { deviceType: '04', orderNum: 2, operateCode: '303', tip: 'Left click [confirm]' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: '0203',
+            skinCode: '05',
+            trainingName: 'Signal closure({5})',
+            trainingRemark: 'Signal closure',
+            trainingType: '02',
+            productTypes: ['01', '02'],
+            stepVOList: [
+                { deviceType: '04', orderNum: 1, operateCode: '306', tip: 'Right click to select [Signal closure]' },
+                { deviceType: '04', orderNum: 2, operateCode: '306', tip: 'Left click [confirm] ' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: '0204',
+            skinCode: '05',
+            trainingName: 'Signal unsealing({5})',
+            trainingRemark: 'Signal unsealing',
+            trainingType: '02',
+            productTypes: ['01', '02'],
+            stepVOList: [
+                { deviceType: '04', orderNum: 1, operateCode: '307', tip: 'Right click to select [Signal unsealing]' },
+                { deviceType: '04', orderNum: 2, operateCode: '3071', tip: 'Left click  [Execute]' },
+                { deviceType: '04', orderNum: 3, operateCode: '3072', tip: 'Left click [confirm]' },
+                { deviceType: '04', orderNum: 4, operateCode: '3073', tip: 'Left click [confirm1]' },
+                { deviceType: '04', orderNum: 5, operateCode: '3074', tip: 'Left click [confirm2]' },
+                { deviceType: '04', orderNum: 6, operateCode: '001', tip: 'Left click [close]' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: '0205',
+            skinCode: '05',
+            trainingName: 'Signal Off({3})',
+            trainingRemark: 'Signal Off',
+            trainingType: '02',
+            productTypes: ['01', '02'],
+            stepVOList: [
+                { deviceType: '04', orderNum: 1, operateCode: '313', tip: 'Right click to select [Signal Off]' },
+                { deviceType: '04', orderNum: 2, operateCode: '313', tip: 'Left click [confirm]' },
+                { deviceType: '04', orderNum: 3, operateCode: '3131', tip: 'Left click [confirm]' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: '0206',
+            skinCode: '05',
+            trainingName: 'Signal reopen({3})',
+            trainingRemark: 'Signal reopen',
+            trainingType: '02',
+            productTypes: ['01', '02'],
+            stepVOList: [
+                { deviceType: '04', orderNum: 1, operateCode: '304', tip: 'Right click to select [Signal reopen]' },
+                { deviceType: '04', orderNum: 2, operateCode: '304', tip: 'Left click [confirm]' },
+                { deviceType: '04', orderNum: 3, operateCode: '3041', tip: 'Left click [confirm]' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: '0207',
+            skinCode: '05',
+            trainingName: 'Guide route handling({3})',
+            trainingRemark: 'Guide route handling',
+            trainingType: '02',
+            productTypes: ['01'],
+            stepVOList: [
+                { deviceType: '04', orderNum: 1, operateCode: '308', tip: 'Right click to select [Guide route handling]' },
+                { deviceType: '04', orderNum: 2, operateCode: '3081', tip: 'Left click  [Execute]' },
+                { deviceType: '04', orderNum: 3, operateCode: '3083', tip: 'Left click [confirm1]' },
+                { deviceType: '04', orderNum: 4, operateCode: '3084', tip: 'Left click [confirm2]' },
+                { deviceType: '04', orderNum: 5, operateCode: '001', tip: 'Left click [close]' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: '0208',
+            skinCode: '05',
+            trainingName: 'Start automatic routing({5})',
+            trainingRemark: 'Start automatic routing',
+            trainingType: '02',
+            productTypes: ['02'],
+            stepVOList: [
+                { deviceType: '04', orderNum: 1, operateCode: '315', tip: 'Right click to select [Start automatic routing]' },
+                { deviceType: '04', orderNum: 2, operateCode: '3151', tip: 'Left click to select the route based on the manual control state', val: '{6}' },
+                { deviceType: '04', orderNum: 3, operateCode: '315', tip: 'Left click [confirm] ' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: '0209',
+            skinCode: '05',
+            trainingName: 'Close automatic routing({5})',
+            trainingRemark: 'Close automatic routing',
+            trainingType: '02',
+            productTypes: ['02'],
+            stepVOList: [
+                { deviceType: '04', orderNum: 1, operateCode: '314', tip: 'Right click to select [Close automatic routing]' },
+                { deviceType: '04', orderNum: 2, operateCode: '3141', tip: 'Left click to select the first route', val: '{6}' },
+                { deviceType: '04', orderNum: 3, operateCode: '314', tip: 'Left click [confirm]' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: '0210',
+            skinCode: '05',
+            trainingName: 'Route control status query({5})',
+            trainingRemark: 'Query the route control status ',
+            trainingType: '02',
+            productTypes: ['02'],
+            stepVOList: [
+                { deviceType: '04', orderNum: 1, operateCode: '316', tip: 'Right click to select [Route control status query]' },
+                { deviceType: '04', orderNum: 2, operateCode: '316', tip: 'Left click [confirm] ' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: '0211',
+            skinCode: '05',
+            trainingName: 'Set Interlock for Auto Routing({5})',
+            trainingRemark: 'Set Interlock for Auto Routing',
+            trainingType: '02',
+            productTypes: ['01'],
+            stepVOList: [
+                { deviceType: '04', orderNum: 1, operateCode: '309', tip: 'Right click to select  [Set Interlock for Auto Routing]' },
+                { deviceType: '04', orderNum: 2, operateCode: '309', tip: 'Left click [confirm]' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: '0212',
+            skinCode: '05',
+            trainingName: 'Cancel Interlock setting for Auto Routing({5})',
+            trainingRemark: 'Cancel Interlock setting for Auto Routing',
+            trainingType: '02',
+            productTypes: ['01'],
+            stepVOList: [
+                { deviceType: '04', orderNum: 1, operateCode: '310', tip: 'Right click to select  [Cancel Interlock setting for Auto Routing]' },
+                { deviceType: '04', orderNum: 2, operateCode: '310', tip: 'Left click [confirm]' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: '0213',
+            skinCode: '05',
+            trainingName: 'Set Interlock for Auto Trigger({5})',
+            trainingRemark: 'Set Interlock for Auto Trigger',
+            trainingType: '02',
+            productTypes: ['01'],
+            stepVOList: [
+                { deviceType: '04', orderNum: 1, operateCode: '311', tip: 'Right click to select [Set Interlock for Auto Trigger]' },
+                { deviceType: '04', orderNum: 2, operateCode: '311', tip: 'Left click [confirm]' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: '0214',
+            skinCode: '05',
+            trainingName: 'Cancel Interlock setting for Auto Trigger({5})',
+            trainingRemark: 'Cancel Interlock setting for Auto Trigger',
+            trainingType: '02',
+            productTypes: ['01'],
+            stepVOList: [
+                { deviceType: '04', orderNum: 1, operateCode: '312', tip: 'Right click to select[Cancel Interlock setting for Auto Trigger]' },
+                { deviceType: '04', orderNum: 2, operateCode: '312', tip: 'Left click [confirm]' }
+            ]
+        }
+    ]
+};
diff --git a/src/jmapNew/theme/xian_01/planConvert.js b/src/jmapNew/theme/xian_01/planConvert.js
new file mode 100644
index 000000000..a4341aa98
--- /dev/null
+++ b/src/jmapNew/theme/xian_01/planConvert.js
@@ -0,0 +1,319 @@
+import { createMartPoint, createSeriesModel, createMarkLineModels, hexColor, convertSheetToList, prefixTime } from '@/utils/runPlan';
+
+export default {
+    /** 边缘高度*/
+    EdgeHeight: 600,
+
+    /** 间隔高度*/
+    CoordMultiple: 1,
+
+    /** 偏移时间*/
+    TranslationTime: 60 * 60 * 2,
+
+    /** excel解析配置*/
+    ExcelConfig: {
+        beginRow: 1,
+        beginCol: 0,
+        fieldNum: 6,
+        sepField: '车次号',
+        columns: {
+            '停车站名称': { key: 'stationName', formatter: (val) => { return val; } },
+            '到达时间': { key: 'arriveTime', formatter: (val) => { return val; } },
+            '出发时间': { key: 'departureTime', formatter: (val) => { return val; } }
+        }
+    },
+
+    /** 解析exal数据转换为Json后台数据*/
+    importData(Sheet, JsonData) {
+        const dataList = convertSheetToList(Sheet, true);
+        const needList = Object.keys(this.ExcelConfig.columns);
+
+        if (dataList && dataList.length) {
+            for (let colIndex = this.ExcelConfig.beginCol; colIndex < dataList.length; colIndex += this.ExcelConfig.fieldNum + 1) {
+                let isContinue = true;
+                let tripObj = { code: '', arrivalList: [] };
+                for (let rowIndex = this.ExcelConfig.beginRow; isContinue; rowIndex += 1) {
+                    isContinue = false;
+
+                    const stationObj = {};
+                    for (let index = 0; index < this.ExcelConfig.fieldNum; index += 1) {
+                        if (dataList[colIndex + index]) {
+                            const title = dataList[colIndex + index][0];
+                            const value = dataList[colIndex + index][rowIndex];
+
+                            if (title && value) {
+                                // 数据列解析
+                                isContinue = true;
+                                const titleStr = `${title}`.trim();
+                                let valueStr = `${value}`.trim();
+
+                                if (titleStr == this.ExcelConfig.sepField) {
+                                    valueStr = `${dataList[colIndex + index - 1][rowIndex]}${valueStr}`;
+                                    if (tripObj.code) {
+                                        const length = tripObj.arrivalList.length;
+                                        if (length == 1) {
+                                            tripObj.arrivalList[0]['flag'] = true;
+                                        }
+                                        if (valueStr != tripObj.code) {
+                                            JsonData.push(tripObj);
+                                            tripObj = { code: valueStr, arrivalList: [] };
+                                        }
+                                    } else {
+                                        tripObj.code = valueStr;
+                                    }
+                                }
+
+                                // 取需要的字段
+                                if (needList.findIndex(elem => { return elem == titleStr; }) >= 0) {
+                                    stationObj[this.ExcelConfig.columns[titleStr].key] = this.ExcelConfig.columns[titleStr].formatter(valueStr);
+                                    if (this.ExcelConfig.columns[titleStr].key == 'arriveTime' || this.ExcelConfig.columns[titleStr].key == 'departureTime') {
+                                        stationObj[this.ExcelConfig.columns[titleStr].key] = this.ExcelConfig.columns[titleStr].formatter(prefixTime(valueStr));
+                                    }
+                                }
+                            }
+                        }
+                    }
+
+                    // 添加字段值
+                    if (Object.keys(stationObj).length) {
+                        tripObj.arrivalList.push(stationObj);
+                    }
+                }
+
+                // 添加最后那条没有车次的记录
+                if (tripObj.code) {
+                    const length = tripObj.arrivalList.length;
+                    if (length) {
+                        tripObj.arrivalList[length - 1]['flag'] = true;
+                    }
+                    JsonData.push(tripObj);
+                }
+            }
+        }
+
+        return JsonData;
+    },
+
+    /** 将后台数据解析成图表*/
+    convertDataToModels(data, stations, kmRangeCoordMap, lineStyle) {
+        var models = [];
+
+        if (data && data.serviceNumberDataList && data.serviceNumberDataList.length) {
+            /** 按服务遍历数据*/
+            data.serviceNumberDataList.forEach((service) => {
+                /** 按车次遍历数据*/
+                var isBackup = true;
+                var opt = { name: '', markPointData: [], data: [] };
+                if (service.tripNumberDataList && service.tripNumberDataList.length) {
+                    service.tripNumberDataList.forEach((train, j) => {
+                        var pointdata = {};
+                        var idx = 0;
+                        var num = 0;
+                        var lastPoint = null;
+                        var nextPoint = null;
+
+                        /** 如果车次号为空，不显示名称*/
+                        if (train.tripNumber) {
+                            /** 创建标记点名称和坐标*/
+                            pointdata.name = `${service.serviceNumber}${train.directionCode}${train.tripNumber}`;
+                            pointdata.color = '#000' || lineStyle.color;
+                            pointdata.directionCode = train.directionCode;
+                            pointdata.coord = [train.stationTimeList[1].secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, train.stationTimeList[1], train.directionCode, false)];
+
+                            /** 给服务对象添加服务名称和标记点*/
+                            opt.markPointData.push(createMartPoint(pointdata));
+                            /** 创建服务号名称*/
+                            opt.name = `${service.serviceNumber}`;
+                        }
+
+                        /** 计算非折返点车次点坐标集合*/
+                        train.stationTimeList.forEach((elem, index) => {
+                            idx = index;
+                            if (index == 0 && train.stationTimeList[index].stationCode != train.stationTimeList[index + 1].stationCode ||
+								index == train.stationTimeList.length - 2 && train.stationTimeList[index].secondTime != train.stationTimeList[index + 1].secondTime ||
+								index > 0 && index < train.stationTimeList.length - 1) {
+                                const aa = `${train.directionCode}${train.tripNumber}`;
+                                opt.data.push([elem.secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, elem, elem.directionCode, false), elem.stationCode, aa]);
+                            }
+                        });
+
+                        /** 计算折返点车次坐标点集合*/
+                        if (!train.backup && train.reentry && service.tripNumberDataList[j + 1] && service.tripNumberDataList[j + 1].stationTimeList) {
+                            lastPoint = train.stationTimeList[idx - 1];
+                            nextPoint = service.tripNumberDataList[j + 1].stationTimeList[1];
+                            num = this.computedReentryNumber(train.tripNumber);
+                            const aa = `${train.directionCode}${train.tripNumber}`;
+                            opt.data.push([lastPoint.secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, lastPoint, train.directionCode, true, num), lastPoint.stationCode, aa]);
+                            opt.data.push([nextPoint.secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, nextPoint, train.directionCode, true, num), nextPoint.stationCode, aa]);
+                        }
+
+                        /** 如果是备用车，按车次添加线*/
+                        if (train.backup) {
+                            /** 创建一条完成的服务数据*/
+                            opt.name += j;
+                            var model = createSeriesModel(opt, Object.assign({ color: hexColor.toCreate() }, lineStyle));
+                            if (model) {
+                                models.push(model);
+                                opt = { name: '', markPointData: [], data: [] };
+                            }
+                        }
+
+                        isBackup = train.backup;
+                    });
+
+                    // 不是备用车，按服务添加线
+                    if (!isBackup) {
+                        /** 创建一条完成的服务数据*/
+                        var model = createSeriesModel(opt, Object.assign({ color: hexColor.toCreate() }, lineStyle));
+                        if (model) {
+                            models.push(model);
+                        }
+                    }
+                }
+            });
+            return models;
+        } else {
+            return [];
+        }
+    },
+
+    /** 更新数据并解析成图表*/
+    updateDataToModels(data, stations, kmRangeCoordMap, runPlanData, series, lineStyle) {
+        if (data && data.length) {
+            data.forEach(elem => {
+                /** 判断此条记录的服务号是否存在*/
+                if (!runPlanData[elem.serviceNumber]) {
+                    /** 创建一个新服务号标记*/
+                    runPlanData[elem.serviceNumber] = {};
+
+                    /** 不存在此服务号，则需要创建一条新的line*/
+                    series.push(createSeriesModel({
+                        zlevel: 1,
+                        name: `run${elem.serviceNumber}`,
+                        data: [],
+                        markPointData: []
+                    }, Object.assign({ color: hexColor.toCreate() }, lineStyle)));
+                }
+
+                /** 添加数据*/
+                series.forEach(serie => {
+                    /** 找到服务号所在图数据的位置*/
+                    if (serie.name == `run${elem.serviceNumber}`) {
+                        /** 添加车组号记录标记*/
+                        if (!runPlanData[elem.serviceNumber][elem.tripNumber]) {
+                            runPlanData[elem.serviceNumber][elem.tripNumber] = [];
+                        }
+
+                        runPlanData[elem.serviceNumber][elem.tripNumber].push(elem);
+                        runPlanData[elem.serviceNumber][elem.tripNumber].sort((a, b) => {
+                            return parseInt(a.secondTime) - parseInt(b.secondTime);
+                        });
+
+                        /** 如果此记录车组号的数据为第一条时，则打上标签*/
+                        if (runPlanData[elem.serviceNumber][elem.tripNumber].length <= 1) {
+                            serie.markPoint.data.push(createMartPoint({
+                                directionCode: elem.directionCode,
+                                coord: [parseInt(elem.secondTime), this.getCoordYByElem(stations, kmRangeCoordMap, elem, false)],
+                                name: `(${elem.groupNumber})${elem.serviceNumber}${elem.directionCode}${elem.tripNumber}`,
+                                color: lineStyle.color || '#000'
+                            }));
+                        }
+
+                        /** 计算折返点*/
+                        var nextPoint = [parseInt(elem.secondTime), this.getCoordYByElem(stations, kmRangeCoordMap, elem, false), elem.directionCode];
+                        if (serie.data.length > 0) {
+                            var lastPoint = serie.data[serie.data.length - 1];
+                            if (lastPoint[2] !== nextPoint[2]) {
+                                var num = this.computedReentryNumber(elem.tripNumber);
+                                serie.data.push([lastPoint[0], this.getYvalueByDirectionCode(lastPoint[1], lastPoint[2], num), lastPoint[2]]);
+                                serie.data.push([nextPoint[0], this.getYvalueByDirectionCode(nextPoint[1], lastPoint[2], num), lastPoint[2]]);
+                            }
+                        }
+
+                        /** 添加车组号数据到对应的服务图数据中*/
+                        serie.data.push(nextPoint);
+
+                        /** 保证原始数据排序*/
+                        serie.data.sort((a, b) => {
+                            return parseInt(a[0]) - parseInt(b[0]);
+                        });
+                    }
+                });
+            });
+        }
+
+        return series;
+    },
+
+    /** 初始化Y轴*/
+    initializeYaxis(stations) {
+        return createMarkLineModels(stations, (elem) => {
+            return this.EdgeHeight + elem.kmRange * this.CoordMultiple;
+        });
+    },
+
+    /** 将后台数据转换为试图序列模型*/
+    convertStationsToMap(stations) {
+        var map = {};
+        if (stations && stations.length) {
+            stations.forEach((elem) => {
+                map[`${elem.kmRange}`] = this.EdgeHeight + elem.kmRange * this.CoordMultiple;
+            });
+        }
+
+        return map;
+    },
+
+    /** 计算y轴最小值*/
+    computedYaxisMinValue(stations) {
+        return stations[0].kmRange * this.CoordMultiple;
+    },
+
+    /** 计算y轴最大值*/
+    computedYaxisMaxValue(stations) {
+        return stations[stations.length - 1].kmRange * this.CoordMultiple + this.EdgeHeight * 2;
+    },
+
+    /** 格式化y轴数据*/
+    computedFormatYAxis(stations, params) {
+        var yText = '0m';
+
+        stations.forEach(elem => {
+            if (elem.kmRange < parseInt(params.value) / this.CoordMultiple - this.EdgeHeight) {
+                yText = Math.floor(elem.kmRange) + 'm';
+            }
+        });
+
+        return yText;
+    },
+
+    /** 根据是否和上一个车次是否相交，计算下一个车次的折返的高度*/
+    computedReentryNumber(code) {
+        return parseInt(code || 1) % 2 ? 1 : 2;
+    },
+
+    /** 根据方向计算y折返偏移量*/
+    getYvalueByDirectionCode(defaultVlue, directionCode, num) {
+        if (directionCode === '1') {
+            defaultVlue -= this.EdgeHeight / 2 * num;
+        } else if (directionCode === '2') {
+            defaultVlue += this.EdgeHeight / 2 * num;
+        }
+
+        return defaultVlue;
+    },
+
+    /** 根据elem计算y值*/
+    getCoordYByElem(stations, kmRangeCoordMap, elem, directionCode, isSpecial, num) {
+        var defaultVlue = 0;
+        var station = stations.find(it => { return it.code == elem.stationCode; });
+        if (station) {
+            defaultVlue = kmRangeCoordMap[`${station.kmRange}`];
+            if (isSpecial) {
+                defaultVlue = this.getYvalueByDirectionCode(defaultVlue, directionCode, num);
+            }
+        }
+
+        return defaultVlue;
+    }
+};
diff --git a/src/jmapNew/theme/xian_02/menusPlan/addTask.vue b/src/jmapNew/theme/xian_02/menusPlan/addTask.vue
deleted file mode 100644
index cf092b0ca..000000000
--- a/src/jmapNew/theme/xian_02/menusPlan/addTask.vue
+++ /dev/null
@@ -1,175 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="ningbo-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 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();
-		}
-	}
-};
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-    @import "src/styles/mixin.scss";
-
-    /deep/ {
-        .el-button {
-            margin-left: 40px !important;
-            margin-right: 40px !important;
-        }
-
-        .el-row {
-            margin-bottom: 5px !important;
-        }
-
-        .el-input__inner {
-            height: 20px !important;
-            line-height: 20px !important;
-        }
-    }
-</style>
diff --git a/src/jmapNew/theme/xian_02/menusPlan/chooseTemplatePlan.vue b/src/jmapNew/theme/xian_02/menusPlan/chooseTemplatePlan.vue
deleted file mode 100644
index f9ea0760d..000000000
--- a/src/jmapNew/theme/xian_02/menusPlan/chooseTemplatePlan.vue
+++ /dev/null
@@ -1,115 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    :title="title"
-    class="ningbo-01__schedule choose-plan-template"
-    :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 } from '@/api/runplan';
-import { listPublishMap } from '@/api/jmap/map';
-
-export default {
-    name: 'ChooseTemplatePlan',
-    data() {
-        return {
-            dialogShow: false,
-            loading: false,
-            mapList: [],
-            pagerConfig: {
-                pageSize: 'pageSize',
-                pageIndex: 'pageNum'
-            },
-            queryForm: {
-                reset: true,
-                labelWidth: '100px',
-                queryObject: {
-                    name: {
-                        type: 'text',
-                        label: '运行图名称'
-                    }
-                }
-            },
-            queryList: {
-                query: this.queryFunction,
-                selectCheckShow: false,
-                radioShow: true,
-                columns: [
-                    {
-                        title: '运行图名称',
-                        prop: 'name'
-                    },
-                    {
-                        title: '地图名称',
-                        prop: 'mapId',
-                        type: 'tag',
-                        columnValue: (row) => {
-                            return this.$convertField(row.mapId, this.mapList, ['id', 'name']);
-                        },
-                        tagType: (row) => { return 'success'; }
-                    }
-                ]
-            },
-
-            currentModel: {}
-        };
-    },
-    computed: {
-        title() {
-            return '选择模板运行图';
-        }
-    },
-    methods: {
-        loadInitData() {
-            this.mapList = [];
-            listPublishMap().then(response => {
-                this.mapList = response.data;
-            });
-        },
-        doShow() {
-            this.loading = false;
-            this.dialogShow = true;
-            this.loadInitData();
-        },
-        doClose() {
-            this.dialogShow = false;
-        },
-        queryFunction(params) {
-            if (this.$store.state.map && this.$store.state.map.map) {
-                params['mapId'] = this.$route.query.mapId;
-                // params['lineCode'] = this.$store.getters['map/lineCode'];
-            }
-            return runPlanTemplateList(params);
-        },
-        handleConfirm() {
-            this.doClose();
-            if (this.$refs && this.$refs.pageRules) {
-                const choose = this.$refs.pageRules.currentChoose();
-                if (choose) {
-                    this.$emit('chooseConfirm', choose);
-                } else {
-                    this.$messageBox(`请选择模板运行图`);
-                }
-            }
-        },
-        reloadTable() {
-            this.queryList.reload();
-        }
-    }
-};
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-    @import "src/styles/mixin.scss";
-</style>
diff --git a/src/jmapNew/theme/xian_02/menusPlan/components/dataTable.vue b/src/jmapNew/theme/xian_02/menusPlan/components/dataTable.vue
deleted file mode 100644
index fa98a48e7..000000000
--- a/src/jmapNew/theme/xian_02/menusPlan/components/dataTable.vue
+++ /dev/null
@@ -1,206 +0,0 @@
-<template>
-  <div v-if="show">
-    <template v-if="maxmini">
-      <div class="nav">
-        <div v-show="config.showClose" class="cls-status" @click="touch('Close')"><span /></div>
-        <div class="min-status" @click="touch('Minim')"><span /></div>
-      </div>
-      <el-table
-        ref="table"
-        :data="config.data"
-        :highlight-current-row="config.highlightCurrentRow"
-        :height="height"
-        border
-        @current-change="handleChange"
-      >
-        <template v-for="(item,index) in config.columns">
-          <el-table-column :key="index" :prop="item.prop" :label="item.label" :width="item.width" />
-        </template>
-      </el-table>
-    </template>
-    <template v-else>
-      <div class="nav">
-        <div class=" max-status" @click="touch('Maxim')"><span /></div>
-      </div>
-    </template>
-  </div>
-</template>
-
-<script>
-export default {
-	name: 'DataTable',
-	props: {
-		height: {
-			type: Number,
-			required: true
-		},
-		config: {
-			type: Object,
-			required: true
-		}
-	},
-	data() {
-		return {
-			show: true,
-			maxmini: true,
-			touchStrategy: {
-				'Close': [false, true],
-				'Minim': [true, false],
-				'Maxim': [true, true]
-			}
-		};
-	},
-	methods: {
-		handleChange(row) {
-			if (this.config.handleChange) {
-				this.config.handleChange(row);
-			}
-		},
-		setCurrentRow(row) {
-			this.$refs.table.setCurrentRow(row);
-		},
-		touch(operate) {
-			this.$nextTick(() => {
-				[this.show, this.maxmini] = this.touchStrategy[operate];
-				this.$emit('touch', this.maxmini);
-			});
-		}
-	}
-};
-</script>
-
-<style scoped rel="stylesheet/scss" lang="scss" >
-    @import "src/styles/mixin.scss";
-    $height: 20px;
-    $width: 20px;
-
-    .nav {
-        display: table;
-        float: right;
-        width: 100%;
-        color: #0000;
-        background: -webkit-linear-gradient(#FDFDFE, #B1CBF3);
-        background: -o-linear-gradient(#FDFDFE, #B1CBF3);
-        background: -moz-linear-gradient(#FDFDFE, #B1CBF3);
-        background: linear-gradient(#FDFDFE, #B1CBF3);
-        border: 1px solid #B6BCCC !important;
-        border-bottom: 2px solid #B6BCCC !important;
-        list-style: none;
-        height: $height;
-        line-height: $height;
-    }
-
-    /deep/ {
-        .el-table--border th.gutter {
-            background: #EBEADB !important;
-        }
-
-        .el-table {
-            overflow-y: hidden;
-            width: 100%;
-
-            th.is-leaf {
-                padding: 0px 0;
-                background: #EBEADB;
-                border-right: none !important;
-                border-left: 1px solid #D1CDBD !important;
-                border-top: 1px solid #D1CDBD !important;
-                border-bottom: 1px inset #D1CDBD !important;
-                color: #000;
-
-                .cell {
-                    height: $height;
-                    line-height: $height;
-                }
-            }
-
-            td {
-                padding: 0px 0;
-
-                .cell {
-                    height: $height;
-                    line-height: $height;
-                    font-size: smaller !important;
-                }
-
-            }
-
-            .current-row>td {
-                background: #316AC5 !important;
-                color: #fff !important;
-            }
-        }
-
-        .cls-status {
-            float: right;
-            width: 12px;
-            height: 100%;
-            line-height: 100%;
-            margin-left: 5px;
-            cursor: pointer;
-
-            span {
-                display: inline-block;
-                content: '/';
-                background: black;
-                width: 2px;
-                height: 12px;
-                vertical-align: middle;
-               transform: rotate(45deg);
-            }
-
-            span::after {
-                display: block;
-                content: '/';
-                background: black;
-                width: 2px;
-                height: 12px;
-               transform: rotate(-90deg);
-            }
-        }
-
-        .min-status {
-            float: right;
-            width: 20px;
-            height: 100%;
-            line-height: 100%;
-            cursor: pointer;
-
-            span {
-                display: inline-block;
-                content: '-';
-                background: black;
-                width: 2px;
-                height: 12px;
-                vertical-align: middle;
-               transform: rotate(-90deg);
-            }
-        }
-
-        .max-status {
-            float: right;
-            width: 20px;
-            height: 100%;
-            line-height: 100%;
-            cursor: pointer;
-
-            span {
-                display: inline-block;
-                content: '';
-                background: black;
-                width: 2px;
-                height: 12px;
-                transform: rotate(0deg);
-            }
-
-            span::after {
-                display: block;
-                content: '';
-                background: black;
-                width: 2px;
-                height: 12px;
-               transform: rotate(90deg);
-            }
-        }
-    }
-</style>
diff --git a/src/jmapNew/theme/xian_02/menusPlan/createTodayPlan.vue b/src/jmapNew/theme/xian_02/menusPlan/createTodayPlan.vue
deleted file mode 100644
index 27e3513d2..000000000
--- a/src/jmapNew/theme/xian_02/menusPlan/createTodayPlan.vue
+++ /dev/null
@@ -1,134 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    :title="title"
-    class="ningbo-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 } from '@/api/runplan';
-import { getStationList } from '@/api/runplan';
-import { getEveryDayRunPlanData, generateDayRunPlan } from '@/api/simulation';
-import { getPublishMapInfo } from '@/api/jmap/map';
-
-export default {
-    name: 'ReloadTodayPlan',
-    data() {
-        return {
-            dialogShow: false,
-            loading: false,
-            pagerConfig: {
-                pageSize: 'pageSize',
-                pageIndex: 'pageNum'
-            },
-            queryForm: {
-                reset: true,
-                labelWidth: '100px',
-                queryObject: {
-                    name: {
-                        type: 'text',
-                        label: '运行图名称'
-                    }
-                }
-            },
-            queryList: {
-                query: this.queryFunction,
-                selectCheckShow: false,
-                radioShow: true,
-                columns: [
-                    {
-                        title: '运行图名称',
-                        prop: 'name'
-                    }
-                ]
-            },
-
-            currentModel: {}
-        };
-    },
-    computed: {
-        title() {
-            return '加载当天计划';
-        }
-    },
-    methods: {
-        doShow() {
-            this.loading = false;
-            this.dialogShow = true;
-        },
-        doClose() {
-            this.dialogShow = false;
-        },
-        queryFunction(params) {
-            if (this.$store.state.map && this.$store.state.map.map) {
-                // params['lineCode'] = this.$store.getters['map/lineCode'];
-                params['mapId'] = this.$route.query.mapId;
-            }
-            return runPlanTemplateList(params);
-        },
-        // 生成每日运行图
-        handleConfirm() {
-            if (this.$refs && this.$refs.pageRules) {
-                const choose = this.$refs.pageRules.currentChoose();
-                if (choose && choose.id) {
-                    this.loading = true;
-                    generateDayRunPlan(choose.id, this.$route.query.group).then(response => {
-                        this.loading = false;
-                        this.reloadTable();
-                        this.loadRunData();
-                        this.doClose();
-                        this.$message.success(`生成用户每日运行图成功`);
-                    }).catch(() => {
-                        this.loading = false;
-                        this.reloadTable();
-                        this.$messageBox(`生成用户每日运行图失败`);
-                    });
-                } else {
-                    this.$messageBox(`请选择需要加载的运行图`);
-                }
-            }
-        },
-        loadRunData() {
-            // const skinCode = this.$route.query.skinCode;
-            const mapId = this.$route.query.mapId;
-            this.$store.dispatch('runPlan/clear');
-            if (mapId) {
-                getStationList(mapId).then(response => {
-                    const stations = response.data;
-                    getPublishMapInfo(this.$route.query.mapId).then(res=>{
-                        this.PlanConvert = this.$theme.loadPlanConvert(res.data.lineCode);
-                        this.$store.dispatch('runPlan/setStations', stations).then(() => {
-                            getEveryDayRunPlanData(this.$route.query.group).then(resp => {
-                                this.$store.dispatch('runPlan/setPlanData', resp.data);
-                            }).catch(() => {
-                                this.$store.dispatch('runPlan/setPlanData', []);
-                                this.$messageBox(`获取运行图数据失败`);
-                            });
-                        });
-                    });
-                }).catch(() => {
-                    this.$messageBox(`获取车站列表失败`);
-                });
-            }
-        },
-        reloadTable() {
-            this.queryList.reload();
-        }
-    }
-};
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-    @import "src/styles/mixin.scss";
-</style>
diff --git a/src/jmapNew/theme/xian_02/menusPlan/createWeekPlan.vue b/src/jmapNew/theme/xian_02/menusPlan/createWeekPlan.vue
deleted file mode 100644
index 48f65d60f..000000000
--- a/src/jmapNew/theme/xian_02/menusPlan/createWeekPlan.vue
+++ /dev/null
@@ -1,137 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="ningbo-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';
-
-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 {
-				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";
-
-    .card-box {
-        padding-top: 10px;
-    }
-
-    /deep/ {
-        .el-row {
-            margin: 10px;
-        }
-    }
-</style>
diff --git a/src/jmapNew/theme/xian_02/menusPlan/deleteTask.vue b/src/jmapNew/theme/xian_02/menusPlan/deleteTask.vue
deleted file mode 100644
index 035f23fca..000000000
--- a/src/jmapNew/theme/xian_02/menusPlan/deleteTask.vue
+++ /dev/null
@@ -1,73 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="ningbo-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();
-		}
-	}
-};
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-    @import "src/styles/mixin.scss";
-
-    /deep/ {
-        .el-row {
-            margin: 10px;
-        }
-    }
-</style>
diff --git a/src/jmapNew/theme/xian_02/menusPlan/deleteTodayPlan.vue b/src/jmapNew/theme/xian_02/menusPlan/deleteTodayPlan.vue
deleted file mode 100644
index 3110e2858..000000000
--- a/src/jmapNew/theme/xian_02/menusPlan/deleteTodayPlan.vue
+++ /dev/null
@@ -1,62 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="ningbo-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();
-		}
-	}
-};
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-    @import "src/styles/mixin.scss";
-
-    /deep/ {
-        .el-row {
-            margin: 10px;
-        }
-    }
-</style>
diff --git a/src/jmapNew/theme/xian_02/menusPlan/modifyingPlan.vue b/src/jmapNew/theme/xian_02/menusPlan/modifyingPlan.vue
deleted file mode 100644
index a9d25ea80..000000000
--- a/src/jmapNew/theme/xian_02/menusPlan/modifyingPlan.vue
+++ /dev/null
@@ -1,177 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="ningbo-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 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-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';
-
-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";
-
-    .view-button {
-        display: list-item;
-        width: 150px !important;
-        margin-left: 0px;
-    }
-
-    .view-label {
-        height: 32px;
-        line-height: 32px;
-    }
-
-    .view-box {
-        padding: 10px 0px;
-        border: 1px inset gray;
-        border-top: 1px outset gray;
-        border-left: 1px outset gray;
-    }
-
-    /deep/ {
-        .el-row {
-            margin: 5px 20px;
-        }
-    }
-</style>
diff --git a/src/jmapNew/theme/xian_02/menusPlan/modifyingTask.vue b/src/jmapNew/theme/xian_02/menusPlan/modifyingTask.vue
deleted file mode 100644
index 194534120..000000000
--- a/src/jmapNew/theme/xian_02/menusPlan/modifyingTask.vue
+++ /dev/null
@@ -1,327 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="ningbo-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-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-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-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-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';
-
-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 tripNumberList = Object.keys(editData.trainMap).sort((a, b) => { return editData.trainMap[a].oldIndex - editData.trainMap[b].oldIndex; });
-				const trainInfo = editData.trainMap[params.tripNumber];
-				const lastIndex = trainInfo.stationTimeList.length - 1;
-				const taskObj = {
-					tripNumber: params.tripNumber,
-					beginStationCode: trainInfo.stationTimeList[0].stationCode,
-					beginStationStandCode: '',
-					endStationCode: trainInfo.stationTimeList[lastIndex].stationCode,
-					endStationStandCode: ''
-				};
-				this.model.route.push(taskObj);
-
-				trainInfo.stationTimeList.forEach((elem, index) => {
-					const stationObj = {
-						stationCode: elem.stationCode,
-						startTime: index == 0 ? null : trainInfo.stationTimeList[index - 1].secondTime,
-						stopTime: index == 0 ? null : elem.secondTime - trainInfo.stationTimeList[index - 1].secondTime,
-						endTime: elem.secondTime,
-						level: ''
-					};
-					this.model.detail.push(stationObj);
-				});
-			}
-		},
-		doShow(params) {
-			this.loadInitData(params);
-			this.dialogShow = true;
-		},
-		doClose() {
-			this.loading = false;
-			this.dialogShow = false;
-		},
-		handleCommit() {
-		}
-	}
-};
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-    @import "src/styles/mixin.scss";
-
-    /deep/ {
-        .el-button {
-            margin-left: 40px !important;
-            margin-right: 40px !important;
-        }
-
-        .el-row {
-            margin-bottom: 5px !important;
-        }
-
-        .el-input__inner {
-            height: 20px !important;
-            line-height: 20px !important;
-        }
-
-        .el-input {
-            width: 110px !important;
-        }
-    }
-</style>
diff --git a/src/jmapNew/theme/xian_02/model.js b/src/jmapNew/theme/xian_02/model.js
index ed34da08c..dd040cf61 100644
--- a/src/jmapNew/theme/xian_02/model.js
+++ b/src/jmapNew/theme/xian_02/model.js
@@ -14,6 +14,9 @@ class Model {
         this['private'][deviceType.StationControl] = {
             indicatorShow: true									// 标识灯名称显示
         };
+        this['private'][deviceType.Station] = {
+            kmPostShow: true									// 公里标显示
+        };
         this['private'][deviceType.Switch] = {
             nameShow: true
         };
diff --git a/src/jmapNew/theme/xian_02/planConvert.js b/src/jmapNew/theme/xian_02/planConvert.js
index 8f2fc6dc3..94dbb9b00 100644
--- a/src/jmapNew/theme/xian_02/planConvert.js
+++ b/src/jmapNew/theme/xian_02/planConvert.js
@@ -1,4 +1,31 @@
-import { createMartPoint, createSeriesModel, createMarkLineModels, hexColor, convertSheetToList, prefixTime } from '@/utils/runPlan';
+import { createMartPoint, createSeriesModel, createMarkLineModels, hexColor, convertSheetToList } from '@/utils/runPlan';
+const StationMap = {
+    YARD1: '潏河转换轨',
+    YARD2: '潏河转换轨',
+    WQN: '韦曲南站',
+    HTC: '航天城站',
+    FQY: '凤栖原站',
+    SYZ: '三爻站',
+    HZX: '会展中心站',
+    WYJ: '纬一街站',
+    XZZ: '小寨站',
+    TYC: '体育场站',
+    NSM: '南稍门站',
+    YNM: '永宁门站',
+    ZLZ: '钟楼站',
+    BDJ: '北大街站',
+    AYM: '安远门站',
+    LSY: '龙首原站',
+    DMG: '大明宫西站',
+    STS: '市图书馆站',
+    FCW: '凤城五路站',
+    XZX: '行政中心站',
+    YDG: '运动公园站',
+    BYZ: '北苑站',
+    BKZ: '北客站',
+    NDOP1: '渭河转换轨',
+    NDOP2: '渭河转换轨'
+};
 
 export default {
     /** 边缘高度*/
@@ -9,107 +36,101 @@ export default {
 
     /** 偏移时间*/
     TranslationTime: 60 * 60 * 2,
-
     /** excel解析配置*/
     ExcelConfig: {
         beginRow: 1,
         beginCol: 0,
-        fieldNum: 10,
-        sepField: '行车间隔',
-        trainId: 'TrainID',
-        columns: ['折返线', 'TrainID', '行车间隔']
+        fieldNum: 8,
+        sepField: 'Trip',
+        idField: 'Train ID',
+        columns: {
+            'LOC': { key: 'stationName', formatter: (val) => { return StationMap[val]; } },
+            'Arrive': { key: 'arriveTime', formatter: (val) => { return val; } },
+            'Depart': { key: 'departureTime', formatter: (val) => { return val; } }
+        }
+
     },
 
     /** 解析exal数据转换为Json后台数据*/
     importData(Sheet, JsonData) {
         var dataList = convertSheetToList(Sheet, true);
-        if (dataList && dataList.length) {
-            if (dataList && dataList.length && dataList[1] && dataList[0]) {
-                // const tIndex = dataList.findIndex(it => { return it[0]; }); // 设置不用过滤行数
-                const tIndex = 9; // 设置不用过滤行数
+        var needList = Object.keys(this.ExcelConfig.columns);
 
-                /** 解析二维数组为json对象*/
-                const reg3 = /^(\d+:\d+:\d+|)/; // 06:12:00
-                dataList.forEach((elem, i) => {
-                    var begin = -1;
-                    /** 跳过名称所在的行*/
-                    if (i != tIndex && elem && elem.length > 0) {
-                        let flag = false;
-                        let count = 0;
-                        let param = { begTime: '', endTime: '' };
-                        if (i > tIndex) { elem.reverse(); }
-                        elem.forEach((item, j) => {
-                            /** 过滤空值*/
-                            if (item) {
-                                let title = '';
-                                var value = `${item}`.trim();
-                                if (i > tIndex) { // 上行线
-                                    title = `${dataList[tIndex][dataList[tIndex].length - j - 1]}`.replace(/\s*/g, '');
-                                    if (title == 'undefined') {
-                                        title = `${dataList[tIndex][dataList[tIndex].length - j - 2]}`.replace(/\s*/g, '');
-                                    }
-                                } else { // 下行线
-                                    title = `${dataList[tIndex][j]}`.replace(/\s*/g, '');
-                                    if (title == 'undefined') {
-                                        title = `${dataList[tIndex][j - 1]}`.replace(/\s*/g, '');
+        if (dataList && dataList.length) {
+            for (var colIndex = this.ExcelConfig.beginCol; colIndex < dataList.length; colIndex += this.ExcelConfig.fieldNum + 1) {
+                var isContinue = true;
+                var tripObj = { code: '', trainId: '', arrivalList: [] };
+
+                for (var rowIndex = this.ExcelConfig.beginRow; isContinue; rowIndex += 1) {
+                    isContinue = false;
+
+                    var stationObj = {};
+                    for (var index = 0; index < this.ExcelConfig.fieldNum; index += 1) {
+                        if (dataList[colIndex + index]) {
+                            var title = dataList[colIndex + index][0];
+                            var value = dataList[colIndex + index][rowIndex];
+
+                            if (title && value) {
+                                // 数据列解析
+                                isContinue = true;
+                                var titleStr = `${title}`.trim();
+                                var valueStr = `${value}`.trim();
+
+                                if (titleStr == this.ExcelConfig.sepField) {
+                                    if (tripObj.code) {
+                                        const length = tripObj.arrivalList.length;
+                                        if (length == 1) {
+                                            tripObj.arrivalList[0]['flag'] = true;
+                                        }
+                                        if (valueStr.includes('FT') || valueStr.includes('LT')) {
+                                            valueStr = valueStr.replace('FT', '').replace('LT', '');
+                                            console.log(valueStr);
+                                        }
+                                        valueStr = tripObj.trainId + valueStr;
+                                        delete tripObj.trainId;
+                                        JsonData.push(tripObj);
+                                        tripObj = { code: valueStr, arrivalList: [] };
+                                    } else {
+                                        if (valueStr.includes('FT') || valueStr.includes('LT')) {
+                                            valueStr = valueStr.replace('FT', '').replace('LT', '');
+                                        }
+                                        valueStr = tripObj.trainId + valueStr;
+                                        delete tripObj.trainId;
+                                        tripObj.code = valueStr;
                                     }
+                                } else if (titleStr === this.ExcelConfig.idField) {
+                                    tripObj.trainId = valueStr;
                                 }
 
-                                /** 匹配到开始位置或者结束位置*/
-                                if (title == this.ExcelConfig.trainId) {
-                                    if (begin == -1) {
-                                        flag = true;
-                                        begin = value; 	// 设置初始索引
-                                        JsonData.push({
-                                            code: value,
-                                            destinationCode: '',
-                                            arrivalList: []
-                                        });
-                                    } else if (flag) {
-                                        begin = -1; 	// 清空初始索引
-                                        JsonData[JsonData.length - 1].destinationCode = value;
-                                        flag = false;
-                                    }
-                                } else if (begin !== -1) {
-                                    /** 匹配到中间位置*/
-                                    var stationName = title.replace(/\s/, '');
-                                    if (this.ExcelConfig.columns.indexOf(stationName) == -1 && reg3.test(value)) {
-                                        let need = false;
-                                        if (value.split(':')[0] == '24') { // 24:XX:XX  类似这种数据 变24为00
-                                            const arr = value.split(':');
-                                            arr[0] = '00';
-                                            value = arr.join(':');
-                                        }
-                                        if (count == 1) {
-                                            count = 0;
-                                            param.endTime = value;
-                                        }
-                                        if (count == 0) {
-                                            count = 1;
-                                            param.begTime = param.begTime || value;
-                                        }
-
-                                        if (param.begTime && param.endTime) {
-                                            need = true;
-                                        }
-
-                                        /** 添加json数据*/
-                                        if (need) { // 储存非空 数据
-                                            var stationObj = {
-                                                stationName: stationName
-                                            };
-                                            stationObj['arriveTime'] = prefixTime(param.begTime);
-                                            stationObj['departureTime'] = prefixTime(param.endTime);
-                                            JsonData[JsonData.length - 1].arrivalList.push(stationObj);
-                                            param = { begTime: '', endTime: '' };
-                                            count = 0;
-                                        }
-                                    }
+                                // 取需要的字段
+                                if (needList.findIndex(elem => { return elem == titleStr; }) >= 0) {
+                                    stationObj[this.ExcelConfig.columns[titleStr].key] = this.ExcelConfig.columns[titleStr].formatter(valueStr);
                                 }
                             }
-                        });
+                        }
                     }
-                });
+
+                    // 添加字段值
+                    if (Object.keys(stationObj).length) {
+                        if (!stationObj.departureTime) {
+                            stationObj.departureTime = stationObj.arriveTime;
+                        } else if (!stationObj.arriveTime) {
+                            stationObj.arriveTime = stationObj.departureTime;
+                        }
+                        if (stationObj.stationName) {
+                            tripObj.arrivalList.push(stationObj);
+                        }
+                    }
+                }
+
+                // 添加最后那条没有车次的记录
+                if (tripObj.code) {
+                    const length = tripObj.arrivalList.length;
+                    if (length) {
+                        tripObj.arrivalList[length - 1]['flag'] = true;
+                    }
+                    JsonData.push(tripObj);
+                }
             }
         }
         return JsonData;
@@ -118,10 +139,12 @@ export default {
     /** 将后台数据解析成图表*/
     convertDataToModels(data, stations, kmRangeCoordMap, lineStyle) {
         var models = [];
+
         if (data && data.serviceNumberDataList && data.serviceNumberDataList.length) {
             /** 按服务遍历数据*/
             data.serviceNumberDataList.forEach((service) => {
                 /** 按车次遍历数据*/
+                var isBackup = true;
                 var opt = { name: '', markPointData: [], data: [] };
                 if (service.tripNumberDataList && service.tripNumberDataList.length) {
                     service.tripNumberDataList.forEach((train, j) => {
@@ -161,8 +184,9 @@ export default {
                             lastPoint = train.stationTimeList[idx - 1];
                             nextPoint = service.tripNumberDataList[j + 1].stationTimeList[1];
                             num = this.computedReentryNumber(train.tripNumber);
-                            opt.data.push([lastPoint.secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, lastPoint, train.directionCode, true, num), lastPoint.stationCode]);
-                            opt.data.push([nextPoint.secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, nextPoint, train.directionCode, true, num), nextPoint.stationCode]);
+                            const aa = `${train.directionCode}${train.tripNumber}`;
+                            opt.data.push([lastPoint.secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, lastPoint, train.directionCode, true, num), lastPoint.stationCode, aa]);
+                            opt.data.push([nextPoint.secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, nextPoint, train.directionCode, true, num), nextPoint.stationCode, aa]);
                         }
 
                         /** 如果是备用车，按车次添加线*/
@@ -175,10 +199,12 @@ export default {
                                 opt = { name: '', markPointData: [], data: [] };
                             }
                         }
+
+                        isBackup = train.backup;
                     });
 
                     // 不是备用车，按服务添加线
-                    if (!service.backup) {
+                    if (!isBackup) {
                         /** 创建一条完成的服务数据*/
                         var model = createSeriesModel(opt, Object.assign({ color: hexColor.toCreate() }, lineStyle));
                         if (model) {
@@ -201,6 +227,7 @@ export default {
                 if (!runPlanData[elem.serviceNumber]) {
                     /** 创建一个新服务号标记*/
                     runPlanData[elem.serviceNumber] = {};
+
                     /** 不存在此服务号，则需要创建一条新的line*/
                     series.push(createSeriesModel({
                         zlevel: 1,
diff --git a/src/jmapNew/theme/xian_02/planSchedule/index.vue b/src/jmapNew/theme/xian_02/planSchedule/index.vue
deleted file mode 100644
index 332007bb7..000000000
--- a/src/jmapNew/theme/xian_02/planSchedule/index.vue
+++ /dev/null
@@ -1,403 +0,0 @@
-<template>
-  <div class="plan-schedule" style="width: 100%">
-    <title-bar ref="titleBar" @back="back" />
-    <menu-bar ref="menuBar" :line-code="lineCode" @dispatchDialog="dispatchDialog" />
-    <schedule ref="schedule" :group="group" :line-code="lineCode" :max-height="height" :max-width="width" />
-    <status-bar ref="statusBar" :max-top="height" @setPosition="setPosition" />
-
-    <manage-plan-list ref="managePlanList" @dispatchDialog="dispatchDialog" />
-    <create-week-plan ref="createWeekPlan" @reloadTable="reloadTable" />
-    <create-today-plan ref="createTodayPlan" />
-    <modifying-plan ref="modifyingPlan" @dispatchDialog="dispatchDialog" />
-    <add-task ref="addTask" />
-    <delete-task ref="deleteTask" />
-    <modifying-task ref="modifyingTask" />
-  </div>
-</template>
-
-<script>
-import TitleBar from './titleBar';
-import MenuBar from './menuBar';
-import StatusBar from './statusBar';
-import Schedule from './schedule';
-import ManagePlanList from '../menusPlan/managePlanList';
-import CreateWeekPlan from '../menusPlan/createWeekPlan';
-import CreateTodayPlan from '../menusPlan/createTodayPlan';
-import ModifyingPlan from '../menusPlan/modifyingPlan';
-import AddTask from '../menusPlan/addTask';
-import DeleteTask from '../menusPlan/deleteTask';
-import ModifyingTask from '../menusPlan/modifyingTask';
-
-export default {
-    name: 'Menus',
-    components: {
-        TitleBar,
-        MenuBar,
-        StatusBar,
-        Schedule,
-        ManagePlanList,
-        CreateWeekPlan,
-        CreateTodayPlan,
-        ModifyingPlan,
-        AddTask,
-        DeleteTask,
-        ModifyingTask
-    },
-    props: {
-        group: {
-            type: String,
-            required: true
-        }
-    },
-    data() {
-        return {
-        };
-    },
-    computed: {
-        lineCode() {
-            return this.$route.query.lineCode || '02';
-        },
-        width() {
-            return this.$store.state.app.width;
-        },
-        height() {
-            return this.$store.state.app.height;
-        }
-    },
-    methods: {
-        setPosition() {
-            this.$nextTick(() => {
-                this.$refs.schedule.setPosition();
-            });
-        },
-        dispatchDialog(dialogObj) {
-            this.$nextTick(() => {
-                if (this.$refs[dialogObj.name]) {
-                    this.$refs[dialogObj.name].doShow(dialogObj.params);
-                }
-            });
-        },
-        reloadTable(dialogObj) {
-            if (this.$refs[dialogObj.name]) {
-                this.$refs[dialogObj.name].reloadTable();
-            }
-        },
-        confirm(params) {
-        },
-        back() {
-            this.$emit('back');
-        }
-    }
-};
-</script>
-
-<style>
-    .plan-schedule {
-        position: absolute;
-        background: gray;
-    }
-
-    .plan-schedule .pop-menu {
-        background: #F0F0F0;
-    }
-
-    .plan-schedule .pop-menu span {
-        color: #000;
-    }
-
-    .plan-schedule .system-close {
-        cursor: pointer;
-        position: absolute;
-        right: 0px;
-        background: -webkit-linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
-        background: -o-linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
-        background: -moz-linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
-        background: linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
-        border: 1px solid white;
-        border-radius: 4px;
-    }
-
-    .plan-schedule .system-close::before {
-        position: absolute;
-        height: 22px;
-        line-height: 22px;
-        top: 0px;
-        left: 0px;
-        font-size: x-large;
-    }
-
-    .plan-schedule .pop-menu .is-disabled span {
-        color: #B4B3B8;
-    }
-
-    .ningbo-01__schedule {
-        overflow: hidden !important;
-    }
-
-    .ningbo-01__schedule .el-dialog {
-        background: rgba(0, 85, 231, 1);
-        box-shadow: 1px hsla(240, 0%, 100%, 0.5) inset;
-        border: 2px solid #727375;
-        border-radius: 4px;
-        color: #000;
-        font-size: 14px;
-    }
-
-    .ningbo-01__schedule .el-dialog .el-dialog__header {
-        height: 30px;
-        padding: 5px;
-    }
-
-    .ningbo-01__schedule .el-dialog .el-dialog__footer {
-        background: #ECE9D8;
-        opacity: 1;
-    }
-
-    .ningbo-01__schedule .el-dialog .el-dialog__body {
-        padding-top: 10px;
-        padding-bottom: 10px;
-        padding-left: 5px;
-        padding-right: 5px;
-        margin: 0px 3px 3px 3px;
-        border: 2px solid rgba(120, 121, 123, 0.5);
-        box-shadow: 1px hsla(240, 0%, 100%, 0.5) inset;
-        color: #000;
-        background: #ECE9D8;
-        opacity: 1;
-    }
-
-    .ningbo-01__schedule .el-dialog .el-dialog__title {
-        font-size: 16px;
-    }
-
-    .ningbo-01__schedule .el-dialog .el-dialog__headerbtn {
-        background: -webkit-linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
-        background: -o-linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
-        background: -moz-linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
-        background: linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
-        border: 1px solid white;
-        border-radius: 4px;
-        top: 0px;
-        right: 3px;
-        line-height: 26px;
-        width: 26px;
-    }
-
-    .ningbo-01__schedule .el-dialog .el-dialog__headerbtn .el-icon-close:before {
-        font-size: 16px;
-    }
-
-    .ningbo-01__schedule .el-dialog .el-dialog__headerbtn .el-dialog__close {
-        color: #fff;
-    }
-
-    .ningbo-01__schedule .el-dialog .el-form {
-        background: #ECE9D8 !important;
-    }
-
-    .ningbo-01__schedule .el-dialog .el-card {
-        background: #ECE9D8 !important;
-    }
-
-    .ningbo-01__schedule .el-dialog .el-button {
-        height: 32px;
-        line-height: 32px;
-        padding: 0px;
-        width: 80px;
-        border: 2px outset #E2E2E2;
-        border-radius: 0px !important;
-        color: #000;
-        background: #ECE9D8;
-    }
-
-    .ningbo-01__schedule .el-dialog .expand {
-        width: 120px;
-    }
-
-    .ningbo-01__schedule .el-dialog .el-button:focus span {
-        border: 1px dashed gray;
-    }
-
-    .ningbo-01__schedule .el-dialog .el-button:active {
-        border: 2px inset #E2E2E2;
-    }
-
-    .ningbo-01__schedule .el-dialog .el-button:disabled {
-        border: 2px inset #E2E2E2;
-    }
-
-    .ningbo-01__schedule .el-dialog .el-button:disabled span {
-        border: 0px;
-    }
-
-    .ningbo-01__schedule .el-dialog .button-group {
-        margin: 0px 5px;
-        text-align: center !important;
-    }
-
-    .ningbo-01__schedule .el-dialog .el-input {
-        border: 2px inset #E9E9E9;
-    }
-
-    .ningbo-01__schedule .el-dialog .el-input .el-input__inner {
-        color: #000;
-        background: #fff !important;
-        border: 0px;
-        border-radius: 0px !important;
-        box-sizing: border-box;
-    }
-
-    .ningbo-01__schedule .el-dialog .el-input.is-disabled .el-input__inner {
-        background: #F0F0F0 !important;
-    }
-
-    .ningbo-01__schedule .el-dialog .el-textarea {
-        border: 2px inset #E9E9E9;
-        border-radius: 0px;
-    }
-
-    .ningbo-01__schedule .el-dialog .el-textarea .el-textarea__inner {
-        color: #000;
-        background: #fff !important;
-        border: 0px;
-        border-radius: 0px !important;
-        box-sizing: border-box;
-    }
-
-    .ningbo-01__schedule .el-dialog .el-textarea.is-disabled .el-textarea__inner {
-        background: #F0F0F0 !important;
-    }
-
-    .ningbo-01__schedule .el-dialog .el-table {
-        border: 2px inset #E9E9E9;
-        color: #000 !important;
-    }
-
-    .ningbo-01__schedule .el-dialog .el-table .cell {
-        line-height: unset !important;
-    }
-
-    .ningbo-01__schedule .el-dialog .el-table th.is-leaf {
-        background: #ECE9D8 !important;
-        border-right: 1px solid #BDBDBD !important;
-        border-bottom: 1px solid #BDBDBD !important;
-        color: #000 !important;
-        height: 20px !important;
-        padding: 0px;
-    }
-
-    .ningbo-01__schedule .el-dialog .el-table tr td {
-        height: 20px !important;
-        padding: 0px;
-    }
-
-    .ningbo-01__schedule .el-dialog .el-table .el-table__empty-text {
-        top: 15px !important;
-    }
-
-    .ningbo-01__schedule .el-dialog .current-row>td {
-        background: #316AC5 !important;
-        color: #fff !important;
-    }
-
-    .ningbo-01__schedule .el-dialog .el-checkbox__inner {
-        border: 1px inset #dcdfe6 !important;
-    }
-
-    .ningbo-01__schedule .el-dialog .el-checkbox__label {
-        color: #000 !important;
-    }
-
-    .ningbo-01__schedule .el-dialog .el-checkbox.is-disabled .el-checkbox__inner {
-        background: #E6E6E6 !important;
-    }
-
-    .ningbo-01__schedule .el-dialog .el-checkbox.is-disabled .el-checkbox__label {
-        color: #C5C9CC !important;
-    }
-
-    .ningbo-01__schedule .el-dialog .el-checkbox__input.is-checked .el-checkbox__inner {
-        background: #fff !important;
-        border: 1px inset #dcdfe6 !important;
-    }
-
-    .ningbo-01__schedule .el-dialog .el-checkbox__input.is-checked .el-checkbox__inner::after {
-        position: absolute;
-        -webkit-box-sizing: content-box;
-        box-sizing: content-box;
-        content: "";
-        border: 1px solid #000;
-        border-left: 0;
-        border-top: 0;
-        height: 7px;
-        left: 4px;
-        top: 1px;
-    }
-
-    .ningbo-01__schedule .el-dialog .el-radio__inner {
-        border: 1px inset #dcdfe6 !important;
-    }
-
-    .ningbo-01__schedule .el-dialog .el-radio__label {
-        color: #000 !important;
-    }
-
-    .ningbo-01__schedule .el-dialog .el-radio__input.is-checked .el-radio__inner {
-        background: #fff !important;
-        border: 1px inset #dcdfe6 !important;
-    }
-
-    .ningbo-01__schedule .el-dialog .el-radio__input.is-checked .el-radio__inner::after {
-        width: 4px;
-        height: 4px;
-        border-radius: 100%;
-        background-color: #000 !important;
-        position: absolute;
-        left: 50%;
-        top: 50%;
-    }
-
-    .ningbo-01__schedule .el-dialog .el-radio.is-disabled .el-radio__inner {
-        background: #E6E6E6 !important;
-    }
-
-    .ningbo-01__schedule .el-dialog .el-radio.is-disabled .el-radio__label {
-        color: #C5C9CC !important;
-    }
-
-    .ningbo-01__schedule .el-dialog .base-label {
-        background: rgba(0, 0, 0, x);
-        position: relative;
-        left: -15px;
-        top: -18px;
-    }
-
-    .ningbo-01__schedule .el-dialog .el-form-item label {
-        font-weight: normal !important;
-        color: #000 !important;
-    }
-
-    .ningbo-01__schedule .el-dialog .context {
-        height: 100px;
-        border: 2px inset #E2E2E2;
-        overflow-y: scroll;
-    }
-
-    .ningbo-01__schedule .el-dialog .table {
-        margin-top: 10px;
-    }
-
-    .ningbo-01__schedule .el-dialog .notice {
-        margin-left: 62px;
-        line-height: 30px;
-    }
-
-    .ningbo-01__schedule .el-dialog .button-group {
-        margin-top: 10px;
-    }
-
-    .ningbo-01__schedule .el-dialog .el-tree__empty-block {
-        background: #E9E9E9 !important;
-        color: #000 !important;
-    }
-</style>
diff --git a/src/jmapNew/theme/xian_02/planSchedule/menuBar.vue b/src/jmapNew/theme/xian_02/planSchedule/menuBar.vue
deleted file mode 100644
index e64ae3063..000000000
--- a/src/jmapNew/theme/xian_02/planSchedule/menuBar.vue
+++ /dev/null
@@ -1,514 +0,0 @@
-<template>
-  <div id="PlanMenuBar">
-    <div class="nav">
-      <template v-for="(item,i) in menu">
-        <template v-if="noShowingChildren(item.children)">
-          <li class="nav-li" @click="hookClick(item)">
-            <span class="nav-li-text">{{ item.title }}</span>
-          </li>
-        </template>
-        <template v-else>
-          <li class="nav-li" @click.stop="popupMenuA(item, i)">
-            <span class="nav-li-text">{{ item.title }}</span>
-            <ul class="nav-ul" :class="{'active' :i==classA}">
-              <template v-for="(child,j) in item.children">
-                <template
-                  v-if="child.children&&child.children.length>0&&hasShowingChildren(child.children)"
-                >
-                  <li v-if="child.type === 'separator'" class="menu-separator">
-                    <span class="status">&ensp;</span>
-                    <span class="separator">&ensp;</span>
-                  </li>
-                  <li v-else-if="child.type === 'file'" class="menu-li">
-                    <div class="menu-li-block">
-                      <span class="menu-li-text">
-                        <span class="status">&ensp;</span>
-                        <el-button type="text" class="button" :disabled="child.disabled">
-                          <input
-                            :ref="child.label"
-                            type="file"
-                            accept=".csv, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel"
-                            @change="openLoadFile(child)"
-                          >
-                          {{ child.title }}
-                        </el-button>
-                      </span>
-                    </div>
-                  </li>
-                  <li v-else class="menu-li" @click.stop="popupMenuB(child, j)">
-                    <div class="menu-li-block">
-                      <span class="menu-li-text">
-                        <span class="status">&ensp;</span>
-                        <span class="label">{{ child.title }}</span>
-                      </span>
-                    </div>
-                    <ul class="menu-ul" :class="{'active' :j==classB}">
-                      <template v-for="(grandchild,k) in child.children">
-                        <li v-if="grandchild.type === 'separator'" class="menu-separator">
-                          <span class="status">&ensp;</span>
-                          <span class="separator">&ensp;</span>
-                        </li>
-                        <li v-else-if="grandchild.type === 'file'" class="menu-li">
-                          <div class="menu-li-block">
-                            <span class="menu-li-text">
-                              <span class="status">&ensp;</span>
-                              <el-button
-                                type="text"
-                                class="button"
-                                :disabled="grandchild.disabled"
-                              >
-                                <input
-                                  :ref="grandchild.label"
-                                  type="file"
-                                  accept=".csv, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel"
-                                  @change="openLoadFile(grandchild)"
-                                >
-                                {{ grandchild.title }}
-                              </el-button>
-                            </span>
-                          </div>
-                        </li>
-                        <li v-else class="menu-li" @click.stop="hookClick(grandchild)">
-                          <div class="menu-li-block">
-                            <span class="menu-li-text">
-                              <span class="status">&ensp;</span>
-                              <span class="label">{{ grandchild.title }}</span>
-                            </span>
-                          </div>
-                        </li>
-                      </template>
-                    </ul>
-                  </li>
-                </template>
-                <template v-else>
-                  <li v-if="child.type === 'separator'" class="menu-separator">
-                    <span class="status">&ensp;</span>
-                    <span class="separator">&ensp;</span>
-                  </li>
-                  <li v-else-if="child.type === 'file'" class="menu-li">
-                    <div class="menu-li-block">
-                      <span class="menu-li-text">
-                        <span class="status">&ensp;</span>
-                        <el-button type="text" class="button" :disabled="child.disabled">
-                          <input
-                            :ref="child.title"
-                            type="file"
-                            accept=".csv, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel"
-                            @change="openLoadFile(child)"
-                          >
-                          {{ child.title }}
-                        </el-button>
-                      </span>
-                    </div>
-                  </li>
-                  <li v-else class="menu-li" @click.stop="hookClick(child)">
-                    <div class="menu-li-block">
-                      <span class="menu-li-text">
-                        <span class="status">&ensp;</span>
-                        <span class="label">{{ child.title }}</span>
-                      </span>
-                    </div>
-                  </li>
-                </template>
-              </template>
-            </ul>
-          </li>
-        </template>
-      </template>
-    </div>
-  </div>
-</template>
-<script>
-import { mapGetters } from 'vuex';
-import { EventBus } from '@/scripts/event-bus';
-
-export default {
-    name: 'PlanMenuBar',
-    props: {
-        lineCode: {
-            type: String,
-            required: true
-        }
-    },
-    data() {
-        return {
-            classA: -1,
-            classB: -1,
-            tempClassA: -1,
-            tempClassB: -1,
-            menu: [
-                {
-                    title: '文件（F）',
-                    children: [
-                    ]
-                },
-                {
-                    title: '显示（V）',
-                    children: [
-                        // {
-                        //     title: '缩放',
-                        // },
-                        // {
-                        //     title: '单色显示历史计划',
-                        // },
-                        // {
-                        //     title: '彩色显示历史计划'
-                        // }
-                    ]
-                },
-                {
-                    title: '编辑（E）',
-                    children: [
-                        // {
-                        //     title: '修改',
-                        //     click: this.handleEditPlanningTrain
-                        // },
-                        // {
-                        //     title: '加任务',
-                        //     click: this.handleAddTask
-                        // },
-                        // {
-                        //     title: '删任务',
-                        //     click: this.handleDeleteTask
-                        // },
-                        // {
-                        //     title: '改表号',
-                        //     click: this.handleModifyingPlanId
-                        // },
-                        // {
-                        //     title: '平移多辆车',
-                        //     click: this.handleTranslationalMulTrain
-                        // }
-                    ]
-                },
-                {
-                    title: '工具（T）',
-                    children: [
-                        {
-                            title: '查看计划列表',
-                            click: this.handleViewPlanSchedule
-                        },
-                        {
-                            title: '创建一周计划',
-                            click: this.handleCreateWeekPlan
-                        },
-                        {
-                            title: '加载当天计划',
-                            click: this.handleReloadTodayPlan
-                        }
-                        // {
-                        //     title: '有效性检查',
-                        //     click: this.handleValidityCheck
-                        // }
-                    ]
-                },
-                {
-                    title: '帮助（H）',
-                    children: [
-                    ]
-                }
-            ]
-        };
-    },
-    computed: {
-        ...mapGetters('training', [
-            'mode'
-        ]),
-        ...mapGetters('map', [
-            'stationList'
-        ])
-    },
-    watch: {
-        tempClassA() {
-            this.classA = this.$store.state.menuOperation.break ? -1 : this.tempClassA;
-        },
-        tempClassB() {
-            this.classB = this.$store.state.menuOperation.break ? -1 : this.tempClassB;
-        },
-        '$store.state.menuOperation.break': function (val) {
-            if (val) {
-                this.classA = this.classB = -1;
-            } else {
-                this.classA = this.tempClassA;
-                this.classB = this.tempClassB;
-            }
-        }
-    },
-    mounted() {
-        this.initMenu();
-    },
-    methods: {
-        initMenu() {
-            this.clickEvent();
-            this.closeMenu();
-        },
-        clickEvent() {
-            const self = this;
-            window.onclick = function (e) {
-                self.closeMenu(false);
-            };
-        },
-        noShowingChildren(children) {
-            if (!children || children.length <= 0) {
-                return true;
-            }
-            return false;
-        },
-        hasShowingChildren(children) {
-            if (children && children.length > 0) {
-                return true;
-            }
-            return false;
-        },
-        closeMenu() {
-            this.classA = this.tempClassA = -1;
-            this.classB = this.tempClassB = -1;
-        },
-        hookClick(item, event) {
-            this.closeMenu();
-            setTimeout(() => {
-                if (item && typeof item.click == 'function') {
-                    item.click();
-                }
-            }, 500);
-        },
-        popupMenuA(item, index) {
-            this.clickEvent();
-            this.tempClassA = index;
-            this.tempClassB = -1;
-        },
-        popupMenuB(item, index) {
-            this.tempClassB = index;
-        },
-        openLoadFile(item) {
-            const obj = this.$refs[item.title][0];
-            if (obj.files) {
-                const file = obj.files[0];
-                item.click(file);
-                obj.value = '';
-            }
-        },
-        doClose() {
-            this.$nextTick(() => {
-                EventBus.$emit('closeMenu');
-            });
-        },
-        // 刷新
-        refresh() {
-            this.closeMenu(true);
-            EventBus.$emit('refresh');
-        },
-        undeveloped() {
-            this.doClose();
-            this.$alert('实现中......', '提示', {
-                confirmButtonText: '确定',
-                callback: action => {
-                }
-            });
-        },
-        // 修改计划
-        handleEditPlanningTrain() {
-            this.$emit('dispatchDialog', { name: 'modifyingPlan' });
-        },
-        // 添加任务
-        handleAddTask() {
-            const params = this.$store.state.runPlan.selected;
-            this.$emit('dispatchDialog', { name: 'addTask', params });
-        },
-        // 删除任务
-        handleDeleteTask() {
-            const params = this.$store.state.runPlan.selected;
-            this.$emit('dispatchDialog', { name: 'deleteTask', params });
-        },
-        // 修改任务
-        handleModifyingTask() {
-            const params = this.$store.state.runPlan.selected;
-            this.$emit('dispatchDialog', { name: 'modifyingTask', params });
-        },
-        // 改表号
-        handleModifyingPlanId() {
-            this.$emit('dispatchDialog', { name: 'modifyingPlanId' });
-        },
-        // 平移多辆车
-        handleTranslationalMulTrain() {
-            this.$emit('dispatchDialog', { name: 'translationalMulTrain' });
-        },
-        // 查看计划列表
-        handleViewPlanSchedule() {
-            this.$emit('dispatchDialog', { name: 'managePlanList' });
-        },
-        // 创建一周计划
-        handleCreateWeekPlan() {
-            this.$emit('dispatchDialog', { name: 'createWeekPlan' });
-        },
-        // 创建当天计划
-        handleReloadTodayPlan() {
-            this.$emit('dispatchDialog', { name: 'createTodayPlan' });
-        },
-        // 有效性检查
-        handleValidityCheck() {
-        }
-    }
-};
-</script>
-
-<style scoped rel="stylesheet/scss" lang="scss">
-    @import "src/styles/mixin.scss";
-    $top: 25px;
-    $width: 30px;
-    $height: 20px;
-    $menuPadding: 10px;
-    $menuItemHeight: 30px;
-    $menuItemWidth: 160px;
-    $menuItemPadding: 5px;
-
-    #PlanMenuBar {
-        z-index: 10;
-        position: absolute;
-        top: $top;
-        width: 100%;
-        height: $height;
-        line-height: $height;
-    }
-
-    .nav {
-        display: block;
-        cursor: pointer;
-        color: #0000;
-        background: #EBEADB;
-        list-style: none;
-        border: 1px solid #B6BCCC !important;
-    }
-
-    .nav-li {
-        position: relative;
-        display: inline-block;
-        padding-left: $menuPadding;
-        padding-right: $menuPadding;
-    }
-
-    .nav-li:active {
-        background: #C9D0E1;
-        border-radius: 4px;
-    }
-
-    .nav-li-text {
-        font-size: 13px;
-        color: #000;
-        text-align: center;
-        text-decoration: none;
-    }
-
-    .nav-ul {
-        display: none;
-        position: absolute;
-        list-style: none;
-        border: 1px solid gray;
-        width: $menuItemWidth;
-        padding: 0px;
-        margin: 0px;
-    }
-
-    .menu-ul {
-        display: none;
-        list-style: none;
-        background: #F0F0F0;
-        line-height: $menuItemHeight;
-        width: $menuItemWidth;
-        bottom: $menuItemHeight;
-    }
-
-    .active {
-        position: absolute;
-        display: block !important;
-    }
-
-    .menu-ul-text {
-        font-size: 14px;
-        color: #000;
-        letter-spacing: 0;
-        height: $menuItemHeight;
-        line-height: $menuItemHeight;
-        border-left: 1px solid #000;
-        border-right: 1px solid #000;
-    }
-
-    .menu-separator {
-        text-align: left;
-        background: #F0F0F0;
-        height: 2px;
-        line-height: 2px;
-    }
-
-    .menu-separator .status {
-        display: inline-block;
-        border-right: 1px inset #CACACA;
-        width: $width;
-        height: 100%;
-        background: #EFECDE;
-    }
-
-    .menu-separator .separator {
-        display: inline-block;
-        background: #CACACA;
-        margin-left: 5px;
-        height: 2px;
-        width: $menuItemWidth - $width - 30px;
-    }
-
-    .menu-li {
-        text-align: left;
-        background: #F0F0F0;
-        height: $menuItemHeight;
-        line-height: $menuItemHeight;
-    }
-
-    .menu-li-block {
-        letter-spacing: 0;
-        height: $menuItemHeight;
-        line-height: $menuItemHeight;
-    }
-
-    .menu-li-text {
-        font-size: 14px;
-        color: #000;
-    }
-
-    .menu-li-text .status {
-        display: inline-block;
-        border-right: 1px inset #CACACA;
-        width: $width;
-        background: #EFECDE;
-    }
-
-    .menu-li-text .label {
-        display: inline-block;
-        margin-left: 5px;
-    }
-
-    .menu-li-text .button {
-        position: relative;
-        overflow: hidden;
-        margin-left: 10px;
-        line-height: 0px;
-        width: $menuItemWidth - $width;
-        top: -$menuItemHeight;
-        color: #000;
-        cursor: pointer;
-
-        input {
-            opacity: 0;
-            cursor: pointer;
-            position: absolute;
-            top: 0px;
-            width: $menuItemWidth - $width - 10px;
-        }
-    }
-
-    .menu-li-block:hover {
-        background: #C9DEF7;
-        box-sizing: border-box;
-        -moz-box-sizing: border-box;
-        -webkit-box-sizing: border-box;
-    }
-</style>
diff --git a/src/jmapNew/theme/xian_02/planSchedule/menuTool.vue b/src/jmapNew/theme/xian_02/planSchedule/menuTool.vue
deleted file mode 100644
index d3ecde016..000000000
--- a/src/jmapNew/theme/xian_02/planSchedule/menuTool.vue
+++ /dev/null
@@ -1,172 +0,0 @@
-<template>
-    <div id="PlanMenuTool">
-        <div class="nav">
-            <div class="tool" v-for="(item,index) in tools" :key="index">
-                <img :src="item.src" :alt="item.title" />
-            </div>
-        </div>
-    </div>
-</template>
-<script>
-    import { mapGetters } from 'vuex';
-    import { prefixIntrger } from '@/utils/date';
-    import logo_ from '@/assets/logo_.png';
-
-
-    export default {
-        name: 'PlanMenuTool',
-        data() {
-            return {
-                tools: [
-                    {
-                        title: '服务器1',
-                        operate: '',
-                        src: logo_,
-                        click: this.undeveloped,
-                    },
-                    {
-                        title: '服务器2',
-                        operate: '',
-                        src: '',
-                        click: this.undeveloped,
-                    },
-                    {
-                        title: '前置机1',
-                        operate: '',
-                        src: '',
-                        click: this.undeveloped,
-                    },
-                    {
-                        title: '前置机2',
-                        operate: '',
-                        src: '',
-                        click: this.undeveloped,
-                    },
-                    {
-                        title: '主调',
-                        operate: '',
-                        src: '',
-                        click: this.undeveloped,
-                    },
-                    {
-                        title: '调度台1',
-                        operate: '',
-                        src: '',
-                        click: this.undeveloped,
-                    },
-                    {
-                        title: '调度台2',
-                        operate: '',
-                        src: '',
-                        click: this.undeveloped,
-                    },
-                    {
-                        title: '调度台3',
-                        operate: '',
-                        src: '',
-                        click: this.undeveloped,
-                    },
-                    {
-                        title: '大屏',
-                        operate: '',
-                        src: '',
-                        click: this.undeveloped,
-                    },
-                    {
-                        title: '维护工作站',
-                        operate: '',
-                        src: '',
-                        click: this.undeveloped,
-                    },
-                    {
-                        title: '运行图显示人工站',
-                        operate: '',
-                        src: '',
-                        click: this.undeveloped,
-                    },
-                    {
-                        title: '跳停',
-                        operate: '',
-                        src: '',
-                        click: this.undeveloped,
-                    },
-                    {
-                        title: '扣车',
-                        operate: '',
-                        src: '',
-                        click: this.undeveloped,
-                    },
-                    {
-                        title: '列车报警',
-                        operate: '',
-                        src: logo_,
-                        click: this.undeveloped,
-                    }
-                ]
-            }
-        },
-        watch: {
-            '$store.state.training.initTime': function (initTime) {
-                let date = new Date(initTime);
-                this.time = `${prefixIntrger(date.getHours(), 2)}:${prefixIntrger(date.getMinutes(), 2)}${prefixIntrger(date.getSeconds(), 2)}`
-            }
-        },
-        computed: {
-            isShowSystemTime() {
-                return this.$route.params.mode == 'demon' || this.$route.params.mode === 'dp' || !this.$route.params.mode;
-            }
-        },
-        mounted() {
-            this.initTools();
-        },
-        methods: {
-            initTools() {
-                this.tools = [];
-            }
-        }
-    }
-</script>
-
-<style scoped rel="stylesheet/scss" lang="scss" scoped>
-    @import "src/styles/mixin.scss";
-    $top: 48px;
-    $width: 25px;
-    $height: 25px;
-
-    #PlanMenuTool {
-        z-index: 5;
-        position: absolute;
-        width: 100%;
-        top: $top;
-    }
-
-    .nav {
-        display: block;
-        color: #0000;
-        background: #EBEADB;
-        border: 1px solid #B6BCCC !important;
-        border-bottom: 2px solid #B6BCCC !important;
-        list-style: none;
-        height: $height;
-        line-height: $height;
-    }
-
-    .tool {
-        padding-left: 10px;
-        display: flex;
-        justify-content: center;
-        cursor: pointer;
-        position: relative;
-        float: left;
-        margin: 1px;
-        width: $width;
-
-        img {
-            display: block;
-            text-align: center;
-            padding-top: 2px;
-            height: $height - 5;
-            width: $width - 5;
-        }
-    }
-</style>
\ No newline at end of file
diff --git a/src/jmapNew/theme/xian_02/planSchedule/schedule.vue b/src/jmapNew/theme/xian_02/planSchedule/schedule.vue
deleted file mode 100644
index 82a3c9ed3..000000000
--- a/src/jmapNew/theme/xian_02/planSchedule/schedule.vue
+++ /dev/null
@@ -1,468 +0,0 @@
-<template>
-  <div id="PlanSchedule" :style="{top: top+'px', height: height+'px'}">
-    <div class="left">
-      <div :id="runPlanId" />
-    </div>
-    <div class="right">
-      <data-table
-        ref="serviceTable"
-        :height="height/2"
-        :config="serviceNumberConfig"
-        :style="{top: top-height/2+'px'}"
-        @touch="scheduleTouch"
-      />
-      <data-table
-        ref="tripTable"
-        :height="height/2"
-        :config="tripNumberConfig"
-        :style="{top: top-height/2+'px'}"
-        @touch="trainNumTouch"
-      />
-    </div>
-  </div>
-</template>
-
-<script>
-import { mapGetters } from 'vuex';
-import { timeFormat } from '@/utils/date';
-import {toTimeStamp, formatDuring} from '@/utils/date';
-import DataTable from '../menusPlan/components/dataTable';
-import echarts from 'echarts';
-
-export default {
-    name: 'PlanSchedule',
-    components: {
-        DataTable
-    },
-    props: {
-        group: {
-            type: String,
-            required: true
-        },
-        lineCode: {
-            type: String,
-            required: true
-        },
-        maxWidth: {
-            type: Number,
-            require: true
-        },
-        maxHeight: {
-            type: Number,
-            required: true
-        }
-    },
-    data() {
-        return {
-            top: 0,
-            height: 0,
-            heights: [100, 100],
-            runPlanId: 'plan-schedule-id',
-            myChart: null,
-            PlanConvert: {},
-            serviceNumberConfig: {
-                data: [],
-                highlightCurrentRow: true,
-                handleChange: this.serviceNumberChange,
-                showClose: false,
-                columns: [
-                    {
-                        prop: 'serviceNumber',
-                        label: '表号'
-                    },
-                    {
-                        width: 40
-                    }
-                ]
-            },
-            tripNumberConfig: {
-                data: [],
-                highlightCurrentRow: true,
-                handleChange: this.tripNumberChange,
-                showClose: false,
-                columns: [
-                    {
-                        prop: 'tripNumber',
-                        label: '车次号'
-                    },
-                    {
-                        width: 40
-                    }
-                ]
-            },
-            realData: {},
-            kmRangeCoordMap: {},
-            option: {
-                title: {
-                    text: '',
-                    left: 'center'
-                },
-                grid: {
-                    top: '30px',
-                    left: '120px',
-                    right: '40px',
-                    bottom: '65px',
-                    containLabel: true,
-                    backgroundColor: 'floralwhite'
-                },
-                toolbox: {
-                    // right: '30px',
-                    // feature: {
-                    //     dataZoom: {
-                    //         yAxisIndex: 'none'
-                    //     },
-                    //     restore: {},
-                    //     saveAsImage: {}
-                    // }
-                },
-                tooltip: {
-                    axisPointer: {
-                        trigger: 'item',
-                        type: 'cross'
-                    },
-                    formatter: this.axisTooltip,
-                    borderWidth: 1
-                },
-                xAxis: [
-                    {
-                        type: 'category',
-                        boundaryGap: false,
-                        data: [],
-                        axisLine: {
-                            onZero: false,
-                            lineStyle: {
-                                width: 2,
-                                color: '#d14a61'
-                            }
-                        },
-                        axisLabel: {
-                            formatter: this.xAxisLableFormat,
-                            textStyle: {
-                                color: '#333'
-                            }
-                        },
-                        axisPointer: {
-                            snap: true,
-                            label: {
-                                formatter: this.xAxisPointFormat,
-                                backgroundColor: 'rgb(255,0,0,0.5)',
-                                color: 'white'
-                            }
-                        }
-                    }
-                ],
-                yAxis: {
-                    type: 'value',
-                    splitLine: {
-                        show: false
-                    },
-                    axisTick: {
-                        show: false
-                    },
-                    axisLine: {
-                        onZero: false,
-                        lineStyle: {
-                            width: 2,
-                            color: '#d14a61'
-                        }
-                    },
-                    axisLabel: {
-                        interval: 'auto',
-                        formatter: this.yAxisLableFormat
-                    },
-                    axisPointer: {
-                        xAxisIndex: 'all',
-                        label: {
-                            formatter: this.yAxisPointFormat,
-                            backgroundColor: 'rgb(0,100,0,0.5)',
-                            color: 'white'
-                        }
-                    },
-                    min: 0,
-                    max: 0
-                },
-                series: [],
-                dataZoom: [
-                    {
-                        type: 'inside'
-                    },
-                    {
-                        fiterMode: 'filter',
-                        handleIcon: 'M10.7,11.9v-1.3H9.3v1.3c-4.9,0.3-8.8,4.4-8.8,9.4c0,5,3.9,9.1,8.8,9.4v1.3h1.3v-1.3c4.9-0.3,8.8-4.4,8.8-9.4C19.5,16.3,15.6,12.2,10.7,11.9z M13.3,24.4H6.7V23h6.6V24.4z M13.3,19.6H6.7v-1.4h6.6V19.6z',
-                        handleSize: '80%',
-                        handleStyle: {
-                            color: '#fff',
-                            shadowBlur: 3,
-                            shadowColor: 'rgba(0, 0, 0, 0.6)',
-                            shadowOffsetX: 2,
-                            shadowOffsetY: 2
-                        },
-                        bottom: '20px'
-                    }
-                ]
-            },
-            absoluteTime: 2 * 3600,
-            indexKmRangeMap: {}
-        };
-    },
-    computed: {
-        ...mapGetters('runPlan', [
-            'stations'
-        ])
-    },
-    watch: {
-        maxWidth() {
-            this.setPosition();
-        },
-        maxHeight() {
-            this.setPosition();
-        },
-        '$store.state.runPlan.planLoadedCount': async function () {
-            await this.loadChartPage();
-        },
-        '$store.state.runPlan.planSizeCount': function () {
-            this.reSize({ width: this.$store.state.runPlan.width, height: this.$store.state.runPlan.height });
-        },
-        '$store.state.runPlan.selected.serviceNumber': function (val) {
-            const index = this.serviceNumberConfig.data.findIndex(elem => {
-                return elem.serviceNumber == val;
-            });
-
-            this.$refs.serviceTable.setCurrentRow(this.serviceNumberConfig.data[index]);
-        },
-        '$store.state.runPlan.selected.tripNumber': function (val) {
-            const index = this.tripNumberConfig.data.findIndex(elem => {
-                return elem.tripNumber == val;
-            });
-            this.$refs.tripTable.setCurrentRow(this.tripNumberConfig.data[index]);
-        }
-    },
-    mounted() {
-        this.PlanConvert = this.$theme.loadPlanConvert(this.lineCode);
-    },
-    beforeDestroy() {
-        this.destroy();
-    },
-    methods: {
-        serviceNumberChange(row) {
-            if (row) {
-                this.$store.dispatch('runPlan/setSelected', { serviceNumber: row.serviceNumber, tripNumber: null });
-                const serviceObj = this.$store.state.runPlan.editData[row.serviceNumber];
-                if (serviceObj) {
-                    this.analyticalTripNumber(serviceObj.trainMap);
-                }
-            }
-        },
-        tripNumberChange(row) {
-            if (row) {
-                this.$store.dispatch('runPlan/setSelected', { serviceNumber: this.$store.state.runPlan.selected.serviceNumber, tripNumber: row.tripNumber });
-            }
-        },
-        async analyticalServiceNumber(data) {
-            this.serviceNumberConfig.data = Object.keys(data || {})
-                .sort((a, b) => { return data[a].oldIndex - data[b].oldIndex; })
-                .map(serviceNumber => { return { serviceNumber }; });
-        },
-        async analyticalTripNumber(data) {
-            this.tripNumberConfig.data = Object.keys(data || {})
-                .sort((a, b) => { return data[a].oldIndex - data[b].oldIndex; })
-                .map(tripNumber => { return { tripNumber }; });
-        },
-        async setPosition() {
-            this.$nextTick(() => {
-                let top = 3;
-                const width = this.maxWidth * 0.85;
-                let height = this.maxHeight;
-
-                const titleBar = document.getElementById('PlanTitleBar');
-                const menuBar = document.getElementById('PlanMenuBar');
-                const menuTool = document.getElementById('PlanMenuTool');
-                const statusBar = document.getElementById('PlanStatusBar');
-
-                if (titleBar) {
-                    top += (titleBar.offsetHeight || 0);
-                }
-
-                if (menuBar) {
-                    top += (menuBar.offsetHeight || 0);
-                }
-
-                if (menuTool) {
-                    top += (menuTool.offsetHeight || 0);
-                }
-
-                if (statusBar) {
-                    height -= (statusBar.offsetHeight || 0);
-                }
-
-                height = height - top;
-                this.$store.dispatch('runPlan/resize', { width, height });
-
-                if (this.top != top) {
-                    this.top = top;
-                }
-
-                if (this.height != height) {
-                    this.height = height - 20 * 2;
-                }
-            });
-        },
-        async loadChartPage() {
-            try {
-                let series = [];
-                const stations = this.$store.state.runPlan.stations;
-                const planData = this.$store.state.runPlan.planData;
-
-                this.viewDisabled = true;
-                this.kmRangeCoordMap = this.PlanConvert.convertStationsToMap(stations);
-                series = this.pushModels(series, [this.PlanConvert.initializeYaxis(stations)]);
-                series = this.pushModels(series, this.PlanConvert.convertDataToModels(planData, stations, this.kmRangeCoordMap, { color: '#000', width: 0.5 }));
-                await this.loadInitData(series);
-                await this.analyticalServiceNumber(this.$store.state.runPlan.editData);
-                this.viewDisabled = false;
-
-            } catch (error) {
-                this.viewDisabled = false;
-                this.$messageBox(`加载运行图数据失败`);
-            }
-        },
-        async loadInitData(series) {
-            this.myChart && this.myChart.showLoading();
-            await this.xAxisInit();
-            await this.yAxisInit();
-            await this.loadInitChart(series);
-            this.myChart && this.myChart.hideLoading();
-        },
-        pushModels(series, models) {
-            if (models && models.length) {
-                models.forEach(elem => {
-                    if (elem) {
-                        series.push(elem);
-                    }
-                });
-            }
-
-            return series;
-        },
-        loadInitChart(series) {
-            return new Promise((resolve, reject) => {
-                try {
-                    this.destroy();
-                    let startValue = 3600 + this.PlanConvert.TranslationTime;
-                    const offsetTime = 3600;
-                    const initTime = toTimeStamp(formatDuring(this.$store.state.training.initTime));
-                    startValue = initTime - this.PlanConvert.TranslationTime;
-                    this.option.dataZoom[0].startValue = this.option.dataZoom[1].startValue = startValue - offsetTime;
-                    this.option.dataZoom[0].endValue = this.option.dataZoom[1].endValue = startValue + offsetTime;
-                    this.option.series = series;
-                    this.myChart = echarts.init(document.getElementById(this.runPlanId));
-                    if (this.myChart) {
-                        this.myChart.setOption(this.option);
-                        this.reSize({ width: this.$store.state.runPlan.width, height: this.$store.state.runPlan.height });
-                        this.myChart.on('click', this.mouseClick);
-                    }
-                    resolve(true);
-                } catch (error) {
-                    reject(error);
-                }
-            });
-
-        },
-        xAxisPointFormat(params) {
-            return timeFormat(params.value);
-        },
-        yAxisPointFormat(params) {
-            return this.PlanConvert.computedFormatYAxis(this.stations, params);
-        },
-        xAxisLableFormat(value, index) {
-            if (value % 60 === 0) {
-                return timeFormat(value);
-            }
-        },
-        yAxisLableFormat(value, index) {
-            return '';
-        },
-        xAxisInit() {
-            const list = [];
-            for (var time = 0 + this.PlanConvert.TranslationTime; time < 3600 * 24 + this.PlanConvert.TranslationTime; time++) {
-                list.push(time);
-            }
-
-            const startValue = 3600 * 6;
-            const offsetTime = 3600 * 1;
-
-            this.option.xAxis[0].data = list;
-            if (!this.option.dataZoom[0].startValue) {
-                this.option.dataZoom[0].startValue = this.option.dataZoom[1].startValue = startValue - offsetTime;
-            }
-
-            if (!this.option.dataZoom[0].endValue) {
-                this.option.dataZoom[0].endValue = this.option.dataZoom[1].endValue = startValue + offsetTime;
-            }
-        },
-        yAxisInit() {
-            if (Object.keys(this.PlanConvert).length) {
-                this.option.yAxis.min = this.PlanConvert.computedYaxisMinValue(this.stations);
-                this.option.yAxis.max = this.PlanConvert.computedYaxisMaxValue(this.stations);
-            }
-        },
-        axisTooltip(param) {
-            const station = this.stations[Math.floor((param.data[1] - this.PlanConvert.EdgeHeight) / this.PlanConvert.CoordMultiple)] || { name: '', kmRange: '' };
-            return [
-                `Point Data <hr size=1 style=" margin: 3px 0">`,
-                `车站名称: ${station.name}<br>`,
-                `车站公里标: ${station.kmRange} km <br>`,
-                `到站时间: ${timeFormat(param.data[0] + this.PlanConvert.TranslationTime)} (${param.data[0]})<br>`
-            ].join('');
-        },
-        mouseClick(params) {
-            const model = {
-                serviceNumber: params.seriesName
-            };
-            this.$store.dispatch('runPlan/setSelected', model);
-        },
-        reSize(opt) {
-            if (this.myChart) {
-                this.myChart.resize({
-                    width: opt.width,
-                    height: opt.height,
-                    silent: false
-                });
-            }
-        },
-        destroy() {
-            if (this.myChart && this.myChart.isDisposed) {
-                this.myChart.dispose();
-                this.myChart = null;
-            }
-        },
-        scheduleTouch() {
-
-        },
-        trainNumTouch() {
-
-        }
-    }
-};
-</script>
-<style scoped rel="stylesheet/scss" lang="scss">
-    @import "src/styles/mixin.scss";
-
-    #PlanSchedule {
-        z-index: 5;
-        position: absolute;
-        width: 100%;
-
-        .left {
-            height: 100%;
-            width: 85%;
-            float: left;
-        }
-
-        .right {
-            height: 100%;
-            width: 15%;
-            float: right;
-        }
-    }
-</style>
diff --git a/src/jmapNew/theme/xian_02/planSchedule/statusBar.vue b/src/jmapNew/theme/xian_02/planSchedule/statusBar.vue
deleted file mode 100644
index 4c1418fb3..000000000
--- a/src/jmapNew/theme/xian_02/planSchedule/statusBar.vue
+++ /dev/null
@@ -1,107 +0,0 @@
-<template>
-  <data-table
-    id="PlanStatusBar"
-    ref="dataTable"
-    :height="height-11"
-    :config="stationListConfig"
-    :close="false"
-    :style="{top: maxmini? maxTop-110+'px':maxTop-21+'px'}"
-    @touch="touch"
-  />
-</template>
-
-<script>
-import DataTable from '../menusPlan/components/dataTable';
-import { formatTime, formatName } from '@/utils/runPlan';
-
-export default {
-	name: 'PlanStatusBar',
-	components: {
-		DataTable
-	},
-	props: {
-		maxTop: {
-			type: Number,
-			required: true
-		}
-	},
-	data() {
-		return {
-			maxmini: true,
-			height: 100,
-			stationListConfig: {
-				data: [],
-				showClose: true,
-				highlightCurrentRow: true,
-				columns: [
-					{
-						prop: 'stationName',
-						label: '站台',
-						width: 400
-					},
-					{
-						prop: 'startTime',
-						label: '到点'
-					},
-					{
-						prop: 'stopTime',
-						label: '停站时间'
-					},
-					{
-						prop: 'endTime',
-						label: '发点'
-					},
-					{
-						prop: 'level',
-						label: '运行等级'
-
-					}
-				]
-			}
-		};
-	},
-	watch: {
-		'$store.state.runPlan.selected': function (select) {
-			this.stationListConfig.data = [];
-			const serviceObj = this.$store.state.runPlan.editData[select.serviceNumber];
-			if (serviceObj) {
-				const trainMap = serviceObj.trainMap;
-				if (trainMap) {
-					const trainObj = trainMap[select.tripNumber];
-					if (trainObj) {
-						const stationTimeList = trainObj.stationTimeList;
-						if (stationTimeList && stationTimeList.length) {
-							stationTimeList.forEach((elem, index) => {
-								const stationObj = {
-									stationName: formatName(elem.stationCode),
-									startTime: formatTime(index == 0 ? null : stationTimeList[index - 1].secondTime),
-									stopTime: formatTime(index == 0 ? null : elem.secondTime - stationTimeList[index - 1].secondTime),
-									endTime: formatTime(elem.secondTime),
-									level: ''
-								};
-								this.stationListConfig.data.push(stationObj);
-							});
-						}
-					}
-				}
-			}
-		}
-	},
-	methods: {
-		touch(maxmini) {
-			this.maxmini = maxmini;
-			this.$emit('setPosition');
-		}
-	}
-};
-</script>
-
-<style scoped rel="stylesheet/scss" lang="scss">
-    @import "src/styles/mixin.scss";
-
-    #PlanStatusBar {
-        z-index: 5;
-        position: absolute;
-        width: 100%;
-    }
-</style>
diff --git a/src/jmapNew/theme/xian_02/planSchedule/titleBar.vue b/src/jmapNew/theme/xian_02/planSchedule/titleBar.vue
deleted file mode 100644
index 689c3486a..000000000
--- a/src/jmapNew/theme/xian_02/planSchedule/titleBar.vue
+++ /dev/null
@@ -1,75 +0,0 @@
-<template>
-    <div id="PlanTitleBar">
-        <img class="logo" :src="logoImg" />
-        <span> {{mapName}} &ensp;</span>
-        <span v-if="runPlanName">({{runPlanName}})</span>
-        <span class="system-close el-icon-close" @click="back"></span>
-    </div>
-</template>
-
-<script>
-    import logo_ from '@/assets/logo_.png';
-    import { getPublishMapInfo } from '@/api/jmap/map';
-
-    export default {
-        name: 'PlanTitleBar',
-        data() {
-            return {
-                mapName: '',
-                logoImg: logo_
-            }
-        },
-        computed: {
-            runPlanName() {
-                return this.$route.query.planName || '';
-            }
-        },
-        mounted() {
-            if (this.$route.query.mapId) {
-                getPublishMapInfo(this.$route.query.mapId).then(resp => {
-                    this.mapName = resp.data.name;
-                })
-            }
-        },
-        methods: {
-            back() {
-                this.$emit('back');
-            }
-        }
-    }
-</script>
-<style scoped rel="stylesheet/scss" lang="scss" scoped>
-    @import "src/styles/mixin.scss";
-    $width: 25px;
-    $height: 25px;
-
-    #PlanTitleBar {
-        z-index: 10;
-        display: flex;
-        position: absolute;
-        width: 100%;
-        height: $height;
-        line-height: $height;
-        background: -webkit-linear-gradient(#0055E8, #0099F8);
-        background: -o-linear-gradient(#0055E8, #0099F8);
-        background: -moz-linear-gradient(#0055E8, #0099F8);
-        background: linear-gradient(#0055E8, #0099F8);
-        color: white;
-        font: bold;
-        font-size: 16px;
-
-        .logo {
-            display: inline-block;
-            width: $width;
-            height: $height;
-            padding-right: 5px;
-        }
-
-        .system-close {
-            width: 25px;
-            height: 25px;
-            position: absolute;
-            right: 1px;
-        }
-    }
-</style>
\ No newline at end of file
diff --git a/src/jmapNew/utils/parser.js b/src/jmapNew/utils/parser.js
index 82727b6fc..6c6484ffd 100644
--- a/src/jmapNew/utils/parser.js
+++ b/src/jmapNew/utils/parser.js
@@ -179,6 +179,21 @@ export function parser(data, skinCode, showConfig) {
             case 'Axle':
                 mapDevice[elem.code] = createDevice(deviceType.Axle, elem, propConvert, showConfig);
                 break;
+            case 'ModeStatusGroup':
+                mapDevice[elem.code] = createDevice(deviceType.ModeStatusGroup, elem, propConvert, showConfig);
+                break;
+            case 'LampFilament':
+                mapDevice[elem.code] = createDevice(deviceType.LampFilament, elem, propConvert, showConfig);
+                break;
+            case 'ReturnModeGroup':
+                mapDevice[elem.code] = createDevice(deviceType.ReturnModeGroup, elem, propConvert, showConfig);
+                break;
+            case 'ControlSwitch':
+                mapDevice[elem.code] = createDevice(deviceType.ControlSwitch, elem, propConvert, showConfig);
+                break;
+            case 'SwitchFault':
+                mapDevice[elem.code] = createDevice(deviceType.SwitchFault, elem, propConvert, showConfig);
+                break;
             }
         }, this);
 
@@ -298,6 +313,7 @@ export function updateMapData(state, model) {
         case deviceType.ControlSwitch: updateForList(model, state, 'indicatorLightList'); break;
         case deviceType.Axle: updateForList(model, state, 'indicatorLightList'); break;
         case deviceType.SplitStation: updateForList(model, state, 'splitStationList'); break;
+        case deviceType.SwitchFault: updateForList(model, state, 'indicatorLightList'); break;
         }
     }
 }
diff --git a/src/permission.js b/src/permission.js
index 3d3c9b496..949a5a037 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -3,6 +3,7 @@ import store from '@/store/index_APP_TARGET';
 import router from './router/index_APP_TARGET';
 import {PermissionParam} from '@/scripts/ProjectConfig';
 import NProgress from 'nprogress';
+import 'nprogress/nprogress.css';
 import { admin} from './router/index_APP_TARGET';
 import { getToken, removeToken} from '@/utils/auth';
 import { LoginParams } from '@/utils/login';
diff --git a/src/scripts/ConstConfig.js b/src/scripts/ConstConfig.js
index 7070ddc21..9cf863d59 100644
--- a/src/scripts/ConstConfig.js
+++ b/src/scripts/ConstConfig.js
@@ -89,7 +89,7 @@ export default {
         ],
         roleTypeNew:[
             {label: '管理员', value: 'ADMIN', enLabel: 'Admin '},
-            // {label: '教员', value: 'Instructor', enLabel: 'Instructor '},
+            {label: '教员', value: 'Instructor', enLabel: 'Instructor '},
             {label: '行调', value: 'DISPATCHER', enLabel: 'Dispatcher '},
             {label: '行值', value: 'STATION_SUPERVISOR', enLabel: 'Attendant '},
             {label: '观众', value: 'AUDIENCE', enLabel: 'Audience '},
diff --git a/src/scripts/GlobalPlugin.js b/src/scripts/GlobalPlugin.js
index d767ae38c..0a466d53e 100644
--- a/src/scripts/GlobalPlugin.js
+++ b/src/scripts/GlobalPlugin.js
@@ -100,3 +100,17 @@ Vue.prototype.$convertList = function(FromList, ToList, checktypeFunction) {
         });
     }
 };
+
+// 对象2 复制到 对象1上 并保留对象1原有字段
+Vue.prototype.$copyClone = function(obj1, obj2 = {}) {
+    for (const keys in obj1) {
+        if (obj1.hasOwnProperty(keys)) {
+            if (obj1[keys] && typeof obj1[keys] === 'object') { // 如果值是对象，就递归一下
+                obj1[keys] = Vue.prototype.$copyClone(obj1[keys], obj2[keys]);
+            } else {
+                obj1[keys] = obj2[keys];
+            }
+        }
+    }
+    return obj1;
+};
diff --git a/src/store/modules/socket.js b/src/store/modules/socket.js
index e3e4ad1d6..3673c1088 100644
--- a/src/store/modules/socket.js
+++ b/src/store/modules/socket.js
@@ -81,6 +81,9 @@ function handle(state, data) {
     case 'Be_Logged_Out': // 重复登录被登出
         state.beLogoutCount++;
         break;
+    case 'Simulation_Run_Plan_Reload': // 运行图变更
+        state.runPlanReloadCount++;
+        break;
     case 'Simulation_Control_Pause': // 暂停中
         store.dispatch('scriptRecord/updateSimulationPause', msg);
         break;
@@ -233,7 +236,8 @@ const socket = {
 
         tipOperateCount: 0, // 任务结束提示消息
         realDeviceInfo: 0, // 真实设备信息
-        beLogoutCount: 0 // 被登出
+        beLogoutCount: 0, // 被登出
+        runPlanReloadCount: 0 // 仿真运行图变更
     },
 
     getters: {
diff --git a/src/utils/index.js b/src/utils/index.js
index ce0764f13..056af38cf 100644
--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -160,16 +160,3 @@ export function deepAssign(obj, item) {
     return Object.assign(obj, target);
 }
 
-// 对象2 复制到 对象1上 并保留对象1原有字段
-export function copyClone(obj1, obj2 = {}) {
-    for (const keys in obj1) {
-        if (obj1.hasOwnProperty(keys)) {
-            if (obj1[keys] && typeof obj1[keys] === 'object') { // 如果值是对象，就递归一下
-                obj1[keys] = copyClone(obj1[keys], obj2[keys]);
-            } else {
-                obj1[keys] = obj2[keys];
-            }
-        }
-    }
-    return obj1;
-}
diff --git a/src/utils/request.js b/src/utils/request.js
index b31cf8b33..cbe2c8ea3 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -6,6 +6,7 @@ import { MessageBox } from 'element-ui';
 import { getToken } from '@/utils/auth';
 import { getBaseUrl } from '@/utils/baseUrl';
 import { EventBus } from '@/scripts/event-bus';
+import Vue from 'vue';
 
 const BASE_API = getBaseUrl();
 
@@ -61,8 +62,17 @@ service.interceptors.response.use(
                         });
                     });
                 });
+                // } else if (res.code == 500) {
+                //     Vue.prototype.$alert('<strong>服务异常: <i style="color: red;">' + res.message + '</i></strong>', '请求结果', {
+                //         confirmButtonText: '确定',
+                //         dangerouslyUseHTMLString: true,
+                //         closeOnClickModal: false
+                //     }).then(() => {
+                //         return Promise.reject(res);
+                //     });
+                // } else {
+                return Promise.reject(res);
             }
-            return Promise.reject(res);
         } else {
             return response.data;
         }
diff --git a/src/views/components/editTable/index.vue b/src/views/components/editTable/index.vue
index 776b7a351..b0783ffde 100644
--- a/src/views/components/editTable/index.vue
+++ b/src/views/components/editTable/index.vue
@@ -2,7 +2,7 @@
   <div>
     <el-table
       :size="size"
-      :stripe="rowStyle? null: stripe"
+      :stripe="rowStyle? false: stripe"
       :border="border"
       :data="tableData"
       :max-height="maxHeight"
@@ -93,79 +93,79 @@
 
 <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
-		},
-		rowStyle: {
-			type: Function,
-			default() {
-				return null;
-			}
-		}
-	},
-	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);
-			}
-		}
-	}
+    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
+        },
+        rowStyle: {
+            type: Function,
+            default() {
+                return null;
+            }
+        }
+    },
+    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>
diff --git a/src/views/demonstration/detail/index.vue b/src/views/demonstration/detail/index.vue
index b606a994c..b7ed74bf5 100644
--- a/src/views/demonstration/detail/index.vue
+++ b/src/views/demonstration/detail/index.vue
@@ -263,18 +263,24 @@ export default {
             this.disabled = true;
             setTimeout(() => {
                 const data = { mapId: this.courseModel.mapId, prdType: this.currentPrdType };
-                schedulingNotify(data).then(resp => {
-                    const query = { lineCode: this.courseModel.lineCode, group: resp.data, prdType: this.courseModel.prdType, mapId: this.courseModel.mapId, goodsId: this.goodsId, try: this.tryUser };
+                try {
                     if (this.drawWay) {
-                        this.$router.push({ path: `${UrlConfig.displayNew}/demon`, query: query });
+                        createSimulationNew(data).then(resp => {
+                            const query = { lineCode: this.courseModel.lineCode, group: resp.data, prdType: this.courseModel.prdType, mapId: this.courseModel.mapId, goodsId: this.goodsId, try: this.tryUser };
+                            this.$router.push({ path: `${UrlConfig.displayNew}/demon`, query: query });
+                            launchFullscreen();
+                        });
                     } else {
-                        this.$router.push({ path: `${UrlConfig.display}/demon`, query: query });
+                        schedulingNotify(data).then(resp => {
+                            const query = { lineCode: this.courseModel.lineCode, group: resp.data, prdType: this.courseModel.prdType, mapId: this.courseModel.mapId, goodsId: this.goodsId, try: this.tryUser };
+                            this.$router.push({ path: `${UrlConfig.display}/demon`, query: query });
+                            launchFullscreen();
+                        });
                     }
-                    launchFullscreen();
-                }).catch(error => {
-                    this.$messageBox(this.$t('error.createSimulationFailed') + error.message);
+                } catch (e) {
+                    this.$messageBox(this.$t('error.createSimulationFailed') + e.message);
                     this.disabled = false;
-                });
+                }
             }, 100);
         },
         jump() {
diff --git a/src/views/jlmap3d/drive/drivecontrol/centerpane.vue b/src/views/jlmap3d/drive/drivecontrol/centerpane.vue
index 7487fc01c..b6e259ad7 100644
--- a/src/views/jlmap3d/drive/drivecontrol/centerpane.vue
+++ b/src/views/jlmap3d/drive/drivecontrol/centerpane.vue
@@ -1,5 +1,5 @@
 <template>
-	<div style="width:25%;height:100%;position:absolute;left:50%;">
+	<div style="width:100%;height:50%;position:absolute;bottom:4%">
 		<div id="start" class="panebutton2" style="bottom:1%;left:5%;">
 			<img class="buttonimg2" :src="start" />
 		</div>
diff --git a/src/views/jlmap3d/drive/drivecontrol/drivecontrol.vue b/src/views/jlmap3d/drive/drivecontrol/drivecontrol.vue
index f83538e48..e9fc433f0 100644
--- a/src/views/jlmap3d/drive/drivecontrol/drivecontrol.vue
+++ b/src/views/jlmap3d/drive/drivecontrol/drivecontrol.vue
@@ -1,7 +1,7 @@
 <template>
 	<div class="drivepane">
 
-		<div style="position: absolute;left:50%;top:10%;z-index:10;background: #EBEBEB;">
+		<div style="position: absolute;right:50%;top:60%;z-index:10;background: #EBEBEB;">
 			<el-select v-model="value" placeholder="请选择列车" @change="currentsel" @visible-change="clickselect">
 				<el-option
 					v-for="item in options"
@@ -14,9 +14,9 @@
 
 			<Centerc-Pane ref="centercontrol" :draw-way="drawWay" :group-num="groupnum" :user-role="userrole" />
 
-			<Left-Pane ref="leftcontrol" />
+			<!-- <Left-Pane ref="leftcontrol" /> -->
 
-			<Right-Pane ref="rightcontrol" />
+			<!-- <Right-Pane ref="rightcontrol" /> -->
 
 			<TopRight-Pane ref="topcontrol" />
 
@@ -148,13 +148,14 @@ import axios from 'axios';
 
 <style>
 	.drivepane{
-		width:100%;
-    height:160px;
-		left:0;
+		width:30%;
+    height:320px;
+		right:500px;
 		bottom:0;
 		position: absolute;
 		background-size: 100% 100%;
 		background-image: url('/static/jl3d/control/scene.png');
+		border-radius:10px;
 	}
 	.panebutton{
 		height: 73px;
diff --git a/src/views/jlmap3d/drive/drivecontrol/leftpane.vue b/src/views/jlmap3d/drive/drivecontrol/leftpane.vue
index 651e8c777..f121eef3c 100644
--- a/src/views/jlmap3d/drive/drivecontrol/leftpane.vue
+++ b/src/views/jlmap3d/drive/drivecontrol/leftpane.vue
@@ -1,58 +1,73 @@
 <template>
 	<div style="width:25%;height:100%;position:absolute;bottom:0;left:0;">
-		<div id="breaker" class="panebutton" style="top:3%;left:3%;" @tap="breakerclick">
+		<!-- 高速断路器 -->
+		<!-- <div id="breaker" class="panebutton" style="top:3%;left:3%;" @tap="breakerclick">
 			<img class="buttonimg" :src="greenzimg" />
 			<div class="buttontext">{{ $t('jlmap3d.highSpeedCircuitBreaker') }}</div>
-		</div>
-		<div id="carwash" class="panebutton" style="top:3%;left:14%;" @tap="carwashclick">
+		</div> -->
+		<!-- 洗车模式 -->
+		<!-- <div id="carwash" class="panebutton" style="top:3%;left:14%;" @tap="carwashclick">
 			<img class="buttonimg" :src="redzimg" />
 			<div class="buttontext">{{ $t('jlmap3d.washCarModel')  }}</div>
-		</div>
-		<div id="aircom" class="panebutton" style="top:3%;left:28%;" @tap="aircomclick">
+		</div> -->
+		<!-- 空压机强迫启动 -->
+		<!-- <div id="aircom" class="panebutton" style="top:3%;left:28%;" @tap="aircomclick">
 			<img class="buttonimg" :src="aircomimg" />
 			<div class="buttontext">{{ $t('jlmap3d.forcedAirCompressor') }}</div>
-		</div>
+		</div> -->
+
+		<!-- ATB启动 -->
 		<div id="atb" class="panebutton" style="top:3%;left:42%;" @tap="atbclick">
 			<img class="buttonimg" :src="greenimg" />
 			<div class="buttontext">{{ $t('jlmap3d.ATBStart') }}</div>
 		</div>
+		<!-- BM/CBTC -->
 		<div id="bmcbtc" class="panebutton" style="top:3%;left:56%;" @tap="bmcbtcclick">
 			<img class="buttonimg" :src="greenimg" />
 			<div class="buttontext">BM/CBTC</div>
 		</div>
+		<!-- RM -->
 		<div id="rm" class="panebutton" style="top:3%;left:70%;" @tap="rmclick">
 			<img class="buttonimg" :src="greenimg" />
 			<div class="buttontext">RM</div>
 		</div>
-		<div id="relieve" class="panebutton" style="top:3%;left:84%;" @tap="relieveclick">
+		<!-- 强迫缓解 -->
+		<!-- <div id="relieve" class="panebutton" style="top:3%;left:84%;" @tap="relieveclick">
 			<img class="buttonimg" :src="aircomimg" />
 			<div class="buttontext">{{ $t('jlmap3d.forcedRelieve') }}</div>
-		</div>
+		</div> -->
 
+		<!-- 关左门 -->
 		<div id="dlclose" class="panebutton" style="bottom:3%;left:3%;" @tap="dlcclick">
 			<img class="buttonimg" :src="greenimg" />
 			<div class="buttontext">{{ $t('jlmap3d.closeLeftDoor') }}</div>
 		</div>
+		<!-- 开左门A -->
 		<div id="dlopen" class="panebutton" style="bottom:3%;left:14%;" @tap="dloclick">
 			<img class="buttonimg" :src="redimg" />
 			<div class="buttontext">{{ $t('jlmap3d.openLeftDoor') }}</div>
 		</div>
-		<div id="dlopen" class="panebutton" style="bottom:3%;left:28%;" @tap="dloclick">
+		<!-- 开左门B -->
+		<!-- <div id="dlopen" class="panebutton" style="bottom:3%;left:28%;" @tap="dloclick">
 			<img class="buttonimg" :src="redimg" />
 			<div class="buttontext">{{ $t('jlmap3d.openLeftDoor') }}</div>
-		</div>
+		</div> -->
+		<!-- ATO启动A -->
 		<div id="atoa" class="panebutton" style="bottom:3%;left:42%;" @tap="atoaclick">
 			<img class="buttonimg" :src="apoimg" />
 			<div class="buttontext">{{ $t('jlmap3d.ATOStart') }}</div>
 		</div>
-		<div id="atob" class="panebutton" style="bottom:3%;left:56%;" @tap="atobclick">
+		<!-- ATO启动B -->
+		<!-- <div id="atob" class="panebutton" style="bottom:3%;left:56%;" @tap="atobclick">
 			<img class="buttonimg" :src="apoimg" />
 			<div class="buttontext">{{ $t('jlmap3d.ATOStart') }}</div>
-		</div>
+		</div> -->
+		<!-- cbtc -->
 		<div id="cbtc" class="panebutton" style="bottom:3%;left:70%;" @tap="cbtcclick">
 			<img class="buttonimg" :src="greenimg" />
 			<div class="buttontext">CBTC</div>
 		</div>
+		<!-- 电笛按钮 -->
 		<div id="elflute" class="panebutton" style="bottom:3%;left:84%;" @tap="elfluteclick">
 			<img class="buttonimg" :src="grayimg" />
 			<div class="buttontext">{{ $t('jlmap3d.electricHornButton') }}</div>
diff --git a/src/views/jlmap3d/drive/drivecontrol/rightpane.vue b/src/views/jlmap3d/drive/drivecontrol/rightpane.vue
index 192c6cb7f..f48b27074 100644
--- a/src/views/jlmap3d/drive/drivecontrol/rightpane.vue
+++ b/src/views/jlmap3d/drive/drivecontrol/rightpane.vue
@@ -1,22 +1,22 @@
 <template>
-	<div style="width:25%;height:100%;position:absolute;left:75%;">
+		<div style="width:25%;height:100%;position:absolute;left:75%;">
 
 	    <div id="dropen" class="panebutton" style="bottom:1%;left:1%;" @tap="droclick">
 			<img class="buttonimg" :src="redlimg" />
 			<div class="buttontext">{{ $t('jlmap3d.openRightDoor') }}</div>
 		</div>
 
-		<div id="dropen" class="panebutton" style="bottom:1%;left:21%;" @tap="droclick">
+		<!-- <div id="dropen" class="panebutton" style="bottom:1%;left:21%;" @tap="droclick">
 			<img class="buttonimg" :src="redlimg" />
 			<div class="buttontext">{{ $t('jlmap3d.openRightDoor') }}</div>
-		</div>
+		</div> -->
 
 		<div id="drclose" class="panebutton" style="bottom:1%;left:41%;" @tap="drcclick">
 			<img class="buttonimg" :src="greenimg" />
 			<div class="buttontext">{{ $t('jlmap3d.closeRightDoor') }}</div>
 		</div>
 
-		<div id="waterswitch" class="panebutton2" style="bottom:1%;left:61%;" @tap="waterclick">
+		<!-- <div id="waterswitch" class="panebutton2" style="bottom:1%;left:61%;" @tap="waterclick">
 			<img class="buttonimg2" :src="zuoimg" />
 			<img class="buttonimg2" :src="niuimg" :style="{transform:watertou}" @touchstart='watertouchstart' @touchmove='watertouchmove' @touchend='watertouchend'/>
 			<div class="tfbutton" style="font-size:1px;top:5px;left:33px;">{{ $t('jlmap3d.close') }}</div>
@@ -31,7 +31,7 @@
 			<div class="tfbutton" style="font-size:1px;top:13px;left:50px;">{{ $t('jlmap3d.slow') }}</div>
 			<div class="tfbutton" style="font-size:1px;top:23px;left:50px;">{{ $t('jlmap3d.highSpeed') }}</div>
 			<div class="buttontext2">{{ $t('jlmap3d.wiperSwitch') }}</div>
-		</div>
+		</div> -->
 
 		<div id="urgestop" class="panebutton" style="top:1%;left:1%;">
 			<img class="buttonimg" :src="urgestopimg" />
@@ -47,14 +47,14 @@
 			<div class="buttontext2">{{ $t('jlmap3d.doorSideChoose') }}</div>
 		</div>
 
-		<div id="doormode" class="panebutton2" style="top:1%;left:66%;">
+		<!-- <div id="doormode" class="panebutton2" style="top:1%;left:66%;">
 			<img class="buttonimg2" :src="zuoimg" />
 			<img class="buttonimg2" :src="niuimg" :style="{transform:doormodetou}" @touchstart='doormodetouchstart' @touchmove='doormodetouchmove' @touchend='doormodetouchend'/>
 			<div class="tfbutton" style="font-size:1px;top:13px;left:5px;">AA</div>
 			<div class="tfbutton" style="font-size:1px;top:5px;left:33px;">AM</div>
 			<div class="tfbutton" style="font-size:1px;top:13px;left:50px;">MM</div>
 			<div class="buttontext2">{{ $t('jlmap3d.doorModel') }}</div>
-		</div>
+		</div> -->
 
 	</div>
 </template>
diff --git a/src/views/jlmap3d/drive/drivecontrol/toprightpane.vue b/src/views/jlmap3d/drive/drivecontrol/toprightpane.vue
index 96484fbee..ddcdc875f 100644
--- a/src/views/jlmap3d/drive/drivecontrol/toprightpane.vue
+++ b/src/views/jlmap3d/drive/drivecontrol/toprightpane.vue
@@ -1,10 +1,50 @@
 <template>
-	<div style="width:25%;height:100%;position:absolute;left:25%;">
+	<div style="width:100%;height:48%;position:absolute;top:0px;">
+		<!-- ATB启动 -->
+		<div id="atb" class="panebutton" style="top:8%;left:3%;" @tap="atbclick">
+			<img class="buttonimg" :src="greenimg" />
+			<div class="buttontext">{{ $t('jlmap3d.ATBStart') }}</div>
+		</div>
+		<!-- BM/CBTC -->
+		<div id="bmcbtc" class="panebutton" style="top:8%;left:17%;" @tap="bmcbtcclick">
+			<img class="buttonimg" :src="greenimg" />
+			<div class="buttontext">BM/CBTC</div>
+		</div>
+		<!-- RM -->
+		<div id="rm" class="panebutton" style="top:8%;left:31%;" @tap="rmclick">
+			<img class="buttonimg" :src="greenimg" />
+			<div class="buttontext">RM</div>
+		</div>
+		<!-- 关左门 -->
+		<div id="dlclose" class="panebutton" style="top:8%;left:45%;" @tap="dlcclick">
+			<img class="buttonimg" :src="greenimg" />
+			<div class="buttontext">{{ $t('jlmap3d.closeLeftDoor') }}</div>
+		</div>
+		<!-- 开左门A -->
+		<div id="dlopen" class="panebutton" style="top:8%;left:59%;" @tap="dloclick">
+			<img class="buttonimg" :src="redimg" />
+			<div class="buttontext">{{ $t('jlmap3d.openLeftDoor') }}</div>
+		</div>
+		<!-- ATO启动A -->
+		<div id="atoa" class="panebutton" style="top:8%;left:73%;" @tap="atoaclick">
+			<img class="buttonimg" :src="apoimg" />
+			<div class="buttontext">{{ $t('jlmap3d.ATOStart') }}</div>
+		</div>
+		<!-- cbtc -->
+		<div id="cbtc" class="panebutton" style="top:8%;left:87%;" @tap="cbtcclick">
+			<img class="buttonimg" :src="greenimg" />
+			<div class="buttontext">CBTC</div>
+		</div>
+		<!-- 电笛按钮 -->
+		<!-- <div id="elflute" class="panebutton" style="bottom:3%;left:84%;" @tap="elfluteclick">
+			<img class="buttonimg" :src="grayimg" />
+			<div class="buttontext">{{ $t('jlmap3d.electricHornButton') }}</div>
+		</div> -->
 
-		<div id="passlight" class="panebutton2" style="top:1%;left:1%;">
+		<!-- <div id="passlight" class="panebutton2" style="top:1%;left:1%;">
 			<img class="buttonimg2" :src="zuoimg" />
 			<img class="buttonimg2" :src="niuimg" :style="{transform:passlighttf}" @touchstart='passlighttouchstart' @touchmove='passlighttouchmove' @touchend='passlighttouchend'/>
-			<div class="tfbutton" style="font-size:1px;top:5px;left:33px;">{{ $t('jlmap3d.close') }}</div>
+			<div class="tfbutton" style="font-size:1px;top:8px;left:33px;">{{ $t('jlmap3d.close') }}</div>
 			<div class="tfbutton" style="font-size:1px;top:25px;left:50px;">{{ $t('jlmap3d.open') }}</div>
 			<div class="buttontext2">{{ $t('jlmap3d.roomLightingControl') }}</div>
 		</div>
@@ -12,15 +52,15 @@
 		<div id="siv" class="panebutton2" style="top:1%;left:20%;">
 			<img class="buttonimg2" :src="zuoimg" />
 			<img class="buttonimg2" :src="niuimg" :style="{transform:sivtf}" @touchstart='sivtouchstart' @touchmove='sivtouchmove' @touchend='sivtouchend'/>
-			<div class="tfbutton" style="font-size:1px;top:5px;left:33px;">{{ $t('jlmap3d.close') }}</div>
+			<div class="tfbutton" style="font-size:1px;top:8px;left:33px;">{{ $t('jlmap3d.close') }}</div>
 			<div class="tfbutton" style="font-size:1px;top:25px;left:50px;">{{ $t('jlmap3d.open') }}</div>
 			<div class="buttontext2">{{ $t('jlmap3d.sivsControl') }}</div>
-		</div>
+		</div> -->
 
-		<div id="driverlight" class="panebutton2" style="top:1%;left:40%;">
+		<!-- <div id="driverlight" class="panebutton2" style="top:1%;left:40%;">
 			<img class="buttonimg2" :src="zuoimg" />
 			<img class="buttonimg2" :src="niuimg" :style="{transform:driverlighttf}" @touchstart='driverlighttouchstart' @touchmove='driverlighttouchmove' @touchend='driverlighttouchend'/>
-			<div class="tfbutton" style="font-size:1px;top:5px;left:28px;">{{ $t('jlmap3d.shut') }}</div>
+			<div class="tfbutton" style="font-size:1px;top:8px;left:28px;">{{ $t('jlmap3d.shut') }}</div>
 			<div class="tfbutton" style="font-size:1px;top:25px;left:50px;">{{ $t('jlmap3d.open') }}</div>
 			<div class="buttontext2">{{ $t('jlmap3d.driverRoomLights') }}</div>
 		</div>
@@ -28,41 +68,63 @@
 		<div id="headlight" class="panebutton2" style="top:1%;left:60%;">
 			<img class="buttonimg2" :src="zuoimg" />
 			<img class="buttonimg2" :src="niuimg" :style="{transform:headlighttf}" @touchstart='headlighttouchstart' @touchmove='headlighttouchmove' @touchend='headlighttouchend'/>
-			<div class="tfbutton" style="font-size:1px;top:5px;left:28px;">{{ $t('jlmap3d.shut') }}</div>
+			<div class="tfbutton" style="font-size:1px;top:8px;left:28px;">{{ $t('jlmap3d.shut') }}</div>
 			<div class="tfbutton" style="font-size:1px;top:13px;left:50px;">{{ $t('jlmap3d.passingBeam') }}</div>
 			<div class="tfbutton" style="font-size:1px;top:25px;left:50px">{{ $t('jlmap3d.distanceLight') }}</div>
 			<div class="buttontext2">{{ $t('jlmap3d.headLamp') }}</div>
-		</div>
+		</div> -->
 
-
-		<div id="sg" class="panebutton" style="bottom:1%;left:1%;" @tap="sgclink">
+		<!-- 受电弓升 -->
+		<!-- <div id="sg" class="panebutton" style="bottom:6%;left:3%;" @tap="sgclink">
 			<img class="buttonimg" :src="sgimg" />
 			<div class="buttontext">{{ $t('jlmap3d.electricGongSheng') }}</div>
-		</div>
-
-		<div id="jg" class="panebutton" style="bottom:1%;left:20%;" @tap="jgclick">
+		</div> -->
+		<!-- 受电弓降 -->
+		<!-- <div id="jg" class="panebutton" style="bottom:6%;left:17%;" @tap="jgclick">
 			<img class="buttonimg" :src="jgimg" />
 			<div class="buttontext">{{ $t('jlmap3d.pantographFall') }}</div>
-		</div>
-
-		<div id="sl" class="panebutton" style="bottom:1%;left:40%;" @tap="slclick">
+		</div> -->
+		<!-- 试灯按钮 -->
+		<!-- <div id="sl" class="panebutton" style="bottom:6%;left:40%;" @tap="slclick">
 			<img class="buttonimg" :src="slimg" />
 			<div class="buttontext">{{ $t('jlmap3d.lampButton') }}</div>
-		</div>
-
-		<div id="atp" class="panebutton" style="bottom:1%;left:60%;" @tap="atpclick">
+		</div> -->
+		<!-- ATP切除 -->
+		<div id="atp" class="panebutton" style="bottom:6%;left:31%;" @tap="atpclick">
 			<img class="buttonimg" :src="atpimg" />
 			<div class="buttontext">{{ $t('jlmap3d.removalATP') }}</div>
 		</div>
 
-		<div id="staymode" class="panebutton2" style="bottom:1%;left:80%;">
+		<!-- <div id="staymode" class="panebutton2" style="bottom:6%;left:80%;">
 			<img class="buttonimg2" :src="zuoimg" />
 			<img class="buttonimg2" :src="niuimg"  :style="{transform:toutransform}" @touchstart='stopmodetouchstart' @touchmove='stopmodetouchmove' @touchend='stopmodetouchend'/>
 			<div class="tfbutton" style="top:25px;left:1px;">{{ $t('jlmap3d.infliction') }}</div>
-			<div class="tfbutton" style="top:5px;left:25px;">{{ $t('jlmap3d.mesoPosition') }}</div>
+			<div class="tfbutton" style="top:8px;left:25px;">{{ $t('jlmap3d.mesoPosition') }}</div>
 			<div class="tfbutton" style="top:25px;left:50px;">{{ $t('jlmap3d.remission') }}</div>
 			<div class="buttontext2">{{ $t('jlmap3d.parkingBrakeMode') }}</div>
+		</div> -->
+		<div id="dropen" class="panebutton" style="bottom:6%;left:45%;" @tap="droclick">
+			<img class="buttonimg" :src="redlimg" />
+			<div class="buttontext">{{ $t('jlmap3d.openRightDoor') }}</div>
 		</div>
+		<div id="drclose" class="panebutton" style="bottom:6%;left:59%;" @tap="drcclick">
+			<img class="buttonimg" :src="greenimg" />
+			<div class="buttontext">{{ $t('jlmap3d.closeRightDoor') }}</div>
+		</div>
+		<div id="urgestop" class="panebutton" style="bottom:6%;left:73%;">
+			<img class="buttonimg" :src="urgestopimg" />
+			<div class="buttontext">{{ $t('jlmap3d.emergencyBraking') }}</div>
+		</div>
+		<div id="doorpick" class="panebutton2" style="bottom:6%;left:85%;">
+			<img class="buttonimg2" :src="zuoimg" />
+			<img class="buttonimg2" :src="niuimg" :style="{transform:doordirecttou}" @touchstart='doordirecttouchstart' @touchmove='doordirecttouchmove' @touchend='doordirecttouchend'/>
+			<div class="tfbutton" style="font-size:1px;top:13px;left:5px;">{{ $t('jlmap3d.leftSide') }}</div>
+			<div class="tfbutton" style="font-size:1px;top:8px;left:33px;">{{ $t('jlmap3d.location0') }}</div>
+			<div class="tfbutton" style="font-size:1px;top:13px;left:50px;">{{ $t('jlmap3d.rightSide') }}</div>
+			<div class="buttontext2">{{ $t('jlmap3d.doorSideChoose') }}</div>
+		</div>
+
+
 	</div>
 
 </template>
@@ -80,7 +142,7 @@
 			return {
 				move:0,
 				movex:"20%",
-				apoimg:"",
+				apoimg:"/static/jl3d/control/green.png",
 				sgimg:"/static/jl3d/control/redz.png",
 				jgimg:"/static/jl3d/control/greenz.png",
 				atpimg:"/static/jl3d/control/atp.png",
@@ -88,6 +150,25 @@
 				zuoimg:"/static/jl3d/control/zuo.png",
 				niuimg:"/static/jl3d/control/niu.png",
 				toutransform:"rotate(0deg)",
+
+				redlimg:"/static/jl3d/control/redl.png",
+				greenimg:"/static/jl3d/control/green.png",
+				urgestopimg:"/static/jl3d/control/urgestop.png",
+				doordirecttou:"rotate(0deg)",
+				doormodetou:"rotate(0deg)",
+				watertou:"rotate(0deg)",
+				washtou:"rotate(0deg)",
+
+				greenzimg:"/static/jl3d/control/greenz.png",
+				redzimg:"/static/jl3d/control/redz.png",
+				redimg:"/static/jl3d/control/red.png",
+				greenlimg:"/static/jl3d/control/greenl.png",
+				grayimg:"/static/jl3d/control/gray.png",
+				aircomimg:"/static/jl3d/control/aircom.png",
+				passlighttf:"rotate(0deg)",
+				sivtf:"rotate(0deg)",
+				driverlighttf:"rotate(0deg)",
+				headlighttf:"rotate(0deg)",
 			}
 		},
 		watch: {
diff --git a/src/views/jlmap3d/drive/sceneview/mmiview.vue b/src/views/jlmap3d/drive/sceneview/mmiview.vue
index 4a14a3522..6dc2a3f70 100644
--- a/src/views/jlmap3d/drive/sceneview/mmiview.vue
+++ b/src/views/jlmap3d/drive/sceneview/mmiview.vue
@@ -202,7 +202,6 @@ export default {
     },
     updatetrainstatus(newdata){
       //更新车组号
-
       this.updatespeed(newdata.v);
 
       this.updateatpspeed(newdata.pv);
@@ -395,7 +394,7 @@ export default {
     height:333px;
     background: black;
     position:absolute;
-    bottom:160px;
+    bottom:0;
   }
   .meter{
     width:60%;
diff --git a/src/views/jlmap3d/drive/sceneview/tmsview.vue b/src/views/jlmap3d/drive/sceneview/tmsview.vue
index cd2382218..24c305d47 100644
--- a/src/views/jlmap3d/drive/sceneview/tmsview.vue
+++ b/src/views/jlmap3d/drive/sceneview/tmsview.vue
@@ -47,7 +47,7 @@ export default {
     background-size:100% 100%;
     background-image:url('/static/jl3d/tms.png');
     position:absolute;
-    bottom:160px;
+    bottom:0;
     right:0;
   }
 
diff --git a/src/views/jlmap3d/passflow/jl3dpassflow.vue b/src/views/jlmap3d/passflow/jl3dpassflow.vue
index d6b1c8469..b60de1e1b 100644
--- a/src/views/jlmap3d/passflow/jl3dpassflow.vue
+++ b/src/views/jlmap3d/passflow/jl3dpassflow.vue
@@ -19,7 +19,7 @@
 <script>
 import Vue from 'vue';
 import { Jl3dpassflow } from '@/jlmap3d/jl3dpassflow/jl3dpassflow.js';
-import { ProjectIcon } from '@/scripts/ConstDic';
+import { ProjectIcon } from '@/scripts/ProjectConfig';
 
 export default {
     name: 'Passflow',
diff --git a/src/views/jlmap3d/simulation/jl3dsimulation.vue b/src/views/jlmap3d/simulation/jl3dsimulation.vue
index 46f0cf43e..ded62f8b3 100644
--- a/src/views/jlmap3d/simulation/jl3dsimulation.vue
+++ b/src/views/jlmap3d/simulation/jl3dsimulation.vue
@@ -47,7 +47,7 @@ import { JLmap3d } from '@/jlmap3d/jl3dsimulation/jlmap3d.js';
 import Jlmap3dMenu from '@/views/jlmap3d/simulation/show/menu';
 
 import Jlmap3dConfig from '@/views/jlmap3d/simulation/show/configmenu';
-import { ProjectIcon } from '@/scripts/ConstDic';
+import { ProjectIcon } from '@/scripts/ProjectConfig';
 
 // import Jlmap3dMsg from '@/views/jlmap3d/show/msg';
 
diff --git a/src/views/login/hydLogin.vue b/src/views/login/hydLogin.vue
index a0ff99b9a..a6ab19cc9 100644
--- a/src/views/login/hydLogin.vue
+++ b/src/views/login/hydLogin.vue
@@ -68,7 +68,8 @@ import QCode from '@/assets/erCode.jpg';
 import { setSessionStorage, removeSessionStorage } from '@/utils/auth';
 import Cookies from 'js-cookie';
 import md5 from 'js-md5';
-import { ProjectIcon, UrlConfig } from '@/scripts/ConstDic';
+import { UrlConfig } from '@/scripts/ConstDic';
+import { ProjectIcon } from '@/scripts/ProjectConfig';
 import { removeToken } from '@/utils/auth';
 import LangStorage from '@/utils/lang';
 import logoImgHyd from '@/assets/logo_hyd.png';
diff --git a/src/views/newMap/displayNew/demon/runPlanLoad.vue b/src/views/newMap/displayNew/demon/runPlanLoad.vue
index 04d83a840..f592f87ca 100644
--- a/src/views/newMap/displayNew/demon/runPlanLoad.vue
+++ b/src/views/newMap/displayNew/demon/runPlanLoad.vue
@@ -1,14 +1,19 @@
 <template>
   <div v-show="show" class="run-plan-dialog">
-    <component :is="menus" ref="schedule" :group="group" @back="doClose" />
+    <plan-schedule ref="planSchedule" :group="group" @back="doClose" />
   </div>
 </template>
 
 <script>
+import PlanSchedule from '@/views/planSchedule/index';
+import { getEveryDayRunPlanNew } from '@/api/simulation';
 
 // 运行图加载
 export default {
     name: 'RunPlanLoad',
+    components: {
+        PlanSchedule
+    },
     props: {
         group: {
             type: String,
@@ -27,19 +32,28 @@ export default {
         }
     },
     watch: {
-        '$route.query.lineCode': function (code) {
-            if (code) {
-                this.menus = this.$theme.loadPlanComponent(code);
-            }
+        '$store.state.socket.runPlanReloadCount': function (val) {
+            getEveryDayRunPlanNew(this.group).then(resp => {
+                this.$store.dispatch('runPlan/setPlanData', resp.data);
+                this.$store.dispatch('runPlan/setInitialPlanData', resp.data);
+                this.viewDisabled = false;
+            }).catch(error => {
+                this.$store.dispatch('runPlan/setPlanData', []);
+                if (error.code == 30001) {
+                    this.$messageBox(this.$t('display.schema.todayRunDiagramNoLoad'));
+                } else {
+                    this.$messageBox(this.$t('display.schema.getRunDiagramFail'));
+                }
+            });
         }
     },
     mounted() {
-        this.menus = this.$theme.loadPlanComponent(this.$route.query.lineCode);
+        // this.menus = this.$theme.loadPlanComponent(this.$route.query.lineCode);
     },
     methods: {
         doShow() {
             this.show = true;
-            this.$refs.schedule.setPosition();
+            this.$refs.planSchedule.setPosition();
         },
         doClose() {
             this.show = false;
diff --git a/src/views/newMap/displayNew/demon/scheduling.vue b/src/views/newMap/displayNew/demon/scheduling.vue
index 8f27d6ffb..3c760e0e0 100644
--- a/src/views/newMap/displayNew/demon/scheduling.vue
+++ b/src/views/newMap/displayNew/demon/scheduling.vue
@@ -22,31 +22,27 @@
                     size="small"
                     type="date"
                     value-format="yyyy-MM-dd"
+                    :picker-options="pickerOptions"
                     @change="handleQuery"
                   />
                 </el-form-item>
               </el-col>
-              <el-col :span="6">
+              <el-col :span="12">
                 <el-form-item :label="$t('display.schedule.runDiagramName')">
-                  <el-select v-model="formModel.runPlanName" size="small" style="display: inline-block">
-                    <el-option
-                      v-for="item in runPlanList"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value"
-                    />
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item :label="$t('display.schedule.scheduleMode')">
-                  <div>{{ formModel.mode }}</div>
+                  <!--<el-select v-model="formModel.runPlanName" size="small" style="display: inline-block">-->
+                  <!--<el-option-->
+                  <!--v-for="item in runPlanList"-->
+                  <!--:key="item.value"-->
+                  <!--:label="item.label"-->
+                  <!--:value="item.value"-->
+                  <!--/>-->
+                  <!--</el-select>-->
+                  <el-input v-model="formModel.runPlanName" size="small" style="width:140px;" />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
                 <el-form-item style="text-align: right">
                   <el-button-group>
-                    <el-button size="small" type="warning" @click="handleCheck">{{ $t('display.schedule.check') }}</el-button>
                     <el-button size="small" type="primary" @click="handleSave">{{ $t('display.schedule.save') }}</el-button>
                   </el-button-group>
                 </el-form-item>
@@ -65,7 +61,7 @@
 </template>
 
 <script>
-import { querySecheduling, generateScheduling, getSchedulingAllTrains, checkScheduling, saveScheduling, generateSchedulingAgain } from '@/api/scheduling';
+import { querySechedulingNew, generateSchedulingNew, saveSchedulingNew, generateSchedulingAgain } from '@/api/scheduling';
 import { hexColor } from '@/utils/runPlan';
 import EditTable from '@/views/components/editTable/index';
 
@@ -87,6 +83,11 @@ export default {
             loading: false,
             runPlanList: [],
             groupNumberList: [],
+            pickerOptions: {
+                disabledDate(time) {
+                    return time.getTime() < Date.now() - 24 * 3600 * 1000;
+                }
+            },
             formModel: {
                 id: '',
                 mode: '',
@@ -96,14 +97,14 @@ export default {
             tableForm: {
                 index: true,
                 columns: [
-                    {
-                        title: this.$t('display.schedule.driverNumber'),
-                        prop: 'driverCode',
-                        type: 'text'
-                    },
+                    // {
+                    //     title: this.$t('display.schedule.driverNumber'),
+                    //     prop: 'driverCode',
+                    //     type: 'text'
+                    // },
                     {
                         title: this.$t('display.schedule.trainNumber'),
-                        prop: 'trainCode',
+                        prop: 'groupNumber',
                         type: 'select',
                         width: '150',
                         options: () => { return this.groupNumberList; },
@@ -112,42 +113,47 @@ export default {
                     },
                     {
                         title: this.$t('display.schedule.onlineSection'),
-                        prop: 'onlineSection',
-                        type: 'text'
+                        prop: 'outDepotTrip.outDepotSectionCode',
+                        type: 'text',
+                        format: (row) => { return this.handleDeviceName(row.outDepotTrip.outDepotSectionCode); }
                     },
                     {
                         title: this.$t('display.schedule.onlineServerNumber'),
-                        prop: 'onlineServerNumber',
-                        type: 'text'
+                        prop: 'outDepotTrip.serviceNumber',
+                        type: 'text',
+                        format: (row) => { return row.outDepotTrip.serviceNumber; }
                     },
                     {
                         title: this.$t('display.schedule.onlineTargetNumber'),
-                        prop: 'onlineTargetNumber',
-                        type: 'text'
+                        prop: 'outDepotTrip.destinationCode',
+                        type: 'text',
+                        format: (row) => { return row.outDepotTrip.destinationCode; }
                     },
                     {
                         title: this.$t('display.schedule.onlineTime'),
-                        prop: 'onlineTime',
-                        type: 'text'
+                        prop: 'outDepotTrip.outDepotTime',
+                        type: 'text',
+                        format: (row) => { return row.outDepotTrip.outDepotTime; }
                     },
                     {
                         title: this.$t('display.schedule.onlineTripNumber'),
-                        prop: 'onlineTripNumber',
+                        prop: 'outDepotTrip.tripNumber',
                         type: 'text',
-                        format: (row) => { return `${row.onlineDirectionCode}${row.onlineTripNumber}`; }
+                        format: (row) => { return row.outDepotTrip.tripNumber; }
                     },
                     {
                         title: this.$t('display.schedule.outDepot'),
-                        prop: 'outDepot',
-                        type: 'text'
+                        prop: 'outDepotTrip.outDepotCode',
+                        type: 'text',
+                        format: (row) => { return this.handleDeviceName(row.outDepotTrip.outDepotCode); }
                     },
                     {
                         title: this.$t('display.schedule.outDepotStatus'),
-                        prop: 'outStatus',
+                        prop: 'outDepotTrip.status',
                         type: 'tag',
-                        columnValue: (row) => { return this.$ConstSelect.translate(row.outStatus, 'Whether'); },
+                        columnValue: (row) => { return this.$ConstSelect.translate(row.outDepotTrip.status, 'Whether'); },
                         tagType: (row) => {
-                            switch (row.outStatus) {
+                            switch (row.outDepotTrip.status) {
                             case true: return 'success';
                             case false: return 'danger';
                             }
@@ -156,41 +162,46 @@ export default {
                     {
                         title: this.$t('display.schedule.offlineSection'),
                         prop: 'offlineSection',
-                        type: 'text'
+                        type: 'text',
+                        format: (row) => { return this.handleDeviceName(row.inDepotTrip.inDepotSectionCode); }
                     },
                     {
                         title: this.$t('display.schedule.offlineServerNumber'),
                         prop: 'offlineServerNumber',
-                        type: 'text'
+                        type: 'text',
+                        format: (row) => { return row.inDepotTrip.serviceNumber; }
                     },
                     {
                         title: this.$t('display.schedule.offlineTargetNumber'),
                         prop: 'offlineTargetNumber',
-                        type: 'text'
+                        type: 'text',
+                        format: (row) => { return row.inDepotTrip.destinationCode; }
                     },
                     {
                         title: this.$t('display.schedule.offlineTime'),
                         prop: 'offlineTime',
-                        type: 'text'
+                        type: 'text',
+                        format: (row) => { return row.inDepotTrip.inDepotTime; }
                     },
                     {
                         title: this.$t('display.schedule.offlineTripNumber'),
                         prop: 'offlineTripNumber',
                         type: 'text',
-                        format: (row) => { return `${row.offlineDirectionCode}${row.offlineTripNumber}`; }
+                        format: (row) => { return row.inDepotTrip.tripNumber; }
                     },
                     {
                         title: this.$t('display.schedule.inDepot'),
                         prop: 'inDepot',
-                        type: 'text'
+                        type: 'text',
+                        format: (row) => { return this.handleDeviceName(row.inDepotTrip.inDepotCode); }
                     },
                     {
                         title: this.$t('display.schedule.inDepotStatus'),
                         prop: 'inStatus',
                         type: 'tag',
-                        columnValue: (row) => { return this.$ConstSelect.translate(row.inStatus, 'Whether'); },
+                        columnValue: (row) => { return this.$ConstSelect.translate(row.inDepotTrip.status, 'Whether'); },
                         tagType: (row) => {
-                            switch (row.inStatus) {
+                            switch (row.inDepotTrip.status) {
                             case true: return 'success';
                             case false: return 'danger';
                             }
@@ -206,8 +217,14 @@ export default {
             return this.$t('display.schedule.schedulePlan');
         }
     },
-    created() {
-        this.loadInitData();
+    watch: {
+        '$store.state.map.mapDataLoadedCount': function () {
+            const trainList = this.$store.state.map.map.trainList || [];
+            this.groupNumberList = [];
+            trainList.forEach(item => {
+                this.groupNumberList.push({value: item.code, label: item.groupNumber});
+            });
+        }
     },
     methods: {
         doShow() {
@@ -217,16 +234,10 @@ export default {
         doClose() {
             this.show = false;
         },
-        loadInitData() {
-            this.groupNumberList = [];
-            getSchedulingAllTrains(this.group).then(resp => {
-                this.groupNumberList = resp.data.map(elem => { return {value: elem.code, label: elem.groupNumber}; });
-            });
-        },
         handleQuery(day) {
             if (day) {
                 this.loading = true;
-                querySecheduling(this.group, {day}).then(resp => {
+                querySechedulingNew(this.group, {day}).then(resp => {
                     if (!resp.data) {
                         this.$confirm(this.$t('display.schedule.noSchedulePlan'), this.$t('global.tips'), {
                             confirmButtonText: this.$t('global.confirm'),
@@ -258,11 +269,11 @@ export default {
             }
         },
         handleGenerate(day) {
-            generateScheduling(this.group, {day}).then(resp => {
+            generateSchedulingNew(this.group, {day}).then(resp => {
                 this.loading = false;
                 this.tableData = this.initTableData(resp.data.planList || []);
                 this.formModel.id = resp.data.id;
-                this.formModel.planDate = resp.data.planDate;
+                // this.formModel.planDate = resp.data.planDate;
                 this.formModel.runPlanName = resp.data.runPlanName;
                 this.$message.success(this.$t('display.schedule.createSchedulePlanSuccess'));
             }).catch(error => {
@@ -285,27 +296,16 @@ export default {
                 this.$messageBox(`${error.message}`);
             });
         },
-        handleCheck() {
-            if (this.formModel.planDate) {
-                checkScheduling(this.group, this.tableData).then(resp => {
-                    const data = resp.data;
-                    this.setConflictList(data.conflictList);
-                    if (data.pass) {
-                        this.$message.success(this.$t('display.schedule.checkPassed'));
-                    } else {
-                        this.$message.warning(this.$t('display.schedule.checkFailed'));
-                    }
-                }).catch(error => {
-                    this.$messageBox(`${this.$t('display.schedule.checkSchedulePlanFailed')}: ${error.message}`);
-                });
-            } else {
-                this.$messageBox(this.$t('display.schedule.selectSchedulePlan'));
-            }
-        },
         handleSave() {
             if (this.formModel.planDate) {
-                saveScheduling(this.group, this.tableData).then(resp => {
-                    this.$message.success(this.$t('display.schedule.saveSchedulePlanSuccess'));
+                saveSchedulingNew(this.group, this.tableData).then(resp => {
+                    if (resp.data && !resp.data.pass) {
+                        this.setConflictList(resp.data.conflictList);
+                        this.$message.warning(this.$t('display.schedule.checkFailed'));
+                    } else {
+                        this.setConflictList([]);
+                        this.$message.success(this.$t('display.schedule.saveSchedulePlanSuccess'));
+                    }
                 }).catch(() => {
                     this.$messageBox(this.$t('display.schedule.saveSchedulePlanFail'));
                 });
@@ -314,17 +314,16 @@ export default {
             }
 
         },
-        handleRowStyle({rowIndex}) {
-            const row = this.tableData[rowIndex];
-            return row['$conflict'] ? `background: ${row['$conflict']}` : `background: #fff`;
+        handleRowStyle({row, rowIndex}) {
+            return row['$conflict'] ? {background: row.$conflict} : {background: '#FFF'};
         },
         setConflictList(list) {
             this.tableData.forEach(elem => { elem['$conflict'] = null; });
             if (list && list.length) {
                 list.forEach(idList => {
-                    const color = hexColor.colorRandom();
                     this.tableData.forEach(elem => {
                         if (idList.includes(parseInt(elem.id))) {
+                            const color = hexColor.colorRandom();
                             elem['$conflict'] = color;
                         }
                     });
@@ -334,7 +333,7 @@ export default {
         },
         initTableData(tableData) {
             tableData.forEach(elem => {
-                elem['$conflict'] = null;
+                this.$set(elem, '$conflict', null);
             });
 
             return tableData;
@@ -342,6 +341,10 @@ export default {
         clearData() {
             this.formModel.planDate = '';
             this.tableData = [];
+        },
+        handleDeviceName(code) {
+            const device = this.$store.getters['map/getDeviceByCode'](code) || {};
+            return device.name;
         }
     }
 };
diff --git a/src/views/newMap/displayNew/index.vue b/src/views/newMap/displayNew/index.vue
index c22161d1e..ad5e33248 100644
--- a/src/views/newMap/displayNew/index.vue
+++ b/src/views/newMap/displayNew/index.vue
@@ -324,13 +324,17 @@ export default {
                 } else {
                     this.mouseNumTime += 1;
                 }
-                if (this.mapBoxP) {
-                    if (this.mouseNumTime >= 8) {
-                        this.mapBoxP.style.cursor = 'none'; // canvas 单个绘图层级只设置一层就好
-                    } else {
-                        this.mapBoxP.style.cursor = '';
-                    }
-                }
+				if (this.mapBox) {
+					if (this.mouseNumTime >= 15) {
+						for (let i = 0; i < this.mapBox.length; i++) {
+							this.mapBox[i].style.cursor = 'none';
+						}
+					} else {
+						for (let i = 0; i < this.mapBox.length; i++) {
+							this.mapBox[i].style.cursor = '';
+						}
+					}
+				}
             }, 1000);
         },
         mousemove() {
diff --git a/src/views/newMap/displayNew/menuDemon.vue b/src/views/newMap/displayNew/menuDemon.vue
index 6e7fcd506..1866d14ad 100644
--- a/src/views/newMap/displayNew/menuDemon.vue
+++ b/src/views/newMap/displayNew/menuDemon.vue
@@ -8,9 +8,9 @@
     <div class="display-draft" :style="{bottom: offsetBottom + 'px'}">
       <el-button-group>
         <el-button v-if="isShowScheduling" type="primary" @click="jumpScheduling">{{ $t('display.demon.dispatchingPlan') }}</el-button>
-        <el-button type="jl3dpassflow" @click="jumpjl3dpassflow">{{ jl3dpassflow }}</el-button>
-        <el-button type="jumpjlmap3d" @click="jumpjlmap3d">{{ jl3dname }}</el-button>
-        <el-button v-if="isShow3dmodel" type="jumpjlmap3dmodel" @click="jumpjlmap3dmodel">{{ jl3dmodel }}</el-button>
+        <el-button v-if="!isShowScheduling" type="jl3dpassflow" @click="jumpjl3dpassflow">{{ jl3dpassflow }}</el-button>
+        <el-button v-if="!isShowScheduling" type="jumpjlmap3d" @click="jumpjlmap3d">{{ jl3dname }}</el-button>
+        <el-button v-if="isShow3dmodel && !isShowScheduling" type="jumpjlmap3dmodel" @click="jumpjlmap3dmodel">{{ jl3dmodel }}</el-button>
         <template v-if="isShowQuest">
           <!-- && !isDesignPlatform  -->
           <el-button v-if="!isDesignPlatform " type="danger" @click="handleQuitQuest">{{ $t('display.demon.exitScript') }}</el-button>
diff --git a/src/views/newMap/displayNew/menuSchema.vue b/src/views/newMap/displayNew/menuSchema.vue
index db1df16b0..76372d2c5 100644
--- a/src/views/newMap/displayNew/menuSchema.vue
+++ b/src/views/newMap/displayNew/menuSchema.vue
@@ -10,13 +10,13 @@
       <el-button-group>
         <el-button v-if="isDemon && isDesignPlatform" size="small" :disabled="viewDisabled" type="success" @click="viewScriptRoles">{{ $t('display.schema.selectRoles') }}</el-button>
         <!-- 加载剧本 -->
-        <el-button v-if="isDemon && !isDesignPlatform" size="small" :disabled="viewDisabled" type="success" @click="viewRunQuest">{{ $t('display.schema.loadScript') }}</el-button>
+        <el-button v-if="isDemon && !isDesignPlatform && !isScheduling" size="small" :disabled="viewDisabled" type="success" @click="viewRunQuest">{{ $t('display.schema.loadScript') }}</el-button>
         <el-button v-if="notScript && runing" size="small" :disabled="viewDisabled" @click="viewRunPlan">{{ $t('display.schema.previewRunDiagram') }}</el-button>
         <el-button v-if="!runing && notScript" size="small" :disabled="viewDisabled" type="warning" @click="loadRunPlan">{{ $t('display.schema.loadRunDiagram') }}</el-button>
         <el-button v-if="mode==OperateMode.FAULT" size="small" type="danger" @click="setFault">{{ $t('display.schema.faultSetting') }}</el-button>
       </el-button-group>
 
-      <el-radio-group v-model="mode" size="small" @change="changeOperateMode(mode)">
+      <el-radio-group v-if="!isScheduling" v-model="mode" size="small" @change="changeOperateMode(mode)">
         <el-radio-button class="mode" :label="OperateMode.NORMAL">{{ $t('display.schema.normalOperation') }}</el-radio-button>
         <el-radio-button class="mode" :label="OperateMode.FAULT">{{ $t('display.schema.faultOperation') }}</el-radio-button>
       </el-radio-group>
@@ -104,6 +104,9 @@ export default {
         },
         isDesignPlatform() {
             return this.$route.fullPath.includes('design/display/demon');
+        },
+        isScheduling() {
+            return this.$route.query.prdType === '05';
         }
     },
     watch: {
diff --git a/src/views/newMap/jlmapNew/index.vue b/src/views/newMap/jlmapNew/index.vue
index 7085505d7..d15c1d25c 100644
--- a/src/views/newMap/jlmapNew/index.vue
+++ b/src/views/newMap/jlmapNew/index.vue
@@ -4,8 +4,8 @@
     <div :id="canvasId" style="background: #000;" class="display_canvas" />
     <progress-bar ref="progressBar" />
     <zoom-box v-if="!isScreen" :scale-rate="dataZoom.scaleRate" @setShrink="setShrink" @setMagnify="setMagnify" />
-    <show-mode v-if="isDesign" :local-station-show="localStationShow " @setShowMode="setShowMode" />
-    <switch-station v-show="isDesign && (showMode === '03') && localStationShow" ref="switchStation" :concentration-station-list="concentrationStationList" @setShowStation="setShowStation" />
+    <show-mode v-if="isDesign" :local-station-show="localStationShow" @setShowMode="setShowMode" />
+    <switch-station v-if="isDesign && (showMode === '03') && localStationShow" ref="switchStation" :concentration-station-list="concentrationStationList" @setShowStation="setShowStation" />
     <div v-if="show" class="zoom-view" :style="{ width: width +'px'}">
       <el-form :model="dataZoom" label-width="80px" size="mini" inline>
         <el-form-item :label="$t(`global.offset`)">
diff --git a/src/views/newMap/jlmapNew/pendant/showMode.vue b/src/views/newMap/jlmapNew/pendant/showMode.vue
index 344175d23..a4e0dc372 100644
--- a/src/views/newMap/jlmapNew/pendant/showMode.vue
+++ b/src/views/newMap/jlmapNew/pendant/showMode.vue
@@ -10,7 +10,7 @@ export default {
     name: 'ShowMode',
     props: {
         localStationShow: {
-            type: String,
+            type: Boolean,
             default() {
                 return false;
             }
diff --git a/src/views/newMap/jointTrainingNew/chatBox.vue b/src/views/newMap/jointTrainingNew/chatBox.vue
new file mode 100644
index 000000000..ea530e5fa
--- /dev/null
+++ b/src/views/newMap/jointTrainingNew/chatBox.vue
@@ -0,0 +1,419 @@
+<template>
+  <div class="chatBox">
+    <div v-show="!minimize" class="chat-box">
+      <div :class="showMembers?'memberAnimate chat-box-members':'chat-box-members'">
+        <div class="chat-member-title">成员列表</div>
+        <div class="chat-member-list">
+          <div v-for="member in memberList" :key="member.id" :class="member.online?'each-chat-member':'each-chat-member each-chat-member-outline'">{{ member.role+'-'+member.name }}</div>
+        </div>
+      </div>
+      <div class="chat-box-main">
+        <div class="chat-box-header">
+          <div class="chat-box-header-title">所有人</div>
+          <div class="minimality" @click="handleMinimality('min')">
+            <i class="el-icon-remove" />
+          </div>
+          <div class="showMembers" @click="handleMembers()">
+            <i class="el-icon-user-solid" />
+          </div>
+          <div class="chat-setting" @click="handleSetting()">
+            <i class="el-icon-s-tools" />
+          </div>
+        </div>
+        <div class="chat-box-content">
+          <div v-if="recordSending" class="chat_record_tip">
+            <div id="record_progress_bar" :style="'width:'+100/60*seconds+'%'" />
+            <div class="record_icon" />
+            <div class="record_tip_text">正在录音...</div>
+            <div class="record_tip_confirm" @click="stopRecording()">确定</div>
+            <div class="record_tip_cancle" @click="cancleRecording()">取消</div>
+          </div>
+        </div>
+        <div class="chat-box-footer">
+          <div class="chat-box-footer-tool" />
+          <div class="chat-box-footer-send" @click="startRecording()">发送语音</div>
+        </div>
+      </div>
+    </div>
+    <div v-show="minimize" class="reminder-drag minimize-box">
+      <div class="chat-title">聊天窗口</div>
+      <div class="minimality" @click="handleMinimality('max')">
+        <i class="el-icon-circle-plus" />
+      </div>
+    </div>
+    <chat-setting ref="chatSetting" />
+  </div>
+</template>
+<script>
+import ChatSetting from './chatSetting';
+import RecordRTC from 'recordrtc';
+import {getSimulationMembersNew, getSimulationConversationListNew, getSimulationConversationIdNew} from '@/api/chat';
+import ConstConfig from '@/scripts/ConstConfig';
+import Cookies from 'js-cookie';
+export default {
+    name: 'ChatBox',
+    components:{
+        ChatSetting
+    },
+    data() {
+        return {
+            minimize:false,
+            showMembers:false,
+            recordSending:false,
+            memberList:[],
+            seconds:0,
+            inter:null,
+            recorders: null,
+            microphone:null
+        };
+    },
+    mounted() {
+        this.initPage();
+    },
+    methods:{
+        initPage() {
+            // getSimulationConversationIdNew({ memberId:'' }, this.$route.query.group).then(response=>{
+            //     debugger;
+            // });
+            getSimulationConversationListNew(this.$route.query.group).then(resp=>{
+                debugger;
+            });
+        },
+        handleMinimality(data) {
+            if (data == 'min') {
+                this.minimize = true;
+            } else {
+                this.minimize = false;
+            }
+        },
+        // 语音录制开始
+        startRecording() {
+            const that = this;
+            if (!this.recordSending && !this.recorders && !this.microphone) {
+                navigator.getUserMedia(
+                    { audio: true } // 只启用音频
+                    , function (stream) {
+                        that.microphone = stream;
+                        that.recorders = new RecordRTC(that.microphone, {
+                            type: 'audio',
+                            checkForInactiveTracks: true
+                        });
+                        that.recorders.startRecording();
+                        that.recordSending = true;
+                        that.inter = setInterval(() => {
+                            if (that.seconds < 60) {
+                                that.seconds++;
+                            } else {
+                                clearInterval(that.inter);
+                            }
+                        }, 1000);
+                    }, function (error) {
+                        switch (error.code || error.name) {
+                        case 'PERMISSION_DENIED':
+                        case 'PermissionDeniedError':
+                            that.$message({
+                                showClose: true,
+                                message: '用户拒绝提供信息',
+                                type: 'error'
+                            });
+                            break;
+                        case 'NOT_SUPPORTED_ERROR':
+                        case 'NotSupportedError':
+                            that.$message({
+                                showClose: true,
+                                message: '浏览器不支持硬件设备',
+                                type: 'error'
+                            });
+                            break;
+                        case 'MANDATORY_UNSATISFIED_ERROR':
+                        case 'MandatoryUnsatisfiedError':
+                            that.$message({
+                                showClose: true,
+                                message: '无法发现指定的硬件设备',
+                                type: 'error'
+                            });
+                            break;
+                        default:
+                            that.$message({
+                                showClose: true,
+                                message: '无法打开麦克风',
+                                type: 'error'
+                            });
+                            break;
+                        }
+                    }
+                );
+            }
+        },
+        cancleRecording() {
+            if (this.microphone) {
+                clearInterval(this.inter);
+                this.seconds = 0;
+                this.microphone.stop();
+                this.microphone = null;
+                this.recordSending = false;
+                this.recorders = null;
+            }
+        },
+        // 停止录制
+        stopRecording() {
+            const that = this;
+            this.recorders.stopRecording(function(blobURL) {
+                const data = URL.createObjectURL(that.recorders.getBlob());
+                console.log('--------', data);
+                clearInterval(that.inter);
+                that.seconds = 0;
+                const blob = that.recorders.getBlob();
+                const fd = new FormData();
+                fd.append('file', blob);
+                // 调用接口（待添加）
+                if (that.microphone) {
+                    that.microphone.stop();
+                    that.microphone = null;
+                    that.recordSending = false;
+                    that.recorders = null;
+                }
+            });
+        },
+        handleSetting() {
+            this.$refs.chatSetting.doShow();
+        },
+        handleMembers() {
+            if (this.showMembers) {
+                this.showMembers = false;
+            } else {
+                this.showMembers = true;
+                getSimulationMembersNew(this.$route.query.group).then(resp => {
+                    // this.memberList = netdata.data;
+                    let lastData = JSON.stringify(resp.data);
+                    const roleTypeList = ConstConfig.ConstSelect.roleTypeNew;
+                    roleTypeList.forEach(function(element) {
+                        const rolename = element.value;
+                        if (Cookies.get('user_lang') == 'en') {
+                            lastData = lastData.replace(new RegExp(rolename, 'g'), element.enLabel);
+                        } else {
+                            lastData = lastData.replace(new RegExp(rolename, 'g'), element.label);
+                        }
+                    });
+                    lastData = JSON.parse(lastData);
+                    this.memberList = lastData;
+                });
+
+            }
+        }
+    }
+};
+</script>
+<style lang="scss" scoped>
+.chatBox{
+  width: 400px;
+  height: 400px;
+  position: absolute;
+  padding-left:5px;
+  left: 0;
+  bottom:28px;
+}
+.chat-box{
+  width: 100%;
+  height: 100%;
+}
+.chat-box-header{
+    width: 100%;
+    height: 40px;
+    border-bottom: 1px #dedede solid;
+}
+.chat-box-header-title{
+  font-size: 15px;
+  margin-left: 15px;
+  display: inline-block;
+  margin-top: 10px;
+}
+.chat-box-content{
+    width: 100%;
+    height: 300px;
+    border-bottom: 1px #dedede solid;
+    position: relative;
+}
+.chat-box-contentTip{
+
+}
+.chat-box-footer{
+
+}
+.chat-setting{
+    float: right;
+    line-height: 40px;
+    margin-right: 10px;
+    cursor: pointer;
+    font-size: 16px;
+}
+.chat-box-footer-tool{
+    width: 100%;
+    height: 30px;
+}
+.chat-box-footer-send{
+    background: #36a2fd;
+    width: 65px;
+    font-size: 12px;
+    padding: 5px 0px 4px 0px;
+    text-align: center;
+    border-radius: 3px;
+    color: #fff;
+    float: right;
+    margin-right: 10px;
+    margin-bottom: 10px;
+    cursor: pointer;
+}
+.minimality {
+    float: right;
+    line-height: 40px;
+    margin-right: 10px;
+    cursor: pointer;
+}
+.chat-box-main{
+    position: absolute;
+    width: 100%;
+    left: 0;
+    height: 100%;
+    top: 0;
+    border-right: 1px #dedede solid;
+    z-index: 4;
+    background: #fff;
+    border-radius: 5px;
+    left:5px;
+}
+.chat-member-list{
+    margin-top: 13px;
+    font-size: 12px;
+    margin-left: 2px;
+    height: 350px;
+    overflow-y: auto;
+}
+.each-chat-member{
+    margin-bottom: 10px;
+    width: 100%;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    cursor: pointer;
+}
+.each-chat-member-outline{
+    color: #ccc;
+}
+.chat-box-members{
+    position: absolute;
+    width: 140px;
+    right: 0;
+    height: 100%;
+    background: #fff;
+    border-right: 1px #dedede solid;
+    border-radius: 0px 5px 5px 0px;
+    z-index: 2;
+    transition: transform 1s;
+    padding: 12px 2px 10px 16px;
+    font-size: 14px;
+}
+.chat-member-title{
+}
+.showMembers{
+    float: right;
+    line-height: 40px;
+    margin-right: 10px;
+    cursor: pointer;
+    font-size: 17px;
+}
+.memberAnimate{
+  transform: translateX(97%);
+}
+#record_progress_bar{
+    height: 100%;
+    position: absolute;
+    background: #bbe5f5;
+}
+.chat_record_tip{
+    height: 28px;
+    display: inline-block;
+    background: #dfe6ee;
+    width: 100%;
+    font-size: 13px;
+    border-top: 1px #d8dce5 solid;
+    position: absolute;
+    bottom: 0;
+    right: 0;
+}
+.record_icon{
+    display: inline-block;
+    width: 8px;
+    height: 8px;
+    background: #25d825;
+    border-radius: 10px;
+    left: 7px;
+    margin-right: 0px;
+    box-shadow: -1px 0px 3px #6d6d6d;
+    border: 1px #28d228 solid;
+    position: absolute;
+    top: 10px;
+}
+.record_tip_text{
+    display: inline-block;
+    font-size: 12px;
+    margin-left: 3px;
+    // padding: 8px 0px 6px 0px;
+    position: absolute;
+    top: 8px;
+    left:20px
+}
+.record_tip_confirm{
+    position: absolute;
+    right: 63px;
+    padding: 3px 0px 2px 0px;
+    border: 1px #a2a5aa solid;
+    border-radius: 5px;
+    width: 45px;
+    text-align: center;
+    font-size: 12px;
+    top: 4px;
+    background: #eeeeee;
+    cursor: pointer;
+}
+.record_tip_cancle{
+    position: absolute;
+    right: 10px;
+    padding: 3px 0px 2px 0px;
+    border: 1px #a2a5aa solid;
+    border-radius: 5px;
+    width: 45px;
+    text-align: center;
+    font-size: 12px;
+    top: 4px;
+    background: #eeeeee;
+    cursor: pointer;
+}
+
+.minimize-box {
+    width: 97.5%;
+    height: 40px;
+    position: absolute;
+    left: 5px;
+    bottom: 0;
+    z-index: 222;
+    background: #fff;
+    border-radius: 5px;
+
+    .chat-title {
+        float: left;
+        font-size: 15px;
+        margin-left: 10px;
+        line-height: 40px;
+    }
+
+    .minimality {
+        float: right;
+        height: 40px;
+        line-height: 40px;
+        margin-right: 10px;
+        cursor: pointer;
+    }
+}
+
+</style>
diff --git a/src/views/newMap/jointTrainingNew/chatSetting.vue b/src/views/newMap/jointTrainingNew/chatSetting.vue
new file mode 100644
index 000000000..90ac70cd6
--- /dev/null
+++ b/src/views/newMap/jointTrainingNew/chatSetting.vue
@@ -0,0 +1,121 @@
+<template>
+  <div v-show="dialogVisible" class="chat-popup">
+    <div class="chat-setting-header">
+      <div class="chat-setting-title">设置</div>
+      <div class="chat-setting-close">
+        <i class="el-icon-close" @click="dialogVisible=false" />
+      </div>
+    </div>
+    <div class="chat-setting-content">
+      <div class="chat-setting-language">
+        <div class="setting-language-title">语言: </div>
+        <el-switch
+          v-model="form.language"
+          class="setting-language-select"
+          active-color="#409EFF"
+          inactive-color="#ff4949"
+          active-text="中"
+          inactive-text="En"
+          active-value="zh"
+          inactive-value="en"
+          @change="changeLanguage()"
+        />
+      </div>
+      <div class="chat-setting-sex">
+        <div class="setting-sex-title">性别: </div>
+        <el-switch
+          v-model="form.sex"
+          class="setting-sex-select"
+          active-color="#409EFF"
+          inactive-color="#ff4949"
+          active-icon-class="el-icon-male"
+          inactive-icon-class="el-icon-female"
+          active-value="man"
+          inactive-value="woman"
+          @change="changeSex()"
+        />
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+    name: 'ChatSetting',
+    data() {
+        return {
+            dialogVisible: false,
+            loading:false,
+            form:{
+                language:'zh',
+                sex:'man'
+            }
+        };
+    },
+    methods:{
+        doShow() {
+            this.dialogVisible = true;
+        },
+        changeLanguage() {
+
+        },
+        changeSex() {
+
+        }
+    }
+};
+</script>
+<style lang="scss" scoped>
+.chat-popup{
+    position: absolute;
+    width: 54%;
+    height: 143px;
+    border: 1px #dedede solid;
+    left: 23%;
+    top: 24%;
+    z-index: 7;
+    border-radius: 4px;
+    -webkit-box-shadow: 3px 3px 3px #dedede;
+    box-shadow: 3px 3px 3px #dedede;
+    background: #fff;
+}
+.chat-setting-header{
+    padding-left: 10px;
+    padding-top: 6px;
+    font-size: 14px;
+    border-bottom: 1px #dedede solid;
+    padding-bottom: 6px;
+}
+.chat-setting-title{
+    display: inline-block;
+}
+.chat-setting-close{
+    float: right;
+    display: inline-block;
+    margin-right: 5px;
+    font-size: 16px;
+    cursor: pointer;
+}
+.chat-setting-content{
+
+}
+.chat-setting-language,.chat-setting-sex{
+    display: inline-block;
+    margin-top: 20px;
+}
+.setting-language-title,.setting-sex-title{
+    display: inline-block;
+    font-size: 14px;
+    margin-left: 20px;
+    vertical-align: top;
+    margin-top: 3px;
+}
+.setting-language-select,.setting-sex-select{
+    display: inline-block;
+    vertical-align: top;
+}
+</style>
+<style lang="scss">
+.setting-sex-select .el-icon-male,.setting-sex-select .el-icon-female{
+    font-size:18px !important;
+}
+</style>
diff --git a/src/views/newMap/jointTrainingNew/index.vue b/src/views/newMap/jointTrainingNew/index.vue
index ff903836b..63092118f 100644
--- a/src/views/newMap/jointTrainingNew/index.vue
+++ b/src/views/newMap/jointTrainingNew/index.vue
@@ -85,7 +85,7 @@ export default {
             panelShow: true,
             ibpPart: '',
             showStation: '',
-            stationList: '',
+            stationList: [],
             showSelectStation: false,
             mapViewLoadedOver: false
         };
diff --git a/src/views/newMap/jointTrainingNew/menuDemon.vue b/src/views/newMap/jointTrainingNew/menuDemon.vue
index 0ea4a114c..1c21f0724 100644
--- a/src/views/newMap/jointTrainingNew/menuDemon.vue
+++ b/src/views/newMap/jointTrainingNew/menuDemon.vue
@@ -1,5 +1,63 @@
 <template>
   <div>
+    <chat-box />
+    <!-- <div v-show="!minimize" class="reminder-drag">
+        <div v-if="userRole != '05' && userRole != ''">
+          <div class="tabs-roles">
+            <div
+              class="roles roles-first"
+              :class="activeName == 'first' ? 'roles-active':''"
+              @click="clickRoles('first')"
+            >角色
+            </div>
+            <div
+              class="roles"
+              :class="activeName == 'second' ? 'roles-active':''"
+              @click="clickRoles('second')"
+            >所有人
+            </div>
+            <div class="minimality" @click="handleMinimality('min')">
+              <i class="el-icon-remove" />
+            </div>
+          </div>
+          <div class="tabs-content">
+            <div v-show="activeName == 'first'">
+              <chart-view
+                ref="chatView"
+                :group="group"
+                :station-list="stationLists"
+                @showChatSpeak="showChatSpeak"
+                @showChat="showChat"
+                @showChatNone="showChatNone"
+              />
+            </div>
+            <div style="flex-grow: 1">
+              <chart-window
+                ref="chat"
+                :group="group"
+                :chat-show="chatShow"
+                :speaking="isSpeaking"
+                :is-show-auto="isShowAuto"
+                @handleChatShow="handleChatShow"
+                @handleChatList="handleChatList"
+              />
+            </div>
+          </div>
+        </div>
+        <div v-else>
+          <el-tabs v-model="activeName2" type="card">
+            <el-tab-pane label="所有人" name="second">
+              <chart-window :speaking="isSpeaking" :group="group" :is-show-auto="true" />
+            </el-tab-pane>
+          </el-tabs>
+        </div>
+      </div> -->
+    <!-- <div v-show="minimize" class="reminder-drag minimize-box">
+        <div class="chat-title">聊天窗口</div>
+        <div class="minimality" @click="handleMinimality('max')">
+          <i class="el-icon-circle-plus" />
+        </div>
+      </div> -->
     <div class="display-draft" :class="{'display-type-hb': $route.query.lineCode == '07' && $store.state.training.prdType=='01'}">
       <el-button-group>
         <el-button v-if="isProject" type="primary" @click="setRelDevice">{{ $t('joinTraining.connectRealDevices') }}</el-button>
@@ -8,7 +66,7 @@
           <el-button type="success" :disabled="isDisable" @click="selectBeginTime">{{ $t('joinTraining.drivingByPlan') }}</el-button>
           <el-button type="danger" :disabled="!isDisable" @click="end">{{ $t('joinTraining.exitPlan') }}</el-button>
         </template>
-        <el-button type="primary" @click="back">{{ $t('global.back') }}</el-button>
+        <el-button type="primary" :loading="backLoading" @click="back">{{ $t('global.back') }}</el-button>
       </el-button-group>
     </div>
     <qr-code ref="qrCode" />
@@ -19,6 +77,9 @@
 
 <script>
 import QrCode from '@/components/QrCode';
+// import ChartWindow from './chatWindow';
+// import ChartView from './chartView';
+import ChatBox from './chatBox';
 import SetTime from '@/views/newMap/displayNew/demon/setTime';
 import { ranAsPlan, exitRunPlan } from '@/api/simulation';
 import { exitFullscreen } from '@/utils/screen';
@@ -30,6 +91,9 @@ import RealDevice from './menuDraft/realDevice';
 export default {
     name: 'MenuDemonJoint',
     components: {
+        // ChartView,
+        // ChartWindow,
+        ChatBox,
         QrCode,
         SetTime,
         RealDevice
@@ -53,6 +117,7 @@ export default {
     data() {
         return {
             isDisable: false,
+            backLoading:false,
             timeNow: 0,
             remainingTime: 0,
             recordStep: 'BGSetting',
@@ -69,7 +134,7 @@ export default {
             activeName2: 'second',
             stationList: [],
             stationLists: [],
-            minimize: false
+            minimize: true
         };
     },
     computed: {
@@ -115,6 +180,7 @@ export default {
     },
     async mounted() {
         this.userId = this.$store.state.user.id;
+        this.backLoading = false;
         await this.initLoadPage();
     },
     beforeDestroy() {
@@ -151,35 +217,29 @@ export default {
             }
             this.activeName = active;
         },
-        handleMinimality(data) {
-            if (data == 'min') {
-                this.minimize = true;
-            } else {
-                this.minimize = false;
-            }
-        },
-        handleChatShow(data) {
-            if (!this.minimize) { // 最大化状态
-                if (this.activeName == 'first') {
-                    this.$refs.chatView.select(data.id);
-                    this.chatShow = false;
-                    this.isShowAuto = false;
-                    this.$refs.chat.handleTextList(data.conversationId);
-                } else {
-                    this.activeName = 'first';
-                    this.handleChatShow(data);
-                }
-            } else { // 最小化状态
-                this.minimize = false;
-                this.handleChatShow(data);
-            }
-        },
+
+        // handleChatShow(data) {
+        //     if (!this.minimize) { // 最大化状态
+        //         if (this.activeName == 'first') {
+        //             this.$refs.chatView.select(data.id);
+        //             this.chatShow = false;
+        //             this.isShowAuto = false;
+        //             this.$refs.chat.handleTextList(data.conversationId);
+        //         } else {
+        //             this.activeName = 'first';
+        //             this.handleChatShow(data);
+        //         }
+        //     } else { // 最小化状态
+        //         this.minimize = false;
+        //         this.handleChatShow(data);
+        //     }
+        // },
         // 切到未读消息并说话
-        showChatSpeak(data) {
-            this.chatShow = false;
-            this.isShowAuto = false;
-            this.$refs.chat.handleTextList(data.conversationId);
-        },
+        // showChatSpeak(data) {
+        //     this.chatShow = false;
+        //     this.isShowAuto = false;
+        //     this.$refs.chat.handleTextList(data.conversationId);
+        // },
         // 获取历史纪录list
         showChat(obj) {
             this.chatShow = false;
@@ -327,9 +387,11 @@ export default {
         },
         back() {
             this.$store.dispatch('training/over').then(() => {
+                this.backLoading = true;
                 putJointTrainingSimulationUserNew(this.group).then(() => {
                     this.$router.replace({ path: `/trainroom`, query: { lineCode: this.lineCode, group: this.group, drawWay: true } });
                     exitFullscreen();
+                    this.backLoading = false;
                 });
             });
         },
@@ -374,12 +436,6 @@ export default {
             color: #409EFF;
         }
 
-        .minimality {
-            float: right;
-            line-height: 40px;
-            margin-right: 10px;
-            cursor: pointer;
-        }
     }
 
     .tabs-content {
@@ -431,27 +487,6 @@ export default {
         }
     }
 
-    .minimize-box {
-        bottom: 10px;
-        width: 300px;
-        height: 40px;
-
-        .chat-title {
-            float: left;
-            font-size: 16px;
-            margin-left: 10px;
-            line-height: 40px;
-        }
-
-        .minimality {
-            float: right;
-            height: 40px;
-            line-height: 40px;
-            margin-right: 10px;
-            cursor: pointer;
-        }
-    }
-
     .display-draft {
         position: absolute;
         float: right;
diff --git a/src/views/newMap/jointTrainingNew/menuSchema.vue b/src/views/newMap/jointTrainingNew/menuSchema.vue
index 7ea9dbe47..7f1316488 100644
--- a/src/views/newMap/jointTrainingNew/menuSchema.vue
+++ b/src/views/newMap/jointTrainingNew/menuSchema.vue
@@ -66,7 +66,7 @@ export default {
             }
         },
         stationList: {
-            type: Object,
+            type: Array,
             default() {
                 return [];
             }
diff --git a/src/views/newMap/newDesignUser/mapmanage/operateMenu.vue b/src/views/newMap/newDesignUser/mapmanage/operateMenu.vue
index 82b4287bb..4b3bb98ef 100644
--- a/src/views/newMap/newDesignUser/mapmanage/operateMenu.vue
+++ b/src/views/newMap/newDesignUser/mapmanage/operateMenu.vue
@@ -229,7 +229,7 @@ export default {
         deleteObj() {
             this.doClose();
             const _that = this;
-            this.$confirm(this.$t('tip.confirmDeletion'), this.$t('tip.hint'), {
+            this.$confirm('是否确认删除 “' + this.editModel.name + '" ' + ' ？', this.$t('tip.hint'), {
                 confirmButtonText: this.$t('map.confirm'),
                 cancelButtonText: this.$t('map.cancel'),
                 type: 'warning'
diff --git a/src/views/newMap/newMapdraft/dataRelation/dwellTimeOperate/detail.vue b/src/views/newMap/newMapdraft/dataRelation/dwellTimeOperate/detail.vue
new file mode 100644
index 000000000..75e1092b2
--- /dev/null
+++ b/src/views/newMap/newMapdraft/dataRelation/dwellTimeOperate/detail.vue
@@ -0,0 +1,201 @@
+<template>
+  <el-dialog v-dialogDrag class="autoSignal" :title="$t('map.automaticSignalList')" :visible.sync="show" width="85%" :before-do-close="doClose">
+    <div>
+      <QueryListPage
+        ref="queryListPage"
+        :pager-config="pagerConfig"
+        :query-form="queryForm"
+        :query-list="queryList"
+      />
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+import { listMap } from '@/api/jmap/mapdraft';
+import { getStationParkTimeList, deleteStationParkTime, getStationParkTime } from '@/api/jmap/mapdraft';
+
+export default {
+    name: 'RouteDetail',
+    props: {
+        mapInfo: {
+            type: Object,
+            default() {
+                return null;
+            }
+        }
+    },
+    data() {
+        return {
+            show: false,
+            mapList: [],
+            pagerConfig: {
+                pageSize: 'pageSize',
+                pageIndex: 'pageNum'
+            },
+            queryForm: {
+                labelWidth: '120px',
+                queryObject: {
+                    code: {
+                        type: 'text',
+                        label: this.$t('map.autoSignalCode'),
+                        config: {
+                            data: []
+                        }
+                    },
+                    signalCode: {
+                        type: 'select',
+                        label: this.$t('map.signal'),
+                        config: {
+                            data: []
+                        }
+                    }
+                }
+            },
+            queryList: {
+                query: this.queryFunction,
+                afterQuery: this.afterQuery,
+                selectCheckShow: false,
+                indexShow: true,
+                columns: [
+                    {
+                        title: '停站车站',
+                        prop: 'stationCode',
+                        type: 'tag',
+                        columnValue: (row) => { return this.formatName(row.stationCode); },
+                        tagType: (row) => { return ''; }
+                    },
+                    {
+                        title: '停站时间',
+                        prop: 'parkingTimeVOList',
+                        type: 'tagMore',
+                        columnValue: (row) => { return this.handelParkingTime(row.parkingTimeVOList); },
+                        tagType: (row) => { return ''; }
+                    },
+                    {
+                        type: 'button',
+                        title: this.$t('map.operation'),
+                        width: '200',
+                        buttons: [
+                            {
+                                name: this.$t('map.compile'),
+                                handleClick: this.editObj
+                            },
+                            {
+                                name: this.$t('map.deleteObj'),
+                                handleClick: this.deleteObj,
+                                type: 'danger'
+                            }
+                        ]
+                    }
+                ]
+            }
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'sectionList',
+            'signalList',
+            'stationStandList'
+        ])
+    },
+    watch: {
+        signalList: function (val, old) {
+            const list = [];
+            if (val && val.length) {
+                for (let i = 0; i < val.length; i++) {
+                    list.push({ label: val[i].uniqueName, value: val[i].code });
+                }
+                this.queryForm.queryObject.signalCode.config.data = list;
+            }
+        }
+    },
+    mounted() {
+        this.acquireMapList();
+    },
+    methods: {
+        doShow() {
+            this.show = true;
+            this.reloadTable();
+        },
+        handelParkingTime(parkingTimeVOList) {
+            const nameList = [];
+            parkingTimeVOList.forEach(item => {
+                nameList.push(`${this.formatName(item.sectionCode)}(${item.parkingTime}s)`);
+            });
+            return nameList;
+        },
+        doClose() {
+            this.show = false;
+        },
+        formatName(code) {
+            let name = '';
+            const device = this.$store.getters['map/getDeviceByCode'](code);
+            if (device) {
+                name = device.uniqueName || device.name;
+            }
+            console.log(code, name, device);
+            return name;
+        },
+        queryFunction(params) {
+            if (this.mapInfo && this.mapInfo.id) {
+                return getStationParkTimeList(this.mapInfo.id, params);
+            }
+        },
+        acquireMapList() {
+            // 地图名称列表
+            listMap({ drawWay:true}).then(response => {
+                this.mapList = response.data;
+            });
+        },
+        afterQuery(data) {
+            if (data && data.list) {
+                const that = this;
+                const list = data.list;
+                if (list) {
+                    list.map(elem => {
+                        that.$convertSpecifiedField(elem, that.mapList, 'id', 'name', ['mapId']);
+                        elem.code = elem.signalCode;
+                        elem.signalCode = that.formatName(elem.signalCode);
+                    });
+                }
+            }
+            return data;
+        },
+        editObj(index, row) {
+            getStationParkTime(row.id).then(response => {
+                const data = response.data;
+                this.$emit('autoMaticoSelected', data);
+                this.doClose();
+            });
+        },
+        deleteObj(index, row) {
+            if (this.mapInfo && this.mapInfo.id && row) {
+                // 删除
+                deleteStationParkTime(row.id).then(response => {
+                    this.$message.success(this.$t('map.successfullyDelete'));
+                    this.reloadTable();
+                }).catch(() => {
+                    this.$messageBox(this.$t('map.failDelete'));
+                });
+            }
+        },
+        reloadTable() {
+            if (this.queryList && this.queryList.reload) {
+                this.queryList.reload();
+            }
+        }
+    }
+};
+</script>
+<style lang="scss">
+    .autoSignal .el-dialog__body {
+        padding: 0px 20px 10px 20px;
+        color: #606266;
+        font-size: 14px;
+    }
+    .autoSignal .el-dialog{
+        margin-top: 5vh !important;
+    }
+</style>
diff --git a/src/views/newMap/newMapdraft/dataRelation/dwellTimeOperate/dwellTime.vue b/src/views/newMap/newMapdraft/dataRelation/dwellTimeOperate/dwellTime.vue
new file mode 100644
index 000000000..59d643ec4
--- /dev/null
+++ b/src/views/newMap/newMapdraft/dataRelation/dwellTimeOperate/dwellTime.vue
@@ -0,0 +1,265 @@
+<template>
+  <div style="height: 100%;">
+    <el-scrollbar wrap-class="scrollbar-wrapper">
+      <el-form ref="form" :model="addModel" :rules="rules" label-width="80px" size="mini">
+        <div class="definition">
+          <el-form-item label="停站车站" prop="stationCode">
+            <el-select v-model="addModel.stationCode" clearable :filterable="true">
+              <el-option
+                v-for="item in stationList"
+                :key="item.code"
+                :label="item.name"
+                :value="item.code"
+              />
+            </el-select>
+            <el-button
+              :type=" field === 'parkStationCode' ? 'danger' : 'primary'"
+              @click="hover('parkStationCode')"
+            >{{ $t('map.activate') }}</el-button>
+          </el-form-item>
+          <el-form-item label="停站时间:" prop="parkingTimeVOList">
+            <div style="margin-left: 10px; margin-top: 15px;">
+              <span style="text-align:right;vertical-align:middle;font-size:14px;color:#606266;font-weight: 700;">停站区段:</span>
+              <el-select v-model="sectionCode" clearable :filterable="true" :placeholder="$t('map.pleaseSelect')">
+                <el-option
+                  v-for="item in filterSectionList"
+                  :key="item.code"
+                  :label="`${item.name}(${item.code})`"
+                  :value="item.code"
+                />
+              </el-select>
+              <el-button
+                :type=" field === 'parkSection' ? 'danger' : 'primary'"
+                @click="hover('parkSection')"
+              >{{ $t('map.activate') }}</el-button>
+            </div>
+            <div style="margin-left: 10px; margin-top: 15px; margin-bottom: 15px;">
+              <span style="text-align:right;vertical-align:middle;font-size:14px;color:#606266;font-weight: 700;">停站时间:</span>
+              <el-input-number v-model="parkingTime" controls-position="right" :min="0" /><span>(s)</span>
+              <el-button
+                type="primary"
+                style="position: absolute; right: 10px;"
+                @click="pushSection(addModel.parkingTimeVOList, {sectionCode: sectionCode, parkingTime:parkingTime})"
+              >
+                {{ $t('map.add') }}
+              </el-button>
+            </div>
+            <el-table :data="addModel.parkingTimeVOList" border style="width: 97%">
+              <el-table-column prop="sectionCode" label="停车区段">
+                <template slot-scope="scope">
+                  <span>{{ formatName(scope.row.sectionCode) }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column prop="parkingTime" label="停车时间">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.parkingTime }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column fixed="right" :label="$t('map.operation')" width="50">
+                <template slot-scope="scope">
+                  <el-button
+                    type="text"
+                    size="small"
+                    @click.native.prevent="deleteSection(addModel.routingSectionList, scope.$index)"
+                  >
+                    {{ $t('map.remove') }}
+                  </el-button>
+                </template>
+              </el-table-column>
+            </el-table>
+          </el-form-item>
+          <el-form-item>
+            <el-button-group>
+              <el-button v-if="isSave" type="primary" size="small" :loading="loading" @click="save">{{ $t('map.save') }}
+              </el-button>
+              <el-button v-else type="warning" size="small" :loading="loading" @click="update">{{ $t('map.updata') }}
+              </el-button>
+            </el-button-group>
+          </el-form-item>
+        </div>
+      </el-form>
+    </el-scrollbar>
+  </div>
+</template>
+<script>
+import { mapGetters } from 'vuex';
+import { setUID } from '@/jmapNew/utils/Uid';
+import { createStationParkTime, updateStationParkTime } from '@/api/jmap/mapdraft';
+import { ViewMode } from '@/scripts/ConstDic';
+import { formatName } from '@/utils/runPlan';
+
+export default {
+    name: 'RouteOperation',
+    props: {
+        selected: {
+            type: Object,
+            default() {
+                return null;
+            }
+        },
+        mapInfo: {
+            type: Object,
+            default() {
+                return null;
+            }
+        },
+        routeData: {
+            type: Object,
+            default() {
+                return null;
+            }
+        }
+    },
+    data() {
+        return {
+            ViewMode: ViewMode,
+            field: '',
+            isSave: true,
+            loading: false,
+            sectionCode: '',
+            parkingTime: 0,
+            addModel: {
+                id: '',
+                code: '',
+                mapId: '',
+                stationCode: '',
+                parkingTimeVOList: []
+            },
+            editShow: false,
+            rules: {
+                signalCode: [
+                    { required: true, message: this.$t('map.pleaseSelectSignal'), trigger: 'change' }
+                ]
+                // sectionList: [
+                //     { required: true, message: this.$t('map.triggerSegmentData'), trigger: 'change' }
+                // ]
+            }
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'sectionList',
+            'stationList'
+        ]),
+        filterSectionList() {
+            if (this.sectionList) {
+                return this.sectionList.filter(elem => { return elem.standTrack || elem.reentryTrack || elem.transferTrack; });
+            } else {
+                return [];
+            }
+        }
+    },
+    watch: {
+        mapInfo(val) {
+            if (val) {
+                this.addModel.mapId = val.id;
+            }
+        },
+        routeData(val, old) {
+            if (val) {
+                this.addModel = val;
+                if (val.parkingTimeVOList.length) {
+                    this.sectionCode = val.parkingTimeVOList[0].sectionCode;
+                    this.parkingTime = val.parkingTimeVOList[0].parkingTime;
+                }
+                this.editShow = true;
+            }
+        }
+    },
+    mounted() {
+    },
+    methods: {
+        hover(field) {
+            this.field = field === this.field ? '' : field;
+        },
+        formatName(code) {
+            return formatName(code);
+        },
+        pushSection(list, data) {
+            list.push(data);
+        },
+        setSelected(selected) {
+            if (selected) {
+                if (selected._type.toUpperCase() === 'Station'.toUpperCase() && this.field.toUpperCase() === 'parkStationCode'.toUpperCase()) {
+                    this.addModel.stationCode = selected.code;
+                } else if (selected._type.toUpperCase() === 'Section'.toUpperCase() && this.field.toUpperCase() === 'parkSection'.toUpperCase()) {
+                    if (selected.standTrack || selected.reentryTrack || selected.transferTrack) {
+                        this.sectionCode = selected.code;
+                    } else {
+                        this.$message.error('请选择可以停车的区段！');
+                    }
+                }
+            }
+        },
+        buildModel(code) {
+            const model = Object.assign({}, this.addModel);
+            if (code) { model['code'] = code; }
+            model['mapId'] = this.mapInfo.id;
+            model['id'] = this.addModel.id;
+            return model;
+        },
+        save() {
+            this.$refs.form.validate((valid) => {
+                if (valid) {
+                    this.loading = true;
+                    createStationParkTime(this.buildModel(setUID('dwellTime'))).then(resp => {
+                        this.$message.success(this.$t('tip.dwellTimeSuccessful'));
+                        this.loading = false;
+                        this.clear();
+                    }).catch(() => {
+                        this.$messageBox(this.$t('tip.dwellTimeFailed'));
+                        this.loading = false;
+                    });
+                }
+            });
+        },
+        update() {
+            this.$refs.form.validate((valid) => {
+                if (valid) {
+                    this.loading = true;
+                    updateStationParkTime(this.buildModel()).then(resp => {
+                        this.$message.success(this.$t('tip.updateDwellTimeSuccessful'));
+                        this.loading = false;
+                        this.clear();
+                    }).catch(() => {
+                        this.$messageBox(this.$t('tip.updateDwellTimeFailed'));
+                        this.loading = false;
+                    });
+                }
+            });
+        },
+        clear() {
+            if (this.$refs && this.$refs.form && this.mapInfo) {
+                delete this.addModel.id;
+                this.$refs.form.resetFields();
+                this.addModel.mapId = this.mapInfo.id;
+                this.addModel.stationCode = '';
+                this.addModel.parkingTimeVOList = [];
+                this.sectionCode = '';
+                this.parkingTime = 0;
+                this.addModel.code = '';
+                this.isSave = true;
+            }
+        }
+    }
+};
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+	/deep/ .el-radio {
+		margin-right: 10px;
+	}
+    /deep/ {
+        .el-select .el-tag {
+            height: auto;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            padding-right: 15px;
+            box-sizing: border-box;
+            white-space: normal;
+        }
+        .el-input__suffix{
+            right: 2px;
+        }
+    }
+</style>
diff --git a/src/views/newMap/newMapdraft/dataRelation/dwellTimeOperate/index.vue b/src/views/newMap/newMapdraft/dataRelation/dwellTimeOperate/index.vue
new file mode 100644
index 000000000..f83cbd2e2
--- /dev/null
+++ b/src/views/newMap/newMapdraft/dataRelation/dwellTimeOperate/index.vue
@@ -0,0 +1,87 @@
+<template>
+  <div style="height: 100%;">
+    <dwell-time-draft
+      ref="routeEdit"
+      :selected="selected"
+      :map-info="mapInfo"
+      :route-data="routeData"
+    />
+    <dwell-time-detail ref="routeDetail" :map-info="mapInfo" @autoMaticoSelected="autoMaticoSelected" />
+  </div>
+</template>
+<script>
+import DwellTimeDraft from './dwellTime';
+import DwellTimeDetail from './detail';
+
+export default {
+    name: 'DwellTimeOperate',
+    components: {
+        DwellTimeDraft,
+        DwellTimeDetail
+    },
+    props: {
+        mapInfo: {
+            type: Object,
+            default() {
+                return null;
+            }
+        },
+        selected: {
+            type: Object,
+            default() {
+                return null;
+            }
+        }
+    },
+    data() {
+        return {
+            enabledTab: 'Route',
+            routeData: null
+        };
+    },
+    methods: {
+        clickEvent(e, model) {
+            this.onSelect(model);
+        },
+        onSelect(model) {
+            if (model) {
+                this.selected = model;
+            } else {
+                this.selected = null;
+            }
+        },
+        setDelayUnlockStatus(data, status) {
+            if (data && data.delayShowList) {
+                data.delayShowList.forEach(elem => {
+                    elem.status = status;
+                });
+            }
+        },
+        autoMaticoSelected: function (data) {
+            this.routeData = data;
+            if (this.$refs && this.$refs.routeEdit) {
+                this.$refs.routeEdit.isSave = false;
+            }
+        },
+        previewRouteEvent: function () {
+            if (this.$refs && this.$refs.routeDetail) {
+                this.$refs.routeDetail.doShow();
+            }
+        },
+        deleteSection(list, index) {
+            list.splice(index, 1);
+        },
+        createRouteEvent: function () {
+            if (this.$refs && this.$refs.routeEdit) {
+                this.$refs.routeEdit.clear();
+            }
+        },
+        setSelected(selected) {
+            this.$refs.routeEdit.setSelected(selected);
+        },
+        setCenter(code) {
+            this.$emit('setCenter', code);
+        }
+    }
+};
+</script>
diff --git a/src/views/newMap/newMapdraft/dataRelation/flankProtectOperate/route.vue b/src/views/newMap/newMapdraft/dataRelation/flankProtectOperate/route.vue
index 195e931cb..cd0e98369 100644
--- a/src/views/newMap/newMapdraft/dataRelation/flankProtectOperate/route.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/flankProtectOperate/route.vue
@@ -172,7 +172,6 @@
 import { mapGetters } from 'vuex';
 import { setUID } from '@/jmapNew/utils/Uid';
 import { getFlankProtectionList, postFlankProtection, putFlankProtection } from '@/api/jmap/mapdraft';
-import { copyClone } from '@/utils/index';
 
 export default {
     name: 'RouteOperation',
@@ -269,8 +268,8 @@ export default {
         },
         routeData(val, old) {
             if (val) {
-                this.addModel = copyClone(this.addModel, val);
-                console.log(this.addModel, 'addModel');
+                // console.log(this, this.$copyClone);
+                this.addModel = this.$copyClone(this.addModel, val);
                 this.editShow = true;
             }
         }
diff --git a/src/views/newMap/newMapdraft/dataRelation/index.vue b/src/views/newMap/newMapdraft/dataRelation/index.vue
index 5eb8a5a9a..1c579bfc0 100644
--- a/src/views/newMap/newMapdraft/dataRelation/index.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/index.vue
@@ -69,6 +69,14 @@
               @setCenter="setCenter"
             />
           </el-tab-pane>
+          <el-tab-pane label="停站时间" class="tab_pane_box" name="dwellTime">
+            <dwell-time-operate
+              ref="dwellTimeOperate"
+              :map-info="mapInfo"
+              :selected="selected"
+              @setCenter="setCenter"
+            />
+          </el-tab-pane>
         </el-tabs>
       </div>
     </div>
@@ -84,6 +92,7 @@ import RunLevelOperate from './runLeveloperate/index';
 import SignalOperate from './signaloperate/index';
 import TurnedOperate from './turnedoperate/index';
 import FlankProtectOperate from './flankProtectOperate/index';
+import DwellTimeOperate from './dwellTimeOperate/index';
 
 export default {
     name: 'DataRelation',
@@ -95,7 +104,8 @@ export default {
         FlankProtectOperate,
         // PathOperate,
         SignalOperate,
-        TurnedOperate
+        TurnedOperate,
+        DwellTimeOperate
     },
     props: {
         selected: {
@@ -120,7 +130,8 @@ export default {
                 signal: 'signalOperate',
                 runLevel: 'runLevelOperate',
                 turned: 'turnedOperate',
-                flankProtect: 'flankProtectOperate'
+                flankProtect: 'flankProtectOperate',
+                dwellTime: 'dwellTimeOperate'
             }
         };
     },
@@ -131,7 +142,7 @@ export default {
             this.$emit('showMap');
         },
         initLoad() {
-            if (this.enabledTab === 'route') {
+            if (this.enabledTab === 'route' || this.enabledTab == 'runLevel') {
                 this.$refs[this.enabledTabMenu[this.enabledTab]].initLoad();
             }
         },
@@ -153,13 +164,14 @@ export default {
         drawMap() {
             this.$refs.routeOperate.batchSectionListFocus(false);
             this.$refs.signalOperate.batchSectionListFocus(false);
+            this.$refs.runLevelOperate.batchSectionListFocus(false);
             this.$emit('selectView', 'draft');
         },
         tabBeforeLeave(activeName, oldActiveName) {
-            if (activeName === 'route' || activeName === 'signal') {
+            if (activeName === 'route' || activeName === 'signal' || activeName == 'runLevel') {
                 this.$refs[this.enabledTabMenu[activeName]].batchSectionListFocus(true);
             }
-            if (oldActiveName === 'route' || oldActiveName === 'signal') {
+            if (oldActiveName === 'route' || oldActiveName === 'signal' || activeName == 'runLevel') {
                 this.$refs[this.enabledTabMenu[oldActiveName]].batchSectionListFocus(false);
             }
         }
diff --git a/src/views/newMap/newMapdraft/dataRelation/routeoperate/hostileData.vue b/src/views/newMap/newMapdraft/dataRelation/routeoperate/hostileData.vue
index 50b0be100..e7a809045 100644
--- a/src/views/newMap/newMapdraft/dataRelation/routeoperate/hostileData.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/routeoperate/hostileData.vue
@@ -122,7 +122,7 @@ export default {
             }
         },
         conflictingSignalList: {
-            type: Object,
+            type: Array,
             default() {
                 return [];
             }
diff --git a/src/views/newMap/newMapdraft/dataRelation/routeoperate/protect.vue b/src/views/newMap/newMapdraft/dataRelation/routeoperate/protect.vue
index 1668fdf17..22ec3260a 100644
--- a/src/views/newMap/newMapdraft/dataRelation/routeoperate/protect.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/routeoperate/protect.vue
@@ -1,6 +1,6 @@
 <template>
   <div style="height: 100%; border: 1px solid #EBEEF5; position: relative; left: 8%; width: 88%">
-    <el-form ref="form" :model="addModel" :rules="rules" label-width="150px" size="mini" style="margin-top: 10px">
+    <el-form ref="form" :model="addModel" label-width="150px" size="mini" style="margin-top: 10px">
       <div class="definition">
         <el-form-item label="延续保护解锁区段:" prop="unlockSectionCode">
           <el-select v-model="addModel.unlockSectionCode" clearable :disabled="true">
diff --git a/src/views/newMap/newMapdraft/dataRelation/routeoperate/route.vue b/src/views/newMap/newMapdraft/dataRelation/routeoperate/route.vue
index 6b63c56a9..9ec827105 100644
--- a/src/views/newMap/newMapdraft/dataRelation/routeoperate/route.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/routeoperate/route.vue
@@ -67,7 +67,7 @@
           </el-radio-group>
         </el-form-item>
         <el-form-item :label="$t('map.physicalSection') +':'" prop="routeSectionList">
-          <el-select v-model="addModel.routeSectionList" multiple filterable>
+          <el-select v-model="addModel.routeSectionList" multiple filterable> <!--  111 -->
             <el-option
               v-for="item in sectionList"
               :key="item.code"
diff --git a/src/views/newMap/newMapdraft/dataRelation/routingoperate/detail.vue b/src/views/newMap/newMapdraft/dataRelation/routingoperate/detail.vue
index 123415514..3a3035520 100644
--- a/src/views/newMap/newMapdraft/dataRelation/routingoperate/detail.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/routingoperate/detail.vue
@@ -87,10 +87,10 @@ export default {
                     },
                     {
                         title: this.$t('map.routingDirection'),
-                        prop: 'directionCode',
+                        prop: 'right',
                         type: 'tag',
-                        columnValue: (row) => { return this.$ConstSelect.translate(row.directionCode, 'DirectionCodeList'); },
-                        tagType: (row) => { if (row.directionCode === '0') { return 'primary'; } else { return 'success'; } }
+                        columnValue: (row) => { if (row.right) { return '右行'; } else { return '左行'; } },
+                        tagType: (row) => { if (row.right) { return 'primary'; } else { return 'success'; } }
                     },
                     {
                         title: this.$t('map.destination'),
@@ -98,7 +98,7 @@ export default {
                     },
                     {
                         title: this.$t('map.remarks'),
-                        prop: 'remarks'
+                        prop: 'description'
                     },
                     {
                         type: 'button',
@@ -159,6 +159,15 @@ export default {
         doClose() {
             this.show = false;
         },
+        // handlerParkSectionCodeList(parkSectionCodeList) {
+        //     const nameList = [];
+        //     this.sectionList.forEach(item => {
+        //         if (parkSectionCodeList.includes(item.code)) {
+        //             nameList.push(item.name);
+        //         }
+        //     });
+        //     return nameList;
+        // },
         formatName(code) {
             let name = '';
             const device = this.$store.getters['map/getDeviceByCode'](code);
@@ -226,7 +235,7 @@ export default {
                 title: '区段列表',
                 name: row.name,
                 model: {
-                    field: 'routingSectionList',
+                    field: 'parkSectionCodeList',
                     items: [
                         { prop: 'stationCode', label: this.$t('map.stationCodeClomn'), type: 'text' },
                         {
diff --git a/src/views/newMap/newMapdraft/dataRelation/routingoperate/route.vue b/src/views/newMap/newMapdraft/dataRelation/routingoperate/route.vue
index af8b650c9..a3e671d5b 100644
--- a/src/views/newMap/newMapdraft/dataRelation/routingoperate/route.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/routingoperate/route.vue
@@ -66,7 +66,7 @@
             <el-input v-model="addModel.destinationCode" />
           </el-form-item>
           <el-form-item :label="$t('map.routingDirection')" prop="directionCode">
-            <el-select v-model="addModel.directionCode" clearable :filterable="true" :placeholder="$t('map.pleaseSelect')">
+            <el-select v-model="addModel.right" clearable :filterable="true" :placeholder="$t('map.pleaseSelect')">
               <el-option
                 v-for="item in DirectionCodeList"
                 :key="item.value"
@@ -75,11 +75,23 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item :label="$t('map.remarksColon')" prop="remarks">
-            <el-input v-model="addModel.remarks" type="textarea" :rows="4" :placeholder="$t('map.pleaseSelect')" />
+          <el-form-item :label="$t('map.remarksColon')" prop="description">
+            <el-input v-model="addModel.description" type="textarea" :rows="4" :placeholder="$t('map.pleaseSelect')" />
           </el-form-item>
-          <el-form-item :label="$t('map.trafficSegmentData')" prop="routingSectionList">
+          <!--<el-form-item :label="$t('map.trafficSegmentData')" prop="parkSectionCodeList">-->
+          <!--<el-select v-model="addModel.parkSectionCodeList" multiple>-->
+          <!--<el-option-->
+          <!--v-for="item in sectionList"-->
+          <!--:key="item.code"-->
+          <!--:label="`${item.name}(${item.code})`"-->
+          <!--:value="item.code"-->
+          <!--/>-->
+          <!--</el-select>-->
+          <!--<el-button :type=" field === 'routingSection' ? 'danger' : 'primary'" @click="hover('routingSection')">{{ $t('map.activate') }}</el-button>-->
+          <!--</el-form-item>-->
+          <el-form-item :label="$t('map.trafficSegmentData')" prop="parkSectionCodeList">
             <div>
+              <span>车站:</span>
               <el-select v-model="stationCode" clearable :filterable="true" :placeholder="$t('map.pleaseSelect')">
                 <el-option
                   v-for="item in filterStationList"
@@ -94,6 +106,7 @@
               >{{ $t('map.activate') }}</el-button>
             </div>
             <div>
+              <span>区段:</span>
               <el-select v-model="sectionCode" clearable :filterable="true" :placeholder="$t('map.pleaseSelect')">
                 <el-option
                   v-for="item in sectionList"
@@ -108,12 +121,12 @@
               >{{ $t('map.activate') }}</el-button>
               <el-button
                 type="primary"
-                @click="pushSection(addModel.routingSectionList, {stationCode: stationCode, sectionCode: sectionCode})"
+                @click="pushSection(addModel.parkSectionCodeList, {stationCode: stationCode, sectionCode: sectionCode})"
               >
                 {{ $t('map.add') }}
               </el-button>
             </div>
-            <el-table :data="addModel.routingSectionList" border style="width: 97%">
+            <el-table :data="addModel.parkSectionCodeList" border style="width: 97%">
               <el-table-column prop="sectionCode" :label="$t('map.stationName')">
                 <template slot-scope="scope">
                   <span>{{ formatName(scope.row.stationCode) }}</span>
@@ -129,7 +142,7 @@
                   <el-button
                     type="text"
                     size="small"
-                    @click.native.prevent="deleteSection(addModel.routingSectionList, scope.$index)"
+                    @click.native.prevent="deleteSection(addModel.parkSectionCodeList, scope.$index)"
                   >
                     {{ $t('map.remove') }}
                   </el-button>
@@ -188,19 +201,19 @@ export default {
             sectionCode: '',
             isSave: true,
             loading: false,
-            DirectionCodeList: this.$ConstSelect.DirectionCodeList,
+            DirectionCodeList: [{label: '右行', value: true}, {label: '左行', value: false}],
             addModel: {
                 name: '',
                 mapId: '',
                 code: '',
-                directionCode: '',
+                right: true,
                 destinationCode: '',
                 startStationCode: '',
                 startSectionCode: '',
                 endStationCode: '',
                 endSectionCode: '',
-                remarks: '',
-                routingSectionList: []
+                description: '',
+                parkSectionCodeList: []
             },
             editShow: false,
             rules: {
@@ -304,6 +317,8 @@ export default {
                 const index = list.findIndex(elem => { return elem.sectionCode == data.sectionCode; });
                 if (index < 0) {
                     list.push(data);
+                    this.sectionCode = '';
+                    this.stationCode = '';
                 } else {
                     this.$messageBox(this.$t('tip.routeSameID'));
                 }
@@ -313,9 +328,9 @@ export default {
             list.splice(index, 1);
         },
         buildModel(code) {
-            this.addModel.routingSectionList.forEach((elem, index) => {
-                elem['orderNum'] = index + 1;
-            });
+            // this.addModel.routingSectionList.forEach((elem, index) => {
+            //     elem['orderNum'] = index + 1;
+            // });
 
             const model = Object.assign({}, this.addModel);
             model['mapId'] = this.mapInfo.id;
@@ -360,7 +375,7 @@ export default {
                 delete this.addModel.id;
                 this.$refs.form.resetFields();
                 this.addModel.mapId = this.mapInfo.id;
-                this.addModel.routingSectionList = [];
+                this.addModel.parkSectionCodeList = [];
                 this.addModel.code = '';
                 this.stationCode = '';
                 this.sectionCode = '';
diff --git a/src/views/newMap/newMapdraft/dataRelation/runLeveloperate/detail.vue b/src/views/newMap/newMapdraft/dataRelation/runLeveloperate/detail.vue
index 25a5e0f5d..c5b2bb19a 100644
--- a/src/views/newMap/newMapdraft/dataRelation/runLeveloperate/detail.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/runLeveloperate/detail.vue
@@ -84,9 +84,13 @@ export default {
                         title: '行驶方向',
                         prop: 'right',
                         type: 'tag',
-                        columnValue: (row) => { return this.translate(row.right, 'PermissionUseList'); },
+                        columnValue: (row) => { return this.translate(row.right); },
                         tagType: (row) => { return 'success'; }
                     },
+                    {
+                        title: '站间距离',
+                        prop: 'distance'
+                    },
                     {
                         title: '第一等级时间',
                         prop: 'l1'
@@ -169,11 +173,12 @@ export default {
                 return getRunLevelList(this.mapInfo.id, params);
             }
         },
-        translate(rowData, listName) {
-            const obj = this[listName].filter((item) => {
-                return item.value === rowData;
-            });
-            return obj && obj.label;
+        translate(rowData) {
+            if (rowData) {
+                return '向右';
+            } else {
+                return '向左';
+            }
         },
         acquireMapList() {
             // 地图名称列表
diff --git a/src/views/newMap/newMapdraft/dataRelation/runLeveloperate/index.vue b/src/views/newMap/newMapdraft/dataRelation/runLeveloperate/index.vue
index 888de5cee..f886e589d 100644
--- a/src/views/newMap/newMapdraft/dataRelation/runLeveloperate/index.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/runLeveloperate/index.vue
@@ -73,11 +73,17 @@ export default {
                 this.$refs.routeEdit.clear();
             }
         },
+        initLoad() {
+            this.$refs.routeEdit.batchSectionListFocus(true);
+        },
         setSelected(selected) {
             this.$refs.routeEdit.setSelected(selected);
         },
         setCenter(code) {
             this.$emit('setCenter', code);
+        },
+        batchSectionListFocus(flag) {
+            this.$refs.routeEdit.batchSectionListFocus(flag);
         }
     }
 };
diff --git a/src/views/newMap/newMapdraft/dataRelation/runLeveloperate/route.vue b/src/views/newMap/newMapdraft/dataRelation/runLeveloperate/route.vue
index 7db6b135a..10b174e98 100644
--- a/src/views/newMap/newMapdraft/dataRelation/runLeveloperate/route.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/runLeveloperate/route.vue
@@ -67,10 +67,6 @@
             <el-form-item label="是否向右:" prop="right">
               <el-checkbox v-model="addModel.right" />
             </el-form-item>
-            <el-form-item label="站间距离:" prop="distance">
-              <el-input-number v-model="addModel.distance" :min="0" />
-              <span>m</span>
-            </el-form-item>
             <el-form-item>
               <el-button-group>
                 <el-button type="primary" size="small" style="margin-top: 10px" @click="generateLevel">生成等级</el-button>
@@ -137,6 +133,10 @@
             <el-form-item label="是否向右:" prop="right">
               <el-checkbox v-model="addModel.right" />
             </el-form-item>
+            <el-form-item label="站间距离:" prop="distance">
+              <el-input-number v-model="addModel.distance" :min="0" />
+              <span>m</span>
+            </el-form-item>
             <el-form-item label="等级一时间:" prop="l1">
               <el-input-number v-model="addModel.l1" :min="0" />
               <span>s</span>
@@ -204,6 +204,7 @@ export default {
             display: 1, // 默认显示第一个
             field: '',
             editShow: false,
+            loading:false,
             runLevelId: '', // 运行等级id
             addModel: {
                 mapId: '',
@@ -232,9 +233,6 @@ export default {
                 ],
                 endSectionCode: [
                     { required: true, message: '请选择末端区段', trigger: 'change' }
-                ],
-                distance: [
-                    { required: true, message: '请输入站间距离', trigger: 'blur' }
                 ]
             }
         };
@@ -285,6 +283,22 @@ export default {
             if (this.addModel.startStationCode && val) {
                 this.getStationDistance();
             }
+        },
+        'addModel.startSectionCode': function(val, old) {
+            if (old) {
+                this.changeSectionSelected(old, false, 'routePhysicalSection');
+            }
+            if (val) {
+                this.changeSectionSelected(val, true, 'routePhysicalSection');
+            }
+        },
+        'addModel.endSectionCode': function(val, old) {
+            if (old) {
+                this.changeSectionSelected(old, false, 'routePhysicalSection');
+            }
+            if (val) {
+                this.changeSectionSelected(val, true, 'routePhysicalSection');
+            }
         }
     },
     methods: {
@@ -304,10 +318,28 @@ export default {
                         this.addModel.l3 = res.data.l3;
                         this.addModel.l4 = res.data.l4;
                         this.addModel.l5 = res.data.l5;
+                        this.addModel.distance = res.data.distance;
                     }
                 }
             });
         },
+        batchSectionListFocus(flag) {
+            this.changeSectionSelected(this.addModel.endSectionCode, flag, 'routePhysicalSection');
+            this.changeSectionSelected(this.addModel.startSectionCode, flag, 'routePhysicalSection');
+        },
+        changeSectionSelected(val, flag, type) {
+            if (val) {
+                const section = this.$store.getters['map/getDeviceByCode'](val);
+                if (section && section.logicSectionCodeList && section.logicSectionCodeList.length) {
+                    section.logicSectionCodeList.forEach( (logicSectionCode) => {
+                        const logicSection = this.$store.getters['map/getDeviceByCode'](logicSectionCode);
+                        logicSection && logicSection.instance.drawBatchSelected(flag, flag ? type : '');
+                    });
+                } else {
+                    section && section.instance.drawBatchSelected(flag, flag ? type : '');
+                }
+            }
+        },
         save() {
             this.loading = true;
             if (this.editShow) {
@@ -341,7 +373,7 @@ export default {
                     startSectionCode: '',
                     startStationCode: '',
                     right: false,
-                    distance: '',
+                    distance: 0,
                     l1: 0,
                     l2: 0,
                     l3: 0,
diff --git a/src/views/newMap/newMapdraft/dataRelation/turnedoperate/priority.vue b/src/views/newMap/newMapdraft/dataRelation/turnedoperate/priority.vue
index 594b6b248..d75fa57ad 100644
--- a/src/views/newMap/newMapdraft/dataRelation/turnedoperate/priority.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/turnedoperate/priority.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog v-dialogDrag title="自动折返分组列表" :visible.sync="show" width="85%" :before-do-close="doClose">
+  <el-dialog v-dialogDrag title="自动折返分组列表" :visible.sync="show" width="85%">
     <div>
       <el-table
         :data="tableData"
@@ -7,14 +7,14 @@
         border
         style="width: 100%; margin-top: 20px"
       >
-         <el-table-column
-            prop="stationCode"
-            label="所属车站"
-          >
-            <template slot-scope="scope">
-              <span>{{ handelSpecifiedField(scope.row.stationCode, stationList, 'code', 'name') }}</span>
-            </template>
-         </el-table-column>
+        <el-table-column
+          prop="stationCode"
+          label="所属车站"
+        >
+          <template slot-scope="scope">
+            <span>{{ handelSpecifiedField(scope.row.stationCode, stationList, 'code', 'name') }}</span>
+          </template>
+        </el-table-column>
         <el-table-column
           prop="reentryTrackCode"
           label="折返区段"
@@ -89,7 +89,7 @@ export default {
     computed: {
         ...mapGetters('map', [
             'sectionList',
-            'stationList',
+            'stationList'
         ])
     },
     methods:{
@@ -114,7 +114,7 @@ export default {
                         }
                     });
                     temporaryData.forEach((it, index) => {
-                        this.spanArr.push(index?0:temporaryData.length);
+                        this.spanArr.push(index ? 0 : temporaryData.length);
                     });
                     temporaryData = [];
                 }
diff --git a/src/views/newMap/newMapdraft/dataRelation/turnedoperate/route.vue b/src/views/newMap/newMapdraft/dataRelation/turnedoperate/route.vue
index f8c1e4579..980a4f8c6 100644
--- a/src/views/newMap/newMapdraft/dataRelation/turnedoperate/route.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/turnedoperate/route.vue
@@ -18,11 +18,11 @@
           </el-form-item>
           <el-card style="width: 400px;position: relative; left: 80px; padding-top: 10px; margin-bottom: 20px">
             <el-form-item label="折返进路:" prop="turnBackRouteName" label-width="100px">
-              <el-input v-model="addModel.turnBackRouteName" readonly="true" style="width: 178px" />
+              <el-input v-model="addModel.turnBackRouteName" :readonly="true" style="width: 178px" />
               <el-button type="primary" @click="selectedRoute('turnBackRoute')">选择</el-button>
             </el-form-item>
             <el-form-item label="基础进路:" prop="basicRouteName" label-width="100px">
-              <el-input v-model="addModel.basicRouteName" readonly="true" style="width: 178px" />
+              <el-input v-model="addModel.basicRouteName" :readonly="true" style="width: 178px" />
               <el-button type="primary" @click="selectedRoute('basicRoute')">选择</el-button>
             </el-form-item>
             <el-form-item label="折返区段:" prop="reentryTrackCode" label-width="100px">
@@ -51,11 +51,11 @@
           </el-card>
           <el-card v-show="showSecond" style="width: 400px;position: relative; left: 80px; padding-top: 10px; margin-bottom: 20px">
             <el-form-item label="折返进路2:" prop="turnBackRoute2Name" label-width="100px">
-              <el-input v-model="addModel.turnBackRoute2Name" readonly="true" style="width: 178px" />
+              <el-input v-model="addModel.turnBackRoute2Name" :readonly="true" style="width: 178px" />
               <el-button type="primary" @click="selectedRoute('turnBackRoute2')">选择</el-button>
             </el-form-item>
             <el-form-item label="基础进路2:" prop="basicRoute2Name" label-width="100px">
-              <el-input v-model="addModel.basicRoute2Name" readonly="true" style="width: 178px" />
+              <el-input v-model="addModel.basicRoute2Name" :readonly="true" style="width: 178px" />
               <el-button type="primary" @click="selectedRoute('basicRoute2')">选择</el-button>
             </el-form-item>
             <el-form-item label="折返区段2:" prop="reentryTrack2Code" label-width="100px">
diff --git a/src/views/newMap/newMapdraft/index.vue b/src/views/newMap/newMapdraft/index.vue
index 62bdf8c5a..d405700d7 100644
--- a/src/views/newMap/newMapdraft/index.vue
+++ b/src/views/newMap/newMapdraft/index.vue
@@ -18,7 +18,6 @@
             :map-info="mapInfo"
             :selected="selected"
             :map-saveing="mapSaveing"
-            @handleSelectLogicalView="handleSelectLogicalView"
             @handleSelectPhysicalView="handleSelectPhysicalView"
             @saveMapEvent="saveMapEvent"
             @verifyMapEvent="verifyMapEvent"
@@ -39,10 +38,7 @@
         </div>
         <config-map
           ref="configMap"
-          @handleSelectView="handleSelectView"
-          @handleSelectLogicalView="handleSelectLogicalView"
           @handleSelectPhysicalView="handleSelectPhysicalView"
-          @handleSelectHybridView="handleSelectHybridView"
         />
       </div>
     </div>
@@ -107,8 +103,12 @@ export default {
         this.timeDemon = setInterval(() => {
             checkLoginLine();
         }, 5000 * 60);
+        EventBus.$on('SELECTON', () => {
+            this.selected = null;
+        });
     },
     beforeDestroy() {
+        EventBus.$off('SELECTON');
         this.clearAutoSave();
         this.$store.dispatch('map/mapClear');
         if (this.timeDemon) {
@@ -313,6 +313,9 @@ export default {
         },
         saveMapEvent() { // 保存地图
             const map = this.$store.state.map.map;
+            // map.signalList.forEach(item => {
+            //     item.lampPostType = '02';
+            // });
             if (this.$refs.jlmapVisual && map && parseInt(this.$route.params.mapId)) {
                 if (this.verifySectionPoint(map)) {
                     this.mapSaveing = true;
diff --git a/src/views/newMap/newMapdraft/mapoperate/config/list.vue b/src/views/newMap/newMapdraft/mapoperate/config/list.vue
index a188b4f1f..1f20a9402 100644
--- a/src/views/newMap/newMapdraft/mapoperate/config/list.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/config/list.vue
@@ -43,22 +43,41 @@
           </template>
           <template v-if="checkFieldType(item, 'multiSelect')">
             <el-form-item v-if="!item.isHidden" :key="item.prop" :label="item.label" :prop="item.prop" :required="item.required">
-              <el-select
-                v-model="formModel[item.prop]"
-                filterable
-                multiple
-                :placeholder="item.placeholder"
-                :disabled="item.disabled"
-                :clearable="item.clearable"
-                @change="item.deviceChange"
-              >
-                <el-option
-                  v-for="option in item.options"
-                  :key="option[item.optionValue]"
-                  :label="handleLabel(option, item.optionLabel)"
-                  :value="option[item.optionValue]"
-                />
-              </el-select>
+              <template v-if="item.change">
+                <el-select
+                  v-model="formModel[item.prop]"
+                  filterable
+                  multiple
+                  :placeholder="item.placeholder"
+                  :disabled="item.disabled"
+                  :clearable="item.clearable"
+                  @change="item.deviceChange"
+                >
+                  <el-option
+                    v-for="option in item.options"
+                    :key="option[item.optionValue]"
+                    :label="handleLabel(option, item.optionLabel)"
+                    :value="option[item.optionValue]"
+                  />
+                </el-select>
+              </template>
+              <template v-else>
+                <el-select
+                  v-model="formModel[item.prop]"
+                  filterable
+                  multiple
+                  :placeholder="item.placeholder"
+                  :disabled="item.disabled"
+                  :clearable="item.clearable"
+                >
+                  <el-option
+                    v-for="option in item.options"
+                    :key="option[item.optionValue]"
+                    :label="handleLabel(option, item.optionLabel)"
+                    :value="option[item.optionValue]"
+                  />
+                </el-select>
+              </template>
             </el-form-item>
           </template>
           <template v-if="checkFieldType(item, 'selectHover')">
diff --git a/src/views/newMap/newMapdraft/mapoperate/controlLamp.vue b/src/views/newMap/newMapdraft/mapoperate/controlLamp.vue
index f658903af..2e715d7d4 100644
--- a/src/views/newMap/newMapdraft/mapoperate/controlLamp.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/controlLamp.vue
@@ -3,7 +3,7 @@
     <el-tab-pane class="view-control" label="表示状态" name="first">
       <div style="height: calc(100% - 46px);">
         <el-scrollbar wrap-class="scrollbar-wrapper">
-          <config-list ref="dataform" :form="form" :form-model="editModel" :rules="rules" />
+          <config-list ref="dataform" :form="form" :form-model="editModel" :rules="editRules" />
         </el-scrollbar>
       </div>
       <div class="button_box">
@@ -17,6 +17,9 @@
       <div style="height: calc(100% - 46px);">
         <el-scrollbar wrap-class="scrollbar-wrapper">
           <config-data ref="make" :form="formMake" :form-model="addModel" :rules="createRules" />
+          <div style="color: #99a9bf;font-size: 12px;text-align: center;">
+            <span>提示:设置归属车站时，坐标会默认设置为车站下方50px</span>
+          </div>
         </el-scrollbar>
       </div>
       <div class="button_box">
@@ -52,7 +55,7 @@ export default {
     data() {
         return {
             activeName: 'first',
-            autoList: [],
+            selectLists: [],
             atsControlList: [],
             centerCommunicationList: [],
             chainControlList: [],
@@ -81,7 +84,8 @@ export default {
                 'LampFilament',
                 'ReturnModeGroup',
                 'ControlSwitch',
-                'Axle'
+                'Axle',
+                'SwitchFault'
             ],
             noNameTypeList: ['FaultStatusGroup', 'ModeStatusGroup', 'LampFilament', 'ReturnModeGroup', 'ControlSwitch', 'Axle'],
             typeList: [
@@ -101,7 +105,8 @@ export default {
                 { name: '信号灯丝告警', value: 'LampFilament'},
                 { name: '折返模式组', value: 'ReturnModeGroup'},
                 { name: 'LCW/ATS控制开关', value: 'ControlSwitch'},
-                { name: '计轴预复位', value: 'Axle'}
+                { name: '计轴预复位', value: 'Axle'},
+                { name: '道岔故障', value: 'SwitchFault'}
             ],
             editModel: {
                 code: '',
@@ -111,7 +116,10 @@ export default {
                 position: {
                     x: 0,
                     y: 0
-                }
+                },
+                mfNum: 0,
+                pfNum: 0,
+                switchCode: ''
             },
             addModel: {
                 code: '',
@@ -121,7 +129,10 @@ export default {
                 position: {
                     x: 0,
                     y: 0
-                }
+                },
+                mfNum: 0,
+                pfNum: 0,
+                switchCode: ''
             },
             rules: {
                 code: [
@@ -139,12 +150,14 @@ export default {
                 stationCode: [
                     { required: true, message: this.$t('rules.pleaseSelectStationCode'), trigger: 'change'}
                 ]
-            }
+            },
+            field: ''
         };
     },
     computed: {
         ...mapGetters('map', [
             'stationList',
+            'switchList',
             'indicatorLightList'
         ]),
         form() {
@@ -165,7 +178,10 @@ export default {
                                 { prop: 'position.x', firstLevel: 'position', secondLevel: 'x', label: 'x:', type: 'number', labelWidth: '20px' },
                                 { prop: 'position.y', firstLevel: 'position', secondLevel: 'y', label: 'y:', type: 'number', labelWidth: '20px' }
                             ] },
-                            { prop:'stationCode', label: '所属车站', type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: this.stationList}
+                            { prop: 'mfNum', label: '报警指示故障数量:', type: 'number', min: 0, isHidden: this.editModel.type !== 'FaultStatusGroup' },
+                            { prop: 'pfNum', label: '电源故障数量:', type: 'number', min: 0, isHidden: this.editModel.type !== 'FaultStatusGroup'},
+                            { prop: 'switchCode', label: '所属道岔:', type: 'selectHover', optionLabel: 'name&&code', optionValue: 'code', options: this.switchList, isHidden: this.editModel.type !== 'SwitchFault', hover: this.hover, buttonType: 'switchSelectCode', buttonShowType: this.isButtonType },
+                            { prop:'stationCode', label: '所属车站:', type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: this.stationList}
                         ]
                     }
                 }
@@ -176,25 +192,25 @@ export default {
             const form = {
                 labelWidth: '150px',
                 items: [
-                    { prop:'type', label: this.$t('map.saidLampType'), type: 'select', optionLabel: 'name', optionValue: 'value', options: this.typeList, change: true, deviceChange: this.typeChange },
-                    { prop: 'name', label: this.$t('map.saidLampName'), type: 'input', isHidden: this.noNameTypeList.includes(this.editModel.type) },
+                    { prop:'type', label: this.$t('map.saidLampType'), type: 'select', optionLabel: 'name', optionValue: 'value', options: this.typeList, change: true, deviceChange: this.typeChange},
+                    { prop: 'name', label: this.$t('map.saidLampName'), type: 'input', isHidden: this.noNameTypeList.includes(this.addModel.type) },
+                    { prop:'stationCode', label: '所属车站:', type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: this.stationList, change: true, deviceChange: this.changeBelongStation},
                     { prop: 'position', label: this.$t('map.textPoints'), type: 'coordinate', width: '140px', children: [
                         { 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:'stationCode', label: '所属车站', type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: this.stationList}
+                    { prop: 'mfNum', label: '报警指示故障数量:', type: 'number', min: 0, isHidden: this.addModel.type !== 'FaultStatusGroup' },
+                    { prop: 'pfNum', label: '电源故障数量:', type: 'number', min: 0, isHidden: this.addModel.type !== 'FaultStatusGroup'},
+                    { prop: 'switchCode', label: '所属道岔:', type: 'selectHover', optionLabel: 'name&&code', optionValue: 'code', options: this.switchList, isHidden: this.addModel.type !== 'SwitchFault', hover: this.hover, buttonType: 'switchSelectCode', buttonShowType: this.isButtonType }
                 ]
             };
             return form;
         },
-        createRules: function () {
+        editRules: function () {
             return {
                 type: [
                     { required: true, message: this.$t('rules.selectSaidLampType'), trigger: 'change' }
                 ],
-                name: [
-                    { required: true, message: this.$t('rules.enterSaidLampName'), trigger: 'blur' }
-                ],
                 'position.x': [
                     { required: true, message: this.$t('rules.trainPositionX'), trigger: 'blur' }
                 ],
@@ -203,8 +219,30 @@ export default {
                 ],
                 stationCode: [
                     { required: true, message: this.$t('rules.pleaseSelectStationCode'), trigger: 'change'}
+                ],
+                switchCode: [
+                    { required: true, message: '请选择所属道岔!', trigger: 'change'}
                 ]
             };
+        },
+        createRules: function () {
+            return {
+                type: [
+                    { required: true, message: this.$t('rules.selectSaidLampType'), trigger: 'change' }
+                ],
+                name: [
+                    { required: true, message: this.$t('rules.enterSaidLampName'), trigger: 'blur' }
+                ],
+                stationCode: [
+                    { required: true, message: this.$t('rules.pleaseSelectStationCode'), trigger: 'change'}
+                ],
+                switchCode: [
+                    { required: true, message: '请选择所属道岔!', trigger: 'change'}
+                ]
+            };
+        },
+        isButtonType() {
+            return this.field == 'switchSelectCode';
         }
     },
     watch: {
@@ -213,9 +251,13 @@ export default {
         },
         indicatorLightList(val) {
             this.handleIndicatorLightList(val);
+        },
+        'editModel.type': function (val) {
+            this.handleTypes(this.editModel.type);
         }
     },
     mounted() {
+        this.selectLists = this.indicatorLightList;
         this.handleIndicatorLightList(this.indicatorLightList);
     },
     methods: {
@@ -224,7 +266,10 @@ export default {
             this.$refs.make.resetFields();
             this.addModel.type = type;
             this.editModel.type = type;
-            this.handleTypes(type);
+        },
+        hover(field) {
+            this.field = field === this.field ? '' : field;
+            this.$emit('saidLampHover', this.field);
         },
         handleIndicatorLightList(indicatorLightList) {
             this.atsControlList = [];
@@ -351,40 +396,103 @@ export default {
             case 'Axle':
                 this.selectLists = this.AxleList;
                 break;
+            default :
+                this.selectLists = this.intersiteControlList;
+                break;
             }
         },
-        changeStation(code) { // 选择对应的所属设备集中站
-            this.autoList.forEach(elem => {
-                if (elem.code == code) {
-                    this.addModel.stationCode = elem.stationCode;
-                }
-            });
-        },
-        changeEditStation(code) { // 选择对应的所属设备集中站
-            this.autoList.forEach(elem => {
-                if (elem.code == code) {
-                    this.editModel.stationCode = elem.stationCode;
-                }
-            });
-        },
         deviceChange(code) {
             this.$emit('setCenter', code);
             this.deviceSelect(this.$store.getters['map/getDeviceByCode'](code));
         },
         deviceSelect(selected) {
-            this.$refs.dataform.resetFields();
-            this.$refs.make.resetFields();
-            if (selected && this.controlLampTypeList.includes(selected._type)) {
+            if (this.field.toUpperCase() === 'switchSelectCode'.toUpperCase() && selected._type.toUpperCase() === 'Switch'.toUpperCase()) {
+                if (this.activeName === 'first') {
+                    this.editModel.switchCode = selected.code;
+                } else {
+                    this.addModel.switchCode = selected.code;
+                }
+            } else if (selected && this.controlLampTypeList.includes(selected._type)) {
+                this.$refs.dataform.resetFields();
+                this.$refs.make.resetFields();
                 this.activeName = 'first';
                 this.editModel = deepAssign(this.editModel, selected);
                 this.editModel.type = selected._type;
             }
         },
+        getIdPrefix(type) {
+            let idPrefix = '';
+            switch (type) {
+            case 'AtsControl':
+                idPrefix = 'ats';
+                break;
+            case 'CenterCommunication':
+                idPrefix = 'centerC';
+                break;
+            case 'ChainControl':
+                idPrefix = 'chain';
+                break;
+            case 'IntersiteControl':
+                idPrefix = 'intersite';
+                break;
+            case 'LeuControl':
+                idPrefix = 'leu';
+                break;
+            case 'LocalControl':
+                idPrefix = 'local';
+                break;
+            case 'Maintain':
+                idPrefix = 'maintain';
+                break;
+            case 'PowerSupply':
+                idPrefix = 'power';
+                break;
+            case 'NoOneReturn':
+                idPrefix = 'noOne';
+                break;
+            case 'MaintenanceLamps':
+                idPrefix = 'mLamp';
+                break;
+            case 'ZcCommunication':
+                idPrefix = 'zcC';
+                break;
+            case 'FaultStatusGroup':
+                idPrefix = 'faultSG';
+                break;
+            case 'ModeStatusGroup':
+                idPrefix = 'modeSG';
+                break;
+            case 'LampFilament':
+                idPrefix = 'lampF';
+                break;
+            case 'ReturnModeGroup':
+                idPrefix = 'returnMG';
+                break;
+            case 'ControlSwitch':
+                idPrefix = 'controlS';
+                break;
+            case 'Axle':
+                idPrefix = 'axle';
+                break;
+            }
+            return idPrefix;
+        },
+        changeBelongStation(code) {
+            if (code) {
+                this.stationList.forEach(item => {
+                    if (item.code === code) {
+                        this.addModel.position.x = item.position.x;
+                        this.addModel.position.y = item.position.y + 50;
+                    }
+                });
+            }
+
+        },
         // 创建对象
         create() {
             this.$refs.make.validate((valid) => {
                 if (valid) {
-                    const uid = getUID(this.addModel.type, this.selectLists); // 根据类型写 uid 前缀命名
+                    const uid = getUID(this.getIdPrefix(this.addModel.type), this.selectLists); // 根据类型写 uid 前缀命名
                     const models = [];
                     const model = {
                         _type: this.addModel.type,
@@ -395,6 +503,8 @@ export default {
                             x: this.addModel.position.x,
                             y: this.addModel.position.y
                         },
+                        mfNum: this.addModel.mfNum,
+                        pfNum: this.addModel.pfNum,
                         stationCode: this.addModel.stationCode // 所属设备集中站
                     };
                     models.push(model);
diff --git a/src/views/newMap/newMapdraft/mapoperate/index.vue b/src/views/newMap/newMapdraft/mapoperate/index.vue
index 4a63705b3..89a563479 100644
--- a/src/views/newMap/newMapdraft/mapoperate/index.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/index.vue
@@ -106,6 +106,7 @@
               :selected="selected"
               @updateMapModel="updateMapModel"
               @setCenter="setCenter"
+              @saidLampHover="saidLampTab"
             />
           </el-tab-pane>
           <el-tab-pane :label="$t('map.train')" class="tab_pane_box" name="Train">
@@ -281,7 +282,7 @@ export default {
             this.$emit('showMap');
         },
         handleSelectControlPage(device) {
-            const controlLampTypeList = ['AtsControl', 'CenterCommunication', 'ChainControl', 'IntersiteControl', 'LeuControl', 'LocalControl', 'Maintain',
+            const controlLampTypeList = ['AtsControl', 'CenterCommunication', 'ChainControl', 'IntersiteControl', 'LeuControl', 'LocalControl', 'Maintain', 'SwitchFault',
                 'PowerSupply', 'NoOneReturn', 'MaintenanceLamps', 'ZcCommunication', 'FaultStatusGroup', 'ModeStatusGroup', 'LampFilament', 'ReturnModeGroup', 'ControlSwitch', 'Axle'];
             const type = device._type;
             if (this.stationType) {
@@ -300,7 +301,7 @@ export default {
                 this.enabledTab = 'Section';
             } else if (type == 'AutomaticRoute' || type == 'AutoTurnBack' || type == 'AxleReset' || type == 'LimitControl' || type == 'GuideLock') {
                 this.enabledTab = 'ControlDraft';
-            } else if (controlLampTypeList.includes(type)) {
+            } else if (controlLampTypeList.includes(type) || this.saidLampType) {
                 this.enabledTab = 'ControlLamp';
             } else {
                 this.enabledTab = type;
@@ -312,6 +313,9 @@ export default {
         psdTab(type) {
             this.psdType = type;
         },
+        saidLampTab(type) {
+        	this.saidLampType = type;
+        },
         standStationTab(type) {
             this.stationStandType = type;
         },
diff --git a/src/views/newMap/newMapdraft/mapoperate/section/batchSettings.vue b/src/views/newMap/newMapdraft/mapoperate/section/batchSettings.vue
index b58990028..d90287e09 100644
--- a/src/views/newMap/newMapdraft/mapoperate/section/batchSettings.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/section/batchSettings.vue
@@ -61,14 +61,8 @@ import { mapGetters } from 'vuex';
 export default {
     name: 'BatchSettings',
     props: {
-        sectionList: {
-            type: Object,
-            default: function() {
-                return [];
-            }
-        },
         field: {
-            type: Object,
+            type: String,
             default: function () {
                 return '';
             }
diff --git a/src/views/newMap/newMapdraft/mapoperate/section/create.vue b/src/views/newMap/newMapdraft/mapoperate/section/create.vue
index 03ce736e6..976c0cd67 100644
--- a/src/views/newMap/newMapdraft/mapoperate/section/create.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/section/create.vue
@@ -103,19 +103,19 @@ export default {
     name: 'Create',
     props: {
         switchAndPhySicalSectionList: {
-            type: Object,
+            type: Array,
             default: function() {
                 return [];
             }
         },
         sectionList: {
-            type: Object,
+            type: Array,
             default: function() {
                 return [];
             }
         },
         field: {
-            type: Object,
+            type: String,
             default: function () {
                 return '';
             }
@@ -221,6 +221,7 @@ export default {
                 trainWindowCode: '',
                 destinationCodePoint: { x: 0, y: 0 },
                 curve: false,
+                nameShow: true,
                 relevanceSectionList: [],
                 points: [],
                 leftAxlePosition: 0,
diff --git a/src/views/newMap/newMapdraft/mapoperate/section/index.vue b/src/views/newMap/newMapdraft/mapoperate/section/index.vue
index 98c4c0f05..c8f02a217 100644
--- a/src/views/newMap/newMapdraft/mapoperate/section/index.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/section/index.vue
@@ -23,7 +23,7 @@
       <logic-block ref="logicBlock" :edit-model="editModel" @updateMapModel="updateMapModel" />
     </el-tab-pane>
     <el-tab-pane class="view-control" :label="$t('map.batchSettings')" name="five">
-      <batch-settings ref="batchSettings" :field="field" :section-list="sectionList" @hover="hover" @updateMapModel="updateMapModel" @tipInfoHandle="tipInfoHandle" />
+      <batch-settings ref="batchSettings" :field="field" @hover="hover" @updateMapModel="updateMapModel" @tipInfoHandle="tipInfoHandle" />
     </el-tab-pane>
     <tip-info ref="tipInfo" :tip-info-list="tipInfoList" />
   </el-tabs>
@@ -64,7 +64,11 @@ export default {
             SectionSepTypeList: [],
             regionList: [],
             viewSelect: false,
-            axlePositionList: [{value: 1, label: '下方显示'}, {value: 0, label: '不显示'}, {value: -1, label: '上方显示'}],
+            axlePositionList: [
+                {value: 1, label: '下方显示'},
+                {value: 0, label: '不显示'},
+                {value: -1, label: '上方显示'}
+            ],
             editModel: {
                 code: '',
                 name: '',
@@ -129,7 +133,7 @@ export default {
             'lineCode'
         ]),
         form() {
-            const form = {
+            return {
                 labelWidth: '160px',
                 items: {
                     code: {
@@ -161,29 +165,29 @@ export default {
                                 { prop: 'standTrackNamePosition.x', firstLevel: 'standTrackNamePosition', secondLevel: 'x', label: 'x:', type: 'number', labelWidth: '20px'},
                                 { prop: 'standTrackNamePosition.y', firstLevel: 'standTrackNamePosition', secondLevel: 'y', label: 'y:', type: 'number', labelWidth: '20px'}
                             ] },
-                            { prop: 'reentryTrack', label: this.$t('map.isReentryTrack'), type: 'checkbox', isHidden: !this.isStandTrackShow }, // 是否折返轨
+                            { prop: 'reentryTrack', label: this.$t('map.isReentryTrack'), type: 'checkbox', isHidden: !this.isReentryTrackShow }, // 是否折返轨
 
-                            { prop: 'reentryTrackName', label: this.$t('map.reentryTrackName'), type: 'input', isHidden: !this.isreentryTrackName },
+                            { prop: 'reentryTrackName', label: this.$t('map.reentryTrackName'), type: 'input', isHidden: !this.isreentryTrackName }, // 折返轨名称
                             { prop: 'reentryTrackNamePosition', label: this.$t('map.reentryTrackNamePosition'), type: 'coordinate', width: '150px', isHidden: !this.isreentryTrackName, children: [
                                 { prop: 'reentryTrackNamePosition.x', firstLevel: 'reentryTrackNamePosition', secondLevel: 'x', label: 'x:', type: 'number', labelWidth: '20px'},
                                 { prop: 'reentryTrackNamePosition.y', firstLevel: 'reentryTrackNamePosition', secondLevel: 'y', label: 'y:', type: 'number', labelWidth: '20px'}
-                            ] },
+                            ] }, // 折返轨名称坐标
 
-                            { prop: 'transferTrack', label: this.$t('map.isTransferTrack'), type: 'checkbox', isHidden: !this.isStandTrackShow }, // 是否转换轨
+                            { prop: 'transferTrack', label: this.$t('map.isTransferTrack'), type: 'checkbox', isHidden: !this.isTransferTrackShow }, // 是否转换轨
 
-                            { prop: 'transferTrackName', label: this.$t('map.transferTrackName'), type: 'input', isHidden: !this.istransferTrackName },
+                            { prop: 'transferTrackName', label: this.$t('map.transferTrackName'), type: 'input', isHidden: !this.istransferTrackName }, // 转换轨名称
                             { prop: 'transferTrackNamePosition', label: this.$t('map.transferTrackNamePosition'), type: 'coordinate', width: '150px', isHidden: !this.istransferTrackName, children: [
                                 { prop: 'transferTrackNamePosition.x', firstLevel: 'transferTrackNamePosition', secondLevel: 'x', label: 'x:', type: 'number', labelWidth: '20px'},
                                 { prop: 'transferTrackNamePosition.y', firstLevel: 'transferTrackNamePosition', secondLevel: 'y', label: 'y:', type: 'number', labelWidth: '20px'}
-                            ] },
-                            { prop: 'destinationCode', label: this.$t('map.destinationCode'), type: 'input', isHidden: !this.isdestinationCode },
+                            ] }, // 转换轨名称坐标
+                            { prop: 'destinationCode', label: this.$t('map.destinationCode'), type: 'input', isHidden: !this.isdestinationCode }, // 目的地码
                             { prop: 'destinationCodePoint', label: this.$t('map.destinationCodePoint'), type: 'coordinate', width: '150px', isHidden: !this.isdestinationCode, children: [
                                 { prop: 'destinationCodePoint.x', firstLevel: 'destinationCodePoint', secondLevel: 'x', label: 'x:', type: 'number', labelWidth: '20px'},
                                 { prop: 'destinationCodePoint.y', firstLevel: 'destinationCodePoint', secondLevel: 'y', label: 'y:', type: 'number', labelWidth: '20px'}
-                            ] },
+                            ] }, // 目的地码坐标
 
                             { prop: 'switchSection', label: this.$t('map.isSwitchSection'), type: 'checkbox', disabled: true }, // 是否关联道岔
-                            { prop: 'relSwitchCode', label: this.$t('map.relSwitchCode'), type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: this.switchList, isHidden: this.isStandTrackShow, disabled: true }, // 关联道岔
+                            { prop: 'relSwitchCode', label: this.$t('map.relSwitchCode'), type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: this.switchList, isHidden: !this.isRelevanceSwitchShow, disabled: true }, // 关联道岔
 
                             { prop: 'logicSectionShow', label: this.$t('map.displayLogicalExtents'), type: 'checkbox', isHidden: !this.isSwitchSectionType }, // 1
                             { prop: 'logicSectionNameSort', label: this.$t('map.logicSectionNameSort'), type: 'radio', optionLabel: 'label', optionValue: 'value', isHidden: !this.isLogicSectionNameSort, radioList: [
@@ -204,14 +208,13 @@ export default {
                             { prop: 'leftStopPointOffset', label: this.$t('map.leftStopPointOffset'), type: 'number', min: 0, disabled: true, isHidden: !this.isStopPointOffset },
                             { prop: 'rightStopPointOffset', label: this.$t('map.rightStopPointOffset'), type: 'number', min: 0, disabled: true, isHidden: !this.isStopPointOffset },
                             { prop: 'region', label: this.$t('map.sectionColon'), type: 'select', optionLabel: 'label', optionValue: 'value', options: this.regionList, isHidden: !this.sectionColonShow },
-                            { prop: 'trainWindowCode', label: '关联车次窗', type: 'input', disabled: true, isHidden: this.hasAssociatedSection },
+                            { prop: 'trainWindowCode', label: '关联车次窗', type: 'input', disabled: true, isHidden: !this.isSwitchSectionShow },
                             { prop: 'kmRangeLeft', label: this.$t('map.leftKilometerMark'), type: 'number', min: 0, placeholder: this.$t('map.meter') },
                             { prop: 'kmRangeRight', label: this.$t('map.rightKilometerMark'), type: 'number', min: 0, placeholder: this.$t('map.meter') }
                         ]
                     }
                 }
             };
-            return form;
         },
         rules() {
             var validateAssociatedSection = (rule, value, callback) => {
@@ -312,9 +315,15 @@ export default {
         isLogicSectionNameSort() { // 逻辑区段排序 判断
             return this.editModel.type == '01';
         },
+        isSwitchSectionShow() { // 道岔区段
+            return this.editModel.type != '03';
+        },
         isPointsShow() {
             return this.editModel.type !== '04' && this.editModel.points.length > 0;
         },
+        isRelevanceSwitchShow() {
+            return this.editModel.type == '04' && this.editModel.type == '03';
+        },
         isStandTrackShow() {
             return this.editModel.type != '04' && this.editModel.type != '03';
         },
@@ -333,6 +342,12 @@ export default {
         istransferTrackName() {
             return this.editModel.type !== '04' && this.editModel.transferTrack;
         },
+        isTransferTrackShow() {
+            return this.editModel.type != '04' && this.editModel.type != '03' && !this.editModel.reentryTrack;
+        },
+        isReentryTrackShow() {
+            return this.editModel.type != '04' && this.editModel.type != '03' && !this.editModel.transferTrack;
+        },
         isdestinationCode() {
             return this.editModel.type !== '04' && (this.editModel.reentryTrack || this.editModel.transferTrack);
         },
@@ -408,6 +423,8 @@ export default {
                 this.oldPoint = JSON.parse(JSON.stringify(selected.points));
                 this.oldLeftSectionCode = selected.leftSectionCode;
                 this.oldRightSectionCode = selected.rightSectionCode;
+                this.editModel.leftAxlePosition = selected.leftAxlePosition || 0; // 重置计轴显示
+                this.editModel.rightAxlePosition = selected.rightAxlePosition || 0; // 重置计轴显示
                 this.$refs.logicBlock.computedLogicSectionNumList(this.editModel.logicSectionNum);
                 if (this.field.toUpperCase() === 'splitSection'.toUpperCase()) {
                     this.$refs.splitOrMerge.addModel.splitOffsetMax = Math.sqrt(new JTriangle(selected.points[0], selected.points[selected.points.length - 1]).abspowz);
@@ -457,7 +474,7 @@ export default {
         },
         // 修改区段属性
         edit() {
-            this.$refs['dataform'].validate((valid) => {
+            this.$refs['dataform'].validate(valid => {
                 if (valid) {
                     if (this.editModel.type === '03' && this.editModel.leftSectionCode && this.editModel.rightSectionCode) {
                         this.$messageBox('道岔区段应仅有一侧关联区段！');
diff --git a/src/views/newMap/newMapdraft/mapoperate/section/logicBlock.vue b/src/views/newMap/newMapdraft/mapoperate/section/logicBlock.vue
index 7e364ed70..12bf651fe 100644
--- a/src/views/newMap/newMapdraft/mapoperate/section/logicBlock.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/section/logicBlock.vue
@@ -176,6 +176,7 @@ export default {
                 trainPosType: model.trainPosType,
                 points: points,
                 curve: false,
+                nameShow: true,
                 lengthFact: lineLength ? lineLength.toFixed(3) : lineLength,
                 trainWindowCode: '',
                 kmRangeRight: model.kmRangeRight,
diff --git a/src/views/newMap/newMapdraft/mapoperate/section/splitOrMerge.vue b/src/views/newMap/newMapdraft/mapoperate/section/splitOrMerge.vue
index bb58ec0eb..8fa5f8460 100644
--- a/src/views/newMap/newMapdraft/mapoperate/section/splitOrMerge.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/section/splitOrMerge.vue
@@ -45,7 +45,7 @@
         <el-form-item :label="$t('map.sectionRsectioncode')" prop="rsectioncode">
           <el-select v-model="mergeModel.rsectioncode" filterable :placeholder="$t('rules.pleaseSelect')">
             <el-option
-              v-for="item in c"
+              v-for="item in reverseSectionList"
               :key="item.code"
               :label="item.name"
               :value="item.code"
@@ -70,11 +70,13 @@
 <script>
 import { getUID } from '@/jmapNew/utils/Uid';
 import { deepAssign } from '@/utils/index';
+import { EventBus } from '@/scripts/event-bus';
+
 export default {
     name: 'SplitOrMerge',
     props: {
         field: {
-            type: Object,
+            type: String,
             default: function () {
                 return '';
             }
@@ -86,25 +88,25 @@ export default {
             }
         },
         physicalSectionList: {
-            type: Object,
+            type: Array,
             default() {
                 return [];
             }
         },
         reverseSectionList: {
-            type: Object,
+            type: Array,
             default() {
                 return [];
             }
         },
         sectionList: {
-            type: Object,
+            type: Array,
             default: function() {
                 return [];
             }
         },
         switchAndPhySicalSectionList: {
-            type: Object,
+            type: Array,
             default: function() {
                 return [];
             }
@@ -139,6 +141,13 @@ export default {
             }
         };
     },
+    watch: {
+        field(val) {
+            if (val) {
+                EventBus.$emit('SELECTON');
+            }
+        }
+    },
     methods: {
         hover(filed) {
             this.$emit('hover', filed);
@@ -183,6 +192,7 @@ export default {
                                 sepTypeRight: index == this.addModel.splitNumber ? selected.sepTypeRight : '01', // 右侧分隔符类型 (终点右侧按原来区段类型走 其余 默认 01)
                                 offsetRight: selected.offsetRight,
                                 curve: selected.curve,
+                                nameShow: true,
                                 lengthFact: 0,
                                 points: [
                                     {
@@ -266,6 +276,7 @@ export default {
                                 switchSection: false,
                                 relSwitchCode: '',
                                 curve: false,
+                                nameShow: true,
                                 kmRangeRight: '',
                                 kmRangeLeft: '',
                                 region: '',
diff --git a/src/views/newMap/newMapdraft/mapoperate/section/tipInfo.vue b/src/views/newMap/newMapdraft/mapoperate/section/tipInfo.vue
index d8e4671c2..de7aef047 100644
--- a/src/views/newMap/newMapdraft/mapoperate/section/tipInfo.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/section/tipInfo.vue
@@ -3,7 +3,6 @@
     title="提示"
     :visible.sync="dialogVisible"
     width="30%"
-    :before-close="handleClose"
   >
     <ul>
       <li v-for="(item,index) in tipInfoList" :key="index">{{ item }}</li>
@@ -19,7 +18,7 @@ export default {
     name: 'TipInfo',
     props: {
         tipInfoList:{
-            type:Object,
+            type:Array,
             default: function () {
                 return [];
             }
diff --git a/src/views/newMap/newMapdraft/mapoperate/splitStation.vue b/src/views/newMap/newMapdraft/mapoperate/splitStation.vue
index 22a246dbf..02e237248 100644
--- a/src/views/newMap/newMapdraft/mapoperate/splitStation.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/splitStation.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-tabs v-model="activeName" class="card" @tab-click="handleClick">
+  <el-tabs v-model="activeName" class="card">
     <el-tab-pane class="view-control" :label="$t('map.property')" name="first">
       <div style="height: calc(100% - 46px);">
         <el-scrollbar wrap-class="scrollbar-wrapper">
@@ -88,7 +88,7 @@ export default {
                     draw: {
                         name: this.$t('map.drawData'),
                         item: [
-                            { prop: 'code', label: `${this.$t('map.code')}`, type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: this.splitStationList},
+                            { prop: 'code', label: `${this.$t('map.code')}`, type: 'select', optionLabel: 'code', optionValue: 'code', options: this.splitStationList},
                             { prop: 'rightStationName', label: this.$t('map.rightCentralStationName'), type: 'input'},
                             { prop: 'leftStationName', label: this.$t('map.leftCentralStationName'), type: 'input'},
                             { prop: 'position', label: this.$t('map.textPoints'), type: 'coordinate', width: '140px', children: [
@@ -141,7 +141,7 @@ export default {
         deviceSelect(selected) {
             this.$refs.dataform.resetFields();
             this.$refs.make.resetFields();
-            if (selected) {
+            if (selected && selected._type === 'SplitStation') {
                 this.activeName = 'first';
                 this.editModel = deepAssign(this.editModel, selected);
                 this.editModel.type = selected._type;
diff --git a/src/views/newMap/newMapdraft/mapoperate/station.vue b/src/views/newMap/newMapdraft/mapoperate/station.vue
index 2696290f7..177b89343 100644
--- a/src/views/newMap/newMapdraft/mapoperate/station.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/station.vue
@@ -76,6 +76,9 @@
             <el-form-item label="公里标字体:" prop="kmPostFont">
               <el-font v-model="allModel.kmPostFont" :placeholder="this.$t('tip.stationFont')" />
             </el-form-item>
+            <el-form-item label="车站Y坐标:" prop="positionY">
+              <el-input-number v-model="allModel.positionY" />
+            </el-form-item>
             <el-form-item>
               <el-button-group>
                 <el-button type="primary" @click="batchSettings">{{ $t('global.set') }}</el-button>
@@ -161,7 +164,8 @@ export default {
             },
             allModel: {
                 nameFont: '',
-                kmPostFont: ''
+                kmPostFont: '',
+                positionY: 0
             }
         };
     },
@@ -493,6 +497,7 @@ export default {
                 const model = deepAssign({}, station);
                 model.nameFont = this.allModel.nameFont;
                 model.kmPostFont = this.allModel.kmPostFont;
+                model.position.y = this.allModel.positionY;
                 models.push(model);
             });
             this.$emit('updateMapModel', models);
diff --git a/src/views/newMap/newMapdraft/mapoperate/switch/create.vue b/src/views/newMap/newMapdraft/mapoperate/switch/create.vue
index 75e67080c..2c1b7545e 100644
--- a/src/views/newMap/newMapdraft/mapoperate/switch/create.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/switch/create.vue
@@ -360,7 +360,8 @@ export default {
                             parentCode: '',
                             stationCode: sectiona.stationCode,
                             trainPosType: sectiona.trainPosType,
-                            curve: false
+                            curve: false,
+                            nameShow: true
                         });
                     }
                 });
diff --git a/src/views/newMap/newMapdraft/mapoperate/switch/createAxle.vue b/src/views/newMap/newMapdraft/mapoperate/switch/createAxle.vue
index 2df3a33f3..598a236e0 100644
--- a/src/views/newMap/newMapdraft/mapoperate/switch/createAxle.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/switch/createAxle.vue
@@ -3,16 +3,16 @@
   <div style="height: 100%;">
     <el-scrollbar wrap-class="scrollbar-wrapper">
       <el-form ref="oprt1" :model="fromData" label-width="130px" size="mini" :rules="mergeRules">
-        <el-form-item label="关联区段" prop="relevanceSectionList">
-          <el-select v-model="fromData.relevanceSectionList" filterable multiple :placeholder="$t('rules.pleaseSelect')">
+        <el-form-item label="关联区段" prop="relevanceSwitchList">
+          <el-select v-model="fromData.relevanceSwitchList" filterable multiple :placeholder="$t('rules.pleaseSelect')">
             <el-option
-              v-for="item in sectionList"
+              v-for="item in switchList"
               :key="item.code"
               :label="item.name + '(' + item.code + ')'"
               :value="item.code"
             />
           </el-select>
-          <el-button :type="field === 'relevanceSectionList' ? 'danger' : 'primary'" size="small" @click="hover('relevanceSectionList')">{{ $t('map.activate') }}</el-button>
+          <el-button :type="field === 'relevanceSwitchList' ? 'danger' : 'primary'" size="small" @click="hover('relevanceSwitchList')">{{ $t('map.activate') }}</el-button>
         </el-form-item>
         <el-form-item>
           <el-button-group>
@@ -27,6 +27,8 @@
 import { deepAssign } from '@/utils/index';
 import { mapGetters } from 'vuex';
 import { getUID } from '@/jmapNew/utils/Uid';
+import { EventBus } from '@/scripts/event-bus';
+
 export default {
     name: 'CreateAxle',
     props:{
@@ -38,7 +40,11 @@ export default {
     data() {
         return {
             fromData: {
-                relevanceSectionList: []
+                relevanceSectionList: [],
+                relevanceSwitchList: []
+            },
+            mergeRules: {
+                relevanceSwitchList: [{ required: true, message: '请选择关联道岔', trigger: 'change' }]
             }
         };
     },
@@ -48,77 +54,98 @@ export default {
             'switchList'
         ])
     },
+    watch: {
+        field(val) {
+            if (val) {
+                EventBus.$emit('SELECTON');
+            }
+        }
+    },
     methods:{
         hover(field) {
             this.$emit('hover', field);
         },
         createSwitchSectionManual() {
-            const models = [];
-            const uid = getUID('T', this.sectionList);
-            let sectiona = [];
-            this.fromData.relevanceSectionList.forEach(item => {
-                const section = deepAssign({}, this.$store.getters['map/getDeviceByCode'](item));
-                section.parentCode = uid;
-                const length = section.points.length - 1;
-                if (sectiona.length > 0) {
-                    sectiona.forEach(each=>{
-                        if ((section.points[0].x == each.x && section.points[0].y == each.y) || (section.points[length].x == each.x && section.points[length].y == each.y)) {
-                            sectiona = [];
-                            sectiona.push(each);
-                        }
+            this.$refs.oprt1.validate((valid) => {
+                if (valid) {
+                    const models = [];
+                    this.hover(''); // 处理 field 值为空
+                    const uid = getUID('T', this.sectionList);
+                    let sectiona = [];
+                    this.fromData.relevanceSectionList = [];
+                    this.fromData.relevanceSwitchList.forEach(item => {
+                        const switchModel = deepAssign({}, this.$store.getters['map/getDeviceByCode'](item));
+                        this.fromData.relevanceSectionList.push(switchModel.sectionACode);
+                        this.fromData.relevanceSectionList.push(switchModel.sectionBCode);
+                        this.fromData.relevanceSectionList.push(switchModel.sectionCCode);
                     });
-                } else {
-                    sectiona.push(section.points[0]);
-                    sectiona.push(section.points[section.points.length - 1]);
+                    this.fromData.relevanceSectionList.forEach(item => {
+                        const section = deepAssign({}, this.$store.getters['map/getDeviceByCode'](item));
+                        section.parentCode = uid;
+                        const length = section.points.length - 1;
+                        if (sectiona.length > 0) {
+                            sectiona.forEach(each=>{
+                                if ((section.points[0].x == each.x && section.points[0].y == each.y) || (section.points[length].x == each.x && section.points[length].y == each.y)) {
+                                    sectiona = [];
+                                    sectiona.push(each);
+                                }
+                            });
+                        } else {
+                            sectiona.push(section.points[0]);
+                            sectiona.push(section.points[section.points.length - 1]);
+                        }
+                        models.push(section);
+                    });
+                    if (sectiona.length <= 0) {
+                        return false;
+                    }
+                    models.push({
+                        _type: 'Section',
+                        code: uid,
+                        name: uid,
+                        type: '04',
+                        namePosition: {
+                            x: sectiona[sectiona.length - 1].x,
+                            y: sectiona[sectiona.length - 1].y
+                        },
+                        standTrack: false,
+                        kmRangeRight: '',
+                        kmRangeLeft: '',
+                        region: '',
+                        standTrackName: '',
+                        standTrackNamePosition: { x: 0, y: 0 },
+                        reentryTrack: false,
+                        reentryTrackName: '',
+                        reentryTrackNamePosition: { x: 0, y: 0 },
+                        transferTrack: false,
+                        transferTrackName: '',
+                        transferTrackNamePosition: { x: 0, y: 0 },
+                        // segmentation: false,
+                        segmentationPosition: { x: 0, y: 0 },
+                        switchSection: true,
+                        relSwitchCode: '',
+                        relevanceSectionList: this.fromData.relevanceSectionList,
+                        points: [{ x: 0, y: 0 }, { x: 0, y: 0 }],
+                        logicSectionNum: [0],
+                        logicSectionShow: false,
+                        sepTypeLeft: '00',
+                        offsetLeft: 0,
+                        sepTypeRight: '00',
+                        offsetRight: 0,
+                        parentCode: '',
+                        stationCode: sectiona.stationCode,
+                        trainPosType: sectiona.trainPosType,
+                        curve: false,
+                        nameShow: true
+                    });
+                    this.$emit('updateMapModel', models);
+                    this.fromData.relevanceSectionList = [];
+                    this.fromData.relevanceSwitchList = [];
                 }
-                models.push(section);
             });
-            if (sectiona.length <= 0) {
-                return false;
-            }
-            models.push({
-                _type: 'Section',
-                code: uid,
-                name: uid,
-                type: '04',
-                namePosition: {
-                    x: sectiona[sectiona.length - 1].x,
-                    y: sectiona[sectiona.length - 1].y
-                },
-                standTrack: false,
-                kmRangeRight: '',
-                kmRangeLeft: '',
-                region: '',
-                standTrackName: '',
-                standTrackNamePosition: { x: 0, y: 0 },
-                reentryTrack: false,
-                reentryTrackName: '',
-                reentryTrackNamePosition: { x: 0, y: 0 },
-                transferTrack: false,
-                transferTrackName: '',
-                transferTrackNamePosition: { x: 0, y: 0 },
-                // segmentation: false,
-                segmentationPosition: { x: 0, y: 0 },
-                switchSection: true,
-                relSwitchCode: '',
-                relevanceSectionList: this.fromData.relevanceSectionList,
-                points: [{ x: 0, y: 0 }, { x: 0, y: 0 }],
-                logicSectionNum: [0],
-                logicSectionShow: false,
-                sepTypeLeft: '00',
-                offsetLeft: 0,
-                sepTypeRight: '00',
-                offsetRight: 0,
-                parentCode: '',
-                stationCode: sectiona.stationCode,
-                trainPosType: sectiona.trainPosType,
-                curve: false
-            });
-            this.$emit('updateMapModel', models);
-            this.fromData.relevanceSectionList = [];
         },
         pushData(data) {
-            this.fromData.relevanceSectionList.push(data);
+            this.fromData.relevanceSwitchList.push(data);
         }
     }
 };
diff --git a/src/views/newMap/newMapdraft/mapoperate/switch/index.vue b/src/views/newMap/newMapdraft/mapoperate/switch/index.vue
index aca3838e7..1415cff78 100644
--- a/src/views/newMap/newMapdraft/mapoperate/switch/index.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/switch/index.vue
@@ -60,11 +60,11 @@ export default {
             this.$emit('fieldSelectSwitchSection', this.field);
         },
         deviceSelect(selected) {
-            if (this.field.toUpperCase() != 'relevanceSectionList'.toUpperCase() && selected && selected._type.toUpperCase() === 'Switch'.toUpperCase()) {
+            if (selected && selected._type.toUpperCase() === 'Switch'.toUpperCase() && this.field.toUpperCase() === 'relevanceSwitchList'.toUpperCase()) {
+                this.$refs.createAxle.pushData(selected.code);
+            } else if (selected && selected._type.toUpperCase() === 'Switch'.toUpperCase()) {
                 this.activeName = 'first';
                 this.$refs.switchModel.setModel(selected);
-            } else if (selected && selected._type.toUpperCase() === 'Section'.toUpperCase() && this.field.toUpperCase() === 'relevanceSectionList'.toUpperCase()) {
-                this.$refs.createAxle.pushData(selected.code);
             }
         },
         findSectionDataByLinkCodeAndPoint(code, point) {
diff --git a/src/views/newMap/newMapdraft/mapoperate/trainwindow.vue b/src/views/newMap/newMapdraft/mapoperate/trainwindow.vue
index aa66f37ad..488df6d7b 100644
--- a/src/views/newMap/newMapdraft/mapoperate/trainwindow.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/trainwindow.vue
@@ -43,13 +43,13 @@
                 >{{ $t('map.activate') }}</el-button>
               </el-form-item>
               <el-form-item label="Y轴坐标:" prop="pointY">
-                <el-input-number v-model="addModel.pointY" style="width: 178px;" @change="handleChange" />
+                <el-input-number v-model="addModel.pointY" style="width: 178px;" />
               </el-form-item>
               <el-form-item label="车次窗宽度:" prop="width">
-                <el-input-number v-model="addModel.width" style="width: 178px;" @change="handleChange" />
+                <el-input-number v-model="addModel.width" style="width: 178px;" />
               </el-form-item>
               <el-form-item label="车次窗高度:" prop="height">
-                <el-input-number v-model="addModel.height" style="width: 178px;" @change="handleChange" />
+                <el-input-number v-model="addModel.height" style="width: 178px;" />
               </el-form-item>
               <el-form-item>
                 <el-button-group>
diff --git a/src/views/newMap/newMapdraft/mapoperate/zcControl.vue b/src/views/newMap/newMapdraft/mapoperate/zcControl.vue
index bb3e6c688..becdcccc2 100644
--- a/src/views/newMap/newMapdraft/mapoperate/zcControl.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/zcControl.vue
@@ -122,7 +122,7 @@ export default {
                                 { prop: 'position.x', firstLevel: 'position', secondLevel: 'x', label: 'x:', type: 'number', labelWidth: '20px' },
                                 { prop: 'position.y', firstLevel: 'position', secondLevel: 'y', label: 'y:', type: 'number', labelWidth: '20px' }
                             ] },
-                            { prop:'concentrateStationList', label:this.$t('map.concentrateStationList'), type: 'multiSelect', optionLabel: 'name', optionValue: 'code', options: this.concertrateStation, deviceChange:this.changeConcertrateStation }
+                            { prop:'concentrateStationList', label:this.$t('map.concentrateStationList'), type: 'multiSelect', optionLabel: 'name', optionValue: 'code', options: this.concertrateStation, deviceChange: this.changeConcentrateStation }
                         ]
                     }
                 }
@@ -138,7 +138,7 @@ export default {
                         { prop: 'position.x', firstLevel: 'position', secondLevel: 'x', label: 'x:', type: 'number', labelWidth: '20px' },
                         { prop: 'position.y', firstLevel: 'position', secondLevel: 'y', label: 'y:', type: 'number', labelWidth: '20px' }
                     ] },
-                    { prop:'concentrateStationList', label:this.$t('map.concentrateStationList'), type: 'multiSelect', optionLabel: 'name', optionValue: 'code', options: this.concertrateStation }
+                    { prop:'concentrateStationList', label:this.$t('map.concentrateStationList'), type: 'multiSelect', optionLabel: 'name', optionValue: 'code', options: this.concertrateStation, deviceChange: this.changeConcentrateStation }
                 ]
             };
             return form;
@@ -176,6 +176,7 @@ export default {
             this.$emit('setCenter', code);
             this.deviceSelect(this.$store.getters['map/getDeviceByCode'](code));
         },
+        changeConcentrateStation() {},
         handleClick() {
             this.getConcertrateStation();
         },
@@ -191,7 +192,6 @@ export default {
         getConcertrateStation() {
             // 被选中的集中站站数据
             const beConcentrateStation = {};
-            this.zcList = this.$store.getters['map/zcList'];
             this.zcList.forEach(data=>{
                 data.concentrateStationList.forEach(concentrate=>{
                     beConcentrateStation[concentrate] = data.code;
diff --git a/src/views/planMonitor/editTool/menus/createEmptyPlan.vue b/src/views/planMonitor/editTool/menus/createEmptyPlan.vue
index fd3017917..6413edccf 100644
--- a/src/views/planMonitor/editTool/menus/createEmptyPlan.vue
+++ b/src/views/planMonitor/editTool/menus/createEmptyPlan.vue
@@ -227,9 +227,11 @@ export default {
                                     } else {
                                         importRunPlan({ mapId: that.$route.params.mapId || '02', runPlanList: jsonData }).then(response => {
                                             that.loadingDig.close();
-                                            that.$message.success(that.$t('tip.importOperationGraphSuccessfully'));
-                                            that.$emit('refresh');
+                                            if (response && response.code == 200) {
+                                                that.$message.success(that.$t('tip.importOperationGraphSuccessfully'));
+                                                that.$emit('refresh');
                                             // this.$emit('dispatchDialog', { name: 'openRunPlan', params: {type: 'add'} });
+                                            }
                                         }).catch(error => {
                                             that.loadingDig.close();
                                             that.$message.warning(`${that.$t('tip.importRunGraphFailed')} ${error.message}`);
diff --git a/src/jmapNew/theme/chengdu_03/planSchedule/index.vue b/src/views/planSchedule/index.vue
similarity index 80%
rename from src/jmapNew/theme/chengdu_03/planSchedule/index.vue
rename to src/views/planSchedule/index.vue
index 83cd8f1e3..913942880 100644
--- a/src/jmapNew/theme/chengdu_03/planSchedule/index.vue
+++ b/src/views/planSchedule/index.vue
@@ -6,12 +6,8 @@
     <status-bar ref="statusBar" :max-top="height" @setPosition="setPosition" />
 
     <manage-plan-list ref="managePlanList" @dispatchDialog="dispatchDialog" />
-    <create-week-plan ref="createWeekPlan" @reloadTable="reloadTable" />
     <create-today-plan ref="createTodayPlan" />
-    <modifying-plan ref="modifyingPlan" @dispatchDialog="dispatchDialog" />
-    <add-task ref="addTask" />
-    <delete-task ref="deleteTask" />
-    <modifying-task ref="modifyingTask" />
+    <create-week-plan ref="createWeekPlan" @reloadPlanList="reloadTable" />
   </div>
 </template>
 
@@ -20,13 +16,9 @@ import TitleBar from './titleBar';
 import MenuBar from './menuBar';
 import StatusBar from './statusBar';
 import Schedule from './schedule';
-import ManagePlanList from '../menusPlan/managePlanList';
-import CreateWeekPlan from '../menusPlan/createWeekPlan';
-import CreateTodayPlan from '../menusPlan/createTodayPlan';
-import ModifyingPlan from '../menusPlan/modifyingPlan';
-import AddTask from '../menusPlan/addTask';
-import DeleteTask from '../menusPlan/deleteTask';
-import ModifyingTask from '../menusPlan/modifyingTask';
+import ManagePlanList from './menusPlan/managePlanList';
+import CreateTodayPlan from './menusPlan/createTodayPlan';
+import CreateWeekPlan from './menusPlan/createWeekPlan';
 
 export default {
     name: 'Menus',
@@ -36,12 +28,8 @@ export default {
         StatusBar,
         Schedule,
         ManagePlanList,
-        CreateWeekPlan,
         CreateTodayPlan,
-        ModifyingPlan,
-        AddTask,
-        DeleteTask,
-        ModifyingTask
+        CreateWeekPlan
     },
     props: {
         group: {
@@ -56,7 +44,7 @@ export default {
     },
     computed: {
         skinCode() {
-            return this.$route.query.skinCode || '02';
+            return this.$route.query.skinCode;
         },
         width() {
             return this.$store.state.app.width;
@@ -135,8 +123,8 @@ export default {
         overflow: hidden !important;
     }
 
-    .beijing-01__schedule .el-dialog {
-        background: rgba(0, 85, 231, 1);
+    .plan-schedule-dialog .el-dialog {
+		background: #0099F8;
         box-shadow: 1px hsla(240, 0%, 100%, 0.5) inset;
         border: 2px solid #727375;
         border-radius: 4px;
@@ -144,34 +132,37 @@ export default {
         font-size: 14px;
     }
 
-    .beijing-01__schedule .el-dialog .el-dialog__header {
+    .plan-schedule-dialog .el-dialog .el-dialog__header {
         height: 30px;
         padding: 5px;
+		background: -webkit-linear-gradient(#0055E8, #0099F8);
+		background: -o-linear-gradient(#0055E8, #0099F8);
+		background: -moz-linear-gradient(#0055E8, #0099F8);
+		background: linear-gradient(#0055E8, #0099F8);
     }
 
-    .beijing-01__schedule .el-dialog .el-dialog__footer {
+    .plan-schedule-dialog .el-dialog .el-dialog__footer {
         background: #ECE9D8;
         opacity: 1;
     }
 
-    .beijing-01__schedule .el-dialog .el-dialog__body {
+    .plan-schedule-dialog .el-dialog .el-dialog__body {
         padding-top: 10px;
         padding-bottom: 10px;
         padding-left: 5px;
         padding-right: 5px;
         margin: 0px 3px 3px 3px;
-        border: 2px solid rgba(120, 121, 123, 0.5);
-        box-shadow: 1px hsla(240, 0%, 100%, 0.5) inset;
         color: #000;
-        background: #ECE9D8;
+        background: #FFFFFF;
         opacity: 1;
     }
 
-    .beijing-01__schedule .el-dialog .el-dialog__title {
+    .plan-schedule-dialog .el-dialog .el-dialog__title {
         font-size: 16px;
+		color: #ffffff;
     }
 
-    .beijing-01__schedule .el-dialog .el-dialog__headerbtn {
+    .plan-schedule-dialog .el-dialog .el-dialog__headerbtn {
         background: -webkit-linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
         background: -o-linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
         background: -moz-linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
@@ -184,11 +175,11 @@ export default {
         width: 26px;
     }
 
-    .beijing-01__schedule .el-dialog .el-dialog__headerbtn .el-icon-close:before {
+    .plan-schedule-dialog .el-dialog .el-dialog__headerbtn .el-icon-close:before {
         font-size: 16px;
     }
 
-    .beijing-01__schedule .el-dialog .el-dialog__headerbtn .el-dialog__close {
+    .plan-schedule-dialog .el-dialog .el-dialog__headerbtn .el-dialog__close {
         color: #fff;
     }
 
@@ -200,36 +191,29 @@ export default {
         background: #ECE9D8 !important;
     }
 
-    .beijing-01__schedule .el-dialog .el-button {
-        height: 32px;
-        line-height: 32px;
-        padding: 0px;
-        width: 80px;
-        border: 2px outset #E2E2E2;
-        border-radius: 0px !important;
-        color: #000;
-        background: #ECE9D8;
+    .plan-schedule-dialog .el-dialog .el-button .el-button--primary{
+        background: #0099F8;
     }
 
     .beijing-01__schedule .el-dialog .expand {
         width: 120px;
     }
 
-    .beijing-01__schedule .el-dialog .el-button:focus span {
-        border: 1px dashed gray;
-    }
+    /*.plan-schedule-dialog .el-dialog .el-button:focus span {*/
+        /*border: 1px dashed gray;*/
+    /*}*/
 
-    .beijing-01__schedule .el-dialog .el-button:active {
-        border: 2px inset #E2E2E2;
-    }
+    /*.plan-schedule-dialog .el-dialog .el-button:active {*/
+        /*border: 2px inset #E2E2E2;*/
+    /*}*/
 
-    .beijing-01__schedule .el-dialog .el-button:disabled {
-        border: 2px inset #E2E2E2;
-    }
+    /*.plan-schedule-dialog .el-dialog .el-button:disabled {*/
+        /*border: 2px inset #E2E2E2;*/
+    /*}*/
 
-    .beijing-01__schedule .el-dialog .el-button:disabled span {
-        border: 0px;
-    }
+    /*.plan-schedule-dialog .el-dialog .el-button:disabled span {*/
+        /*border: 0px;*/
+    /*}*/
 
     .beijing-01__schedule .el-dialog .button-group {
         margin: 0px 5px;
@@ -274,7 +258,7 @@ export default {
         color: #000 !important;
     }
 
-    .beijing-01__schedule .el-dialog .el-table .cell {
+    .plan-schedule-dialog .el-dialog .el-table .cell {
         line-height: unset !important;
     }
 
@@ -296,7 +280,7 @@ export default {
         top: 15px !important;
     }
 
-    .beijing-01__schedule .el-dialog .current-row>td {
+    .plan-schedule-dialog .el-dialog .current-row>td {
         background: #316AC5 !important;
         color: #fff !important;
     }
diff --git a/src/jmapNew/theme/chengdu_03/planSchedule/menuBar.vue b/src/views/planSchedule/menuBar.vue
similarity index 84%
rename from src/jmapNew/theme/chengdu_03/planSchedule/menuBar.vue
rename to src/views/planSchedule/menuBar.vue
index e64ae3063..5e3b63b01 100644
--- a/src/jmapNew/theme/chengdu_03/planSchedule/menuBar.vue
+++ b/src/views/planSchedule/menuBar.vue
@@ -138,75 +138,34 @@ export default {
             tempClassB: -1,
             menu: [
                 {
-                    title: '文件（F）',
-                    children: [
-                    ]
+                    title: '管理运行计划',
+                    click: this.handleViewPlanSchedule
                 },
                 {
-                    title: '显示（V）',
-                    children: [
-                        // {
-                        //     title: '缩放',
-                        // },
-                        // {
-                        //     title: '单色显示历史计划',
-                        // },
-                        // {
-                        //     title: '彩色显示历史计划'
-                        // }
-                    ]
-                },
-                {
-                    title: '编辑（E）',
-                    children: [
-                        // {
-                        //     title: '修改',
-                        //     click: this.handleEditPlanningTrain
-                        // },
-                        // {
-                        //     title: '加任务',
-                        //     click: this.handleAddTask
-                        // },
-                        // {
-                        //     title: '删任务',
-                        //     click: this.handleDeleteTask
-                        // },
-                        // {
-                        //     title: '改表号',
-                        //     click: this.handleModifyingPlanId
-                        // },
-                        // {
-                        //     title: '平移多辆车',
-                        //     click: this.handleTranslationalMulTrain
-                        // }
-                    ]
-                },
-                {
-                    title: '工具（T）',
-                    children: [
-                        {
-                            title: '查看计划列表',
-                            click: this.handleViewPlanSchedule
-                        },
-                        {
-                            title: '创建一周计划',
-                            click: this.handleCreateWeekPlan
-                        },
-                        {
-                            title: '加载当天计划',
-                            click: this.handleReloadTodayPlan
-                        }
-                        // {
-                        //     title: '有效性检查',
-                        //     click: this.handleValidityCheck
-                        // }
-                    ]
-                },
-                {
-                    title: '帮助（H）',
-                    children: [
-                    ]
+                    title: '运行图管理',
+                    click: this.handleReloadTodayPlan
                 }
+                // {
+                //     title: '工具（T）',
+                //     children: [
+                //         {
+                //             title: '查看计划列表',
+                //             click: this.handleViewPlanSchedule
+                //         },
+                //         {
+                //             title: '创建一周计划',
+                //             click: this.handleCreateWeekPlan
+                //         },
+                //         {
+                //             title: '加载当天计划',
+                //             click: this.handleReloadTodayPlan
+                //         }
+                //         // {
+                //         //     title: '有效性检查',
+                //         //     click: this.handleValidityCheck
+                //         // }
+                //     ]
+                // }
             ]
         };
     },
diff --git a/src/jmapNew/theme/chengdu_01/planSchedule/menuTool.vue b/src/views/planSchedule/menuTool.vue
similarity index 100%
rename from src/jmapNew/theme/chengdu_01/planSchedule/menuTool.vue
rename to src/views/planSchedule/menuTool.vue
diff --git a/src/jmapNew/theme/chengdu_03/menusPlan/components/dataTable.vue b/src/views/planSchedule/menusPlan/components/dataTable.vue
similarity index 100%
rename from src/jmapNew/theme/chengdu_03/menusPlan/components/dataTable.vue
rename to src/views/planSchedule/menusPlan/components/dataTable.vue
diff --git a/src/views/planSchedule/menusPlan/createTodayPlan.vue b/src/views/planSchedule/menusPlan/createTodayPlan.vue
new file mode 100644
index 000000000..28003b402
--- /dev/null
+++ b/src/views/planSchedule/menusPlan/createTodayPlan.vue
@@ -0,0 +1,114 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    :title="title"
+    class="plan-schedule-dialog"
+    :visible.sync="dialogShow"
+    width="80%"
+    :before-close="doClose"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <el-table :data="tableData" border>
+      <el-table-column
+        type="index"
+        label="序号"
+        width="50"
+      />
+      <el-table-column
+        property="name"
+        align="center"
+        label="运行图名称"
+      />
+      <el-table-column
+        property="$loading"
+        align="center"
+        label="当前状态"
+      >
+        <template slot-scope="scope">
+          <el-tag :type="scope.row.$loading?'success':'danger'">{{ scope.row.$loading? '已加载': '未加载' }}</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column
+        fixed="right"
+        label="操作"
+        align="center"
+        width="150"
+      >
+        <template slot-scope="scope">
+          <el-button type="primary" :loading="loading" size="small" :disabled="currentPlanId===scope.row.id" @click="handleClickLoad(scope.row)">加载</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-row type="flex" justify="center" style="margin-top: 10px">
+      <el-button size="small" @click="dialogShow = false">取 消</el-button>
+    </el-row>
+  </el-dialog>
+</template>
+
+<script>
+import { queryRunPlanList } from '@/api/runplan';
+import { simulationLoadRunPlan } from '@/api/simulation';
+
+export default {
+    name: 'ReloadTodayPlan',
+    data() {
+        return {
+            dialogShow: false,
+            loading: false,
+            tableData: [],
+            currentModel: {},
+            currentPlanId: ''
+        };
+    },
+    computed: {
+        title() {
+            return '运行图管理';
+        }
+    },
+    watch: {
+        '$store.state.runPlan.planLoadedCount': function() {
+            this.currentPlanId = this.$store.state.runPlan.planData.id;
+            this.tableData.forEach(item => {
+                item.$loading = item.id === this.currentPlanId;
+            });
+        }
+    },
+    methods: {
+        doShow() {
+            this.loading = false;
+            this.dialogShow = true;
+            this.initPageData();
+        },
+        doClose() {
+            this.dialogShow = false;
+        },
+        initPageData() {
+            this.tableData = [];
+            this.currentPlanId = this.$store.state.runPlan.planData.id;
+            queryRunPlanList(this.$route.query.mapId).then(resp =>{
+                if (resp.data && resp.data.length) {
+                    resp.data.forEach(item => {
+                        this.$set(item, '$loading', this.currentPlanId === item.id);
+                        this.tableData.push(item);
+                    });
+                }
+            }).catch(() => {
+                this.$message.error('获取地图模板运行图列表失败！');
+            });
+        },
+        handleClickLoad(row) {
+            this.loading = true;
+            simulationLoadRunPlan(this.$route.query.group, row.id).then(response => {
+                this.$message.success('仿真加载指定运行计划成功！');
+                this.loading = false;
+            }).catch(() => {
+                this.$message.error('仿真加载指定运行计划失败！');
+            });
+        }
+    }
+};
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+    @import "src/styles/mixin.scss";
+</style>
diff --git a/src/jmapNew/theme/haerbin_01/menusPlan/createWeekPlan.vue b/src/views/planSchedule/menusPlan/createWeekPlan.vue
similarity index 54%
rename from src/jmapNew/theme/haerbin_01/menusPlan/createWeekPlan.vue
rename to src/views/planSchedule/menusPlan/createWeekPlan.vue
index 469fd37d6..26066f48a 100644
--- a/src/jmapNew/theme/haerbin_01/menusPlan/createWeekPlan.vue
+++ b/src/views/planSchedule/menusPlan/createWeekPlan.vue
@@ -1,7 +1,7 @@
 <template>
   <el-dialog
     v-dialogDrag
-    class="fuzhou-01__schedule create-week-plan"
+    class="plan-schedule-dialog"
     :title="title"
     :visible.sync="dialogShow"
     width="800px"
@@ -11,24 +11,27 @@
     :close-on-click-modal="false"
   >
     <el-row>
-      <el-form ref="form" :model="model" :rules="rules" label-width="150px" size="small">
-        <el-form-item :label="this.$t('menu.runGraphName') + this.$t('global.colon')" prop="planId">
+      <el-form v-if="dialogShow" 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">{{ this.$t('global.select') }}</el-button>
-            </el-col>
+            <el-select v-model="model.planId">
+              <el-option
+                v-for="item in runPlanList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              />
+            </el-select>
           </el-row>
         </el-form-item>
-        <el-form-item :label="this.$t('menu.plannedDateRange') + this.$t('global.colon')" prop="dateList">
+        <el-form-item label="计划日期范围:" prop="dateList">
           <el-row>
             <el-date-picker
               v-model="model.dateList"
               type="dates"
               :clearable="false"
-              :placeholder="this.$t('rules.selectOneOrMoreDates')"
+              :picker-options="pickerOptions"
+              placeholder="选择一个或多个日期"
               value-format="yyyy-MM-dd"
             />
           </el-row>
@@ -36,22 +39,18 @@
       </el-form>
     </el-row>
     <el-row type="flex" justify="center" class="button-group">
-      <el-button @click="create">{{ $t('global.confirm') }}</el-button>
-      <el-button @click="doClose">{{ $t('global.cancel') }}</el-button>
+      <el-button type="primary" size="small" @click="create">确 定</el-button>
+      <el-button size="small" @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 { queryRunPlanList } from '@/api/runplan';
 
 export default {
     name: 'CreateWeekPlan',
-    components: {
-        ChooseTemplatePlan
-    },
     data() {
         return {
             dialogShow: false,
@@ -60,20 +59,26 @@ export default {
                 planId: '',
                 planName: '',
                 dateList: []
+            },
+            runPlanList: [],
+            pickerOptions: {
+                disabledDate(time) {
+                    return time.getTime() < Date.now() - 24 * 3600 * 1000;
+                }
             }
         };
     },
     computed: {
         title() {
-            return this.$t('menu.createAWeekPlan');
+            return '创建运行计划';
         },
         rules() {
             const rules = {
                 planId: [
-                    { required: true, message: this.$t('rules.inputTemplateRunPlan'), trigger: 'blur' }
+                    { required: true, message: '请选择模板运行图', trigger: 'blur' }
                 ],
                 dateList: [
-                    { required: true, message: this.$t('rules.selectAPlannedDateRange'), trigger: 'change' }
+                    { required: true, message: '请选择计划日期范围', trigger: 'change' }
                 ]
             };
 
@@ -83,12 +88,25 @@ export default {
     mounted() {
     },
     methods: {
-        doShow(params) {
+        doShow() {
             this.dialogShow = true;
+            this.runPlanList = [];
+            queryRunPlanList(this.$route.query.mapId).then(resp =>{
+                if (resp.data && resp.data.length) {
+                    this.runPlanList = resp.data;
+                }
+            }).catch(() => {
+                this.$message.error('获取地图模板运行图列表失败！');
+            });
         },
         doClose() {
             this.loading = false;
             this.dialogShow = false;
+            this.model = {
+                planId: '',
+                planName: '',
+                dateList: []
+            };
         },
         handleChoose() {
             this.$refs.choose.doShow();
@@ -110,11 +128,12 @@ export default {
             this.$refs['form'].validate((valid) => {
                 if (valid) {
                     createRunPlanLoad(this.buildModel()).then(response => {
-                        this.$message.success(this.$t('tip.createRunChartPlanSuccessfully'));
+                        this.$message.success('创建运行图计划成功');
+                        this.$emit('reloadPlanList', {name:'managePlanList'});
                         this.doClose();
                     }).catch(() => {
                         this.doClose();
-                        this.$messageBox(this.$t('tip.createRunChartPlanFailed'));
+                        this.$messageBox('创建运行图计划失败');
                     });
                 }
             });
@@ -133,5 +152,9 @@ export default {
         .el-row {
             margin: 10px;
         }
+		.el-form-item__label{
+			height: 53px;
+			line-height: 53px;
+		}
     }
 </style>
diff --git a/src/jmapNew/theme/xian_02/menusPlan/managePlanList.vue b/src/views/planSchedule/menusPlan/managePlanList.vue
similarity index 79%
rename from src/jmapNew/theme/xian_02/menusPlan/managePlanList.vue
rename to src/views/planSchedule/menusPlan/managePlanList.vue
index 034b461b6..635c078f0 100644
--- a/src/jmapNew/theme/xian_02/menusPlan/managePlanList.vue
+++ b/src/views/planSchedule/menusPlan/managePlanList.vue
@@ -1,7 +1,7 @@
 <template>
   <el-dialog
     v-dialogDrag
-    class="ningbo-01__schedule manage-plan-list"
+    class="plan-schedule-dialog"
     :title="title"
     :visible.sync="dialogShow"
     width="80%"
@@ -15,8 +15,7 @@
 </template>
 
 <script>
-import { getRunPlanLoadList, deleteRunPlanLoad, listAllTempLateRunPlan } from '@/api/runplan';
-import { getPublishMapListOnline } from '@/api/jmap/map';
+import { getRunPlanLoadList, deleteRunPlanLoad, queryRunPlanList } from '@/api/runplan';
 
 export default {
     name: 'ManagePlanList',
@@ -30,20 +29,14 @@ export default {
             },
             queryForm: {
                 labelWidth: '140px',
-                reset: true
+                // reset: true,
+                offsetSpan: 20
             },
             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',
@@ -78,7 +71,7 @@ export default {
     },
     computed: {
         title() {
-            return '运行图计划表';
+            return '管理运行计划';
         }
     },
     mounted() {
@@ -86,12 +79,8 @@ export default {
     },
     methods: {
         loadPageData() {
-            this.mapList = [];
-            getPublishMapListOnline().then(resp => {
-                this.mapList = resp.data;
-            });
             this.templatePlanList = [];
-            listAllTempLateRunPlan().then(resp => {
+            queryRunPlanList(this.$route.query.mapId).then(resp => {
                 this.templatePlanList = resp.data;
             });
         },
@@ -107,7 +96,7 @@ export default {
             return getRunPlanLoadList(params);
         },
         handleDelete(index, row) {
-            this.$confirm('此操作将删除次日加载的运行图, 是否继续?', '提示', {
+            this.$confirm('此操作将删除运行图, 是否继续?', '提示', {
                 confirmButtonText: '确定',
                 cancelButtonText: '取消',
                 type: 'warning'
@@ -139,5 +128,5 @@ export default {
 };
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
-    @import "src/styles/mixin.scss";
+    /*@import "src/styles/mixin.scss";*/
 </style>
diff --git a/src/jmapNew/theme/chengdu_03/planSchedule/schedule.vue b/src/views/planSchedule/schedule.vue
similarity index 99%
rename from src/jmapNew/theme/chengdu_03/planSchedule/schedule.vue
rename to src/views/planSchedule/schedule.vue
index 243166af0..f8a7fd69e 100644
--- a/src/jmapNew/theme/chengdu_03/planSchedule/schedule.vue
+++ b/src/views/planSchedule/schedule.vue
@@ -25,7 +25,7 @@
 <script>
 import { mapGetters } from 'vuex';
 import { timeFormat } from '@/utils/date';
-import DataTable from '../menusPlan/components/dataTable';
+import DataTable from './menusPlan/components/dataTable';
 import echarts from 'echarts';
 import {toTimeStamp, formatDuring} from '@/utils/date';
 
diff --git a/src/jmapNew/theme/haerbin_01/planSchedule/statusBar.vue b/src/views/planSchedule/statusBar.vue
similarity index 88%
rename from src/jmapNew/theme/haerbin_01/planSchedule/statusBar.vue
rename to src/views/planSchedule/statusBar.vue
index d21265950..f7df3461d 100644
--- a/src/jmapNew/theme/haerbin_01/planSchedule/statusBar.vue
+++ b/src/views/planSchedule/statusBar.vue
@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import DataTable from '../menusPlan/components/dataTable';
+import DataTable from './menusPlan/components/dataTable';
 import { formatTime, formatName } from '@/utils/runPlan';
 
 export default {
@@ -36,24 +36,24 @@ export default {
                 columns: [
                     {
                         prop: 'stationName',
-                        label: this.$t('menu.platform'),
+                        label: '站台',
                         width: 400
                     },
                     {
                         prop: 'startTime',
-                        label: this.$t('menu.arrivalTime')
+                        label: '到点'
                     },
                     {
                         prop: 'stopTime',
-                        label: this.$t('menu.stopTime')
+                        label: '停站时间'
                     },
                     {
                         prop: 'endTime',
-                        label: this.$t('menu.departureTime')
+                        label: '发点'
                     },
                     {
                         prop: 'level',
-                        label: this.$t('menu.runLevel')
+                        label: '运行等级'
 
                     }
                 ]
@@ -96,7 +96,7 @@ export default {
 };
 </script>
 
-<style scoped rel="stylesheet/scss" lang="scss">
+<style scoped rel="stylesheet/scss" lang="scss" scoped>
     @import "src/styles/mixin.scss";
 
     #PlanStatusBar {
diff --git a/src/jmapNew/theme/fuzhou_01/planSchedule/titleBar.vue b/src/views/planSchedule/titleBar.vue
similarity index 83%
rename from src/jmapNew/theme/fuzhou_01/planSchedule/titleBar.vue
rename to src/views/planSchedule/titleBar.vue
index 56e459044..340a98456 100644
--- a/src/jmapNew/theme/fuzhou_01/planSchedule/titleBar.vue
+++ b/src/views/planSchedule/titleBar.vue
@@ -8,15 +8,17 @@
 </template>
 
 <script>
-import logo_ from '@/assets/logo_.png';
+// import logo_ from '@/assets/logo_.png';
 import { getPublishMapInfo } from '@/api/jmap/map';
+import { ProjectIcon } from '@/scripts/ProjectConfig';
+import { getSessionStorage } from '@/utils/auth';
 
 export default {
     name: 'PlanTitleBar',
     data() {
         return {
             mapName: '',
-            logoImg: logo_
+            logoImg: ''
         };
     },
     computed: {
@@ -25,6 +27,8 @@ export default {
         }
     },
     mounted() {
+        const project = getSessionStorage('project');
+        this.logoImg = ProjectIcon[project];
         if (this.$route.query.mapId) {
             getPublishMapInfo(this.$route.query.mapId).then(resp => {
                 this.mapName = resp.data.name;
@@ -38,7 +42,7 @@ export default {
     }
 };
 </script>
-<style scoped rel="stylesheet/scss" lang="scss">
+<style scoped rel="stylesheet/scss" lang="scss" scoped>
     @import "src/styles/mixin.scss";
     $width: 25px;
     $height: 25px;
diff --git a/src/views/publish/publishMap/draft.vue b/src/views/publish/publishMap/draft.vue
index 914fa7aa5..1fd90ba2e 100644
--- a/src/views/publish/publishMap/draft.vue
+++ b/src/views/publish/publishMap/draft.vue
@@ -78,23 +78,15 @@ export default {
             return crules;
         }
     },
-    mounted() {
-        this.loadInitData();
-    },
     methods: {
-        async loadInitData() {
-            this.cityList = [];
-            const res = await this.$Dictionary.cityType();
-            this.cityList = res.map(elem => { return { value: elem.code, label: elem.name }; });
-        },
-        doShow(row) {
+        doShow({row, cityList}) {
             this.formModel.mapId = row.id;
             if (this.type == 'updateMapName') {
                 this.formModel.name = row.name;
             } else {
+                this.cityList = cityList.map(elem => { return { value: elem.code, label: elem.name }; });
                 this.formModel.cityCode = row.cityCode;
             }
-
             this.dialogVisible = true;
         },
         doCreate() {
diff --git a/src/views/publish/publishMap/index.vue b/src/views/publish/publishMap/index.vue
index 1b232a9f1..c2e32b304 100644
--- a/src/views/publish/publishMap/index.vue
+++ b/src/views/publish/publishMap/index.vue
@@ -117,11 +117,11 @@ export default {
                                 name: this.$t('global.exportMap'),
                                 handleClick: this.handleExportMap
                             },
-                            {
-                                name: this.$t('global.export'),
-                                handleClick: this.handleExportMapSame,
-                                showControl: () => { return process.env.NODE_ENV === 'development'; }
-                            },
+                            // {
+                            //     name: this.$t('global.export'),
+                            //     handleClick: this.handleExportMapSame,
+                            //     showControl: () => { return process.env.NODE_ENV === 'development'; }
+                            // },
                             {
                                 name: this.$t('publish.setTheProject'),
                                 handleClick: this.handleSetProject
@@ -175,7 +175,7 @@ export default {
         },
         // 编辑名称
         handleUpdate(index, row) {
-            this.$refs.updateMapName.doShow(row);
+            this.$refs.updateMapName.doShow({row:row});
         },
         handleSetProject(index, row) {
             this.$refs.setProject.doShow(row);
@@ -185,7 +185,7 @@ export default {
         },
         // 编辑城市
         handleUpdateCity(index, row) {
-            this.$refs.updateCityName.doShow(row);
+            this.$refs.updateCityName.doShow({row:row, cityList:this.cityList});
         },
         // 删除
         handleDelete(index, row) {
@@ -263,34 +263,38 @@ export default {
             }).catch(() => { });
         },
 
-        // 导出地图
+        // 导出地图 json
         async handleExportMap(index, row) {
-            const res = await getPublishMapExport(row.id);
-            const resultData = res.data;
-            if (resultData === false) {
-                return;
-            }
-
-            // const self = this;
-            // import('@/utils/Export2Excel').then(excel => {
-            // 	self.queryExportData(resultData).then(data => {
-            // 		excel.export_json_excel(data, resultData.name);
-            // 	}).catch(error => {
-            // 		self.$message.error(`${this.$t('error.exportException')}:${error.message}`);
-            // 	});
-            // });
-
-            const content = new Blob([JSON.stringify(resultData)]);
-            const urlObject = window.URL || window.webkitURL || window;
-            const url = urlObject.createObjectURL(content);
-            const el = document.createElement('a');
-            el.href = url;
-            el.download = `${resultData.name}.json`;
-            el.click();
-            urlObject.revokeObjectURL(url);
+            this.$confirm('您是否导出地图数据？', this.$t('global.tips'), {
+                confirmButtonText: this.$t('global.confirm'),
+                cancelButtonText: this.$t('global.cancel'),
+                type: 'warning'
+            }).then(async () => {
+                const res = await getPublishMapExport(row.id);
+                const resultData = res.data;
+                if (resultData === false) {
+                    return;
+                }
+                // const self = this;
+                // import('@/utils/Export2Excel').then(excel => {
+                // 	self.queryExportData(resultData).then(data => {
+                // 		excel.export_json_excel(data, resultData.name);
+                // 	}).catch(error => {
+                // 		self.$message.error(`${this.$t('error.exportException')}:${error.message}`);
+                // 	});
+                // });
+                const content = new Blob([JSON.stringify(resultData)]);
+                const urlObject = window.URL || window.webkitURL || window;
+                const url = urlObject.createObjectURL(content);
+                const el = document.createElement('a');
+                el.href = url;
+                el.download = `${resultData.name}.json`;
+                el.click();
+                urlObject.revokeObjectURL(url);
+            }).catch(() => { });
         },
 
-        // 部分导出
+        // 导出地图 exls
         async handleExportMapSame(index, row) {
             const res = await getPublishMapExport(row.id);
             const resultData = res.data;
@@ -307,14 +311,17 @@ export default {
             	});
             });
         },
-        async handleSimulationCheck(index, row) {
-            const res = await simulationCheck(row.id);
-            if (!res.data.length) {
-                this.$message.success(this.$t('publish.simulationDataIsValidated'));
-                return;
-            }
-            this.tableToExcel(res.data);
-            this.$messageBox(this.$t('tip.dataValidationFailed'));
+        handleSimulationCheck(index, row) {
+            simulationCheck(row.id).then(res=>{
+                if (!res.data.length) {
+                    this.$message.success(this.$t('publish.simulationDataIsValidated'));
+                    return;
+                }
+                this.tableToExcel(res.data);
+                this.$messageBox(this.$t('tip.dataValidationFailed'));
+            }).catch(error=>{
+                this.$messageBox(this.$t('tip.dataValidationFailed') + error.message);
+            });
         },
         tableToExcel(data) {
             const filterVal = ['index'];
diff --git a/src/views/publish/runPlanCommon/chooseTemplatePlan.vue b/src/views/publish/runPlanCommon/chooseTemplatePlan.vue
index 4a41eae46..5ec78a9a7 100644
--- a/src/views/publish/runPlanCommon/chooseTemplatePlan.vue
+++ b/src/views/publish/runPlanCommon/chooseTemplatePlan.vue
@@ -75,7 +75,9 @@ export default {
             this.loading = false;
             this.dialogShow = true;
             this.loadInitData();
-            this.reloadTable();
+            if (this.mapId) {
+                this.reloadTable();
+            }
         },
         doClose() {
             this.dialogShow = false;
diff --git a/src/views/publish/runPlanTemplate/copyPlan.vue b/src/views/publish/runPlanTemplate/copyPlan.vue
index 12aca3c3b..9c7100184 100644
--- a/src/views/publish/runPlanTemplate/copyPlan.vue
+++ b/src/views/publish/runPlanTemplate/copyPlan.vue
@@ -24,8 +24,6 @@
 </template>
 
 <script>
-import { getPublishMapListOnline } from '@/api/jmap/map';
-
 export default {
     data() {
         return {
@@ -54,22 +52,20 @@ export default {
         }
     },
     methods: {
-        doShow(row) {
+        doShow({row, mapList}) {
             this.formMdoel.id = row.id;
             this.formMdoel.name = row.name;
             this.formMdoel.mapId = '';
             this.show = true;
-            getPublishMapListOnline().then(response => {
-                this.mapIdList = response.data;
-                if (this.mapIdList.length) {
-                    this.mapIdList.forEach(item => {
-                        item.disabled = false;
-                        if (item.id === row.mapId) {
-                            item.disabled = true;
-                        }
-                    });
-                }
-            });
+            this.mapIdList = mapList;
+            if (this.mapIdList.length) {
+                this.mapIdList.forEach(item => {
+                    item.disabled = false;
+                    if (item.id === row.mapId) {
+                        item.disabled = true;
+                    }
+                });
+            }
         },
         doClose(done) {
             this.show = false;
diff --git a/src/views/publish/runPlanTemplate/index.vue b/src/views/publish/runPlanTemplate/index.vue
index 4c764d5e3..2771ad952 100644
--- a/src/views/publish/runPlanTemplate/index.vue
+++ b/src/views/publish/runPlanTemplate/index.vue
@@ -135,7 +135,7 @@ export default {
         },
         // 复制运行图
         handleCopyPlan(index, row) {
-            this.$refs.copyPlan.doShow(row);
+            this.$refs.copyPlan.doShow({row:row, mapList:this.mapIdList});
         },
         // 生成每日运行图
         handleGenerateEveryDay(planId, mapId) {
diff --git a/src/views/scriptManage/create.vue b/src/views/scriptManage/create.vue
index d44315f53..8e990e401 100644
--- a/src/views/scriptManage/create.vue
+++ b/src/views/scriptManage/create.vue
@@ -9,7 +9,7 @@
 </template>
 
 <script>
-import { getQuestById} from '@/api/quest';
+import { getScriptByIdBasic} from '@/api/script';
 
 export default {
     name: 'ScriptDraft',
@@ -77,7 +77,7 @@ export default {
         },
         doShow(questid) {
             if (questid) {
-                getQuestById(questid).then(resp=>{
+                getScriptByIdBasic(questid).then(resp=>{
                     const data = {'name':resp.data.name, 'description':resp.data.description, 'mapId':resp.data.mapId};
                     this.formModel = data;
                     this.formModel.id = questid;
diff --git a/src/views/scriptManage/home.vue b/src/views/scriptManage/home.vue
index d357b1f5a..eab6a2dc8 100644
--- a/src/views/scriptManage/home.vue
+++ b/src/views/scriptManage/home.vue
@@ -16,7 +16,7 @@ import Cookies from 'js-cookie';
 import ConstConfig from '@/scripts/ConstConfig';
 import { UrlConfig } from '@/scripts/ConstDic';
 import { admin, superAdmin} from '@/router/index_APP_TARGET';
-import { getQuestPageList, createQuest, deleteQuest, updateQuest, publishQuest, retractQuest} from '@/api/quest';
+import {retractScript, publishScript, updateScript, deleteScript, getScriptPageList, createScript} from '@/api/script';
 import { launchFullscreen } from '@/utils/screen';
 import { scriptDraftRecordNotify, scriptRecordNotify, scriptRecordNotifyNew } from '@/api/simulation';
 import CreateScript from './create';
@@ -117,7 +117,7 @@ export default {
     },
     methods: {
         queryFunction(params) {
-            return getQuestPageList(this.$route.params.mapId, params);
+            return getScriptPageList(this.$route.params.mapId, params);
         },
         reloadTable() {
             if (this.queryList && this.queryList.reload) {
@@ -151,7 +151,7 @@ export default {
                 cancelButtonText: this.$t('global.cancel'),
                 type: 'warning'
             }).then(() => {
-                deleteQuest(row.id).then(response => {
+                deleteScript(row.id).then(response => {
                     this.$message.success(this.$t('scriptRecord.deleteScriptSucess'));
                     this.reloadTable();
                 }).catch(() => {
@@ -166,7 +166,7 @@ export default {
             } else {
                 data.lang = 'zh';
             }
-            createQuest(data).then(resp => {
+            createScript(data).then(resp => {
                 this.reloadTable();
                 this.$message.success(this.$t('scriptRecord.createScriptSuccess'));
             }).catch(error => {
@@ -184,7 +184,7 @@ export default {
             } else {
                 data.lang = 'zh';
             }
-            updateQuest(data.id, data).then(resp => {
+            updateScript(data.id, data).then(resp => {
                 this.reloadTable();
                 this.$message.success(this.$t('scriptRecord.modifyScriptSuccess'));
             }).catch(error => {
@@ -216,7 +216,7 @@ export default {
             return lastData.status;
         },
         handleConfirmPublish(data) {
-            publishQuest(data.id, {'scriptName':data.scriptName}).then(resp => {
+            publishScript(data.id, {'scriptName':data.scriptName}).then(resp => {
                 this.reloadTable();
                 this.$message.success(this.$t('scriptRecord.publishScriptSuccess'));
             }).catch(error => {
@@ -232,7 +232,7 @@ export default {
                     cancelButtonText: this.$t('global.cancel'),
                     type: 'warning'
                 }).then(() => {
-                    publishQuest(row.id, {name:''}).then(resp => {
+                    publishScript(row.id, {name:''}).then(resp => {
                         this.reloadTable();
                         this.$message.success(this.$t('scriptRecord.releaseScriptSuccess'));
                     }).catch(error => {
@@ -255,7 +255,7 @@ export default {
                 cancelButtonText: this.$t('global.cancel'),
                 type: 'warning'
             }).then(() => {
-                retractQuest(row.id).then(resp => {
+                retractScript(row.id).then(resp => {
                     this.reloadTable();
                     this.$message.success(this.$t('approval.revokeScriptSuccess'));
                 }).catch(error => {
diff --git a/src/views/trainRoom/e-chat.vue b/src/views/trainRoom/e-chat.vue
index e96f035bf..f6431ca08 100644
--- a/src/views/trainRoom/e-chat.vue
+++ b/src/views/trainRoom/e-chat.vue
@@ -9,23 +9,41 @@
         <div v-for="(nor, index) in textList" :key="index" style="margin-top: 5px;">
           <li v-if="nor.self" style="position: relative">
             <div class="userName" style="position: absolute; right: 4px; top: 4px; font-size: 14px;">
-              {{ nor.chatTime }} {{ nor.userName }}</div>
+              {{ covertTime(nor.chatTime) }} {{ nor.userName }}</div>
             <div class="news">
               <span>{{ nor.value }}</span>
             </div>
+            <div v-if="nor.voice" class="yuyin" @click="playAudio(nor)">
+              <i class="el-icon-caret-right" />
+            </div>
           </li>
           <li v-if="nor.other" style="position: relative">
             <div class="userName" style="position: absolute; left: 12px; top: 4px; font-size: 14px;">
-              {{ nor.userName }} {{ nor.chatTime }}</div>
+              {{ nor.userName }} {{ covertTime(nor.chatTime) }}</div>
             <div class="answers">
               <span>{{ nor.value }}</span>
             </div>
+            <div v-if="nor.voice" class="yuyin1" @click="playAudio(nor)">
+              <i class="el-icon-caret-right" />
+            </div>
           </li>
-          <li v-if="nor.join" style="font-size: 12px; text-align: center;">{{ nor.roomTip }}</li>
+          <li v-if="nor.join" class="roomTip">{{ nor.roomTip }}</li>
         </div>
       </ul>
+      <div v-if="recordSending" class="chat_record_tip">
+        <div id="record_progress_bar" :style="'width:'+100/60*seconds+'%'" />
+        <div class="record_icon" />
+        <div class="record_tip_text">正在录音...</div>
+        <div class="record_tip_confirm" @click="stopRecording()">确定</div>
+        <div class="record_tip_cancle" @click="cancleRecording()">取消</div>
+      </div>
     </div>
     <div class="chat__footer">
+      <div class="chat_tool">
+        <div class="microphoneBtn" @click="startRecording()">
+          <span class="el-icon-microphone" />
+        </div>
+      </div>
       <textarea id="dope" v-model="text" class="chat__footer--text" style="width: 99%;height: 47px; border: none;outline: none;" @keyup="handleSetInputState" />
       <button class="chat__footer--send" :disabled="disabled" @click="handleSendText">{{ $t('trainRoom.sendText') }}</button>
     </div>
@@ -33,7 +51,9 @@
 </template>
 
 <script>
-import { chatWithText } from '@/api/chat';
+// import HZRecorder from '@/utils/HZRecorder';
+import RecordRTC from 'recordrtc';
+import { chatWithText, chatWithAudio } from '@/api/chat';
 import { chatWithTextNew } from '@/api/jointTraining';
 
 export default {
@@ -54,15 +74,19 @@ export default {
     data() {
         return {
             textList: [],
+            recordSending:false,
             text: '',
+            seconds:0,
+            inter:null,
+            recorders: null,
             sending: false,
-            background: '',
-            disabled:true
+            disabled:true,
+            microphone:null
         };
     },
     computed: {
         listHeight() {
-            return this.height - 90;
+            return this.height - 119;
         },
         group() {
             return this.$route.query.group;
@@ -89,6 +113,9 @@ export default {
                 this.disabled = false;
             }
         },
+        covertTime(time) {
+            return time.slice(0, time.indexOf('.'));
+        },
         async handleSendText() {
             try {
                 if (this.text.trim()) {
@@ -118,6 +145,193 @@ export default {
                     this.$refs.content.scrollTop = this.$refs.content.scrollHeight;
                 }
             });
+        },
+        // 语音录制开始
+        startRecording() {
+            const that = this;
+            if (!this.recordSending && !this.recorders && !this.microphone) {
+                navigator.getUserMedia(
+                    { audio: true } // 只启用音频
+                    , function (stream) {
+                        that.microphone = stream;
+                        that.recorders = new RecordRTC(that.microphone, {
+                            type: 'audio',
+                            checkForInactiveTracks: true
+                        });
+                        that.recorders.startRecording();
+                        that.recordSending = true;
+                        that.inter = setInterval(() => {
+                            if (that.seconds < 60) {
+                                that.seconds++;
+                            } else {
+                                clearInterval(that.inter);
+                            }
+                        }, 1000);
+                    }, function (error) {
+                        switch (error.code || error.name) {
+                        case 'PERMISSION_DENIED':
+                        case 'PermissionDeniedError':
+                            that.$message({
+                                showClose: true,
+                                message: '用户拒绝提供信息',
+                                type: 'error'
+                            });
+                            break;
+                        case 'NOT_SUPPORTED_ERROR':
+                        case 'NotSupportedError':
+                            that.$message({
+                                showClose: true,
+                                message: '浏览器不支持硬件设备',
+                                type: 'error'
+                            });
+                            break;
+                        case 'MANDATORY_UNSATISFIED_ERROR':
+                        case 'MandatoryUnsatisfiedError':
+                            that.$message({
+                                showClose: true,
+                                message: '无法发现指定的硬件设备',
+                                type: 'error'
+                            });
+                            break;
+                        default:
+                            that.$message({
+                                showClose: true,
+                                message: '无法打开麦克风',
+                                type: 'error'
+                            });
+                            break;
+                        }
+                    }
+                );
+                // HZRecorder.init.get(rec => {
+                //     if (typeof rec == 'object') {
+                //         this.recorders = rec;
+                //         this.recorders.start();
+                //         this.recordSending = true;
+                //     }
+                // });
+            }
+        },
+        // 停止录制
+        stopRecording() {
+            const that = this;
+            this.recorders.stopRecording(function(blobURL) {
+                const data = URL.createObjectURL(that.recorders.getBlob());
+                console.log('--------', data);
+                clearInterval(that.inter);
+                that.seconds = 0;
+                const blob = that.recorders.getBlob();
+                const fd = new FormData();
+                fd.append('file', blob);
+                chatWithAudio(fd, that.$route.query.group).then((res)=>{
+                    this.recordSending = false;
+                    that.$message({
+                        showClose: true,
+                        message: '语音发送成功',
+                        type: 'success'
+                    });
+                }).catch(error => {
+                    // this.sending = false;
+                    that.recordSending = false;
+                    const message = JSON.parse(error.message);
+                    if (message.err_no == 3301) {
+                        that.$message({
+                            showClose: true,
+                            message: '音频质量有问题',
+                            type: 'error'
+                        });
+                    } else if (message.err_no == 3308) {
+                        that.$message({
+                            showClose: true,
+                            message: '音频过长,建议60s以下',
+                            type: 'error'
+                        });
+                    } else if (message.err_no == 3314) {
+                        that.$message({
+                            showClose: true,
+                            message: '音频太短,建议重录',
+                            type: 'error'
+                        });
+                    } else {
+                        that.$message({
+                            showClose: true,
+                            message: '网络问题，请重试',
+                            type: 'error'
+                        });
+                    }
+                });
+                if (that.microphone) {
+                    that.microphone.stop();
+                    that.microphone = null;
+                    that.recordSending = false;
+                    that.recorders = null;
+                }
+            });
+            // this.sending = true;
+            // if (this.recorders) {
+            //     this.recorders.stop();
+            //     var fd = new FormData();
+            //     fd.append('file', this.recorders.getBlob());
+            //     chatWithAudio(fd, this.$route.query.group).then((res)=>{
+            //         this.recordSending = false;
+            //         this.$message({
+            //             showClose: true,
+            //             message: '语音发送成功',
+            //             type: 'success'
+            //         });
+            //     }).catch(error => {
+            //         // this.sending = false;
+            //         this.recordSending = false;
+            //         const message = JSON.parse(error.message);
+            //         if (message.err_no == 3301) {
+            //             this.$message({
+            //                 showClose: true,
+            //                 message: '音频质量有问题',
+            //                 type: 'error'
+            //             });
+            //         } else if (message.err_no == 3308) {
+            //             this.$message({
+            //                 showClose: true,
+            //                 message: '音频过长,建议60s以下',
+            //                 type: 'error'
+            //             });
+            //         } else if (message.err_no == 3314) {
+            //             this.$message({
+            //                 showClose: true,
+            //                 message: '音频太短,建议重录',
+            //                 type: 'error'
+            //             });
+            //         } else {
+            //             this.$message({
+            //                 showClose: true,
+            //                 message: '网络问题，请重试',
+            //                 type: 'error'
+            //             });
+            //         }
+            //     });
+            //     this.recorders = null;
+            // } else {
+            //     // this.sending = false;
+            //     this.$message({
+            //         showClose: true,
+            //         message: '音频太短,建议重录',
+            //         type: 'error'
+            //     });
+            // }
+        },
+        cancleRecording() {
+            if (this.microphone) {
+                clearInterval(this.inter);
+                this.seconds = 0;
+                this.microphone.stop();
+                this.microphone = null;
+                this.recordSending = false;
+                this.recorders = null;
+            }
+        },
+        playAudio(nor) {
+            this.$refs.audio.src = nor.src;
+            this.$refs.audio.play();
         }
     }
 };
@@ -165,6 +379,7 @@ export default {
             overflow-y: scroll;
             padding-right: 8px;
             padding-left: 2px;
+            position: relative;
 			&--list {
 				list-style: none;
 				margin: 0;
@@ -174,7 +389,29 @@ export default {
 					width: 100%;
 					overflow: hidden;
 					padding-top: 8px;
-				}
+                }
+
+                .yuyin {
+                    width: 20px;
+                    height: 20px;
+                    cursor: pointer;
+                    margin-top: 21px;
+                    margin-right: 3px;
+                    float: right;
+                    border: 1px solid #ccc;
+                    border-radius: 50%;
+                }
+
+                .yuyin1 {
+                    width: 20px;
+                    height: 20px;
+                    cursor: pointer;
+                    margin-top: 21px;
+                    margin-left: 3px;
+                    float: left;
+                    border: 1px solid #ccc;
+                    border-radius: 50%;
+                }
 
 				.news {
 					max-width: 55%;
@@ -206,16 +443,102 @@ export default {
 					position: relative;
 					float: left;
 					text-align: left;
-				}
+                }
+
+                .roomTip{
+                    font-size: 12px;
+                    text-align: center;
+                }
 			}
         }
 
+        #record_progress_bar{
+            height: 100%;
+            position: absolute;
+            background: #bbe5f5;
+        }
+
+        .chat_record_tip{
+            height: 28px;
+            display: inline-block;
+            background: #dfe6ee;
+            width: 100%;
+            font-size: 13px;
+            border-top: 1px #d8dce5 solid;
+            position: absolute;
+            bottom: 0;
+            right: 0;
+        }
+        .record_icon{
+            display: inline-block;
+            width: 8px;
+            height: 8px;
+            background: #25d825;
+            border-radius: 10px;
+            left: 7px;
+            margin-right: 0px;
+            box-shadow: -1px 0px 3px #6d6d6d;
+            border: 1px #28d228 solid;
+            position: absolute;
+            top: 10px;
+        }
+        .record_tip_text{
+            display: inline-block;
+            font-size: 12px;
+            margin-left: 3px;
+            // padding: 8px 0px 6px 0px;
+            position: absolute;
+            top: 8px;
+            left:20px
+        }
+        .record_tip_confirm{
+            position: absolute;
+            right: 63px;
+            padding: 3px 0px 2px 0px;
+            border: 1px #a2a5aa solid;
+            border-radius: 5px;
+            width: 45px;
+            text-align: center;
+            font-size: 12px;
+            top: 4px;
+            background: #eeeeee;
+            cursor: pointer;
+        }
+        .record_tip_cancle{
+            position: absolute;
+            right: 10px;
+            padding: 3px 0px 2px 0px;
+            border: 1px #a2a5aa solid;
+            border-radius: 5px;
+            width: 45px;
+            text-align: center;
+            font-size: 12px;
+            top: 4px;
+            background: #eeeeee;
+            cursor: pointer;
+        }
+
         &__footer {
             width: 100%;
-            height: 83px;
-            border-top: 1px solid #ccc;
+            height: 113px;
             position: relative;
 
+            .chat_tool{
+                border-top: 1px solid #d8dce5;
+                width: 100%;
+                padding: 5px;
+            }
+            .microphoneBtn{
+                font-size: 18px;
+                padding: 2px;
+                width: 24px;
+                text-align: center;
+                &:hover{
+                    color:#0188fb;
+                    cursor: pointer;
+                }
+            }
+
 			&--text {
 				width: 99%;
 				height: 75px;
@@ -224,7 +547,7 @@ export default {
 				resize: none;
 				font-size: 16px;
                 padding-left: 10px;
-                padding-top: 10px;
+                padding-top: 0px;
 			}
 
             &--send {
diff --git a/static/jl3d/control/scene.png b/static/jl3d/control/scene.png
index 0c7779fd3..177792217 100644
Binary files a/static/jl3d/control/scene.png and b/static/jl3d/control/scene.png differ
diff --git a/static/jl3d/control/scene1.png b/static/jl3d/control/scene1.png
new file mode 100644
index 000000000..0c7779fd3
Binary files /dev/null and b/static/jl3d/control/scene1.png differ
diff --git a/static/model/suidao/hebsuidao.FBX b/static/model/suidao/hebsuidao.FBX
index 4dcd7e249..97e9798a7 100644
Binary files a/static/model/suidao/hebsuidao.FBX and b/static/model/suidao/hebsuidao.FBX differ
diff --git a/static/model/suidao/hebsuidao1.FBX b/static/model/suidao/hebsuidao1.FBX
new file mode 100644
index 000000000..4dcd7e249
Binary files /dev/null and b/static/model/suidao/hebsuidao1.FBX differ
diff --git a/static/model/suidao/hebsuidaow.FBX b/static/model/suidao/hebsuidaow.FBX
new file mode 100644
index 000000000..f468e199e
Binary files /dev/null and b/static/model/suidao/hebsuidaow.FBX differ
diff --git a/static/test/z0251.png b/static/test/z0251.png
index 76703a90b..88dbf0f7e 100644
Binary files a/static/test/z0251.png and b/static/test/z0251.png differ
diff --git a/static/test/z02512.png b/static/test/z02512.png
new file mode 100644
index 000000000..76703a90b
Binary files /dev/null and b/static/test/z02512.png differ