Merge pull request 'fix : 修复设备管理的序列号样式' (#362) from de into dev

Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/362
This commit is contained in:
2024-08-15 15:14:53 +00:00

View File

@@ -76,19 +76,19 @@
@change="changeFanData(scope.row)"></el-input> @change="changeFanData(scope.row)"></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="serialNumber" label="序列号" align="center" width="500"> <!-- <el-table-column prop="serialNumber" label="序列号" align="center" width="500">-->
<template #default="scope"> <!-- <template #default="scope">-->
<el-select placeholder="请选择" v-model="scope.row.serialNumber" popper-class="serialNumber-select" <!-- <el-select placeholder="请选择" v-model="scope.row.serialNumber" popper-class="serialNumber-select"-->
@change="changeFanData(scope.row)" class="serialNumber"> <!-- @change="changeFanData(scope.row)" class="serialNumber">-->
<el-option <!-- <el-option-->
v-for="item in serialNumberOptions" <!-- v-for="item in serialNumberOptions"-->
:key="item.value" <!-- :key="item.value"-->
:label="item.label" <!-- :label="item.label"-->
:value="item.value" <!-- :value="item.value"-->
/> <!-- />-->
</el-select> <!-- </el-select>-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column prop="state" label="状态" align="center" min-width="86"> <el-table-column prop="state" label="状态" align="center" min-width="86">
<template #default="scope"> <template #default="scope">
<div class="switch"> <div class="switch">
@@ -160,19 +160,19 @@
@change="changeWindData(scope.row)"></el-input> @change="changeWindData(scope.row)"></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="serialNumber" label="序列号" align="center" width="500"> <!-- <el-table-column prop="serialNumber" label="序列号" align="center" width="500">-->
<template #default="scope"> <!-- <template #default="scope">-->
<el-select placeholder="请选择" v-model="scope.row.serialNumber" popper-class="serialNumber-select" <!-- <el-select placeholder="请选择" v-model="scope.row.serialNumber" popper-class="serialNumber-select"-->
@change="changeWindData(scope.row)" class="serialNumber"> <!-- @change="changeWindData(scope.row)" class="serialNumber">-->
<el-option <!-- <el-option-->
v-for="item in serialNumberOptions" <!-- v-for="item in serialNumberOptions"-->
:key="item.value" <!-- :key="item.value"-->
:label="item.label" <!-- :label="item.label"-->
:value="item.value" <!-- :value="item.value"-->
/> <!-- />-->
</el-select> <!-- </el-select>-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column prop="state" label="状态" align="center"> <el-table-column prop="state" label="状态" align="center">
<template #default="scope"> <template #default="scope">
<div class="switch wind-switch"> <div class="switch wind-switch">
@@ -244,19 +244,19 @@
@change="changeOtherData(scope.row)"></el-input> @change="changeOtherData(scope.row)"></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="serialNumber" label="序列号" align="center" width="500"> <!-- <el-table-column prop="serialNumber" label="序列号" align="center" width="500">-->
<template #default="scope"> <!-- <template #default="scope">-->
<el-select placeholder="请选择" v-model="scope.row.serialNumber" popper-class="serialNumber-select" <!-- <el-select placeholder="请选择" v-model="scope.row.serialNumber" popper-class="serialNumber-select"-->
@change="changeOtherData(scope.row)" clearable class="serialNumber"> <!-- @change="changeOtherData(scope.row)" clearable class="serialNumber">-->
<el-option <!-- <el-option-->
v-for="item in serialNumberOptions" <!-- v-for="item in serialNumberOptions"-->
:key="item.value" <!-- :key="item.value"-->
:label="item.label" <!-- :label="item.label"-->
:value="item.value" <!-- :value="item.value"-->
/> <!-- />-->
</el-select> <!-- </el-select>-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column prop="state" label="状态" align="center"> <el-table-column prop="state" label="状态" align="center">
<template #default="scope"> <template #default="scope">
<div class="switch wind-switch"> <div class="switch wind-switch">
@@ -537,10 +537,10 @@ getList()
border: 1px solid #05FEFF!important; border: 1px solid #05FEFF!important;
background-color: transparent!important; background-color: transparent!important;
.el-select__wrapper{ .el-select__wrapper{
//height: 53px!important; height: 54px!important;
color: #FFFFFF!important; color: #FFFFFF!important;
font-size: 40px!important; font-size: 40px!important;
height: auto!important; //height: auto!important;
line-height: normal!important; line-height: normal!important;
border-radius: 6px!important; border-radius: 6px!important;
border: 1px solid #05FEFF!important; border: 1px solid #05FEFF!important;