From 4ceaba9c59bb66fe6a1e3a177053e5b4e7f3aff9 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Wed, 11 Mar 2020 10:52:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=97=E4=BA=AC=E4=B8=80=E5=8F=B7=E7=BA=BF?=
 =?UTF-8?q?=E6=96=B0=E7=89=88=E6=8C=87=E4=BB=A4=E4=BB=A3=E7=A0=81=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../menus/dialog/sectionCmdControl.vue        | 840 +++++++++---------
 .../menus/dialog/sectionControl.vue           |  21 +-
 .../theme/beijing_01/menus/menuSection.vue    |  44 -
 3 files changed, 433 insertions(+), 472 deletions(-)

diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/sectionCmdControl.vue b/src/jmapNew/theme/beijing_01/menus/dialog/sectionCmdControl.vue
index b2364f5b6..7f7cd65b0 100644
--- a/src/jmapNew/theme/beijing_01/menus/dialog/sectionCmdControl.vue
+++ b/src/jmapNew/theme/beijing_01/menus/dialog/sectionCmdControl.vue
@@ -1,435 +1,455 @@
 <template>
-    <div>
-        <el-dialog class="beijing-01__systerm section-cmd-control" :title="title" :visible.sync="show" width="800px"
-            :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
-            <div style="padding: 10px 20px; border: 1px solid lightgray;">
-                <span class="base-label">命令信息</span>
-                <el-form label-position="center" size="mini">
-                    <el-row>
-                        <el-col :span="8">
-                            <el-form-item label="类型" label-width="40px">
-                                <el-select v-model="operation" size="small" disabled>
-                                    <el-option v-for="option in typeList" :key="option.code" :label="option.name"
-                                        :value="option.code">
-                                    </el-option>
-                                </el-select>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="8">
-                            <el-form-item label="车站名称" label-width="80px">
-                                <el-input v-model="stationName" size="small" disabled></el-input>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="8">
-                            <el-form-item label="区段名称" label-width="100px">
-                                <el-input v-model="sectionName" size="small" disabled></el-input>
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                </el-form>
-            </div>
-            <el-table class="table" ref="tempData" :data="tempData" border style="width: 100%" size="mini"
-                highlight-current-row height="200">
-                <el-table-column prop="order" :width="50" label="序号">
-                </el-table-column>
-                <el-table-column prop="date" :width="160" label="时间">
-                </el-table-column>
-                <el-table-column prop="context" :width="180" label="执行过程">
-                </el-table-column>
-                <el-table-column prop="result" label="执行结果">
-                </el-table-column>
-            </el-table>
-            <span class="notice">{{message}}</span>
-            <el-row class="button-group">
-                <el-col :span="2" :offset="2">
-                    <el-button :id="domIdCommand" type="primary" :disabled="cmdDisabled[0]" @click="command">下达<span
-                            v-show="timeCountCommand>0">({{timeCountCommand}})</span></el-button>
-                </el-col>
-                <el-col :span="2" :offset="2">
-                    <el-button :id="domIdConfirm1" type="primary" :disabled="cmdDisabled[1]" @click="confirm1">确认1
-                    </el-button>
-                </el-col>
-                <el-col :span="2" :offset="2">
-                    <el-button :id="domIdConfirm2" type="primary" :disabled="cmdDisabled[2]" @click="confirm2">确认2<span
-                            v-show="timeCountConfirm>0">({{timeCountConfirm}})</span></el-button>
-                </el-col>
-                <el-col :span="2" :offset="2">
-                    <el-button :id="domIdStop" type="primary" :disabled="stpDisabled" @click="stop">中止</el-button>
-                </el-col>
-                <el-col :span="2" :offset="2">
-                    <el-button :id="domIdClose" @click="close">关闭</el-button>
-                </el-col>
-            </el-row>
-        </el-dialog>
-    </div>
+  <div>
+    <el-dialog
+      v-dialogDrag
+      class="beijing-01__systerm section-cmd-control"
+      :title="title"
+      :visible.sync="show"
+      width="800px"
+      :before-close="doClose"
+      :z-index="2000"
+      :modal="false"
+      :close-on-click-modal="false"
+    >
+      <div style="padding: 10px 20px; border: 1px solid lightgray;">
+        <span class="base-label">命令信息</span>
+        <el-form label-position="center" size="mini">
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="类型" label-width="40px">
+                <el-select v-model="operation" size="small" disabled>
+                  <el-option
+                    v-for="option in typeList"
+                    :key="option.code"
+                    :label="option.name"
+                    :value="option.code"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="车站名称" label-width="80px">
+                <el-input v-model="stationName" size="small" disabled />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="区段名称" label-width="100px">
+                <el-input v-model="sectionName" size="small" disabled />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+      <el-table
+        ref="tempData"
+        class="table"
+        :data="tempData"
+        border
+        style="width: 100%"
+        size="mini"
+        highlight-current-row
+        height="200"
+      >
+        <el-table-column prop="order" :width="50" label="序号" />
+        <el-table-column prop="date" :width="160" label="时间" />
+        <el-table-column prop="context" :width="180" label="执行过程" />
+        <el-table-column prop="result" label="执行结果" />
+      </el-table>
+      <span class="notice">{{ message }}</span>
+      <el-row class="button-group">
+        <el-col :span="2" :offset="2">
+          <el-button :id="domIdCommand" type="primary" :disabled="cmdDisabled[0]" @click="command">下达<span
+            v-show="timeCountCommand>0"
+          >({{ timeCountCommand }})</span></el-button>
+        </el-col>
+        <el-col :span="2" :offset="2">
+          <el-button :id="domIdConfirm1" type="primary" :disabled="cmdDisabled[1]" @click="confirm1">确认1
+          </el-button>
+        </el-col>
+        <el-col :span="2" :offset="2">
+          <el-button :id="domIdConfirm2" type="primary" :disabled="cmdDisabled[2]" @click="confirm2">确认2<span
+            v-show="timeCountConfirm>0"
+          >({{ timeCountConfirm }})</span></el-button>
+        </el-col>
+        <el-col :span="2" :offset="2">
+          <el-button :id="domIdStop" type="primary" :disabled="stpDisabled" @click="stop">中止</el-button>
+        </el-col>
+        <el-col :span="2" :offset="2">
+          <el-button :id="domIdClose" @click="close">关闭</el-button>
+        </el-col>
+      </el-row>
+    </el-dialog>
+  </div>
 </template>
 <script>
-    import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
-    import { mouseCancelState } from '../utils/menuItemStatus';
-    import { now } from '@/utils/date';
+import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { mouseCancelState } from '../utils/menuItemStatus';
+import { now } from '@/utils/date';
 
-    export default {
-        name: 'SectionCmdControl',
-        data() {
-            return {
-                dialogShow: false,
-                backOperate: '',
-                selected: '',
-                order: 0,
-                row: null,
-                timer: null,
-                operation: '',
-                cmdDisabled: [true, true, true],
-                stpDisabled: true,
-                tempData: [],
-                message: '',
-                timeCountCommand: -1,
-                timeCountConfirm: -1,
-                stationName: '',
-                sectionName: ''
+export default {
+    name: 'SectionCmdControl',
+    data() {
+        return {
+            dialogShow: false,
+            backOperate: '',
+            selected: '',
+            order: 0,
+            row: null,
+            timer: null,
+            operation: '',
+            cmdDisabled: [true, true, true],
+            stpDisabled: true,
+            tempData: [],
+            message: '',
+            timeCountCommand: -1,
+            timeCountConfirm: -1,
+            stationName: '',
+            sectionName: ''
+        };
+    },
+    computed: {
+        typeList() {
+            return [
+                { code: OperationEvent.Section.unlock.menu.operation, name: '区段解封' },
+                { code: OperationEvent.Section.fault.menu.operation, name: '区段故障解锁' },
+                { code: OperationEvent.Section.axlePreReset.menu.operation, name: '区段计轴预复位' }
+            ];
+        },
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
+        },
+        domIdCommand() {
+            if (this.dialogShow) {
+                if (this.operation == OperationEvent.Section.fault.menu.operation) {
+                    /** 区段故障解锁*/
+                    return OperationEvent.Section.fault.order.domId;
+                } else if (this.operation == OperationEvent.Section.axlePreReset.menu.operation) {
+                    /** 区段计轴预复位*/
+                    return OperationEvent.Section.axlePreReset.order.domId;
+                } else {
+                    return '';
+                }
+            } else {
+                return '';
             }
         },
-        computed: {
-            typeList() {
-                return [
-                    { code: OperationEvent.Section.unlock.menu.operation, name: '区段解封' },
-                    { code: OperationEvent.Section.fault.menu.operation, name: '区段故障解锁' },
-                    { code: OperationEvent.Section.axlePreReset.menu.operation, name: '区段计轴预复位' },
-                ]
-            },
-            show() {
-                return this.dialogShow && !this.$store.state.menuOperation.break;
-            },
-            domIdCommand() {
-                if (this.dialogShow) {
-                    if (this.operation == OperationEvent.Section.unlock.menu.operation) {
-                        /** 区段解封*/
-                        return OperationEvent.Section.unlock.order.domId;
-                    } else if (this.operation == OperationEvent.Section.fault.menu.operation) {
-                        /** 区段故障解锁*/
-                        return OperationEvent.Section.fault.order.domId;
-                    } else if (this.operation == OperationEvent.Section.axlePreReset.menu.operation) {
-                        /** 区段计轴预复位*/
-                        return OperationEvent.Section.axlePreReset.order.domId;
-                    }
-                }
-            },
-            domIdConfirm1() {
-                if (this.dialogShow) {
-                    if (this.operation == OperationEvent.Section.unlock.menu.operation) {
-                        /** 区段解封*/
-                        return OperationEvent.Section.unlock.confirm1.domId;
-                    } else if (this.operation == OperationEvent.Section.fault.menu.operation) {
-                        /** 区段故障解锁*/
-                        return OperationEvent.Section.fault.confirm1.domId;
-                    } else if (this.operation == OperationEvent.Section.axlePreReset.menu.operation) {
-                        /** 区段计轴预复位*/
-                        return OperationEvent.Section.axlePreReset.confirm1.domId;
-                    }
-                }
-            },
-            domIdConfirm2() {
-                if (this.dialogShow) {
-                    if (this.operation == OperationEvent.Section.unlock.menu.operation) {
-                        /** 区段解封*/
-                        return OperationEvent.Section.unlock.confirm2.domId;
-                    } else if (this.operation == OperationEvent.Section.fault.menu.operation) {
-                        /** 区段故障解锁*/
-                        return OperationEvent.Section.fault.confirm2.domId;
-                    } else if (this.operation == OperationEvent.Section.axlePreReset.menu.operation) {
-                        /** 区段计轴预复位*/
-                        return OperationEvent.Section.axlePreReset.confirm2.domId;
-                    }
-                }
-            },
-            domIdStop() {
-                if (this.dialogShow) {
-                    if (this.operation == OperationEvent.Section.unlock.menu.operation) {
-                        /** 区段解封*/
-                        return OperationEvent.Section.unlock.stop.domId;
-                    } else if (this.operation == OperationEvent.Section.fault.menu.operation) {
-                        /** 区段故障解锁*/
-                        return OperationEvent.Section.fault.stop.domId;
-                    } else if (this.operation == OperationEvent.Section.axlePreReset.menu.operation) {
-                        /** 区段计轴预复位*/
-                        return OperationEvent.Section.axlePreReset.stop.domId;
-                    }
-                }
-            },
-            domIdClose() {
-                if (this.dialogShow) {
-                    return OperationEvent.Command.close.menu.domId;
-                }
-            },
-            title() {
-                if (this.dialogShow) {
-                    if (this.operation == OperationEvent.Section.unlock.menu.operation) {
-                        return '区段解封';
-                    } else if (this.operation == OperationEvent.Section.fault.menu.operation) {
-                        return '区段故障解锁';
-                    } else if (this.operation == OperationEvent.Section.axlePreReset.menu.operation) {
-                        return '区段计轴预复位';
-                    }
+        domIdConfirm1() {
+            if (this.dialogShow) {
+                if (this.operation == OperationEvent.Section.fault.menu.operation) {
+                    /** 区段故障解锁*/
+                    return OperationEvent.Section.fault.confirm1.domId;
+                } else if (this.operation == OperationEvent.Section.axlePreReset.menu.operation) {
+                    /** 区段计轴预复位*/
+                    return OperationEvent.Section.axlePreReset.confirm1.domId;
+                } else {
+                    return '';
                 }
+            } else {
+                return '';
             }
         },
-        watch: {
-            cmdDisabled: {
-                handler(val, oldVal) {
-                    this.stpDisabled = true;
-                    val.forEach((elem, index) => {
-                        // 在确定1之前的操作才可以终止
-                        if (elem == false && 1 <= index && index <= 2) {
-                            this.stpDisabled = false;
-                        }
-                    });
-                },
-                deep: true
+        domIdConfirm2() {
+            if (this.dialogShow) {
+                if (this.operation == OperationEvent.Section.fault.menu.operation) {
+                    /** 区段故障解锁*/
+                    return OperationEvent.Section.fault.confirm2.domId;
+                } else if (this.operation == OperationEvent.Section.axlePreReset.menu.operation) {
+                    /** 区段计轴预复位*/
+                    return OperationEvent.Section.axlePreReset.confirm2.domId;
+                } else {
+                    return '';
+                }
+            } else {
+                return '';
             }
         },
-        mounted() {
-            this.$nextTick(() => {
-                this.$store.dispatch('training/tipReload');
-            })
-            this.timer = setInterval(() => {
-                if (!this.$store.state.menuOperation.break) {
-                    if (this.timeCountCommand > 0) {
-                        this.timeCountCommand--;
-                    } else if (this.timeCountCommand == 0) {
-                        this.setButtonEnable({ step: 0 });
-                        this.timeCountCommand = -1;
-                    }
-                    if (this.timeCountConfirm > 0) {
-                        this.timeCountConfirm--;
-                    } else if (this.timeCountConfirm == 0) {
-                        this.setButtonEnable({ step: 0 });
-                        this.timeCountConfirm = -1;
-                    }
+        domIdStop() {
+            if (this.dialogShow) {
+                if (this.operation == OperationEvent.Section.fault.menu.operation) {
+                    /** 区段故障解锁*/
+                    return OperationEvent.Section.fault.stop.domId;
+                } else if (this.operation == OperationEvent.Section.axlePreReset.menu.operation) {
+                    /** 区段计轴预复位*/
+                    return OperationEvent.Section.axlePreReset.stop.domId;
+                } else {
+                    return '';
                 }
-            }, 1000)
+            } else {
+                return '';
+            }
         },
-        beforeDestroy() {
-            clearInterval(this.timer);
-            this.timer = null;
+        domIdClose() {
+            if (this.dialogShow) {
+                return OperationEvent.Command.close.menu.domId;
+            } else {
+                return '';
+            }
         },
-        methods: {
-            doShow(operate, selected) {
-                this.selected = selected;
-                if (!this.dialogShow) {
-                    this.sectionName = '';
-                    this.stationName = '';
-                    if (selected && selected._type.toUpperCase() === 'Section'.toUpperCase()) {
-                        if (selected.type === '02') {
-                            let section = this.$store.getters['map/getDeviceByCode'](selected.parentCode);
-                            if (section) {
-                                this.sectionName += section.name
-                            }
-                        }
-                        this.sectionName += selected.name
-
-                        let station = this.$store.getters['map/getDeviceByCode'](selected.stationCode);
-                        if (station) {
-                            this.stationName = station.name;
-                        }
-                    }
-
-                    this.order = 0;
-                    this.operation = operate.operation || '';
-                    this.dialogShow = true;
-                    this.tempData = [];
-                    this.timeCountCommand = -1;
-                    this.timeCountConfirm = -1;
-                    this.cmdDisabled = [false, true, true];
+        title() {
+            if (this.dialogShow) {
+                if (this.operation == OperationEvent.Section.fault.menu.operation) {
+                    return '区段故障解锁';
+                } else if (this.operation == OperationEvent.Section.axlePreReset.menu.operation) {
+                    return '区段计轴预复位';
+                } else {
+                    return '';
                 }
+            } else {
+                return '';
+            }
+        }
+    },
+    watch: {
+        cmdDisabled: {
+            handler(val, oldVal) {
                 this.stpDisabled = true;
-                this.setMessage('请点击“下达”按钮，下达命令！');
-                this.$nextTick(function () {
-                    this.$store.dispatch('training/emitTipFresh');
+                val.forEach((elem, index) => {
+                    // 在确定1之前的操作才可以终止
+                    if (elem == false && index >= 1 && index <= 2) {
+                        this.stpDisabled = false;
+                    }
                 });
             },
-            doClose() {
-                this.dialogShow = false;
+            deep: true
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+        this.timer = setInterval(() => {
+            if (!this.$store.state.menuOperation.break) {
+                if (this.timeCountCommand > 0) {
+                    this.timeCountCommand--;
+                } else if (this.timeCountCommand == 0) {
+                    this.setButtonEnable({ step: 0 });
+                    this.timeCountCommand = -1;
+                }
+                if (this.timeCountConfirm > 0) {
+                    this.timeCountConfirm--;
+                } else if (this.timeCountConfirm == 0) {
+                    this.setButtonEnable({ step: 0 });
+                    this.timeCountConfirm = -1;
+                }
+            }
+        }, 1000);
+    },
+    beforeDestroy() {
+        clearInterval(this.timer);
+        this.timer = null;
+    },
+    methods: {
+        doShow(operate, selected) {
+            this.selected = selected;
+            if (!this.dialogShow) {
+                this.sectionName = '';
+                this.stationName = '';
+                if (selected && selected._type.toUpperCase() === 'Section'.toUpperCase()) {
+                    if (selected.type === '02') {
+                        const section = this.$store.getters['map/getDeviceByCode'](selected.parentCode);
+                        if (section) {
+                            this.sectionName += section.name;
+                        }
+                    }
+                    this.sectionName += selected.name;
+
+                    const station = this.$store.getters['map/getDeviceByCode'](selected.stationCode);
+                    if (station) {
+                        this.stationName = station.name;
+                    }
+                }
+
+                this.order = 0;
+                this.operation = operate.operation || '';
+                this.dialogShow = true;
+                this.tempData = [];
+                this.timeCountCommand = -1;
+                this.timeCountConfirm = -1;
+                this.cmdDisabled = [false, true, true];
+            }
+            this.stpDisabled = true;
+            this.setMessage('请点击“下达”按钮，下达命令！');
+            this.$nextTick(function () {
                 this.$store.dispatch('training/emitTipFresh');
-                mouseCancelState(this.selected);
-            },
-            command() {
-                if (this.operation == OperationEvent.Section.fault.menu.operation ||
+            });
+        },
+        doClose() {
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+            mouseCancelState(this.selected);
+        },
+        command() {
+            if (this.operation == OperationEvent.Section.fault.menu.operation ||
                     this.operation == OperationEvent.Section.unlock.menu.operation ||
                     this.operation == OperationEvent.Section.cancelSpeed.menu.operation ||
                     this.operation == OperationEvent.Section.axlePreReset.menu.operation) {
-                    /** 第一步不带弹框处理*/
-                    this.commandNoPopUp();
-                } else {
-                    /** 第一步带弹框处理*/
-                    this.commandHasPopUp();
-                }
-            },
-            commandHasPopUp() {
-            },
-            commandNoPopUp() {
-                let operate = {
-                    type: MapDeviceType.Section.type
-                }
-
-                if (this.operation == OperationEvent.Section.unlock.menu.operation) {
-                    /** 区段解封*/
-                    operate.operation = OperationEvent.Section.unlock.order.operation
-                } else if (this.operation == OperationEvent.Section.fault.menu.operation) {
-                    /** 区段故障解锁*/
-                    operate.operation = OperationEvent.Section.fault.order.operation
-                } else if (this.operation == OperationEvent.Section.axlePreReset.menu.operation) {
-                    /** 区段计轴预复位*/
-                    operate.operation = OperationEvent.Section.axlePreReset.order.operation
-                }
-
-                this.setMessage('请点击“确认1”按钮，确认命令！');
-                this.writeRecord({ order: ++this.order, date: now(), context: '点击下达命令', result: '' });
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                        this.setButtonEnable({ step: 1 });
-                        this.editRecord({ order: this.order, date: now(), context: '点击下达命令', result: '执行成功' });
-                    } else {
-                        this.editRecord({ order: this.order, date: now(), context: '点击下达命令', result: '执行失败' });
-                    }
-                }).catch(() => {
-                    this.editRecord({ order: this.order, date: now(), context: '点击下达命令', result: '执行异常' });
-                })
-            },
-            confirm1() {
-                let operate = {
-                    type: MapDeviceType.Section.type,
-                }
-
-                if (this.operation == OperationEvent.Section.unlock.menu.operation) {
-                    /** 区段解封*/
-                    operate.operation = OperationEvent.Section.unlock.confirm1.operation;
-                } else if (this.operation == OperationEvent.Section.fault.menu.operation) {
-                    /** 区段故障解锁*/
-                    operate.operation = OperationEvent.Section.fault.confirm1.operation;
-                } else if (this.operation == OperationEvent.Section.axlePreReset.menu.operation) {
-                    /** 区段计轴预复位*/
-                    operate.operation = OperationEvent.Section.axlePreReset.confirm1.operation;
-                }
-
-                this.setMessage('请点击“确认2”按钮，确认命令！');
-                this.writeRecord({ order: ++this.order, date: now(), context: '点击确认1', result: '' });
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                        this.timeCountCommand = -1;
-                        this.timeCountConfirm = 10;
-                        this.setButtonEnable({ step: 2 });
-                        this.editRecord({ order: this.order, date: now(), context: '点击确认1', result: '执行成功' });
-                    } else {
-                        this.editRecord({ order: this.order, date: now(), context: '点击确认1', result: '执行失败' });
-                    }
-                }).catch(() => {
-                    this.editRecord({ order: this.order, date: now(), context: '点击确认1', result: '执行异常' });
-                })
-            },
-            confirm2() {
-                let operate = {
-                    send: true,
-                    type: MapDeviceType.Section.type
-                }
-
-                if (this.operation == OperationEvent.Section.unlock.menu.operation) {
-                    /** 区段解封*/
-                    operate.operation = OperationEvent.Section.unlock.confirm2.operation;
-                } else if (this.operation == OperationEvent.Section.fault.menu.operation) {
-                    /** 区段故障解锁*/
-                    operate.operation = OperationEvent.Section.fault.confirm2.operation;
-                } else if (this.operation == OperationEvent.Section.axlePreReset.menu.operation) {
-                    /** 区段计轴预复位*/
-                    operate.operation = OperationEvent.Section.axlePreReset.confirm2.operation;
-                }
-                this.setMessage('');
-                this.writeRecord({ order: ++this.order, date: now(), context: '点击确认2', result: '' });
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    this.timeCountCommand = -1;
-                    this.timeCountConfirm = -1;
-                    this.setButtonEnable({ step: -1 });
-                    if (valid) {
-                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                        this.editRecord({ order: this.order, date: now(), context: '点击确认2', result: '执行成功' });
-                    } else {
-                        this.editRecord({ order: this.order, date: now(), context: '点击确认2', result: '执行失败' });
-                    }
-                }).catch(() => {
-                    this.timeCountCommand = -1;
-                    this.timeCountConfirm = -1;
-                    this.setButtonEnable({ step: -1 });
-                    this.editRecord({ order: this.order, date: now(), context: '点击确认2', result: '执行异常' });
-                })
-            },
-            stop() {
-                let operate = {
-                    type: MapDeviceType.Section.type,
-                }
-
-                if (this.operation == OperationEvent.Section.unlock.menu.operation) {
-                    /** 区段解封*/
-                    operate.operation = OperationEvent.Section.unlock.stop.operation;
-                } else if (this.operation == OperationEvent.Section.fault.menu.operation) {
-                    /** 区段故障解锁*/
-                    operate.operation = OperationEvent.Section.fault.stop.operation;
-                } else if (this.operation == OperationEvent.Section.axlePreReset.menu.operation) {
-                    /** 区段计轴预复位*/
-                    operate.operation = OperationEvent.Section.axlePreReset.stop.operation;
-                }
-
-                this.writeRecord({ order: ++this.order, date: now(), context: '点击终止', result: '' });
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                        this.setButtonEnable({ step: 0 });
-                        this.editRecord({ order: this.order, date: now(), context: '点击终止', result: '执行成功' });
-                    } else {
-                        this.editRecord({ order: this.order, date: now(), context: '点击终止', result: '执行失败' });
-                    }
-                }).catch(error => {
-                    this.editRecord({ order: this.order, date: now(), context: '点击终止', result: '执行异常' });
-                })
-            },
-            close() {
-                let operate = {
-                    type: MapDeviceType.Section.type,
-                    operation: OperationEvent.Command.close.menu.operation,
-                }
-
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.doClose();
-                    }
-                }).catch(error => {
-                    this.doClose();
-                });
-            },
-            getOperate(operate) {
-                /** 弹框返回值处理*/
-            },
-            setButtonEnable(param) {
-                this.cmdDisabled = [true, true, true];
-                if (param && param.step >= 0) {
-                    this.cmdDisabled[param.step] = false;
-                }
-            },
-            setMessage(message) {
-                this.message = message;
-            },
-            writeRecord(param) {
-                this.tempData.push(param);
-            },
-            editRecord(param) {
-                this.tempData.forEach(elem => {
-                    if (elem.order == param.order) {
-                        for (var prop in param) {
-                            elem[prop] = param[prop];
-                        }
-                    }
-                })
+                /** 第一步不带弹框处理*/
+                this.commandNoPopUp();
+            } else {
+                /** 第一步带弹框处理*/
+                this.commandHasPopUp();
             }
+        },
+        commandHasPopUp() {
+        },
+        commandNoPopUp() {
+            const operate = {
+                type: MapDeviceType.Section.type
+            };
+
+            if (this.operation == OperationEvent.Section.unlock.menu.operation) {
+                /** 区段解封*/
+                operate.operation = OperationEvent.Section.unlock.order.operation;
+            } else if (this.operation == OperationEvent.Section.fault.menu.operation) {
+                /** 区段故障解锁*/
+                operate.operation = OperationEvent.Section.fault.order.operation;
+            } else if (this.operation == OperationEvent.Section.axlePreReset.menu.operation) {
+                /** 区段计轴预复位*/
+                operate.operation = OperationEvent.Section.axlePreReset.order.operation;
+            }
+
+            this.setMessage('请点击“确认1”按钮，确认命令！');
+            this.writeRecord({ order: ++this.order, date: now(), context: '点击下达命令', result: '' });
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.setButtonEnable({ step: 1 });
+                    this.editRecord({ order: this.order, date: now(), context: '点击下达命令', result: '执行成功' });
+                } else {
+                    this.editRecord({ order: this.order, date: now(), context: '点击下达命令', result: '执行失败' });
+                }
+            }).catch(() => {
+                this.editRecord({ order: this.order, date: now(), context: '点击下达命令', result: '执行异常' });
+            });
+        },
+        confirm1() {
+            const operate = {
+                type: MapDeviceType.Section.type
+            };
+
+            if (this.operation == OperationEvent.Section.fault.menu.operation) {
+                /** 区段故障解锁*/
+                operate.operation = OperationEvent.Section.fault.confirm1.operation;
+            } else if (this.operation == OperationEvent.Section.axlePreReset.menu.operation) {
+                /** 区段计轴预复位*/
+                operate.operation = OperationEvent.Section.axlePreReset.confirm1.operation;
+            }
+
+            this.setMessage('请点击“确认2”按钮，确认命令！');
+            this.writeRecord({ order: ++this.order, date: now(), context: '点击确认1', result: '' });
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.timeCountCommand = -1;
+                    this.timeCountConfirm = 10;
+                    this.setButtonEnable({ step: 2 });
+                    this.editRecord({ order: this.order, date: now(), context: '点击确认1', result: '执行成功' });
+                } else {
+                    this.editRecord({ order: this.order, date: now(), context: '点击确认1', result: '执行失败' });
+                }
+            }).catch(() => {
+                this.editRecord({ order: this.order, date: now(), context: '点击确认1', result: '执行异常' });
+            });
+        },
+        confirm2() {
+            const operate = {
+                send: true,
+                type: MapDeviceType.Section.type
+            };
+
+            if (this.operation == OperationEvent.Section.fault.menu.operation) {
+                /** 区段故障解锁*/
+                operate.operation = OperationEvent.Section.fault.confirm2.operation;
+            } else if (this.operation == OperationEvent.Section.axlePreReset.menu.operation) {
+                /** 区段计轴预复位*/
+                operate.operation = OperationEvent.Section.axlePreReset.confirm2.operation;
+            }
+            this.setMessage('');
+            this.writeRecord({ order: ++this.order, date: now(), context: '点击确认2', result: '' });
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.timeCountCommand = -1;
+                this.timeCountConfirm = -1;
+                this.setButtonEnable({ step: -1 });
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.editRecord({ order: this.order, date: now(), context: '点击确认2', result: '执行成功' });
+                } else {
+                    this.editRecord({ order: this.order, date: now(), context: '点击确认2', result: '执行失败' });
+                }
+            }).catch(() => {
+                this.timeCountCommand = -1;
+                this.timeCountConfirm = -1;
+                this.setButtonEnable({ step: -1 });
+                this.editRecord({ order: this.order, date: now(), context: '点击确认2', result: '执行异常' });
+            });
+        },
+        stop() {
+            const operate = {
+                type: MapDeviceType.Section.type
+            };
+
+            if (this.operation == OperationEvent.Section.unlock.menu.operation) {
+                /** 区段解封*/
+                operate.operation = OperationEvent.Section.unlock.stop.operation;
+            } else if (this.operation == OperationEvent.Section.fault.menu.operation) {
+                /** 区段故障解锁*/
+                operate.operation = OperationEvent.Section.fault.stop.operation;
+            } else if (this.operation == OperationEvent.Section.axlePreReset.menu.operation) {
+                /** 区段计轴预复位*/
+                operate.operation = OperationEvent.Section.axlePreReset.stop.operation;
+            }
+
+            this.writeRecord({ order: ++this.order, date: now(), context: '点击终止', result: '' });
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.setButtonEnable({ step: 0 });
+                    this.editRecord({ order: this.order, date: now(), context: '点击终止', result: '执行成功' });
+                } else {
+                    this.editRecord({ order: this.order, date: now(), context: '点击终止', result: '执行失败' });
+                }
+            }).catch(() => {
+                this.editRecord({ order: this.order, date: now(), context: '点击终止', result: '执行异常' });
+            });
+        },
+        close() {
+            const operate = {
+                type: MapDeviceType.Section.type,
+                operation: OperationEvent.Command.close.menu.operation
+            };
+
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => {
+                this.doClose();
+            });
+        },
+        getOperate(operate) {
+            /** 弹框返回值处理*/
+        },
+        setButtonEnable(param) {
+            this.cmdDisabled = [true, true, true];
+            if (param && param.step >= 0) {
+                this.cmdDisabled[param.step] = false;
+            }
+        },
+        setMessage(message) {
+            this.message = message;
+        },
+        writeRecord(param) {
+            this.tempData.push(param);
+        },
+        editRecord(param) {
+            this.tempData.forEach(elem => {
+                if (elem.order == param.order) {
+                    for (var prop in param) {
+                        elem[prop] = param[prop];
+                    }
+                }
+            });
         }
     }
