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

调整区段字段显示，调整功能按钮样式

Browse Source
This commit is contained in:
zyy 2020-07-29 13:23:25 +08:00
parent d91467db70
commit c3e7f8227a
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -363,5 +363,8 @@ export default {
float: right;
right: 5px;
bottom: 15px;
button {
float: right;
}
}
</style>

5
src/views/newMap/jointTrainingNew/menuDemon.vue
View File

@ -8,14 +8,12 @@
<el-button v-if="isAdmin && isProject" @click="handleEquipment" size="small">设备管理</el-button>
<el-button v-if="isAdmin" @click="memberManage" size="small">成员管理</el-button>
<el-button v-if="isAdmin && !noQrcodeList.includes(project)" type="primary" @click="generateQrCode" size="small">生成二维码</el-button>
<!-- cctv视图 -->
<el-button v-if="(isShowScheduling && !dataError) || (isStationSupervisor && !dataError)" @click="jumpjl3dpassflow" size="small">{{ $t('display.demon.passengerflow') }}</el-button>
<!-- 三维视图 / 司机视角 -->
<el-button v-if="(isShowScheduling && !dataError) || (isDriver && !dataError)" @click="jumpjlmap3d" size="small">{{ jl3dname }}</el-button>
<!-- 设备视图 -->
<el-button v-if="isShow3dmodel && isShowScheduling && !dataError" @click="jumpjlmap3dmodel" size="small">{{ $t('display.demon.deviceView') }}</el-button>
<template v-if="isAdmin && project != 'refereeJsxt'">
<el-button type="success" :disabled="isDisable || dataError" @click="selectBeginTime" size="small">{{ $t('joinTraining.drivingByPlan') }}</el-button>
<el-button type="danger" :disabled="dataError" @click="end" size="small">{{ $t('joinTraining.initialize') }}</el-button>
@ -507,6 +505,9 @@ export default {
// &.active{
// transform: translateX(0);
// }
button {
float: right;
}
}
.haerbin_btn_box{
width: 450px;

6
src/views/newMap/newMapdraft/mapoperate/section/index.vue
View File

@ -340,7 +340,7 @@ export default {
return this.editModel.type == '01' && this.editModel.standTrack;
},
isreentryTrackName() {
return !this.isParentCode && this.editModel.reentryTrack;
return this.hasAssociatedSection && this.editModel.reentryTrack;
},
istransferTrackName() {
return this.editModel.type == '01' && this.editModel.transferTrack;
@ -349,10 +349,10 @@ export default {
return this.editModel.type == '01' && !this.editModel.reentryTrack;
},
isReentryTrackShow() {
return !this.isParentCode && !this.editModel.transferTrack;
return this.hasAssociatedSection && !this.editModel.transferTrack;
},
isdestinationCode() {
return !this.isParentCode && (this.editModel.reentryTrack || this.editModel.transferTrack);
return this.hasAssociatedSection && (this.editModel.reentryTrack || this.editModel.transferTrack);
},
isStopPointOffset() {
return this.editModel.type !== '04' && (this.editModel.reentryTrack || this.editModel.standTrack || this.editModel.transferTrack);