联锁
列监
运图
-
时刻表
+
时刻表
编表
调度
站控
@@ -287,6 +287,12 @@ export default {
troClick() {
this.$emit('troClick');
},
+ traClick() {
+ this.$emit('traClick');
+ },
+ ttlClick() {
+ this.$emit('ttlClick');
+ },
// 车场
handleCarPark() {
this.$emit('handleCarPark');
diff --git a/src/views/newMap/displayBaSiDi/index.vue b/src/views/newMap/displayBaSiDi/index.vue
index d8cc7de56..83fb60921 100644
--- a/src/views/newMap/displayBaSiDi/index.vue
+++ b/src/views/newMap/displayBaSiDi/index.vue
@@ -6,6 +6,8 @@
:data-error="dataError"
@rpsClick="rpsClick"
@troClick="troClick"
+ @traClick="traClick"
+ @ttlClick="ttlClick"
@handleCarPark="handleCarPark"
@end="end"
@back="back"
@@ -15,6 +17,8 @@
+
+
@@ -36,18 +40,21 @@ 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 parseStatus from '@/utils/parseStatus';
export default {
name: 'DisplayDraft',
components: {
- // MapSystemDraft
BaSiDi,
SetTime,
RpsDialog,
CarPack,
TroDialog,
- TroDetail
+ TroDetail,
+ TraDialog,
+ TtlDialog
},
data() {
return {
@@ -179,24 +186,12 @@ export default {
},
// 仿真错误时，被动退出时调用
async back() {
- // if (this.isExam) {
- // await this.$refs.menuExam.back();
- // } else if (this.isLesson) {
- // await this.$refs.lessonMenu.back();
- // } else if (this.isDemon) {
- // await this.$refs.menuDemon.back();
- // } else if (this.isScript) {
- // await this.$refs.menuScript.back();
- // } else if (this.isContest) {
- // await this.$refs.menuDispatherContest.back();
- // }
this.$router.go(-1);
},
async statusMessage(list) {
if (this.$jlmap) {
await this.$store.dispatch('training/updateMapState', list);
} else {
- // await this.$store.dispatch('map/updateMapDevices', list);
this.$store.commit('map/updateMapDevice', list);
}
await this.$store.dispatch('socket/setEquipmentStatus');
@@ -320,34 +315,6 @@ export default {
this.dataError = resp.data.dataError;
}
},
- // 通过showMode切换显示效果
- switchModeInner(swch) {
- let showMode = '03';
- if (swch == '01') {
- showMode = '03';
- } else if (swch == '02') {
- showMode = '02';
- }
-
- const nameList = Object.keys(this.$store.state.map.map || {});
- let list = [];
- nameList.forEach(item => {
- if (item !== 'skinVO') {
- const data = this.$store.state.map.map[item];
- if (data && data.constructor === Array) {
- list = [...list, ...data];
- }
- }
- });
-
- if (swch == '01') {
- this.$jlmap.updateShowStation(list, this.$store.state.training.centerStationCode); // 显示全部元素
- } else {
- this.$jlmap.updateShowStation(list, ''); // 显示全部元素
- }
-
- this.$jlmap.updateShowMode(list, showMode); // 二次过滤
- },
selectBeginTime() {
this.$refs.setTime.doShow();
},
@@ -429,6 +396,12 @@ export default {
troClick() {
this.$refs.troDialog.doShow();
},
+ ttlClick() {
+ this.$refs.ttlDialog.doShow();
+ },
+ traClick() {
+ this.$refs.traDialog.doShow();
+ },
handleCarPark() {
this.$refs.carPack.doShow();
}
@@ -438,7 +411,7 @@ export default {