From 9e3ee28611a9655543d3ff6e82b56266e07e6876 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Tue, 23 Jun 2020 17:15:17 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=BD=A6=E7=AB=99=E5=8F=B3=E9=94=AE?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/table.js                              |   9 -
 .../menus/dialog/stationCmdControl.vue        |   9 +-
 .../menus/dialog/stationHumanControlAll.vue   |  11 +-
 .../dialog/stationSetRouteControlAll.vue      |  11 +-
 .../menus/dialog/stationCmdControl.vue        | 407 ------------------
 .../menus/dialog/stationHumanControlAll.vue   | 123 ------
 .../dialog/stationSetRouteControlAll.vue      | 145 -------
 .../theme/fuzhou_01/menus/menuStation.vue     |  12 +-
 .../menus/dialog/stationCmdControl.vue        | 401 -----------------
 .../menus/dialog/stationHumanControlAll.vue   | 118 -----
 .../dialog/stationSetRouteControlAll.vue      | 136 ------
 .../theme/ningbo_01/menus/menuStation.vue     |  12 +-
 .../theme/xian_01/menus/menuStation.vue       |  12 +-
 13 files changed, 44 insertions(+), 1362 deletions(-)
 delete mode 100644 src/api/table.js
 rename src/jmapNew/theme/{xian_01 => components}/menus/dialog/stationCmdControl.vue (99%)
 rename src/jmapNew/theme/{xian_01 => components}/menus/dialog/stationHumanControlAll.vue (94%)
 rename src/jmapNew/theme/{xian_01 => components}/menus/dialog/stationSetRouteControlAll.vue (95%)
 delete mode 100644 src/jmapNew/theme/fuzhou_01/menus/dialog/stationCmdControl.vue
 delete mode 100644 src/jmapNew/theme/fuzhou_01/menus/dialog/stationHumanControlAll.vue
 delete mode 100644 src/jmapNew/theme/fuzhou_01/menus/dialog/stationSetRouteControlAll.vue
 delete mode 100644 src/jmapNew/theme/ningbo_01/menus/dialog/stationCmdControl.vue
 delete mode 100644 src/jmapNew/theme/ningbo_01/menus/dialog/stationHumanControlAll.vue
 delete mode 100644 src/jmapNew/theme/ningbo_01/menus/dialog/stationSetRouteControlAll.vue

diff --git a/src/api/table.js b/src/api/table.js
deleted file mode 100644
index 10bac1b1b..000000000
--- a/src/api/table.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import request from '@/utils/request';
-
-export function getList(params) {
-    return request({
-        url: '/table/list',
-        method: 'get',
-        params
-    });
-}
diff --git a/src/jmapNew/theme/xian_01/menus/dialog/stationCmdControl.vue b/src/jmapNew/theme/components/menus/dialog/stationCmdControl.vue
similarity index 99%
rename from src/jmapNew/theme/xian_01/menus/dialog/stationCmdControl.vue
rename to src/jmapNew/theme/components/menus/dialog/stationCmdControl.vue
index 8bcab70aa..520c42e2c 100644
--- a/src/jmapNew/theme/xian_01/menus/dialog/stationCmdControl.vue
+++ b/src/jmapNew/theme/components/menus/dialog/stationCmdControl.vue
@@ -2,7 +2,8 @@
   <div>
     <el-dialog
       v-dialogDrag
-      class="xian-01__systerm station-cmd-control"
+      class="station-cmd-control"
+      :class="popClass"
       :title="title"
       :visible.sync="show"
       width="840px"
