北京一号线区段操作步骤代码调整

src/jmapNew/theme/beijing_01/menus/dialog/childDialog/confirmControlSpeed.vue

@@ -1,148 +1,154 @@
 <template>
-    <el-dialog class="beijing-01__systerm confirm-control-speed" :title="title" :visible.sync="show" width="540px"
-        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" append-to-body v-dialogDrag>
-        <div style="height: 60px; padding-left: 20px">
-            <span style="font-size: 18px">{{message}}</span>
-        </div>
-        <el-row justify="center" class="button-group">
-            <el-col :span="6" :offset="6">
-                <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
-            </el-col>
-            <el-col :span="10" :offset="2">
-                <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
-            </el-col>
-        </el-row>
-    </el-dialog>
+  <el-dialog
+    v-dialogDrag
+    class="beijing-01__systerm confirm-control-speed"
+    :title="title"
+    :visible.sync="show"
+    width="540px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+    append-to-body
+  >
+    <div style="height: 60px; padding-left: 20px">
+      <span style="font-size: 18px">{{ message }}</span>
+    </div>
+    <el-row justify="center" class="button-group">
+      <el-col :span="6" :offset="6">
+        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
+      </el-col>
+      <el-col :span="10" :offset="2">
+        <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
+      </el-col>
+    </el-row>
+  </el-dialog>
 </template>
 
 <script>
