-
-
-
@@ -17,10 +14,7 @@ import { mapGetters } from 'vuex';
import { clearSubscribe, displayTopic } from '@/utils/stomp';
import { EventBus } from '@/scripts/event-bus';
import BaSiDi from './baSiDi';
-import RpsDialog from './rps';
-import TroDialog from './tro';
import CarPack from './carPack';
-import TroDetail from './troDetail';
import TraDialog from './tra';
import TtlDialog from './ttl';
import TmtDialog from './tmt';
@@ -31,10 +25,7 @@ export default {
name: 'DisplayDraft',
components: {
BaSiDi,
- RpsDialog,
CarPack,
- TroDialog,
- TroDetail,
TraDialog,
TtlDialog,
TmtDialog,
@@ -76,22 +67,10 @@ export default {
return this.$store.state.training.started;
}
},
- watch:{
- '$store.state.menuOperation.selectedCount':function(em) {
- const device = this.$store.state.menuOperation.selected;
- if (device && device._type === 'Station' && this.$store.state.menuOperation.subType === 'troButton') {
- this.$refs.troDialog.doClose();
- this.$refs.troDetail.doShow(device.code);
- }
- }
- },
beforeDestroy() {
this.clearSubscribe();
this.$store.dispatch('training/reset');
},
- async mounted() {
- this.$refs.troDialog.doClose();
- },
methods:{
// 结束加载状态
endViewLoading(isSuccess) {
@@ -115,7 +94,11 @@ export default {
this.$refs.trainTrunkDetail.doShow(index);
},
handleDialogShow(type) {
- this.$refs[type].doShow();
+ if (type === 'troWork' || type === 'bigScreen') {
+ this.$emit('pictureChange', type);
+ } else {
+ this.$refs[type].doShow();
+ }
}
}
};
diff --git a/src/views/newMap/display/terminals/displayBaSiDi/rps.vue b/src/views/newMap/display/terminals/displayBaSiDi/rps.vue
deleted file mode 100644
index 8d04d1b20..000000000
--- a/src/views/newMap/display/terminals/displayBaSiDi/rps.vue
+++ /dev/null
@@ -1,118 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/src/views/newMap/display/terminals/index.vue b/src/views/newMap/display/terminals/index.vue
index df2a79035..31c0f04d3 100644
--- a/src/views/newMap/display/terminals/index.vue
+++ b/src/views/newMap/display/terminals/index.vue
@@ -26,7 +26,9 @@
-
+
+
+
@@ -73,10 +75,13 @@ import DiagramLoad from './diagramLoad';
import DiagramPreview from './diagramPreview';
import DiagramEdit from './diagramEdit/index';
import DisplayBaSiDi from './displayBaSiDi/index';
+import TroWork from './troWork';
+import TroDetailWork from './troDetailWork';
export default {
name: 'Index',
components: {
+ TroWork,
DispatcherWork,
LocalWork,
InterlockWork,
@@ -104,7 +109,8 @@ export default {
DiagramLoad,
DiagramPreview,
DiagramEdit,
- DisplayBaSiDi
+ DisplayBaSiDi,
+ TroDetailWork
},
data() {
return {
@@ -113,7 +119,8 @@ export default {
centralizedStationMap: {},
loading: false,
isFirst: true,
- group: ''
+ group: '',
+ showStationCode: ''
};
},
computed: {
@@ -160,6 +167,13 @@ export default {
console.log('[ERROR] ', error);
this.mapViewLoaded(false);
}
+ },
+ '$store.state.menuOperation.selectedCount':function() {
+ const device = this.$store.state.menuOperation.selected;
+ if (device && device._type === 'Station' && this.$store.state.menuOperation.subType === 'troButton') {
+ this.showStationCode = device.code;
+ this.pictureChange('troDetailWork');
+ }
}
},
mounted() {
@@ -227,10 +241,6 @@ export default {
},
pictureChange(val) {
this.picture = val;
- if (this.picture === 'dispatchWork' && this.lineCode === '14') {
- this.picture = 'basidi';
- this.$store.dispatch('app/animationsClose');
- }
this.$store.dispatch('map/setPicture', this.picture);
if (val === 'ibp') {
this.$nextTick(() => { this.$refs.ibpPlate.show(this.roleDeviceCode, ''); });
diff --git a/src/views/newMap/display/terminals/terminalMenu.vue b/src/views/newMap/display/terminals/terminalMenu.vue
index c41a236b6..1ed498d20 100644
--- a/src/views/newMap/display/terminals/terminalMenu.vue
+++ b/src/views/newMap/display/terminals/terminalMenu.vue
@@ -28,152 +28,180 @@ export default {
code: 'localWork',
roleList: ['STATION_SUPERVISOR', 'STATION_ASSISTANT', 'STATION_MASTER', 'STATION_SIGNALER', 'STATION_PASSENGER',
'STATION_SWITCH_MAN', 'STATION_FACILITATOR', 'STATION_WORKER', 'DEVICE_MANAGER', 'TRAIN_MASTER', 'DEPOT_DISPATCHER', 'SIGNAL_BUILDING'],
+ isShow: () => true,
click: this.changePictureShow
},
{
name: '行调工作站',
code: 'dispatchWork',
roleList: ['DISPATCHER'],
+ isShow: () => this.$route.query.lineCode !== '14',
+ click: this.changePictureShow
+ },
+ {
+ name: '行调台',
+ code: 'dispatcherManage',
+ roleList: ['DISPATCHER'],
+ isShow: () => this.$route.query.simType === 'RAILWAY',
+ click: this.changePictureShow
+ },
+ {
+ name: '车务终端',
+ code: 'trafficTerminal',
+ roleList: ['STATION_SUPERVISOR'],
+ isShow: () => this.$route.query.simType === 'RAILWAY',
+ click: this.changePictureShow
+ },
+ {
+ name: '车务管理终端',
+ code: 'trafficManageTerminal',
+ roleList: ['STATION_SUPERVISOR'],
+ isShow: () => this.$route.query.simType === 'RAILWAY',
+ click: this.changePictureShow
+ },
+ {
+ name: '调度计划',
+ code: 'schedulingPlan',
+ roleList: ['DISPATCHER'],
+ isShow: () => this.$route.query.simType === 'RAILWAY',
+ click: this.changePictureShow
+ },
+ {
+ name: '调度命令',
+ code: 'dispatchingCommand',
+ roleList: ['DISPATCHER'],
+ isShow: () => this.$route.query.simType === 'RAILWAY',
+ click: this.changePictureShow
+ },
+ {
+ name: '路票',
+ code: 'trainTicket',
+ roleList: ['DISPATCHER', 'STATION_SUPERVISOR', 'STATION_ASSISTANT', 'STATION_MASTER', 'STATION_SIGNALER', 'STATION_PASSENGER',
+ 'STATION_SWITCH_MAN', 'STATION_FACILITATOR', 'STATION_WORKER', 'DEVICE_MANAGER', 'TRAIN_MASTER', 'DEPOT_DISPATCHER', 'SIGNAL_BUILDING', 'DRIVER'],
+ isShow: () => this.$route.query.simType === 'RAILWAY',
+ click: this.changePictureShow
+ },
+ {
+ name: '簿册',
+ code: 'registerBook',
+ roleList: ['DISPATCHER', 'STATION_SUPERVISOR', 'STATION_ASSISTANT', 'STATION_MASTER', 'STATION_SIGNALER', 'STATION_PASSENGER',
+ 'STATION_SWITCH_MAN', 'STATION_FACILITATOR', 'STATION_WORKER', 'DEVICE_MANAGER', 'TRAIN_MASTER', 'DEPOT_DISPATCHER', 'SIGNAL_BUILDING', 'DRIVER'],
+ isShow: () => this.$route.query.simType === 'RAILWAY',
+ click: this.changePictureShow
+ },
+ {
+ name: '运行图加载',
+ code: 'diagramLoad',
+ roleList: ['DISPATCHER'],
+ isShow: () => this.$route.query.simType === 'METRO',
+ click: this.changePictureShow
+ },
+ {
+ name: '运行图预览',
+ code: 'diagramPreview',
+ roleList: ['DISPATCHER', 'STATION_SUPERVISOR', 'DRIVER'],
+ isShow: () => this.$route.query.simType === 'METRO',
+ click: this.changePictureShow
+ },
+ {
+ name: '运行图编制',
+ code: 'diagramEdit',
+ roleList: [],
+ isShow: () => this.$route.query.simType === 'METRO',
+ click: this.changePictureShow
+ },
+ {
+ name: '派班工作站',
+ code: 'scheduleWork',
+ roleList: ['DEPOT_DISPATCHER'],
+ isShow: () => this.$route.query.simType === 'METRO',
+ click: this.changePictureShow
+ },
+ {
+ name: 'cctv视图',
+ code: 'cctvView',
+ roleList: ['DISPATCHER', 'STATION_SUPERVISOR'],
+ isShow: () => this.$route.query.simType === 'METRO',
+ click: this.changePictureShow
+ },
+ {
+ name: 'ISCS',
+ code: 'iscsView',
+ roleList: ['DISPATCHER', 'STATION_SUPERVISOR'],
+ isShow: () => this.$route.query.simType === 'METRO',
+ click: this.changePictureShow
+ },
+ {
+ name: '大屏',
+ code: 'bigScreen',
+ roleList: ['DISPATCHER'],
+ isShow: () => this.$route.query.simType === 'METRO',
+ click: this.changePictureShow
+ },
+ {
+ name: '司机视角',
+ code: 'drivingPlan',
+ roleList: ['DRIVER'],
+ isShow: () => this.$route.query.simType === 'METRO',
+ click: this.changePictureShow
+ },
+ {
+ name: 'IBP盘',
+ code: 'ibp',
+ roleList: ['STATION_SUPERVISOR'],
+ isShow: () => this.$route.query.simType === 'METRO',
+ click: this.changePictureShow
+ },
+ {
+ name: '数字沙盘',
+ code: 'digitalStand',
+ roleList: ['STATION_SUPERVISOR', 'DISPATCHER'],
+ isShow: () => this.$route.query.simType === 'METRO',
+ click: this.changePictureShow
+ },
+ {
+ name: '大客流策略',
+ code: 'largePassengerStrategy',
+ roleList: ['DISPATCHER'],
+ isShow: () => this.itemMap && this.itemMap.LPF,
+ click: this.changePictureShow
+ },
+ {
+ name: '大客流视图',
+ code: 'largePassengerView',
+ roleList: ['DISPATCHER'],
+ isShow: () => this.itemMap && this.itemMap.LPF,
+ click: this.changePictureShow
+ },
+ {
+ name: 'PSL',
+ code: 'psl',
+ roleList: ['STATION_SUPERVISOR'],
+ isShow: () => this.$route.query.simType === 'METRO',
+ click: this.changePictureShow
+ },
+ {
+ name: 'BaSiDi',
+ code: 'baSiDi',
+ roleList: ['DISPATCHER'],
+ isShow: () => this.$route.query.lineCode === '14' && this.$route.query.simType === 'METRO',
+ click: this.changePictureShow
+ },
+ {
+ name: '轨道总览',
+ code: 'troWork',
+ roleList: ['DISPATCHER'],
+ isShow: () => this.$route.query.lineCode === '14' && this.$route.query.simType === 'METRO',
+ click: this.changePictureShow
+ },
+ {
+ name: '轨道详览',
+ code: 'troDetailWork',
+ roleList: ['DISPATCHER'],
+ isShow: () => this.$route.query.lineCode === '14' && this.$route.query.simType === 'METRO',
click: this.changePictureShow
}
],
- terminalMap:{
- 'RAILWAY': [
- {
- name: '行调台',
- code: 'dispatcherManage',
- roleList: ['DISPATCHER'],
- click: this.changePictureShow
- },
- {
- name: '车务终端',
- code: 'trafficTerminal',
- roleList: ['STATION_SUPERVISOR'],
- click: this.changePictureShow
- },
- {
- name: '车务管理终端',
- code: 'trafficManageTerminal',
- roleList: ['STATION_SUPERVISOR'],
- click: this.changePictureShow
- },
- {
- name: '调度计划',
- code: 'schedulingPlan',
- roleList: ['DISPATCHER'],
- click: this.changePictureShow
- },
- {
- name: '调度命令',
- code: 'dispatchingCommand',
- roleList: ['DISPATCHER'],
- click: this.changePictureShow
- },
- {
- name: '路票',
- code: 'trainTicket',
- roleList: ['DISPATCHER', 'STATION_SUPERVISOR', 'STATION_ASSISTANT', 'STATION_MASTER', 'STATION_SIGNALER', 'STATION_PASSENGER',
- 'STATION_SWITCH_MAN', 'STATION_FACILITATOR', 'STATION_WORKER', 'DEVICE_MANAGER', 'TRAIN_MASTER', 'DEPOT_DISPATCHER', 'SIGNAL_BUILDING', 'DRIVER'],
- click: this.changePictureShow
- },
- {
- name: '簿册',
- code: 'registerBook',
- roleList: ['DISPATCHER', 'STATION_SUPERVISOR', 'STATION_ASSISTANT', 'STATION_MASTER', 'STATION_SIGNALER', 'STATION_PASSENGER',
- 'STATION_SWITCH_MAN', 'STATION_FACILITATOR', 'STATION_WORKER', 'DEVICE_MANAGER', 'TRAIN_MASTER', 'DEPOT_DISPATCHER', 'SIGNAL_BUILDING', 'DRIVER'],
- click: this.changePictureShow
- }
- ],
- 'METRO': [
- {
- name: '运行图加载',
- code: 'diagramLoad',
- roleList: ['DISPATCHER'],
- click: this.changePictureShow
- },
- {
- name: '运行图预览',
- code: 'diagramPreview',
- roleList: ['DISPATCHER', 'STATION_SUPERVISOR', 'DRIVER'],
- click: this.changePictureShow
- },
- {
- name: '运行图编制',
- code: 'diagramEdit',
- roleList: [],
- click: this.changePictureShow
- },
- {
- name: '派班工作站',
- code: 'scheduleWork',
- roleList: ['DEPOT_DISPATCHER'],
- click: this.changePictureShow
- },
- {
- name: 'cctv视图',
- code: 'cctvView',
- roleList: ['DISPATCHER', 'STATION_SUPERVISOR'],
- click: this.changePictureShow
- },
- {
- name: 'ISCS',
- code: 'iscsView',
- roleList: ['DISPATCHER', 'STATION_SUPERVISOR'],
- click: this.changePictureShow
- },
- {
- name: '大屏',
- code: 'bigScreen',
- roleList: ['DISPATCHER'],
- click: this.changePictureShow
- },
- // {
- // name: '故障设备',
- // code: 'jlmap3dFault',
- // roleList: ['STATION_SUPERVISOR'],
- // click: this.noEvent
- // },
- {
- name: '司机视角',
- code: 'drivingPlan',
- roleList: ['DRIVER'],
- click: this.changePictureShow
- },
- {
- name: 'IBP盘',
- code: 'ibp',
- roleList: ['STATION_SUPERVISOR'],
- click: this.changePictureShow
- },
- {
- name: '数字沙盘',
- code: 'digitalStand',
- roleList: ['STATION_SUPERVISOR', 'DISPATCHER'],
- click: this.changePictureShow
- },
- {
- name: '大客流策略',
- code: 'largePassengerStrategy',
- roleList: ['DISPATCHER'],
- functionItem: 'LPF',
- click: this.changePictureShow
- },
- {
- name: '大客流视图',
- code: 'largePassengerView',
- roleList: ['DISPATCHER'],
- functionItem: 'LPF',
- click: this.changePictureShow
- },
- {
- name: 'PSL',
- code: 'psl',
- roleList: ['STATION_SUPERVISOR'],
- click: this.changePictureShow
- }
- ],
- 'EMERGENCY': []
- },
itemMap: {}
};
},
@@ -221,8 +249,8 @@ export default {
methods:{
initTerminalList() {
this.terminalList = [];
- [...this.commonTerminal, ...(this.terminalMap[this.simType] || [])].forEach(item => {
- if (item.roleList.includes(this.roles) && (!item.functionItem || this.itemMap[item.functionItem])) {
+ this.commonTerminal.forEach(item => {
+ if (item.roleList.includes(this.roles) && item.isShow()) {
this.terminalList.push(item);
}
});
@@ -236,7 +264,14 @@ export default {
if (localWorkRoleList.includes(this.roles)) {
this.changePictureShow('localWork');
} else if (this.roles === 'DISPATCHER') {
- this.changePictureShow('dispatchWork');
+ if (this.$route.query.lineCode === '14') {
+ this.changePictureShow('baSiDi');
+ this.$store.dispatch('app/animationsClose');
+ } else if (this.$route.query.simType === 'RAILWAY') {
+ this.changePictureShow('dispatcherManage');
+ } else {
+ this.changePictureShow('dispatchWork');
+ }
} else if (this.roles === 'MAINTAINER') {
// 通号
} else if (this.roles === 'DRIVER') {
diff --git a/src/views/newMap/display/terminals/displayBaSiDi/troDetail.vue b/src/views/newMap/display/terminals/troDetailWork.vue
similarity index 52%
rename from src/views/newMap/display/terminals/displayBaSiDi/troDetail.vue
rename to src/views/newMap/display/terminals/troDetailWork.vue
index 8754be2f7..5bda1f68f 100644
--- a/src/views/newMap/display/terminals/displayBaSiDi/troDetail.vue
+++ b/src/views/newMap/display/terminals/troDetailWork.vue
@@ -1,40 +1,37 @@
-
-
-
-
-
+
+
diff --git a/src/views/newMap/display/terminals/displayBaSiDi/tro.vue b/src/views/newMap/display/terminals/troWork.vue
similarity index 55%
rename from src/views/newMap/display/terminals/displayBaSiDi/tro.vue
rename to src/views/newMap/display/terminals/troWork.vue
index c52401566..6f1181f2f 100644
--- a/src/views/newMap/display/terminals/displayBaSiDi/tro.vue
+++ b/src/views/newMap/display/terminals/troWork.vue
@@ -1,28 +1,20 @@
-
-
-
+
+
+
+
diff --git a/src/views/newMap/display/trainingList/designTrainingMenu.vue b/src/views/newMap/display/trainingList/designTrainingMenu.vue
deleted file mode 100644
index 48e0b532c..000000000
--- a/src/views/newMap/display/trainingList/designTrainingMenu.vue
+++ /dev/null
@@ -1,300 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
- {{ trainingDetail.name }}
-
-
-
-
-
-
-
-
- {{ $t('display.training.trainingName') }}
- {{ trainingDetail.name }}
-
-
- 实训模式:
-
-
- {{ $t('display.lesson.teachingMode') }}
- {{ $t('display.lesson.practiceMode') }}
- {{ $t('display.lesson.testMode') }}
-
-
-
-
- {{ $t('display.training.trainingInstructions') }}
- {{ trainingDetail.description }}
-
-
- 操作按钮:
-
- 开始
- 结束
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/newMap/display/trainingList/trainingMenu.vue b/src/views/newMap/display/trainingList/trainingMenu.vue
index 510fb0ebf..dcd575034 100644
--- a/src/views/newMap/display/trainingList/trainingMenu.vue
+++ b/src/views/newMap/display/trainingList/trainingMenu.vue
@@ -4,7 +4,7 @@