@@ -83,6 +84,12 @@ import CMD from '@/scripts/cmdPlugin/CommandEnum';
 
 export default {
     name: 'StationCmdControl',
+    props: {
+        popClass: {
+            type: String,
+            default: ''
+        }
+    },
     data() {
         return {
             dialogShow: false,
diff --git a/src/jmapNew/theme/xian_01/menus/dialog/stationHumanControlAll.vue b/src/jmapNew/theme/components/menus/dialog/stationHumanControlAll.vue
similarity index 94%
rename from src/jmapNew/theme/xian_01/menus/dialog/stationHumanControlAll.vue
rename to src/jmapNew/theme/components/menus/dialog/stationHumanControlAll.vue
index e47e55968..973efd221 100644
--- a/src/jmapNew/theme/xian_01/menus/dialog/stationHumanControlAll.vue
+++ b/src/jmapNew/theme/components/menus/dialog/stationHumanControlAll.vue
@@ -1,7 +1,8 @@
 <template>
   <el-dialog
     v-dialogDrag
-    class="xian-01__systerm station-human-control-all"
+    class="station-human-control-all"
+    :class="popClass"
     :title="title"
     :visible.sync="show"
     width="430px"
@@ -22,7 +23,7 @@
         <el-button :id="domIdCancel" @click="cancel">{{ $t('global.cancel') }}</el-button>
       </el-col>
     </el-row>
-    <notice-info ref="noticeInfo" pop-class="xian-01__systerm" />
+    <notice-info ref="noticeInfo" :pop-class="popClass" />
   </el-dialog>
 </template>
 
@@ -36,6 +37,12 @@ export default {
     components: {
         NoticeInfo
     },
+    props: {
+        popClass: {
+            type: String,
+            default: ''
+        }
+    },
     data() {
         return {
             dialogShow: false,
diff --git a/src/jmapNew/theme/xian_01/menus/dialog/stationSetRouteControlAll.vue b/src/jmapNew/theme/components/menus/dialog/stationSetRouteControlAll.vue
similarity index 95%
rename from src/jmapNew/theme/xian_01/menus/dialog/stationSetRouteControlAll.vue
rename to src/jmapNew/theme/components/menus/dialog/stationSetRouteControlAll.vue
index e66874a83..d2715738e 100644
--- a/src/jmapNew/theme/xian_01/menus/dialog/stationSetRouteControlAll.vue
+++ b/src/jmapNew/theme/components/menus/dialog/stationSetRouteControlAll.vue
@@ -1,7 +1,8 @@
 <template>
   <el-dialog
     v-dialogDrag
-    class="xian-01__systerm station-set-route-control-all"
+    class="station-set-route-control-all"
+    :class="popClass"
     :title="title"
     :visible.sync="show"
     width="450px"
@@ -34,7 +35,7 @@
         <el-button :id="domIdCancel" @click="cancel">{{ $t('global.cancel') }}</el-button>
       </el-col>
     </el-row>
-    <notice-info ref="noticeInfo" pop-class="xian-01__systerm" />
+    <notice-info ref="noticeInfo" :pop-class="popClass" />
   </el-dialog>
 </template>
 
@@ -48,6 +49,12 @@ export default {
     components: {
         NoticeInfo
     },
+    props: {
+        popClass: {
+            type: String,
+            default: ''
+        }
+    },
     data() {
         return {
             dialogShow: false,
diff --git a/src/jmapNew/theme/fuzhou_01/menus/dialog/stationCmdControl.vue b/src/jmapNew/theme/fuzhou_01/menus/dialog/stationCmdControl.vue
deleted file mode 100644
index a6e66771e..000000000
--- a/src/jmapNew/theme/fuzhou_01/menus/dialog/stationCmdControl.vue
+++ /dev/null
@@ -1,407 +0,0 @@
-<template>
-  <div>
-    <el-dialog
-      v-dialogDrag
-      class="fuzhou-01__systerm station-cmd-control"
-      :title="title"
-      :visible.sync="show"
-      width="840px"
-      :before-close="doClose"
-      :z-index="2000"
-      :modal="false"
-      :close-on-click-modal="false"
-    >
-      <div style="padding: 10px 20px; border: 1px solid lightgray;">
-        <span class="base-label">{{ $t('menu.commandInformation') }}</span>
-        <el-form label-position="center" size="mini">
-          <el-row>
-            <el-col :span="11">
-              <el-form-item :label="this.$t('menu.type')" label-width="40px">
-                <el-select v-model="operation" size="small" disabled style="width:230px">
-                  <el-option
-                    v-for="option in typeList"
-                    :key="option.code"
-                    :label="option.name"
-                    :value="option.code"
-                  />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="11">
-              <el-form-item :label="this.$t('menu.stationName')" label-width="100px">
-                <el-input v-model="stationName" size="small" disabled />
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
-      </div>
-      <el-table
-        ref="tempData"
-        class="table"
-        :data="tempData"
-        border
-        style="width: 100%"
-        size="mini"
-        highlight-current-row
-        height="200"
-      >
-        <el-table-column prop="order" :width="110" :label="this.$t('menu.serialNumber2')" />
-        <el-table-column prop="date" :width="160" :label="this.$t('menu.time')" />
-        <el-table-column prop="context" :width="180" :label="this.$t('menu.implementationProcess')" />
-        <el-table-column prop="result" :label="this.$t('menu.executionResult')" />
-      </el-table>
-      <span class="notice">{{ message }}</span>
-      <el-row class="button-group">
-        <el-col :span="2" :offset="3">
-          <el-button :id="domIdCommand" type="primary" :disabled="cmdDisabled[0]" @click="command">{{ $t('menu.release') }}<span
-            v-show="timeCountCommand>0"
-          >({{ timeCountCommand }})</span></el-button>
-        </el-col>
-        <el-col :span="2" :offset="1">
-          <el-button :id="domIdConfirm1" type="primary" style="width:120px;" :disabled="cmdDisabled[1]" @click="confirm1">{{ $t('menu.firstConfirm') }}
-          </el-button>
-        </el-col>
-        <el-col :span="2" :offset="2">
-          <el-button :id="domIdConfirm2" type="primary" style="width:120px;" :disabled="cmdDisabled[2]" @click="confirm2">{{ $t('menu.secondConfirm') }}<span
-            v-show="timeCountConfirm>0"
-          >({{ timeCountConfirm }})</span></el-button>
-        </el-col>
-        <el-col :span="2" :offset="2">
-          <el-button :id="domIdStop" type="primary" :disabled="stpDisabled" @click="stop">{{ $t('menu.suspend') }}</el-button>
-        </el-col>
-        <el-col :span="2" :offset="1">
-          <el-button :id="domIdClose" @click="close">{{ $t('global.close') }}</el-button>
-        </el-col>
-      </el-row>
-    </el-dialog>
-  </div>
-</template>
-<script>
-import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
-import { now } from '@/utils/date';
-import CMD from '@/scripts/cmdPlugin/CommandEnum';
-
-export default {
-    name: 'StationCmdControl',
-    data() {
-        return {
-            dialogShow: false,
-            backOperate: '',
-            order: 0,
-            row: null,
-            timer: null,
-            operation: '',
-            cmdDisabled: [true, true, true],
-            stpDisabled: true,
-            tempData: [],
-            message: '',
-            timeCountCommand: -1,
-            timeCountConfirm: -1,
-            stationName: ''
-        };
-    },
-    computed: {
-        typeList() {
-            return [
-                { code: OperationEvent.Station.powerUnLock.menu.operation, name: this.$t('menu.menuStation.powerUnLock') },
-                { code: OperationEvent.Station.execKeyOperationTest.menu.operation, name: this.$t('menu.menuStation.execKeyOperationTest') }
-            ];
-        },
-        show() {
-            return this.dialogShow && !this.$store.state.menuOperation.break;
-        },
-        domIdCommand() {
-            if (this.dialogShow) {
-                if (this.operation == OperationEvent.Station.powerUnLock.menu.operation) {
-                    /** 上电解锁*/
-                    return OperationEvent.Station.powerUnLock.order.domId;
-                } else if (this.operation == OperationEvent.Station.execKeyOperationTest.menu.operation) {
-                    /** 执行关键操作测试*/
-                    return OperationEvent.Station.execKeyOperationTest.order.domId;
-                }
-            }
-            return '';
-        },
-        domIdConfirm1() {
-            if (this.dialogShow) {
-                if (this.operation == OperationEvent.Station.powerUnLock.menu.operation) {
-                    /** 上电解锁*/
-                    return OperationEvent.Station.powerUnLock.confirm1.domId;
-                } else if (this.operation == OperationEvent.Station.execKeyOperationTest.menu.operation) {
-                    /** 执行关键操作测试*/
-                    return OperationEvent.Station.execKeyOperationTest.confirm1.domId;
-                }
-            }
-            return '';
-        },
-        domIdConfirm2() {
-            if (this.dialogShow) {
-                if (this.operation == OperationEvent.Station.powerUnLock.menu.operation) {
-                    /** 上电解锁*/
-                    return OperationEvent.Station.powerUnLock.confirm2.domId;
-                } else if (this.operation == OperationEvent.Station.execKeyOperationTest.menu.operation) {
-                    /** 执行关键操作测试*/
-                    return OperationEvent.Station.execKeyOperationTest.confirm2.domId;
-                }
-            }
-            return '';
-        },
-        domIdStop() {
-            if (this.dialogShow) {
-                if (this.operation == OperationEvent.Station.powerUnLock.menu.operation) {
-                    /** 上电解锁*/
-                    return OperationEvent.Station.powerUnLock.stop.domId;
-                } else if (this.operation == OperationEvent.Station.execKeyOperationTest.menu.operation) {
-                    /** 执行关键操作测试*/
-                    return OperationEvent.Station.execKeyOperationTest.stop.domId;
-                }
-            }
-            return '';
-        },
-        domIdClose() {
-            if (this.dialogShow) {
-                return OperationEvent.Command.close.menu.domId;
-            }
-            return '';
-        },
-        title() {
-            if (this.dialogShow) {
-                if (this.operation == OperationEvent.Station.powerUnLock.menu.operation) {
-                    return this.$t('menu.signalDeblocking');
-                } else if (this.operation == OperationEvent.Station.execKeyOperationTest.menu.operation) {
-                    return this.$t('menu.menuStation.execKeyOperationTest');
-                }
-            }
-            return '';
-        }
-    },
-    watch: {
-        cmdDisabled: {
-            handler(val, oldVal) {
-                this.stpDisabled = true;
-                val.forEach((elem, index) => {
-                    // 在确定1之前的操作才可以终止
-                    if (elem == false && index >= 1 && index <= 2) {
-                        this.stpDisabled = false;
-                    }
-                });
-            },
-            deep: true
-        }
-    },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-        this.timer = setInterval(() => {
-            if (!this.$store.state.menuOperation.break) {
-                if (this.timeCountCommand > 0) {
-                    this.timeCountCommand--;
-                } else if (this.timeCountCommand == 0) {
-                    this.setButtonEnable({ step: 0 });
-                    this.timeCountCommand = -1;
-                }
-                if (this.timeCountConfirm > 0) {
-                    this.timeCountConfirm--;
-                } else if (this.timeCountConfirm == 0) {
-                    this.setButtonEnable({ step: 0 });
-                    this.timeCountConfirm = -1;
-                }
-            }
-        }, 1000);
-    },
-    beforeDestroy() {
-        clearInterval(this.timer);
-        this.timer = null;
-    },
-    methods: {
-        doShow(operate, selected) {
-            if (!this.dialogShow) {
-                this.stationName = '';
-                if (selected && selected._type.toUpperCase() === 'Station'.toUpperCase()) {
-                    this.stationName = selected.name;
-                }
-
-                this.order = 0;
-                this.operation = operate.operation;
-                this.tempData = [];
-                this.timeCountCommand = -1;
-                this.timeCountConfirm = -1;
-                this.cmdDisabled = [false, true, true];
-            }
-            this.stpDisabled = true;
-            this.dialogShow = true;
-            this.setMessage(this.$t('tip.releaseTip'));
-            this.$nextTick(function () {
-                this.$store.dispatch('training/emitTipFresh');
-            });
-        },
-        doClose() {
-            this.dialogShow = false;
-            this.$store.dispatch('training/emitTipFresh');
-        },
-        command() {
-            if (this.operation == OperationEvent.Station.powerUnLock.menu.operation ||
-                    this.operation == OperationEvent.Station.execKeyOperationTest.menu.operation) {
-                /** 第一步不带弹框处理*/
-                this.commandNoPopUp();
-            } else {
-                /** 第一步带弹框处理*/
-                this.commandHasPopUp();
-            }
-        },
-        commandHasPopUp() {
-        },
-        commandNoPopUp() {
-            const operate = {
-            };
-
-            if (this.operation == OperationEvent.Station.powerUnLock.menu.operation) {
-                /** 上电解锁*/
-                operate.operation = OperationEvent.Station.powerUnLock.order.operation;
-            } else if (this.operation == OperationEvent.Station.execKeyOperationTest.menu.operation) {
-                /** 执行关键操作测试*/
-                operate.operation = OperationEvent.Station.execKeyOperationTest.order.operation;
-            }
-
-            this.setMessage(this.$t('tip.firstConfirmTip'));
-            this.writeRecord({ order: ++this.order, date: now(), context: this.$t('menu.clickReleaseCommand'), result: '' });
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.setButtonEnable({ step: 1 });
-                    this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickReleaseCommand'), result: this.$t('tip.executionSucceed') });
-                } else {
-                    this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickReleaseCommand'), result: this.$t('tip.executionFailed') });
-                }
-            }).catch(() => {
-                this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickReleaseCommand'), result: this.$t('tip.executionException') });
-            });
-        },
-        confirm1() {
-            const operate = {
-            };
-
-            if (this.operation == OperationEvent.Station.powerUnLock.menu.operation) {
-                /** 上电解锁*/
-                operate.operation = OperationEvent.Station.powerUnLock.confirm1.operation;
-            } else if (this.operation == OperationEvent.Station.execKeyOperationTest.menu.operation) {
-                /** 执行关键操作测试*/
-                operate.operation = OperationEvent.Station.execKeyOperationTest.confirm1.operation;
-            }
-
-            this.setMessage(this.$t('tip.secondConfirmTip'));
-            this.writeRecord({ order: ++this.order, date: now(), context: this.$t('menu.clickFirstConfirm'), result: '' });
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.timeCountCommand = -1;
-                    this.timeCountConfirm = 10;
-                    this.setButtonEnable({ step: 2 });
-                    this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickFirstConfirm'), result: this.$t('tip.executionSucceed') });
-                } else {
-                    this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickFirstConfirm'), result: this.$t('tip.executionFailed') });
-                }
-            }).catch(() => {
-                this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickFirstConfirm'), result: this.$t('tip.executionException') });
-            });
-        },
-        confirm2() {
-            const operate = {
-                over: true
-            };
-
-            if (this.operation == OperationEvent.Station.powerUnLock.menu.operation) {
-                /** 上电解锁*/
-                operate.operation = OperationEvent.Station.powerUnLock.confirm2.operation;
-                operate.cmdType = CMD.Station.CMD_STATION_POWER_ON_UNLOCK;
-            } else if (this.operation == OperationEvent.Station.execKeyOperationTest.menu.operation) {
-                /** 执行关键操作测试*/
-                operate.operation = OperationEvent.Station.execKeyOperationTest.confirm2.operation;
-                operate.cmdType = CMD.Station.CMD_STATION_KEY_OPERATION_TEST;
-            }
-
-            this.setMessage('');
-            this.writeRecord({ order: ++this.order, date: now(), context: this.$t('menu.clickSecondConfirm'), result: '' });
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                this.timeCountCommand = -1;
-                this.timeCountConfirm = -1;
-                this.setButtonEnable({ step: -1 });
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickSecondConfirm'), result: this.$t('tip.executionSucceed') });
-                } else {
-                    this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickSecondConfirm'), result: this.$t('tip.executionFailed') });
-                }
-            }).catch(() => {
-                this.timeCountCommand = -1;
-                this.timeCountConfirm = -1;
-                this.setButtonEnable({ step: -1 });
-                this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickSecondConfirm'), result: this.$t('tip.executionException') });
-            });
-        },
-        stop() {
-            const operate = {
-            };
-
-            if (this.operation == OperationEvent.Station.powerUnLock.menu.operation) {
-                /** 上电解锁*/
-                operate.operation = OperationEvent.Station.powerUnLock.stop.operation;
-            } else if (this.operation == OperationEvent.Station.execKeyOperationTest.menu.operation) {
-                /** 执行关键操作测试*/
-                operate.operation = OperationEvent.Station.execKeyOperationTest.stop.operation;
-            }
-
-            this.writeRecord({ order: ++this.order, date: now(), context: this.$t('menu.clickSuspend'), result: '' });
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.setButtonEnable({ step: 0 });
-                    this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickSuspend'), result: this.$t('tip.executionSucceed') });
-                } else {
-                    this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickSuspend'), result: this.$t('tip.executionFailed') });
-                }
-            }).catch(() => {
-                this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickSuspend'), result: this.$t('tip.executionException') });
-            });
-        },
-        close() {
-            const operate = {
-                operation: OperationEvent.Command.close.menu.operation
-            };
-
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => {
-                this.doClose();
-            });
-        },
-        getOperate(operate) {
-            /** 弹框返回值处理*/
-        },
-        setButtonEnable(param) {
-            this.cmdDisabled = [true, true, true];
-            if (param && param.step >= 0) {
-                this.cmdDisabled[param.step] = false;
-            }
-        },
-        setMessage(message) {
-            this.message = message;
-        },
-        writeRecord(param) {
-            this.tempData.push(param);
-        },
-        editRecord(param) {
-            this.tempData.forEach(elem => {
-                if (elem.order == param.order) {
-                    for (var prop in param) {
-                        elem[prop] = param[prop];
-                    }
-                }
-            });
-        }
-    }
-};
-</script>
diff --git a/src/jmapNew/theme/fuzhou_01/menus/dialog/stationHumanControlAll.vue b/src/jmapNew/theme/fuzhou_01/menus/dialog/stationHumanControlAll.vue
deleted file mode 100644
index 4b6d43bca..000000000
--- a/src/jmapNew/theme/fuzhou_01/menus/dialog/stationHumanControlAll.vue
+++ /dev/null
@@ -1,123 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="fuzhou-01__systerm station-human-control-all"
-    :title="title"
-    :visible.sync="show"
-    width="430px"
-    :before-close="doClose"
-    :z-index="2000"
-    :modal="false"
-    :close-on-click-modal="false"
-    append-to-body
-  >
-    <div class="context">
-      <span>{{ title }}</span>
-    </div>
-    <el-row justify="center" class="button-group">
-      <el-col :span="10" :offset="2">
-        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">{{ $t('global.confirm') }}</el-button>
-      </el-col>
-      <el-col :span="8" :offset="4">
-        <el-button :id="domIdCancel" @click="cancel">{{ $t('global.cancel') }}</el-button>
-      </el-col>
-    </el-row>
-    <notice-info ref="noticeInfo" pop-class="fuzhou-01__systerm" />
-  </el-dialog>
-</template>
-
-<script>
-import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
-import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
-import CMD from '@/scripts/cmdPlugin/CommandEnum';
-
-export default {
-    name: 'StationHumanControlAll',
-    components: {
-        NoticeInfo
-    },
-    data() {
-        return {
-            dialogShow: false,
-            loading: false,
-            operation: null
-        };
-    },
-    computed: {
-        show() {
-            return this.dialogShow && !this.$store.state.menuOperation.break;
-        },
-        title() {
-            return this.$t('menu.fullConcentrationStationAccessManualControl');
-        },
-        domIdCancel() {
-            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-        },
-        domIdConfirm() {
-            return this.dialogShow ? OperationEvent.Station.humanControlALL.menu.domId : '';
-        }
-    },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
-    methods: {
-        doShow(operate) {
-            if (!this.dialogShow) {
-                this.loading = false;
-                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 = {
-                over: true,
-                operation: OperationEvent.Station.humanControlALL.menu.operation,
-                cmdType: CMD.Station.CMD_STATION_CLOSE_AUTO_SETTING
-            };
-
-            this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                this.loading = false;
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => {
-                this.loading = false;
-                this.doClose();
-                this.$refs.noticeInfo.doShow(operate);
-            });
-        },
-        cancel() {
-            const operate = {
-                operation: OperationEvent.Command.cancel.menu.operation
-            };
-
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => {
-                this.doClose();
-            });
-        }
-    }
-};
-
-</script>
-<style>
-    .station-human-control-all .context {
-        padding-bottom: 40px !important;
-        border: 1px solid lightgray;
-    }
-</style>
diff --git a/src/jmapNew/theme/fuzhou_01/menus/dialog/stationSetRouteControlAll.vue b/src/jmapNew/theme/fuzhou_01/menus/dialog/stationSetRouteControlAll.vue
deleted file mode 100644
index 94c302983..000000000
--- a/src/jmapNew/theme/fuzhou_01/menus/dialog/stationSetRouteControlAll.vue
+++ /dev/null
@@ -1,145 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="fuzhou-01__systerm station-set-route-control-all"
-    :title="title"
-    :visible.sync="show"
-    width="450px"
-    :before-close="doClose"
-    :z-index="2000"
-    :modal="false"
-    :close-on-click-modal="false"
-    append-to-body
-  >
-    <div style="padding: 0px 10px">
-      <el-form ref="form" size="small" label-width="110px" label-position="left">
-        <el-form-item :label="this.$t('menu.concentratedStationName')" prop="stationName">
-          <el-input v-model="stationName" size="small" disabled />
-        </el-form-item>
-      </el-form>
-      <el-radio-group v-model="mode">
-        <el-row>
-          <el-radio :label="true">{{ $t('menu.checkConflict') }}</el-radio>
-        </el-row>
-        <el-row style="margin-top: 20px">
-          <el-radio :label="false">{{ $t('menu.notCheckConflict') }}</el-radio>
-        </el-row>
-      </el-radio-group>
-    </div>
-    <el-row justify="center" class="button-group">
-      <el-col :span="10" :offset="2">
-        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">{{ $t('global.confirm') }}</el-button>
-      </el-col>
-      <el-col :span="8" :offset="4">
-        <el-button :id="domIdCancel" @click="cancel">{{ $t('global.cancel') }}</el-button>
-      </el-col>
-    </el-row>
-    <notice-info ref="noticeInfo" pop-class="fuzhou-01__systerm" />
-  </el-dialog>
-</template>
-
-<script>
-import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
-import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
-import CMD from '@/scripts/cmdPlugin/CommandEnum';
-
-export default {
-    name: 'StationSetRouteControlAll',
-    components: {
-        NoticeInfo
-    },
-    data() {
-        return {
-            dialogShow: false,
-            loading: false,
-            operation: null,
-            stationName: '',
-            mode: true
-        };
-    },
-    computed: {
-        show() {
-            return this.dialogShow && !this.$store.state.menuOperation.break;
-        },
-        title() {
-            return this.$t('menu.fullConcentrationStationSettingAccessControlMode');
-        },
-        domIdCancel() {
-            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-        },
-        domIdConfirm() {
-            return this.dialogShow ? OperationEvent.Station.atsAutoControlALL.menu.domId : '';
-        }
-    },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
-    methods: {
-        doShow(operate, selected) {
-            if (!this.dialogShow) {
-                this.loading = false;
-                this.operation = operate.operation;
-                this.stationName = '';
-                if (selected) {
-                    this.stationName = selected.name;
-                }
-            }
-
-            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 = {
-                over: true,
-                operation: OperationEvent.Station.atsAutoControlALL.menu.operation,
-                cmdType: CMD.Station.CMD_STATION_OPEN_AUTO_SETTING,
-                val: this.mode,
-                param: {
-                    CheckConflict: this.mode
-                }
-            };
-
-            this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                this.loading = false;
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => {
-                this.loading = false;
-                this.doClose();
-                this.$refs.noticeInfo.doShow(operate);
-            });
-        },
-        cancel() {
-            const operate = {
-                operation: OperationEvent.Command.cancel.menu.operation
-            };
-
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => {
-                this.doClose();
-            });
-        }
-    }
-};
-
-</script>
-<style>
-    .station-set-route-control-all .context {
-        padding-bottom: 40px !important;
-        border: 1px solid lightgray;
-    }
-</style>
diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuStation.vue b/src/jmapNew/theme/fuzhou_01/menus/menuStation.vue
index 7bc2b434b..beb684f1b 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/menuStation.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/menuStation.vue
@@ -1,18 +1,18 @@
 <template>
   <div>
     <pop-menu ref="popMenu" :menu="menu" />
