Merge branch 'develop' into baicai

This commit is contained in:
白菜
2025-07-01 09:35:40 +08:00
2 changed files with 5 additions and 5 deletions

View File

@ -54,9 +54,9 @@ export function getClusterNameList(stackDeviceId) {
})
}
//单体电池表格数据
export function getClusterDataInfoList({siteId, stackDeviceId, clusterDeviceId, pageSize, pageNumber}) {
export function getClusterDataInfoList({siteId, stackDeviceId, clusterDeviceId, pageSize, pageNum}) {
return request({
url: `/ems/siteMonitor/getClusterDataInfoList?clusterDeviceId=${clusterDeviceId}&siteId=${siteId}&stackDeviceId=${stackDeviceId}&pageSize=${pageSize}&pageNumber=${pageNumber}`,
url: `/ems/siteMonitor/getClusterDataInfoList?clusterDeviceId=${clusterDeviceId}&siteId=${siteId}&stackDeviceId=${stackDeviceId}&pageSize=${pageSize}&pageNum=${pageNum}`,
method: 'get'
})
}

View File

@ -46,7 +46,7 @@
>
</el-table-column>
<el-table-column
prop="voltage"
prop="temperature"
label="温度(℃)">
</el-table-column>
<el-table-column
@ -134,8 +134,8 @@ export default {
getTableData(){
this.loading=true;
const {stackId:stackDeviceId,clusterId:clusterDeviceId} =this.search
const {siteId,pageNum:pageNumber,pageSize}=this
getClusterDataInfoList({stackDeviceId,clusterDeviceId,siteId,pageNumber,pageSize}).then(response => {
const {siteId,pageNum,pageSize}=this
getClusterDataInfoList({stackDeviceId,clusterDeviceId,siteId,pageNum,pageSize}).then(response => {
this.tableData=response?.rows || [];
this.totalSize = response?.total || 0
}).finally(()=>{