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:
zyy 2020-12-04 10:15:50 +08:00
commit 0277a04558
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/jmapNew/theme/haerbin_01/menus/menuButton.vue
View File

@ -47,13 +47,13 @@
<el-button :id="commandId" class="fl" :class="{'disabled': canCommand || secondConfirm}" style="line-height: 18px; margin-top: 4px;" plain :disabled="canCommand || secondConfirm" @click="command">执行</el-button>
<el-button class="fr" style="line-height: 18px; margin-top: 4px;" plain @click="cancle">取消</el-button>
</div>
<div class="nav-border-bottom">
<div v-if="!speedShow" class="nav-border-bottom">
<el-table
ref="table"
:data="tempData"
border
:cell-style="tableStyle"
style="width: 100%;background: #E0E0E0;border: none;outline: none; height: 28px"
style="width: 100%;background: #E0E0E0;border: none;outline: none; height: 56px"
size="mini"
class="haerbin_table"
highlight-current-row
@ -61,14 +61,14 @@
>
<el-table-column prop="name" style="margin-left:10px" class-name="abc" />
</el-table>
<el-select v-if="speedShow" v-model="speedLimitValue" size="small" style="float: left;width: 100px;margin-left: 20px;" placeholder="请选择">
<el-option
v-for="item in speedList"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</div>
<div v-if="speedShow" class="nav-border-bottom">
<div style="height: 56px;width: 100%;background: #fff;overflow-y: scroll;text-align: left;">
<div class="speed-value-box" :style="{background: speedLimitValue===15? '#87CEFA': '#FFF'}" @click="setSpeedLimitValue(15)">15</div>
<div class="speed-value-box" :style="{background: speedLimitValue===25? '#87CEFA': '#FFF'}" @click="setSpeedLimitValue(25)">25</div>
<div class="speed-value-box" :style="{background: speedLimitValue===40? '#87CEFA': '#FFF'}" @click="setSpeedLimitValue(40)">40</div>
<div class="speed-value-box" :style="{background: speedLimitValue===60? '#87CEFA': '#FFF'}" @click="setSpeedLimitValue(60)">60</div>
</div>
</div>
</div>
</el-col>
@ -688,6 +688,9 @@ export default {
this.formModelSectionName = this.trainModel.sectionModel.name;
this.formModelNewTrip = '';
},
setSpeedLimitValue(val) {
this.speedLimitValue = val;
},
changeShowMode(flag) {
if (this.$store.state.training.prdType === '01') {
this.trainModel = {};
@ -822,15 +825,12 @@ export default {
height: 20px;
line-height: 20px;
}
/deep/.el-input--small .el-input__inner{
height: 28px;
line-height: 28px;
}
/deep/.el-table__empty-text{
line-height: 28px;
}
/deep/.el-table__empty-block{
min-height: 28px;
.speed-value-box{
height: 18px;
padding-left: 20px;
cursor: pointer;
width: 100%;
line-height: 18px;
}
</style>
<style lang="scss">