-    import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
-    export default {
-        name: 'ConfirmControlSpeed',
-        data() {
-            return {
-                dialogShow: false,
-                loading: false,
-                type: '',
-                operation: '',
-                message: '',
-            }
+export default {
+    name: 'ConfirmControlSpeed',
+    data() {
+        return {
+            dialogShow: false,
+            loading: false,
+            operation: '',
+            message: ''
+        };
+    },
+    computed: {
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
         },
-        computed: {
-            show() {
-                return this.dialogShow && !this.$store.state.menuOperation.break;
-            },
-            title() {
-                if (this.dialogShow) {
-                    if (this.operation === OperationEvent.Section.setSpeed.order.operation) {
-                        return "区段设置限速";
-                    } else if (this.operation === OperationEvent.Section.cancelSpeed.order.operation) {
-                        return "区段取消限速";
-                    } else if (this.operation === OperationEvent.Switch.setSpeed.order.operation) {
-                        return "道岔设置限速";
-                    } else if (this.operation === OperationEvent.Switch.cancelSpeed.order.operation) {
-                        return "道岔取消限速";
-                    }
-                }
-            },
-            domIdCancel() {
-                return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-            },
-            domIdConfirm() {
-                if (this.dialogShow) {
-                    if (this.operation === OperationEvent.Section.setSpeed.order.operation) {
-                        /** 区段设置限速*/
-                        return OperationEvent.Section.setSpeed.confirm.domId;
-                    } else if (this.operation === OperationEvent.Section.cancelSpeed.order.operation) {
-                        /** 区段取消限速*/
-                        return OperationEvent.Section.cancelSpeed.confirm.domId;
-                    } else if (this.operation === OperationEvent.Switch.setSpeed.order.operation) {
-                        /** 道岔设置限速*/
-                        return OperationEvent.Switch.setSpeed.confirm.domId;
-                    } else if (this.operation === OperationEvent.Switch.cancelSpeed.order.operation) {
-                        /** 道岔取消限速*/
-                        return OperationEvent.Switch.cancelSpeed.confirm.domId;
-                    }
+        title() {
+            if (this.dialogShow) {
+                if (this.operation === OperationEvent.Section.setSpeed.order.operation) {
+                    return '区段设置限速';
+                } else if (this.operation === OperationEvent.Section.cancelSpeed.order.operation) {
+                    return '区段取消限速';
+                } else if (this.operation === OperationEvent.Switch.setSpeed.order.operation) {
+                    return '道岔设置限速';
+                } else if (this.operation === OperationEvent.Switch.cancelSpeed.order.operation) {
+                    return '道岔取消限速';
                 }
             }
         },
-        mounted() {
-            this.$nextTick(() => {
-                this.$store.dispatch('training/tipReload');
-            })
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
         },
-        methods: {
-            doShow(operate) {
-                if (!this.dialogShow) {
-                    this.type = operate.type;
-                    this.operation = operate.operation;
-                    this.message = operate.message;
-                }
-
-                this.loading = false;
-                this.dialogShow = true;
-                this.$nextTick(function () {
-                    this.$store.dispatch('training/emitTipFresh');
-                });
-            },
-            doClose() {
-                this.loading = false;
-                this.dialogShow = false;
-                this.$store.dispatch('training/emitTipFresh');
-            },
-            commit() {
-                let operate = {
-                    type: this.type
-                }
-
+        domIdConfirm() {
+            if (this.dialogShow) {
                 if (this.operation === OperationEvent.Section.setSpeed.order.operation) {
                     /** 区段设置限速*/
-                    operate.operation = OperationEvent.Section.setSpeed.confirm.operation;
+                    return OperationEvent.Section.setSpeed.confirm.domId;
                 } else if (this.operation === OperationEvent.Section.cancelSpeed.order.operation) {
                     /** 区段取消限速*/
-                    operate.operation = OperationEvent.Section.cancelSpeed.confirm.operation;
+                    return OperationEvent.Section.cancelSpeed.confirm.domId;
                 } else if (this.operation === OperationEvent.Switch.setSpeed.order.operation) {
                     /** 道岔设置限速*/
-                    operate.operation = OperationEvent.Switch.setSpeed.confirm.operation;
+                    return OperationEvent.Switch.setSpeed.confirm.domId;
                 } else if (this.operation === OperationEvent.Switch.cancelSpeed.order.operation) {
                     /** 道岔取消限速*/
-                    operate.operation = OperationEvent.Switch.cancelSpeed.confirm.operation;
+                    return OperationEvent.Switch.cancelSpeed.confirm.domId;
                 }
-
-                this.loading = true;
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    this.loading = false;
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    if (valid) {
-                        this.$emit('setOperate', { step: 1, success: true });
-                        this.doClose();
-                    }
-                }).catch((error) => {
-                    this.loading = false;
-                    this.$emit('setOperate', { step: 0, success: false });
-                    this.doClose();
-                })
-            },
-            cancel() {
-                let operate = {
-                    type: this.type,
-                    operation: OperationEvent.Command.cancel.menu.operation,
-                }
-
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    if (valid) {
-                        this.$emit('setOperate', { step: 0, success: false });
-                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                        this.doClose();
-                    }
-                }).catch(error => {
-                    this.doClose();
-                });
             }
         }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(operate) {
+            if (!this.dialogShow) {
+                this.operation = operate.operation;
+                this.message = operate.message;
+            }
+
+            this.loading = false;
+            this.dialogShow = true;
+            this.$nextTick(function () {
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+        },
+        commit() {
+            const operate = {
+            };
+
+            if (this.operation === OperationEvent.Section.setSpeed.order.operation) {
+                /** 区段设置限速*/
+                operate.operation = OperationEvent.Section.setSpeed.confirm.operation;
+            } else if (this.operation === OperationEvent.Section.cancelSpeed.order.operation) {
+                /** 区段取消限速*/
+                operate.operation = OperationEvent.Section.cancelSpeed.confirm.operation;
+            } else if (this.operation === OperationEvent.Switch.setSpeed.order.operation) {
+                /** 道岔设置限速*/
+                operate.operation = OperationEvent.Switch.setSpeed.confirm.operation;
+            } else if (this.operation === OperationEvent.Switch.cancelSpeed.order.operation) {
+                /** 道岔取消限速*/
+                operate.operation = OperationEvent.Switch.cancelSpeed.confirm.operation;
+            }
+
+            this.loading = true;
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.loading = false;
+                this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                if (valid) {
+                    this.$emit('setOperate', { step: 1, success: true });
+                    this.doClose();
+                }
+            }).catch((error) => {
+                this.loading = false;
+                this.$emit('setOperate', { step: 0, success: false });
+                this.doClose();
+            });
+        },
+        cancel() {
+            const operate = {
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
+
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                if (valid) {
+                    this.$emit('setOperate', { step: 0, success: false });
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.doClose();
+                }
+            }).catch(error => {
+                this.doClose();
+            });
+        }
     }
+};
 
 </script>
 <style>
@@ -150,4 +156,4 @@
         padding-bottom: 40px !important;
         border: 1px solid lightgray;
     }
-</style>
+</style>

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

@@ -102,7 +102,7 @@
 </template>
 <script>
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import ConfirmControlSpeed from './childDialog/confirmControlSpeed';
 import { now } from '@/utils/date';
 
