Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test

src/i18n/langs/zh/login.js

@@ -9,7 +9,7 @@ export default {
     mobilePhoneNumberOrEmail: '手机号/邮箱',
     password: '密码',
     autoLogin: '自动登录',
-    perfectInformation: '请在琏课堂小程序助手，完善个人信息，设置登录密码，手机号或邮箱。',
+    perfectInformation: '请在玖琏科技小程序，完善个人信息，设置登录密码，手机号或邮箱。',
     unableToLogin: '无法登录?',
     login: '登录',
     enterTheCorrectUserName: '请输入正确的用户名',

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

@@ -111,7 +111,7 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import { mouseCancelState } from '@/jmapNew/theme/components/utils/menuItemStatus';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 import PopupAlarm from './childDialog/popupAlarm';

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

@@ -1,59 +1,69 @@
 <template>
-    <el-dialog class="beijing-01__systerm confirm-control-speed" :title="title" :visible.sync="show" width="340px"
-        :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="11">
-                <el-button type="primary" :id="confirmId" @click="confirm">确定</el-button>
-            </el-col>
-            <el-col :span="11" :offset="2">
-                <el-button @click="doClose">取 消</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="340px"
+    :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="11">
+        <el-button :id="confirmId" type="primary" @click="confirm">确定</el-button>
+      </el-col>
+      <el-col :span="11" :offset="2">
+        <el-button @click="doClose">取 消</el-button>
+      </el-col>
+    </el-row>
+  </el-dialog>
 </template>
 
 <script>
-    import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
 
-    export default {
-        name: 'ConfirmTip',
-        data() {
-            return {
-                dialogShow: false,
-                message: '',
-                confirmId: '',
-            }
+export default {
+    name: 'ConfirmTip',
+    data() {
+        return {
+            dialogShow: false,
+            message: '',
+            confirmId: ''
+        };
+    },
+    computed: {
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
         },
-        computed: {
-            show() {
-                return this.dialogShow && !this.$store.state.menuOperation.break;
-            },
-            title() {
-                if (this.dialogShow) {
-                    return "提示";
-                }
+        title() {
+            if (this.dialogShow) {
+                return '提示';
             }
-        },
-        mounted() {
+            return '';
+        }
+    },
+    mounted() {
 
+    },
+    methods: {
+        doShow(operate) {
+            this.message = operate.message;
+            this.dialogShow = true;
+            this.confirmId = operate.confirmId;
         },
-        methods: {
-            doShow(operate) {
-                this.message = operate.message;
-                this.dialogShow = true;
-                this.confirmId = operate.confirmId;
-            },
-            confirm() {
-                this.$emit('close');
-            },
-            doClose() {
-                this.dialogShow = false;
-            }
+        confirm() {
+            this.$emit('close');
+        },
+        doClose() {
+            this.dialogShow = false;
         }
     }
+};
 
 </script>
 <style scoped>
@@ -65,4 +75,4 @@
         display: block;
         margin: 0 auto;
     }
-</style>
+</style>

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

@@ -29,7 +29,7 @@
 </template>
 
 <script>
-import { OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 
 export default {

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

@@ -25,7 +25,7 @@
 </template>
 
 <script>
-import { OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
 export default {
     name: 'PopupAlarm',

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

@@ -64,7 +64,8 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import { mouseCancelState } from '@/jmapNew/theme/components/utils/menuItemStatus';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 

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

@@ -77,7 +77,8 @@
   </div>
 </template>
 <script>
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import { mouseCancelState } from '@/jmapNew/theme/components/utils/menuItemStatus';
 import { now } from '@/utils/date';
 

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

@@ -27,7 +27,8 @@
 </template>
 
 <script>
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import { mouseCancelState } from '@/jmapNew/theme/components/utils/menuItemStatus';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 

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

@@ -39,7 +39,8 @@
 </template>
 
 <script>
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import { mouseCancelState } from '@/jmapNew/theme/components/utils/menuItemStatus';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 

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

@@ -44,7 +44,8 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import { mouseCancelState } from '@/jmapNew/theme/components/utils/menuItemStatus';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 

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

@@ -30,7 +30,8 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 // import { getPublishMapTrainNos } from '@/api/runplan';
 import { mouseCancelState } from '@/jmapNew/theme/components/utils/menuItemStatus';
 import ConfirmControl from './childDialog/confirmControl';

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

@@ -41,7 +41,8 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
 export default {
     name: 'TrainMove',

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

@@ -44,7 +44,8 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import { mouseCancelState } from '@/jmapNew/theme/components/utils/menuItemStatus';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 

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

@@ -40,7 +40,8 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import { mouseCancelState } from '@/jmapNew/theme/components/utils/menuItemStatus';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 

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

@@ -44,7 +44,8 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import { mouseCancelState } from '@/jmapNew/theme/components/utils/menuItemStatus';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 

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

@@ -49,7 +49,8 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
 export default {
     name: 'TrainMove',

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

@@ -44,7 +44,8 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import { mouseCancelState } from '@/jmapNew/theme/components/utils/menuItemStatus';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 

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

@@ -37,7 +37,8 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import { mouseCancelState } from '@/jmapNew/theme/components/utils/menuItemStatus';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 

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

@@ -30,7 +30,8 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import { mouseCancelState } from '@/jmapNew/theme/components/utils/menuItemStatus';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 

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

@@ -99,7 +99,8 @@
 </template>
 <script>
 import { mapGetters } from 'vuex';
-import { TrainingMode, OperationEvent } from '@/scripts/ConstDic';
+import { TrainingMode } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import StationControl from './menuDialog/stationControl';
 import DetainTrainContorl from './menuDialog/detainTrainContorl';
 import DetainTrainContorlUpDown from './menuDialog/detainTrainContorlUpDown';

src/jmapNew/theme/beijing_01/menus/menuDialog/childDialog/userAdd.vue

@@ -1,154 +1,164 @@
 <template>
-    <el-dialog class="beijing-01__systerm user-add" :title="title" :visible.sync="show" width="420px"
-        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" append-to-body v-dialogDrag>
-        <div style="padding: 15px 40px; border: 1px double lightgray; margin: 20px 10px; ">
-            <el-form size="small" label-width="90px" :model="model" label-position="left" :rules="rules" ref="form">
-                <el-form-item label="工号:" prop="jobNumber">
-                    <el-input v-model="model.jobNumber"></el-input>
-                </el-form-item>
-                <el-form-item label="用户名:" prop="userName">
-                    <el-input v-model="model.userName"></el-input>
-                </el-form-item>
-                <el-form-item label="密码:" prop="password">
-                    <el-input type="password" v-model="model.password"></el-input>
-                </el-form-item>
-                <el-form-item label="确认密码:" prop="confirm">
-                    <el-input type="password" v-model="model.confirm"></el-input>
-                </el-form-item>
+  <el-dialog
+    v-dialogDrag
+    class="beijing-01__systerm user-add"
+    :title="title"
+    :visible.sync="show"
+    width="420px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+    append-to-body
+  >
+    <div style="padding: 15px 40px; border: 1px double lightgray; margin: 20px 10px; ">
+      <el-form ref="form" size="small" label-width="90px" :model="model" label-position="left" :rules="rules">
+        <el-form-item label="工号:" prop="jobNumber">
+          <el-input v-model="model.jobNumber" />
+        </el-form-item>
+        <el-form-item label="用户名:" prop="userName">
+          <el-input v-model="model.userName" />
+        </el-form-item>
+        <el-form-item label="密码:" prop="password">
+          <el-input v-model="model.password" type="password" />
+        </el-form-item>
+        <el-form-item label="确认密码:" prop="confirm">
+          <el-input v-model="model.confirm" type="password" />
+        </el-form-item>
 
-            </el-form>
-        </div>
-        <el-row justify="center" class="button-group">
-            <el-col :span="8" :offset="6">
-                <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
-            </el-col>
-            <el-col :span="8" :offset="0">
-                <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
-            </el-col>
-        </el-row>
-    </el-dialog>
+      </el-form>
+    </div>
+    <el-row justify="center" class="button-group">
+      <el-col :span="8" :offset="6">
+        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
+      </el-col>
+      <el-col :span="8" :offset="0">
+        <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
+      </el-col>
+    </el-row>
+  </el-dialog>
 </template>
 
 <script>
-    import { mapGetters } from 'vuex';
-    import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { mapGetters } from 'vuex';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
-    export default {
-        name: 'UserAdd',
-        components: {
-        },
-        data() {
-            return {
-                operate: {},
-                operation: null,
-                dialogShow: false,
-                loading: false,
-                model: {
-                    type: 'ADD',
-                    jobNumber: '',
-                    userName: '',
-                    password: '',
-                    confirm: '',
-                },
-                rules: {
-                    jobNumber: [
-                        { required: true, message: '请输入工号', trigger: 'blur' }
-                    ],
-                    userName: [
-                        { required: true, message: '请输入用户名', trigger: 'blur' }
-                    ],
-                    password: [
-                        { required: true, message: '请输入密码', trigger: 'change' }
-                    ],
-                    confirm: [
-                        { required: true, message: '请再次输入密码', trigger: 'change' }
-                    ],
-                },
+export default {
+    name: 'UserAdd',
+    components: {
+    },
+    data() {
+        return {
+            operate: {},
+            operation: null,
+            dialogShow: false,
+            loading: false,
+            model: {
+                type: 'ADD',
+                jobNumber: '',
+                userName: '',
+                password: '',
+                confirm: ''
+            },
+            rules: {
+                jobNumber: [
+                    { required: true, message: '请输入工号', trigger: 'blur' }
+                ],
+                userName: [
+                    { required: true, message: '请输入用户名', trigger: 'blur' }
+                ],
+                password: [
+                    { required: true, message: '请输入密码', trigger: 'change' }
+                ],
+                confirm: [
+                    { required: true, message: '请再次输入密码', trigger: 'change' }
+                ]
             }
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'stationStandList'
+        ]),
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
         },
-        computed: {
-            ...mapGetters('map', [
-                'stationStandList'
-            ]),
-            show() {
-                return this.dialogShow && !this.$store.state.menuOperation.break;
-            },
-            domIdCancel() {
-                return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-            },
-            domIdConfirm() {
-                return this.dialogShow ? OperationEvent.Command.close.confirm.domId : '';
-            },
-            title() {
-                return '增加用户'
-            }
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
         },
-        mounted() {
-            this.$nextTick(() => {
-                this.$store.dispatch('training/tipReload');
-            })
+        domIdConfirm() {
+            return this.dialogShow ? OperationEvent.Command.close.confirm.domId : '';
         },
-        methods: {
-            doShow(operate) {
-                //非断电激活时设置初始值
-                if (!this.dialogShow) {
-                    this.loading = false;
-                    this.operate = operate || {};
-                    this.operation = operate.operation;
-                    this.$nextTick(() => {
-                        this.$refs.form.resetFields();
-                    });
-                }
-
-                this.dialogShow = true;
-                this.$nextTick(function () {
-                    this.$store.dispatch('training/emitTipFresh');
-                });
-            },
-            doClose() {
+        title() {
+            return '增加用户';
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(operate) {
+            // 非断电激活时设置初始值
+            if (!this.dialogShow) {
                 this.loading = false;
-                this.dialogShow = false;
-                this.$store.dispatch('training/emitTipFresh');
-            },
-            commit() {
-                this.$refs['form'].validate((valid) => {
-                    if (valid) {
-                        let operate = {
-                            type: this.operate.type,
-                            operation: OperationEvent.Command.close.confirm.operation,
-                        }
-
-                        this.loading = true;
-                        this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                            this.loading = false;
-                            if (valid) {
-                                if (this.model.password === this.model.confirm) {
-                                    this.doClose();
-                                    this.$emit('operateUser', this.model);
-                                } else {
-                                    this.$messageBox('二次输入密码不一致');
-                                }
-                            }
-                        })
-                    } else {
-                        return false;
-                    }
+                this.operate = operate || {};
+                this.operation = operate.operation;
+                this.$nextTick(() => {
+                    this.$refs.form.resetFields();
                 });
-            },
-            cancel() {
-                let operate = {
-                    type: this.operate.type,
-                    operation: OperationEvent.Command.cancel.menu.operation,
-                }
-
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.doClose();
-                    }
-                }).catch(error => { this.doClose(); this.model });
             }
+
+            this.dialogShow = true;
+            this.$nextTick(function () {
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+        },
+        commit() {
+            this.$refs['form'].validate((valid) => {
+                if (valid) {
+                    const operate = {
+                        type: this.operate.type,
+                        operation: OperationEvent.Command.close.confirm.operation
+                    };
+
+                    this.loading = true;
+                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                        this.loading = false;
+                        if (valid) {
+                            if (this.model.password === this.model.confirm) {
+                                this.doClose();
+                                this.$emit('operateUser', this.model);
+                            } else {
+                                this.$messageBox('二次输入密码不一致');
+                            }
+                        }
+                    });
+                } else {
+                    return false;
+                }
+            });
+        },
+        cancel() {
+            const operate = {
+                type: this.operate.type,
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
+
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => { this.doClose(); this.model; });
         }
     }
+};
 </script>
 <style scoped>
     .beijing-01__systerm .el-dialog .base-label {

src/jmapNew/theme/beijing_01/menus/menuDialog/childDialog/userDelete.vue

@@ -28,7 +28,7 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
 export default {
     name: 'UserDelete',

src/jmapNew/theme/beijing_01/menus/menuDialog/childDialog/userEdit.vue

@@ -1,170 +1,181 @@
 <template>
-    <el-dialog class="beijing-01__systerm user-edit" :title="title" :visible.sync="show" width="420px"
-        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" append-to-body v-dialogDrag>
-        <div style="padding: 15px 40px; border: 1px double lightgray; margin: 20px 10px; ">
-            <el-form size="small" label-width="90px" :model="model" label-position="left" :rules="rules" ref="form">
-                <el-form-item label="工号:" prop="jobNumber">
-                    <el-input v-model="model.jobNumber" disabled></el-input>
-                </el-form-item>
-                <el-form-item label="用户名:" prop="userName">
-                    <el-input v-model="model.userName" disabled></el-input>
-                </el-form-item>
-                <el-form-item label="原始密码:" prop="oldPassword">
-                    <el-input type="oldPassword" v-model="model.oldPassword"></el-input>
-                </el-form-item>
-                <el-form-item label="密码:" prop="password">
-                    <el-input type="password" v-model="model.password"></el-input>
-                </el-form-item>
-                <el-form-item label="确认密码:" prop="confirm">
-                    <el-input type="password" v-model="model.confirm"></el-input>
-                </el-form-item>
+  <el-dialog
+    v-dialogDrag
+    class="beijing-01__systerm user-edit"
+    :title="title"
+    :visible.sync="show"
+    width="420px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+    append-to-body
+  >
+    <div style="padding: 15px 40px; border: 1px double lightgray; margin: 20px 10px; ">
+      <el-form ref="form" size="small" label-width="90px" :model="model" label-position="left" :rules="rules">
+        <el-form-item label="工号:" prop="jobNumber">
+          <el-input v-model="model.jobNumber" disabled />
+        </el-form-item>
+        <el-form-item label="用户名:" prop="userName">
+          <el-input v-model="model.userName" disabled />
+        </el-form-item>
+        <el-form-item label="原始密码:" prop="oldPassword">
+          <el-input v-model="model.oldPassword" type="oldPassword" />
+        </el-form-item>
+        <el-form-item label="密码:" prop="password">
+          <el-input v-model="model.password" type="password" />
+        </el-form-item>
+        <el-form-item label="确认密码:" prop="confirm">
+          <el-input v-model="model.confirm" type="password" />
+        </el-form-item>
 
-            </el-form>
-        </div>
-        <el-row justify="center" class="button-group">
-            <el-col :span="8" :offset="6">
-                <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
-            </el-col>
-            <el-col :span="8" :offset="0">
-                <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
-            </el-col>
-        </el-row>
-    </el-dialog>
+      </el-form>
+    </div>
+    <el-row justify="center" class="button-group">
+      <el-col :span="8" :offset="6">
+        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
+      </el-col>
+      <el-col :span="8" :offset="0">
+        <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
+      </el-col>
+    </el-row>
+  </el-dialog>
 </template>
 
 <script>
-    import { mapGetters } from 'vuex';
-    import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { mapGetters } from 'vuex';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
-    export default {
-        name: 'UserEdit',
-        components: {
-        },
-        data() {
-            return {
-                operate: {},
-                selected: {},
-                operation: null,
-                dialogShow: false,
-                loading: false,
-                model: {
-                    type: 'EDIT',
-                    jobNumber: '',
-                    userName: '',
-                    oldPassword: '',
-                    password: '',
-                    confirm: '',
-                },
-                rules: {
-                    jobNumber: [
-                        { required: true, message: '请输入工号', trigger: 'blur' }
-                    ],
-                    userName: [
-                        { required: true, message: '请输入用户名', trigger: 'blur' }
-                    ],
-                    oldPassword: [
-                        { required: true, message: '请输入原始密码', trigger: 'change' }
-                    ],
-                    password: [
-                        { required: true, message: '请输入新密码', trigger: 'change' }
-                    ],
-                    confirm: [
-                        { required: true, message: '请再次输入新密码', trigger: 'change' }
-                    ],
-                },
+export default {
+    name: 'UserEdit',
+    components: {
+    },
+    data() {
+        return {
+            operate: {},
+            selected: {},
+            operation: null,
+            dialogShow: false,
+            loading: false,
+            model: {
+                type: 'EDIT',
+                jobNumber: '',
+                userName: '',
+                oldPassword: '',
+                password: '',
+                confirm: ''
+            },
+            rules: {
+                jobNumber: [
+                    { required: true, message: '请输入工号', trigger: 'blur' }
+                ],
+                userName: [
+                    { required: true, message: '请输入用户名', trigger: 'blur' }
+                ],
+                oldPassword: [
+                    { required: true, message: '请输入原始密码', trigger: 'change' }
+                ],
+                password: [
+                    { required: true, message: '请输入新密码', trigger: 'change' }
+                ],
+                confirm: [
+                    { required: true, message: '请再次输入新密码', trigger: 'change' }
+                ]
             }
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'stationStandList'
+        ]),
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
         },
-        computed: {
-            ...mapGetters('map', [
-                'stationStandList'
-            ]),
-            show() {
-                return this.dialogShow && !this.$store.state.menuOperation.break;
-            },
-            domIdCancel() {
-                return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-            },
-            domIdConfirm() {
-                return this.dialogShow ? OperationEvent.Command.close.confirm.domId : '';
-            },
-            title() {
-                return '用户编辑页面'
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+        },
+        domIdConfirm() {
+            return this.dialogShow ? OperationEvent.Command.close.confirm.domId : '';
+        },
+        title() {
+            return '用户编辑页面';
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(operate, selected) {
+            // 非断电激活时设置初始值
+            if (!this.dialogShow) {
+                this.loading = false;
+                this.operate = operate || {};
+                this.operation = operate.operation;
+                this.$nextTick(() => {
+                    this.$refs.form.resetFields();
+                    this.selected = selected;
+                    if (selected) {
+                        this.model.jobNumber = selected.jobNumber;
+                        this.model.userName = selected.userName;
+                    }
+                });
             }
+
+            this.dialogShow = true;
+            this.$nextTick(function () {
+                this.$store.dispatch('training/emitTipFresh');
+            });
         },
-        mounted() {
-            this.$nextTick(() => {
-                this.$store.dispatch('training/tipReload');
-            })
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
         },
-        methods: {
-            doShow(operate, selected) {
-                //非断电激活时设置初始值
-                if (!this.dialogShow) {
-                    this.loading = false;
-                    this.operate = operate || {};
-                    this.operation = operate.operation;
-                    this.$nextTick(() => {
-                        this.$refs.form.resetFields();
-                        this.selected = selected;
-                        if (selected) {
-                            this.model.jobNumber = selected.jobNumber;
-                            this.model.userName = selected.userName;
+        commit() {
+            this.$refs['form'].validate((valid) => {
+                if (valid) {
+                    const operate = {
+                        type: this.operate.type,
+                        operation: OperationEvent.Command.close.confirm.operation
+                    };
+
+                    this.loading = true;
+                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                        this.loading = false;
+                        if (valid) {
+                            if (this.selected.password !== this.model.oldPassword) {
+                                this.$messageBox('原始密码错误');
+                            } else if (this.model.password !== this.model.confirm) {
+                                this.$messageBox('二次输入的密码错误');
+                            } else if (this.model.oldPassword === this.model.password) {
+                                this.$messageBox('老密码和新密相同');
+                            } else {
+                                this.doClose();
+                                this.$emit('operateUser', this.model);
+                            }
                         }
                     });
+                } else {
+                    return false;
                 }
+            });
+        },
+        cancel() {
+            const operate = {
+                type: this.operate.type,
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
 
-                this.dialogShow = true;
-                this.$nextTick(function () {
-                    this.$store.dispatch('training/emitTipFresh');
-                });
-            },
-            doClose() {
-                this.loading = false;
-                this.dialogShow = false;
-                this.$store.dispatch('training/emitTipFresh');
-            },
-            commit() {
-                this.$refs['form'].validate((valid) => {
-                    if (valid) {
-                        let operate = {
-                            type: this.operate.type,
-                            operation: OperationEvent.Command.close.confirm.operation,
-                        }
-
-                        this.loading = true;
-                        this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                            this.loading = false;
-                            if (valid)
-                                if (this.selected.password !== this.model.oldPassword) {
-                                    this.$messageBox('原始密码错误');
-                                } else if (this.model.password !== this.model.confirm) {
-                                    this.$messageBox('二次输入的密码错误');
-                                } else if (this.model.oldPassword === this.model.password) {
-                                    this.$messageBox('老密码和新密相同');
-                                } else {
-                                    this.doClose();
-                                    this.$emit('operateUser', this.model);
-                                }
-                        })
-                    } else {
-                        return false;
-                    }
-                });
-            },
-            cancel() {
-                let operate = {
-                    type: this.operate.type,
-                    operation: OperationEvent.Command.cancel.menu.operation,
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
                 }
-
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.doClose();
-                    }
-                }).catch(error => { this.doClose(); });
-            }
+            }).catch(() => { this.doClose(); });
         }
     }
+};
 </script>
 <style scoped>
     .beijing-01__systerm .el-dialog .base-label {

src/jmapNew/theme/beijing_01/menus/menuDialog/detainTrainContorl.vue

@@ -27,7 +27,8 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 
 export default {

src/jmapNew/theme/beijing_01/menus/menuDialog/detainTrainContorlUpDown.vue

@@ -27,7 +27,8 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 
 export default {

src/jmapNew/theme/beijing_01/menus/menuDialog/helpAbout.vue

@@ -1,123 +1,133 @@
 <template>
-    <el-dialog class="beijing-01__systerm manage-user" :title="title" :visible.sync="show" width="600px" :before-close="doClose"
-        :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
-        <div style="height: 70px;">
-            <div style="position: relative; left: 10px;">
-            </div>
-            <div style="position: relative; left: 80px;">
-                <div style="width:100%">
-                    <span style="padding-left: 60px">ControlMonitor 1.3.5.0</span>
-                    <el-button style="position: absolute; right: 95px;" :id="domIdConfirm" type="primary"
-                        :loading="loading" @click="commit">确定</el-button>
-                </div>
-                <div style="width:100%; padding-top: 20px">
-                    <span> 版权所有（C）2010-2011 北京玖琏科技有限公司</span>
-                </div>
-            </div>
+  <el-dialog
+    v-dialogDrag
+    class="beijing-01__systerm manage-user"
+    :title="title"
+    :visible.sync="show"
+    width="600px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <div style="height: 70px;">
+      <div style="position: relative; left: 10px;" />
+      <div style="position: relative; left: 80px;">
+        <div style="width:100%">
+          <span style="padding-left: 60px">ControlMonitor 1.3.5.0</span>
+          <el-button
+            :id="domIdConfirm"
+            style="position: absolute; right: 95px;"
+            type="primary"
+            :loading="loading"
+            @click="commit"
+          >确定</el-button>
         </div>
-        <div style="padding: 10px;  margin: 5px; ">
-            <el-table :data="tableData" style="width: 100%;" height="400">
-                <el-table-column prop="moduleName" label="模块名称" width="180">
-                </el-table-column>
-                <el-table-column prop="version" label="版本" width="180">
-                </el-table-column>
-                <el-table-column prop="updateDate" label="修改日期">
-                </el-table-column>
-            </el-table>
+        <div style="width:100%; padding-top: 20px">
+          <span> 版权所有（C）2010-2011 北京玖琏科技有限公司</span>
         </div>
-    </el-dialog>
+      </div>
+    </div>
+    <div style="padding: 10px;  margin: 5px; ">
+      <el-table :data="tableData" style="width: 100%;" height="400">
+        <el-table-column prop="moduleName" label="模块名称" width="180" />
+        <el-table-column prop="version" label="版本" width="180" />
+        <el-table-column prop="updateDate" label="修改日期" />
+      </el-table>
+    </div>
+  </el-dialog>
 </template>
 
 <script>
-    import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
-    export default {
-        name: 'ManageUser',
-        data() {
-            return {
-                tableData: [
-                    {
-                        moduleName: '主程序版本:',
-                        version: '123',
-                        updateDate: '123'
-                    }
-                ],
-                operate: {},
-                operation: null,
-                dialogShow: false,
-                loading: false,
-                selected: null,
-            }
-        },
-        computed: {
-            show() {
-                return this.dialogShow && !this.$store.state.menuOperation.break;
-            },
-            domIdCancel() {
-                return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-            },
-            domIdConfirm() {
-                return this.dialogShow ? OperationEvent.Command.close.menu.domId : '';
-            },
-            title() {
-                return '关于ControlMonitor'
-            }
-        },
-        mounted() {
-            this.$nextTick(() => {
-                this.$store.dispatch('training/tipReload');
-            })
-        },
-        methods: {
-            doShow(operate) {
-                //非断电激活时设置初始值
-                if (!this.dialogShow) {
-                    this.loading = false;
-                    this.operate = operate || {};
-                    this.operation = operate.operation;
+export default {
+    name: 'ManageUser',
+    data() {
+        return {
+            tableData: [
+                {
+                    moduleName: '主程序版本:',
+                    version: '123',
+                    updateDate: '123'
                 }
-
-                this.dialogShow = true;
-                this.$nextTick(function () {
-                    this.$store.dispatch('training/emitTipFresh');
-                });
-            },
-            doClose() {
+            ],
+            operate: {},
+            operation: null,
+            dialogShow: false,
+            loading: false,
+            selected: null
+        };
+    },
+    computed: {
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
+        },
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+        },
+        domIdConfirm() {
+            return this.dialogShow ? OperationEvent.Command.close.menu.domId : '';
+        },
+        title() {
+            return '关于ControlMonitor';
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(operate) {
+            // 非断电激活时设置初始值
+            if (!this.dialogShow) {
                 this.loading = false;
-                this.dialogShow = false;
-                this.$store.dispatch('training/emitTipFresh');
-            },
-            commit() {
-                let operate = {
-                    type: this.operate.type,
-                    operation: OperationEvent.Command.close.menu.operation,
-                }
-
-                this.loading = true;
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                    this.loading = false;
-                    if (valid) {
-                        this.doClose();
-                    }
-                }).catch(error => {
-                    this.loading = false;
-                    this.doClose();
-                })
-            },
-            cancel() {
-                let operate = {
-                    type: this.operate.type,
-                    operation: OperationEvent.Command.cancel.menu.operation,
-                }
-
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.doClose();
-                    }
-                }).catch(error => { this.doClose(); });
+                this.operate = operate || {};
+                this.operation = operate.operation;
             }
+
+            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 = {
+                type: this.operate.type,
+                operation: OperationEvent.Command.close.menu.operation
+            };
+
+            this.loading = true;
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.loading = false;
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => {
+                this.loading = false;
+                this.doClose();
+            });
+        },
+        cancel() {
+            const operate = {
+                type: this.operate.type,
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
+
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => { this.doClose(); });
         }
     }
+};
 </script>
 <style scoped>
     .beijing-01__systerm .el-dialog .base-label {

src/jmapNew/theme/beijing_01/menus/menuDialog/manageUser.vue

@@ -1,282 +1,300 @@
 <template>
-    <el-dialog class="beijing-01__systerm manage-user" :title="title" :visible.sync="show" width="420px"
-        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
-        <div style="padding: 5px 5px; border: 1px double lightgray; margin: 20px 0px; ">
-            <span class="base-label">用户列表</span>
-            <el-row>
-                <el-col :span="18">
-                    <el-table ref="multipleTable" :data="tableData" border row-key="code" style="width: 100%"
-                        height="450" center size="mini" highlight-current-row @row-click="chooseUser">
-                        <el-table-column prop="jobNumber" label="工号" width="120">
-                            <template slot-scope="scope">
-                                <span>{{scope.row.jobNumber}}</span>
-                            </template>
-                        </el-table-column>
-                        <el-table-column prop="userName" label="用户名">
-                            <template slot-scope="scope">
-                                <span>{{scope.row.userName}}</span>
-                            </template>
-                        </el-table-column>
-                        <el-table-column width="20">
-                        </el-table-column>
-                    </el-table>
-                </el-col>
-                <el-col :span="4">
-                    <el-button style="margin-top: 140px; margin-left: 10px;" :id="domIdFreshUser" @click="freshUser">刷新
-                    </el-button>
-                    <el-button style="margin-top: 30px; margin-left: 10px;" :id="domIdAddUser" @click="addUser">增加
-                    </el-button>
-                    <el-button style="margin-top: 30px; margin-left: 10px;" :id="domIdEditUser" @click="editUser">修改
-                    </el-button>
-                    <el-button style="margin-top: 30px; margin-left: 10px;" :id="domIdDelUser" @click="delUser">删除
-                    </el-button>
-                </el-col>
-            </el-row>
-        </div>
-        <el-row justify="center" class="button-group">
-            <el-col :span="8" :offset="6">
-                <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
-            </el-col>
-            <el-col :span="8" :offset="0">
-                <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
-            </el-col>
-        </el-row>
-        <user-add ref="userAdd" @operateUser="operateUser"></user-add>
-        <user-edit ref="userEdit" @operateUser="operateUser"></user-edit>
-        <user-delete ref="userDelete" @operateUser="operateUser"></user-delete>
-    </el-dialog>
+  <el-dialog
+    v-dialogDrag
+    class="beijing-01__systerm manage-user"
+    :title="title"
+    :visible.sync="show"
+    width="420px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <div style="padding: 5px 5px; border: 1px double lightgray; margin: 20px 0px; ">
+      <span class="base-label">用户列表</span>
+      <el-row>
+        <el-col :span="18">
+          <el-table
+            ref="multipleTable"
+            :data="tableData"
+            border
+            row-key="code"
+            style="width: 100%"
+            height="450"
+            center
+            size="mini"
+            highlight-current-row
+            @row-click="chooseUser"
+          >
+            <el-table-column prop="jobNumber" label="工号" width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.jobNumber }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="userName" label="用户名">
+              <template slot-scope="scope">
+                <span>{{ scope.row.userName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column width="20" />
+          </el-table>
+        </el-col>
+        <el-col :span="4">
+          <el-button :id="domIdFreshUser" style="margin-top: 140px; margin-left: 10px;" @click="freshUser">刷新
+          </el-button>
+          <el-button :id="domIdAddUser" style="margin-top: 30px; margin-left: 10px;" @click="addUser">增加
+          </el-button>
+          <el-button :id="domIdEditUser" style="margin-top: 30px; margin-left: 10px;" @click="editUser">修改
+          </el-button>
+          <el-button :id="domIdDelUser" style="margin-top: 30px; margin-left: 10px;" @click="delUser">删除
+          </el-button>
+        </el-col>
+      </el-row>
+    </div>
+    <el-row justify="center" class="button-group">
+      <el-col :span="8" :offset="6">
+        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
+      </el-col>
+      <el-col :span="8" :offset="0">
+        <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
+      </el-col>
+    </el-row>
+    <user-add ref="userAdd" @operateUser="operateUser" />
+    <user-edit ref="userEdit" @operateUser="operateUser" />
+    <user-delete ref="userDelete" @operateUser="operateUser" />
+  </el-dialog>
 </template>
 
 <script>
-    import { mapGetters } from 'vuex';
-    import UserAdd from './childDialog/userAdd';
-    import UserEdit from './childDialog/userEdit';
-    import UserDelete from './childDialog/userDelete';
-    import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { mapGetters } from 'vuex';
+import UserAdd from './childDialog/userAdd';
+import UserEdit from './childDialog/userEdit';
+import UserDelete from './childDialog/userDelete';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
-    export default {
-        name: 'ManageUser',
-        components: {
-            UserAdd,
-            UserEdit,
-            UserDelete
+export default {
+    name: 'ManageUser',
+    components: {
+        UserAdd,
+        UserEdit,
+        UserDelete
+    },
+    data() {
+        return {
+            tableData: [],
+            operate: {},
+            operation: null,
+            dialogShow: false,
+            loading: false,
+            selected: null
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'stationStandList'
+        ]),
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
         },
-        data() {
-            return {
-                tableData: [],
-                operate: {},
-                operation: null,
-                dialogShow: false,
-                loading: false,
-                selected: null,
-            }
+        domIdAddUser() {
+            return this.dialogShow ? OperationEvent.Command.manage.addUser.domId : '';
         },
-        computed: {
-            ...mapGetters('map', [
-                'stationStandList'
-            ]),
-            show() {
-                return this.dialogShow && !this.$store.state.menuOperation.break;
-            },
-            domIdAddUser() {
-                return this.dialogShow ? OperationEvent.Command.manage.addUser.domId : '';
-            },
-            domIdEditUser() {
-                return this.dialogShow ? OperationEvent.Command.manage.editUser.domId : '';
-            },
-            domIdDelUser() {
-                return this.dialogShow ? OperationEvent.Command.manage.delUser.domId : '';
-            },
-            domIdFreshUser() {
-                return this.dialogShow ? OperationEvent.Command.manage.freshUser.domId : '';
-            },
-            domIdChooseUser() {
-                return this.dialogShow ? OperationEvent.Command.manage.chooseUser.domId : '';
-            },
-            domIdCancel() {
-                return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-            },
-            domIdConfirm() {
-                return this.dialogShow ? OperationEvent.Command.close.menu.domId : '';
-            },
-            title() {
-                return '用户管理'
-            }
+        domIdEditUser() {
+            return this.dialogShow ? OperationEvent.Command.manage.editUser.domId : '';
         },
-        mounted() {
-            this.$nextTick(() => {
-                this.$store.dispatch('training/tipReload');
-            })
+        domIdDelUser() {
+            return this.dialogShow ? OperationEvent.Command.manage.delUser.domId : '';
         },
-        methods: {
-            doShow(operate) {
-                //非断电激活时设置初始值
-                if (!this.dialogShow) {
-                    this.loading = false;
-                    this.operate = operate || {};
-                    this.operation = operate.operation;
-                }
-
-                this.dialogShow = true;
-                this.$nextTick(function () {
-                    this.$store.dispatch('training/emitTipFresh');
-                });
-            },
-            doClose() {
+        domIdFreshUser() {
+            return this.dialogShow ? OperationEvent.Command.manage.freshUser.domId : '';
+        },
+        domIdChooseUser() {
+            return this.dialogShow ? OperationEvent.Command.manage.chooseUser.domId : '';
+        },
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+        },
+        domIdConfirm() {
+            return this.dialogShow ? OperationEvent.Command.close.menu.domId : '';
+        },
+        title() {
+            return '用户管理';
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(operate) {
+            // 非断电激活时设置初始值
+            if (!this.dialogShow) {
                 this.loading = false;
-                this.dialogShow = false;
+                this.operate = operate || {};
+                this.operation = operate.operation;
+            }
+
+            this.dialogShow = true;
+            this.$nextTick(function () {
                 this.$store.dispatch('training/emitTipFresh');
-            },
-            //添加用户
-            addUser() {
-                let operate = {
-                    type: this.operate.type,
-                    operation: OperationEvent.Command.manage.addUser.operation,
+            });
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+        },
+        // 添加用户
+        addUser() {
+            const operate = {
+                type: this.operate.type,
+                operation: OperationEvent.Command.manage.addUser.operation
+            };
+
+            this.loading = true;
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.loading = false;
+                if (valid) {
+                    this.$refs.userAdd.doShow(operate);
                 }
+            }).catch(() => {
+                this.loading = false;
+            });
+        },
+        // 编辑用户
+        editUser() {
+            if (this.selected) {
+                const operate = {
+                    type: this.operate.type,
+                    operation: OperationEvent.Command.manage.editUser.operation
+                };
 
                 this.loading = true;
                 this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                     this.loading = false;
                     if (valid) {
-                        this.$refs.userAdd.doShow(operate);
+                        this.$refs.userEdit.doShow(operate, this.selected);
                     }
-                }).catch(error => {
+                }).catch(() => {
                     this.loading = false;
-                })
-            },
-            //编辑用户
-            editUser() {
-                if (this.selected) {
-                    let operate = {
-                        type: this.operate.type,
-                        operation: OperationEvent.Command.manage.editUser.operation,
-                    }
-
-                    this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                        this.loading = false;
-                        if (valid) {
-                            this.$refs.userEdit.doShow(operate, this.selected);
-                        }
-                    }).catch(error => {
-                        this.loading = false;
-                    })
-                } else {
-                    this.$messageBox('请先选择用户');
-                }
-            },
-            //删除用户
-            delUser() {
-                if (this.selected) {
-                    let operate = {
-                        type: this.operate.type,
-                        operation: OperationEvent.Command.manage.delUser.operation,
-                        messages: [`你确定删除用户${this.selected.userName}吗？`]
-                    }
-
-                    this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                        this.loading = false;
-                        if (valid) {
-                            this.$refs.userDelete.doShow(operate, this.selected);
-                        }
-                    }).catch(error => {
-                        this.loading = false;
-                    })
-                } else {
-                    this.$messageBox('请先选择用户');
-                }
-            },
-            //刷新用户
-            freshUser() {
-                let operate = {
+                });
+            } else {
+                this.$messageBox('请先选择用户');
+            }
+        },
+        // 删除用户
+        delUser() {
+            if (this.selected) {
+                const operate = {
                     type: this.operate.type,
-                    operation: OperationEvent.Command.manage.freshUser.operation,
-                }
-
-                this.loading = true;
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                    this.loading = false;
-                }).catch(error => {
-                    this.loading = false;
-                })
-            },
-            //选择用户
-            chooseUser(row) {
-                let operate = {
-                    type: this.operate.type,
-                    operation: OperationEvent.Command.manage.chooseUser.operation,
-                }
-
-                this.loading = true;
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                    this.loading = false;
-                    this.selected = row;
-                }).catch(error => {
-                    this.loading = false;
-                })
-            },
-            commit() {
-                let operate = {
-                    type: this.operate.type,
-                    operation: OperationEvent.Command.close.menu.operation,
-                }
+                    operation: OperationEvent.Command.manage.delUser.operation,
+                    messages: [`你确定删除用户${this.selected.userName}吗？`]
+                };
 
                 this.loading = true;
                 this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                     this.loading = false;
                     if (valid) {
-                        this.doClose();
+                        this.$refs.userDelete.doShow(operate, this.selected);
                     }
-                }).catch(error => {
+                }).catch(() => {
                     this.loading = false;
+                });
+            } else {
+                this.$messageBox('请先选择用户');
+            }
+        },
+        // 刷新用户
+        freshUser() {
+            const operate = {
+                type: this.operate.type,
+                operation: OperationEvent.Command.manage.freshUser.operation
+            };
+
+            this.loading = true;
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.loading = false;
+            }).catch(() => {
+                this.loading = false;
+            });
+        },
+        // 选择用户
+        chooseUser(row) {
+            const operate = {
+                type: this.operate.type,
+                operation: OperationEvent.Command.manage.chooseUser.operation
+            };
+
+            this.loading = true;
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.loading = false;
+                this.selected = row;
+            }).catch(() => {
+                this.loading = false;
+            });
+        },
+        commit() {
+            const operate = {
+                type: this.operate.type,
+                operation: OperationEvent.Command.close.menu.operation
+            };
+
+            this.loading = true;
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.loading = false;
+                if (valid) {
                     this.doClose();
-                })
-            },
-            cancel() {
-                let operate = {
-                    type: this.operate.type,
-                    operation: OperationEvent.Command.cancel.menu.operation,
                 }
+            }).catch(() => {
+                this.loading = false;
+                this.doClose();
+            });
+        },
+        cancel() {
+            const operate = {
+                type: this.operate.type,
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
 
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.doClose();
-                    }
-                }).catch(error => { this.doClose(); });
-            },
-            //增删改函数处理
-            operateUser(data) {
-                if (data && data.type === 'ADD') {
-                    let index = this.tableData.indexOf(this.tableData.find(elem => { return elem.jobNumber === data.jobNumber }));
-                    if (index < 0) {
-                        this.tableData.push({
-                            jobNumber: data.jobNumber,
-                            userName: data.userName,
-                            password: data.password
-                        });
-                    } else {
-                        this.$messageBox('添加失败，存在相同工号的用户');
-                    }
-                } else if (data && data.type === 'EDIT') {
-                    let index = this.tableData.indexOf(this.tableData.find(elem => { return elem.jobNumber === data.jobNumber }));
-                    if (index >= 0) {
-                        this.tableData[index].password = data.password;
-                        this.tableData[index].userName = data.userName;
-                    } else {
-                        this.$messageBox('修改失败');
-                    }
-                } else if (data && data.type === 'DELETE') {
-                    let index = this.tableData.indexOf(this.tableData.find(elem => { return elem.jobNumber === data.jobNumber }));
-                    if (index >= 0) {
-                        this.tableData.splice(index, 1);
-                    } else {
-                        this.$messageBox('删除失败');
-                    }
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => { this.doClose(); });
+        },
+        // 增删改函数处理
+        operateUser(data) {
+            if (data && data.type === 'ADD') {
+                const index = this.tableData.indexOf(this.tableData.find(elem => { return elem.jobNumber === data.jobNumber; }));
+                if (index < 0) {
+                    this.tableData.push({
+                        jobNumber: data.jobNumber,
+                        userName: data.userName,
+                        password: data.password
+                    });
+                } else {
+                    this.$messageBox('添加失败，存在相同工号的用户');
+                }
+            } else if (data && data.type === 'EDIT') {
+                const index = this.tableData.indexOf(this.tableData.find(elem => { return elem.jobNumber === data.jobNumber; }));
+                if (index >= 0) {
+                    this.tableData[index].password = data.password;
+                    this.tableData[index].userName = data.userName;
+                } else {
+                    this.$messageBox('修改失败');
+                }
+            } else if (data && data.type === 'DELETE') {
+                const index = this.tableData.indexOf(this.tableData.find(elem => { return elem.jobNumber === data.jobNumber; }));
+                if (index >= 0) {
+                    this.tableData.splice(index, 1);
+                } else {
+                    this.$messageBox('删除失败');
                 }
             }
         }
     }
