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

Squashed commit of the following:

Browse Source 
commit 6187b449c1
Author: dong <58670809@qq.com>
Date:   Fri Apr 7 15:22:33 2023 +0800

    代码调整

commit 074453ece7
Author: weizhihong <weizhihong@joylink.club>
Date:   Fri Mar 31 16:52:08 2023 +0800

    【删除注释】
This commit is contained in:
dong 2023-04-07 15:27:22 +08:00
parent 95b6d019dd
commit 54fb5eb47a
71 changed files with 25 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/jmapNew/theme/chengdu_01/menus/menuBar.vue
View File

@ -72,7 +72,7 @@ import { mapGetters } from 'vuex';
import { TrainingMode } from '@/scripts/ConstDic';
import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
import { State2SimulationMap } from '@/scripts/cmdPlugin/Config';
// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
import SystemLogin from './menuDialog/systemLogin';
import SystemLogout from './menuDialog/systemLogout';
import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';

2
src/jmapNew/theme/chengdu_01/menus/menuSection.vue
View File

@ -23,7 +23,7 @@ import { mapGetters } from 'vuex';
import CMD from '@/scripts/cmdPlugin/CommandEnum';
import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
import LoadSpareTrain from '@/jmapNew/theme/components/menus/dialog/loadSpareTrain';
import { judgeStationControl } from '@/jmapNew/theme/components/utils/menuJudge.js';

1
src/jmapNew/theme/chengdu_01/menus/menuSignal.vue
View File

@ -16,7 +16,6 @@ import { mapGetters } from 'vuex';
import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
import CMD from '@/scripts/cmdPlugin/CommandEnum';
// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
import { judgeStationControl } from '@/jmapNew/theme/components/utils/menuJudge.js';

2
src/jmapNew/theme/chengdu_01/menus/menuStationStand.vue
View File

@ -16,7 +16,7 @@ import { mapGetters } from 'vuex';
import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
import { OperateMode } from '@/scripts/ConstDic';
import CMD from '@/scripts/cmdPlugin/CommandEnum';
// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
import { judgeStationControl } from '@/jmapNew/theme/components/utils/menuJudge.js';

2
src/jmapNew/theme/chengdu_01/menus/menuSwitch.vue
View File

@ -21,7 +21,7 @@ import CancelMouseState from '@/mixin/CancelMouseState';
import { mapGetters } from 'vuex';
import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
import { judgeStationControl } from '@/jmapNew/theme/components/utils/menuJudge.js';

2
src/jmapNew/theme/chengdu_01/menus/menuTrain.vue
View File

@ -14,8 +14,6 @@ import SetFault from '@/jmapNew/theme/components/menus/dialog/setFault';
import { mapGetters } from 'vuex';
import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
// import CMD from '@/scripts/cmdPlugin/CommandEnum';
// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
import CancelMouseState from '@/mixin/CancelMouseState';
import SpeedLimit from '@/jmapNew/theme/components/menus/dialog/trainSpeedLimit';
import { menuOperate, commitOperate, commitTrainSend } from '@/jmapNew/theme/components/utils/menuOperate';

2
src/jmapNew/theme/chengdu_03/menus/menuButton.vue
View File

@ -111,7 +111,7 @@
<script>
import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
// import Handler from '@/scripts/cmdPlugin/Handler';
import { getAutoReentryBySignalCode } from '@/utils/mapList';
import PasswordBox from './dialog/childDialog/passwordInputBox.vue';
import CMD from '@/scripts/cmdPlugin/CommandEnum';

2
src/jmapNew/theme/chengdu_03/menus/menuSection.vue
View File

@ -21,7 +21,7 @@ import { mapGetters } from 'vuex';
import CMD from '@/scripts/cmdPlugin/CommandEnum';
import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
import { menuOperate, commitOperate } from '@/jmapNew/theme/components/utils/menuOperate';
import LoadSpareTrain from '@/jmapNew/theme/components/menus/dialog/loadSpareTrain';
import {judgeStationControl} from '../../components/utils/menuJudge';

2
src/jmapNew/theme/chengdu_03/menus/menuSignal.vue
View File

@ -25,7 +25,7 @@ import { mapGetters } from 'vuex';
import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
import CMD from '@/scripts/cmdPlugin/CommandEnum';
// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
import PasswordBox from '@/jmapNew/theme/components/menus/childDialog/passwordInputBox';
import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
import {judgeStationControl} from '../../components/utils/menuJudge';

2
src/jmapNew/theme/components/menus/dialog/trainControl.vue
View File

@ -96,7 +96,7 @@
<script>
import { mapGetters } from 'vuex';
import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
// import Handler from '@/scripts/cmdPlugin/Handler';
import { menuOperate, commitOperate } from '@/jmapNew/theme/components/utils/menuOperate';
import { getTrainDetailBytripNumber, getTrainDetailByStNumber } from '@/api/simulation';
import NoticeInfo from '../childDialog/noticeInfo';

