From 0fc9c03d2b159879073daa84015b4b44c942a391 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Fri, 16 Apr 2021 16:51:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=81=E6=B3=A2=E4=B8=89=E4=BF=A1=E5=8F=B7?=
 =?UTF-8?q?=E5=8F=B3=E9=94=AE=E8=8F=9C=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jmapNew/theme/ningbo_03/menus/index.vue   |   2 +-
 .../menus/menuDialog/allocateTime.vue         |  18 +-
 .../menus/menuDialog/sectionLimitSpeed.vue    |  24 ++
 .../menus/menuDialog/sectionOpen.vue          |  22 ++
 .../menus/menuDialog/sectionShow.vue          |  22 +-
 .../menus/menuDialog/standControl.vue         |  15 +-
 .../menus/menuDialog/standDetail.vue          |  14 +-
 .../menus/menuDialog/standDetain.vue          |  14 +-
 .../menus/menuDialog/stationTransfer.vue      |   8 +
 .../menus/menuDialog/switchActive.vue         |  47 ++--
 .../menus/menuDialog/switchBlock.vue          | 242 ++++++++--------
 .../menus/menuDialog/switchCommand.vue        |  15 +
 .../menus/menuDialog/switchDetail.vue         |  10 +-
 .../theme/ningbo_03/menus/menuSection.vue     | 160 ++++++++---
 .../theme/ningbo_03/menus/menuSignal.vue      |  24 --
 .../theme/ningbo_03/menus/menuStation.vue     |  27 +-
 .../ningbo_03/menus/menuStationStand.vue      | 225 ++++-----------
 .../theme/ningbo_03/menus/menuSwitch.vue      | 258 ++++++++----------
 src/utils/baseUrl.js                          |   4 +-
 19 files changed, 619 insertions(+), 532 deletions(-)

diff --git a/src/jmapNew/theme/ningbo_03/menus/index.vue b/src/jmapNew/theme/ningbo_03/menus/index.vue
index 595a953a4..932152f00 100644
--- a/src/jmapNew/theme/ningbo_03/menus/index.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="menus __socpe" :style="{width: width + 'px'}">
     <menu-bar v-show="isShowBar" ref="menuBar" :selected="selected" :init-cache-map="initCacheMap" :init-info="initInfo" :update-done="updateDone" @onUpdateDone="onUpdateDone" @onChangeInitInfo="onChangeInitInfo" />
