Merge branch 'develop' into single-develop

This commit is contained in:
白菜
2025-12-05 09:49:54 +08:00
3 changed files with 240 additions and 243 deletions

View File

@ -1,19 +1,19 @@
<template>
<div>
<el-table
class="common-table"
:data="tableData"
stripe
style="width: 100%; margin-top: 25px"
class="common-table"
:data="tableData"
stripe
style="width: 100%; margin-top: 25px"
>
<el-table-column prop="deviceId" label="单体编号"> </el-table-column>
<el-table-column prop="clusterDeviceId" label="簇号"> </el-table-column>
<el-table-column prop="deviceId" label="单体编号"></el-table-column>
<el-table-column prop="clusterDeviceId" label="簇号"></el-table-column>
<el-table-column prop="voltage" label="电压 (V)">
<template slot-scope="scope">
<el-button
@click="chartDetail(scope.row, '电压 (V)')"
type="text"
size="small"
@click="chartDetail(scope.row, '电压 (V)')"
type="text"
size="small"
>
{{ scope.row.voltage }}
</el-button>
@ -22,9 +22,9 @@
<el-table-column prop="temperature" label="温度 (℃)">
<template slot-scope="scope">
<el-button
@click="chartDetail(scope.row, '温度 (℃)')"
type="text"
size="small"
@click="chartDetail(scope.row, '温度 (℃)')"
type="text"
size="small"
>
{{ scope.row.temperature }}
</el-button>
@ -33,9 +33,9 @@
<el-table-column prop="soc" label="SOC (%)">
<template slot-scope="scope">
<el-button
@click="chartDetail(scope.row, 'SOC (%)')"
type="text"
size="small"
@click="chartDetail(scope.row, 'SOC (%)')"
type="text"
size="small"
>
{{ scope.row.soc }}
</el-button>
@ -44,15 +44,15 @@
<el-table-column prop="soh" label="SOH (%)">
<template slot-scope="scope">
<el-button
@click="chartDetail(scope.row, 'SOH (%)')"
type="text"
size="small"
@click="chartDetail(scope.row, 'SOH (%)')"
type="text"
size="small"
>
{{ scope.row.soh }}
</el-button>
</template>
</el-table-column>
<el-table-column label="操作">
<el-table-column label="操作" width="160">
<template slot-scope="scope">
<el-button @click="$emit('pointDetail',scope.row,'point')" type="text" size="small">
详细
@ -118,7 +118,7 @@ export default {
methods: {
//查看表格行图表
chartDetail(row, dataType = "") {
this.$emit("chart", { ...row, dataType });
this.$emit("chart", {...row, dataType});
},
},
};