diff --git a/src/jmapNew/shape/graph/Signal/index.js b/src/jmapNew/shape/graph/Signal/index.js
index 4cb1fd057..f6fead50e 100644
--- a/src/jmapNew/shape/graph/Signal/index.js
+++ b/src/jmapNew/shape/graph/Signal/index.js
@@ -933,9 +933,7 @@ class Signal extends Group {
this.lamps && this.lamps[1] && this.lamps[1].hide();
}
- if (this.style.Signal.lamp.faultType == 'flash') {
- // this.lamps && this.lamps[0] && this.lamps[0].faultHide();
- } else if (this.style.Signal.lamp.faultType == 'cross') {
+ if (this.style.Signal.lamp.faultType == 'cross') {
this.lamps && this.lamps[0] && this.lamps[0].setFault2Corss(false);
} else if (this.style.Signal.lamp.faultType == 'watch') {
const device = findDeviceByModelDepType(this.model, deviceType.LampFilament, 'stationCode');
diff --git a/src/views/newMap/displayBaSiDi/atr.vue b/src/views/newMap/displayBaSiDi/atr.vue
index 0828ca022..99dfe02cb 100644
--- a/src/views/newMap/displayBaSiDi/atr.vue
+++ b/src/views/newMap/displayBaSiDi/atr.vue
@@ -168,11 +168,30 @@
- 显示列车信息
+ 显示列车信息
执行
重设
关闭
+
+
+
+
+ {{ scope.row.destinationCode + scope.row.serviceNumber + scope.row.tripNumber.substring(2) }}
+
+
+
+
+ {{ getSectionName(scope.row.code) }}
+
+
+
+
@@ -195,11 +214,13 @@ export default {
tableData2: [],
tableData3: [],
tableData4: [],
+ showTrainList: [],
input: '',
timeTerm: 'stop',
sortStationList: [],
noStopList: [],
- dialogShow:false
+ dialogShow:false,
+ innerVisible: false
};
},
computed: {
@@ -241,6 +262,20 @@ export default {
if (val !== 'REGULATION_OFF') {
this.timeTerm = '';
}
+ },
+ '$store.state.map.activeTrainListUpdate': function (val) {
+ if (val) {
+ const activeTrainList = this.$store.state.map.activeTrainList;
+ this.showTrainList = [];
+ activeTrainList.forEach((trainCode)=>{
+ const train = this.$store.getters['map/getDeviceByCode'](trainCode);
+ if (train && train.sectionCode) {
+ this.showTrainList.push(train);
+ }
+ });
+ } else {
+ this.showTrainList = [];
+ }
}
},
mounted() {
@@ -290,6 +325,14 @@ export default {
}
}
},
+ getSectionName(code) {
+ const train = this.$store.getters['map/getDeviceByCode'](code);
+ const section = this.$store.getters['map/getDeviceByCode'](train.sectionCode);
+ return section ? section.name : '';
+ },
+ showTrainInfo() {
+ this.innerVisible = true;
+ },
doShow() {
this.initData();
this.dialogShow = true;