北京一号线 现地 道岔操作代码调整

src/jmapNew/theme/beijing_01/menus/dialog/switchCmdControl.vue

@@ -1,472 +0,0 @@
-<template>
-  <div>
-    <el-dialog
-      v-dialogDrag
-      class="beijing-01__systerm switch-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="80px">
-                <el-input v-model="switchName" size="small" disabled />
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
-      </div>
-      <el-table
-        ref="tempData"
-        class="table"
-        :data="tempData"
-        border
-        style="width: 100%"
-        size="mini"
-        highlight-current-row
-        height="200"
-      >
-        <el-table-column prop="order" :width="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';
-
-export default {
-    name: 'SwitchCmdControl',
-    data() {
-        return {
-            dialogShow: false,
-            backOperate: '',
-            selected: '',
-            order: 0,
-            row: null,
-            timer: null,
-            operation: '',
-            cmdDisabled: [true, true, true],
-            stpDisabled: true,
-            tempData: [],
-            message: '',
-            timeCountCommand: -1,
-            timeCountConfirm: -1,
-            stationName: '',
-            switchName: ''
-        };
-    },
-    computed: {
-        typeList() {
-            return [
-                { code: OperationEvent.Switch.unlock.menu.operation, name: '道岔单解' },
-                { code: OperationEvent.Switch.fault.menu.operation, name: '道岔故障解锁' },
-                { code: OperationEvent.Switch.axlePreReset.menu.operation, name: '道岔计轴预复位' }
-            ];
-        },
-        show() {
-            return this.dialogShow && !this.$store.state.menuOperation.break;
-        },
-        domIdCommand() {
-            if (this.dialogShow) {
-                if (this.operation == OperationEvent.Switch.unlock.menu.operation) {
-                    /** 道岔单解*/
-                    return OperationEvent.Switch.unlock.order.domId;
-                } else if (this.operation == OperationEvent.Switch.fault.menu.operation) {
-                    /** 道岔故障解锁*/
-                    return OperationEvent.Switch.fault.order.domId;
-                } else if (this.operation == OperationEvent.Switch.axlePreReset.menu.operation) {
-                    /** 道岔计轴复位*/
-                    return OperationEvent.Switch.axlePreReset.order.domId;
-                } else {
-                    return '';
-                }
-            } else {
-                return '';
-            }
-        },
-        domIdConfirm1() {
-            if (this.dialogShow) {
-                if (this.operation == OperationEvent.Switch.unlock.menu.operation) {
-                    /** 道岔单解*/
-                    return OperationEvent.Switch.unlock.confirm1.domId;
-                } else if (this.operation == OperationEvent.Switch.fault.menu.operation) {
-                    /** 道岔故障解锁*/
-                    return OperationEvent.Switch.fault.confirm1.domId;
-                } else if (this.operation == OperationEvent.Switch.axlePreReset.menu.operation) {
-                    /** 道岔计轴复位*/
-                    return OperationEvent.Switch.axlePreReset.confirm1.domId;
-                } else {
-                    return '';
-                }
-            } else {
-                return '';
-            }
-        },
-        domIdConfirm2() {
-            if (this.dialogShow) {
-                if (this.operation == OperationEvent.Switch.unlock.menu.operation) {
-                    /** 道岔单解*/
-                    return OperationEvent.Switch.unlock.confirm2.domId;
-                } else if (this.operation == OperationEvent.Switch.fault.menu.operation) {
-                    /** 道岔故障解锁*/
-                    return OperationEvent.Switch.fault.confirm2.domId;
-                } else if (this.operation == OperationEvent.Switch.axlePreReset.menu.operation) {
-                    /** 道岔计轴复位*/
-                    return OperationEvent.Switch.axlePreReset.confirm2.domId;
-                } else {
-                    return '';
-                }
-            } else {
-                return '';
-            }
-        },
-        domIdStop() {
-            if (this.dialogShow) {
-                if (this.operation == OperationEvent.Switch.unlock.menu.operation) {
-                    /** 道岔单解*/
-                    return OperationEvent.Switch.unlock.stop.domId;
-                } else if (this.operation == OperationEvent.Switch.fault.menu.operation) {
-                    /** 道岔故障解锁*/
-                    return OperationEvent.Switch.fault.stop.domId;
-                } else if (this.operation == OperationEvent.Switch.axlePreReset.menu.operation) {
-                    /** 道岔计轴复位*/
-                    return OperationEvent.Switch.axlePreReset.stop.domId;
-                } else {
-                    return '';
-                }
-            } else {
-                return '';
-            }
-        },
-        domIdClose() {
-            if (this.dialogShow) {
-                return OperationEvent.Command.close.menu.domId;
-            } else {
-                return '';
-            }
-        },
-        title() {
-            if (this.dialogShow) {
-                if (this.operation == OperationEvent.Switch.unlock.menu.operation) {
-                    return '道岔单解';
-                } else if (this.operation == OperationEvent.Switch.fault.menu.operation) {
-                    return '道岔故障解锁';
-                } else if (this.operation == OperationEvent.Switch.axlePreReset.menu.operation) {
-                    return '道岔计轴复位';
-                } else {
-                    return '';
-                }
-            } else {
-                return '';
-            }
-        }
-    },
-    watch: {
-        cmdDisabled: {
-            handler(val, oldVal) {
-                this.stpDisabled = true;
-                val.forEach((elem, index) => {
-                    // 在确定1之前的操作才可以终止
-                    if (elem == false && index >= 1 && index <= 2) {
-                        this.stpDisabled = false;
-                    }
-                });
-            },
-            deep: true
-        }
-    },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-        this.timer = setInterval(() => {
-            if (!this.$store.state.menuOperation.break) {
-                if (this.timeCountCommand > 0) {
-                    this.timeCountCommand--;
-                } else if (this.timeCountCommand == 0) {
-                    this.setButtonEnable({ step: 0 });
-                    this.timeCountCommand = -1;
-                }
-                if (this.timeCountConfirm > 0) {
-                    this.timeCountConfirm--;
-                } else if (this.timeCountConfirm == 0) {
-                    this.setButtonEnable({ step: 0 });
-                    this.timeCountConfirm = -1;
-                }
-            }
-        }, 1000);
-    },
-    beforeDestroy() {
-        clearInterval(this.timer);
-        this.timer = null;
-    },
-    methods: {
-        doShow(operate, selected) {
-            this.selected = selected;
-            if (!this.dialogShow) {
-                this.switchName = '';
-                this.stationName = '';
-                if (selected && selected._type.toUpperCase() === 'Switch'.toUpperCase()) {
-                    this.switchName = selected.name;
-                    const station = this.$store.getters['map/getDeviceByCode'](selected.stationCode);
-                    if (station) {
-                        this.stationName = station.name;
-                    }
-                }
-
-                this.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');
-            });
-        },
-        doClose() {
-            this.dialogShow = false;
-            this.$store.dispatch('training/emitTipFresh');
-            mouseCancelState(this.selected);
-        },
-        command() {
-            /** 道岔单解/道岔解封/道岔故障解锁/道岔计轴复位*/
-            if (this.operation == OperationEvent.Switch.unlock.menu.operation ||
-                    this.operation == OperationEvent.Switch.unblock.menu.operation ||
-                    this.operation == OperationEvent.Switch.fault.menu.operation ||
-                    this.operation == OperationEvent.Switch.axlePreReset.menu.operation ||
-                    this.operation == OperationEvent.Switch.cancelSpeed.menu.operation) {
-                /** 第一步不带弹框处理*/
-                this.commandNoPopUp();
-            } else {
-                /** 第一步带弹框处理*/
-                this.commandHasPopUp();
-            }
-        },
-        commandHasPopUp() {
-
-        },
-        commandNoPopUp() {
-            const operate = {
-                type: MapDeviceType.Switch.type
-            };
-
-            if (this.operation == OperationEvent.Switch.unlock.menu.operation) {
-                /** 道岔单解*/
-                operate.operation = OperationEvent.Switch.unlock.order.operation;
-            } else if (this.operation == OperationEvent.Switch.fault.menu.operation) {
-                /** 道岔故障解锁*/
-                operate.operation = OperationEvent.Switch.fault.order.operation;
-            } else if (this.operation == OperationEvent.Switch.axlePreReset.menu.operation) {
-                /** 道岔计轴复位*/
-                operate.operation = OperationEvent.Switch.axlePreReset.order.operation;
-            }
-
-            this.setMessage('请点击“确认1”按钮，确认命令！');
-            this.writeRecord({ order: ++this.order, date: now(), context: '点击下达命令', result: '' });
-            this.$store.dispatch('training/nextNew', 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.Switch.type
-            };
-
-            if (this.operation == OperationEvent.Switch.unlock.menu.operation) {
-                /** 道岔单解*/
-                operate.operation = OperationEvent.Switch.unlock.confirm1.operation;
-            } else if (this.operation == OperationEvent.Switch.fault.menu.operation) {
-                /** 道岔故障解锁*/
-                operate.operation = OperationEvent.Switch.fault.confirm1.operation;
-            } else if (this.operation == OperationEvent.Switch.axlePreReset.menu.operation) {
-                /** 道岔计轴复位*/
-                operate.operation = OperationEvent.Switch.axlePreReset.confirm1.operation;
-            }
-
-            this.setMessage('请点击“确认2”按钮，确认命令！');
-            this.writeRecord({ order: ++this.order, date: now(), context: '点击确认1', result: '' });
-            this.$store.dispatch('training/nextNew', 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.Switch.type
-            };
-
-            if (this.operation == OperationEvent.Switch.unlock.menu.operation) {
-                /** 道岔单解*/
-                operate.operation = OperationEvent.Switch.unlock.confirm2.operation;
-            } else if (this.operation == OperationEvent.Switch.fault.menu.operation) {
-                /** 道岔故障解锁*/
-                operate.operation = OperationEvent.Switch.fault.confirm2.operation;
-            } else if (this.operation == OperationEvent.Switch.axlePreReset.menu.operation) {
-                /** 道岔计轴复位*/
-                operate.operation = OperationEvent.Switch.axlePreReset.confirm2.operation;
-            }
-
-            this.setMessage('');
-            this.writeRecord({ order: ++this.order, date: now(), context: '点击确认2', result: '' });
-            this.$store.dispatch('training/nextNew', 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.Switch.type
-            };
-
-            if (this.operation == OperationEvent.Switch.unlock.menu.operation) {
-                /** 道岔单解*/
-                operate.operation = OperationEvent.Switch.unlock.stop.operation;
-            } else if (this.operation == OperationEvent.Switch.fault.menu.operation) {
-                /** 道岔故障解锁*/
-                operate.operation = OperationEvent.Switch.fault.stop.operation;
-            } else if (this.operation == OperationEvent.Switch.axlePreReset.menu.operation) {
-                /** 道岔计轴复位*/
-                operate.operation = OperationEvent.Switch.axlePreReset.stop.operation;
-            }
-
-            this.writeRecord({ order: ++this.order, date: now(), context: '点击终止', result: '' });
-            this.$store.dispatch('training/nextNew', 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: '执行异常,' + error.message });
-            });
-        },
-        close() {
-            const operate = {
-                type: MapDeviceType.Switch.type,
-                operation: OperationEvent.Command.close.menu.operation
-            };
-
-            this.$store.dispatch('training/nextNew', 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>

src/jmapNew/theme/beijing_01/menus/dialog/switchControl.vue

@@ -22,6 +22,26 @@
         <el-input v-model="switchName" size="small" disabled />
       </el-col>
     </el-row>
+    <el-row v-if="isActive" style="margin-top: 10px;">
+      <el-col :span="11">
+        <el-radio v-model="activeRadio" label="1" :disabled="activeRadio == 2" style="display: block; text-align: center;">
+          激活</el-radio>
+      </el-col>
+      <el-col :span="11" :offset="2">
+        <el-radio v-model="activeRadio" label="2" :disabled="activeRadio == 1" style="display: block; text-align: center;">
+          切除</el-radio>
+      </el-col>
+    </el-row>
+    <el-row v-if="isLock" style="margin-top: 10px;">
+      <el-col :span="11">
+        <el-radio v-model="lockRadio" label="1" style="display: block; text-align: center;">
+          道岔单锁</el-radio>
+      </el-col>
+      <el-col :span="11" :offset="2">
+        <el-radio v-model="lockRadio" label="2" disabled style="display: block; text-align: center;">
+          道岔解锁</el-radio>
+      </el-col>
+    </el-row>
     <el-row justify="center" class="button-group">
       <el-col :span="10" :offset="2">
         <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
@@ -47,12 +67,16 @@ export default {
     },
     data() {
         return {
+            isActive: false,
+            isLock: false,
             dialogShow: false,
             loading: false,
             selected: null,
             operation: '',
             stationName: '',
-            switchName: ''
+            switchName: '',
+            lockRadio: '1',
+            activeRadio: '1'
         };
     },
     computed: {
@@ -67,9 +91,11 @@ export default {
         },
         title() {
             if (this.operation == OperationEvent.Switch.split.menu.operation) {
-                return '区段切除';
+                return '区段控制';
             } else if (this.operation == OperationEvent.Switch.active.menu.operation) {
-                return '区段激活';
+                return '区段控制';
+            } else if (this.operation == OperationEvent.Switch.unlock.menu.operation) {
+                return '道岔单解';
             } else {
                 return '';
             }
@@ -94,6 +120,18 @@ export default {
                     }
                 }
                 this.operation = operate.operation;
+                this.isActive = false;
+                this.isLock = false;
+                if (this.operation == OperationEvent.Switch.split.menu.operation) {
+                    this.isActive = true;
+                    this.activeRadio = '2';
+                } else if (this.operation == OperationEvent.Switch.active.menu.operation) {
+                    this.isActive = true;
+                    this.activeRadio = '1';
+                } else if (this.operation == OperationEvent.Switch.unlock.menu.operation) {
+                    this.isLock = true;
+                    this.lockRadio = '2';
+                }
             }
             this.dialogShow = true;
             this.$nextTick(function () {
@@ -113,8 +151,20 @@ export default {
             } else if (this.operation == OperationEvent.Switch.active.menu.operation) {
                 /** 区段激活*/
                 this.active();
+            } else if (this.operation == OperationEvent.Switch.unlock.menu.operation) {
+                /** 道岔单解*/
+                this.unlock();
             }
         },
+        // 道岔单解
+        unlock() {
+            const operate = {
+                over: true,
+                operation: OperationEvent.Switch.unlock.menu.operation,
+                cmdType: CMD.Switch.CMD_SWITCH_SINGLE_UNLOCK
+            };
+            this.sendCommand(operate);
+        },
         // 区段切除
         split() {
             const operate = {

src/jmapNew/theme/beijing_01/menus/menuSwitch.vue

@@ -3,7 +3,6 @@
     <pop-menu ref="popMenu" :menu="menu" />
     <section-control ref="sectionControl" />
     <switch-control ref="switchControl" />
-    <switch-cmd-control ref="switchCmdControl" />
     <speed-cmd-control ref="speedCmdControl" />
     <speed-limit-control ref="speedLimitControl" />
     <alxe-effective ref="alxeEffective" />
@@ -15,7 +14,6 @@
 import PopMenu from '@/components/PopMenu';
 import SectionControl from './dialog/sectionControl';
 import SwitchControl from './dialog/switchControl';
-import SwitchCmdControl from './dialog/switchCmdControl';
 import SpeedCmdControl from './dialog/speedCmdControl';
 import SpeedLimitControl from './dialog/speedLimitControl';
 import AlxeEffective from './dialog/alxeEffective';
@@ -33,7 +31,6 @@ export default {
         PopMenu,
         SectionControl,
         SwitchControl,
-        SwitchCmdControl,
         SpeedLimitControl,
         SpeedCmdControl,
         AlxeEffective,
@@ -256,18 +253,16 @@ export default {
         unlock(selectType) {
             const operate = {
                 start: true,
-                over: true,
                 code: this.selected.code,
                 operation: OperationEvent.Switch.unlock.menu.operation,
                 param: {
                     switchCode: selectType.code
-                },
+                }
-                cmdType: CMD.Switch.CMD_SWITCH_SINGLE_UNLOCK
             };
             this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    // this.$refs.switchCmdControl.doShow(operate, this.selected);
+                    this.$refs.switchControl.doShow(operate, selectType);
                 }
             });
         },
@@ -360,23 +355,6 @@ export default {
                 }
             });
         },
-        // 道岔计轴预复位
-        // axlePreReset() {
-        //     const operate = {
-        //         start: true,
-        //         code: this.selected.code,
-        //         operation: OperationEvent.Switch.axlePreReset.menu.operation,
-        //         param: {
-        //             switchCode: `${this.selected.code}`
-        //         }
-        //     };
-        //     this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-        //         if (valid) {
-        //             this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-        //             this.$refs.switchCmdControl.doShow(operate, this.selected);
-        //         }
-        //     });
-        // },
         // 设置临时限速
         setSpeed() {
             const operate = {

src/jmapNew/theme/ningbo_01/menus/dialog/switchControl.vue

@@ -182,7 +182,7 @@ export default {
                 /** 道岔反位*/
                 this.reverse();
             } else if (this.operation == OperationEvent.Switch.split.menu.operation) {
-                /** 区段激活*/
+                /** 区段切除*/
                 this.split();
             } else if (this.operation == OperationEvent.Switch.active.menu.operation) {
                 /** 区段激活*/