@@ -378,7 +378,6 @@ export default {
                     this.cmdDisabled = [true, true, true];
                     this.stpDisabled = true;
                     this.order = 0;
-                    this.type = operate.type;
                     this.operation = operate.operation;
                     this.setMessage('请选择限速值后，点击“下达”按钮，下达命令！');
                     if (this.isCancelSpeed) {
@@ -400,7 +399,6 @@ export default {
         },
         speedSelectChange(val) {
             const operate = {
-                type: this.type,
                 val: val
             };
 
@@ -422,7 +420,6 @@ export default {
         },
         command() {
             const operate = {
-                type: this.type
             };
 
             if (this.operation == OperationEvent.Section.setSpeed.menu.operation) {
@@ -445,6 +442,7 @@ export default {
 
             this.setMessage('请点击“确认1”按钮，确认命令！');
             this.writeRecord({ order: ++this.order, date: now(), context: '点击下达命令', result: '' });
+            debugger;
             this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
@@ -459,7 +457,6 @@ export default {
         },
         confirm1() {
             const operate = {
-                type: this.type
             };
 
             if (this.operation == OperationEvent.Section.setSpeed.menu.operation) {
@@ -495,7 +492,6 @@ export default {
         confirm2() {
             const operate = {
                 over:true,
-                type: this.type,
                 val: this.speed,
                 param: {
                     speedLimitValue: `${this.speed}`
@@ -539,7 +535,6 @@ export default {
         },
         stop() {
             const operate = {
-                type: this.type
             };
 
             if (this.operation == OperationEvent.Section.setSpeed.menu.operation) {
@@ -571,7 +566,6 @@ export default {
         },
         close() {
             const operate = {
-                type: this.type,
                 operation: OperationEvent.Command.close.menu.operation
             };
             this.writeRecord({ order: ++this.order, date: now(), context: '点击关闭', result: '' });

src/scripts/OperationConfig.js

@@ -1095,7 +1095,6 @@ export const OperationList = {
                     { deviceType: '06', orderNum: 3, operateCode: '511', tip: '鼠标左键点击【确定】按钮' }
                 ]
             },
-
             {
                 maxDuration: 15,
                 minDuration: 8,
@@ -1137,7 +1136,7 @@ export const OperationList = {
                     { deviceType: '03', orderNum: 1, operateCode: '407', tip: '鼠标右键菜单选择【设置临时限速】' },
                     { deviceType: '03', orderNum: 2, operateCode: '4076', tip: '鼠标左键选择【限速值15】', val: '15' },
                     { deviceType: '03', orderNum: 3, operateCode: '4071', tip: '鼠标左键点击【下达】按钮' },
-                    { deviceType: '03', orderNum: 4, operateCode: '4072', tip: '鼠标左键点击【确认】按钮' },
+                    { deviceType: '03', orderNum: 4, operateCode: '4072', tip: '鼠标左键点击【确定】按钮' },
                     { deviceType: '03', orderNum: 5, operateCode: '4073', tip: '鼠标左键点击【确认1】按钮' },
                     { deviceType: '03', orderNum: 6, operateCode: '4074', tip: '鼠标左键点击【确认2】按钮' },
                     { deviceType: '03', orderNum: 7, operateCode: '001', tip: '鼠标左键点击【关闭】按钮' }
@@ -1205,7 +1204,7 @@ export const OperationList = {
                     { deviceType: '02', orderNum: 1, operateCode: '113', tip: '鼠标右键菜单选择【设置临时限速】' },
                     { deviceType: '02', orderNum: 2, operateCode: '1136', tip: '鼠标左键选择【限速值35】', val: '35' },
                     { deviceType: '02', orderNum: 3, operateCode: '1131', tip: '鼠标左键点击【下达】按钮' },
-                    { deviceType: '02', orderNum: 4, operateCode: '1132', tip: '鼠标左键点击【确认】按钮' },
+                    { deviceType: '02', orderNum: 4, operateCode: '1132', tip: '鼠标左键点击【确定】按钮' },
                     { deviceType: '02', orderNum: 5, operateCode: '1133', tip: '鼠标左键点击【确认1】按钮' },
                     { deviceType: '02', orderNum: 6, operateCode: '1134', tip: '鼠标左键点击【确认2】按钮' },
                     { deviceType: '02', orderNum: 7, operateCode: '001', tip: '鼠标左键点击【关闭】按钮' }