diff --git a/src/jmapNew/config/skinCode/nanjing_02.js b/src/jmapNew/config/skinCode/nanjing_02.js
index c1d5a8552..1112055f2 100644
--- a/src/jmapNew/config/skinCode/nanjing_02.js
+++ b/src/jmapNew/config/skinCode/nanjing_02.js
@@ -192,6 +192,7 @@ class SkinCode extends defaultStyle {
                 closeSignalVerColor: '#FF1F10', // 关闭信号 灯柱竖柱颜色 level 1
                 guideSignalVerColor: '#FFFF00', // 引导信号控制级 灯柱竖柱颜色 level 2
                 autoRouteVerColor: '#9DFF6E', // 联锁自动进路颜色
+                atpLevelColor: '#009600', // ATP级别灯柱颜色
                 standardVerticalShape: '8', // 灯柱 竖杆 8边型
                 standardLength: 12, // 高柱长度
                 standardHeight: 5, // 灯柱高度
@@ -561,7 +562,7 @@ class SkinCode extends defaultStyle {
 
         this[deviceType.Switch] = {
             shapeFlash: true, // 道岔转动失去表示 道岔遮罩删除
-            faultNoHandle: true, // 南京二 道岔长闪 道岔无状态 道岔区段 bc 闪烁
+            faultNoHandle: false, // 南京二 道岔长闪 道岔无状态 道岔区段 bc 闪烁 （南京叶老师要求有短闪）
             text: {
                 show: true,									// 道岔名称显示
                 position: 0, 								// 区段名称位置 1 上面 -1 下面 0 对称
diff --git a/src/jmapNew/shape/graph/Section/index.js b/src/jmapNew/shape/graph/Section/index.js
index b7e4a3583..2bf166ed1 100644
--- a/src/jmapNew/shape/graph/Section/index.js
+++ b/src/jmapNew/shape/graph/Section/index.js
@@ -483,6 +483,9 @@ export default class Section extends Group {
         // 哈尔滨线路 南京二 道岔相关区段设置 默认颜色
         if (this.style.Switch.sectionAction.flag && model.relSwitchCode && !flag) {
             const switchModel = this.mapDevice[model.relSwitchCode];
+            if (!switchModel) {
+                return;
+            }
             const sectionB = switchModel.sectionBCode === model.code ? this.mapDevice[switchModel.sectionBCode] : null;
             const sectionC = switchModel.sectionCCode === model.code ? this.mapDevice[switchModel.sectionCCode] : null;
             const sectionA = this.mapDevice[switchModel.sectionACode];
diff --git a/src/jmapNew/shape/graph/Signal/index.js b/src/jmapNew/shape/graph/Signal/index.js
index b74acd722..07899588e 100644
--- a/src/jmapNew/shape/graph/Signal/index.js
+++ b/src/jmapNew/shape/graph/Signal/index.js
@@ -1188,8 +1188,8 @@ class Signal extends Group {
                 this.sigPost.setVerColor(this.style.Signal.post.closeSignalVerColor);
             } else if (model.level === 1 && this.style.Signal.post.guideSignalVerColor && !model.fleetMode) {
                 this.sigPost.setVerColor(this.style.Signal.post.guideSignalVerColor);
-            } else if (model.level === 2 && this.style.Signal.post.autoRouteVerColor && !model.fleetMode) {
-                this.sigPost.setVerColor(this.style.Signal.post.autoRouteVerColor);
+            } else if (model.level === 2 && this.style.Signal.post.atpLevelColor && !model.fleetMode) {
+                this.sigPost.setVerColor(this.style.Signal.post.atpLevelColor);
             }
 
             if (this.style.Signal.lamp.special) {
diff --git a/src/jmapNew/theme/components/menus/dialog/loadSpareTrain.vue b/src/jmapNew/theme/components/menus/dialog/loadSpareTrain.vue
index 38d450976..8b4e68996 100644
--- a/src/jmapNew/theme/components/menus/dialog/loadSpareTrain.vue
+++ b/src/jmapNew/theme/components/menus/dialog/loadSpareTrain.vue
@@ -33,6 +33,16 @@
         </el-select>
       </el-col>
     </el-row>
+    <el-row>
+      <el-col :span="11">预选模式</el-col>
+    </el-row>
+    <el-row>
+      <el-col :span="11">
+        <el-select v-model="addModel.preselectionMode" size="small">
+          <el-option v-for="option in modeList" :key="option.value" :label="option.label" :value="option.value" />
+        </el-select>
+      </el-col>
+    </el-row>
     <el-row justify="center" class="button-group">
       <el-col :span="10">
         <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
@@ -71,10 +81,18 @@ export default {
             addModel: {
                 groupNumber: '',
                 right: '',
-                sectionCode: ''
+                sectionCode: '',
+                preselectionMode: 'RM'
             },
             dialogShow: false,
-            loading: false
+            loading: false,
+            modeList: [
+                { value: 'AM_C', label: 'AM-C模式' },
+                { value: 'SM_C', label: 'SM-C模式' },
+                { value: 'AM_I', label: 'AM-I模式'},
+                { value: 'SM_I', label: 'SM-I模式' },
+                { value: 'RM', label: 'RM模式' }
+            ]
         };
     },
     computed: {
@@ -119,7 +137,8 @@ export default {
             this.addModel = {
                 groupNumber: '',
                 right: '',
-                sectionCode: ''
+                sectionCode: '',
+                preselectionMode: 'RM'
             };
             this.$store.dispatch('training/emitTipFresh');
             this.$store.dispatch('map/setTrainWindowShow', false);
@@ -133,7 +152,8 @@ export default {
             const params = {
                 groupNumber: this.addModel.groupNumber,
                 sectionCode: this.addModel.sectionCode,
-                right: this.addModel.right
+                right: this.addModel.right,
+                preselectionMode: this.addModel.preselectionMode
             };
             this.messageTip1 = '';
             this.loading = true;
diff --git a/src/jmapNew/theme/components/menus/dialog/setFault.vue b/src/jmapNew/theme/components/menus/dialog/setFault.vue
index bf9219376..b2cf9e71c 100644
--- a/src/jmapNew/theme/components/menus/dialog/setFault.vue
+++ b/src/jmapNew/theme/components/menus/dialog/setFault.vue
@@ -24,12 +24,11 @@
                   </el-tooltip>
                 </el-form-item>
                 <el-form-item prop="through" label="方式：">
-                  <el-radio-group v-model="formModel.through">
+                  <el-radio-group v-model="formModel.through" style="text-align: left;">
                     <el-radio :label="1">越红灯行驶</el-radio><br>
                     <el-radio style="margin-top: 10px" :label="2">越引导行驶</el-radio><br>
                     <el-radio style="margin-top: 10px" :label="3">运行至前方车站</el-radio><br>
-                    <el-radio style="margin-top: 10px" :label="4">进路闭塞法行车</el-radio><br>
-                    <el-radio style="margin-top: 10px" :label="0">无</el-radio>
+                    <el-radio style="margin-top: 10px" :label="0">进路闭塞法行车</el-radio>
                   </el-radio-group>
                 </el-form-item>
                 <el-form-item prop="targetDeviceCode" label="目的地:">
diff --git a/src/jmapNew/theme/nanjing_02/menus/dispatchWorkMenuButton.vue b/src/jmapNew/theme/nanjing_02/menus/dispatchWorkMenuButton.vue
index 65b092c98..8f1143174 100644
--- a/src/jmapNew/theme/nanjing_02/menus/dispatchWorkMenuButton.vue
+++ b/src/jmapNew/theme/nanjing_02/menus/dispatchWorkMenuButton.vue
@@ -853,10 +853,8 @@ export default {
                 this.handleClose();
                 if (error && error.code == '10017') {
                     EventBus.$emit('sendMsg', {message: error.message});
-                    this.$refs.noticeInfo.doShow(error.message);
                 } else {
                     EventBus.$emit('sendMsg', {message: `${this.commandInfo.name}失败`});
-                    this.$refs.noticeInfo.doShow(`${this.commandInfo.name}失败`);
                 }
             });
         },
@@ -895,15 +893,10 @@ export default {
 
             this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
-                    this.doClose();
-                    this.handleDeviceMenu();
-                    this.handleClose();
                     EventBus.$emit('sendMsg', {message: `${this.commandInfo.name}成功`});
                 }
             }).catch((error) => {
-                this.doClose();
-                this.handleDeviceMenu();
-                this.handleClose();
+
                 if (error && error.code == '10017') {
                     EventBus.$emit('sendMsg', {message: error.message});
                     this.$refs.noticeInfo.doShow(error.message);
@@ -912,6 +905,9 @@ export default {
                     this.$refs.noticeInfo.doShow(`${this.commandInfo.name}失败`);
                 }
             });
+            this.doClose();
+            this.handleDeviceMenu();
+            this.handleClose();
         },
         handleRightClickClose() {
             this.rightClickDialogVisible = false;
diff --git a/src/jmapNew/theme/nanjing_02/menus/localWorkMenuButton.vue b/src/jmapNew/theme/nanjing_02/menus/localWorkMenuButton.vue
index a2e6cd6b6..3e67306f9 100644
--- a/src/jmapNew/theme/nanjing_02/menus/localWorkMenuButton.vue
+++ b/src/jmapNew/theme/nanjing_02/menus/localWorkMenuButton.vue
@@ -910,7 +910,6 @@ export default {
                 step.over = true;
                 step.cmdType = this.cmdType;
             }
-
             EventBus.$emit('sendMsg', {});
             this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid && this.securityCommand) {
@@ -967,21 +966,18 @@ export default {
 
             this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
-                    this.doClose();
-                    this.handleDeviceMenu();
-                    this.handleClose();
                     EventBus.$emit('sendMsg', {message: `${this.commandInfo.name}成功`});
                 }
             }).catch((error) => {
-                this.doClose();
-                this.handleDeviceMenu();
-                this.handleClose();
                 if (error && error.code == '10017') {
                     EventBus.$emit('sendMsg', {message: error.message});
                 } else {
                     EventBus.$emit('sendMsg', {message: `${this.commandInfo.name}失败`});
                 }
             });
+            this.doClose();
+            this.handleDeviceMenu();
+            this.handleClose();
         },
         handleRightClickClose() {
             this.rightClickDialogVisible = false;
diff --git a/src/jmapNew/theme/nanjing_02/menus/menuTrain.vue b/src/jmapNew/theme/nanjing_02/menus/menuTrain.vue
index 96d96ed8d..dafa52a83 100644
--- a/src/jmapNew/theme/nanjing_02/menus/menuTrain.vue
+++ b/src/jmapNew/theme/nanjing_02/menus/menuTrain.vue
@@ -80,6 +80,10 @@ export default {
                     label: '回库',
                     handler: this.setInbound
                 },
+                {
+                    label: '停车',
+                    handler: this.handleParkingTrain
+                },
                 {
                     label: '切换驾驶模式',
                     children: [
@@ -104,6 +108,10 @@ export default {
                             handler: this.handlerApplyRmMode
                         }
                     ]
+                },
+                {
+                    label: '转NRM模式',
+                    handler: this.handlerApplyNrmMode
                 }
             ],
             menuSpeed: [
@@ -301,6 +309,21 @@ export default {
                 console.error(error);
                 this.$refs.noticeInfo.doShow();
             });
+        },
+        // 转NRM模式
+        handlerApplyNrmMode() {
+            commitOperate(menuOperate.Driver.applyNrm, { groupNumber: this.selected.code }, 3).then(({ valid, operate }) => {
+            }).catch((error) => {
+                console.error(error);
+                this.$refs.noticeInfo.doShow();
+            });
+        },
+        handleParkingTrain() {
+            commitOperate(menuOperate.Train.driverStop, { groupNumber: this.selected.code }, 3).then(({ valid, operate }) => {
+            }).catch((error) => {
+                console.error(error);
+                this.$refs.noticeInfo.doShow();
+            });
         }
     }
 };