-</script>
\ No newline at end of file
+};
+</script>
diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/sectionControl.vue b/src/jmapNew/theme/beijing_01/menus/dialog/sectionControl.vue
index 7e9264dfc..ec4708039 100644
--- a/src/jmapNew/theme/beijing_01/menus/dialog/sectionControl.vue
+++ b/src/jmapNew/theme/beijing_01/menus/dialog/sectionControl.vue
@@ -77,9 +77,7 @@ export default {
             return this.dialogShow ? getDomIdByOperation(this.operation) : '';
         },
         title() {
-            if (this.operation == OperationEvent.Section.lock.menu.operation) {
-                return '区段封锁';
-            } else if (this.operation == OperationEvent.Section.split.menu.operation) {
+            if (this.operation == OperationEvent.Section.split.menu.operation) {
                 this.radio = '2';
                 return '区段控制';
             } else if (this.operation == OperationEvent.Section.active.menu.operation) {
@@ -129,10 +127,7 @@ export default {
             mouseCancelState(this.selected);
         },
         commit() {
-            if (this.operation == OperationEvent.Section.lock.menu.operation) {
-                /** 区段封锁*/
-                this.lock();
-            } else if (this.operation == OperationEvent.Section.split.menu.operation) {
+            if (this.operation == OperationEvent.Section.split.menu.operation) {
                 /** 轨道区段切除*/
                 this.split();
             } else if (this.operation == OperationEvent.Section.active.menu.operation) {
@@ -140,16 +135,6 @@ export default {
                 this.active();
             }
         },
-        // 道岔单锁
-        lock() {
-            const operate = {
-                over:true,
-                operation: OperationEvent.Section.lock.menu.operation,
-                cmdType: CMD.Section.CMD_SWITCH_SINGLE_LOCK
-            };
-
-            this.sendCommand(operate);
-        },
         // 轨道区段切除
         split() {
             const operate = {
@@ -197,7 +182,7 @@ export default {
                 this.doClose();
                 this.$refs.noticeInfo.doShow(operate, error.message);
             });
-        },
+        }
     }
 };
 </script>
diff --git a/src/jmapNew/theme/beijing_01/menus/menuSection.vue b/src/jmapNew/theme/beijing_01/menus/menuSection.vue
index 1d2575e64..77fdccda0 100644
--- a/src/jmapNew/theme/beijing_01/menus/menuSection.vue
+++ b/src/jmapNew/theme/beijing_01/menus/menuSection.vue
@@ -71,16 +71,6 @@ export default {
                         handler: this.axlePreReset,
                         cmdType: CMD.Section.CMD_SECTION_AXIS_PRE_RESET
                     },
-                    {
-                        label: '区段封锁',
-                        handler: this.lock,
-                        cmdType: CMD.Section.CMD_SECTION_BLOCK
-                    },
-                    {
-                        label: '区段解封',
-                        handler: this.unlock,
-                        cmdType: CMD.Section.CMD_SECTION_UNBLOCK
-                    },
                     {
                         label: '区段设置限速',
                         handler: this.setSpeed,
@@ -307,40 +297,6 @@ export default {
                 }
             });
         },
-        // 区段解锁
-        lock() {
-            const operate = {
-                start: true,
-                code: this.selected.code,
-                operation: OperationEvent.Section.lock.menu.operation,
-                param: {
-                    sectionCode: `${this.selected.code}`
-                }
-            };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.sectionControl.doShow(operate, this.selected);
-                }
-            });
-        },
-        // 区段封锁
-        unlock() {
-            const operate = {
-                start: true,
-                code: this.selected.code,
-                operation: OperationEvent.Section.unlock.menu.operation,
-                param: {
-                    sectionCode: `${this.selected.code}`
-                }
-            };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.sectionCmdControl.doShow(operate, this.selected);
-                }
-            });
-        },
         // 设置速度
         setSpeed() {
             // let operate = {