From f26275e03cae867cc193653741a76eb0efbba799 Mon Sep 17 00:00:00 2001
From: ival <610568032@qq.com>
Date: Mon, 18 Nov 2019 18:47:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../dialog/childDialog/confirmControl.vue | 658 +++++++++---------
src/jmap/theme/beijing_01/menus/index.vue | 92 +--
.../dialog/childDialog/confirmControl.vue | 22 +-
.../menus/dialog/childDialog/confirmTrain.vue | 4 +-
.../menus/dialog/routeCmdControl.vue | 3 +
.../fuzhou_01/menus/dialog/routeControl.vue | 16 +-
.../fuzhou_01/menus/dialog/routeDetail.vue | 4 +-
.../menus/dialog/routeHandControl.vue | 7 +-
.../fuzhou_01/menus/dialog/routeLock.vue | 4 +-
.../menus/dialog/sectionCmdControl.vue | 4 +
.../fuzhou_01/menus/dialog/sectionControl.vue | 10 +-
.../menus/dialog/speedCmdControl.vue | 5 +
.../menus/dialog/standBackStrategy.vue | 2 +
.../fuzhou_01/menus/dialog/standControl.vue | 15 +-
.../menus/dialog/standDetainTrainAll.vue | 2 +
.../menus/dialog/stationCmdControl.vue | 3 +
.../menus/dialog/stationHumanControlAll.vue | 4 +-
.../dialog/stationSetRouteControlAll.vue | 2 +
.../menus/dialog/switchCmdControl.vue | 5 +
.../fuzhou_01/menus/dialog/switchControl.vue | 19 +-
.../fuzhou_01/menus/dialog/trainControl.vue | 5 +
.../fuzhou_01/menus/dialog/trainCreate.vue | 2 +
.../fuzhou_01/menus/dialog/trainDelete.vue | 2 +
.../menus/dialog/trainEditNumber.vue | 4 +-
.../fuzhou_01/menus/dialog/trainMove.vue | 4 +-
.../fuzhou_01/menus/dialog/trainSwitch.vue | 4 +-
.../childDialog/twoConfirmation.vue | 4 +
.../theme/fuzhou_01/menus/menuSection.vue | 10 +-
src/jmap/theme/fuzhou_01/menus/menuSignal.vue | 22 +-
.../theme/fuzhou_01/menus/menuStation.vue | 13 +-
.../fuzhou_01/menus/menuStationStand.vue | 19 +-
src/jmap/theme/fuzhou_01/menus/menuSwitch.vue | 10 +-
src/jmap/theme/fuzhou_01/menus/menuTrain.vue | 10 +-
.../fuzhou_01/menus/passiveDialog/control.vue | 3 +
src/main.js | 1 -
src/scripts/plugin/CommandHandler.js | 23 +-
src/scripts/plugin/Commands.js | 243 +++++++
src/scripts/plugin/OperateHandler.js | 207 +-----
src/scripts/plugin/OperateHandler1.js | 147 ++++
src/scripts/plugin/OperateHandler2.js | 179 +++++
src/store/modules/training.js | 3 +-
41 files changed, 1155 insertions(+), 641 deletions(-)
create mode 100644 src/scripts/plugin/Commands.js
create mode 100644 src/scripts/plugin/OperateHandler1.js
create mode 100644 src/scripts/plugin/OperateHandler2.js
diff --git a/src/jmap/theme/batong_01/menus/dialog/childDialog/confirmControl.vue b/src/jmap/theme/batong_01/menus/dialog/childDialog/confirmControl.vue
index 48ea2bacb..b12296702 100644
--- a/src/jmap/theme/batong_01/menus/dialog/childDialog/confirmControl.vue
+++ b/src/jmap/theme/batong_01/menus/dialog/childDialog/confirmControl.vue
@@ -1,355 +1,365 @@
-
-
-
- {{message}}
-
-
-
-
- 确定
-
-
- 取 消
-
-
-
-
+
+
+
+ {{ message }}
+
+
+
+
+ 确定
+
+
+ 取 消
+
+
+
+
\ No newline at end of file
+
diff --git a/src/jmap/theme/beijing_01/menus/index.vue b/src/jmap/theme/beijing_01/menus/index.vue
index 64aac8c71..60e92cc34 100644
--- a/src/jmap/theme/beijing_01/menus/index.vue
+++ b/src/jmap/theme/beijing_01/menus/index.vue
@@ -37,54 +37,54 @@ import PassiveContorl from './passiveDialog/control';
import PassiveTimeout from './passiveDialog/timeout';
export default {
- name: 'Menus',
- components: {
- MenuBar,
- MenuButton,
- MenuCancel,
- MenuSignal,
- MenuSwitch,
- MenuSection,
- MenuStationControl,
- MenuStationStand,
- MenuStation,
- MenuTrain,
- MenuLimit,
- PassiveAlarm,
- PassiveContorl,
- PassiveTimeout
- },
- props: {
- selected: {
- type: Object,
- default() {
- return null;
- }
- }
- },
- computed: {
- ...mapGetters('config', [
- 'width'
- ]),
- isShowAll() {
- return this.$route.params.mode !== 'dp' &&
+ name: 'Menus',
+ components: {
+ MenuBar,
+ MenuButton,
+ MenuCancel,
+ MenuSignal,
+ MenuSwitch,
+ MenuSection,
+ MenuStationControl,
+ MenuStationStand,
+ MenuStation,
+ MenuTrain,
+ MenuLimit,
+ PassiveAlarm,
+ PassiveContorl,
+ PassiveTimeout
+ },
+ props: {
+ selected: {
+ type: Object,
+ default() {
+ return null;
+ }
+ }
+ },
+ computed: {
+ ...mapGetters('config', [
+ 'width'
+ ]),
+ isShowAll() {
+ return this.$route.params.mode !== 'dp' &&
this.$route.params.mode !== 'plan' &&
this.$store.state.training.roles != 'BigScreen';
- },
- isShowBar() {
- return this.$store.state.training.prdType;
- }
- },
- watch: {
- isShowBar(val) {
- val && this.$store.dispatch('config/updateMenuBar');
- }
- },
- mounted() {
- this.$nextTick(() => {
- this.$store.dispatch('config/updateMenuBar');
- });
- }
+ },
+ isShowBar() {
+ return this.$store.state.training.prdType;
+ }
+ },
+ watch: {
+ isShowBar(val) {
+ val && this.$store.dispatch('config/updateMenuBar');
+ }
+ },
+ mounted() {
+ this.$nextTick(() => {
+ this.$store.dispatch('config/updateMenuBar');
+ });
+ }
};
diff --git a/src/jmap/theme/fuzhou_01/menus/dialog/childDialog/confirmControl.vue b/src/jmap/theme/fuzhou_01/menus/dialog/childDialog/confirmControl.vue
index b9216b44b..a2757967f 100644
--- a/src/jmap/theme/fuzhou_01/menus/dialog/childDialog/confirmControl.vue
+++ b/src/jmap/theme/fuzhou_01/menus/dialog/childDialog/confirmControl.vue
@@ -30,6 +30,7 @@