fix:日志添加时,设备显示设别编号
This commit is contained in:
parent
d17f336a89
commit
2eca64bf93
|
|
@ -308,5 +308,11 @@ export default {
|
||||||
left: 50%;
|
left: 50%;
|
||||||
color: #cccccc;
|
color: #cccccc;
|
||||||
}
|
}
|
||||||
|
.el-select-dropdown__item{
|
||||||
|
height:auto!important;
|
||||||
|
}
|
||||||
|
.el-select-dropdown__item div{
|
||||||
|
margin-left:15px!important;
|
||||||
|
}
|
||||||
//排放系统
|
//排放系统
|
||||||
</style>
|
</style>
|
||||||
|
|
|
||||||
|
|
@ -97,7 +97,7 @@
|
||||||
<el-option
|
<el-option
|
||||||
v-for="item in options"
|
v-for="item in options"
|
||||||
:key="item.id"
|
:key="item.id"
|
||||||
:label="item.name"
|
:label="item.label"
|
||||||
:value="item.id"
|
:value="item.id"
|
||||||
>
|
>
|
||||||
<span style="float:left">{{item.name}}</span>
|
<span style="float:left">{{item.name}}</span>
|
||||||
|
|
@ -314,7 +314,12 @@ export default {
|
||||||
getEquipment() {
|
getEquipment() {
|
||||||
let that = this;
|
let that = this;
|
||||||
this.$API.em.equipment.list.req({ page: 0, type: 10,mgroup:that.mgroup}).then((res) => {
|
this.$API.em.equipment.list.req({ page: 0, type: 10,mgroup:that.mgroup}).then((res) => {
|
||||||
this.options = res;
|
res.forEach((item) => {
|
||||||
|
let obj = {};
|
||||||
|
Object.assign(obj, item);
|
||||||
|
obj.label = item.name+'-'+item.number;
|
||||||
|
that.options.push(obj);
|
||||||
|
});
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
getSupplier() {
|
getSupplier() {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue