joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

修改代码

Browse Source
This commit is contained in:
ival 2019-11-20 10:39:46 +08:00
parent 898135a61b
commit 0c6d17647a
39 changed files with 129 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -30,7 +30,7 @@
"storejs": "^1.0.25",
"three": "^0.107.0",
"vue-i18n": "^8.12.0",
"vuedraggable": "^2.20.0",
"vuedraggable": "^2.23.2",
"xlsx": "^0.14.2",
"zrender": "^4.0.4"
},

20
src/jmap/theme/fuzhou_01/menus/dialog/childDialog/confirmControl.vue
View File

@ -30,7 +30,7 @@
<script>
import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
import Commands from '@/scripts/plugin/Commands';
import CommandEnum from '@/scripts/plugin/CommandEnum';
import NoticeInfo from './childDialog/noticeInfo';
export default {
@ -170,7 +170,7 @@ export default {
send: true,
type: this.operate.type,
operation: OperationEvent.Signal.arrangementRoute.confirm.operation,
commandType: Commands.Signal.arrangementRoute
commandType: CommandEnum.Signal.arrangementRoute
};
this.loading = true;
@ -191,7 +191,7 @@ export default {
send: true,
type: this.operate.type,
operation: OperationEvent.Signal.signalClose.confirm.operation,
commandType: Commands.Signal.signalClose
commandType: CommandEnum.Signal.signalClose
};
this.loading = true;
@ -212,7 +212,7 @@ export default {
send: true,
type: this.operate.type,
operation: OperationEvent.Signal.reopenSignal.confirm.operation,
commandType: Commands.Signal.reopenSignal
commandType: CommandEnum.Signal.reopenSignal
};
this.loading = true;
@ -233,7 +233,7 @@ export default {
send: true,
type: this.operate.type,
operation: OperationEvent.Signal.cancelTrainRoute.confirm.operation,
commandType: Commands.Signal.cancelTrainRoute
commandType: CommandEnum.Signal.cancelTrainRoute
};
this.loading = true;
@ -254,7 +254,7 @@ export default {
send: true,
type: MapDeviceType.Signal.type,
operation: OperationEvent.Signal.humanControl.menu.operation,
commandType: Commands.Signal.humanControl
commandType: CommandEnum.Signal.humanControl
};
this.loading = true;
@ -275,7 +275,7 @@ export default {
send: true,
type: MapDeviceType.Signal.type,
operation: OperationEvent.Signal.atsAutoControl.menu.operation,
commandType: Commands.Signal.atsAutoControl
commandType: CommandEnum.Signal.atsAutoControl
};
this.loading = true;
@ -296,7 +296,7 @@ export default {
send: true,
type: this.operate.type,
operation: OperationEvent.StationStand.setRunLevel.confirm.operation,
commandType: Commands.StationStand.setRunLevel,
commandType: CommandEnum.StationStand.setRunLevel,
val: this.operate.val
};
@ -318,7 +318,7 @@ export default {
send: true,
type: this.operate.type,
operation: OperationEvent.StationStand.setStopTime.confirm.operation,
commandType: Commands.StationStand.setStopTime,
commandType: CommandEnum.StationStand.setStopTime,
val: this.operate.val
};
@ -340,7 +340,7 @@ export default {
send: true,
type: this.operate.type,
operation: OperationEvent.StationStand.setBackStrategy.confirm.operation,
commandType: Commands.StationStand.setBackStrategy,
commandType: CommandEnum.StationStand.setBackStrategy,
val: this.operate.val
};

4
src/jmap/theme/fuzhou_01/menus/dialog/childDialog/confirmTrain.vue
View File

@ -31,7 +31,7 @@
<script>
import { OperationEvent } from '@/scripts/ConstDic';
import NoticeInfo from './childDialog/noticeInfo';
import Commands from '@/scripts/plugin/Commands';
import CommandEnum from '@/scripts/plugin/CommandEnum';
export default {
name: 'ConfirmTrain',
@ -141,7 +141,7 @@ export default {
send: true,
type: this.operate.type,
operation: OperationEvent.Train.addTrainId.confirm.operation,
commandType: Commands.Train.addTrainId
commandType: CommandEnum.Train.addTrainId
};
this.loading = true;

2
src/jmap/theme/fuzhou_01/menus/dialog/routeCmdControl.vue
View File

@ -86,7 +86,7 @@
import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
import { now } from '@/utils/date';
import ConfirmSignalUnlock from './childDialog/confirmSignalUnlock';
import Commands from '@/scripts/plugin/Commands';
import CommandEnum from '@/scripts/plugin/CommandEnum';
export default {
name: 'RouteCmdControl',

12
src/jmap/theme/fuzhou_01/menus/dialog/routeControl.vue
View File

@ -39,7 +39,7 @@
import { MapDeviceType, OperationEvent, getDomIdByOperation } from '@/scripts/ConstDic';
import ConfirmControl from './childDialog/confirmControl';
import NoticeInfo from './childDialog/childDialog/noticeInfo';
import Commands from '@/scripts/plugin/Commands';
import CommandEnum from '@/scripts/plugin/CommandEnum';
export default {
name: 'RouteControl',
@ -157,7 +157,7 @@ export default {
send: true,
type: MapDeviceType.Signal.type,
operation: OperationEvent.Signal.cancelTrainRoute.menu.operation,
commandType: Commands.Signal.cancelTrainRoute
commandType: CommandEnum.Signal.cancelTrainRoute
};
this.loading = true;
@ -238,7 +238,7 @@ export default {
send: true,
type: MapDeviceType.Signal.type,
operation: OperationEvent.Signal.setAutoInterlock.menu.operation,
commandType: Commands.Signal.setAutoInterlock
commandType: CommandEnum.Signal.setAutoInterlock
};
this.loading = true;
@ -259,7 +259,7 @@ export default {
send: true,
type: MapDeviceType.Signal.type,
operation: OperationEvent.Signal.cancelAutoInterlock.menu.operation,
commandType: Commands.Signal.cancelAutoInterlock
commandType: CommandEnum.Signal.cancelAutoInterlock
};
this.loading = true;
@ -280,7 +280,7 @@ export default {
send: true,
type: MapDeviceType.Signal.type,
operation: OperationEvent.Signal.setAutoTrigger.menu.operation,
commandType: Commands.Signal.setAutoTrigger
commandType: CommandEnum.Signal.setAutoTrigger
};
this.loading = true;
@ -301,7 +301,7 @@ export default {
send: true,
type: MapDeviceType.Signal.type,
operation: OperationEvent.Signal.cancelAutoTrigger.menu.operation,
commandType: Commands.Signal.cancelAutoTrigger
commandType: CommandEnum.Signal.cancelAutoTrigger
};
this.doClose();

4
src/jmap/theme/fuzhou_01/menus/dialog/routeDetail.vue
View File

@ -64,7 +64,7 @@
import { mapGetters } from 'vuex';
import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
import NoticeInfo from './childDialog/childDialog/noticeInfo';
import Commands from '@/scripts/plugin/Commands';
import CommandEnum from '@/scripts/plugin/CommandEnum';
export default {
name: 'RouteDetail',
@ -133,7 +133,7 @@ export default {
send: true,
type: MapDeviceType.Signal.type,
operation: OperationEvent.Signal.detail.menu.operation,
commandType: Commands.Signal.detail
commandType: CommandEnum.Signal.detail
};
this.loading = true;

6
src/jmap/theme/fuzhou_01/menus/dialog/routeHandControl.vue
View File

@ -82,7 +82,7 @@ import { mapGetters } from 'vuex';
import { MapDeviceType, OperationEvent, getDomIdByOperation } from '@/scripts/ConstDic';
import ConfirmControl from './childDialog/confirmControl';
import NoticeInfo from './childDialog/childDialog/noticeInfo';
import Commands from '@/scripts/plugin/Commands';
import CommandEnum from '@/scripts/plugin/CommandEnum';
export default {
name: 'RouteHandControl',
@ -265,7 +265,7 @@ export default {
send: true,
type: MapDeviceType.Signal.type,
operation: OperationEvent.Signal.humanControl.menu.operation,
commandType: Commands.Signal.humanControl
commandType: CommandEnum.Signal.humanControl
};
this.loading = true;
@ -286,7 +286,7 @@ export default {
send: true,
type: MapDeviceType.Signal.type,
operation: OperationEvent.Signal.atsAutoControl.menu.operation,
commandType: Commands.Signal.atsAutoControl
commandType: CommandEnum.Signal.atsAutoControl
};
this.loading = true;

4
src/jmap/theme/fuzhou_01/menus/dialog/routeLock.vue
View File

@ -55,7 +55,7 @@
import { mapGetters } from 'vuex';
import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
import NoticeInfo from './childDialog/childDialog/noticeInfo';
import Commands from '@/scripts/plugin/Commands';
import CommandEnum from '@/scripts/plugin/CommandEnum';
export default {
name: 'RouteLock',
@ -135,7 +135,7 @@ export default {
send: true,
type: MapDeviceType.Signal.type,
operation: OperationEvent.Signal.lock.menu.operation,
commandType: Commands.Signal.lock
commandType: CommandEnum.Signal.lock
};
this.loading = true;

2
src/jmap/theme/fuzhou_01/menus/dialog/sectionCmdControl.vue
View File

@ -84,7 +84,7 @@
<script>
import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
import { now } from '@/utils/date';
import Commands from '@/scripts/plugin/Commands';
import CommandEnum from '@/scripts/plugin/CommandEnum';
export default {
name: 'SectionCmdControl',

8
src/jmap/theme/fuzhou_01/menus/dialog/sectionControl.vue
View File

@ -37,7 +37,7 @@
<script>
import { MapDeviceType, OperationEvent, getDomIdByOperation } from '@/scripts/ConstDic';
import NoticeInfo from './childDialog/childDialog/noticeInfo';
import Commands from '@/scripts/plugin/Commands';
import CommandEnum from '@/scripts/plugin/CommandEnum';
export default {
name: 'SectionControl',
@ -128,7 +128,7 @@ export default {
send: true,
type: MapDeviceType.Section.type,
operation: OperationEvent.Section.lock.menu.operation,
commandType: Commands.Section.lock
commandType: CommandEnum.Section.lock
};
this.loading = true;
@ -149,7 +149,7 @@ export default {
send: true,
type: MapDeviceType.Section.type,
operation: OperationEvent.Section.split.menu.operation,
commandType: Commands.Section.split
commandType: CommandEnum.Section.split
};
this.loading = true;
@ -170,7 +170,7 @@ export default {
send: true,
type: MapDeviceType.Section.type,
operation: OperationEvent.Section.active.menu.operation,
commandType: Commands.Section.active
commandType: CommandEnum.Section.active
};
this.loading = true;

2
src/jmap/theme/fuzhou_01/menus/dialog/speedCmdControl.vue
View File

@ -99,7 +99,7 @@
import { OperationEvent } from '@/scripts/ConstDic';
import ConfirmControlSpeed from './childDialog/confirmControlSpeed';
import { now } from '@/utils/date';
import Commands from '@/scripts/plugin/Commands';
import CommandEnum from '@/scripts/plugin/CommandEnum';
export default {
name: 'SectionCmdSpeed',

4
src/jmap/theme/fuzhou_01/menus/dialog/standBackStrategy.vue
View File

@ -82,7 +82,7 @@
<script>
import ConfirmControl from './childDialog/confirmControl';
import NoticeInfo from './childDialog/childDialog/noticeInfo';
import Commands from '@/scripts/plugin/Commands';
import CommandEnum from '@/scripts/plugin/CommandEnum';
import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
import { mapGetters } from 'vuex';
@ -215,7 +215,7 @@ export default {
send: true,
type: MapDeviceType.StationStand.type,
operation: OperationEvent.StationStand.setBackStrategy.menu.operation,
commandType: Commands.StationStand.setBackStrategy,
commandType: CommandEnum.StationStand.setBackStrategy,
val: `${this.strategy}`
};

14
src/jmap/theme/fuzhou_01/menus/dialog/standControl.vue
View File

@ -28,7 +28,7 @@
<script>
import { MapDeviceType, OperationEvent, getDomIdByOperation } from '@/scripts/ConstDic';
import NoticeInfo from './childDialog/childDialog/noticeInfo';
import Commands from '@/scripts/plugin/Commands';
import CommandEnum from '@/scripts/plugin/CommandEnum';
export default {
name: 'StandDetainTrain',
@ -127,7 +127,7 @@ export default {
send: true,
type: MapDeviceType.StationStand.type,
operation: OperationEvent.StationStand.setDetainTrain.menu.operation,
commandType: Commands.StationStand.setDetainTrain
commandType: CommandEnum.StationStand.setDetainTrain
};
this.loading = true;
@ -149,7 +149,7 @@ export default {
send: true,
type: MapDeviceType.StationStand.type,
operation: OperationEvent.StationStand.cancelDetainTrain.menu.operation,
commandType: Commands.StationStand.cancelDetainTrain
commandType: CommandEnum.StationStand.cancelDetainTrain
};
this.loading = true;
@ -171,7 +171,7 @@ export default {
send: true,
type: MapDeviceType.StationStand.type,
operation: OperationEvent.StationStand.cancelDetainTrainForce.menu.operation,
commandType: Commands.StationStand.cancelDetainTrainForce
commandType: CommandEnum.StationStand.cancelDetainTrainForce
};
this.loading = true;
@ -193,7 +193,7 @@ export default {
send: true,
type: MapDeviceType.StationStand.type,
operation: OperationEvent.StationStand.earlyDeparture.menu.operation,
commandType: Commands.StationStand.earlyDeparture
commandType: CommandEnum.StationStand.earlyDeparture
};
this.loading = true;
@ -214,7 +214,7 @@ export default {
send: true,
type: MapDeviceType.StationStand.type,
operation: OperationEvent.StationStand.setJumpStop.menu.operation,
commandType: Commands.StationStand.setJumpStop,
commandType: CommandEnum.StationStand.setJumpStop,
val: this.selected.direction // 站台的上下行方向, 01:下行 /02:上行
};
@ -236,7 +236,7 @@ export default {
send: true,
type: MapDeviceType.StationStand.type,
operation: OperationEvent.StationStand.cancelJumpStop.menu.operation,
commandType: Commands.StationStand.cancelJumpStop,
commandType: CommandEnum.StationStand.cancelJumpStop,
val: this.selected.direction // 站台的上下行方向, 01:下行 /02:上行
};

4
src/jmap/theme/fuzhou_01/menus/dialog/standDetainTrainAll.vue
View File

@ -57,7 +57,7 @@
import { mapGetters } from 'vuex';
import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
import NoticeInfo from './childDialog/childDialog/noticeInfo';
import Commands from '@/scripts/plugin/Commands';
import CommandEnum from '@/scripts/plugin/CommandEnum';
export default {
name: 'StandDetainTrainAll',
@ -158,7 +158,7 @@ export default {
send: true,
type: MapDeviceType.StationStand.type,
operation: OperationEvent.StationStand.cancelDetainTrainAll.menu.operation,
commandType: Commands.StationStand.cancelDetainTrainAll,
commandType: CommandEnum.StationStand.cancelDetainTrainAll,
val: this.upDown
};

2
src/jmap/theme/fuzhou_01/menus/dialog/stationCmdControl.vue
View File

@ -79,7 +79,7 @@
<script>
import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
import { now } from '@/utils/date';
import Commands from '@/scripts/plugin/Commands';
import CommandEnum from '@/scripts/plugin/CommandEnum';
export default {
name: 'StationCmdControl',

4
src/jmap/theme/fuzhou_01/menus/dialog/stationHumanControlAll.vue
View File

@ -29,7 +29,7 @@
<script>
import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
import NoticeInfo from './childDialog/childDialog/noticeInfo';
import Commands from '@/scripts/plugin/Commands';
import CommandEnum from '@/scripts/plugin/CommandEnum';
export default {
name: 'StationHumanControlAll',
@ -85,7 +85,7 @@ export default {
type: MapDeviceType.Station.type,
label: MapDeviceType.Station.label,
operation: OperationEvent.Station.humanControlALL.menu.operation,
commandType: Commands.Station.humanControlALL
commandType: CommandEnum.Station.humanControlALL
};
this.loading = true;

4
src/jmap/theme/fuzhou_01/menus/dialog/stationSetRouteControlAll.vue
View File

@ -41,7 +41,7 @@
<script>
import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
import NoticeInfo from './childDialog/childDialog/noticeInfo';
import Commands from '@/scripts/plugin/Commands';
import CommandEnum from '@/scripts/plugin/CommandEnum';
export default {
name: 'StationSetRouteControlAll',
@ -103,7 +103,7 @@ export default {
type: MapDeviceType.Station.type,
label: MapDeviceType.Station.label,
operation: OperationEvent.Station.atsAutoControlALL.menu.operation,
commandType: Commands.Station.atsAutoControlALL,
commandType: CommandEnum.Station.atsAutoControlALL,
val: this.mode
};

2
src/jmap/theme/fuzhou_01/menus/dialog/switchCmdControl.vue
View File

@ -84,7 +84,7 @@
<script>
import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
import { now } from '@/utils/date';
import Commands from '@/scripts/plugin/Commands';
import CommandEnum from '@/scripts/plugin/CommandEnum';
export default {
name: 'SwitchCmdControl',

14
src/jmap/theme/fuzhou_01/menus/dialog/switchControl.vue
View File

@ -47,7 +47,7 @@
<script>
import { MapDeviceType, OperationEvent, getDomIdByOperation } from '@/scripts/ConstDic';
import NoticeInfo from './childDialog/childDialog/noticeInfo';
import Commands from '@/scripts/plugin/Commands';
import CommandEnum from '@/scripts/plugin/CommandEnum';
export default {
name: 'SwitchControl',
@ -156,7 +156,7 @@ export default {
send: true,
type: MapDeviceType.Switch.type,
operation: OperationEvent.Switch.lock.menu.operation,
commandType: Commands.Switch.lock
commandType: CommandEnum.Switch.lock
};
this.loading = true;
@ -177,7 +177,7 @@ export default {
send: true,
type: MapDeviceType.Switch.type,
operation: OperationEvent.Switch.block.menu.operation,
commandType: Commands.Switch.block
commandType: CommandEnum.Switch.block
};
this.loading = true;
@ -198,7 +198,7 @@ export default {
send: true,
type: MapDeviceType.Switch.type,
operation: OperationEvent.Switch.turnout.menu.operation,
commandType: Commands.Switch.turnout
commandType: CommandEnum.Switch.turnout
};
this.loading = true;
@ -219,7 +219,7 @@ export default {
send: true,
type: MapDeviceType.Switch.type,
operation: OperationEvent.Switch.turnoutForce.menu.operation,
commandType: Commands.Switch.turnoutForce
commandType: CommandEnum.Switch.turnoutForce
};
this.loading = true;
this.$store.dispatch('training/next', operate).then(({ valid }) => {
@ -239,7 +239,7 @@ export default {
send: true,
type: MapDeviceType.Switch.type,
operation: OperationEvent.Switch.split.menu.operation,
commandType: Commands.Switch.split
commandType: CommandEnum.Switch.split
};
this.loading = true;
this.$store.dispatch('training/next', operate).then(({ valid }) => {
@ -259,7 +259,7 @@ export default {
send: true,
type: MapDeviceType.Switch.type,
operation: OperationEvent.Switch.active.menu.operation,
commandType: Commands.Switch.active
commandType: CommandEnum.Switch.active
};
this.loading = true;
this.$store.dispatch('training/next', operate).then(({ valid }) => {

6
src/jmap/theme/fuzhou_01/menus/dialog/trainControl.vue
View File

@ -84,7 +84,7 @@
<script>
import { mapGetters } from 'vuex';
import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
import Commands from '@/scripts/plugin/Commands';
import CommandEnum from '@/scripts/plugin/CommandEnum';
import ConfirmTrain from './childDialog/confirmTrain';
import NoticeInfo from './childDialog/childDialog/noticeInfo';
import OperateHandler from '@/scripts/plugin/OperateHandler';
@ -399,7 +399,7 @@ export default {
send: true,
type: MapDeviceType.Train.type,
operation: OperationEvent.Train.addTrainId.menu.operation,
commandType: Commands.Train.addTrainId,
commandType: CommandEnum.Train.addTrainId,
messages: [this.$t('tip.addTrainIdTip')],
val: `${model.groupNumber}::${model.trainType}::${model.serviceNumber}::${model.tripNumber}::${model.targetCode}`
};
@ -430,7 +430,7 @@ export default {
send: true,
type: MapDeviceType.Train.type,
operation: OperationEvent.Train.editTrainId.menu.operation,
commandType: Commands.Train.editTrainId,
commandType: CommandEnum.Train.editTrainId,
messages: [this.$t('tip.editTrainIdTip')],
val: `${this.formModel.trainType}::${this.formModel.tripNumber}`
};

4
src/jmap/theme/fuzhou_01/menus/dialog/trainCreate.vue
View File

@ -40,7 +40,7 @@
import { mapGetters } from 'vuex';
import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
import NoticeInfo from './childDialog/childDialog/noticeInfo';
import Commands from '@/scripts/plugin/Commands';
import CommandEnum from '@/scripts/plugin/CommandEnum';
export default {
name: 'RouteCreate',
@ -121,7 +121,7 @@ export default {
send: true,
type: MapDeviceType.Section.type,
operation: OperationEvent.Section.newtrain.menu.operation,
commandType: Commands.Section.newtrain,
commandType: CommandEnum.Section.newtrain,
val: '' + this.direction + '::' + this.trainCode
};
this.loading = true;

4
src/jmap/theme/fuzhou_01/menus/dialog/trainDelete.vue
View File

@ -34,7 +34,7 @@ import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
// import { getPublishMapTrainNos } from '@/api/runplan';
import ConfirmControl from './childDialog/confirmControl';
import NoticeInfo from './childDialog/childDialog/noticeInfo';
import Commands from '@/scripts/plugin/Commands';
import CommandEnum from '@/scripts/plugin/CommandEnum';
export default {
name: 'TrainDelete',
@ -130,7 +130,7 @@ export default {
send: true,
type: MapDeviceType.Train.type,
operation: OperationEvent.Train.delTrainId.menu.operation,
commandType: Commands.Train.delTrainId,
commandType: CommandEnum.Train.delTrainId,
val: this.formModel.groupNumber
};

4
src/jmap/theme/fuzhou_01/menus/dialog/trainEditNumber.vue
View File

@ -29,7 +29,7 @@
<script>
import { mapGetters } from 'vuex';
import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
import Commands from '@/scripts/plugin/Commands';
import CommandEnum from '@/scripts/plugin/CommandEnum';
export default {
name: 'TrainMove',
@ -93,7 +93,7 @@ export default {
send: true,
type: MapDeviceType.Train.type,
operation: OperationEvent.Train.editTrainNo.menu.operation,
commandType: Commands.Train.editTrainNo
commandType: CommandEnum.Train.editTrainNo
};
this.loading = true;

4
src/jmap/theme/fuzhou_01/menus/dialog/trainMove.vue
View File

@ -75,7 +75,7 @@
<script>
import { mapGetters } from 'vuex';
import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
import Commands from '@/scripts/plugin/Commands';
import CommandEnum from '@/scripts/plugin/CommandEnum';
export default {
name: 'TrainMove',
@ -155,7 +155,7 @@ export default {
send: true,
type: MapDeviceType.Train.type,
operation: OperationEvent.Train.moveTrainId.menu.operation,
commandType: Commands.Train.moveTrainId
commandType: CommandEnum.Train.moveTrainId
};
this.loading = true;

4
src/jmap/theme/fuzhou_01/menus/dialog/trainSwitch.vue
View File

@ -76,7 +76,7 @@
<script>
import { mapGetters } from 'vuex';
import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
import Commands from '@/scripts/plugin/Commands';
import CommandEnum from '@/scripts/plugin/CommandEnum';
export default {
name: 'TrainSwitch',
@ -160,7 +160,7 @@ export default {
send: true,
type: MapDeviceType.Train.type,
operation: OperationEvent.Train.moveTrainId.menu.operation,
commandType: Commands.Train.moveTrainId
commandType: CommandEnum.Train.moveTrainId
};
this.loading = true;

2
src/jmap/theme/fuzhou_01/menus/menuDialog/childDialog/twoConfirmation.vue
View File

@ -32,7 +32,7 @@
<script>
import { OperationEvent, checkOperationIsCurrentOperate } from '@/scripts/ConstDic';
import NoticeInfo from '../../dialog/childDialog/childDialog/noticeInfo';
import Commands from '@/scripts/plugin/Commands';
import CommandEnum from '@/scripts/plugin/CommandEnum';
export default {
name: 'TwoConfirmation',

10
src/jmap/theme/fuzhou_01/menus/menuSection.vue
View File

@ -16,7 +16,7 @@ import SectionCmdControl from './dialog/sectionCmdControl';
import SpeedCmdControl from './dialog/speedCmdControl';
import TrainCreate from './dialog/trainCreate';
import NoticeInfo from './dialog/childDialog/childDialog/noticeInfo';
import Commands from '@/scripts/plugin/Commands';
import CommandEnum from '@/scripts/plugin/CommandEnum';
import { mapGetters } from 'vuex';
import { OperateMode } from '@/scripts/ConstDic';
import { MapDeviceType, OperationEvent, DeviceMenu } from '@/scripts/ConstDic';
@ -226,8 +226,10 @@ export default {
type: MapDeviceType.Section.type,
label: MapDeviceType.Section.label,
operation: OperationEvent.Section.stoppage.menu.operation,
commandType: Commands.Section.stoppage
commandType: CommandEnum.Section.stoppage,
commandParams: null
};
this.$store.dispatch('training/next', operate).then(({ valid }) => {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
@ -247,7 +249,7 @@ export default {
type: MapDeviceType.Section.type,
label: MapDeviceType.Section.label,
operation: OperationEvent.Section.cancelStoppage.menu.operation,
commandType: Commands.Section.cancelStoppage
commandType: CommandEnum.Section.cancelStoppage
};
this.$store.dispatch('training/next', operate).then(({ valid }) => {
if (valid) {
@ -380,7 +382,7 @@ export default {
type: MapDeviceType.Section.type,
label: MapDeviceType.Section.label,
operation: OperationEvent.Section.cancelSpeed.menu.operation,
commandType: Commands.Section.query
commandType: CommandEnum.Section.query
};
this.$store.dispatch('training/next', operate).then(({ valid, response }) => {
if (valid) {

16
src/jmap/theme/fuzhou_01/menus/menuSignal.vue
View File

@ -20,7 +20,7 @@ import RouteCmdControl from './dialog/routeCmdControl';
import RouteHandControl from './dialog/routeHandControl';
import RouteDetail from './dialog/routeDetail';
import NoticeInfo from './dialog/childDialog/childDialog/noticeInfo';
import Commands from '@/scripts/plugin/Commands';
import CommandEnum from '@/scripts/plugin/CommandEnum';
import { mapGetters } from 'vuex';
import { OperateMode } from '@/scripts/ConstDic';
import { MapDeviceType, OperationEvent, DeviceMenu } from '@/scripts/ConstDic';
@ -261,7 +261,7 @@ export default {
type: MapDeviceType.Signal.type,
label: MapDeviceType.Signal.label,
operation: OperationEvent.Signal.stoppage.menu.operation,
commandType: Commands.Signal.stoppage
commandType: CommandEnum.Signal.stoppage
};
this.$store.dispatch('training/next', operate).then(({ valid }) => {
if (valid) {
@ -282,7 +282,7 @@ export default {
type: MapDeviceType.Signal.type,
label: MapDeviceType.Signal.label,
operation: OperationEvent.Signal.cancelStoppage.menu.operation,
commandType: Commands.Signal.cancelStoppage
commandType: CommandEnum.Signal.cancelStoppage
};
this.$store.dispatch('training/next', operate).then(({ valid }) => {
if (valid) {
@ -303,7 +303,7 @@ export default {
type: MapDeviceType.Signal.type,
label: MapDeviceType.Signal.label,
operation: OperationEvent.Signal.arrangementRoute.menu.operation,
commandType: Commands.Signal.query
commandType: CommandEnum.Signal.query
};
this.$store.dispatch('training/next', operate).then(({ valid, response }) => {
@ -344,7 +344,7 @@ export default {
type: MapDeviceType.Signal.type,
label: MapDeviceType.Signal.label,
operation: OperationEvent.Signal.lock.menu.operation,
commandType: Commands.Signal.lock
commandType: CommandEnum.Signal.lock
};
this.$store.dispatch('training/next', operate).then(({ valid }) => {
@ -493,7 +493,7 @@ export default {
type: MapDeviceType.Signal.type,
label: MapDeviceType.Signal.label,
operation: OperationEvent.Signal.humanControl.menu.operation,
commandType: Commands.Signal.query
commandType: CommandEnum.Signal.query
};
this.$store.dispatch('training/next', operate).then(({ valid, response }) => {
if (valid) {
@ -515,7 +515,7 @@ export default {
type: MapDeviceType.Signal.type,
label: MapDeviceType.Signal.label,
operation: OperationEvent.Signal.atsAutoControl.menu.operation,
commandType: Commands.Signal.query
commandType: CommandEnum.Signal.query
};
this.$store.dispatch('training/next', operate).then(({ valid, response }) => {
if (valid) {
@ -537,7 +537,7 @@ export default {
type: MapDeviceType.Signal.type,
label: MapDeviceType.Signal.label,
operation: OperationEvent.Signal.detail.menu.operation,
commandType: Commands.Signal.query
commandType: CommandEnum.Signal.query
};
this.$store.dispatch('training/next', operate).then(({ valid, response }) => {
if (valid) {

10
src/jmap/theme/fuzhou_01/menus/menuStation.vue
View File

@ -18,7 +18,7 @@ import { mapGetters } from 'vuex';
import { OperateMode } from '@/scripts/ConstDic';
import { MapDeviceType, OperationEvent, DeviceMenu } from '@/scripts/ConstDic';
import { MenuDisabledState, menuConvert, menuFiltration } from './utils/menuItemStatus';
import Commands from '@/scripts/plugin/Commands';
import CommandEnum from '@/scripts/plugin/CommandEnum';
export default {
name: 'StationMenu',
@ -167,7 +167,7 @@ export default {
type: MapDeviceType.Station.type,
label: MapDeviceType.Station.label,
operation: OperationEvent.Station.stoppage.menu.operation,
commandType: Commands.Station.stoppage
commandType: CommandEnum.Station.stoppage
};
this.$store.dispatch('training/next', operate).then(({ valid }) => {
if (valid) {
@ -188,7 +188,7 @@ export default {
type: MapDeviceType.Station.type,
label: MapDeviceType.Station.label,
operation: OperationEvent.Station.cancelStoppage.menu.operation,
commandType: Commands.Station.cancelStoppage
commandType: CommandEnum.Station.cancelStoppage
};
this.$store.dispatch('training/next', operate).then(({ valid }) => {
if (valid) {
@ -209,7 +209,7 @@ export default {
type: MapDeviceType.Station.type,
label: MapDeviceType.Station.label,
operation: OperationEvent.Station.setAutoTrigger.menu.operation,
commandType: Commands.Station.setAutoTrigger
commandType: CommandEnum.Station.setAutoTrigger
};
this.$store.dispatch('training/next', operate).then(({ valid }) => {
if (valid) {
@ -228,7 +228,7 @@ export default {
type: MapDeviceType.Station.type,
label: MapDeviceType.Station.label,
operation: OperationEvent.Station.cancelAutoTrigger.menu.operation,
commandType: Commands.Station.cancelAutoTrigger
commandType: CommandEnum.Station.cancelAutoTrigger
};
this.$store.dispatch('training/next', operate).then(({ valid }) => {
if (valid) {

14
src/jmap/theme/fuzhou_01/menus/menuStationStand.vue
View File

@ -24,7 +24,7 @@ import { mapGetters } from 'vuex';
import { OperateMode } from '@/scripts/ConstDic';
import { MapDeviceType, OperationEvent, DeviceMenu } from '@/scripts/ConstDic';
import { MenuDisabledState, menuConvert, menuFiltration } from './utils/menuItemStatus';
import Commands from '@/scripts/plugin/Commands';
import CommandEnum from '@/scripts/plugin/CommandEnum';
export default {
name: 'StationStandMenu',
@ -249,7 +249,7 @@ export default {
type: MapDeviceType.StationStand.type,
label: MapDeviceType.StationStand.label,
operation: OperationEvent.StationStand.stoppage.menu.operation,
commandType: Commands.StationStand.query
commandType: CommandEnum.StationStand.query
};
this.$store.dispatch('training/next', operate).then(({ valid }) => {
if (valid) {
@ -270,7 +270,7 @@ export default {
type: MapDeviceType.StationStand.type,
label: MapDeviceType.StationStand.label,
operation: OperationEvent.StationStand.cancelStoppage.menu.operation,
commandType: Commands.StationStand.cancelStoppage
commandType: CommandEnum.StationStand.cancelStoppage
};
this.$store.dispatch('training/next', operate).then(({ valid }) => {
if (valid) {
@ -388,7 +388,7 @@ export default {
type: MapDeviceType.StationStand.type,
label: MapDeviceType.StationStand.label,
operation: OperationEvent.StationStand.setStopTime.menu.operation,
commandType: Commands.StationStand.query
commandType: CommandEnum.StationStand.query
};
this.$store.dispatch('training/next', operate).then(({ valid, response }) => {
if (valid) {
@ -412,7 +412,7 @@ export default {
type: MapDeviceType.StationStand.type,
label: MapDeviceType.StationStand.label,
operation: OperationEvent.StationStand.setRunLevel.menu.operation,
commandType: Commands.StationStand.query
commandType: CommandEnum.StationStand.query
};
this.$store.dispatch('training/next', operate).then(({ valid, response }) => {
if (valid) {
@ -450,7 +450,7 @@ export default {
code: this.selected.code,
type: MapDeviceType.StationStand.type,
operation: OperationEvent.StationStand.setBackStrategy.menu.operation,
commandType: Commands.StationStand.query
commandType: CommandEnum.StationStand.query
};
this.$store.dispatch('training/next', operate).then(({ valid, response }) => {
@ -475,7 +475,7 @@ export default {
type: MapDeviceType.StationStand.type,
label: MapDeviceType.StationStand.label,
operation: OperationEvent.StationStand.detail.menu.operation,
commandType: Commands.StationStand.detail
commandType: CommandEnum.StationStand.detail
};
this.$store.dispatch('training/next', operate).then(({ valid, response }) => {
if (valid) {

8
src/jmap/theme/fuzhou_01/menus/menuSwitch.vue
View File

@ -14,7 +14,7 @@ import SwitchControl from './dialog/switchControl';
import SwitchCmdControl from './dialog/switchCmdControl';
import SpeedCmdControl from './dialog/speedCmdControl';
import NoticeInfo from './dialog/childDialog/childDialog/noticeInfo';
import Commands from '@/scripts/plugin/Commands';
import CommandEnum from '@/scripts/plugin/CommandEnum';
import { mapGetters } from 'vuex';
import { OperateMode } from '@/scripts/ConstDic';
import { MapDeviceType, OperationEvent, DeviceMenu } from '@/scripts/ConstDic';
@ -252,7 +252,7 @@ export default {
type: MapDeviceType.Switch.type,
label: MapDeviceType.Switch.label,
operation: OperationEvent.Switch.stoppage.menu.operation,
commandType: Commands.Switch.stoppage
commandType: CommandEnum.Switch.stoppage
};
this.$store.dispatch('training/next', operate).then(({ valid }) => {
if (valid) {
@ -273,7 +273,7 @@ export default {
type: MapDeviceType.Switch.type,
label: MapDeviceType.Switch.label,
operation: OperationEvent.Switch.cancelStoppage.menu.operation,
commandType: Commands.Switch.cancelStoppage
commandType: CommandEnum.Switch.cancelStoppage
};
this.$store.dispatch('training/next', operate).then(({ valid }) => {
if (valid) {
@ -473,7 +473,7 @@ export default {
type: MapDeviceType.Switch.type,
label: MapDeviceType.Switch.label,
operation: OperationEvent.Switch.cancelSpeed.menu.operation,
commandType: Commands.Switch.cancelSpeed
commandType: CommandEnum.Switch.cancelSpeed
};
this.$store.dispatch('training/next', operate).then(({ valid, response }) => {
if (valid) {

8
src/jmap/theme/fuzhou_01/menus/menuTrain.vue
View File

@ -17,7 +17,7 @@ import { mapGetters } from 'vuex';
import { OperateMode } from '@/scripts/ConstDic';
import { MapDeviceType, OperationEvent, DeviceMenu } from '@/scripts/ConstDic';
import { MenuDisabledState, menuConvert, trainMenuFiltration } from './utils/menuItemStatus';
import Commands from '@/scripts/plugin/Commands';
import CommandEnum from '@/scripts/plugin/CommandEnum';
import TrainControl from './dialog/trainControl';
import TrainDelete from './dialog/trainDelete';
import TrainMove from './dialog/trainMove';
@ -170,7 +170,7 @@ export default {
type: MapDeviceType.Train.type,
label: MapDeviceType.Train.label,
operation: OperationEvent.Train.stoppage.menu.operation,
commandType: Commands.Train.stoppage
commandType: CommandEnum.Train.stoppage
};
this.$store.dispatch('training/next', operate).then(({ valid }) => {
if (valid) {
@ -191,7 +191,7 @@ export default {
type: MapDeviceType.Train.type,
label: MapDeviceType.Train.label,
operation: OperationEvent.Train.cancelStoppage.menu.operation,
commandType: Commands.Train.cancelStoppage
commandType: CommandEnum.Train.cancelStoppage
};
this.$store.dispatch('training/next', operate).then(({ valid }) => {
if (valid) {
@ -212,7 +212,7 @@ export default {
type: MapDeviceType.Train.type,
label: MapDeviceType.Train.label,
operation: OperationEvent.Train.limitSpeed.menu.operation,
commandType: Commands.Train.limitSpeed
commandType: CommandEnum.Train.limitSpeed
};
this.$store.dispatch('training/next', operate).then(({ valid }) => {
if (valid) {

2
src/jmap/theme/fuzhou_01/menus/passiveDialog/control.vue
View File

@ -61,7 +61,7 @@
<script>
import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
import NoticeInfo from '../dialog/childDialog/childDialog/noticeInfo';
import Commands from '@/scripts/plugin/Commands';
import CommandEnum from '@/scripts/plugin/CommandEnum';
export default {
name: 'RequestControl',

0
src/scripts/plugin/Commands.js → src/scripts/plugin/CommandEnum.js
View File

8
src/scripts/plugin/CommandHandler.js
View File

@ -45,6 +45,14 @@ class CommandHandle {
});
}
if (!command.val) {
operates.forEach(elem => {
if (elem.val) {
command.val = elem.val;
}
});
}
return command;
} else {
return { error: true };

8
src/scripts/plugin/Operate.js Normal file
View File

@ -0,0 +1,8 @@
export default class Operate {
constructor(operation) {
this.operate = {
operation: operation
};
}
}

2
src/scripts/plugin/OperateHandler.js
View File

@ -3,6 +3,6 @@ import OperateHandler2 from './OperateHandler2.js';
import Cookies from 'js-cookie';
const OPERATEHANDLER_KEY = 'OperateHandler';
Cookies.set(OPERATEHANDLER_KEY, '');
Cookies.set(OPERATEHANDLER_KEY, 1);
export default Cookies.get(OPERATEHANDLER_KEY) ? OperateHandler1 : OperateHandler2;

6
src/views/system/commandDictionary/edit.vue
View File

@ -51,7 +51,7 @@ import { createCommand, editCommand, getCommandDetail } from '@/api/management/d
import CommandEdit from './editParam';
import { getLineCodeList } from '@/api/management/mapline';
import EditCondition from './editCondition';
import Commands from '@/scripts/plugin/Commands';
import CommandEnum from '@/scripts/plugin/CommandEnum';
export default {
name: 'DictionaryEdit',
@ -143,12 +143,12 @@ export default {
if (!this.formModel.conditionList) {
this.formModel.conditionList = [];
}
this.operateList = Object.values(Commands[this.formModel.operateObject]);
this.operateList = Object.values(CommandEnum[this.formModel.operateObject]);
});
}
},
deviceChange(code) { // 操作对象变化
this.operateList = Object.values(Commands[code]);
this.operateList = Object.values(CommandEnum[code]);
},
doSave() {
this.$refs.dataform.validateForm(() => {

6
src/views/system/commandDictionary/index.vue
View File

@ -9,7 +9,7 @@
import { getCommandList, delCommand } from '@/api/management/dictionary';
import { getLineCodeList } from '@/api/management/mapline';
import ShowCondition from './showCondition';
import Commands from '@/scripts/plugin/Commands';
import CommandEnum from '@/scripts/plugin/CommandEnum';
export default {
name: 'CommandDictionary',
@ -149,8 +149,8 @@ export default {
return getCommandList(params);
},
convertField(fieldValue, operateObject, converFormat) {
if (Commands && Commands[operateObject]) {
const enumList = Object.values(Commands[operateObject]);
if (CommandEnum && CommandEnum[operateObject]) {
const enumList = Object.values(CommandEnum[operateObject]);
if (enumList && converFormat && converFormat.length >= 2) {
const value = converFormat[0];
const label = converFormat[1];