-    <menu-station-stand ref="menuStationStand" :selected="selected" :init-cache-map="initCacheMap" :init-info="initInfo" :update-done="updateDone" @onUpdateDone="onUpdateDone" @onChangeInitInfo="onChangeInitInfo" />
+    <menu-station-stand ref="menuStationStand" :selected="selected" />
     <menu-switch ref="menuSwitch" :selected="selected" :init-cache-map="initCacheMap" :init-info="initInfo" :update-done="updateDone" @onUpdateDone="onUpdateDone" @onChangeInitInfo="onChangeInitInfo" />
     <menu-signal ref="menuSignal" :selected="selected" :init-cache-map="initCacheMap" :init-info="initInfo" :update-done="updateDone" @onUpdateDone="onUpdateDone" @onChangeInitInfo="onChangeInitInfo" />
     <menu-section ref="menuSection" :selected="selected" :init-cache-map="initCacheMap" :init-info="initInfo" :update-done="updateDone" @onUpdateDone="onUpdateDone" @onChangeInitInfo="onChangeInitInfo" />
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/allocateTime.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/allocateTime.vue
index 55228a0db..1c0c193e5 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/allocateTime.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/allocateTime.vue
@@ -133,7 +133,7 @@ export default {
         selected() {
             return this.$store.state.menuOperation.selected;
         },
-       	domIdChoose() {
+        domIdChoose() {
             return this.dialogShow ? OperationEvent.Command.common.choose.domId : '';
         },
         domIdChoose1() {
@@ -158,7 +158,7 @@ export default {
                 this.commit();
             }
         },
-        'selected': function(val) { 
+        'selected': function(val) {
             if (val) {
                 const stand = this.$store.getters['map/getDeviceByCode'](val.code);
                 if (stand) {
@@ -176,6 +176,18 @@ export default {
                 this.$store.dispatch('training/emitTipFresh');
             });
         },
+        rightClickShow(operate, selected) {
+            this.dialogShow = true;
+            this.$nextTick(function () {
+                let index = 0;
+                const stand = this.stationStandList.find((el, i) => { index = i; return el.code == selected.code; });
+                this.$refs.table.setCurrentRow(stand);
+                setTimeout(() => {
+                    this.$refs.table.bodyWrapper.scrollTop = index * 20;
+                }, 200);
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
         doClose() {
             this.loading = false;
             this.dialogShow = false;
@@ -199,7 +211,7 @@ export default {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     isClose && this.doClose();
                 }
-            }).catch((error) => {
+            }).catch(() => {
                 isClose && this.doClose();
                 this.$refs.noticeInfo.doShow();
             });
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/sectionLimitSpeed.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/sectionLimitSpeed.vue
index 1c72172cd..f1572253d 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/sectionLimitSpeed.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/sectionLimitSpeed.vue
@@ -202,6 +202,30 @@ export default {
                 this.$store.dispatch('training/emitTipFresh');
             });
         },
+        rightClickShow(operate, sure, selected) {
+            this.operate = operate;
+            this.sure = sure;
+            if (this.isSetSpeed) {
+                this.title = `${sure ? '确认/取消设置临时限速区域' : '初始化设置临时限速区域'}`;
+            } else {
+                this.title = `${sure ? '清除临时限速区域' : '初始化清除临时限速区域'}`;
+                this.command = true;
+            }
+            this.currentSelect = this.$store.getters['map/getDeviceByCode'](selected.code);
+            this.dialogShow = true;
+            this.$nextTick(function () {
+                this.changeIgnore = sure;
+                let index = 0;
+                const section = this.tempList.find((el, i) => { index = i; return el.code == selected.code; });
+                this.$refs.singleTable1.setCurrentRow(section);
+                this.speedLimitValue = this.initParams.value || 0;
+                setTimeout(()=> {
+                    this.$refs.singleTable1.bodyWrapper.scrollTop = index * 20;
+                }, 200);
+                this.$emit('updateDone');
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
         doClose() {
             this.loading = false;
             this.dialogShow = false;
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/sectionOpen.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/sectionOpen.vue
index baa89da50..d685f922a 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/sectionOpen.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/sectionOpen.vue
@@ -166,6 +166,28 @@ export default {
                 this.$store.dispatch('training/emitTipFresh');
             });
         },
+        rightClickShow(operate, sure, selected) {
+            this.operate = operate;
+            this.sure = sure;
+            if (sure) {
+                this.title = `${this.isBlock ? '确认/取消关闭轨道' : '确认/取消开放轨道'}`;
+            } else {
+                this.title = `${this.isBlock ? '初始化关闭轨道' : '初始化开放轨道'}`;
+                this.command = true;
+            }
+            this.currentSelect = this.$store.getters['map/getDeviceByCode'](selected.code);
+            this.dialogShow = true;
+            this.$nextTick(function () {
+                let index = 0;
+                const section = this.tempList.find((el, i) => { index = i; return el.code == selected.code; });
+                this.$refs.table.setCurrentRow(section);
+                setTimeout(()=> {
+                    this.$refs.table.bodyWrapper.scrollTop = index * 20;
+                }, 200);
+                this.$emit('updateDone');
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
         doClose() {
             this.loading = false;
             this.dialogShow = false;
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/sectionShow.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/sectionShow.vue
index 6f66c3d56..49df57016 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/sectionShow.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/sectionShow.vue
@@ -2,7 +2,7 @@
   <el-dialog v-dialogDrag class="ningbo-01__systerm route-setting" :title="title" :visible.sync="show" width="700px" :before-close="doClose" :z-index="2000" :modal="false" :close-on-click-modal="false">
     <el-row>
       <el-col :span="24">
-        <el-table :data="tempList" highlight-current-row height="350px" @current-change="selectLine">
+        <el-table ref="sectionTable" :data="tempList" highlight-current-row height="350px" @current-change="selectLine">
           <el-table-column prop="name" width="100" label="轨道" />
           <el-table-column prop="blockStatus" width="120" label="MAU">
             <template slot-scope="scope">
@@ -40,7 +40,7 @@
         <el-button :id="domIdConfirm" type="primary" :loading="loading" :disabled="true">打印(P)</el-button>
       </el-col>
       <el-col :span="4" :offset="2">
-        <el-button :id="domIdClose" type="primary"  @click="cancel">关闭(C)</el-button>
+        <el-button :id="domIdClose" type="primary" @click="cancel">关闭(C)</el-button>
       </el-col>
       <el-col :span="4" :offset="2">
         <el-button :disabled="true">帮助(H)</el-button>
@@ -81,9 +81,9 @@ export default {
         show() {
             return this.dialogShow && !this.$store.state.menuOperation.break;
         },
-		tempList() {
-			return this.sectionList.filter(el => ['01', '04'].includes(el.type) )
-		},
+        tempList() {
+            return this.sectionList.filter(el => ['01', '04'].includes(el.type) );
+        },
         domIdClose() {
             return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
         },
@@ -106,12 +106,22 @@ export default {
     },
     methods: {
         doShow(operate) {
-			this.operate = operate;
+            this.operate = operate;
             this.dialogShow = true;
             this.$nextTick(function () {
                 this.$store.dispatch('training/emitTipFresh');
             });
         },
+        rightClickShow(operate, selected) {
+            this.operate = operate;
+            this.dialogShow = true;
+            this.$nextTick(function () {
+                const index = this.tempList.findIndex(el => el.code == selected.code);
+                setTimeout(()=> {
+                    this.$refs.sectionTable.bodyWrapper.scrollTop = index * 20;
+                }, 200);
+            });
+        },
         doClose() {
             this.loading = false;
             this.dialogShow = false;
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/standControl.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/standControl.vue
index 784702d64..7f9060343 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/standControl.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/standControl.vue
@@ -2,7 +2,7 @@
   <el-dialog v-dialogDrag class="ningbo-01__systerm route-setting" :title="title" :visible.sync="show" width="600px" :before-close="doClose" :z-index="2000" :modal="false" :close-on-click-modal="false">
     <el-row>
       <el-col :span="16">
-        <div class="simulate_table">
+        <div id="sim_table" class="simulate_table">
           <div style="display: flex;">
             <div class="simulate_table_header" style="width: 120px;">站台</div>
             <div class="simulate_table_header" style="width: 120px;">扣车</div>
@@ -116,6 +116,19 @@ export default {
             this.$nextTick(function () {
                 this.$store.dispatch('training/emitTipFresh');
             });
+            this.judgeStatus();
+        },
+        rightClickShow(operate, selected) {
+            this.dialogShow = true;
+            this.selectedStandList = [selected.code];
+            this.allChecked = false;
+            this.$nextTick(function () {
+                const index = this.stationStandList.findIndex(el => el.code == selected.code);
+                const ele = document.getElementById('sim_table');
+                ele.scrollTop = index * 20;
+                this.judgeStatus();
+                this.$store.dispatch('training/emitTipFresh');
+            });
         },
         doClose() {
             this.loading = false;
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/standDetail.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/standDetail.vue
index bbc59981e..6148dd226 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/standDetail.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/standDetail.vue
@@ -1,7 +1,7 @@
 <template>
   <el-dialog v-dialogDrag class="ningbo-01__systerm route-setting" :title="title" :visible.sync="show" width="800px" :before-close="doClose" :z-index="2000" :modal="false" :close-on-click-modal="false">
     <el-row style="width: 100%;overflow-x: auto;">
-      <el-table :data="stationStandList" height="350px">
+      <el-table ref="table" :data="stationStandList" height="350px">
         <el-table-column prop="name" width="80" label="站台" />
         <el-table-column prop="status" width="80" label="状态">打开</el-table-column>
         <el-table-column prop="minTime" width="110" label="最小停站时间" />
@@ -96,6 +96,16 @@ export default {
                 this.$store.dispatch('training/emitTipFresh');
             });
         },
+        rightClickShow(operate, selected) {
+            this.dialogShow = true;
+            this.$nextTick(function () {
+                const index = this.stationStandList.findIndex(el => el.code == selected.code);
+                setTimeout(() => {
+                    this.$refs.table.bodyWrapper.scrollTop = index * 20;
+                }, 200);
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
         doClose() {
             this.loading = false;
             this.dialogShow = false;
@@ -103,7 +113,7 @@ export default {
         },
         commit() {
         },
-        handleClick() {
+        handleClick(mon, years) {
         },
         getDetainStatus(code) {
             const stand = this.$store.getters['map/getDeviceByCode'](code);
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/standDetain.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/standDetain.vue
index 5b6e420f3..124893cf9 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/standDetain.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/standDetain.vue
@@ -4,7 +4,7 @@
       <el-col :span="16">
         <el-tabs v-model="activeName" type="border-card" @tab-click="changeTabs">
           <el-tab-pane label="站台" name="first">
-            <div class="simulate_table">
+            <div id="sim_table" class="simulate_table">
               <div style="display: flex;">
                 <div class="simulate_table_header" style="width: 120px;">站台</div>
                 <div class="simulate_table_header" style="width: 120px;">扣车</div>
@@ -127,6 +127,18 @@ export default {
             });
             this.judgeStatus();
         },
+        rightClickShow(operate, selected) {
+            this.dialogShow = true;
+            this.selectedStandList = [selected.code];
+            this.allChecked = false;
+            this.$nextTick(function () {
+                const index = this.stationStandList.findIndex(el => el.code == selected.code);
+                const ele = document.getElementById('sim_table');
+                ele.scrollTop = index * 20;
+                this.judgeStatus();
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
         clickStand(val) {
             const index = this.selectedStandList.indexOf(val.code);
             if (index === -1) {
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/stationTransfer.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/stationTransfer.vue
index 67c17c124..9d8b8b906 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/stationTransfer.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/stationTransfer.vue
@@ -158,6 +158,14 @@ export default {
                 this.$store.dispatch('training/emitTipFresh');
             });
         },
+        rightClickShow(operate, selected) {
+            this.dialogShow = true;
+            this.$nextTick(function () {
+                const stand = this.centralizedStaionList.find(el => el.code == selected.code);
+                this.$refs.table.setCurrentRow(stand);
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
         getControlApplUserId(controller, controlApplicant) {
             const memberData = this.$store.state.training.memberData;
             if (controller && memberData[controller] && memberData[controller].userId == this.$store.state.user.id ) {
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/switchActive.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/switchActive.vue
index 53627252f..30d6fd314 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/switchActive.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/switchActive.vue
@@ -3,11 +3,11 @@
     <el-row>
       <el-col :span="18">
         <el-table
+          :id="domIdChoose"
           ref="table"
           :data="switchList"
           highlight-current-row
           height="300px"
-		  :id="domIdChoose"
           @current-change="handleCurrentChange"
         >
           <el-table-column prop="name" width="80" label="道岔" />
@@ -61,8 +61,7 @@ export default {
             allChecked: false,
             dialogShow: false,
             loading: false,
-			status: false,
-			isActive: false,
+            isActive: false
         };
     },
     computed: {
@@ -96,15 +95,15 @@ export default {
             if (this.show) {
                 this.commit();
             }
-		},
-		'selected': function(val) {
+        },
+        'selected': function(val) {
             if (val) {
-				const swchEle = this.$store.getters['map/getDeviceByCode'](val.code);
+                const swchEle = this.$store.getters['map/getDeviceByCode'](val.code);
                 if (swchEle && swchEle.cutOff) {
-					this.status = true;
+                    this.status = true;
                 } else {
-					this.status = false;
-				}
+                    this.status = false;
+                }
             }
         }
     },
@@ -117,6 +116,18 @@ export default {
                 this.$store.dispatch('training/emitTipFresh');
             });
         },
+        rightClickShow(operate, selected) {
+            this.dialogShow = true;
+            this.$nextTick(function () {
+                let index = 0;
+                const switchEle = this.switchList.find((el, i) => { index = i; return el.code == selected.code; });
+                this.$refs.table.setCurrentRow(switchEle);
+                setTimeout(()=> {
+                    this.$refs.table.bodyWrapper.scrollTop = index * 20;
+                }, 200);
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
         doClose() {
             this.loading = false;
             this.dialogShow = false;
@@ -127,13 +138,13 @@ export default {
             const step = {
                 over: true,
                 cmdType: this.status ? CMD.Switch.CMD_SWITCH_ACTIVE : CMD.Switch.CMD_SWITCH_CUT_OFF,
-                operation: isClose ? OperationEvent.Command.common.confirm.operation: OperationEvent.Command.common.apply.operation,
+                operation: isClose ? OperationEvent.Command.common.confirm.operation : OperationEvent.Command.common.apply.operation,
                 param: { switchCode: this.selected.code}
             };
 
             this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
                 if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     isClose && this.doClose();
                 }
             }).catch(() => {
@@ -145,22 +156,22 @@ export default {
             if (!val) { return; }
             const step = {
                 code: val.code,
-				operation: OperationEvent.Command.common.choose.operation,
-				val: val.code
-			};
+                operation: OperationEvent.Command.common.choose.operation,
+                val: val.code
+            };
 
             this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
                 if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-					this.$store.dispatch('menuOperation/setSelected', {device: val});
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$store.dispatch('menuOperation/setSelected', {device: val});
                 }
             }).catch(() => {
                 this.$refs.noticeInfo.doShow();
             });
         },
         getSwitchCutOff(code) {
-			const swchEle = this.$store.getters['map/getDeviceByCode'](code);
-            if (!!swchEle.cutOff) {
+            const swchEle = this.$store.getters['map/getDeviceByCode'](code);
+            if (swchEle.cutOff) {
                 return '未激活';
             } else {
                 return '激活';
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/switchBlock.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/switchBlock.vue
index 35928cf10..c51a98410 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/switchBlock.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/switchBlock.vue
@@ -28,7 +28,7 @@
           </el-table-column>
         </el-table>
       </el-col>
-      <el-col :span="6" v-if="sure">
+      <el-col v-if="sure" :span="6">
         <div class="radio-box-title">命令</div>
         <div class="radio-box">
           <el-radio v-model="command" :label="true" style="display: block;margin-bottom: 10px;">确认</el-radio>
@@ -61,41 +61,41 @@ import { mapGetters } from 'vuex';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
 
 export default {
-	props: {
-		initCacheMap: {
-			type: Object,
-			default() {
-				return {}
-			}
-		},
-		initInfo: {
-			type: Object,
-			default() {
-				return {}
-			}
-		},
-		updateDone: {
-			type: Number,
-			default: 0
-		}
-	},
     components: {
         NoticeInfo
     },
+    props: {
+        initCacheMap: {
+            type: Object,
+            default() {
+                return {};
+            }
+        },
+        initInfo: {
+            type: Object,
+            default() {
+                return {};
+            }
+        },
+        updateDone: {
+            type: Number,
+            default: 0
+        }
+    },
     data() {
         return {
-			title: '',
+            title: '',
             status: false,
             standStatus: true,
             allChecked: false,
             dialogShow: false,
             loading: false,
             command: true,
-			sure: false,
-			operate: {},
-			currentSelect: null,
-			noInit: true,
-			changeIgnore: false,
+            sure: false,
+            operate: {},
+            currentSelect: null,
+            noInit: true,
+            changeIgnore: false
         };
     },
     computed: {
@@ -105,21 +105,21 @@ export default {
         show() {
             return this.dialogShow && !this.$store.state.menuOperation.break;
         },
-		tempList() {
-			return this.switchList;
-		},
-		initSelect() {
-			return this.initInfo.initSelect||{};
-		},
+        tempList() {
+            return this.switchList;
+        },
+        initSelect() {
+            return this.initInfo.initSelect || {};
+        },
         isBlock() {
             return this.operate && this.operate.operation.includes(OperationEvent.Command.commandNingBo3.line_switch_block.operation);
         },
-		cmdType() {
-			return this.isBlock ? CMD.Switch.CMD_SWITCH_BLOCK : CMD.Switch.CMD_SWITCH_UNBLOCK;
-		},
-		disabled() {
-			return !this.currentSelect || (this.isBlock? this.currentSelect.blockade: !this.currentSelect.blockade) || this.noInit;
-		},
+        cmdType() {
+            return this.isBlock ? CMD.Switch.CMD_SWITCH_BLOCK : CMD.Switch.CMD_SWITCH_UNBLOCK;
+        },
+        disabled() {
+            return !this.currentSelect || (this.isBlock ? this.currentSelect.blockade : !this.currentSelect.blockade) || this.noInit;
+        },
         domIdChoose() {
             return this.dialogShow ? OperationEvent.Command.common.choose.domId : '';
         },
@@ -139,82 +139,104 @@ export default {
                 this.commit();
             }
         },
-		updateDone() {
-			if (this.currentSelect) {
-				this.noInit = this.sure && (this.getCacheMap()[this.currentSelect.code]||{}).done != 'one';
-			}
-		}
+        updateDone() {
+            if (this.currentSelect) {
+                this.noInit = this.sure && (this.getCacheMap()[this.currentSelect.code] || {}).done != 'one';
+            }
+        }
     },
     methods: {
-		getCacheMap() {
-			return this.initCacheMap[this.cmdType.value]||{};
-		},
+        getCacheMap() {
+            return this.initCacheMap[this.cmdType.value] || {};
+        },
         doShow(operate, sure) {
             this.operate = operate;
-			this.sure = sure;
+            this.sure = sure;
 
-			if (sure) {
-	            this.title = `${this.isBlock ? '确认/取消道岔封锁' : '确认/取消道岔解除封锁'}`;
-			} else {
-	            this.title = `${this.isBlock ? '初始化道岔封锁': '初始化解除封锁'}`;
-				this.command = true;
-			}
+            if (sure) {
+                this.title = `${this.isBlock ? '确认/取消道岔封锁' : '确认/取消道岔解除封锁'}`;
+            } else {
+                this.title = `${this.isBlock ? '初始化道岔封锁' : '初始化解除封锁'}`;
+                this.command = true;
+            }
 
-			this.currentSelect = sure? this.$store.getters['map/getDeviceByCode'](this.initSelect.code): null
-			this.dialogShow = true;
+            this.currentSelect = sure ? this.$store.getters['map/getDeviceByCode'](this.initSelect.code) : null;
+            this.dialogShow = true;
             this.$nextTick(function () {
-				this.changeIgnore = sure
-				this.$refs.table.setCurrentRow(sure? this.tempList.find(el => el.code == this.initSelect.code): null);
-				this.$store.dispatch('training/emitTipFresh');
+                this.changeIgnore = sure;
+                this.$refs.table.setCurrentRow(sure ? this.tempList.find(el => el.code == this.initSelect.code) : null);
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
+        rightClickShow(operate, sure, selected) {
+            this.operate = operate;
+            this.sure = sure;
+            if (sure) {
+                this.title = `${this.isBlock ? '确认/取消道岔封锁' : '确认/取消道岔解除封锁'}`;
+            } else {
+                this.title = `${this.isBlock ? '初始化道岔封锁' : '初始化解除封锁'}`;
+                this.command = true;
+            }
+            this.currentSelect = this.$store.getters['map/getDeviceByCode'](selected.code);
+            this.dialogShow = true;
+            this.$nextTick(function () {
+                let index = 0;
+                const switchEle = this.tempList.find((el, i) => { index = i; return el.code == selected.code; });
+                this.$refs.table.setCurrentRow(switchEle);
+                setTimeout(()=> {
+                    this.$refs.table.bodyWrapper.scrollTop = index * 20;
+                }, 200);
+                this.$emit('updateDone');
+                this.$store.dispatch('training/emitTipFresh');
             });
         },
         doClose() {
             this.loading = false;
             this.dialogShow = false;
-			this.sure && (this.currentSelect = null);
+            this.sure && (this.currentSelect = null);
             this.sure && this.$refs.table.setCurrentRow();
-			this.sure && this.$root.$emit('iniCacheMap', this.cmdType.value,
-				Object.fromEntries(Object.entries(this.getCacheMap()).filter(el => el[1].done == 'done'))
-			)
+            this.sure && this.$root.$emit('iniCacheMap', this.cmdType.value,
+                Object.fromEntries(Object.entries(this.getCacheMap()).filter(el => el[1].done == 'done'))
+            );
             this.$store.dispatch('training/emitTipFresh');
         },
         commit(isClose = false) {
-			if (this.currentSelect &&
+            if (this.currentSelect &&
 				this.currentSelect.code == this.initSelect.code) {
-				const cacheMap= this.getCacheMap()
-				const isOK = this.command&&(!this.sure || this.sure&&cacheMap[this.currentSelect.code])
-				const operate = {
-					cmdType: this.sure&&isOK ? this.cmdType : null,
-					operation: isClose ? OperationEvent.Command.common.confirm.operation : OperationEvent.Command.common.apply.operation,
-					over: this.sure,
-					param: { switchCode: this.currentSelect.code }
-				};
+                const cacheMap = this.getCacheMap();
+                const isOK = this.command && (!this.sure || this.sure && cacheMap[this.currentSelect.code]);
+                const operate = {
+                    cmdType: this.sure && isOK ? this.cmdType : null,
+                    operation: isClose ? OperationEvent.Command.common.confirm.operation : OperationEvent.Command.common.apply.operation,
+                    over: this.sure,
+                    param: { switchCode: this.currentSelect.code }
+                };
 
-				this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-					if (valid) {
-						this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-						if (isOK) {
-							this.$root.$emit('appendCache', this.cmdType.value, this.currentSelect.code, {done:  this.sure? 'two': 'one'});
-						} else {
-							this.$root.$emit('removeCache', this.cmdType.value, this.currentSelect.code);
-						}
+                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    if (valid) {
+                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                        if (isOK) {
+                            this.$root.$emit('appendCache', this.cmdType.value, this.currentSelect.code, {done:  this.sure ? 'two' : 'one'});
+                        } else {
+                            this.$root.$emit('removeCache', this.cmdType.value, this.currentSelect.code);
+                        }
 
-						this.$emit('updateDone')
-						this.$store.dispatch('map/flushMapRef');
-						isClose && this.doClose();
-					}
-				}).catch(_ => {
-					isClose && this.doClose();
-					this.$refs.noticeInfo.doShow();
-				});
-			} else {
-				this.$messageBox('两次选择不一致');
-			}
+                        this.$emit('updateDone');
+                        this.$store.dispatch('map/flushMapRef');
+                        isClose && this.doClose();
+                    }
+                }).catch(_ => {
+                    isClose && this.doClose();
+                    this.$refs.noticeInfo.doShow();
+                });
+            } else {
+                this.$messageBox('两次选择不一致');
+            }
         },
         handleCurrentChange(val) {
             if (!val) { return; }
-			this.currentSelect = this.$store.getters['map/getDeviceByCode'](val.code);
-			this.$emit('updateDone')
+            this.currentSelect = this.$store.getters['map/getDeviceByCode'](val.code);
+            this.$emit('updateDone');
             if (this.changeIgnore) { return; }
 
             const step = {
@@ -223,34 +245,34 @@ export default {
                 val: val.code
             };
 
-			this.changeIgnore = false;
+            this.changeIgnore = false;
             this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
                 if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-					this.sure || this.$emit('initSelect', this.currentSelect);
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.sure || this.$emit('initSelect', this.currentSelect);
                 }
             }).catch(() => {
                 this.$refs.noticeInfo.doShow();
             });
         },
-		getSwitchStatus(code) {
+        getSwitchStatus(code) {
             const elem = this.$store.getters['map/getDeviceByCode'](code);
-			return elem.blockade? '锁闭的': '未锁闭的';
+            return elem.blockade ? '锁闭的' : '未锁闭的';
         },
         getProcess(code, type) {
-			const blockType = this.isBlock ? 'block': 'unblock';
-			const cacheMap = this.getCacheMap();
-			const cache = cacheMap[code];
-			if (blockType==type) {
-				if (cache) {
-					if (this.sure) {
-						return cache.done == 'two' ? this.isBlock ? '确认锁闭完成' : '确认解锁完成' : '等待确认/取消';
-					} else {
-						return cache.done == 'one' ? '已初始化' : ''
-					}
-				}
-			}
-			return '';
+            const blockType = this.isBlock ? 'block' : 'unblock';
+            const cacheMap = this.getCacheMap();
+            const cache = cacheMap[code];
+            if (blockType == type) {
+                if (cache) {
+                    if (this.sure) {
+                        return cache.done == 'two' ? this.isBlock ? '确认锁闭完成' : '确认解锁完成' : '等待确认/取消';
+                    } else {
+                        return cache.done == 'one' ? '已初始化' : '';
+                    }
+                }
+            }
+            return '';
         },
         cancel() {
             const operate = {
@@ -260,7 +282,7 @@ export default {
                 if (valid) {
                     this.doClose();
                 }
-            }).catch(error => {
+            }).catch(() => {
                 this.doClose();
             });
         }
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/switchCommand.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/switchCommand.vue
index dcdbb6b9b..7ce8da892 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/switchCommand.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/switchCommand.vue
@@ -130,6 +130,21 @@ export default {
                 this.$store.dispatch('training/emitTipFresh');
             });
         },
+        rightClickShow(operate, selected) {
+            this.dialogShow = true;
+            this.mode = '';
+            this.position = '';
+            this.$nextTick(function () {
+                let index = 0;
+                const switchEle = this.switchList.find((el, i) => { index = i; return el.code == selected.code; });
+                this.$refs.table.setCurrentRow(switchEle);
+                setTimeout(() => {
+                    this.$refs.table.bodyWrapper.scrollTop = index * 20;
+                }, 200);
+                this.handleCurrentChange(switchEle);
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
         doClose() {
             this.loading = false;
             this.dialogShow = false;
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/switchDetail.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/switchDetail.vue
index 90514568c..e110428d5 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/switchDetail.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/switchDetail.vue
@@ -1,7 +1,7 @@
 <template>
   <el-dialog v-dialogDrag class="ningbo-01__systerm route-setting" :title="title" :visible.sync="show" width="700px" :before-close="doClose" :z-index="2000" :modal="false" :close-on-click-modal="false">
     <el-row>
-      <el-table :data="switchList" height="350px">
+      <el-table ref="table" :data="switchList" height="350px">
         <el-table-column prop="name" width="80" label="道岔" />
         <el-table-column prop="position" width="80" label="位置">
           <template slot-scope="scope">
@@ -94,6 +94,14 @@ export default {
                 this.$store.dispatch('training/emitTipFresh');
             });
         },
+        rightClickShow(operate, selected) {
+            this.operate = operate;
+            this.dialogShow = true;
+            setTimeout(() => {
+                const index = this.switchList.findIndex(el => el.code == selected.code);
+                this.$refs.table.bodyWrapper.scrollTop = index * 20;
+            }, 200);
+        },
         doClose() {
             this.loading = false;
             this.dialogShow = false;
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuSection.vue b/src/jmapNew/theme/ningbo_03/menus/menuSection.vue
index 38edc8a9b..f3801ef05 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuSection.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuSection.vue
@@ -1,45 +1,42 @@
 <template>
   <div>
     <pop-menu ref="popMenu" :menu="menu" />
-    <section-control ref="sectionControl" pop-class="ningbo-01__systerm" />
-    <section-un-lock ref="sectionUnLock" pop-class="ningbo-01__systerm" />
-    <speed-limit-control ref="speedLimitControl" pop-class="ningbo-01__systerm" />
-    <alxe-effective ref="alxeEffective" />
     <notice-info ref="noticeInfo" pop-class="ningbo-01__systerm" />
     <set-fault ref="setFault" pop-class="ningbo-01__systerm" />
     <train-add-plan ref="trainAddPlan" pop-class="ningbo-01__systerm" />
     <load-spare-train ref="loadSpareTrain" pop-class="foshan-01__systerm" />
+    <section-open ref="sectionOpen" :init-cache-map="initCacheMap" :init-info="initInfo" :update-done="updateDone" @updateDone="onUpdateDone" @initSelect="onChangeInitInfo" />
+    <section-limit-speed ref="sectionLimitSpeed" :init-cache-map="initCacheMap" :init-info="initInfo" :update-done="updateDone" @updateDone="onUpdateDone" @initSelect="onChangeInitInfo" />
+    <section-show ref="sectionShow" />
   </div>
 </template>
 
 <script>
 import PopMenu from '@/components/PopMenu';
-import SectionControl from '@/jmapNew/theme/components/menus/dialog/sectionControl';
 import TrainAddPlan from '@/jmapNew/theme/components/menus/dialog/trainAddPlan';
 import SetFault from '@/jmapNew/theme/components/menus/dialog/setFault';
-import SectionUnLock from '@/jmapNew/theme/components/menus/dialog/sectionUnLock';
-import SpeedLimitControl from '@/jmapNew/theme/components/menus/dialog/speedCmdControl';
-import AlxeEffective from './dialog/alxeEffective';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
+import SectionOpen from './menuDialog/sectionOpen';
+import SectionLimitSpeed from './menuDialog/sectionLimitSpeed';
+import SectionShow from './menuDialog/sectionShow';
 import { mapGetters } from 'vuex';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
-import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
 import LoadSpareTrain from '@/jmapNew/theme/components/menus/dialog/loadSpareTrain';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
 export default {
     name: 'SectionMenu',
     components: {
+        SectionLimitSpeed,
         PopMenu,
-        SectionControl,
-        SectionUnLock,
-        SpeedLimitControl,
-        AlxeEffective,
         NoticeInfo,
         TrainAddPlan,
         SetFault,
-        LoadSpareTrain
+        LoadSpareTrain,
+        SectionOpen,
+        SectionShow
     },
     props: {
         selected: {
@@ -47,6 +44,24 @@ export default {
             default() {
                 return null;
             }
+        },
+        initCacheMap: {
+            type: Object,
+            default() {
+                return {};
+            }
+        },
+        initInfo: {
+            type: Object,
+            default() {
+                return {};
+            }
+        },
+        updateDone: {
+            type: Number,
+            default() {
+                return 0;
+            }
         }
     },
     data() {
@@ -71,26 +86,67 @@ export default {
                     // },
                 ],
                 Center: [
-                    // {
-                    //     label: '区段跟踪激活',
-                    //     handler: this.active,
-                    //     cmdType: CMD.Section.CMD_SECTION_ACTIVE
-                    // },
-                    // {
-                    //     label: '区段跟踪切除',
-                    //     handler: this.split,
-                    //     cmdType: CMD.Section.CMD_SECTION_CUT_OFF
-                    // },
-                    // {
-                    //     label: '确认计轴有效',
-                    //     handler: this.alxeEffective,
-                    //     cmdType: CMD.Section.CMD_SECTION_COMFIRMATION_AXLE
-                    // },
-                    // {
-                    //     label: '设置临时限速',
-                    //     handler: this.setSpeed,
-                    //     cmdType: CMD.Section.CMD_SECTION_SET_LIMIT_SPEED
-                    // }
+                    {
+                        label: '开放',
+                        children: [
+                            {
+                                label: '初始化',
+                                handler: this.handlerInitOpen
+                            },
+                            {
+                                label: '确定/取消',
+                                handler: this.handlerOpen
+                            }
+                        ]
+                    },
+                    {
+                        label: '关闭',
+                        children: [
+                            {
+                                label: '初始化',
+                                handler: this.handlerInitClose
+                            },
+                            {
+                                label: '确定/取消',
+                                handler: this.handlerClose
+                            }
+                        ]
+                    },
+                    {
+                        label: '临时限速',
+                        children: [
+                            {
+                                label: '设置',
+                                children: [
+                                    {
+                                        label: '初始化',
+                                        handler: this.handlerInitSetLimit
+                                    },
+                                    {
+                                        label: '确定/取消',
+                                        handler: this.handlerSetLimit
+                                    }
+                                ]
+                            },
+                            {
+                                label: '清除',
+                                children: [
+                                    {
+                                        label: '初始化',
+                                        handler: this.handlerInitCancelLimit
+                                    },
+                                    {
+                                        label: '确定/取消',
+                                        handler: this.handlerCancelLimit
+                                    }
+                                ]
+                            }
+                        ]
+                    },
+                    {
+                        label: '显示',
+                        handler: this.handlerDetail
+                    }
                 ]
             },
             menuForce: [
@@ -144,7 +200,8 @@ export default {
         initMenu() {
             // 编辑模式菜单列表
             if (this.selected.type != '04') {
-                this.menu = MenuContextHandler.covert(this.menuNormal);
+                // this.menu = MenuContextHandler.covert(this.menuNormal);
+                this.menu = this.menuNormal.Center;
             } else {
                 this.menu = [];
             }
@@ -153,6 +210,12 @@ export default {
                 this.menu = this.menuForce;
             }
         },
+        onUpdateDone() {
+            this.$emit('onUpdateDone');
+        },
+        onChangeInitInfo(initSelect, initParams) {
+            this.$emit('onChangeInitInfo', initSelect, initParams);
+        },
         doShow(point) {
             this.initMenu();
             if (this.$refs && this.$refs.popMenu && this.menu && this.menu.length) {
@@ -251,6 +314,33 @@ export default {
                     this.$refs.loadSpareTrain.doShow(operate, this.selected);
                 }
             });
+        },
+        handlerInitOpen() {
+            this.$refs.sectionOpen.rightClickShow(OperationEvent.Command.commandNingBo3.line_section_open_init, false, this.selected);
+        },
+        handlerOpen() {
+            this.$refs.sectionOpen.rightClickShow(OperationEvent.Command.commandNingBo3.line_section_open_sure, true, this.selected);
+        },
+        handlerInitClose() {
+            this.$refs.sectionOpen.rightClickShow(OperationEvent.Command.commandNingBo3.line_section_close_init, false, this.selected);
+        },
+        handlerClose() {
+            this.$refs.sectionOpen.rightClickShow(OperationEvent.Command.commandNingBo3.line_section_close_sure, true, this.selected);
+        },
+        handlerInitSetLimit() {
+            this.$refs.sectionLimitSpeed.rightClickShow(OperationEvent.Command.commandNingBo3.line_section_setSpeed_init, false, this.selected);
+        },
+        handlerSetLimit() {
+            this.$refs.sectionLimitSpeed.rightClickShow(OperationEvent.Command.commandNingBo3.line_section_setSpeed_sure, true, this.selected);
+        },
+        handlerInitCancelLimit() {
+            this.$refs.sectionLimitSpeed.rightClickShow(OperationEvent.Command.commandNingBo3.line_section_clearSpeed_init, false, this.selected);
+        },
+        handlerCancelLimit() {
+            this.$refs.sectionLimitSpeed.rightClickShow(OperationEvent.Command.commandNingBo3.line_section_clearSpeed_sure, true, this.selected);
+        },
+        handlerDetail() {
+            this.$refs.sectionShow.rightClickShow('', this.selected);
         }
     }
 };
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuSignal.vue b/src/jmapNew/theme/ningbo_03/menus/menuSignal.vue
index 297237b39..b0d518c6a 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuSignal.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuSignal.vue
@@ -227,30 +227,6 @@ export default {
                 this.$refs.popMenu.close();
             }
         },
-        // 设置通过模式
-        singalPassModel() {
-            commitOperate(menuOperate.Signal.setAutoInterlock, {signalCode:this.selected.code}, 0).then(({valid, operate})=>{
-                if (valid) {
-                    this.$refs.routeControl.doShow(operate, this.selected);
-                }
-            });
-        },
-        // 取消通过模式
-        singalCancelPassModel() {
-            commitOperate(menuOperate.Signal.cancelAutoInterlock, {signalCode:this.selected.code}, 0).then(({valid, operate})=>{
-                if (valid) {
-                    this.$refs.routeControl.doShow(operate, this.selected);
-                }
-            });
-        },
-        // 人工解锁进路（信号机取消引导）
-        humanTrainRoute() {
-            commitOperate(menuOperate.Signal.cancelGuide, {signalCode:this.selected.code}, 0).then(({valid, operate})=>{
-                if (valid) {
-                    this.$refs.routerCommand.doShow(operate, this.selected, '是否执行人解列车进路命令?');
-                }
-            });
-        },
         // 设置故障
         setStoppage() {
             commitOperate(menuOperate.Common.setFault, { code: this.selected.code }, 0).then(({valid, operate})=>{
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuStation.vue b/src/jmapNew/theme/ningbo_03/menus/menuStation.vue
index d6307cdbe..7de067d07 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuStation.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuStation.vue
@@ -69,19 +69,28 @@ export default {
                 ],
                 Center: [
                     // {
-                    //     label: '所有进路自排关',
-                    //     handler: this.humanControlALL,
-                    //     cmdType: CMD.Station.CMD_STATION_CLOSE_AUTO_SETTING
+                    //     label: '开放/关闭',
+                    //     handler: ''
                     // },
                     // {
-                    //     label: '所有进路自排开',
-                    //     handler: this.atsAutoControlALL,
-                    //     cmdType: CMD.Station.CMD_STATION_OPEN_AUTO_SETTING
+                    //     label: '设置/取消扣车',
+                    //     handler: ''
                     // },
                     // {
-                    //     label: '执行关键操作测试',
-                    //     handler: this.execKeyOperationTest,
-                    //     cmdType: CMD.Station.CMD_STATION_KEY_OPERATION_TEST
+                    //     label: '设置站间列车数量',
+                    //     handler: ''
+                    // },
+                    // {
+                    //     label: '分配停站时间',
+                    //     handler: ''
+                    // },
+                    // {
+                    //     label: '授权转移',
+                    //     handler: ''
+                    // },
+                    // {
+                    //     label: '显示',
+                    //     handler: ''
                     // }
                 ]
             },
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuStationStand.vue b/src/jmapNew/theme/ningbo_03/menus/menuStationStand.vue
index 7b6b9980f..dada4a68e 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuStationStand.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuStationStand.vue
@@ -1,45 +1,41 @@
 <template>
   <div>
     <pop-menu ref="popMenu" :menu="menu" />
-    <stand-control ref="standControl" system-name="ningbo-01__systerm" />
-    <stand-jump-stop-control ref="standJumpStopControl" system-name="ningbo-01__systerm" />
-    <stand-detail ref="standDetail" pop-class="ningbo-01__systerm" />
-    <stand-run-level ref="standRunLevel" system-name="ningbo-01__systerm" />
-    <stand-stop-time ref="standStopTime" system-name="ningbo-01__systerm" />
-    <StandBulkBuckleTrain ref="standBulkBuckleTrain" />
     <notice-info ref="noticeInfo" pop-class="ningbo-01__systerm" />
     <set-fault ref="setFault" pop-class="ningbo-01__systerm" />
+    <stand-control ref="standControl" />
+    <stand-detain ref="standDetain" />
+    <allocate-time ref="allocateTime" />
+    <station-transfer ref="stationTransfer" />
+    <stand-detail ref="standDetail" />
   </div>
 </template>
 
 <script>
 import PopMenu from '@/components/PopMenu';
-import StandControl from '@/jmapNew/theme/components/menus/dialog/standControl';
-import StandJumpStopControl from '@/jmapNew/theme/components/menus/dialog/standJumpStopControl';
 import SetFault from '@/jmapNew/theme/components/menus/dialog/setFault';
-import StandDetail from '@/jmapNew/theme/components/menus/dialog/standDetail';
-import StandRunLevel from '@/jmapNew/theme/components/menus/dialog/standRunLevel';
-import StandStopTime from '@/jmapNew/theme/components/menus/dialog/standStopTime';
-import StandBulkBuckleTrain from './dialog/standBulkBuckleTrain';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
+import StandControl from './menuDialog/standControl';
+import StandDetain from './menuDialog/standDetain';
+import StandDetail from './menuDialog/standDetail';
+import AllocateTime from './menuDialog/allocateTime';
+import StationTransfer from './menuDialog/stationTransfer';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
 import { mapGetters } from 'vuex';
 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,
-        StandJumpStopControl,
-        StandBulkBuckleTrain,
-        StandDetail,
-        StandRunLevel,
         NoticeInfo,
-        StandStopTime,
-        SetFault
+        StandControl,
+        SetFault,
+        StandDetain,
+        AllocateTime,
+        StationTransfer,
+        StandDetail
     },
     props: {
         selected: {
@@ -76,66 +72,30 @@ export default {
                     // }
                 ],
                 Center: [
-                    // {
-                    //     label: '扣车',
-                    //     handler: this.setDetainTrain,
-                    //     cmdType:CMD.Stand.CMD_STAND_SET_HOLD_TRAIN
-                    // },
-                    // {
-                    //     label: '取消扣车',
-                    //     handler: this.cancelDetainTrain,
-                    //     cmdType:CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN
-                    // },
-                    // {
-                    //     label: '批量扣车',
-                    //     handler: this.setBulkBuckleTrain,
-                    //     cmdType:CMD.Stand.CMD_STAND_SET_HOLD_TRAIN_ALL
-                    // },
-                    // {
-                    //     label: '批量取消扣车',
-                    //     handler: this.cancelBulkBuckleTrain,
-                    //     cmdType:CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN_ALL
-                    // },
-                    // {
-                    //     label: '提前发车',
-                    //     handler: this.earlyDeparture,
-                    //     cmdType:CMD.Stand.CMD_STAND_EARLY_DEPART
-                    // },
-                    // {
-                    //     label: '设置跳停',
-                    //     handler: this.setJumpStop,
-                    //     cmdType:CMD.Stand.CMD_STAND_SET_JUMP_STOP
-                    // },
-                    // {
-                    //     label: '取消跳停',
-                    //     handler: this.cancelJumpStop,
-                    //     cmdType:CMD.Stand.CMD_STAND_CANCEL_JUMP_STOP
-                    // },
-                    // {
-                    //     label: '设置停站时间',
-                    //     handler: this.setStopTime,
-                    //     cmdType:CMD.Stand.CMD_STAND_SET_PARK_TIME
-                    // },
-                    // {
-                    //     label: '设置运行等级',
-                    //     handler: this.setRunLevel,
-                    //     cmdType:CMD.Stand.CMD_STAND_SET_RUN_TIME
-                    // },
-                    // {
-                    //     label: '区间列车数量限制',
-                    //     handler: this.setDetainTrainAll,
-                    //     cmdType:CMD.Stand.CMD_STAND_SET_HOLD_TRAIN_AUTO
-                    // },
-                    // {
-                    //     label: '取消区间列车数量限制',
-                    //     handler: this.cancelDetainTrainAll,
-                    //     cmdType:CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN_AUTO
-                    // },
-                    // {
-                    //     label: '查看站台信息',
-                    //     handler: this.detail,
-                    //     cmdType:CMD.Stand.CMD_STAND_VIEW_STATUS
-                    // }
+                    {
+                        label: '开放/关闭',
+                        handler: this.handlerOpenOrClose
+                    },
+                    {
+                        label: '设置/取消扣车',
+                        handler: this.handlerDetain
+                    },
+                    {
+                        label: '设置站间列车数量',
+                        handler: this.undeveloped
+                    },
+                    {
+                        label: '分配停站时间',
+                        handler: this.handlerAllocateTime
+                    },
+                    {
+                        label: '授权转移',
+                        handler: this.handlerStationTransfer
+                    },
+                    {
+                        label: '显示',
+                        handler: this.handlerDetail
+                    }
                 ]
             },
             menuForce: [
@@ -173,7 +133,8 @@ export default {
     methods: {
         initMenu() {
             // 编辑模式菜单列表
-            this.menu = MenuContextHandler.covert(this.menuNormal);
+            // this.menu = MenuContextHandler.covert(this.menuNormal);
+            this.menu = this.menuNormal.Center;
 
             // 故障模式菜单列表
             if (this.operatemode === OperateMode.FAULT) {
@@ -207,99 +168,25 @@ export default {
                 }
             });
         },
-        // 设置扣车
-        setDetainTrain() {
-            commitOperate(menuOperate.StationStand.setDetainTrain, {standCode:this.selected.code}, 0).then(({valid, operate})=>{
-                if (valid) {
-                    this.$refs.standControl.doShow(operate, this.selected);
-                }
-            });
+        handlerOpenOrClose() {
+            this.$refs.standControl.rightClickShow('', this.selected);
         },
-        // 取消扣车
-        cancelDetainTrain() {
-            commitOperate(menuOperate.StationStand.cancelDetainTrain, {standCode:this.selected.code}, 0).then(({valid, operate})=>{
-                if (valid) {
-                    this.$refs.standControl.doShow(operate, this.selected);
-                }
-            });
+        handlerDetain() {
+            this.$refs.standDetain.rightClickShow('', this.selected);
         },
-        // 区间列车数量限制
-        setDetainTrainAll() {
-            commitOperate(menuOperate.StationStand.setDetainTrainAuto, {standCode:this.selected.code}, 0).then(({valid, operate})=>{
-                if (valid) {
-                    this.$refs.standControl.doShow(operate, this.selected);
-                }
-            });
+        handlerAllocateTime() {
+            this.$refs.allocateTime.rightClickShow('', this.selected);
         },
-        // 取消区间列车数量限制
-        cancelDetainTrainAll() {
-            commitOperate(menuOperate.StationStand.cancelDetainTrainAuto, {standCode:this.selected.code}, 0).then(({valid, operate})=>{
-                if (valid) {
-                    this.$refs.standControl.doShow(operate, this.selected);
-                }
-            });
+        handlerStationTransfer() {
+            this.$refs.stationTransfer.rightClickShow('', this.selected);
         },
-        // 批量扣车
-        setBulkBuckleTrain() {
-            commitOperate(menuOperate.StationStand.setBulkBuckleTrain, {}, 0).then(({valid, operate})=>{
-                if (valid) {
-                    this.$refs.standBulkBuckleTrain.doShow(operate, this.selected);
-                }
-            });
+        handlerDetail() {
+            this.$refs.standDetail.rightClickShow('', this.selected);
         },
-        // 批量取消扣车
-        cancelBulkBuckleTrain() {
-            commitOperate(menuOperate.StationStand.cancelBulkBuckleTrain, {}, 0).then(({valid, operate})=>{
-                if (valid) {
-                    this.$refs.standBulkBuckleTrain.doShow(operate, this.selected);
-                }
-            });
-        },
-        // 设置跳停
-        setJumpStop() {
-            commitOperate(menuOperate.StationStand.setJumpStop, {standCode:this.selected.code}, 0).then(({valid, operate})=>{
-                if (valid) {
-                    this.$refs.standJumpStopControl.doShow(operate, this.selected);
-                }
-            });
-        },
-        // 取消跳停
-        cancelJumpStop() {
-            commitOperate(menuOperate.StationStand.cancelJumpStop, {standCode:this.selected.code}, 0).then(({valid, operate})=>{
-                if (valid) {
-                    this.$refs.standJumpStopControl.doShow(operate, this.selected);
-                }
-            });
-        },
-        // 设置停站时间
-        setStopTime() {
-            commitOperate(menuOperate.StationStand.setStopTime, {standCode:this.selected.code}, 0).then(({valid, operate})=>{
-                if (valid) {
-                    this.$refs.standStopTime.doShow(operate, this.selected);
-                }
-            });
-        },
-        // 设置运行等级
-        setRunLevel() {
-            commitOperate(menuOperate.StationStand.setRunLevel, {standCode:this.selected.code}, 0).then(({valid, operate})=>{
-                if (valid) {
-                    this.$refs.standRunLevel.doShow(operate, this.selected);
-                }
-            });
-        },
-        // 设置提前发车
-        earlyDeparture() {
-            commitOperate(menuOperate.StationStand.earlyDeparture, {standCode:this.selected.code}, 0).then(({valid, operate})=>{
-                if (valid) {
-                    this.$refs.standControl.doShow(operate, this.selected);
-                }
-            });
-        },
-        // 查询站台状态
-        detail() {
-            commitOperate(menuOperate.StationStand.detail, {standCode:this.selected.code}, 0).then(({valid, operate})=>{
-                if (valid) {
-                    this.$refs.standDetail.doShow(operate, this.selected);
+        undeveloped() {
+            this.$alert('实现中......', '提示', {
+                confirmButtonText: '确定',
+                callback: action => {
                 }
             });
         }
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuSwitch.vue b/src/jmapNew/theme/ningbo_03/menus/menuSwitch.vue
index 2cfd01336..f5e54c5b8 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuSwitch.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuSwitch.vue
@@ -1,43 +1,36 @@
 <template>
   <div>
     <pop-menu ref="popMenu" :menu="menu" />
-    <switch-control ref="switchControl" pop-class="ningbo-01__systerm" />
-    <section-un-lock ref="sectionUnLock" pop-class="ningbo-01__systerm" />
-    <speed-limit-control ref="speedLimitControl" pop-class="ningbo-01__systerm" />
-    <alxe-effective ref="alxeEffective" />
-    <switch-hook-lock ref="switchHookLock" pop-class="ningbo-01__systerm" />
     <notice-info ref="noticeInfo" pop-class="ningbo-01__systerm" />
-    <set-fault ref="setFault" pop-class="ningbo-01__systerm" />
+    <switch-command ref="switchCommand" />
+    <switch-block ref="switchBlock" :init-cache-map="initCacheMap" :init-info="initInfo" :update-done="updateDone" @updateDone="onUpdateDone" @initSelect="onChangeInitInfo" />
+    <switch-active ref="switchActive" />
+    <switch-detail ref="switchDetail" />
   </div>
 </template>
 
 <script>
 import PopMenu from '@/components/PopMenu';
-import SwitchControl from '@/jmapNew/theme/components/menus/dialog/switchControl';
-import SetFault from '@/jmapNew/theme/components/menus/dialog/setFault';
-import SectionUnLock from '@/jmapNew/theme/components/menus/dialog/sectionUnLock';
-import SpeedLimitControl from '@/jmapNew/theme/components/menus/dialog/speedCmdControl';
-import AlxeEffective from './dialog/alxeEffective';
-import SwitchHookLock from '@/jmapNew/theme/components/menus/dialog/switchHookLock';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 import { mapGetters } from 'vuex';
-
+import SwitchCommand from './menuDialog/switchCommand';
+import SwitchBlock from './menuDialog/switchBlock';
+import SwitchActive from './menuDialog/switchActive';
+import SwitchDetail from './menuDialog/switchDetail';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
-import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
 
 export default {
     name: 'SwitchMenu',
     components: {
         PopMenu,
-        SwitchControl,
-        SectionUnLock,
-        SpeedLimitControl,
-        AlxeEffective,
         NoticeInfo,
-        SetFault,
-        SwitchHookLock
+        SwitchCommand,
+        SwitchBlock,
+        SwitchActive,
+        SwitchDetail
     },
     props: {
         selected: {
@@ -45,6 +38,24 @@ export default {
             default() {
                 return null;
             }
+        },
+        initCacheMap: {
+            type: Object,
+            default() {
+                return {};
+            }
+        },
+        initInfo: {
+            type: Object,
+            default() {
+                return {};
+            }
+        },
+        updateDone: {
+            type: Number,
+            default() {
+                return 0;
+            }
         }
     },
     data() {
@@ -84,55 +95,54 @@ export default {
                     // }
                 ],
                 Center: [
-                    // {
-                    //     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
-                    // },
-                    // {
-                    //     type: 'separator'
-                    // },
-                    // {
-                    //     label: '区段激活',
-                    //     handler: this.active,
-                    //     cmdType: CMD.Switch.CMD_SWITCH_ACTIVE
-                    // },
-                    // {
-                    //     label: '区段切除',
-                    //     handler: this.split,
-                    //     cmdType: CMD.Switch.CMD_SWITCH_CUT_OFF
-                    // },
-                    // {
-                    //     type: 'separator'
-                    // },
-                    // {
-                    //     label: '确认计轴有效',
-                    //     handler: this.alxeEffective,
-                    //     cmdType: CMD.Switch.CMD_SWITCH_COMFIRMATION_AXLE
-                    // },
-                    // {
-                    //     label: '设置临时限速',
-                    //     handler: this.setSpeed,
-                    //     cmdType: CMD.Switch.CMD_SWITCH_SET_LIMIT_SPEED
-                    // },
-                    // {
-                    //     type: 'separator'
-                    // },
-                    // {
-                    //     label: '查看公里标',
-                    //     handler: this.undeveloped,
-                    //     cmdType: CMD.Switch.CMD_SWITCH_SET_LIMIT_SPEED
-                    // }
+                    {
+                        label: '命令',
+                        handler: this.handlerCommand
+                    },
+                    {
+                        label: '封锁',
+                        children: [
+                            {
+                                label: '初始化',
+                                handler: this.handlerInitBlock
+                            },
+                            {
+                                label: '确定/取消',
+                                handler: this.handlerBlock
+                            }
+                        ]
+                    },
+                    {
+                        label: '解除封锁',
+                        children: [
+                            {
+                                label: '初始化',
+                                handler: this.handlerInitUnblock
+                            },
+                            {
+                                label: '确定/取消',
+                                handler: this.handlerUnblock
+                            }
+                        ]
+                    },
+                    {
+                        label: '请求动岔',
+                        children: [
+                            {
+                                label: '请求或授权/取消',
+                                handler: this.handlerActive
+                            },
+                            {
+                                label: '显示',
+                                disabled: true,
+                                handler: this.undeveloped
+                            }
+                        ]
+                    },
+                    {
+                        label: '显示',
+                        handler: this.handlerDetail
+                    }
                 ]
             },
             menuForce: [
@@ -170,7 +180,8 @@ export default {
     methods: {
         initMenu() {
             // 编辑模式菜单列表
-            this.menu = MenuContextHandler.covert(this.menuNormal);
+            // this.menu = MenuContextHandler.covert(this.menuNormal);
+            this.menu = this.menuNormal.Center;
             // 故障模式菜单列表
             if (this.operatemode === OperateMode.FAULT) {
                 // if (!this.$store.state.scriptRecord.bgSet) {
@@ -184,6 +195,12 @@ export default {
                 // }
             }
         },
+        onUpdateDone() {
+            this.$emit('onUpdateDone');
+        },
+        onChangeInitInfo(initSelect, initParams) {
+            this.$emit('onChangeInitInfo', initSelect, initParams);
+        },
         doShow(point) {
             this.initMenu();
             if (this.$refs && this.$refs.popMenu && this.menu && this.menu.length) {
@@ -195,86 +212,6 @@ export default {
                 this.$refs.popMenu.close();
             }
         },
-        // 定操定位
-        locate() {
-            commitOperate(menuOperate.Switch.locate, {switchCode:this.selected.code}, 0).then(({valid, operate})=>{
-                if (valid) {
-                    this.$refs.switchControl.doShow(operate, this.selected);
-                }
-            });
-        },
-        // 定操反位
-        reverse() {
-            commitOperate(menuOperate.Switch.reverse, {switchCode:this.selected.code}, 0).then(({valid, operate})=>{
-                if (valid) {
-                    this.$refs.switchControl.doShow(operate, this.selected);
-                }
-            });
-        },
-        // 道岔单锁
-        lock() {
-            commitOperate(menuOperate.Switch.lock, {switchCode:this.selected.code}, 0).then(({valid, operate})=>{
-                if (valid) {
-                    this.$refs.switchControl.doShow(operate, this.selected);
-                }
-            });
-        },
-        // 道岔单解
-        unlock() {
-            commitOperate(menuOperate.Switch.unlock, {switchCode:this.selected.code}, 0).then(({valid, operate})=>{
-                if (valid) {
-                    this.$refs.sectionUnLock.doShow(operate, this.selected);
-                }
-            });
-        },
-        // 道岔封锁
-        block() {
-            commitOperate(menuOperate.Switch.block, {switchCode:this.selected.code}, 0).then(({valid, operate})=>{
-                if (valid) {
-                    this.$refs.switchControl.doShow(operate, this.selected);
-                }
-            });
-        },
-        // 道岔解封
-        unblock() {
-            commitOperate(menuOperate.Switch.unblock, {switchCode:this.selected.code}, 0).then(({valid, operate})=>{
-                if (valid) {
-                    this.$refs.sectionUnLock.doShow(operate, this.selected);
-                }
-            });
-        },
-        // 区段切除
-        split() {
-            commitOperate(menuOperate.Switch.split, {switchCode:this.selected.code}, 0).then(({valid, operate})=>{
-                if (valid) {
-                    this.$refs.switchControl.doShow(operate, this.selected);
-                }
-            });
-        },
-        // 区段激活
-        active() {
-            commitOperate(menuOperate.Switch.active, {switchCode:this.selected.code}, 0).then(({valid, operate})=>{
-                if (valid) {
-                    this.$refs.switchControl.doShow(operate, this.selected);
-                }
-            });
-        },
-        // 设置临时限速
-        setSpeed() {
-            commitOperate(menuOperate.Switch.setSpeed, {switchCode:this.selected.code}, 0).then(({valid, operate})=>{
-                if (valid) {
-                    this.$refs.speedLimitControl.doShow(operate, this.selected);
-                }
-            });
-        },
-        // 确认计轴有效
-        alxeEffective() {
-            commitOperate(menuOperate.Switch.alxeEffective, {switchCode:this.selected.code}, 0).then(({valid, operate})=>{
-                if (valid) {
-                    this.$refs.alxeEffective.doShow(operate, this.selected);
-                }
-            });
-        },
         undeveloped() {
             this.doClose();
             this.$alert('实现中......', '提示', {
@@ -302,6 +239,27 @@ export default {
         // 道岔钩锁
         hookLock() {
             this.$refs.switchHookLock.doShow(this.selected);
+        },
+        handlerCommand() {
+            this.$refs.switchCommand.rightClickShow('', this.selected);
+        },
+        handlerInitBlock() {
+            this.$refs.switchBlock.rightClickShow(OperationEvent.Command.commandNingBo3.line_switch_block_init, false, this.selected);
+        },
+        handlerBlock() {
+            this.$refs.switchBlock.rightClickShow(OperationEvent.Command.commandNingBo3.line_switch_block_sure, true, this.selected);
+        },
+        handlerInitUnblock() {
+            this.$refs.switchBlock.rightClickShow(OperationEvent.Command.commandNingBo3.line_switch_unblock_init, false, this.selected);
+        },
+        handlerUnblock() {
+            this.$refs.switchBlock.rightClickShow(OperationEvent.Command.commandNingBo3.line_switch_unblock_sure, true, this.selected);
+        },
+        handlerActive() {
+            this.$refs.switchActive.rightClickShow('', this.selected);
+        },
+        handlerDetail() {
+            this.$refs.switchDetail.rightClickShow('', this.selected);
         }
     }
 };
diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js
index d39a94d40..6d49eb5a3 100644
--- a/src/utils/baseUrl.js
+++ b/src/utils/baseUrl.js
@@ -2,10 +2,10 @@ 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 = 'https://test.joylink.club/jlcloud';
         // BASE_API = 'http://192.168.8.107:9000'; // 袁琪
         // BASE_API = 'http://192.168.8.169:9000'; // 旭强
-        BASE_API = 'http://192.168.3.203:9000'; // 张赛
+        // BASE_API = 'http://192.168.3.203:9000'; // 张赛
         // BASE_API = 'http://192.168.8.140:9000'; // 杜康
         // BASE_API = 'http://b29z135112.zicp.vip';
         // BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康