diff --git a/src/views/newMap/newMapdraft/dataRelation/routeoperate/detail.vue b/src/views/newMap/newMapdraft/dataRelation/routeoperate/detail.vue
index b82ce9c12..8d2c061e7 100644
--- a/src/views/newMap/newMapdraft/dataRelation/routeoperate/detail.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/routeoperate/detail.vue
@@ -140,6 +140,12 @@ export default {
                         type: 'tag',
                         prop: 'arc'
                     },
+                    {
+                        title: '是否单列车进路',
+                        edit: true,
+                        type: 'tag',
+                        prop: 'singleTrain'
+                    },
                     {
                         title: '自排',
                         edit: true,
diff --git a/src/views/newMap/newMapdraft/dataRelation/routeoperate/route.vue b/src/views/newMap/newMapdraft/dataRelation/routeoperate/route.vue
index e71fb13ed..3cf7e401c 100644
--- a/src/views/newMap/newMapdraft/dataRelation/routeoperate/route.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/routeoperate/route.vue
@@ -32,6 +32,12 @@
             <el-radio :label="false">{{ $t('map.deny') }}</el-radio>
           </el-radio-group>
         </el-form-item>
+        <el-form-item label="单列车进路：" prop="singleTrain">
+          <el-radio-group v-model="addModel.singleTrain">
+            <el-radio :label="true">是</el-radio>
+            <el-radio :label="false">否</el-radio>
+          </el-radio-group>
+        </el-form-item>
         <el-form-item :label="$t('map.startingSignalName') + ':'" prop="startSignalCode">
           <el-select v-model="addModel.startSignalCode" clearable filterable>
             <el-option
@@ -263,6 +269,7 @@ export default {
                 lockFirst:false, // 是否先锁闭——办理过程直接先锁闭区段
                 // delayReleaseTime: '', // 延时解锁时间
                 turnBack: false, // 是否折返进路
+                singleTrain: false, // 是否单列车进路
                 startSignalCode: '', // 始端信号机
                 endSignalCode: '', // 终端信号机
                 endButtonSignalCode: '',
diff --git a/src/views/system/configLine/config.vue b/src/views/system/configLine/config.vue
index 63202bde4..dd15ebfc0 100644
--- a/src/views/system/configLine/config.vue
+++ b/src/views/system/configLine/config.vue
@@ -118,7 +118,9 @@ export default {
                 'updateTripPlanByServiceNumber',
                 'railway',
                 'SFUCanOnlyApplyForFaultLockSection',
-                'signalBolckOptReflectSignal'
+                'signalBolckOptReflectSignal',
+                'routeCanSetWhenSwitchFault',
+                'manualTrainDefaultStop'
             ],
             selectList: ['runMode', 'singleApproachLockCancelRoute'],
             generalConfig: [
@@ -170,7 +172,9 @@ export default {
                 'updateTripPlanByServiceNumber',
                 'railway',
                 'SFUCanOnlyApplyForFaultLockSection',
-                'signalBolckOptReflectSignal'
+                'signalBolckOptReflectSignal',
+                'routeCanSetWhenSwitchFault',
+                'manualTrainDefaultStop'
             ],
             rangeList: ['noParkingSM', 'parkingSM'],
             speedList: ['rmAtpSpeed', 'urmAtpSpeed'],
@@ -228,7 +232,9 @@ export default {
                 updateTripPlanByServiceNumber: '根据服务号更新车次计划',
                 railway: '大铁线路',
                 SFUCanOnlyApplyForFaultLockSection: '区故解只能应用于故障锁闭区段',
-                signalBolckOptReflectSignal:'对信号机封锁操作，是否影响信号显示'
+                signalBolckOptReflectSignal:'对信号机封锁操作，是否影响信号显示',
+                routeCanSetWhenSwitchFault: '道岔故障时可以办理进路（由远及近锁闭，到故障处终止）',
+                manualTrainDefaultStop: '人工驾驶模式（CM/RM/NRM）下的列车默认是停车等待命令状态'
             }
         };
     },