diff --git a/src/jmapNew/config/skinCode/fuzhou_01.js b/src/jmapNew/config/skinCode/fuzhou_01.js
index 5d039fa98..afd405d6f 100644
--- a/src/jmapNew/config/skinCode/fuzhou_01.js
+++ b/src/jmapNew/config/skinCode/fuzhou_01.js
@@ -211,7 +211,8 @@ class SkinCode extends defaultStyle {
             },
             standEmergent: { 									// 紧急关闭
                 mergentR: 4, 									// 站台紧急关闭半径
-                offset: {x: 0, y: 40}, 							// 站台紧急关闭偏移量
+                insideOffset: { x: 0, y: 25 }, 				// 内站台紧急关闭偏移量
+                outsideOffset: { x: 0, y: -25 }, 			// 外站台紧急关闭偏移量
                 closeColor: '#F61107' 							// 站台紧急关闭颜色
             },
             reentry: { 											// 站台折返策略
@@ -394,8 +395,12 @@ class SkinCode extends defaultStyle {
             core: {
                 length: 6									// 	道岔单边长度
             },
-            block: {										// 道岔封锁配置
-                blockName: 'default' // 默认道岔封锁类型
+            jointImg: {										// 道岔 A B C D四元素属性配置
+                trapezoidLength: 8,							// 直角梯形元素默认长度
+                block: false,								// 联合图形封锁状态
+                flashingColors: '#D600D5',					// 联合图形封锁闪烁显示颜色
+                fork: false,								// 挤岔专用（如有挤岔操作 变为true）
+                forKColor: 'red'							// 挤岔颜色 配合挤岔专用
             },
             arcBlcok: {										// 圆形封锁图形
                 show: false,								// 显示
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/alxeEffective.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/alxeEffective.vue
index 114a3fa89..c25c4d969 100644
--- a/src/jmapNew/theme/ningbo_01/menus/dialog/alxeEffective.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/dialog/alxeEffective.vue
@@ -223,27 +223,19 @@ export default {
             if (selected) {
                 this.model.sectionCode = selected.code;
                 if (selected && selected._type.toUpperCase() === 'Section'.toUpperCase()) {
-                    if (selected.isSwitchSection) {
-                        const section = this.$store.getters['map/getDeviceByCode'](selected.parentCode);
-                        if (section) {
-                            this.model.sectionName = section.name;
-                        }
+                    const section = this.$store.getters['map/getDeviceByCode'](selected.parentCode);
+                    if (section) {
+                        this.model.sectionName = `${section.name}-${selected.name}(${selected.code})`;
                     } else {
-                        const section = this.$store.getters['map/getDeviceByCode'](selected.parentCode);
-                        if (section) {
-                            this.model.sectionName = section.name;
-                            this.model.sectionName = `${section.name}-${selected.name}`;
-                        } else {
-                            this.model.sectionName = `${selected.name}`;
-                        }
+                        this.model.sectionName = `${selected.name}(${selected.code})`;
                     }
                 } else if (selected._type.toUpperCase() === 'Switch'.toUpperCase()) {
-                    const section = this.$store.getters['map/getDeviceByCode'](selected.switchSectionCode);
+                    const section = this.$store.getters['map/getDeviceByCode'](selected.sectionParentCode);
                     if (section) {
-                        this.model.sectionName = section.name;
+                        this.model.sectionName = `${section.name}(${section.code})`;
+                        this.model.sectionCode = section.code;
                     }
                 }
-
                 const station = this.$store.getters['map/getDeviceByCode'](selected.stationCode);
                 if (station) {
                     this.model.stationName = station.name;
@@ -268,10 +260,10 @@ export default {
             this.randomSectionList = [];
             this.sectionList.forEach(section => {
                 if (section.stationCode == code) {
-                    let name = section.name;
+                    let name = `${section.name}(${section.code})`;
                     if (section.type == '02') {
                         const sectionParent = this.$store.getters['map/getDeviceByCode'](section.parentCode);
-                        name = `${sectionParent.name}-${section.name}`;
+                        name = `${sectionParent.name}-${section.name}(${section.code})`;
                     }
                     this.randomSectionList.push({ name: `${name}`, code: section.code });
                 }
@@ -364,10 +356,10 @@ export default {
                     if (valid) {
                         this.type = 'text';
                         this.stopTask();
-                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                        this.$refs.popupAlarm.doShow(
-                            Object.assign(this.operate, {val: operate.val}), [`集中站 ${this.model.stationName} 区段 ${this.model.sectionName}报告恢复计轴有效`]
-                        );
+                        // this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                        // this.$refs.popupAlarm.doShow(
+                        //     Object.assign(this.operate, {val: operate.val}), [`集中站 ${this.model.stationName} 区段 ${this.model.sectionName}报告恢复计轴有效`]
+                        // );
                     }
                 }).catch((error) => {
                     this.loading = false;
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/childDialog/popupAlarm.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/childDialog/popupAlarm.vue
index 98cfc9f16..7c8195fc5 100644
--- a/src/jmapNew/theme/ningbo_01/menus/dialog/childDialog/popupAlarm.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/dialog/childDialog/popupAlarm.vue
@@ -1,84 +1,93 @@
 <template>
-    <el-dialog class="ningbo-01__systerm popup-alarm" :title="title" :visible.sync="show" width="500px"
-        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" append-to-body v-dialogDrag>
-        <el-row>
-            <el-col :offset="2">
-                <span v-for="(message, index) in messages" :key="index">{{message}}</span><br>
-            </el-col>
-        </el-row>
-        <el-row justify="center" class="button-group">
-            <el-col :span="10" :offset="8">
-                <el-button :id="domIdSure" type="primary" @click="commit">确定</el-button>
-            </el-col>
-        </el-row>
-    </el-dialog>
+  <el-dialog
+    v-dialogDrag
+    class="ningbo-01__systerm popup-alarm"
+    :title="title"
+    :visible.sync="show"
+    width="500px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+    append-to-body
+  >
+    <el-row>
+      <el-col :offset="2">
+        <span v-for="(message, index) in messages" :key="index">{{ message }}</span><br>
+      </el-col>
+    </el-row>
+    <el-row justify="center" class="button-group">
+      <el-col :span="10" :offset="8">
+        <el-button :id="domIdSure" type="primary" @click="commit">确定</el-button>
+      </el-col>
+    </el-row>
+  </el-dialog>
 </template>
 
 <script>
-    import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/ConstDic';
 
-    export default {
-        name: 'Popup-Alarm',
-        data() {
-            return {
-                dialogShow: false,
-                messages: [],
-                operate: null,
-                operation: '',
-            }
+export default {
+    name: 'PopupAlarm',
+    data() {
+        return {
+            dialogShow: false,
+            messages: [],
+            operate: null,
+            operation: ''
+        };
+    },
+    computed: {
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
         },
-        computed: {
-            show() {
-                return this.dialogShow && !this.$store.state.menuOperation.break;
-            },
-            title() {
-                return '弹出式告警';
-            },
-            domIdSure() {
-                return this.dialogShow ? OperationEvent.Command.close.alarm.domId : '';
-            }
+        title() {
+            return '弹出式告警';
         },
-        mounted() {
-            this.$nextTick(() => {
-                this.$store.dispatch('training/tipReload');
-            })
-        },
-        methods: {
-            doShow(operate, messages) {
-                this.operate = operate || {};
-                this.operation = operate.operation;
-                this.dialogShow = true;
-                this.messages = messages || [];
-                this.$nextTick(function () {
-                    this.$store.dispatch('training/emitTipFresh');
-                });
-            },
-            doClose() {
-                this.dialogShow = false;
+        domIdSure() {
+            return this.dialogShow ? OperationEvent.Command.close.alarm.domId : '';
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(operate, messages) {
+            this.operate = operate || {};
+            this.operation = operate.operation;
+            this.dialogShow = true;
+            this.messages = messages || [];
+            this.$nextTick(function () {
                 this.$store.dispatch('training/emitTipFresh');
-            },
-            commit() {
-                if (this.operation == OperationEvent.Section.alxeEffective.menu.operation) {
-                    // 确认计轴有效
-                    this.alxeEffective();
-                }
-
-            },
-            alxeEffective() {
-                let operate = {
-                    type: this.operate.type,
-                    operation: OperationEvent.Command.close.alarm.operation,
-                }
-
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                        this.doClose();
-                    }
-                })
+            });
+        },
+        doClose() {
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+        },
+        commit() {
+            if (this.operation == OperationEvent.Section.alxeEffective.menu.operation) {
+                // 确认计轴有效
+                this.alxeEffective();
             }
+
+        },
+        alxeEffective() {
+            const operate = {
+                operation: OperationEvent.Command.close.alarm.operation
+            };
+
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.doClose();
+                }
+            });
         }
     }
+};
 
 </script>
 <style>
@@ -86,4 +95,4 @@
         padding-bottom: 40px !important;
         border: 1px solid lightgray;
     }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/routeHandControl.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/routeHandControl.vue
index 822c8b42a..1b9bf35ce 100644
--- a/src/jmapNew/theme/ningbo_01/menus/dialog/routeHandControl.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/dialog/routeHandControl.vue
@@ -39,7 +39,7 @@
                 v-model="changeList[scope.$index]"
                 style="text-align: center; display: block;"
                 :disabled="scope.row.disabled"
-                @change="changeCheck(changeList[scope.$index],scope.row.code)"
+                @change="changeCheck(changeList[scope.$index], scope.row.code)"
               />
             </template>
           </el-table-column>
@@ -116,13 +116,12 @@ export default {
             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;
-                }
+            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) : '';
@@ -133,6 +132,7 @@ export default {
             } else if (this.operation == OperationEvent.Signal.atsAutoControl.menu.operation) {
                 return '进路交自动控';
             }
+            return '';
         }
     },
     watch: {
@@ -205,6 +205,7 @@ export default {
             }
             if (this.selection.length > 0) {
                 this.commitDisabled = false;
+                this.handleChooseChange();
             } else {
                 this.commitDisabled = true;
             }
@@ -237,43 +238,27 @@ export default {
                 this.commitDisabled = true;
             }
         },
-        // serializeCodeListWithSeparator(sep) {
-        //     const codeList = [];
-        //     if (this.selection && this.selection.length) {
-        //         this.selection.forEach(elem => {
-        //             codeList.push(elem.code);
-        //         });
-        //     }
-        //     return codeList.join(sep);
-        // },
-        // handleChooseChange(selection) {
-        //     this.selection = selection;
-        //     if (selection && selection.length) {
-        //         const operate = {
-        //             repeat: true,
-        //             type: MapDeviceType.Signal.type,
-        //             operation: '',
-        //             val: this.serializeCodeListWithSeparator('::'),
-        //             selection: selection
-        //         };
+        handleChooseChange() {
+            const codeList = this.selection.map(elem => { return elem; });
+            const operate = {
+                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;
-        //         }
+            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/nextNew', operate).then(({ valid }) => {
-        //             if (valid) {
-        //                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-        //             }
-        //         });
-        //     } else if (!selection) {
-        //         this.$messageBox(`请选择一条数据`);
-        //     }
-        // },
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                }
+            });
+        },
         commit() {
             if (this.operation == OperationEvent.Signal.humanControl.menu.operation) {
                 /** 进路交人工控*/
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/routeSelection.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/routeSelection.vue
index a1028e3bc..2d2286ee7 100644
--- a/src/jmapNew/theme/ningbo_01/menus/dialog/routeSelection.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/dialog/routeSelection.vue
@@ -166,7 +166,8 @@ export default {
 
                     // 设置选中指令
                     const operate = {
-                        operation: OperationEvent.Signal.arrangementRoute.choose.operation
+                        operation: OperationEvent.Signal.arrangementRoute.choose.operation,
+                        val: row.code
                     };
 
                     this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
diff --git a/src/scripts/OperationConfig.js b/src/scripts/OperationConfig.js
index cf241917e..32edd18d5 100644
--- a/src/scripts/OperationConfig.js
+++ b/src/scripts/OperationConfig.js
@@ -3805,7 +3805,7 @@ export const OperationList = {
             //         { deviceType: '03', orderNum: 3, operateCode: '4121', tip: '鼠标左键选择{10}', val: '' },
             //         { deviceType: '03', orderNum: 4, operateCode: '4122', tip: '鼠标左键选择({8}{9})', val: '' },
             //         { deviceType: '03', orderNum: 5, operateCode: '4124', tip: '鼠标左键点击【确认】按钮' },
-            //         { deviceType: '03', orderNum: 6, operateCode: '4074', tip: '鼠标左键点击【关闭】按钮' }
+            //         { deviceType: '03', orderNum: 6, operateCode: '000', tip: '鼠标左键点击【关闭】按钮' }
             //     ]
             // }
 
@@ -3880,7 +3880,7 @@ export const OperationList = {
             //         { deviceType: '03', orderNum: 3, operateCode: '4121', tip: '鼠标左键选择{10}', val: '' },
             //         { deviceType: '03', orderNum: 4, operateCode: '4122', tip: '鼠标左键选择({8}{9})', val: '' },
             //         { deviceType: '03', orderNum: 5, operateCode: '4124', tip: '鼠标左键点击【确认】按钮' },
-            //         { deviceType: '03', orderNum: 6, operateCode: '4074', tip: '鼠标左键点击【关闭】按钮' }
+            //         { deviceType: '03', orderNum: 6, operateCode: '000', tip: '鼠标左键点击【关闭】按钮' }
             //     ]
             // }
             {
@@ -4116,7 +4116,7 @@ export const OperationList = {
             {
                 maxDuration: 15,
                 minDuration: 8,
-                operateType: '0212',
+                operateType: '0215',
                 skinCode: '06',
                 trainingName: '人工解锁进路({5})',
                 trainingRemark: '人工解锁进路',
@@ -4130,7 +4130,7 @@ export const OperationList = {
             {
                 maxDuration: 15,
                 minDuration: 8,
-                operateType: '0212',
+                operateType: '0216',
                 skinCode: '06',
                 trainingName: '信号机引导办理({5})',
                 trainingRemark: '信号机引导办理',
@@ -4195,7 +4195,7 @@ export const OperationList = {
                 trainingName: '请求遥控({1})',
                 trainingRemark: '控制权限转换，站控转中控',
                 trainingType: '01',
-                productTypes: ['02'],
+                productTypes: ['02'], // 行调请求中控
                 stepVOList: [
                     { deviceType: '05', orderNum: 1, operateCode: '202', tip: '鼠标左键点击顶部菜单栏【请求遥控】' },
                     { deviceType: '05', orderNum: 2, operateCode: '202', tip: '鼠标左键点击【应用】' }
@@ -4209,7 +4209,7 @@ export const OperationList = {
                 trainingName: '请求站控({1})',
                 trainingRemark: '控制权限转换，中控转站控',
                 trainingType: '01',
-                productTypes: ['01'],
+                productTypes: ['01'], // 现地请求站控
                 stepVOList: [
                     { deviceType: '05', orderNum: 1, operateCode: '204', tip: '鼠标左键点击顶部菜单栏【请求站控】' },
                     { deviceType: '05', orderNum: 2, operateCode: '204', tip: '鼠标左键点击【应用】' }
diff --git a/src/scripts/cmdPlugin/ValidateHandler.js b/src/scripts/cmdPlugin/ValidateHandler.js
index 1e69bf282..744c36766 100644
--- a/src/scripts/cmdPlugin/ValidateHandler.js
+++ b/src/scripts/cmdPlugin/ValidateHandler.js
@@ -52,6 +52,7 @@ class ValidateHandler {
         const order = Handler.getOrder();
 
         let valid = false;
+        debugger;
         if (operate.over && steps.length == 1) { // 右键菜单直接发送校验
             if (operate && steps[0] &&
                 operate.code == steps[0].code &&
diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js
deleted file mode 100644
index acaa7a611..000000000
--- a/src/utils/baseUrl.js
+++ /dev/null
@@ -1,19 +0,0 @@
-
-export function getBaseUrl() {
-    let BASE_API;
-    if (process.env.NODE_ENV === 'development') {
-        // BASE_API = 'https://joylink.club/jlcloud';
-        BASE_API = 'https://test.joylink.club/jlcloud';
-        // BASE_API = 'http://192.168.3.5:9000'; // 袁琪
-        // BASE_API = 'http://192.168.3.6:9000'; // 旭强
-        // BASE_API = 'http://192.168.3.41:9000'; // 张赛
-        // BASE_API = 'http://192.168.3.82:9000'; // 杜康
-        // BASE_API = 'http://192.168.3.41:9000'; // 张赛
-        // BASE_API = 'http://b29z135112.zicp.vip';
-        // BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康
-        // BASE_API = 'http://2i38984j47.qicp.vip';    // 张赛
-    } else {
-        BASE_API = process.env.VUE_APP_BASE_API;
-    }
-    return BASE_API;
-}
diff --git a/src/views/newMap/newMapdraft/mapoperate/switch/switchModle.vue b/src/views/newMap/newMapdraft/mapoperate/switch/switchModle.vue
index 303df9cf9..bf7f18113 100644
--- a/src/views/newMap/newMapdraft/mapoperate/switch/switchModle.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/switch/switchModle.vue
@@ -126,7 +126,7 @@ export default {
     methods:{
         deviceChange(code) {
             this.$emit('setCenter', code);
-            this.deviceSelect(this.$store.getters['map/getDeviceByCode'](code));
+            this.setModel(this.$store.getters['map/getDeviceByCode'](code));
         },
         setModel(data) {
             this.$refs.dataform.resetFields();