+};
 </script>
 <style scoped>
     .beijing-01__systerm .el-dialog .base-label {

src/jmapNew/theme/beijing_01/menus/menuDialog/trainAdd.vue

@@ -1,154 +1,167 @@
 <template>
-    <el-dialog class="beijing-01__systerm stand-stop-time" :title="title" :visible.sync="show" width="320px"
-        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
-        <el-form size="small" label-width="100px" :model="addModel" :rules="rules" ref="form">
-            <div style="padding: 10px 15px; border: 1px double lightgray; margin: 20px 0px; height: 120px;">
-                <span class="base-label">添加位置</span>
-                <div style="position: relative; top:-10px;">
-                    <el-form-item prop="stationStandCode">
-                        <span slot="label">终&emsp;&emsp;&emsp;端:</span>
-                        <el-select v-model="addModel.stationStandCode" filterable placeholder="请选择">
-                            <el-option v-for="item in stationStandList" :key="item.code" :label="item.name"
-                                :value="item.code">
-                            </el-option>
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item label="前车车次号:" prop="trainNumberLimber">
-                        <el-input v-model="addModel.trainNumberLimber"></el-input>
-                    </el-form-item>
-                </div>
-            </div>
-            <el-form-item label="添加车次号:" label-width="115px" prop="groupNumber">
-                <el-input v-model="addModel.groupNumber"></el-input>
-            </el-form-item>
-        </el-form>
-        <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>
-            </el-col>
-            <el-col :span="8" :offset="4">
-                <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
-            </el-col>
-        </el-row>
-    </el-dialog>
+  <el-dialog
+    v-dialogDrag
+    class="beijing-01__systerm stand-stop-time"
+    :title="title"
+    :visible.sync="show"
+    width="320px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <el-form ref="form" size="small" label-width="100px" :model="addModel" :rules="rules">
+      <div style="padding: 10px 15px; border: 1px double lightgray; margin: 20px 0px; height: 120px;">
+        <span class="base-label">添加位置</span>
+        <div style="position: relative; top:-10px;">
+          <el-form-item prop="stationStandCode">
+            <span slot="label">终&emsp;&emsp;&emsp;端:</span>
+            <el-select v-model="addModel.stationStandCode" filterable placeholder="请选择">
+              <el-option
+                v-for="item in stationStandList"
+                :key="item.code"
+                :label="item.name"
+                :value="item.code"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="前车车次号:" prop="trainNumberLimber">
+            <el-input v-model="addModel.trainNumberLimber" />
+          </el-form-item>
+        </div>
+      </div>
+      <el-form-item label="添加车次号:" label-width="115px" prop="groupNumber">
+        <el-input v-model="addModel.groupNumber" />
+      </el-form-item>
+    </el-form>
+    <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>
+      </el-col>
+      <el-col :span="8" :offset="4">
+        <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
+      </el-col>
+    </el-row>
+  </el-dialog>
 </template>
 
 <script>
-    import { mapGetters } from 'vuex';
-    import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { mapGetters } from 'vuex';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
-    export default {
-        name: 'TrainAdd',
-        components: {
-        },
-        data() {
-            return {
-                trainNoList: [],
-                addModel: {
-                    groupNumber: '',
-                    stationStandCode: '',
-                    trainNumberLimber: '',
-                },
+export default {
+    name: 'TrainAdd',
+    components: {
+    },
+    data() {
+        return {
+            trainNoList: [],
+            addModel: {
+                groupNumber: '',
+                stationStandCode: '',
+                trainNumberLimber: ''
+            },
 
-                rules: {
-                    groupNumber: [
-                        { required: true, message: '请输入车次号', trigger: 'blur' }
-                    ],
-                    // trainNumberLimber: [
-                    //     { required: true, message: '请输入前车车次号', trigger: 'blur' }
-                    // ],
-                    stationStandCode: [
-                        { required: true, message: '请选择终端', trigger: 'change' }
-                    ],
-                },
-                operation: null,
-                dialogShow: false,
-                loading: false,
-            }
-        },
-        computed: {
-            ...mapGetters('map', [
-                'stationStandList'
-            ]),
-            show() {
-                return this.dialogShow && !this.$store.state.menuOperation.break;
+            rules: {
+                groupNumber: [
+                    { required: true, message: '请输入车次号', trigger: 'blur' }
+                ],
+                // trainNumberLimber: [
+                //     { required: true, message: '请输入前车车次号', trigger: 'blur' }
+                // ],
+                stationStandCode: [
+                    { required: true, message: '请选择终端', trigger: 'change' }
+                ]
             },
-            domIdCancel() {
-                return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-            },
-            domIdConfirm() {
-                return this.dialogShow ? OperationEvent.Command.planTrain.addPlanTrain.domId : '';
-            },
-            title() {
-                return '添加计划车'
-            }
+            operation: null,
+            dialogShow: false,
+            loading: false
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'stationStandList'
+        ]),
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
         },
-        mounted() {
-            this.$nextTick(() => {
-                this.$store.dispatch('training/tipReload');
-            })
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
         },
-        methods: {
-            doShow(operate) {
-                this.operate = operate || {};
-                this.operation = operate.operation;
+        domIdConfirm() {
+            return this.dialogShow ? OperationEvent.Command.planTrain.addPlanTrain.domId : '';
+        },
+        title() {
+            return '添加计划车';
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(operate) {
+            this.operate = operate || {};
+            this.operation = operate.operation;
 
-                //非断电激活时设置初始值
-                if (!this.dialogShow) {
-                    this.loading = false;
-                }
-
-                this.dialogShow = true;
-                this.$nextTick(function () {
-                    this.$store.dispatch('training/emitTipFresh');
-                });
-            },
-            doClose() {
+            // 非断电激活时设置初始值
+            if (!this.dialogShow) {
                 this.loading = false;
-                this.dialogShow = false;
-                this.$store.dispatch('training/emitTipFresh');
-            },
-            commit() {
-                this.$refs['form'].validate((valid) => {
-                    if (valid) {
-                        let operate = {
-                            send: true,
-                            type: MapDeviceType.Train.type,
-                            operation: OperationEvent.Command.planTrain.addPlanTrain.operation,
-                        }
-
-                        this.loading = true;
-                        this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                            this.loading = false;
-                            if (valid) {
-                                this.doClose();
-                            } else {
-                                // this.$refs.noticeInfo.doShow(operate);
-                            }
-                        }).catch(error => {
-                            this.loading = false;
-                            this.doClose();
-                            // this.$refs.noticeInfo.doShow(operate);
-                        })
-                    } else {
-                        return false;
-                    }
-                });
-            },
-            cancel() {
-                let operate = {
-                    type: MapDeviceType.Train.type,
-                    operation: OperationEvent.Command.cancel.menu.operation,
-                }
-
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.doClose();
-                    }
-                }).catch(error => { this.doClose(); });
             }
+
+            this.dialogShow = true;
+            this.$nextTick(function () {
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+        },
+        commit() {
+            this.$refs['form'].validate((valid) => {
+                if (valid) {
+                    const operate = {
+                        send: true,
+                        type: MapDeviceType.Train.type,
+                        operation: OperationEvent.Command.planTrain.addPlanTrain.operation
+                    };
+
+                    this.loading = true;
+                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                        this.loading = false;
+                        if (valid) {
+                            this.doClose();
+                        } else {
+                            // this.$refs.noticeInfo.doShow(operate);
+                        }
+                    }).catch(() => {
+                        this.loading = false;
+                        this.doClose();
+                        // this.$refs.noticeInfo.doShow(operate);
+                    });
+                } else {
+                    return false;
+                }
+            });
+        },
+        cancel() {
+            const operate = {
+                type: MapDeviceType.Train.type,
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
+
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => { this.doClose(); });
         }
     }
+};
 </script>
 <style scoped>
     .beijing-01__systerm .el-dialog .base-label {

src/jmapNew/theme/beijing_01/menus/menuDialog/trainDelete.vue

@@ -1,141 +1,149 @@
 <template>
-    <el-dialog class="beijing-01__systerm stand-stop-time" :title="title" :visible.sync="show" width="320px"
-        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
-        <el-form size="small" label-width="100px" :model="addModel" :rules="rules" ref="form">
-            <el-form-item prop="stationStandCode">
-                <span slot="label">终&emsp;&emsp;端:</span>
-                <el-select v-model="addModel.stationStandCode" filterable placeholder="请选择">
-                    <el-option v-for="item in stationStandList" :key="item.code" :label="item.name" :value="item.code">
-                    </el-option>
-                </el-select>
-            </el-form-item>
-            <el-form-item label="车 次 号:" prop="groupNumber">
-                <el-input v-model="addModel.groupNumber"></el-input>
-            </el-form-item>
-        </el-form>
-        <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>
-            </el-col>
-            <el-col :span="8" :offset="4">
-                <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
-            </el-col>
-        </el-row>
-    </el-dialog>
+  <el-dialog
+    v-dialogDrag
+    class="beijing-01__systerm stand-stop-time"
+    :title="title"
+    :visible.sync="show"
+    width="320px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <el-form ref="form" size="small" label-width="100px" :model="addModel" :rules="rules">
+      <el-form-item prop="stationStandCode">
+        <span slot="label">终&emsp;&emsp;端:</span>
+        <el-select v-model="addModel.stationStandCode" filterable placeholder="请选择">
+          <el-option v-for="item in stationStandList" :key="item.code" :label="item.name" :value="item.code" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="车 次 号:" prop="groupNumber">
+        <el-input v-model="addModel.groupNumber" />
+      </el-form-item>
+    </el-form>
+    <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>
+      </el-col>
+      <el-col :span="8" :offset="4">
+        <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
+      </el-col>
+    </el-row>
+  </el-dialog>
 </template>
 
 <script>
-    import { mapGetters } from 'vuex';
-    import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { mapGetters } from 'vuex';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
-    export default {
-        name: 'TrainAdd',
-        components: {
-        },
-        data() {
-            return {
-                trainNoList: [],
-                addModel: {
-                    groupNumber: '',
-                    stationStandCode: '',
-                },
+export default {
+    name: 'TrainAdd',
+    components: {
+    },
+    data() {
+        return {
+            trainNoList: [],
+            addModel: {
+                groupNumber: '',
+                stationStandCode: ''
+            },
 
-                rules: {
-                    groupNumber: [
-                        { required: true, message: '请输入车次号', trigger: 'blur' }
-                    ],
-                    stationStandCode: [
-                        { required: true, message: '请选择终端', trigger: 'change' }
-                    ],
-                },
-                operation: null,
-                dialogShow: false,
-                loading: false,
-            }
-        },
-        computed: {
-            ...mapGetters('map', [
-                'stationStandList'
-            ]),
-            show() {
-                return this.dialogShow && !this.$store.state.menuOperation.break;
+            rules: {
+                groupNumber: [
+                    { required: true, message: '请输入车次号', trigger: 'blur' }
+                ],
+                stationStandCode: [
+                    { required: true, message: '请选择终端', trigger: 'change' }
+                ]
             },
-            domIdCancel() {
-                return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-            },
-            domIdConfirm() {
-                return this.dialogShow ? OperationEvent.Command.planTrain.delPlanTrain.domId : '';
-            },
-            title() {
-                return '删除计划车'
-            }
+            operation: null,
+            dialogShow: false,
+            loading: false
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'stationStandList'
+        ]),
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
         },
-        mounted() {
-            this.$nextTick(() => {
-                this.$store.dispatch('training/tipReload');
-            })
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
         },
-        methods: {
-            doShow(operate) {
-                this.operate = operate || {};
-                this.operation = operate.operation;
+        domIdConfirm() {
+            return this.dialogShow ? OperationEvent.Command.planTrain.delPlanTrain.domId : '';
+        },
+        title() {
+            return '删除计划车';
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(operate) {
+            this.operate = operate || {};
+            this.operation = operate.operation;
 
-                //非断电激活时设置初始值
-                if (!this.dialogShow) {
-                    this.loading = false;
-                }
-
-                this.dialogShow = true;
-                this.$nextTick(function () {
-                    this.$store.dispatch('training/emitTipFresh');
-                });
-            },
-            doClose() {
+            // 非断电激活时设置初始值
+            if (!this.dialogShow) {
                 this.loading = false;
-                this.dialogShow = false;
-                this.$store.dispatch('training/emitTipFresh');
-            },
-            commit() {
-                this.$refs['form'].validate((valid) => {
-                    if (valid) {
-                        let operate = {
-                            send: true,
-                            type: MapDeviceType.Train.type,
-                            operation: OperationEvent.Command.planTrain.delPlanTrain.operation,
-                        }
-
-                        this.loading = true;
-                        this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                            this.loading = false;
-                            if (valid) {
-                                this.doClose();
-                            } else {
-                                // this.$refs.noticeInfo.doShow(operate);
-                            }
-                        }).catch(error => {
-                            this.loading = false;
-                            this.doClose();
-                            // this.$refs.noticeInfo.doShow(operate);
-                        })
-                    } else {
-                        return false;
-                    }
-                });
-            },
-            cancel() {
-                let operate = {
-                    type: MapDeviceType.Train.type,
-                    operation: OperationEvent.Command.cancel.menu.operation,
-                }
-
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.doClose();
-                    }
-                }).catch(error => { this.doClose(); });
             }
+
+            this.dialogShow = true;
+            this.$nextTick(function () {
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+        },
+        commit() {
+            this.$refs['form'].validate((valid) => {
+                if (valid) {
+                    const operate = {
+                        send: true,
+                        type: MapDeviceType.Train.type,
+                        operation: OperationEvent.Command.planTrain.delPlanTrain.operation
+                    };
+
+                    this.loading = true;
+                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                        this.loading = false;
+                        if (valid) {
+                            this.doClose();
+                        } else {
+                            // this.$refs.noticeInfo.doShow(operate);
+                        }
+                    }).catch(() => {
+                        this.loading = false;
+                        this.doClose();
+                    });
+                } else {
+                    return false;
+                }
+            });
+        },
+        cancel() {
+            const operate = {
+                type: MapDeviceType.Train.type,
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
+
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => { this.doClose(); });
         }
     }
+};
 </script>
 <style scoped>
     .beijing-01__systerm .el-dialog .base-label {

src/jmapNew/theme/beijing_01/menus/menuDialog/trainTranstalet.vue

@@ -1,152 +1,165 @@
 <template>
-    <el-dialog class="beijing-01__systerm stand-stop-time" :title="title" :visible.sync="show" width="320px"
-        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
-        <el-form size="small" label-width="100px" :model="addModel" :rules="rules" ref="form">
-            <el-form-item label="车 次 号:" label-width="115px" prop="groupNumber">
-                <el-input v-model="addModel.groupNumber"></el-input>
-            </el-form-item>
-            <div style="padding: 10px 15px; border: 1px double lightgray; margin: 20px 0px; height: 120px;">
-                <span class="base-label">目的</span>
-                <div style="position: relative; top:-10px;">
-                    <el-form-item prop="stationStandCode">
-                        <span slot="label">终&emsp;&emsp;端:</span>
-                        <el-select v-model="addModel.stationStandCode" filterable placeholder="请选择">
-                            <el-option v-for="item in stationStandList" :key="item.code" :label="item.name"
-                                :value="item.code">
-                            </el-option>
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item label="车 次 号:" prop="trainNumberLimber">
-                        <el-input v-model="addModel.trainNumberLimber"></el-input>
-                    </el-form-item>
-                </div>
-            </div>
-        </el-form>
-        <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>
-            </el-col>
-            <el-col :span="8" :offset="4">
-                <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
-            </el-col>
-        </el-row>
-    </el-dialog>
+  <el-dialog
+    v-dialogDrag
+    class="beijing-01__systerm stand-stop-time"
+    :title="title"
+    :visible.sync="show"
+    width="320px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <el-form ref="form" size="small" label-width="100px" :model="addModel" :rules="rules">
+      <el-form-item label="车 次 号:" label-width="115px" prop="groupNumber">
+        <el-input v-model="addModel.groupNumber" />
+      </el-form-item>
+      <div style="padding: 10px 15px; border: 1px double lightgray; margin: 20px 0px; height: 120px;">
+        <span class="base-label">目的</span>
+        <div style="position: relative; top:-10px;">
+          <el-form-item prop="stationStandCode">
+            <span slot="label">终&emsp;&emsp;端:</span>
+            <el-select v-model="addModel.stationStandCode" filterable placeholder="请选择">
+              <el-option
+                v-for="item in stationStandList"
+                :key="item.code"
+                :label="item.name"
+                :value="item.code"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="车 次 号:" prop="trainNumberLimber">
+            <el-input v-model="addModel.trainNumberLimber" />
+          </el-form-item>
+        </div>
+      </div>
+    </el-form>
+    <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>
+      </el-col>
+      <el-col :span="8" :offset="4">
+        <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
+      </el-col>
+    </el-row>
+  </el-dialog>
 </template>
 
 <script>
-    import { mapGetters } from 'vuex';
-    import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { mapGetters } from 'vuex';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
-    export default {
-        name: 'TrainTranstalet',
-        components: {
-        },
-        data() {
-            return {
-                trainNoList: [],
-                addModel: {
-                    groupNumber: '',
-                    stationStandCode: '',
-                    trainNumberLimber: '',
-                },
+export default {
+    name: 'TrainTranstalet',
+    components: {
+    },
+    data() {
+        return {
+            trainNoList: [],
+            addModel: {
+                groupNumber: '',
+                stationStandCode: '',
+                trainNumberLimber: ''
+            },
 
-                rules: {
-                    groupNumber: [
-                        { required: true, message: '请输入车次号', trigger: 'blur' }
-                    ],
-                    trainNumberLimber: [
-                        { required: true, message: '请输入前车车次号', trigger: 'blur' }
-                    ],
-                    stationStandCode: [
-                        { required: true, message: '请选择终端', trigger: 'change' }
-                    ],
-                },
-                operation: null,
-                dialogShow: false,
-                loading: false,
-            }
-        },
-        computed: {
-            ...mapGetters('map', [
-                'stationStandList'
-            ]),
-            show() {
-                return this.dialogShow && !this.$store.state.menuOperation.break;
+            rules: {
+                groupNumber: [
+                    { required: true, message: '请输入车次号', trigger: 'blur' }
+                ],
+                trainNumberLimber: [
+                    { required: true, message: '请输入前车车次号', trigger: 'blur' }
+                ],
+                stationStandCode: [
+                    { required: true, message: '请选择终端', trigger: 'change' }
+                ]
             },
-            domIdCancel() {
-                return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-            },
-            domIdConfirm() {
-                return this.dialogShow ? OperationEvent.Command.planTrain.translatPlanTrain.domId : '';
-            },
-            title() {
-                return '平移计划车'
-            }
+            operation: null,
+            dialogShow: false,
+            loading: false
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'stationStandList'
+        ]),
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
         },
-        mounted() {
-            this.$nextTick(() => {
-                this.$store.dispatch('training/tipReload');
-            })
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
         },
-        methods: {
-            doShow(operate) {
-                this.operate = operate || {};
-                this.operation = operate.operation;
+        domIdConfirm() {
+            return this.dialogShow ? OperationEvent.Command.planTrain.translatPlanTrain.domId : '';
+        },
+        title() {
+            return '平移计划车';
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(operate) {
+            this.operate = operate || {};
+            this.operation = operate.operation;
 
-                //非断电激活时设置初始值
-                if (!this.dialogShow) {
-                    this.loading = false;
-                }
-
-                this.dialogShow = true;
-                this.$nextTick(function () {
-                    this.$store.dispatch('training/emitTipFresh');
-                });
-            },
-            doClose() {
+            // 非断电激活时设置初始值
+            if (!this.dialogShow) {
                 this.loading = false;
-                this.dialogShow = false;
-                this.$store.dispatch('training/emitTipFresh');
-            },
-            commit() {
-                this.$refs['form'].validate((valid) => {
-                    if (valid) {
-                        let operate = {
-                            send: true,
-                            type: MapDeviceType.Train.type,
-                            operation: OperationEvent.Command.planTrain.translatPlanTrain.operation,
-                        }
-
-                        this.loading = true;
-                        this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                            this.loading = false;
-                            if (valid) {
-                                this.doClose();
-                            } else {
-                                // this.$refs.noticeInfo.doShow(operate);
-                            }
-                        }).catch(error => {
-                            this.loading = false;
-                            this.doClose();
-                            // this.$refs.noticeInfo.doShow(operate);
-                        })
-                    } else {
-                        return false;
-                    }
-                });
-            },
-            cancel() {
-                let operate = {
-                    type: MapDeviceType.Train.type,
-                    operation: OperationEvent.Command.cancel.menu.operation,
-                }
-
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.doClose();
-                    }
-                }).catch(error => { this.doClose(); });
             }
+
+            this.dialogShow = true;
+            this.$nextTick(function () {
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+        },
+        commit() {
+            this.$refs['form'].validate((valid) => {
+                if (valid) {
+                    const operate = {
+                        send: true,
+                        type: MapDeviceType.Train.type,
+                        operation: OperationEvent.Command.planTrain.translatPlanTrain.operation
+                    };
+
+                    this.loading = true;
+                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                        this.loading = false;
+                        if (valid) {
+                            this.doClose();
+                        } else {
+                            // this.$refs.noticeInfo.doShow(operate);
+                        }
+                    }).catch(() => {
+                        this.loading = false;
+                        this.doClose();
+                        // this.$refs.noticeInfo.doShow(operate);
+                    });
+                } else {
+                    return false;
+                }
+            });
+        },
+        cancel() {
+            const operate = {
+                type: MapDeviceType.Train.type,
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
+
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => { this.doClose(); });
         }
     }
+};
 </script>

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

