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:
fan 2021-03-29 18:05:30 +08:00
commit def94fee3e
3 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/iscs/iscsSystem/stationConfig/index.vue
View File

@ -19,7 +19,7 @@
<normal v-else-if="mode=='environmentTwelve'" /> -->
<!-- <big-screen v-else-if="mode === 'signal'" /> -->
<!-- <big-screen v-else-if="mode === 'signal'" /> -->
<ticket-or-entrance v-else-if="mode === 'autoTicket'" />
<ticket-or-entrance v-else-if="mode === 'autoTicket'||mode === 'entranceGuard'" />
<!-- -->
</div>
</template>

13
src/views/iscs/iscsSystem/stationConfig/ticketOrEntrance/index.vue
View File

@ -19,7 +19,7 @@ export default {
data() {
return {
title:'',
bacground:'rgba(0,0,0,0)',
bacground:'rgba(66,90,116,1)',
loading:false,
width:window.innerWidth,
scaleRate:window.innerWidth / 2200,
@ -62,7 +62,14 @@ export default {
this.title = this.stationName + ' 自动售检票系统';
this.scaleRate = window.innerWidth / 1920;
this.height = 800;
} else if (this.mode == 'entranceGuard') {
params.userInterface = 'afcTwo02';
params.system = 'entranceGuard';
this.title = this.stationName + ' 门禁系统 站台层';
this.scaleRate = window.innerWidth / 1920;
this.height = 800;
}
this.loading = true;
this.$refs.iscsPlate.show({}, this.width, this.height, this.scaleRate);
getIscsData(params).then(resp=>{
@ -72,8 +79,8 @@ export default {
this.$refs.iscsPlate.show(data, this.width, this.height, this.scaleRate);
document.querySelector('.fasIndex').scrollTop = 0;
} else {
this.loading = false;
}
this.loading = false;
}
});
}
}

14
src/views/lesson/lessoncategory/edit/chapter/list.vue
View File

@ -65,14 +65,14 @@ export default {
config: {
data: []
}
},
generateType: {
type: 'select',
label: this.$t('lesson.automaticOrManual'),
config: {
data: [{ value: '02', label: this.$t('lesson.automatic') }, { value: '01', label: this.$t('lesson.manual') }]
}
}
// generateType: {
// type: 'select',
// label: this.$t('lesson.automaticOrManual'),
// config: {
// data: [{ value: '02', label: this.$t('lesson.automatic') }, { value: '01', label: this.$t('lesson.manual') }]
// }
// }
}
},
queryList: {