2
src/jmapNew/theme/components/menus/menuBar.vue
View File

@ -17,7 +17,7 @@
</template>
<script>
import { State2SimulationMap } from '@/scripts/cmdPlugin/Config';
// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
import EachChildMenu from './eachChildMenu';
export default {

1
src/jmapNew/theme/datie_01/menus/menuButton.vue
View File

@ -108,7 +108,6 @@
<script>
import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
// import Handler from '@/scripts/cmdPlugin/Handler';
import PasswordBox from './dialog/childDialog/passwordInputBox.vue';
import CMD from '@/scripts/cmdPlugin/CommandEnum';
import { mapGetters } from 'vuex';

1
src/jmapNew/theme/datie_01/menus/menuSection.vue
View File

@ -124,7 +124,6 @@ export default {
initMenu() {
// 编辑模式菜单列表
if (this.selected.type != '04') {
// this.menu = MenuContextHandler.covert(this.menuNormal);
this.menu = this.menuNormal.Local;
} else {
this.menu = [];

1
src/jmapNew/theme/datie_01/menus/menuSignal.vue
View File

@ -195,7 +195,6 @@ export default {
methods: {
initMenu() {
// 编辑模式菜单列表
// this.menu = MenuContextHandler.covert(this.menuNormal);
this.menu = this.menuNormal.Local;
// 故障模式菜单列表
if (this.operatemode === OperateMode.FAULT) {

1
src/jmapNew/theme/datie_01/menus/menuStation.vue
View File

@ -92,7 +92,6 @@ export default {
methods: {
initMenu() {
// 编辑模式菜单列表
// this.menu = MenuContextHandler.covert(this.menuNormal);
this.menu = this.menuNormal.Local;
// 故障模式菜单列表
if (this.operatemode === OperateMode.FAULT) {

2
src/jmapNew/theme/datie_01/menus/menuStationStand.vue
View File

@ -17,7 +17,6 @@ import SetFault from '@/jmapNew/theme/components/menus/dialog/setFaultNew';
import { mapGetters } from 'vuex';
import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
import CMD from '@/scripts/cmdPlugin/CommandEnum';
// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
export default {
@ -116,7 +115,6 @@ export default {
methods: {
initMenu() {
// 编辑模式菜单列表
// this.menu = MenuContextHandler.covert(this.menuNormal);
// 故障模式菜单列表
if (this.operatemode === OperateMode.FAULT) {

1
src/jmapNew/theme/datie_01/menus/menuSwitch.vue
View File

@ -137,7 +137,6 @@ export default {
methods: {
initMenu() {
// 编辑模式菜单列表
// this.menu = MenuContextHandler.covert(this.menuNormal);
this.menu = this.menuNormal.Local;
// 故障模式菜单列表
if (this.operatemode === OperateMode.FAULT) {

1
src/jmapNew/theme/datie_01/menus/menuTrain.vue
View File

@ -165,7 +165,6 @@ export default {
methods: {
initMenu() {
// 编辑模式菜单列表
// this.menu = MenuContextHandler.covert(this.menuNormal);
// 故障模式菜单列表
if (this.operatemode === OperateMode.FAULT) {
// if (!this.$store.state.scriptRecord.bgSet) {

2
src/jmapNew/theme/datie_02/menus/menuButton.vue
View File

@ -125,7 +125,7 @@
<script>
import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
// import Handler from '@/scripts/cmdPlugin/Handler';
import PasswordBox from './dialog/childDialog/passwordInputBox.vue';
import DefectiveShunting from './dialog/defectiveShunting.vue';
import CMD from '@/scripts/cmdPlugin/CommandEnum';

2
src/jmapNew/theme/datie_02/menus/menuButtonCtc.vue
View File

@ -127,7 +127,7 @@
import PopMenu from '@/components/PopMenu';
import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
// import Handler from '@/scripts/cmdPlugin/Handler';
import PasswordBox from './dialog/childDialog/passwordInputBox.vue';
import TrainRoute from './dialog/trainRoute.vue';
import ShuntRoute from './dialog/shuntRoute.vue';

1
src/jmapNew/theme/datie_jd1a/menus/menuButton.vue
View File

@ -211,7 +211,6 @@
<script>
import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler'
import OperationHandler from '@/scripts/cmdPlugin/OperationHandler'
// import Handler from '@/scripts/cmdPlugin/Handler'
import PasswordBox from './dialog/childDialog/passwordInputBox.vue'
import DefectiveShunting from './dialog/defectiveShunting.vue'
import CMD from '@/scripts/cmdPlugin/CommandEnum'

1
src/jmapNew/theme/datie_jd1a/menus/menuButtonCtc.vue
View File

@ -120,7 +120,6 @@
import PopMenu from '@/components/PopMenu';
import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
// import Handler from '@/scripts/cmdPlugin/Handler';
import PasswordBox from './dialog/childDialog/passwordInputBox.vue';
import TrainRoute from './dialog/trainRoute.vue';
import ShuntRoute from './dialog/shuntRoute.vue';

2
src/jmapNew/theme/datie_jd1a/menus/menuStation.vue
View File

@ -19,7 +19,7 @@ import SetFault from '@/jmapNew/theme/components/menus/dialog/setFault';
import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
import CMD from '@/scripts/cmdPlugin/CommandEnum';
import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
// import Handler from '@/scripts/cmdPlugin/Handler';
import PasswordBox from './dialog/childDialog/passwordInputBox.vue';
export default {

1
src/jmapNew/theme/datie_jd1a/menus/menuStationStand.vue
View File

@ -17,7 +17,6 @@ import SetFault from '@/jmapNew/theme/components/menus/dialog/setFault';
import { mapGetters } from 'vuex';
import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
import CMD from '@/scripts/cmdPlugin/CommandEnum';
// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
export default {

1
src/jmapNew/theme/datie_jd1a/menus/menuTrain.vue
View File

@ -32,7 +32,6 @@ import UpdateTrip from './dialog/updateTrip';
import CancelMouseState from '@/mixin/CancelMouseState';
import CMD from '@/scripts/cmdPlugin/CommandEnum';
import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
import { menuOperate, commitOperate } from '@/jmapNew/theme/components/utils/menuOperate';
import TrainStop from '@/jmapNew/theme/components/menus/dialog/trainStop';

1
src/jmapNew/theme/datie_ksk/menus/menuButton.vue
View File

@ -139,7 +139,6 @@
<script>
import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
// import Handler from '@/scripts/cmdPlugin/Handler';
import PasswordBox from './dialog/childDialog/passwordInputBox.vue';
import DefectiveShunting from './dialog/defectiveShunting.vue';
import CMD from '@/scripts/cmdPlugin/CommandEnum';

2
src/jmapNew/theme/datie_ksk/menus/menuButtonCtc.vue
View File

@ -120,7 +120,7 @@
import PopMenu from '@/components/PopMenu';
import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
// import Handler from '@/scripts/cmdPlugin/Handler';
import PasswordBox from './dialog/childDialog/passwordInputBox.vue';
import TrainRoute from './dialog/trainRoute.vue';
import ShuntRoute from './dialog/shuntRoute.vue';

1
src/jmapNew/theme/datie_ksk/menus/menuSection.vue
View File

@ -138,7 +138,6 @@ export default {
initMenu() {
// 编辑模式菜单列表
if (this.selected.type != '04') {
// this.menu = MenuContextHandler.covert(this.menuNormal);
this.menu = this.menuNormal.Local;
const station = this.$store.getters['map/getDeviceByCode'](this.$store.state.map.showCentralizedStationCode);
if (station && station.controlMode === 'Interlock' && this.$route.query.ctc) {

1
src/jmapNew/theme/datie_ksk/menus/menuSignal.vue
View File

@ -208,7 +208,6 @@ export default {
methods: {
initMenu() {
// 编辑模式菜单列表
// this.menu = MenuContextHandler.covert(this.menuNormal);
this.menu = this.menuNormal.Local;
const station = this.$store.getters['map/getDeviceByCode'](this.$store.state.map.showCentralizedStationCode);
if (station && station.controlMode === 'Interlock' && this.$route.query.ctc) {

3
src/jmapNew/theme/datie_ksk/menus/menuStation.vue
View File

@ -19,7 +19,7 @@ import SetFault from '@/jmapNew/theme/components/menus/dialog/setFault';
import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
import CMD from '@/scripts/cmdPlugin/CommandEnum';
import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
// import Handler from '@/scripts/cmdPlugin/Handler';
import PasswordBox from './dialog/childDialog/passwordInputBox.vue';
export default {
@ -104,7 +104,6 @@ export default {
methods: {
initMenu() {
// 编辑模式菜单列表
// this.menu = MenuContextHandler.covert(this.menuNormal);
this.menu = this.menuNormal.Local;
// 故障模式菜单列表
if (this.operatemode === OperateMode.FAULT) {

2
src/jmapNew/theme/datie_ksk/menus/menuStationStand.vue
View File

@ -17,7 +17,6 @@ import SetFault from '@/jmapNew/theme/components/menus/dialog/setFault';
import { mapGetters } from 'vuex';
import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
import CMD from '@/scripts/cmdPlugin/CommandEnum';
// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
export default {
@ -116,7 +115,6 @@ export default {
methods: {
initMenu() {
// 编辑模式菜单列表
// this.menu = MenuContextHandler.covert(this.menuNormal);
// 故障模式菜单列表
if (this.operatemode === OperateMode.FAULT) {

1
src/jmapNew/theme/datie_ksk/menus/menuSwitch.vue
View File

@ -197,7 +197,6 @@ export default {
methods: {
initMenu() {
// 编辑模式菜单列表
// this.menu = MenuContextHandler.covert(this.menuNormal);
this.menu = this.menuNormal.Local;
const station = this.$store.getters['map/getDeviceByCode'](this.$store.state.map.showCentralizedStationCode);
if (station && station.controlMode === 'Interlock' && this.$route.query.ctc) {

2
src/jmapNew/theme/datie_ksk/menus/menuTrain.vue
View File

@ -33,7 +33,6 @@ import UpdateTrip from './dialog/updateTrip';
import CancelMouseState from '@/mixin/CancelMouseState';
import CMD from '@/scripts/cmdPlugin/CommandEnum';
import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
import { menuOperate, commitOperate } from '@/jmapNew/theme/components/utils/menuOperate';
import SpeedLimit from '@/jmapNew/theme/components/menus/dialog/trainSpeedLimit';
import TrainStop from '@/jmapNew/theme/components/menus/dialog/trainStop';
@ -248,7 +247,6 @@ export default {
methods: {
initMenu() {
// 编辑模式菜单列表
// this.menu = MenuContextHandler.covert(this.menuNormal);
const station = this.$store.getters['map/getDeviceByCode'](this.$store.state.map.showCentralizedStationCode);
if (station && station.controlMode === 'Interlock' && this.$route.query.ctc) {
this.menu.forEach(item => { item.disabled = true; });

1
src/jmapNew/theme/datie_tky/menus/menuSection.vue
View File

@ -71,7 +71,6 @@ export default {
initMenu() {
// 编辑模式菜单列表
if (this.selected.type != '04') {
// this.menu = MenuContextHandler.covert(this.menuNormal);
this.menu = this.menuNormal.Local;
} else {
this.menu = [];

1
src/jmapNew/theme/datie_tky/menus/menuSignal.vue
View File

@ -98,7 +98,6 @@ export default {
methods: {
initMenu() {
// 编辑模式菜单列表
// this.menu = MenuContextHandler.covert(this.menuNormal);
this.menu = this.menuNormal.Local;
// // 故障模式菜单列表
// if (this.operatemode === OperateMode.FAULT) {

1
src/jmapNew/theme/datie_tky/menus/menuSwitch.vue
View File

@ -197,7 +197,6 @@ export default {
},
initMenu() {
// 编辑模式菜单列表
// this.menu = MenuContextHandler.covert(this.menuNormal);
this.menu = this.menuNormal.Local;
// 故障模式菜单列表
if (this.operatemode === OperateMode.FAULT) {

2
src/jmapNew/theme/datie_tky/menus/menuTrain.vue
View File

@ -33,7 +33,6 @@ import UpdateTrip from './dialog/updateTrip';
import CancelMouseState from '@/mixin/CancelMouseState';
import CMD from '@/scripts/cmdPlugin/CommandEnum';
import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
import { menuOperate, commitOperate } from '@/jmapNew/theme/components/utils/menuOperate';
import SpeedLimit from '@/jmapNew/theme/components/menus/dialog/trainSpeedLimit';
import TrainStop from '@/jmapNew/theme/components/menus/dialog/trainStop';
@ -248,7 +247,6 @@ export default {
methods: {
initMenu() {
// 编辑模式菜单列表
// this.menu = MenuContextHandler.covert(this.menuNormal);
const station = this.$store.getters['map/getDeviceByCode'](this.$store.state.map.showCentralizedStationCode);
if (station && station.controlMode === 'Interlock' && this.$route.query.ctc) {
this.menu.forEach(item => { item.disabled = true; });

1
src/jmapNew/theme/foshan_01/menus/menuAxleReset.vue
View File

@ -13,7 +13,6 @@ import { mapGetters } from 'vuex';
import CMD from '@/scripts/cmdPlugin/CommandEnum';
import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
export default {
name: 'MenuLimit',

2
src/jmapNew/theme/foshan_01/menus/menuButton.vue
View File

@ -244,7 +244,7 @@
import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
import { SimulationUserType, OperateMode } from '@/scripts/ConstDic';
// import Handler from '@/scripts/cmdPlugin/Handler';
export default {
name: 'MapButtonMenu',

2
src/jmapNew/theme/fuzhou_01/menus/menuDeplotButton.vue
View File

@ -149,7 +149,7 @@ import PasswordBox from '@/jmapNew/theme/components/menus/childDialog/passwordIn
import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
// import Handler from '@/scripts/cmdPlugin/Handler';
// import CMD from '@/scripts/cmdPlugin/CommandEnum';
import { menuOperate, commitOperate } from '@/jmapNew/theme/components/utils/menuOperate';
export default {

2
src/jmapNew/theme/ningbo_01/menus/menuAutoTrunRoute.vue
View File

@ -12,7 +12,7 @@ import { mapGetters } from 'vuex';
import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
import CMD from '@/scripts/cmdPlugin/CommandEnum';
import { DeviceMenu, OperateMode, TrainingMode } from '@/scripts/ConstDic';
// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
import { judgeStationControl } from '@/jmapNew/theme/components/utils/menuJudge.js';
export default {

2
src/jmapNew/theme/ningbo_01/menus/menuAxleReset.vue
View File

@ -13,7 +13,6 @@ import { mapGetters } from 'vuex';
import CMD from '@/scripts/cmdPlugin/CommandEnum';
import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
export default {
name: 'MenuLimit',
@ -70,7 +69,6 @@ export default {
methods: {
initMenu() {
// 编辑模式菜单列表
// this.menu = MenuContextHandler.covert(this.menuNormal);
this.menu = [];
this.menuNormal.forEach(menuItem => {
menuItem.show = menuItem.isShow ? menuItem.isShow(this.selected, this.work) : true;

2
src/jmapNew/theme/ningbo_01/menus/menuSection.vue
View File

@ -27,7 +27,6 @@ import ConfirmControl from '@/jmapNew/theme/components/menus/childDialog/confirm
import OperateConfirm from './dialog/childDialog/operateConfirm';
import SectionUnLock from '@/jmapNew/theme/components/menus/dialog/sectionUnLock';
import CMD from '@/scripts/cmdPlugin/CommandEnum';
// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
import { mapGetters } from 'vuex';
import { DeviceMenu, OperateMode, TrainingMode } from '@/scripts/ConstDic';
import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
@ -182,7 +181,6 @@ export default {
initMenu() {
// 编辑模式菜单列表
if (this.selected.type != '04') {
// this.menu = MenuContextHandler.covert(this.menuNormal);
this.menu = [];
this.menuNormal.forEach(menuItem => {
let status = judgeStationControl(this.selected.belongStation, this.selected.stationCode, this.work);

2
src/jmapNew/theme/ningbo_01/menus/menuSignal.vue
View File

@ -27,7 +27,6 @@ import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo'
import OperateConfirm from './dialog/childDialog/operateConfirm';
import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
import CMD from '@/scripts/cmdPlugin/CommandEnum';
// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
import PasswordInput from './dialog/passwordInput';
import { mapGetters } from 'vuex';
import { DeviceMenu, OperateMode, TrainingMode } from '@/scripts/ConstDic';
@ -195,7 +194,6 @@ export default {
},
methods: {
initMenu() {
// this.menu = MenuContextHandler.covert(this.menuNormal);
this.menu = [];
this.menuNormal.forEach(menuItem => {
let status = judgeStationControl(this.selected.belongStationCode, this.selected.stationCode, this.work);

2
src/jmapNew/theme/ningbo_01/menus/menuStation.vue
View File

@ -18,8 +18,6 @@ import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo'
import CMD from '@/scripts/cmdPlugin/CommandEnum';
import { mapGetters } from 'vuex';
import { OperateMode, DeviceMenu, TrainingMode } from '@/scripts/ConstDic';
// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
// import {mouseCancelState} from '@/jmapNew/theme/components/utils/menuItemStatus';
import SetFault from '@/jmapNew/theme/components/menus/dialog/setFault';
import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
import { judgeStationControl } from '@/jmapNew/theme/components/utils/menuJudge.js';

2
src/jmapNew/theme/ningbo_01/menus/menuStationControl.vue
View File

@ -12,7 +12,7 @@ import { mapGetters } from 'vuex';
import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
import CMD from '@/scripts/cmdPlugin/CommandEnum';
// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
export default {
name: 'StationControlMenu',

2
src/jmapNew/theme/ningbo_01/menus/menuStationLight.vue
View File

@ -14,7 +14,7 @@ import { mapGetters } from 'vuex';
import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
import { DeviceMenu, OperateMode, TrainingMode } from '@/scripts/ConstDic';
import CMD from '@/scripts/cmdPlugin/CommandEnum';
// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
import OperateConfirm from './dialog/childDialog/operateConfirm';
import ButtonConfirm from './dialog/childDialog/buttonConfirm';

2
src/jmapNew/theme/ningbo_01/menus/menuStationPreReset.vue
View File

@ -11,7 +11,6 @@ import { mapGetters } from 'vuex';
import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
import { DeviceMenu, OperateMode, TrainingMode } from '@/scripts/ConstDic';
import CMD from '@/scripts/cmdPlugin/CommandEnum';
// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
import ButtonDown from './dialog/buttonDown';
import { judgeStationControl } from '@/jmapNew/theme/components/utils/menuJudge.js';
@ -78,7 +77,6 @@ export default {
methods: {
initMenu() {
// 编辑模式菜单列表
// this.menu = MenuContextHandler.covert(this.menuNormal);
this.menu = [];
this.menuNormal.forEach(menuItem => {
let status = judgeStationControl(this.selected.code, this.selected.stationCode, this.work);

2
src/jmapNew/theme/ningbo_01/menus/menuStationStand.vue
View File

@ -26,7 +26,7 @@ import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuO
import { mapGetters } from 'vuex';
import { DeviceMenu, OperateMode, TrainingMode } from '@/scripts/ConstDic';
import CMD from '@/scripts/cmdPlugin/CommandEnum';
// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
import { judgeStationControl } from '@/jmapNew/theme/components/utils/menuJudge.js';
export default {

2
src/jmapNew/theme/ningbo_01/menus/menuStationTurnBack.vue
View File

@ -12,7 +12,7 @@ import { mapGetters } from 'vuex';
import { DeviceMenu, OperateMode, TrainingMode } from '@/scripts/ConstDic';
import CMD from '@/scripts/cmdPlugin/CommandEnum';
// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
import {menuOperate} from '@/jmapNew/theme/components/utils/menuOperate';
import { judgeStationControl } from '@/jmapNew/theme/components/utils/menuJudge.js';

1
src/jmapNew/theme/ningbo_01/menus/menuSwitch.vue
View File

@ -27,7 +27,6 @@ import { mapGetters } from 'vuex';
import CMD from '@/scripts/cmdPlugin/CommandEnum';
import { DeviceMenu, OperateMode, TrainingMode } from '@/scripts/ConstDic';
// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
import { judgeStationControl } from '@/jmapNew/theme/components/utils/menuJudge.js';

2
src/jmapNew/theme/ningbo_01/menus/menuTrain.vue
View File

@ -30,7 +30,6 @@ import SpeedLimit from '@/jmapNew/theme/components/menus/dialog/trainSpeedLimit'
import { mapGetters } from 'vuex';
import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
import CMD from '@/scripts/cmdPlugin/CommandEnum';
import { menuOperate, commitOperate } from '@/jmapNew/theme/components/utils/menuOperate';
@ -231,7 +230,6 @@ export default {
methods: {
initMenu() {
// 编辑模式菜单列表
// this.menu = MenuContextHandler.covert(this.menuNormal);
this.menu = [];
this.menuNormal.forEach(menuItem => {
menuItem.show = menuItem.isShow ? menuItem.isShow(this.selected, this.work) : true;

2
src/jmapNew/theme/ningbo_03/menus/menuStation.vue
View File

@ -19,7 +19,7 @@ import CMD from '@/scripts/cmdPlugin/CommandEnum';
import { mapGetters } from 'vuex';
import { OperateMode } from '@/scripts/ConstDic';
import { DeviceMenu } from '@/scripts/ConstDic';
// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
import SetFault from '@/jmapNew/theme/components/menus/dialog/setFault';
import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
import { judgeStationControl } from '@/jmapNew/theme/components/utils/menuJudge.js';

2
src/jmapNew/theme/ningbo_03/menus/menuTrain.vue
View File

@ -30,7 +30,7 @@ import SpeedLimit from '@/jmapNew/theme/components/menus/dialog/trainSpeedLimit'
import { mapGetters } from 'vuex';
import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
import CMD from '@/scripts/cmdPlugin/CommandEnum';
// import {mouseCancelState} from '@/jmapNew/theme/components/utils/menuItemStatus';
import { menuOperate, commitOperate } from '@/jmapNew/theme/components/utils/menuOperate';

2
src/jmapNew/theme/xian_01/menus/dialog/trainDetail.vue
View File

@ -38,7 +38,7 @@
import { mapGetters } from 'vuex';
import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
import CMD from '@/scripts/cmdPlugin/CommandEnum';
// import Handler from '@/scripts/cmdPlugin/Handler';
import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
import {TrainType} from '@/scripts/ConstDic';

1
src/jmapNew/theme/xian_01/menus/menuSection.vue
View File

@ -190,7 +190,6 @@ export default {
initMenu() {
// 编辑模式菜单列表
if (this.selected.type != '04') {
// this.menu = MenuContextHandler.covert(this.menuNormal);
this.menu = [];
this.menuNormal.forEach(menuItem => {
let status = judgeStationControl(this.selected.belongStation, this.selected.stationCode, this.work);

2
src/jmapNew/theme/xian_01/menus/menuSignal.vue
View File

@ -24,7 +24,6 @@ import RouteHandControl from '@/jmapNew/theme/components/menus/dialog/routeHandC
import RouteDetail from '@/jmapNew/theme/components/menus/dialog/routeDetail';
import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
import CMD from '@/scripts/cmdPlugin/CommandEnum';
// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
import { mapGetters } from 'vuex';
import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
@ -266,7 +265,6 @@ export default {
},
methods: {
initMenu() {
// this.menu = MenuContextHandler.covert(this.menuNormal);
this.menu = [];
this.menuNormal.forEach(menuItem => {
const status = judgeStationControl(this.selected.belongStationCode, this.selected.stationCode, this.work);

2
src/jmapNew/theme/xian_01/menus/menuStation.vue
View File

@ -19,7 +19,6 @@ import { mapGetters } from 'vuex';
import { OperateMode } from '@/scripts/ConstDic';
import { DeviceMenu } from '@/scripts/ConstDic';
import SetFault from '@/jmapNew/theme/components/menus/dialog/setFault';
// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
import CMD from '@/scripts/cmdPlugin/CommandEnum';
import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
import { judgeStationControl } from '@/jmapNew/theme/components/utils/menuJudge.js';
@ -186,7 +185,6 @@ export default {
methods: {
initMenu() {
// 编辑模式菜单列表
// this.menu = MenuContextHandler.covert(this.menuNormal);
this.menu = [];
this.menuNormal.forEach(menuItem => {
const status = judgeStationControl(this.selected.code, this.selected.stationCode, this.work);

2
src/jmapNew/theme/xian_01/menus/menuStationStand.vue
View File

@ -27,7 +27,6 @@ import Psl from '@/jmapNew/theme/components/menus/dialog/psl';
import { mapGetters } from 'vuex';
import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
import CMD from '@/scripts/cmdPlugin/CommandEnum';
// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
import { judgeStationControl } from '@/jmapNew/theme/components/utils/menuJudge.js';
@ -194,7 +193,6 @@ export default {
methods: {
initMenu() {
// 编辑模式菜单列表
// this.menu = MenuContextHandler.covert(this.menuNormal);
this.menu = [];
this.menuNormal.forEach(menuItem => {
let status = judgeStationControl(this.selected.stationCode, this.selected.deviceStationCode, this.work);

2
src/jmapNew/theme/xian_01/menus/menuStationTurnBack.vue
View File

@ -12,7 +12,6 @@ import { mapGetters } from 'vuex';
import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
import CMD from '@/scripts/cmdPlugin/CommandEnum';
// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
export default {
@ -70,7 +69,6 @@ export default {
methods: {
initMenu() {
// 编辑模式菜单列表
// this.menu = MenuContextHandler.covert(this.menuNormal);
this.menu = [];
this.menuNormal.forEach(menuItem => {
menuItem.disabled = menuItem.isDisabled ? menuItem.isDisabled(this.selected, this.work) : false;

1
src/jmapNew/theme/xian_01/menus/menuSwitch.vue
View File

@ -206,7 +206,6 @@ export default {
methods: {
initMenu() {
// 编辑模式菜单列表
// this.menu = MenuContextHandler.covert(this.menuNormal);
this.menu = [];
this.menuNormal.forEach(menuItem => {
let status = judgeStationControl(this.selected.belongStationCode, this.selected.stationCode, this.work);

2
src/jmapNew/theme/xian_01/menus/menuTrain.vue
View File

@ -31,7 +31,6 @@ import TrainSwitch from './dialog/trainSwitch';
import TrainEditNumber from './dialog/trainEditNumber';
import TrainDetail from './dialog/trainDetail';
import SetTrainOperation from '@/jmapNew/theme/components/menus/dialog/setTrainOperation';
// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
import SpeedLimit from '@/jmapNew/theme/components/menus/dialog/trainSpeedLimit';
import { menuOperate, commitOperate } from '@/jmapNew/theme/components/utils/menuOperate';
@ -240,7 +239,6 @@ export default {
methods: {
initMenu() {
// 编辑模式菜单列表
// this.menu = MenuContextHandler.covert(this.menuNormal);
this.menu = [];
this.menuNormal.forEach(menuItem => {
menuItem.disabled = menuItem.isDisabled ? menuItem.isDisabled(this.selected) : false;

2
src/jmapNew/theme/xian_02/menus/menuAutoTrunRoute.vue
View File

@ -12,7 +12,6 @@ import { mapGetters } from 'vuex';
import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
import CMD from '@/scripts/cmdPlugin/CommandEnum';
import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
export default {
name: 'MenuLimit',
@ -86,7 +85,6 @@ export default {
},
initMenu() {
// 编辑模式菜单列表
// this.menu = MenuContextHandler.covert(this.menuNormal);
// 故障模式菜单列表
if (this.operatemode === OperateMode.FAULT) {
this.menu = this.menuForce;

1
src/jmapNew/theme/xian_02/menus/menuAxleReset.vue
View File

@ -71,7 +71,6 @@ export default {
},
initMenu() {
// 编辑模式菜单列表
// this.menu = MenuContextHandler.covert(this.menuNormal);
// 故障模式菜单列表
if (this.operatemode === OperateMode.FAULT) {
this.menu = this.menuForce;

3
src/jmapNew/theme/xian_02/menus/menuSection.vue
View File

@ -24,7 +24,6 @@ import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo'
import { mapGetters } from 'vuex';
import CMD from '@/scripts/cmdPlugin/CommandEnum';
import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
import LoadSpareTrain from '@/jmapNew/theme/components/menus/dialog/loadSpareTrain';
import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
@ -229,8 +228,6 @@ export default {
initMenu() {
// 编辑模式菜单列表
if (this.selected.type != '04') {
// this.menu = this.menuNormal.Center;
// this.menu = MenuContextHandler.covert2(this.menuNormal);
this.menu = [];
this.menuNormal.forEach(menuItem => {
const status = judgeStationControl(this.selected.belongStation, this.selected.stationCode, this.work);

3
src/jmapNew/theme/xian_02/menus/menuSignal.vue
View File

@ -230,8 +230,6 @@ export default {
}
},
'$store.state.menuOperation.leftClickCount': function (val) {
// const control = MenuContextHandler.getStationControl(this.selected);
// const centralStation = this.$store.getters['map/getDeviceByCode'](this.selected.stationCode);
if (this.selected._type === 'Signal') {
const status = judgeStationControl(this.selected.belongStationCode, this.selected.stationCode, this.work);
status && this.arrangementRoute();
@ -246,7 +244,6 @@ export default {
};
},
initMenu() {
// this.menu = MenuContextHandler.covert2(this.menuNormal);
this.menu = [];
this.menuNormal.forEach(menuItem => {
const status = judgeStationControl(this.selected.belongStationCode, this.selected.stationCode, this.work);

1
src/jmapNew/theme/xian_02/menus/menuStation.vue
View File

@ -263,7 +263,6 @@ export default {
this.menu = [];
// this.menu = [...this.menuNormal.Center];
// 编辑模式菜单列表
// this.menu = MenuContextHandler.covert(this.menuNormal);
const selected = this.selected;
const work = this.work;
function setDisabledShow(item) {

1
src/jmapNew/theme/xian_02/menus/menuStationControl.vue
View File

@ -68,7 +68,6 @@ export default {
},
initMenu() {
// 编辑模式菜单列表
// this.menu = MenuContextHandler.covert(this.menuNormal);
this.menu = [];
this.menuNormal.forEach(menuItem => {
menuItem.disabled = menuItem.isDisabled ? menuItem.isDisabled(this.selected, this.work) : false;

1
src/jmapNew/theme/xian_02/menus/menuSwitch.vue
View File

@ -202,7 +202,6 @@ export default {
},
initMenu() {
// 编辑模式菜单列表
// this.menu = MenuContextHandler.covert2(this.menuNormal);
this.menu = [];
this.menuNormal.forEach(menuItem => {
const status = judgeStationControl(this.selected.belongStationCode, this.selected.stationCode, this.work);

4
src/jmapNew/theme/xian_02/menus/popStationStand.vue
View File

@ -20,7 +20,6 @@ import { mapGetters } from 'vuex';
import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
import CMD from '@/scripts/cmdPlugin/CommandEnum';
import { judgeStationControl } from '@/jmapNew/theme/components/utils/menuJudge.js';
@ -295,17 +294,14 @@ export default {
this.menu = this.updateStandPlan;
break;
case 'stopJumping':
// this.menu = MenuContextHandler.covertList(this.stopJumping.Center);
this.getMenu(type);
break;
case 'allTrainStopJump':
this.topTip = '所有列车跳停本站';
// this.menu = MenuContextHandler.covertList(this.allTrainStopJump.Center);
this.getMenu(type);
break;
case 'standDetain':
this.topTip = '站台扣车 SET/CANCEL';
// this.menu = MenuContextHandler.covertList(this.standDetain.Center);
this.getMenu(type);
break;
case 'psdInfoConfirm':

2
src/views/newMap/display/terminals/equipmentConstructionTable.vue
View File

@ -251,7 +251,7 @@ export default {
}
};
</script>
<style lang="scss">
<style lang="scss" scoped>
.equipmentConstructionTable{
width:91%;margin-left:15px
}