@@ -249,22 +249,6 @@ export default {
                 }
             });
         },
-        // 强制取消扣车
-        // cancelDetainTrainForce() {
-        //     const operate = {
-        //         start: true,
-        //         code: this.selected.code,
-        //         type: MapDeviceType.StationStand.type,
-        //         label: MapDeviceType.StationStand.label,
-        //         operation: OperationEvent.StationStand.cancelDetainTrainForce.menu.operation
-        //     };
-        //     this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-        //         if (valid) {
-        //             this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-        //             this.$refs.standControl.doShow(operate, this.selected);
-        //         }
-        //     });
-        // },
         // 设置跳停
         setJumpStop() {
             commitOperate(menuOperate.StationStand.setJumpStop, {standCode:this.selected.code}, 0).then(({ valid, operate })=>{

src/jmapNew/theme/beijing_01/menus/passiveDialog/alarm.vue

@@ -83,7 +83,7 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
 export default {
     name: 'AlarmDetail',

src/jmapNew/theme/beijing_01/menus/passiveDialog/timeout.vue

@@ -18,7 +18,7 @@
 </template>
 
 <script>
-import { OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 export default {
     name: 'CmdNotice',
     data() {

src/jmapNew/theme/chengdu_01/menus/menuStation.vue

@@ -11,7 +11,6 @@ import PopMenu from '@/components/PopMenu';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 import CancelMouseState from '@/mixin/CancelMouseState';
 import { mapGetters } from 'vuex';
-import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
 import SetFault from '@/jmapNew/theme/components/menus/dialog/setFault';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';

src/jmapNew/theme/chengdu_03/menus/dialog/trainSwitch.vue

@@ -1,188 +1,205 @@
 <template>
-    <el-dialog class="chengdou-03__systerm stand-stop-time" :title="title" :visible.sync="show" width="640px"
-        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
-        <el-form size="small" label-width="80px" :model="addModel" :rules="rules" ref="form">
-            <div style="overflow: hidden;">
-                <div
-                    style="width: 48%; float: left; padding: 10px 15px; border: 1px double lightgray; margin: 20px 0px; height: 177px; margin-right: 4%;">
-                    <span class="base-label">源车次窗</span>
-                    <div style="position: relative; top:-10px;">
-                        <el-form-item label="车 组 号:" prop="trainNumberSource">
-                            <el-input v-model="addModel.trainNumberSource"></el-input>
-                        </el-form-item>
-                        <el-form-item prop="stationStandSource">
-                            <span slot="label">车&emsp; 站:</span>
-                            <el-select v-model="addModel.stationStandSource" filterable placeholder="请选择">
-                                <el-option v-for="item in stationStandList" :key="item.code" :label="item.name"
-                                    :value="item.code">
-                                </el-option>
-                            </el-select>
-                        </el-form-item>
-                        <el-form-item label="车 次 窗:" prop="trainSource">
-                            <el-input v-model="addModel.trainSource"></el-input>
-                        </el-form-item>
-                    </div>
-                </div>
-                <div
-                    style="width: 48%; float: left; padding: 10px 15px; border: 1px double lightgray; margin: 20px 0px; height: 177px;">
-                    <span class="base-label">目的车次窗</span>
-                    <div style="position: relative; top:-10px;">
-                        <el-form-item label="车 组 号:" prop="trainNumberGoal">
-                            <el-input v-model="addModel.trainNumberGoal"></el-input>
-                        </el-form-item>
-                        <el-form-item prop="stationStandGoal">
-                            <span slot="label">车&emsp; 站:</span>
-                            <el-select v-model="addModel.stationStandGoal" filterable placeholder="请选择">
-                                <el-option v-for="item in stationStandList" :key="item.code" :label="item.name"
-                                    :value="item.code">
-                                </el-option>
-                            </el-select>
-                        </el-form-item>
-                        <el-form-item label="车 次 窗:" prop="trainGoal">
-                            <el-input v-model="addModel.trainGoal"></el-input>
-                        </el-form-item>
-                    </div>
-                </div>
-            </div>
-        </el-form>
-        <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>
-            </el-col>
-            <el-col :span="8" :offset="4">
-                <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
-            </el-col>
-        </el-row>
-    </el-dialog>
+  <el-dialog
+    v-dialogDrag
+    class="chengdou-03__systerm stand-stop-time"
+    :title="title"
+    :visible.sync="show"
+    width="640px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <el-form ref="form" size="small" label-width="80px" :model="addModel" :rules="rules">
+      <div style="overflow: hidden;">
+        <div
+          style="width: 48%; float: left; padding: 10px 15px; border: 1px double lightgray; margin: 20px 0px; height: 177px; margin-right: 4%;"
+        >
+          <span class="base-label">源车次窗</span>
+          <div style="position: relative; top:-10px;">
+            <el-form-item label="车 组 号:" prop="trainNumberSource">
+              <el-input v-model="addModel.trainNumberSource" />
+            </el-form-item>
+            <el-form-item prop="stationStandSource">
+              <span slot="label">车&emsp; 站:</span>
+              <el-select v-model="addModel.stationStandSource" filterable placeholder="请选择">
+                <el-option
+                  v-for="item in stationStandList"
+                  :key="item.code"
+                  :label="item.name"
+                  :value="item.code"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="车 次 窗:" prop="trainSource">
+              <el-input v-model="addModel.trainSource" />
+            </el-form-item>
+          </div>
+        </div>
+        <div
+          style="width: 48%; float: left; padding: 10px 15px; border: 1px double lightgray; margin: 20px 0px; height: 177px;"
+        >
+          <span class="base-label">目的车次窗</span>
+          <div style="position: relative; top:-10px;">
+            <el-form-item label="车 组 号:" prop="trainNumberGoal">
+              <el-input v-model="addModel.trainNumberGoal" />
+            </el-form-item>
+            <el-form-item prop="stationStandGoal">
+              <span slot="label">车&emsp; 站:</span>
+              <el-select v-model="addModel.stationStandGoal" filterable placeholder="请选择">
+                <el-option
+                  v-for="item in stationStandList"
+                  :key="item.code"
+                  :label="item.name"
+                  :value="item.code"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="车 次 窗:" prop="trainGoal">
+              <el-input v-model="addModel.trainGoal" />
+            </el-form-item>
+          </div>
+        </div>
+      </div>
+    </el-form>
+    <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>
+      </el-col>
+      <el-col :span="8" :offset="4">
+        <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
+      </el-col>
+    </el-row>
+  </el-dialog>
 </template>
 
 <script>
-    import { mapGetters } from 'vuex';
-    import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
-    import CancelMouseState from '@/mixin/CancelMouseState';
+import { mapGetters } from 'vuex';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import CancelMouseState from '@/mixin/CancelMouseState';
 
-    export default {
-        name: 'TrainSwitch',
-        mixins: [
-            CancelMouseState
-        ],
-        data() {
-            return {
-                trainNoList: [],
-                selected: null,
-                addModel: {
-                    trainNumberSource: '',
-                    trainSource: '',
-                    stationStandSource: '',
-                    trainGoal: '',
-                    stationStandGoal: '',
-                    trainNumberGoal: '',
-                },
+export default {
+    name: 'TrainSwitch',
+    mixins: [
+        CancelMouseState
+    ],
+    data() {
+        return {
+            trainNoList: [],
+            selected: null,
+            addModel: {
+                trainNumberSource: '',
+                trainSource: '',
+                stationStandSource: '',
+                trainGoal: '',
+                stationStandGoal: '',
+                trainNumberGoal: ''
+            },
+
+            rules: {
+                trainNumberSource: [
+                    { required: true, message: '请输入车组号', trigger: 'blur' }
+                ],
+                trainSource: [
+                    { required: true, message: '请输入车次号', trigger: 'blur' }
+                ],
+                stationStandSource: [
+                    { required: true, message: '请选择车站', trigger: 'change' }
+                ],
+                trainNumberGoal: [
+                    { required: true, message: '请输入车组号', trigger: 'blur' }
+                ],
+                trainGoal: [
+                    { required: true, message: '请输入车次号', trigger: 'blur' }
+                ],
+                stationStandGoal: [
+                    { required: true, message: '请选择车站', trigger: 'change' }
+                ]
+            },
+            dialogShow: false,
+            loading: false
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'stationStandList'
+        ]),
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
+        },
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+        },
+        domIdConfirm() {
+            return this.dialogShow ? OperationEvent.Train.moveTrainId.menu.domId : '';
+        },
+        title() {
+            return '移动列车识别号';
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(operate, selected) {
+            this.selected = selected;
+            // 如果不是断点激活，则需要对初始值进行初始化
+            if (!this.dialogShow) {
 
-                rules: {
-                    trainNumberSource: [
-                        { required: true, message: '请输入车组号', trigger: 'blur' }
-                    ],
-                    trainSource: [
-                        { required: true, message: '请输入车次号', trigger: 'blur' }
-                    ],
-                    stationStandSource: [
-                        { required: true, message: '请选择车站', trigger: 'change' }
-                    ],
-                    trainNumberGoal: [
-                        { required: true, message: '请输入车组号', trigger: 'blur' }
-                    ],
-                    trainGoal: [
-                        { required: true, message: '请输入车次号', trigger: 'blur' }
-                    ],
-                    stationStandGoal: [
-                        { required: true, message: '请选择车站', trigger: 'change' }
-                    ],
-                },
-                dialogShow: false,
-                loading: false,
             }
-        },
-        computed: {
-            ...mapGetters('map', [
-                'stationStandList'
-            ]),
-            show() {
-                return this.dialogShow && !this.$store.state.menuOperation.break;
-            },
-            domIdCancel() {
-                return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-            },
-            domIdConfirm() {
-                return this.dialogShow ? OperationEvent.Train.moveTrainId.menu.domId : '';
-            },
-            title() {
-                return '移动列车识别号'
-            }
-        },
-        mounted() {
-            this.$nextTick(() => {
-                this.$store.dispatch('training/tipReload');
-            })
-        },
-        methods: {
-            doShow(operate, selected) {
-                this.selected = selected;
-                //如果不是断点激活，则需要对初始值进行初始化
-                if (!this.dialogShow) {
-
-                }
-                this.dialogShow = true;
-                this.$nextTick(function () {
-                    this.$store.dispatch('training/emitTipFresh');
-                });
-            },
-            doClose() {
-                this.loading = false;
-                this.dialogShow = false;
+            this.dialogShow = true;
+            this.$nextTick(function () {
                 this.$store.dispatch('training/emitTipFresh');
-                this.$store.dispatch('map/setTrainWindowShow', false);
-                this.mouseCancelState(this.selected);
-            },
-            commit() {
-                this.$refs['form'].validate((valid) => {
-                    if (valid) {
-                        let operate = {
-                            send: true,
+            });
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+            this.$store.dispatch('map/setTrainWindowShow', false);
+            this.mouseCancelState(this.selected);
+        },
+        commit() {
+            this.$refs['form'].validate((valid) => {
+                if (valid) {
+                    const operate = {
+                        send: true,
 
-                            operation: OperationEvent.Train.moveTrainId.menu.operation,
-                        }
+                        operation: OperationEvent.Train.moveTrainId.menu.operation
+                    };
 
-                        this.loading = true;
-                        this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                            this.loading = false;
-                            if (valid) {
-                                this.doClose();
-                            }
-                        }).catch(error => {
-                            this.loading = false;
+                    this.loading = true;
+                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                        this.loading = false;
+                        if (valid) {
                             this.doClose();
-                            // this.$refs.noticeInfo.doShow(operate);
-                        })
-                    } else {
-                        return false;
-                    }
-                });
-            },
-            cancel() {
-                let operate = {
-
-                    operation: OperationEvent.Command.cancel.menu.operation,
-                }
-
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                    if (valid) {
+                        }
+                    }).catch(error => {
+                        this.loading = false;
                         this.doClose();
-                    }
-                }).catch(error => { this.doClose(); });
-            }
+                        // this.$refs.noticeInfo.doShow(operate);
+                    });
+                } else {
+                    return false;
+                }
+            });
+        },
+        cancel() {
+            const operate = {
+
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
+
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(error => { this.doClose(); });
         }
     }
+};
 </script>
 <style scoped>
     .chengdou-03__systerm .el-dialog .base-label {

src/jmapNew/theme/chengdu_03/menus/menuDialog/setLimitSpeed.vue

@@ -1,246 +1,264 @@
 <template>
-    <el-dialog class="chengdou-03__systerm stand-stop-time" :title="title" :visible.sync="show" width="800px"
-        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
-        <el-row>
-            <el-col :span="14">
-                <div class="card-box">
-                    <span class="tip-label">请求</span>
-                    <el-row style="margin: 5px">
-                        <el-col :span="6" class="item-label">线路选择</el-col>
-                        <el-col :span="6">
-                            <el-select v-model="data.path">
-                                <el-option v-for="item in pathList" :key="item.value" :label="item.name"
-                                    :value="item.value">
-                                </el-option>
-                            </el-select>
-                        </el-col>
-                        <el-col :span="6" class="item-label">限制速度</el-col>
-                        <el-col :span="6">
-                            <el-select v-model="data.speed">
-                                <el-option v-for="item in speedList" :key="item.value" :label="item.name"
-                                    :value="item.value">
-                                </el-option>
-                            </el-select>
-                        </el-col>
-                    </el-row>
-                    <el-row>
-                        <el-col :span="6" class="item-label">起始公里标</el-col>
-                        <el-col :span="6">
-                            <el-input v-model="data.begKmPost"></el-input>
-                        </el-col>
-                        <el-col :span="6" class="item-label">结束公里标</el-col>
-                        <el-col :span="6">
-                            <el-input v-model="data.endKmPost"></el-input>
-                        </el-col>
-                    </el-row>
-                    <el-row>
-                        <el-col :span="6" class="item-label">限速区段长度</el-col>
-                        <el-col :span="6">
-                            <el-input v-model="data.length"></el-input>
-                        </el-col>
-                        <el-col :span="3">
-                            <el-button>查看</el-button>
-                        </el-col>
-                        <el-col :span="3">
-                            <el-button>请求</el-button>
-                        </el-col>
-                    </el-row>
-                </div>
-                <div class="card-box">
-                    <span class="tip-label">执行</span>
-                    <el-row style="margin: 5px">
-                        <el-col :span="6" class="item-label">线路选择</el-col>
-                        <el-col :span="6">
-                            <el-select v-model="form.path">
-                                <el-option v-for="item in pathList" :key="item.value" :label="item.name"
-                                    :value="item.value">
-                                </el-option>
-                            </el-select>
-                        </el-col>
-                        <el-col :span="6" class="item-label">限制速度</el-col>
-                        <el-col :span="6">
-                            <el-select v-model="form.speed">
-                                <el-option v-for="item in speedList" :key="item.value" :label="item.name"
-                                    :value="item.value">
-                                </el-option>
-                            </el-select>
-                        </el-col>
-                    </el-row>
-                    <el-row>
-                        <el-col :span="6" class="item-label">起始公里标</el-col>
-                        <el-col :span="6">
-                            <el-input v-model="form.begKmPost"></el-input>
-                        </el-col>
-                        <el-col :span="6" class="item-label">结束公里标</el-col>
-                        <el-col :span="6">
-                            <el-input v-model="form.endKmPost"></el-input>
-                        </el-col>
-                    </el-row>
-                    <el-row>
-                        <el-col :span="6" class="item-label">限速区段长度</el-col>
-                        <el-col :span="6">
-                            <el-input v-model="form.length"></el-input>
-                        </el-col>
-                        <el-col :span="3">
-                            <el-button>查看</el-button>
-                        </el-col>
-                        <el-col :span="3">
-                            <el-button>请求</el-button>
-                        </el-col>
-                    </el-row>
-                </div>
-                <div class="card-box">
-                    <span class="tip-label">操作提示</span>
-                    11111113
-                </div>
+  <el-dialog
+    v-dialogDrag
+    class="chengdou-03__systerm stand-stop-time"
+    :title="title"
+    :visible.sync="show"
+    width="800px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <el-row>
+      <el-col :span="14">
+        <div class="card-box">
+          <span class="tip-label">请求</span>
+          <el-row style="margin: 5px">
+            <el-col :span="6" class="item-label">线路选择</el-col>
+            <el-col :span="6">
+              <el-select v-model="data.path">
+                <el-option
+                  v-for="item in pathList"
+                  :key="item.value"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
             </el-col>
-            <el-col :span="9" :offset="1">
-                <div class="card-box">
-                    <span class="tip-label">设备列表</span>
-                    <el-table class="card-table" :data="deviceData" border style="width: 100%" height="300">
-                        <el-table-column prop="stationName" label="站名">
-                        </el-table-column>
-                        <el-table-column prop="deviceCode" label="设备号">
-                        </el-table-column>
-                        <el-table-column prop="deviceName" label="设备名">
-                        </el-table-column>
-                    </el-table>
-                </div>
+            <el-col :span="6" class="item-label">限制速度</el-col>
+            <el-col :span="6">
+              <el-select v-model="data.speed">
+                <el-option
+                  v-for="item in speedList"
+                  :key="item.value"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
             </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>
+          </el-row>
+          <el-row>
+            <el-col :span="6" class="item-label">起始公里标</el-col>
+            <el-col :span="6">
+              <el-input v-model="data.begKmPost" />
             </el-col>
-            <el-col :span="8" :offset="4">
-                <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
+            <el-col :span="6" class="item-label">结束公里标</el-col>
+            <el-col :span="6">
+              <el-input v-model="data.endKmPost" />
             </el-col>
-        </el-row>
-    </el-dialog>
+          </el-row>
+          <el-row>
+            <el-col :span="6" class="item-label">限速区段长度</el-col>
+            <el-col :span="6">
+              <el-input v-model="data.length" />
+            </el-col>
+            <el-col :span="3">
+              <el-button>查看</el-button>
+            </el-col>
+            <el-col :span="3">
+              <el-button>请求</el-button>
+            </el-col>
+          </el-row>
+        </div>
+        <div class="card-box">
+          <span class="tip-label">执行</span>
+          <el-row style="margin: 5px">
+            <el-col :span="6" class="item-label">线路选择</el-col>
+            <el-col :span="6">
+              <el-select v-model="form.path">
+                <el-option
+                  v-for="item in pathList"
+                  :key="item.value"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-col>
+            <el-col :span="6" class="item-label">限制速度</el-col>
+            <el-col :span="6">
+              <el-select v-model="form.speed">
+                <el-option
+                  v-for="item in speedList"
+                  :key="item.value"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="6" class="item-label">起始公里标</el-col>
+            <el-col :span="6">
+              <el-input v-model="form.begKmPost" />
+            </el-col>
+            <el-col :span="6" class="item-label">结束公里标</el-col>
+            <el-col :span="6">
+              <el-input v-model="form.endKmPost" />
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="6" class="item-label">限速区段长度</el-col>
+            <el-col :span="6">
+              <el-input v-model="form.length" />
+            </el-col>
+            <el-col :span="3">
+              <el-button>查看</el-button>
+            </el-col>
+            <el-col :span="3">
+              <el-button>请求</el-button>
+            </el-col>
+          </el-row>
+        </div>
+        <div class="card-box">
+          <span class="tip-label">操作提示</span>
+          11111113
+        </div>
+      </el-col>
+      <el-col :span="9" :offset="1">
+        <div class="card-box">
+          <span class="tip-label">设备列表</span>
+          <el-table class="card-table" :data="deviceData" border style="width: 100%" height="300">
+            <el-table-column prop="stationName" label="站名" />
+            <el-table-column prop="deviceCode" label="设备号" />
+            <el-table-column prop="deviceName" label="设备名" />
+          </el-table>
+        </div>
+      </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>
+      </el-col>
+      <el-col :span="8" :offset="4">
+        <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
+      </el-col>
+    </el-row>
+  </el-dialog>
 </template>
 
 <script>
-    import { mapGetters } from 'vuex';
-    import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import { mapGetters } from 'vuex';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
-    export default {
-        name: 'TrainAdd',
-        components: {
-        },
-        data() {
-            return {
-                operation: null,
-                dialogShow: false,
-                loading: false,
-                data: {
-                    path: '',
-                    speed: '',
-                    begKmPost: '',
-                    endKmPost: '',
-                    length: '',
-                },
-                form: {
-                    path: '',
-                    speed: '',
-                    begKmPost: '',
-                    endKmPost: '',
-                    length: '',
-                },
-                pathList: [
-                    { name: '上行站线', value: '01' },
-                    { name: '下行站线', value: '02' }
-                ],
-                speedList: [
-                    { name: '10Km/h', value: '10' },
-                    { name: '15Km/h', value: '15' },
-                    { name: '20Km/h', value: '20' },
-                    { name: '25Km/h', value: '25' },
-                ],
-                deviceData: []
-            }
-        },
-        computed: {
-            ...mapGetters('map', [
-                'stationStandList'
-            ]),
-            show() {
-                return this.dialogShow && !this.$store.state.menuOperation.break;
+export default {
+    name: 'TrainAdd',
+    components: {
+    },
+    data() {
+        return {
+            operation: null,
+            dialogShow: false,
+            loading: false,
+            data: {
+                path: '',
+                speed: '',
+                begKmPost: '',
+                endKmPost: '',
+                length: ''
             },
-            domIdCancel() {
-                return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+            form: {
+                path: '',
+                speed: '',
+                begKmPost: '',
+                endKmPost: '',
+                length: ''
             },
-            domIdConfirm() {
-                return this.dialogShow ? OperationEvent.Command.planTrain.addPlanTrain.domId : '';
-            },
-            title() {
-                return '设置临时限速'
-            }
+            pathList: [
+                { name: '上行站线', value: '01' },
+                { name: '下行站线', value: '02' }
+            ],
+            speedList: [
+                { name: '10Km/h', value: '10' },
+                { name: '15Km/h', value: '15' },
+                { name: '20Km/h', value: '20' },
+                { name: '25Km/h', value: '25' }
+            ],
+            deviceData: []
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'stationStandList'
+        ]),
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
         },
-        mounted() {
-            this.$nextTick(() => {
-                this.$store.dispatch('training/tipReload');
-            })
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
         },
-        methods: {
-            doShow(operate) {
-                this.operate = operate || {};
-                this.operation = operate.operation;
+        domIdConfirm() {
+            return this.dialogShow ? OperationEvent.Command.planTrain.addPlanTrain.domId : '';
+        },
+        title() {
+            return '设置临时限速';
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(operate) {
+            this.operate = operate || {};
+            this.operation = operate.operation;
 
-                if (!this.dialogShow) {
-                    this.loading = false;
-                }
-
-                this.dialogShow = true;
-                this.$nextTick(function () {
-                    this.$store.dispatch('training/emitTipFresh');
-                });
-            },
-            doClose() {
+            if (!this.dialogShow) {
                 this.loading = false;
-                this.dialogShow = false;
-                this.$store.dispatch('training/emitTipFresh');
-            },
-            commit() {
-                this.$refs['form'].validate((valid) => {
-                    if (valid) {
-                        let operate = {
-                            send: true,
-
-                            operation: OperationEvent.Command.planTrain.addPlanTrain.operation,
-                        }
-
-                        this.loading = true;
-                        this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                            this.loading = false;
-                            if (valid) {
-                                this.doClose();
-                            } else {
-                                // this.$refs.noticeInfo.doShow(operate);
-                            }
-                        }).catch(error => {
-                            this.loading = false;
-                            this.doClose();
-                            // this.$refs.noticeInfo.doShow(operate);
-                        })
-                    } else {
-                        return false;
-                    }
-                });
-            },
-            cancel() {
-                let operate = {
-
-                    operation: OperationEvent.Command.cancel.menu.operation,
-                }
-
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.doClose();
-                    }
-                }).catch(error => { this.doClose(); });
             }
+
+            this.dialogShow = true;
+            this.$nextTick(function () {
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+        },
+        commit() {
+            this.$refs['form'].validate((valid) => {
+                if (valid) {
+                    const operate = {
+                        send: true,
+
+                        operation: OperationEvent.Command.planTrain.addPlanTrain.operation
+                    };
+
+                    this.loading = true;
+                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                        this.loading = false;
+                        if (valid) {
+                            this.doClose();
+                        } else {
+                            // this.$refs.noticeInfo.doShow(operate);
+                        }
+                    }).catch(error => {
+                        this.loading = false;
+                        this.doClose();
+                        // this.$refs.noticeInfo.doShow(operate);
+                    });
+                } else {
+                    return false;
+                }
+            });
+        },
+        cancel() {
+            const operate = {
+
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
+
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(error => { this.doClose(); });
         }
     }
+};
 </script>
 <style scoped>
     .chengdou-03__systerm .el-dialog .base-label {

src/jmapNew/theme/chengdu_03/menus/menuDialog/stationControlConvert.vue

@@ -66,7 +66,6 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { TrainingMode } from '@/scripts/ConstDic';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
 import TwoConfirmation from './childDialog/twoConfirmation';
@@ -114,16 +113,19 @@ export default {
             if (this.dialogShow) {
                 return OperationHandler.checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.forcedStationControl);
             }
+            return '';
         },
         isRequest() {
             if (this.dialogShow) {
                 return OperationHandler.checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.requestStationControl);
             }
+            return '';
         },
         isConter() {
             if (this.dialogShow) {
                 return OperationHandler.checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.requestCentralControl);
             }
+            return '';
         },
         domIdChoose() {
             if (this.dialogShow) {
@@ -135,6 +137,7 @@ export default {
                     return OperationEvent.StationControl.requestCentralControl.choose.domId;
                 }
             }
+            return '';
         },
         domIdConter() {
             return this.dialogShow ? OperationEvent.StationControl.requestCentralControl.menu.domId : '';
@@ -358,7 +361,7 @@ export default {
                 } else {
                     this.disabledSure = false;
                 }
-            }).catch((error) => {
+            }).catch(() => {
                 this.disabledSure = false;
                 this.disabledClose = false;
             });

src/jmapNew/theme/chengdu_03/menus/menuTool.vue

@@ -19,9 +19,6 @@
   </div>
 </template>
 <script>
-// import { mapGetters } from 'vuex';
-// import { TrainingMode, OperationEvent, DeviceMenu } from '@/scripts/ConstDic';
-// import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler'
 import { prefixIntrger } from '@/utils/date';
 import SystemTime from '@/views/components/systemTime/index';
 import logo_ from '@/assets/logo_.png';

src/jmapNew/theme/components/menus/childDialog/confirmControl.vue

@@ -30,7 +30,7 @@
 </template>
 
 <script>
-import { OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import NoticeInfo from './noticeInfo';
 import { commitOperate } from '../../utils/menuOperate';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';

src/jmapNew/theme/components/menus/childDialog/confirmTip.vue

@@ -27,7 +27,6 @@
 </template>
 
 <script>
-// import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
 
 export default {
     name: 'ConfirmTip',

src/jmapNew/theme/components/menus/childDialog/noticeInfo.vue

@@ -26,7 +26,7 @@
 </template>
 
 <script>
-import { OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
 export default {
     name: 'NoticeInfo',

src/jmapNew/theme/components/menus/childDialog/selectStation.vue

@@ -28,7 +28,6 @@
 </template>
 
 <script>
-// import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
 
 export default {
     name: '',

src/jmapNew/theme/components/menus/dialog/cancelAllLimit.vue

@@ -82,7 +82,7 @@
 </template>
 
 <script>
-import { OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import ConfirmTip from '../childDialog/confirmTip';
 import { menuOperate } from '@/jmapNew/theme/components/utils/menuOperate';
 

src/jmapNew/theme/components/menus/passiveDialog/control.vue

@@ -60,7 +60,7 @@
 </template>
 
 <script>
-import {OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import {SimulationType} from '@/scripts/ConstDic';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import NoticeInfo from '../childDialog/noticeInfo';

src/jmapNew/theme/foshan_01/menus/dialog/allLineCancelLimit.vue

@@ -26,7 +26,7 @@
 </template>
 
 <script>
-import { OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 import { commitOperate } from '@/jmapNew/theme/components/utils/menuOperate';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';

src/jmapNew/theme/foshan_01/menus/dialog/cancelAllLimit.vue

@@ -82,7 +82,8 @@
 </template>
 
 <script>
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import ConfirmTip from './childDialog/confirmTip';
 
 export default {

src/jmapNew/theme/foshan_01/menus/dialog/childDialog/confirmControl.vue

@@ -29,7 +29,7 @@
 </template>
 
 <script>
-import { OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
 

src/jmapNew/theme/foshan_01/menus/dialog/childDialog/confirmSignalUnlock.vue

@@ -26,7 +26,8 @@
 </template>
 
 <script>
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
 export default {
     name: 'RouteUnlockConfirm',

src/jmapNew/theme/foshan_01/menus/dialog/standBackStrategy.vue

@@ -50,7 +50,8 @@
 <script>
 import ConfirmControl from './childDialog/confirmControl';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import { mapGetters } from 'vuex';
 
 export default {

src/jmapNew/theme/foshan_01/menus/dialog/stationCmdControl.vue

@@ -77,7 +77,8 @@
   </div>
 </template>
 <script>
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import { now } from '@/utils/date';
 
 export default {

src/jmapNew/theme/foshan_01/menus/dialog/stationHumanControlAll.vue

@@ -27,7 +27,8 @@
 </template>
 
 <script>
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 
 export default {

src/jmapNew/theme/foshan_01/menus/dialog/stationSetRouteControlAll.vue

@@ -39,7 +39,8 @@
 </template>
 
 <script>
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 
 export default {

src/jmapNew/theme/foshan_01/menus/dialog/trainDefine.vue

@@ -44,7 +44,8 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 
 export default {

src/jmapNew/theme/foshan_01/menus/dialog/trainDelete.vue

@@ -30,7 +30,8 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 // import { getPublishMapTrainNos } from '@/api/runplan';
 import ConfirmControl from './childDialog/confirmControl';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';

src/jmapNew/theme/foshan_01/menus/dialog/trainDeletePlan.vue

@@ -40,7 +40,8 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
 export default {
     name: 'TrainMove',

src/jmapNew/theme/foshan_01/menus/dialog/trainEdit.vue

@@ -44,7 +44,8 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 
 export default {

src/jmapNew/theme/foshan_01/menus/dialog/trainFlag.vue

@@ -40,7 +40,8 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 
 export default {

src/jmapNew/theme/foshan_01/menus/dialog/trainMove.vue

@@ -44,7 +44,8 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 
 export default {

src/jmapNew/theme/foshan_01/menus/dialog/trainMoveEvently.vue

@@ -49,7 +49,8 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
 export default {
     name: 'TrainMove',

src/jmapNew/theme/foshan_01/menus/dialog/trainSetHead.vue

@@ -44,7 +44,8 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 
 export default {

src/jmapNew/theme/foshan_01/menus/dialog/trainSetPlan.vue

@@ -45,7 +45,8 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 
 export default {

src/jmapNew/theme/foshan_01/menus/dialog/trainSetWork.vue

@@ -30,7 +30,8 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 
 export default {

src/jmapNew/theme/foshan_01/menus/dialog/trainSetWorkATP.vue

@@ -40,7 +40,8 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 
 export default {

src/jmapNew/theme/foshan_01/menus/menuBar.vue

@@ -100,8 +100,8 @@
 </template>
 <script>
 import { mapGetters } from 'vuex';
-import { TrainingMode, OperationEvent } from '@/scripts/ConstDic';
-// import { menuBarConvert, SystemType } from './utils/menuItemStatus';
+import { TrainingMode } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import StationControl from './menuDialog/stationControl';
 import DetainTrainContorl from './menuDialog/detainTrainContorl';
 import DetainTrainContorlUpDown from './menuDialog/detainTrainContorlUpDown';

src/jmapNew/theme/foshan_01/menus/menuDialog/childDialog/twoConfirmation.vue

@@ -30,7 +30,8 @@
 </template>
 
 <script>
-import { OperationEvent, checkOperationIsCurrentOperate } from '@/scripts/ConstDic';
+import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
 
@@ -53,11 +54,11 @@ export default {
             return this.dialogShow && !this.$store.state.menuOperation.break;
         },
         domIdConfirm() {
-            if (checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.emergencyStationControl)) {
+            if (OperationHandler.checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.emergencyStationControl)) {
                 return OperationEvent.StationControl.emergencyStationControl.confirm.domId;
-            } else if (checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.requestStationControl)) {
+            } else if (OperationHandler.checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.requestStationControl)) {
                 return OperationEvent.StationControl.requestStationControl.confirm.domId;
-            } else if (checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.requestCentralControl)) {
+            } else if (OperationHandler.checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.requestCentralControl)) {
                 return OperationEvent.StationControl.requestCentralControl.confirm.domId;
             }
             return '';

src/jmapNew/theme/foshan_01/menus/menuDialog/childDialog/userAdd.vue

@@ -41,7 +41,7 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
 export default {
     name: 'UserAdd',

src/jmapNew/theme/foshan_01/menus/menuDialog/childDialog/userDelete.vue

@@ -30,7 +30,7 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
 export default {
     name: 'UserDelete',

src/jmapNew/theme/foshan_01/menus/menuDialog/childDialog/userEdit.vue

@@ -44,7 +44,7 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
 export default {
     name: 'UserEdit',

src/jmapNew/theme/foshan_01/menus/menuDialog/detainTrainContorl.vue

@@ -27,7 +27,8 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 
 export default {

src/jmapNew/theme/foshan_01/menus/menuDialog/detainTrainContorlUpDown.vue

@@ -27,7 +27,8 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 
 export default {

src/jmapNew/theme/foshan_01/menus/menuDialog/helpAbout.vue

@@ -39,7 +39,7 @@
 </template>
 
 <script>
-import { OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
 export default {
     name: 'ManageUser',

src/jmapNew/theme/foshan_01/menus/menuDialog/manageUser.vue

@@ -70,7 +70,7 @@ import { mapGetters } from 'vuex';
 import UserAdd from './childDialog/userAdd';
 import UserEdit from './childDialog/userEdit';
 import UserDelete from './childDialog/userDelete';
-import { OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
 export default {
     name: 'ManageUser',

src/jmapNew/theme/foshan_01/menus/menuDialog/stationControl.vue

@@ -48,7 +48,7 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import TwoConfirmation from './childDialog/twoConfirmation';
 
 export default {

src/jmapNew/theme/foshan_01/menus/menuDialog/trainAdd.vue

@@ -47,7 +47,8 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
 export default {
     name: 'TrainAdd',

src/jmapNew/theme/foshan_01/menus/menuDialog/trainDelete.vue

@@ -34,7 +34,8 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
 export default {
     name: 'TrainAdd',

src/jmapNew/theme/foshan_01/menus/menuDialog/trainTranstalet.vue

@@ -47,7 +47,8 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
 export default {
     name: 'TrainTranstalet',

src/jmapNew/theme/foshan_01/menus/menuLimit.vue

@@ -10,7 +10,9 @@ import PopMenu from '@/components/PopMenu';
 import CancelAllLimit from './dialog/cancelAllLimit';
 import { mapGetters } from 'vuex';
 import { OperateMode } from '@/scripts/ConstDic';
-import { MapDeviceType, OperationEvent, DeviceMenu } from '@/scripts/ConstDic';
+import { DeviceMenu } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
 export default {
     name: 'MenuLimit',

src/jmapNew/theme/foshan_01/menus/menuStation.vue

@@ -18,7 +18,9 @@ import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo'
 import { mapGetters } from 'vuex';
 import { OperateMode } from '@/scripts/ConstDic';
 import SetFault from '@/jmapNew/theme/components/menus/dialog/setFault';
-import { MapDeviceType, OperationEvent, DeviceMenu } from '@/scripts/ConstDic';
+import { DeviceMenu } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
 

src/jmapNew/theme/foshan_01/menus/passiveDialog/alarm.vue

@@ -83,7 +83,7 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
 export default {
     name: 'AlarmDetail',

src/jmapNew/theme/ningbo_01/menus/dialog/childDialog/confirmControl.vue

@@ -29,7 +29,7 @@
 </template>
 
 <script>
-import { OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
 

src/jmapNew/theme/ningbo_01/menus/dialog/childDialog/confirmSignalUnlock.vue

@@ -26,7 +26,8 @@
 </template>
 
 <script>
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
 export default {
     name: 'RouteUnlockConfirm',

src/jmapNew/theme/ningbo_01/menus/dialog/childDialog/confirmTip.vue

@@ -26,8 +26,6 @@
 </template>
 
 <script>
-// import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
-
 export default {
     name: 'ConfirmTip',
     data() {

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

@@ -44,7 +44,8 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 import {mouseCancelState} from '@/jmapNew/theme/components/utils/menuItemStatus';
 

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

@@ -30,7 +30,8 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 // import { getPublishMapTrainNos } from '@/api/runplan';
 import ConfirmControl from './childDialog/confirmControl';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';

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

@@ -44,7 +44,8 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 import {mouseCancelState} from '@/jmapNew/theme/components/utils/menuItemStatus';
 

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

@@ -40,7 +40,8 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 import {mouseCancelState} from '@/jmapNew/theme/components/utils/menuItemStatus';
 

src/jmapNew/theme/ningbo_01/menus/menuBar.vue

@@ -99,7 +99,8 @@
 </template>
 <script>
 import { mapGetters } from 'vuex';
-import { TrainingMode, OperationEvent } from '@/scripts/ConstDic';
+import { TrainingMode } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import StationControl from './menuDialog/stationControl';
 import DetainTrainContorl from './menuDialog/detainTrainContorl';
 import DetainTrainContorlUpDown from './menuDialog/detainTrainContorlUpDown';

src/jmapNew/theme/ningbo_01/menus/menuDialog/childDialog/userAdd.vue

@@ -1,154 +1,164 @@
 <template>
-    <el-dialog class="ningbo-01__systerm user-add" :title="title" :visible.sync="show" width="420px"
-        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" append-to-body v-dialogDrag>
-        <div style="padding: 15px 40px; border: 1px double lightgray; margin: 20px 10px; ">
-            <el-form size="small" label-width="90px" :model="model" label-position="left" :rules="rules" ref="form">
-                <el-form-item label="工号:" prop="jobNumber">
-                    <el-input v-model="model.jobNumber"></el-input>
-                </el-form-item>
-                <el-form-item label="用户名:" prop="userName">
-                    <el-input v-model="model.userName"></el-input>
-                </el-form-item>
-                <el-form-item label="密码:" prop="password">
-                    <el-input type="password" v-model="model.password"></el-input>
-                </el-form-item>
-                <el-form-item label="确认密码:" prop="confirm">
-                    <el-input type="password" v-model="model.confirm"></el-input>
-                </el-form-item>
+  <el-dialog
+    v-dialogDrag
+    class="ningbo-01__systerm user-add"
+    :title="title"
+    :visible.sync="show"
+    width="420px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+    append-to-body
+  >
+    <div style="padding: 15px 40px; border: 1px double lightgray; margin: 20px 10px; ">
+      <el-form ref="form" size="small" label-width="90px" :model="model" label-position="left" :rules="rules">
+        <el-form-item label="工号:" prop="jobNumber">
+          <el-input v-model="model.jobNumber" />
+        </el-form-item>
+        <el-form-item label="用户名:" prop="userName">
+          <el-input v-model="model.userName" />
+        </el-form-item>
+        <el-form-item label="密码:" prop="password">
+          <el-input v-model="model.password" type="password" />
+        </el-form-item>
+        <el-form-item label="确认密码:" prop="confirm">
+          <el-input v-model="model.confirm" type="password" />
+        </el-form-item>
 
-            </el-form>
-        </div>
-        <el-row justify="center" class="button-group">
-            <el-col :span="8" :offset="6">
-                <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
-            </el-col>
-            <el-col :span="8" :offset="0">
-                <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
-            </el-col>
-        </el-row>
-    </el-dialog>
+      </el-form>
+    </div>
+    <el-row justify="center" class="button-group">
+      <el-col :span="8" :offset="6">
+        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
+      </el-col>
+      <el-col :span="8" :offset="0">
+        <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
+      </el-col>
+    </el-row>
+  </el-dialog>
 </template>
 
 <script>
-    import { mapGetters } from 'vuex';
-    import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { mapGetters } from 'vuex';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
-    export default {
-        name: 'UserAdd',
-        components: {
-        },
-        data() {
-            return {
-                operate: {},
-                operation: null,
-                dialogShow: false,
-                loading: false,
-                model: {
-                    type: 'ADD',
-                    jobNumber: '',
-                    userName: '',
-                    password: '',
-                    confirm: '',
-                },
-                rules: {
-                    jobNumber: [
-                        { required: true, message: '请输入工号', trigger: 'blur' }
-                    ],
-                    userName: [
-                        { required: true, message: '请输入用户名', trigger: 'blur' }
-                    ],
-                    password: [
-                        { required: true, message: '请输入密码', trigger: 'change' }
-                    ],
-                    confirm: [
-                        { required: true, message: '请再次输入密码', trigger: 'change' }
-                    ],
-                },
+export default {
+    name: 'UserAdd',
+    components: {
+    },
+    data() {
+        return {
+            operate: {},
+            operation: null,
+            dialogShow: false,
+            loading: false,
+            model: {
+                type: 'ADD',
+                jobNumber: '',
+                userName: '',
+                password: '',
+                confirm: ''
+            },
+            rules: {
+                jobNumber: [
+                    { required: true, message: '请输入工号', trigger: 'blur' }
+                ],
+                userName: [
+                    { required: true, message: '请输入用户名', trigger: 'blur' }
+                ],
+                password: [
+                    { required: true, message: '请输入密码', trigger: 'change' }
+                ],
+                confirm: [
+                    { required: true, message: '请再次输入密码', trigger: 'change' }
+                ]
             }
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'stationStandList'
+        ]),
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
         },
-        computed: {
-            ...mapGetters('map', [
-                'stationStandList'
-            ]),
-            show() {
-                return this.dialogShow && !this.$store.state.menuOperation.break;
-            },
-            domIdCancel() {
-                return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-            },
-            domIdConfirm() {
-                return this.dialogShow ? OperationEvent.Command.close.confirm.domId : '';
-            },
-            title() {
-                return '增加用户'
-            }
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
         },
-        mounted() {
-            this.$nextTick(() => {
-                this.$store.dispatch('training/tipReload');
-            })
+        domIdConfirm() {
+            return this.dialogShow ? OperationEvent.Command.close.confirm.domId : '';
         },
-        methods: {
-            doShow(operate) {
-                //非断电激活时设置初始值
-                if (!this.dialogShow) {
-                    this.loading = false;
-                    this.operate = operate || {};
-                    this.operation = operate.operation;
-                    this.$nextTick(() => {
-                        this.$refs.form.resetFields();
-                    });
-                }
-
-                this.dialogShow = true;
-                this.$nextTick(function () {
-                    this.$store.dispatch('training/emitTipFresh');
-                });
-            },
-            doClose() {
+        title() {
+            return '增加用户';
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(operate) {
+            // 非断电激活时设置初始值
+            if (!this.dialogShow) {
                 this.loading = false;
-                this.dialogShow = false;
-                this.$store.dispatch('training/emitTipFresh');
-            },
-            commit() {
-                this.$refs['form'].validate((valid) => {
-                    if (valid) {
-                        let operate = {
-                            type: this.operate.type,
-                            operation: OperationEvent.Command.close.confirm.operation,
-                        }
-
-                        this.loading = true;
-                        this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                            this.loading = false;
-                            if (valid) {
-                                if (this.model.password === this.model.confirm) {
-                                    this.doClose();
-                                    this.$emit('operateUser', this.model);
-                                } else {
-                                    this.$messageBox('二次输入密码不一致');
-                                }
-                            }
-                        })
-                    } else {
-                        return false;
-                    }
+                this.operate = operate || {};
+                this.operation = operate.operation;
+                this.$nextTick(() => {
+                    this.$refs.form.resetFields();
                 });
-            },
-            cancel() {
-                let operate = {
-                    type: this.operate.type,
-                    operation: OperationEvent.Command.cancel.menu.operation,
-                }
-
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.doClose();
-                    }
-                }).catch(error => { this.doClose(); this.model });
             }
+
+            this.dialogShow = true;
+            this.$nextTick(function () {
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+        },
+        commit() {
+            this.$refs['form'].validate((valid) => {
+                if (valid) {
+                    const operate = {
+                        type: this.operate.type,
+                        operation: OperationEvent.Command.close.confirm.operation
+                    };
+
+                    this.loading = true;
+                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                        this.loading = false;
+                        if (valid) {
+                            if (this.model.password === this.model.confirm) {
+                                this.doClose();
+                                this.$emit('operateUser', this.model);
+                            } else {
+                                this.$messageBox('二次输入密码不一致');
+                            }
+                        }
+                    });
+                } else {
+                    return false;
+                }
+            });
+        },
+        cancel() {
+            const operate = {
+                type: this.operate.type,
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
+
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => { this.doClose(); this.model; });
         }
     }
+};
 </script>
 <style scoped>
     .ningbo-01__systerm .el-dialog .base-label {

src/jmapNew/theme/ningbo_01/menus/menuDialog/childDialog/userDelete.vue

@@ -1,126 +1,136 @@
 <template>
-    <el-dialog class="ningbo-01__systerm user-delete" :title="title" :visible.sync="show" width="260px"
-        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" append-to-body v-dialogDrag>
-        <div style="padding-left: 10px; padding-bottom: 10px">
-            <i class="el-icon-info"></i>
-            <template v-for="(message, index) in messages">
-                <span :key="index">{{message}}</span>
-            </template>
-        </div>
-        <el-row justify="center" class="button-group">
-            <el-col :span="8" :offset="3">
-                <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
-            </el-col>
-            <el-col :span="8" :offset="2">
-                <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
-            </el-col>
-        </el-row>
-    </el-dialog>
+  <el-dialog
+    v-dialogDrag
+    class="ningbo-01__systerm user-delete"
+    :title="title"
+    :visible.sync="show"
+    width="260px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+    append-to-body
+  >
+    <div style="padding-left: 10px; padding-bottom: 10px">
+      <i class="el-icon-info" />
+      <template v-for="(message, index) in messages">
+        <span :key="index">{{ message }}</span>
+      </template>
+    </div>
+    <el-row justify="center" class="button-group">
+      <el-col :span="8" :offset="3">
+        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
+      </el-col>
+      <el-col :span="8" :offset="2">
+        <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
+      </el-col>
+    </el-row>
+  </el-dialog>
 </template>
 
 <script>
-    import { mapGetters } from 'vuex';
-    import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { mapGetters } from 'vuex';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
-    export default {
-        name: 'UserDelete',
-        components: {
-        },
-        data() {
-            return {
-                operate: {},
-                messages: [],
-                model: {
-                    type: 'DELETE',
-                    jobNumber: '',
-                    userName: '',
-                },
-                operation: null,
-                dialogShow: false,
-                loading: false,
-            }
-        },
-        computed: {
-            ...mapGetters('map', [
-                'stationStandList'
-            ]),
-            show() {
-                return this.dialogShow && !this.$store.state.menuOperation.break;
+export default {
+    name: 'UserDelete',
+    components: {
+    },
+    data() {
+        return {
+            operate: {},
+            messages: [],
+            model: {
+                type: 'DELETE',
+                jobNumber: '',
+                userName: ''
             },
-            domIdCancel() {
-                return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-            },
-            domIdConfirm() {
-                return this.dialogShow ? OperationEvent.Command.close.confirm.domId : '';
-            },
-            title() {
-                return '删除用户'
-            }
+            operation: null,
+            dialogShow: false,
+            loading: false
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'stationStandList'
+        ]),
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
         },
-        mounted() {
-            this.$nextTick(() => {
-                this.$store.dispatch('training/tipReload');
-            })
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
         },
-        methods: {
-            doShow(operate, selected) {
-                //非断电激活时设置初始值
-                if (!this.dialogShow) {
-                    this.loading = false;
-                    this.operate = operate || {};
-                    this.operation = operate.operation;
-                    this.messages = operate.messages;
-                    this.model.userName = '';
-                    this.model.jobNumber = '';
-                    if (selected) {
-                        this.model.userName = selected.userName;
-                        this.model.jobNumber = selected.jobNumber;
-                    }
-                }
-
-                this.dialogShow = true;
-                this.$nextTick(function () {
-                    this.$store.dispatch('training/emitTipFresh');
-                });
-            },
-            doClose() {
+        domIdConfirm() {
+            return this.dialogShow ? OperationEvent.Command.close.confirm.domId : '';
+        },
+        title() {
+            return '删除用户';
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(operate, selected) {
+            // 非断电激活时设置初始值
+            if (!this.dialogShow) {
                 this.loading = false;
-                this.dialogShow = false;
+                this.operate = operate || {};
+                this.operation = operate.operation;
+                this.messages = operate.messages;
+                this.model.userName = '';
+                this.model.jobNumber = '';
+                if (selected) {
+                    this.model.userName = selected.userName;
+                    this.model.jobNumber = selected.jobNumber;
+                }
+            }
+
+            this.dialogShow = true;
+            this.$nextTick(function () {
                 this.$store.dispatch('training/emitTipFresh');
-            },
-            commit() {
-                if (this.model.userName && this.model.jobNumber) {
-                    let operate = {
-                        type: this.operate.type,
-                        operation: OperationEvent.Command.close.confirm.operation,
-                    }
-
-                    this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                        this.loading = false;
-                        if (valid) {
-                            this.doClose();
-                            this.$emit('operateUser', this.model);
-                        }
-                    })
-                } else {
-                    this.$messageBox('选择的用户名或工号为空');
-                }
-            },
-            cancel() {
-                let operate = {
+            });
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+        },
+        commit() {
+            if (this.model.userName && this.model.jobNumber) {
+                const operate = {
                     type: this.operate.type,
-                    operation: OperationEvent.Command.cancel.menu.operation,
-                }
+                    operation: OperationEvent.Command.close.confirm.operation
+                };
 
+                this.loading = true;
                 this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.loading = false;
                     if (valid) {
                         this.doClose();
+                        this.$emit('operateUser', this.model);
                     }
-                }).catch(error => { this.doClose(); });
+                });
+            } else {
+                this.$messageBox('选择的用户名或工号为空');
             }
+        },
+        cancel() {
+            const operate = {
+                type: this.operate.type,
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
+
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => { this.doClose(); });
         }
     }
+};
 </script>
 <style scoped>
     .ningbo-01__systerm .el-dialog .base-label {

src/jmapNew/theme/ningbo_01/menus/menuDialog/childDialog/userEdit.vue

@@ -1,170 +1,181 @@
 <template>
-    <el-dialog class="ningbo-01__systerm user-edit" :title="title" :visible.sync="show" width="420px"
-        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" append-to-body v-dialogDrag>
-        <div style="padding: 15px 40px; border: 1px double lightgray; margin: 20px 10px; ">
-            <el-form size="small" label-width="90px" :model="model" label-position="left" :rules="rules" ref="form">
-                <el-form-item label="工号:" prop="jobNumber">
-                    <el-input v-model="model.jobNumber" disabled></el-input>
-                </el-form-item>
-                <el-form-item label="用户名:" prop="userName">
-                    <el-input v-model="model.userName" disabled></el-input>
-                </el-form-item>
-                <el-form-item label="原始密码:" prop="oldPassword">
-                    <el-input type="oldPassword" v-model="model.oldPassword"></el-input>
-                </el-form-item>
-                <el-form-item label="密码:" prop="password">
-                    <el-input type="password" v-model="model.password"></el-input>
-                </el-form-item>
-                <el-form-item label="确认密码:" prop="confirm">
-                    <el-input type="password" v-model="model.confirm"></el-input>
-                </el-form-item>
+  <el-dialog
+    v-dialogDrag
+    class="ningbo-01__systerm user-edit"
+    :title="title"
+    :visible.sync="show"
+    width="420px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+    append-to-body
+  >
+    <div style="padding: 15px 40px; border: 1px double lightgray; margin: 20px 10px; ">
+      <el-form ref="form" size="small" label-width="90px" :model="model" label-position="left" :rules="rules">
+        <el-form-item label="工号:" prop="jobNumber">
+          <el-input v-model="model.jobNumber" disabled />
+        </el-form-item>
+        <el-form-item label="用户名:" prop="userName">
+          <el-input v-model="model.userName" disabled />
+        </el-form-item>
+        <el-form-item label="原始密码:" prop="oldPassword">
+          <el-input v-model="model.oldPassword" type="oldPassword" />
+        </el-form-item>
+        <el-form-item label="密码:" prop="password">
+          <el-input v-model="model.password" type="password" />
+        </el-form-item>
+        <el-form-item label="确认密码:" prop="confirm">
+          <el-input v-model="model.confirm" type="password" />
+        </el-form-item>
 
-            </el-form>
-        </div>
-        <el-row justify="center" class="button-group">
-            <el-col :span="8" :offset="6">
-                <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
-            </el-col>
-            <el-col :span="8" :offset="0">
-                <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
-            </el-col>
-        </el-row>
-    </el-dialog>
+      </el-form>
+    </div>
+    <el-row justify="center" class="button-group">
+      <el-col :span="8" :offset="6">
+        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
+      </el-col>
+      <el-col :span="8" :offset="0">
+        <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
+      </el-col>
+    </el-row>
+  </el-dialog>
 </template>
 
 <script>
-    import { mapGetters } from 'vuex';
-    import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { mapGetters } from 'vuex';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
-    export default {
-        name: 'UserEdit',
-        components: {
-        },
-        data() {
-            return {
-                operate: {},
-                selected: {},
-                operation: null,
-                dialogShow: false,
-                loading: false,
-                model: {
-                    type: 'EDIT',
-                    jobNumber: '',
-                    userName: '',
-                    oldPassword: '',
-                    password: '',
-                    confirm: '',
-                },
-                rules: {
-                    jobNumber: [
-                        { required: true, message: '请输入工号', trigger: 'blur' }
-                    ],
-                    userName: [
-                        { required: true, message: '请输入用户名', trigger: 'blur' }
-                    ],
-                    oldPassword: [
-                        { required: true, message: '请输入原始密码', trigger: 'change' }
-                    ],
-                    password: [
-                        { required: true, message: '请输入新密码', trigger: 'change' }
-                    ],
-                    confirm: [
-                        { required: true, message: '请再次输入新密码', trigger: 'change' }
-                    ],
-                },
+export default {
+    name: 'UserEdit',
+    components: {
+    },
+    data() {
+        return {
+            operate: {},
+            selected: {},
+            operation: null,
+            dialogShow: false,
+            loading: false,
+            model: {
+                type: 'EDIT',
+                jobNumber: '',
+                userName: '',
+                oldPassword: '',
+                password: '',
+                confirm: ''
+            },
+            rules: {
+                jobNumber: [
+                    { required: true, message: '请输入工号', trigger: 'blur' }
+                ],
+                userName: [
+                    { required: true, message: '请输入用户名', trigger: 'blur' }
+                ],
+                oldPassword: [
+                    { required: true, message: '请输入原始密码', trigger: 'change' }
+                ],
+                password: [
+                    { required: true, message: '请输入新密码', trigger: 'change' }
+                ],
+                confirm: [
+                    { required: true, message: '请再次输入新密码', trigger: 'change' }
+                ]
             }
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'stationStandList'
+        ]),
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
         },
-        computed: {
-            ...mapGetters('map', [
-                'stationStandList'
-            ]),
-            show() {
-                return this.dialogShow && !this.$store.state.menuOperation.break;
-            },
-            domIdCancel() {
-                return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-            },
-            domIdConfirm() {
-                return this.dialogShow ? OperationEvent.Command.close.confirm.domId : '';
-            },
-            title() {
-                return '用户编辑页面'
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+        },
+        domIdConfirm() {
+            return this.dialogShow ? OperationEvent.Command.close.confirm.domId : '';
+        },
+        title() {
+            return '用户编辑页面';
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(operate, selected) {
+            // 非断电激活时设置初始值
+            if (!this.dialogShow) {
+                this.loading = false;
+                this.operate = operate || {};
+                this.operation = operate.operation;
+                this.$nextTick(() => {
+                    this.$refs.form.resetFields();
+                    this.selected = selected;
+                    if (selected) {
+                        this.model.jobNumber = selected.jobNumber;
+                        this.model.userName = selected.userName;
+                    }
+                });
             }
+
+            this.dialogShow = true;
+            this.$nextTick(function () {
+                this.$store.dispatch('training/emitTipFresh');
+            });
         },
-        mounted() {
-            this.$nextTick(() => {
-                this.$store.dispatch('training/tipReload');
-            })
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
         },
-        methods: {
-            doShow(operate, selected) {
-                //非断电激活时设置初始值
-                if (!this.dialogShow) {
-                    this.loading = false;
-                    this.operate = operate || {};
-                    this.operation = operate.operation;
-                    this.$nextTick(() => {
-                        this.$refs.form.resetFields();
-                        this.selected = selected;
-                        if (selected) {
-                            this.model.jobNumber = selected.jobNumber;
-                            this.model.userName = selected.userName;
+        commit() {
+            this.$refs['form'].validate((valid) => {
+                if (valid) {
+                    const operate = {
+                        type: this.operate.type,
+                        operation: OperationEvent.Command.close.confirm.operation
+                    };
+
+                    this.loading = true;
+                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                        this.loading = false;
+                        if (valid) {
+                            if (this.selected.password !== this.model.oldPassword) {
+                                this.$messageBox('原始密码错误');
+                            } else if (this.model.password !== this.model.confirm) {
+                                this.$messageBox('二次输入的密码错误');
+                            } else if (this.model.oldPassword === this.model.password) {
+                                this.$messageBox('老密码和新密相同');
+                            } else {
+                                this.doClose();
+                                this.$emit('operateUser', this.model);
+                            }
                         }
                     });
+                } else {
+                    return false;
                 }
+            });
+        },
+        cancel() {
+            const operate = {
+                type: this.operate.type,
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
 
-                this.dialogShow = true;
-                this.$nextTick(function () {
-                    this.$store.dispatch('training/emitTipFresh');
-                });
-            },
-            doClose() {
-                this.loading = false;
-                this.dialogShow = false;
-                this.$store.dispatch('training/emitTipFresh');
-            },
-            commit() {
-                this.$refs['form'].validate((valid) => {
-                    if (valid) {
-                        let operate = {
-                            type: this.operate.type,
-                            operation: OperationEvent.Command.close.confirm.operation,
-                        }
-
-                        this.loading = true;
-                        this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                            this.loading = false;
-                            if (valid)
-                                if (this.selected.password !== this.model.oldPassword) {
-                                    this.$messageBox('原始密码错误');
-                                } else if (this.model.password !== this.model.confirm) {
-                                    this.$messageBox('二次输入的密码错误');
-                                } else if (this.model.oldPassword === this.model.password) {
-                                    this.$messageBox('老密码和新密相同');
-                                } else {
-                                    this.doClose();
-                                    this.$emit('operateUser', this.model);
-                                }
-                        })
-                    } else {
-                        return false;
-                    }
-                });
-            },
-            cancel() {
-                let operate = {
-                    type: this.operate.type,
-                    operation: OperationEvent.Command.cancel.menu.operation,
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
                 }
-
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.doClose();
-                    }
-                }).catch(error => { this.doClose(); });
-            }
+            }).catch(() => { this.doClose(); });
         }
     }
+};
 </script>
 <style scoped>
     .ningbo-01__systerm .el-dialog .base-label {

src/jmapNew/theme/ningbo_01/menus/menuDialog/detainTrainContorl.vue

@@ -27,7 +27,8 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 
 export default {

src/jmapNew/theme/ningbo_01/menus/menuDialog/detainTrainContorlUpDown.vue

@@ -27,7 +27,8 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 
 export default {

src/jmapNew/theme/ningbo_01/menus/menuDialog/helpAbout.vue

@@ -1,123 +1,133 @@
 <template>
-    <el-dialog class="ningbo-01__systerm manage-user" :title="title" :visible.sync="show" width="600px" :before-close="doClose"
-        :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
-        <div style="height: 70px;">
-            <div style="position: relative; left: 10px;">
-            </div>
-            <div style="position: relative; left: 80px;">
-                <div style="width:100%">
-                    <span style="padding-left: 60px">ControlMonitor 1.3.5.0</span>
-                    <el-button style="position: absolute; right: 95px;" :id="domIdConfirm" type="primary"
-                        :loading="loading" @click="commit">确定</el-button>
-                </div>
-                <div style="width:100%; padding-top: 20px">
-                    <span> 版权所有（C）2010-2011 北京玖琏科技有限公司</span>
-                </div>
-            </div>
+  <el-dialog
+    v-dialogDrag
+    class="ningbo-01__systerm manage-user"
+    :title="title"
+    :visible.sync="show"
+    width="600px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <div style="height: 70px;">
+      <div style="position: relative; left: 10px;" />
+      <div style="position: relative; left: 80px;">
+        <div style="width:100%">
+          <span style="padding-left: 60px">ControlMonitor 1.3.5.0</span>
+          <el-button
+            :id="domIdConfirm"
+            style="position: absolute; right: 95px;"
+            type="primary"
+            :loading="loading"
+            @click="commit"
+          >确定</el-button>
         </div>
-        <div style="padding: 10px;  margin: 5px; ">
-            <el-table :data="tableData" style="width: 100%;" height="400">
-                <el-table-column prop="moduleName" label="模块名称" width="180">
-                </el-table-column>
-                <el-table-column prop="version" label="版本" width="180">
-                </el-table-column>
-                <el-table-column prop="updateDate" label="修改日期">
-                </el-table-column>
-            </el-table>
+        <div style="width:100%; padding-top: 20px">
+          <span> 版权所有（C）2010-2011 北京玖琏科技有限公司</span>
         </div>
-    </el-dialog>
+      </div>
+    </div>
+    <div style="padding: 10px;  margin: 5px; ">
+      <el-table :data="tableData" style="width: 100%;" height="400">
+        <el-table-column prop="moduleName" label="模块名称" width="180" />
+        <el-table-column prop="version" label="版本" width="180" />
+        <el-table-column prop="updateDate" label="修改日期" />
+      </el-table>
+    </div>
+  </el-dialog>
 </template>
 
 <script>
-    import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
-    export default {
-        name: 'ManageUser',
-        data() {
-            return {
-                tableData: [
-                    {
-                        moduleName: '主程序版本:',
-                        version: '123',
-                        updateDate: '123'
-                    }
-                ],
-                operate: {},
-                operation: null,
-                dialogShow: false,
-                loading: false,
-                selected: null,
-            }
-        },
-        computed: {
-            show() {
-                return this.dialogShow && !this.$store.state.menuOperation.break;
-            },
-            domIdCancel() {
-                return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-            },
-            domIdConfirm() {
-                return this.dialogShow ? OperationEvent.Command.close.menu.domId : '';
-            },
-            title() {
-                return '关于ControlMonitor'
-            }
-        },
-        mounted() {
-            this.$nextTick(() => {
-                this.$store.dispatch('training/tipReload');
-            })
-        },
-        methods: {
-            doShow(operate) {
-                //非断电激活时设置初始值
-                if (!this.dialogShow) {
-                    this.loading = false;
-                    this.operate = operate || {};
-                    this.operation = operate.operation;
+export default {
+    name: 'ManageUser',
+    data() {
+        return {
+            tableData: [
+                {
+                    moduleName: '主程序版本:',
+                    version: '123',
+                    updateDate: '123'
                 }
-
-                this.dialogShow = true;
-                this.$nextTick(function () {
-                    this.$store.dispatch('training/emitTipFresh');
-                });
-            },
-            doClose() {
+            ],
+            operate: {},
+            operation: null,
+            dialogShow: false,
+            loading: false,
+            selected: null
+        };
+    },
+    computed: {
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
+        },
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+        },
+        domIdConfirm() {
+            return this.dialogShow ? OperationEvent.Command.close.menu.domId : '';
+        },
+        title() {
+            return '关于ControlMonitor';
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(operate) {
+            // 非断电激活时设置初始值
+            if (!this.dialogShow) {
                 this.loading = false;
-                this.dialogShow = false;
-                this.$store.dispatch('training/emitTipFresh');
-            },
-            commit() {
-                let operate = {
-                    type: this.operate.type,
-                    operation: OperationEvent.Command.close.menu.operation,
-                }
-
-                this.loading = true;
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                    this.loading = false;
-                    if (valid) {
-                        this.doClose();
-                    }
-                }).catch(error => {
-                    this.loading = false;
-                    this.doClose();
-                })
-            },
-            cancel() {
-                let operate = {
-                    type: this.operate.type,
-                    operation: OperationEvent.Command.cancel.menu.operation,
-                }
-
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.doClose();
-                    }
-                }).catch(error => { this.doClose(); });
+                this.operate = operate || {};
+                this.operation = operate.operation;
             }
+
+            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 = {
+                type: this.operate.type,
+                operation: OperationEvent.Command.close.menu.operation
+            };
+
+            this.loading = true;
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.loading = false;
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => {
+                this.loading = false;
+                this.doClose();
+            });
+        },
+        cancel() {
+            const operate = {
+                type: this.operate.type,
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
+
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => { this.doClose(); });
         }
     }
+};
 </script>
 <style scoped>
     .ningbo-01__systerm .el-dialog .base-label {

src/jmapNew/theme/ningbo_01/menus/menuDialog/manageUser.vue

@@ -1,282 +1,300 @@
 <template>
-    <el-dialog class="ningbo-01__systerm manage-user" :title="title" :visible.sync="show" width="420px"
-        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
-        <div style="padding: 5px 5px; border: 1px double lightgray; margin: 20px 0px; ">
-            <span class="base-label">用户列表</span>
-            <el-row>
-                <el-col :span="18">
-                    <el-table ref="multipleTable" :data="tableData" border row-key="code" style="width: 100%"
-                        height="450" center size="mini" highlight-current-row @row-click="chooseUser">
-                        <el-table-column prop="jobNumber" label="工号" width="120">
-                            <template slot-scope="scope">
-                                <span>{{scope.row.jobNumber}}</span>
-                            </template>
-                        </el-table-column>
-                        <el-table-column prop="userName" label="用户名">
-                            <template slot-scope="scope">
-                                <span>{{scope.row.userName}}</span>
-                            </template>
-                        </el-table-column>
-                        <el-table-column width="20">
-                        </el-table-column>
-                    </el-table>
-                </el-col>
-                <el-col :span="4">
-                    <el-button style="margin-top: 140px; margin-left: 10px;" :id="domIdFreshUser" @click="freshUser">刷新
-                    </el-button>
-                    <el-button style="margin-top: 30px; margin-left: 10px;" :id="domIdAddUser" @click="addUser">增加
-                    </el-button>
-                    <el-button style="margin-top: 30px; margin-left: 10px;" :id="domIdEditUser" @click="editUser">修改
-                    </el-button>
-                    <el-button style="margin-top: 30px; margin-left: 10px;" :id="domIdDelUser" @click="delUser">删除
-                    </el-button>
-                </el-col>
-            </el-row>
-        </div>
-        <el-row justify="center" class="button-group">
-            <el-col :span="8" :offset="6">
-                <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
-            </el-col>
-            <el-col :span="8" :offset="0">
-                <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
-            </el-col>
-        </el-row>
-        <user-add ref="userAdd" @operateUser="operateUser"></user-add>
-        <user-edit ref="userEdit" @operateUser="operateUser"></user-edit>
-        <user-delete ref="userDelete" @operateUser="operateUser"></user-delete>
-    </el-dialog>
+  <el-dialog
+    v-dialogDrag
+    class="ningbo-01__systerm manage-user"
+    :title="title"
+    :visible.sync="show"
+    width="420px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <div style="padding: 5px 5px; border: 1px double lightgray; margin: 20px 0px; ">
+      <span class="base-label">用户列表</span>
+      <el-row>
+        <el-col :span="18">
+          <el-table
+            ref="multipleTable"
+            :data="tableData"
+            border
+            row-key="code"
+            style="width: 100%"
+            height="450"
+            center
+            size="mini"
+            highlight-current-row
+            @row-click="chooseUser"
+          >
+            <el-table-column prop="jobNumber" label="工号" width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.jobNumber }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="userName" label="用户名">
+              <template slot-scope="scope">
+                <span>{{ scope.row.userName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column width="20" />
+          </el-table>
+        </el-col>
+        <el-col :span="4">
+          <el-button :id="domIdFreshUser" style="margin-top: 140px; margin-left: 10px;" @click="freshUser">刷新
+          </el-button>
+          <el-button :id="domIdAddUser" style="margin-top: 30px; margin-left: 10px;" @click="addUser">增加
+          </el-button>
+          <el-button :id="domIdEditUser" style="margin-top: 30px; margin-left: 10px;" @click="editUser">修改
+          </el-button>
+          <el-button :id="domIdDelUser" style="margin-top: 30px; margin-left: 10px;" @click="delUser">删除
+          </el-button>
+        </el-col>
+      </el-row>
+    </div>
+    <el-row justify="center" class="button-group">
+      <el-col :span="8" :offset="6">
+        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
+      </el-col>
+      <el-col :span="8" :offset="0">
+        <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
+      </el-col>
+    </el-row>
+    <user-add ref="userAdd" @operateUser="operateUser" />
+    <user-edit ref="userEdit" @operateUser="operateUser" />
+    <user-delete ref="userDelete" @operateUser="operateUser" />
+  </el-dialog>
 </template>
 
 <script>
-    import { mapGetters } from 'vuex';
-    import UserAdd from './childDialog/userAdd';
-    import UserEdit from './childDialog/userEdit';
-    import UserDelete from './childDialog/userDelete';
-    import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { mapGetters } from 'vuex';
+import UserAdd from './childDialog/userAdd';
+import UserEdit from './childDialog/userEdit';
+import UserDelete from './childDialog/userDelete';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
-    export default {
-        name: 'ManageUser',
-        components: {
-            UserAdd,
-            UserEdit,
-            UserDelete
+export default {
+    name: 'ManageUser',
+    components: {
+        UserAdd,
+        UserEdit,
+        UserDelete
+    },
+    data() {
+        return {
+            tableData: [],
+            operate: {},
+            operation: null,
+            dialogShow: false,
+            loading: false,
+            selected: null
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'stationStandList'
+        ]),
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
         },
-        data() {
-            return {
-                tableData: [],
-                operate: {},
-                operation: null,
-                dialogShow: false,
-                loading: false,
-                selected: null,
-            }
+        domIdAddUser() {
+            return this.dialogShow ? OperationEvent.Command.manage.addUser.domId : '';
         },
-        computed: {
-            ...mapGetters('map', [
-                'stationStandList'
-            ]),
-            show() {
-                return this.dialogShow && !this.$store.state.menuOperation.break;
-            },
-            domIdAddUser() {
-                return this.dialogShow ? OperationEvent.Command.manage.addUser.domId : '';
-            },
-            domIdEditUser() {
-                return this.dialogShow ? OperationEvent.Command.manage.editUser.domId : '';
-            },
-            domIdDelUser() {
-                return this.dialogShow ? OperationEvent.Command.manage.delUser.domId : '';
-            },
-            domIdFreshUser() {
-                return this.dialogShow ? OperationEvent.Command.manage.freshUser.domId : '';
-            },
-            domIdChooseUser() {
-                return this.dialogShow ? OperationEvent.Command.manage.chooseUser.domId : '';
-            },
-            domIdCancel() {
-                return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-            },
-            domIdConfirm() {
-                return this.dialogShow ? OperationEvent.Command.close.menu.domId : '';
-            },
-            title() {
-                return '用户管理'
-            }
+        domIdEditUser() {
+            return this.dialogShow ? OperationEvent.Command.manage.editUser.domId : '';
         },
-        mounted() {
-            this.$nextTick(() => {
-                this.$store.dispatch('training/tipReload');
-            })
+        domIdDelUser() {
+            return this.dialogShow ? OperationEvent.Command.manage.delUser.domId : '';
         },
-        methods: {
-            doShow(operate) {
-                //非断电激活时设置初始值
-                if (!this.dialogShow) {
-                    this.loading = false;
-                    this.operate = operate || {};
-                    this.operation = operate.operation;
-                }
-
-                this.dialogShow = true;
-                this.$nextTick(function () {
-                    this.$store.dispatch('training/emitTipFresh');
-                });
-            },
-            doClose() {
+        domIdFreshUser() {
+            return this.dialogShow ? OperationEvent.Command.manage.freshUser.domId : '';
+        },
+        domIdChooseUser() {
+            return this.dialogShow ? OperationEvent.Command.manage.chooseUser.domId : '';
+        },
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+        },
+        domIdConfirm() {
+            return this.dialogShow ? OperationEvent.Command.close.menu.domId : '';
+        },
+        title() {
+            return '用户管理';
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(operate) {
+            // 非断电激活时设置初始值
+            if (!this.dialogShow) {
                 this.loading = false;
-                this.dialogShow = false;
+                this.operate = operate || {};
+                this.operation = operate.operation;
+            }
+
+            this.dialogShow = true;
+            this.$nextTick(function () {
                 this.$store.dispatch('training/emitTipFresh');
-            },
-            //添加用户
-            addUser() {
-                let operate = {
-                    type: this.operate.type,
-                    operation: OperationEvent.Command.manage.addUser.operation,
+            });
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+        },
+        // 添加用户
+        addUser() {
+            const operate = {
+                type: this.operate.type,
+                operation: OperationEvent.Command.manage.addUser.operation
+            };
+
+            this.loading = true;
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.loading = false;
+                if (valid) {
+                    this.$refs.userAdd.doShow(operate);
                 }
+            }).catch(() => {
+                this.loading = false;
+            });
+        },
+        // 编辑用户
+        editUser() {
+            if (this.selected) {
+                const operate = {
+                    type: this.operate.type,
+                    operation: OperationEvent.Command.manage.editUser.operation
+                };
 
                 this.loading = true;
                 this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                     this.loading = false;
                     if (valid) {
-                        this.$refs.userAdd.doShow(operate);
+                        this.$refs.userEdit.doShow(operate, this.selected);
                     }
-                }).catch(error => {
+                }).catch(() => {
                     this.loading = false;
-                })
-            },
-            //编辑用户
-            editUser() {
-                if (this.selected) {
-                    let operate = {
-                        type: this.operate.type,
-                        operation: OperationEvent.Command.manage.editUser.operation,
-                    }
-
-                    this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                        this.loading = false;
-                        if (valid) {
-                            this.$refs.userEdit.doShow(operate, this.selected);
-                        }
-                    }).catch(error => {
-                        this.loading = false;
-                    })
-                } else {
-                    this.$messageBox('请先选择用户');
-                }
-            },
-            //删除用户
-            delUser() {
-                if (this.selected) {
-                    let operate = {
-                        type: this.operate.type,
-                        operation: OperationEvent.Command.manage.delUser.operation,
-                        messages: [`你确定删除用户${this.selected.userName}吗？`]
-                    }
-
-                    this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                        this.loading = false;
-                        if (valid) {
-                            this.$refs.userDelete.doShow(operate, this.selected);
-                        }
-                    }).catch(error => {
-                        this.loading = false;
-                    })
-                } else {
-                    this.$messageBox('请先选择用户');
-                }
-            },
-            //刷新用户
-            freshUser() {
-                let operate = {
+                });
+            } else {
+                this.$messageBox('请先选择用户');
+            }
+        },
+        // 删除用户
+        delUser() {
+            if (this.selected) {
+                const operate = {
                     type: this.operate.type,
-                    operation: OperationEvent.Command.manage.freshUser.operation,
-                }
-
-                this.loading = true;
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                    this.loading = false;
-                }).catch(error => {
-                    this.loading = false;
-                })
-            },
-            //选择用户
-            chooseUser(row) {
-                let operate = {
-                    type: this.operate.type,
-                    operation: OperationEvent.Command.manage.chooseUser.operation,
-                }
-
-                this.loading = true;
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                    this.loading = false;
-                    this.selected = row;
-                }).catch(error => {
-                    this.loading = false;
-                })
-            },
-            commit() {
-                let operate = {
-                    type: this.operate.type,
-                    operation: OperationEvent.Command.close.menu.operation,
-                }
+                    operation: OperationEvent.Command.manage.delUser.operation,
+                    messages: [`你确定删除用户${this.selected.userName}吗？`]
+                };
 
                 this.loading = true;
                 this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                     this.loading = false;
                     if (valid) {
-                        this.doClose();
+                        this.$refs.userDelete.doShow(operate, this.selected);
                     }
-                }).catch(error => {
+                }).catch(() => {
                     this.loading = false;
+                });
+            } else {
+                this.$messageBox('请先选择用户');
+            }
+        },
+        // 刷新用户
+        freshUser() {
+            const operate = {
+                type: this.operate.type,
+                operation: OperationEvent.Command.manage.freshUser.operation
+            };
+
+            this.loading = true;
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.loading = false;
+            }).catch(() => {
+                this.loading = false;
+            });
+        },
+        // 选择用户
+        chooseUser(row) {
+            const operate = {
+                type: this.operate.type,
+                operation: OperationEvent.Command.manage.chooseUser.operation
+            };
+
+            this.loading = true;
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.loading = false;
+                this.selected = row;
+            }).catch(() => {
+                this.loading = false;
+            });
+        },
+        commit() {
+            const operate = {
+                type: this.operate.type,
+                operation: OperationEvent.Command.close.menu.operation
+            };
+
+            this.loading = true;
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.loading = false;
+                if (valid) {
                     this.doClose();
-                })
-            },
-            cancel() {
-                let operate = {
-                    type: this.operate.type,
-                    operation: OperationEvent.Command.cancel.menu.operation,
                 }
+            }).catch(() => {
+                this.loading = false;
+                this.doClose();
+            });
+        },
+        cancel() {
+            const operate = {
+                type: this.operate.type,
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
 
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.doClose();
-                    }
-                }).catch(error => { this.doClose(); });
-            },
-            //增删改函数处理
-            operateUser(data) {
-                if (data && data.type === 'ADD') {
-                    let index = this.tableData.indexOf(this.tableData.find(elem => { return elem.jobNumber === data.jobNumber }));
-                    if (index < 0) {
-                        this.tableData.push({
-                            jobNumber: data.jobNumber,
-                            userName: data.userName,
-                            password: data.password
-                        });
-                    } else {
-                        this.$messageBox('添加失败，存在相同工号的用户');
-                    }
-                } else if (data && data.type === 'EDIT') {
-                    let index = this.tableData.indexOf(this.tableData.find(elem => { return elem.jobNumber === data.jobNumber }));
-                    if (index >= 0) {
-                        this.tableData[index].password = data.password;
-                        this.tableData[index].userName = data.userName;
-                    } else {
-                        this.$messageBox('修改失败');
-                    }
-                } else if (data && data.type === 'DELETE') {
-                    let index = this.tableData.indexOf(this.tableData.find(elem => { return elem.jobNumber === data.jobNumber }));
-                    if (index >= 0) {
-                        this.tableData.splice(index, 1);
-                    } else {
-                        this.$messageBox('删除失败');
-                    }
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => { this.doClose(); });
+        },
+        // 增删改函数处理
+        operateUser(data) {
+            if (data && data.type === 'ADD') {
+                const index = this.tableData.indexOf(this.tableData.find(elem => { return elem.jobNumber === data.jobNumber; }));
+                if (index < 0) {
+                    this.tableData.push({
+                        jobNumber: data.jobNumber,
+                        userName: data.userName,
+                        password: data.password
+                    });
+                } else {
+                    this.$messageBox('添加失败，存在相同工号的用户');
+                }
+            } else if (data && data.type === 'EDIT') {
+                const index = this.tableData.indexOf(this.tableData.find(elem => { return elem.jobNumber === data.jobNumber; }));
+                if (index >= 0) {
+                    this.tableData[index].password = data.password;
+                    this.tableData[index].userName = data.userName;
+                } else {
+                    this.$messageBox('修改失败');
+                }
+            } else if (data && data.type === 'DELETE') {
+                const index = this.tableData.indexOf(this.tableData.find(elem => { return elem.jobNumber === data.jobNumber; }));
+                if (index >= 0) {
+                    this.tableData.splice(index, 1);
+                } else {
+                    this.$messageBox('删除失败');
                 }
             }
         }
     }
+};
 </script>
 <style scoped>
     .ningbo-01__systerm .el-dialog .base-label {

src/jmapNew/theme/ningbo_01/menus/menuDialog/trainAdd.vue

@@ -47,7 +47,8 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
 export default {
     name: 'TrainAdd',

src/jmapNew/theme/ningbo_01/menus/menuDialog/trainDelete.vue

@@ -34,7 +34,8 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
 export default {
     name: 'TrainAdd',

src/jmapNew/theme/ningbo_01/menus/menuDialog/trainTranstalet.vue

@@ -47,7 +47,8 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
 export default {
     name: 'TrainTranstalet',

src/jmapNew/theme/ningbo_01/menus/passiveDialog/alarm.vue

@@ -83,7 +83,7 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
 export default {
     name: 'AlarmDetail',

src/jmapNew/theme/ningbo_01/menus/passiveDialog/timeout.vue

@@ -18,7 +18,7 @@
 </template>
 
 <script>
-import { OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 export default {
     name: 'CmdNotice',
     data() {

src/jmapNew/theme/ningbo_03/menus/dialog/childDialog/confirmControl.vue

@@ -29,7 +29,7 @@
 </template>
 
 <script>
-import { OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';