-    <station-cmd-control ref="stationCmdControl" />
-    <station-human-control-all ref="stationHumanControlAll" />
-    <station-set-route-control-all ref="stationSetRouteControlAll" />
+    <station-cmd-control ref="stationCmdControl" pop-class="fuzhou-01__systerm" />
+    <station-human-control-all ref="stationHumanControlAll" pop-class="fuzhou-01__systerm" />
+    <station-set-route-control-all ref="stationSetRouteControlAll" pop-class="fuzhou-01__systerm" />
     <notice-info ref="noticeInfo" pop-class="fuzhou-01__systerm" />
   </div>
 </template>
 
 <script>
 import PopMenu from '@/components/PopMenu';
-import StationCmdControl from './dialog/stationCmdControl';
-import StationHumanControlAll from './dialog/stationHumanControlAll';
-import StationSetRouteControlAll from './dialog/stationSetRouteControlAll';
+import StationCmdControl from '@/jmapNew/theme/components/menus/dialog/stationCmdControl';
+import StationHumanControlAll from '@/jmapNew/theme/components/menus/dialog/stationHumanControlAll';
+import StationSetRouteControlAll from '@/jmapNew/theme/components/menus/dialog/stationSetRouteControlAll';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 import { mapGetters } from 'vuex';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/stationCmdControl.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/stationCmdControl.vue
deleted file mode 100644
index ed5cd298c..000000000
--- a/src/jmapNew/theme/ningbo_01/menus/dialog/stationCmdControl.vue
+++ /dev/null
@@ -1,401 +0,0 @@
-<template>
-  <div>
-    <el-dialog
-      v-dialogDrag
-      class="ningbo-01__systerm station-cmd-control"
-      :title="title"
-      :visible.sync="show"
-      width="800px"
-      :before-close="doClose"
-      :z-index="2000"
-      :modal="false"
-      :close-on-click-modal="false"
-    >
-      <div style="padding: 10px 20px; border: 1px solid lightgray;">
-        <span class="base-label">命令信息</span>
-        <el-form label-position="center" size="mini">
-          <el-row>
-            <el-col :span="8">
-              <el-form-item label="类型" label-width="40px">
-                <el-select v-model="operation" size="small" disabled>
-                  <el-option
-                    v-for="option in typeList"
-                    :key="option.code"
-                    :label="option.name"
-                    :value="option.code"
-                  />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="车站名称" label-width="100px">
-                <el-input v-model="stationName" size="small" disabled />
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
-      </div>
-      <el-table
-        ref="tempData"
-        class="table"
-        :data="tempData"
-        border
-        style="width: 100%"
-        size="mini"
-        highlight-current-row
-        height="200"
-      >
-        <el-table-column prop="order" :width="50" label="序号" />
-        <el-table-column prop="date" :width="160" label="时间" />
-        <el-table-column prop="context" :width="180" label="执行过程" />
-        <el-table-column prop="result" label="执行结果" />
-      </el-table>
-      <span class="notice">{{ message }}</span>
-      <el-row class="button-group">
-        <el-col :span="2" :offset="2">
-          <el-button :id="domIdCommand" type="primary" :disabled="cmdDisabled[0]" @click="command">下达<span
-            v-show="timeCountCommand>0"
-          >({{ timeCountCommand }})</span></el-button>
-        </el-col>
-        <el-col :span="2" :offset="2">
-          <el-button :id="domIdConfirm1" type="primary" :disabled="cmdDisabled[1]" @click="confirm1">确认1
-          </el-button>
-        </el-col>
-        <el-col :span="2" :offset="2">
-          <el-button :id="domIdConfirm2" type="primary" :disabled="cmdDisabled[2]" @click="confirm2">确认2<span
-            v-show="timeCountConfirm>0"
-          >({{ timeCountConfirm }})</span></el-button>
-        </el-col>
-        <el-col :span="2" :offset="2">
-          <el-button :id="domIdStop" type="primary" :disabled="stpDisabled" @click="stop">中止</el-button>
-        </el-col>
-        <el-col :span="2" :offset="2">
-          <el-button :id="domIdClose" @click="close">关闭</el-button>
-        </el-col>
-      </el-row>
-    </el-dialog>
-  </div>
-</template>
-<script>
-import { OperationEvent } from '@/scripts/ConstDic';
-import { now } from '@/utils/date';
-import {mouseCancelState} from '@/jmapNew/theme/components/utils/menuItemStatus';
-import CMD from '@/scripts/cmdPlugin/CommandEnum';
-
-export default {
-    name: 'StationCmdControl',
-    data() {
-        return {
-            dialogShow: false,
-            backOperate: '',
-            selected: null,
-            order: 0,
-            row: null,
-            timer: null,
-            operation: '',
-            cmdDisabled: [true, true, true],
-            stpDisabled: true,
-            tempData: [],
-            message: '',
-            timeCountCommand: -1,
-            timeCountConfirm: -1,
-            stationName: ''
-        };
-    },
-    computed: {
-        typeList() {
-            return [
-                { code: OperationEvent.Station.powerUnLock.menu.operation, name: '上电解锁' },
-                { code: OperationEvent.Station.execKeyOperationTest.menu.operation, name: '执行关键操作测试' }
-            ];
-        },
-        show() {
-            return this.dialogShow && !this.$store.state.menuOperation.break;
-        },
-        domIdCommand() {
-            if (this.dialogShow) {
-                if (this.operation == OperationEvent.Station.powerUnLock.menu.operation) {
-                    /** 上电解锁*/
-                    return OperationEvent.Station.powerUnLock.order.domId;
-                } else if (this.operation == OperationEvent.Station.execKeyOperationTest.menu.operation) {
-                    /** 执行关键操作测试*/
-                    return OperationEvent.Station.execKeyOperationTest.order.domId;
-                }
-            }
-        },
-        domIdConfirm1() {
-            if (this.dialogShow) {
-                if (this.operation == OperationEvent.Station.powerUnLock.menu.operation) {
-                    /** 上电解锁*/
-                    return OperationEvent.Station.powerUnLock.confirm1.domId;
-                } else if (this.operation == OperationEvent.Station.execKeyOperationTest.menu.operation) {
-                    /** 执行关键操作测试*/
-                    return OperationEvent.Station.execKeyOperationTest.confirm1.domId;
-                }
-            }
-        },
-        domIdConfirm2() {
-            if (this.dialogShow) {
-                if (this.operation == OperationEvent.Station.powerUnLock.menu.operation) {
-                    /** 上电解锁*/
-                    return OperationEvent.Station.powerUnLock.confirm2.domId;
-                } else if (this.operation == OperationEvent.Station.execKeyOperationTest.menu.operation) {
-                    /** 执行关键操作测试*/
-                    return OperationEvent.Station.execKeyOperationTest.confirm2.domId;
-                }
-            }
-        },
-        domIdStop() {
-            if (this.dialogShow) {
-                if (this.operation == OperationEvent.Station.powerUnLock.menu.operation) {
-                    /** 上电解锁*/
-                    return OperationEvent.Station.powerUnLock.stop.domId;
-                } else if (this.operation == OperationEvent.Station.execKeyOperationTest.menu.operation) {
-                    /** 执行关键操作测试*/
-                    return OperationEvent.Station.execKeyOperationTest.stop.domId;
-                }
-            }
-        },
-        domIdClose() {
-            if (this.dialogShow) {
-                return OperationEvent.Command.close.menu.domId;
-            }
-        },
-        title() {
-            if (this.dialogShow) {
-                if (this.operation == OperationEvent.Station.powerUnLock.menu.operation) {
-                    return '上电解锁';
-                } else if (this.operation == OperationEvent.Station.execKeyOperationTest.menu.operation) {
-                    return '执行关键操作测试';
-                }
-            }
-        }
-    },
-    watch: {
-        cmdDisabled: {
-            handler(val, oldVal) {
-                this.stpDisabled = true;
-                val.forEach((elem, index) => {
-                    // 在确定1之前的操作才可以终止
-                    if (elem == false && index >= 1 && index <= 2) {
-                        this.stpDisabled = false;
-                    }
-                });
-            },
-            deep: true
-        }
-    },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-        this.timer = setInterval(() => {
-            if (!this.$store.state.menuOperation.break) {
-                if (this.timeCountCommand > 0) {
-                    this.timeCountCommand--;
-                } else if (this.timeCountCommand == 0) {
-                    this.setButtonEnable({ step: 0 });
-                    this.timeCountCommand = -1;
-                }
-                if (this.timeCountConfirm > 0) {
-                    this.timeCountConfirm--;
-                } else if (this.timeCountConfirm == 0) {
-                    this.setButtonEnable({ step: 0 });
-                    this.timeCountConfirm = -1;
-                }
-            }
-        }, 1000);
-    },
-    beforeDestroy() {
-        clearInterval(this.timer);
-        this.timer = null;
-    },
-    methods: {
-        doShow(operate, selected) {
-            this.selected = selected;
-            if (!this.dialogShow) {
-                this.stationName = '';
-                if (selected && selected._type.toUpperCase() === 'Station'.toUpperCase()) {
-                    this.stationName = selected.name;
-                }
-
-                this.order = 0;
-                this.operation = operate.operation;
-                this.tempData = [];
-                this.timeCountCommand = -1;
-                this.timeCountConfirm = -1;
-                this.cmdDisabled = [false, true, true];
-            }
-            this.stpDisabled = true;
-            this.dialogShow = true;
-            this.setMessage('请点击“下达”按钮，下达命令！');
-            this.$nextTick(function () {
-                this.$store.dispatch('training/emitTipFresh');
-            });
-        },
-        doClose() {
-            this.dialogShow = false;
-            this.$store.dispatch('training/emitTipFresh');
-            mouseCancelState(this.selected);
-        },
-        command() {
-            if (this.operation == OperationEvent.Station.powerUnLock.menu.operation ||
-                    this.operation == OperationEvent.Station.execKeyOperationTest.menu.operation) {
-                /** 第一步不带弹框处理*/
-                this.commandNoPopUp();
-            } else {
-                /** 第一步带弹框处理*/
-                this.commandHasPopUp();
-            }
-        },
-        commandHasPopUp() {
-        },
-        commandNoPopUp() {
-            const operate = {};
-            if (this.operation == OperationEvent.Station.powerUnLock.menu.operation) {
-                /** 上电解锁*/
-                operate.operation = OperationEvent.Station.powerUnLock.order.operation;
-            } else if (this.operation == OperationEvent.Station.execKeyOperationTest.menu.operation) {
-                /** 执行关键操作测试*/
-                operate.operation = OperationEvent.Station.execKeyOperationTest.order.operation;
-            }
-
-            this.setMessage('请点击“确认1”按钮，确认命令！');
-            this.writeRecord({ order: ++this.order, date: now(), context: '点击下达命令', result: '' });
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.setButtonEnable({ step: 1 });
-                    this.editRecord({ order: this.order, date: now(), context: '点击下达命令', result: '执行成功' });
-                } else {
-                    this.editRecord({ order: this.order, date: now(), context: '点击下达命令', result: '执行失败' });
-                }
-            }).catch(() => {
-                this.editRecord({ order: this.order, date: now(), context: '点击下达命令', result: '执行异常' });
-            });
-        },
-        confirm1() {
-            const operate = {};
-
-            if (this.operation == OperationEvent.Station.powerUnLock.menu.operation) {
-                /** 上电解锁*/
-                operate.operation = OperationEvent.Station.powerUnLock.confirm1.operation;
-            } else if (this.operation == OperationEvent.Station.execKeyOperationTest.menu.operation) {
-                /** 执行关键操作测试*/
-                operate.operation = OperationEvent.Station.execKeyOperationTest.confirm1.operation;
-            }
-
-            this.setMessage('请点击“确认2”按钮，确认命令！');
-            this.writeRecord({ order: ++this.order, date: now(), context: '点击确认1', result: '' });
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.timeCountCommand = -1;
-                    this.timeCountConfirm = 10;
-                    this.setButtonEnable({ step: 2 });
-                    this.editRecord({ order: this.order, date: now(), context: '点击确认1', result: '执行成功' });
-                } else {
-                    this.editRecord({ order: this.order, date: now(), context: '点击确认1', result: '执行失败' });
-                }
-            }).catch(() => {
-                this.editRecord({ order: this.order, date: now(), context: '点击确认1', result: '执行异常' });
-            });
-        },
-        confirm2() {
-            const operate = {
-                send: true
-            };
-
-            if (this.operation == OperationEvent.Station.powerUnLock.menu.operation) {
-                /** 上电解锁*/
-                operate.operation = OperationEvent.Station.powerUnLock.confirm2.operation;
-                operate.cmdType = CMD.Station.CMD_STATION_POWER_ON_UNLOCK;
-            } else if (this.operation == OperationEvent.Station.execKeyOperationTest.menu.operation) {
-                /** 执行关键操作测试*/
-                operate.operation = OperationEvent.Station.execKeyOperationTest.confirm2.operation;
-                operate.cmdType = CMD.Station.CMD_STATION_KEY_OPERATION_TEST;
-            }
-
-            this.setMessage('');
-            this.writeRecord({ order: ++this.order, date: now(), context: '点击确认2', result: '' });
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                this.timeCountCommand = -1;
-                this.timeCountConfirm = -1;
-                this.setButtonEnable({ step: -1 });
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.editRecord({ order: this.order, date: now(), context: '点击确认2', result: '执行成功' });
-                } else {
-                    this.editRecord({ order: this.order, date: now(), context: '点击确认2', result: '执行失败' });
-                }
-            }).catch(() => {
-                this.timeCountCommand = -1;
-                this.timeCountConfirm = -1;
-                this.setButtonEnable({ step: -1 });
-                this.editRecord({ order: this.order, date: now(), context: '点击确认2', result: '执行异常' });
-            });
-        },
-        stop() {
-            const operate = {};
-
-            if (this.operation == OperationEvent.Station.powerUnLock.menu.operation) {
-                /** 上电解锁*/
-                operate.operation = OperationEvent.Station.powerUnLock.stop.operation;
-            } else if (this.operation == OperationEvent.Station.execKeyOperationTest.menu.operation) {
-                /** 执行关键操作测试*/
-                operate.operation = OperationEvent.Station.execKeyOperationTest.stop.operation;
-            }
-
-            this.writeRecord({ order: ++this.order, date: now(), context: '点击终止', result: '' });
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.setButtonEnable({ step: 0 });
-                    this.editRecord({ order: this.order, date: now(), context: '点击终止', result: '执行成功' });
-                } else {
-                    this.editRecord({ order: this.order, date: now(), context: '点击终止', result: '执行失败' });
-                }
-            }).catch(() => {
-                this.editRecord({ order: this.order, date: now(), context: '点击终止', result: '执行异常' });
-            });
-        },
-        close() {
-            const operate = {
-                operation: OperationEvent.Command.close.menu.operation
-            };
-
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => {
-                this.doClose();
-            });
-        },
-        getOperate(operate) {
-            /** 弹框返回值处理*/
-        },
-        setButtonEnable(param) {
-            this.cmdDisabled = [true, true, true];
-            if (param && param.step >= 0) {
-                this.cmdDisabled[param.step] = false;
-            }
-        },
-        setMessage(message) {
-            this.message = message;
-        },
-        writeRecord(param) {
-            this.tempData.push(param);
-        },
-        editRecord(param) {
-            this.tempData.forEach(elem => {
-                if (elem.order == param.order) {
-                    for (var prop in param) {
-                        elem[prop] = param[prop];
-                    }
-                }
-            });
-        }
-    }
-};
-</script>
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/stationHumanControlAll.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/stationHumanControlAll.vue
deleted file mode 100644
index 97820f35b..000000000
--- a/src/jmapNew/theme/ningbo_01/menus/dialog/stationHumanControlAll.vue
+++ /dev/null
@@ -1,118 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="ningbo-01__systerm station-human-control-all"
-    :title="title"
-    :visible.sync="show"
-    width="360px"
-    :before-close="doClose"
-    :z-index="2000"
-    :modal="false"
-    :close-on-click-modal="false"
-    append-to-body
-  >
-    <div class="context">
-      <span>{{ title }}</span>
-    </div>
-    <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>
-    <notice-info ref="noticeInfo" pop-class="ningbo-01__systerm" />
-  </el-dialog>
-</template>
-
-<script>
-import { OperationEvent } from '@/scripts/ConstDic';
-import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
-import {mouseCancelState} from '@/jmapNew/theme/components/utils/menuItemStatus';
-import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
-
-export default {
-    name: 'StationHumanControlAll',
-    components: {
-        NoticeInfo
-    },
-    data() {
-        return {
-            dialogShow: false,
-            loading: false,
-            selected: null
-        };
-    },
-    computed: {
-        show() {
-            return this.dialogShow && !this.$store.state.menuOperation.break;
-        },
-        title() {
-            return '全集中站进路交人工控';
-        },
-        domIdCancel() {
-            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-        },
-        domIdConfirm() {
-            return this.dialogShow ? OperationEvent.Station.humanControlALL.menu.domId : '';
-        }
-    },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
-    methods: {
-        doShow(operate, selected) {
-            this.selected = selected;
-            if (!this.dialogShow) {
-                this.loading = false;
-            }
-
-            this.dialogShow = true;
-            this.$nextTick(function () {
-                this.$store.dispatch('training/emitTipFresh');
-            });
-        },
-        doClose() {
-            this.loading = false;
-            this.dialogShow = false;
-            this.$store.dispatch('training/emitTipFresh');
-            mouseCancelState(this.selected);
-        },
-        commit() {
-            this.loading = true;
-            commitOperate(menuOperate.Station.humanControlALL, {}, 2).then(({valid, operate})=>{
-                this.loading = false;
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(error=>{
-                this.loading = false;
-                this.doClose();
-                this.$refs.noticeInfo.doShow(error.message);
-            });
-        },
-        cancel() {
-            const operate = {
-                operation: OperationEvent.Command.cancel.menu.operation
-            };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => {
-                this.doClose();
-            });
-        }
-    }
-};
-
-</script>
-<style>
-    .station-human-control-all .context {
-        padding-bottom: 40px !important;
-        border: 1px solid lightgray;
-    }
-</style>
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/stationSetRouteControlAll.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/stationSetRouteControlAll.vue
deleted file mode 100644
index 85f117535..000000000
--- a/src/jmapNew/theme/ningbo_01/menus/dialog/stationSetRouteControlAll.vue
+++ /dev/null
@@ -1,136 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="ningbo-01__systerm station-set-route-control-all"
-    :title="title"
-    :visible.sync="show"
-    width="320px"
-    :before-close="doClose"
-    :z-index="2000"
-    :modal="false"
-    :close-on-click-modal="false"
-    append-to-body
-  >
-    <div style="padding: 0px 10px">
-      <el-form ref="form" size="small" label-width="90px" label-position="left">
-        <el-form-item label="集中站名称:" prop="stationName">
-          <el-input v-model="stationName" size="small" disabled />
-        </el-form-item>
-      </el-form>
-      <el-radio-group v-model="mode">
-        <el-row>
-          <el-radio :label="true">检查冲突</el-radio>
-        </el-row>
-        <el-row style="margin-top: 20px">
-          <el-radio :label="false">不检查冲突</el-radio>
-        </el-row>
-      </el-radio-group>
-    </div>
-    <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>
-    <notice-info ref="noticeInfo" pop-class="ningbo-01__systerm" />
-  </el-dialog>
-</template>
-
-<script>
-import { OperationEvent } from '@/scripts/ConstDic';
-import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
-import {mouseCancelState} from '@/jmapNew/theme/components/utils/menuItemStatus';
-import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
-
-export default {
-    name: 'StationSetRouteControlAll',
-    components: {
-        NoticeInfo
-    },
-    data() {
-        return {
-            dialogShow: false,
-            loading: false,
-            selected: null,
-            stationName: '',
-            mode: true
-        };
-    },
-    computed: {
-        show() {
-            return this.dialogShow && !this.$store.state.menuOperation.break;
-        },
-        title() {
-            return '全集中站设置进路控制模式';
-        },
-        domIdCancel() {
-            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-        },
-        domIdConfirm() {
-            return this.dialogShow ? OperationEvent.Station.atsAutoControlALL.menu.domId : '';
-        }
-    },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
-    methods: {
-        doShow(operate, selected) {
-            this.selected = selected;
-            if (!this.dialogShow) {
-                this.loading = false;
-                this.stationName = '';
-                if (selected) {
-                    this.stationName = selected.name;
-                }
-            }
-
-            this.dialogShow = true;
-            this.$nextTick(function () {
-                this.$store.dispatch('training/emitTipFresh');
-            });
-        },
-        doClose() {
-            this.loading = false;
-            this.dialogShow = false;
-            this.$store.dispatch('training/emitTipFresh');
-            mouseCancelState(this.selected);
-        },
-        commit() {
-            this.loading = true;
-            commitOperate(menuOperate.Station.atsAutoControlALL, {CheckConflict: this.mode}, 2, this.mode).then(({valid, operate})=>{
-                this.loading = false;
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(error=>{
-                this.loading = false;
-                this.doClose();
-                this.$refs.noticeInfo.doShow(error.message);
-            });
-        },
-        cancel() {
-            const operate = {
-                operation: OperationEvent.Command.cancel.menu.operation
-            };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => {
-                this.doClose();
-            });
-        }
-    }
-};
-
-</script>
-<style>
-    .station-set-route-control-all .context {
-        padding-bottom: 40px !important;
-        border: 1px solid lightgray;
-    }
-</style>
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuStation.vue b/src/jmapNew/theme/ningbo_01/menus/menuStation.vue
index edca4148a..918c3424b 100644
--- a/src/jmapNew/theme/ningbo_01/menus/menuStation.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/menuStation.vue
@@ -1,18 +1,18 @@
 <template>
   <div>
     <pop-menu ref="popMenu" :menu="menu" />
-    <station-cmd-control ref="stationCmdControl" />
-    <station-human-control-all ref="stationHumanControlAll" />
-    <station-set-route-control-all ref="stationSetRouteControlAll" />
+    <station-cmd-control ref="stationCmdControl" pop-class="ningbo-01__systerm" />
+    <station-human-control-all ref="stationHumanControlAll" pop-class="ningbo-01__systerm" />
+    <station-set-route-control-all ref="stationSetRouteControlAll" pop-class="ningbo-01__systerm" />
     <notice-info ref="noticeInfo" pop-class="ningbo-01__systerm" />
   </div>
 </template>
 
 <script>
 import PopMenu from '@/components/PopMenu';
-import StationCmdControl from './dialog/stationCmdControl';
-import StationHumanControlAll from './dialog/stationHumanControlAll';
-import StationSetRouteControlAll from './dialog/stationSetRouteControlAll';
+import StationCmdControl from '@/jmapNew/theme/components/menus/dialog/stationCmdControl';
+import StationHumanControlAll from '@/jmapNew/theme/components/menus/dialog/stationHumanControlAll';
+import StationSetRouteControlAll from '@/jmapNew/theme/components/menus/dialog/stationSetRouteControlAll';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import { mapGetters } from 'vuex';
diff --git a/src/jmapNew/theme/xian_01/menus/menuStation.vue b/src/jmapNew/theme/xian_01/menus/menuStation.vue
index 89cc256f6..cc84bf9e6 100644
--- a/src/jmapNew/theme/xian_01/menus/menuStation.vue
+++ b/src/jmapNew/theme/xian_01/menus/menuStation.vue
@@ -1,18 +1,18 @@
 <template>
   <div>
     <pop-menu ref="popMenu" :menu="menu" pop-menu-class="xian-01__systerm" />
-    <station-cmd-control ref="stationCmdControl" />
-    <station-human-control-all ref="stationHumanControlAll" />
-    <station-set-route-control-all ref="stationSetRouteControlAll" />
+    <station-cmd-control ref="stationCmdControl" pop-class="xian-01__systerm" />
+    <station-human-control-all ref="stationHumanControlAll" pop-class="xian-01__systerm" />
+    <station-set-route-control-all ref="stationSetRouteControlAll" pop-class="xian-01__systerm" />
     <notice-info ref="noticeInfo" pop-class="xian-01__systerm" />
   </div>
 </template>
 
 <script>
 import PopMenu from '@/components/PopMenu';
-import StationCmdControl from './dialog/stationCmdControl';
-import StationHumanControlAll from './dialog/stationHumanControlAll';
-import StationSetRouteControlAll from './dialog/stationSetRouteControlAll';
+import StationCmdControl from '@/jmapNew/theme/components/menus/dialog/stationCmdControl';
+import StationHumanControlAll from '@/jmapNew/theme/components/menus/dialog/stationHumanControlAll';
+import StationSetRouteControlAll from '@/jmapNew/theme/components/menus/dialog/stationSetRouteControlAll';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 import { mapGetters } from 'vuex';
 import { OperateMode } from '@/scripts/ConstDic';

From b85362460ed14948c5231b1689ee2e53a6dcf7bb Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Tue, 23 Jun 2020 18:59:20 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=89=A7=E6=9C=AC=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jmapNew/keyboardController.js                    | 12 +++++++-----
 src/views/newMap/displayNew/chatView/chatBox.vue     |  2 +-
 .../scriptManage/display/tipScriptRecordNew.vue      |  8 ++++----
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/jmapNew/keyboardController.js b/src/jmapNew/keyboardController.js
index c8e74c12d..a4e523559 100644
--- a/src/jmapNew/keyboardController.js
+++ b/src/jmapNew/keyboardController.js
@@ -38,12 +38,14 @@ class KeyboardController extends Eventful {
 
     keydown(e) {
         if (this._keyOnDownUp && !e.repeat) {
-            const currentEvent = keyboardEvents[e.key.toUpperCase()];
-            let str = '';
-            if (currentEvent && currentEvent.altKey === e.altKey && currentEvent.ctrlKey === e.ctrlKey && currentEvent.shiftKey === e.shiftKey) {
-                str = currentEvent.event;
+            if (e.key) {
+                const currentEvent = keyboardEvents[e.key.toUpperCase()];
+                let str = '';
+                if (currentEvent && currentEvent.altKey === e.altKey && currentEvent.ctrlKey === e.ctrlKey && currentEvent.shiftKey === e.shiftKey) {
+                    str = currentEvent.event;
+                }
+                this.trigger(this.events.Keyboard, str);
             }
-            this.trigger(this.events.Keyboard, str);
         }
     }
 }
diff --git a/src/views/newMap/displayNew/chatView/chatBox.vue b/src/views/newMap/displayNew/chatView/chatBox.vue
index 5955f57bc..dbff10f86 100644
--- a/src/views/newMap/displayNew/chatView/chatBox.vue
+++ b/src/views/newMap/displayNew/chatView/chatBox.vue
@@ -135,7 +135,7 @@ export default {
         'userRole':function(val) {
             this.isHasCoversition = false;
         }
-
+        // updateCoversitionStatus
     },
     mounted() {
         this.initPage();
diff --git a/src/views/scriptManage/display/tipScriptRecordNew.vue b/src/views/scriptManage/display/tipScriptRecordNew.vue
index d1195f505..40a9ff224 100644
--- a/src/views/scriptManage/display/tipScriptRecordNew.vue
+++ b/src/views/scriptManage/display/tipScriptRecordNew.vue
@@ -96,7 +96,7 @@ export default {
         }
     },
     beforeDestroy() {
-        this.clearAutoSave();
+        // this.clearAutoSave();
         this.$store.dispatch('scriptRecord/updateBgSet', false);
         this.$store.dispatch('scriptRecord/updateRole', null);
     },
@@ -192,14 +192,14 @@ export default {
             saveScriptDataNew(this.group).then(resp => {
                 this.$message.success(this.$t('scriptRecord.saveDataSucess'));
                 this.isSavingScript = false;
-                this.initAutoSaveScript();
+                // this.initAutoSaveScript();
             }).catch(error => {
                 this.$messageBox(`${this.$t('scriptRecord.saveDataFail')}: ${error.message}`);
                 this.isSavingScript = false;
                 if (error.code === 40004 || error.code === 40005 || error.code === 40003) {
-                    this.clearAutoSave();
+                    // this.clearAutoSave();
                 } else {
-                    // this.initAutoSaveScript();
+                    // // this.initAutoSaveScript();
                 }
             });
         },