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

Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test

Browse Source
This commit is contained in:
joylink_cuiweidong 2022-08-18 11:05:13 +08:00
commit fda477c08b
4 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/jmapNew/shape/graph/SignalButton/index.js
View File

@ -38,7 +38,7 @@ export default class SignalButton extends Group {
} else { } else {
this.computedPosition = model.position; this.computedPosition = model.position;
} }
this.z = 0; this.z = 10;
this.model = model; this.model = model;
this.style = style; this.style = style;
this.pressed = false; this.pressed = false;

3
src/views/newMap/displayNew/selectStation.vue
View File

@ -69,8 +69,7 @@ export default {
const member = this.$store.state.training.memberData[val]; const member = this.$store.state.training.memberData[val];
const station = this.$store.getters['map/getDeviceByCode'](member.deviceCode); const station = this.$store.getters['map/getDeviceByCode'](member.deviceCode);
if (station) { if (station) {
const pictureLineCodeList = ['16']; if (this.$store.state.map.map && this.$store.state.map.map.pictureList) {
if (pictureLineCodeList.includes(this.$route.query.lineCode) && this.$store.state.map.map && this.$store.state.map.map.pictureList) {
const picture = this.$store.state.map.map.pictureList.find(picture => picture.stationCode === station.code && picture.type === 'chainStation'); const picture = this.$store.state.map.map.pictureList.find(picture => picture.stationCode === station.code && picture.type === 'chainStation');
if (picture) { if (picture) {
const mapDevice = this.$store.state.map.mapDevice; const mapDevice = this.$store.state.map.mapDevice;

3
src/views/newMap/jointTrainingNew/index.vue
View File

@ -440,7 +440,6 @@ export default {
this.$refs[type].doShow(); this.$refs[type].doShow();
}, },
stationRoleShow(deviceCode) { stationRoleShow(deviceCode) {
const pictureLineCodeList = ['16'];
if (this.lineCode === '14') { if (this.lineCode === '14') {
const list = []; const list = [];
const mapDevice = this.$store.state.map.mapDevice; const mapDevice = this.$store.state.map.mapDevice;
@ -450,7 +449,7 @@ export default {
} }
this.$jlmap.updateShowMode(list, '02'); this.$jlmap.updateShowMode(list, '02');
} }
if (pictureLineCodeList.includes(this.lineCode) && this.$store.state.map.map && this.$store.state.map.map.pictureList) { if (this.$store.state.map.map && this.$store.state.map.map.pictureList) {
const picture = this.$store.state.map.map.pictureList.find(picture => picture.stationCode === deviceCode && picture.type === 'chainStation'); const picture = this.$store.state.map.map.pictureList.find(picture => picture.stationCode === deviceCode && picture.type === 'chainStation');
if (picture) { if (picture) {
const mapDevice = this.$store.state.map.mapDevice; const mapDevice = this.$store.state.map.mapDevice;

1
src/views/newMap/newMapdraft/mapoperate/signalButton.vue
View File

@ -442,7 +442,6 @@ export default {
text-align: right; text-align: right;
font-size: 14px; font-size: 14px;
color: #606266; color: #606266;
line-height: 40px;
padding: 0 12px 0 0; padding: 0 12px 0 0;
-webkit-box-sizing: border-box; -webkit-box-sizing: border-box;
box-sizing: border-box; box-sizing: border-box;