diff --git a/src/views/heatRecoverySys/deviceMonitor/monitorCenter.vue b/src/views/heatRecoverySys/deviceMonitor/monitorCenter.vue index f4e98dc..ab3eb98 100644 --- a/src/views/heatRecoverySys/deviceMonitor/monitorCenter.vue +++ b/src/views/heatRecoverySys/deviceMonitor/monitorCenter.vue @@ -329,6 +329,12 @@ {{ getHotMeterTemp(hotDialogArr, "瞬时流量", 31) }}m³/h +
+
热能量累积量:
+
+ {{ getHotMeterTemp(hotDialogArr, "累积热量", 47) }}kwh +
+
@@ -1439,7 +1445,7 @@ export default { border-radius: 10px; padding: 8px 10px; font-size: 16px; - width: 120px; + width: 180px; text-align: center; font-weight: bold; letter-spacing: 0.1em; diff --git a/src/views/heatRecoverySys/heatOverview/index.vue b/src/views/heatRecoverySys/heatOverview/index.vue index ec01740..312b177 100644 --- a/src/views/heatRecoverySys/heatOverview/index.vue +++ b/src/views/heatRecoverySys/heatOverview/index.vue @@ -427,7 +427,7 @@ export default { cold: res.data[0].cold[index].toString(), // 散热量数组 cop: res.data[2].cop[index].toString(), // 热利用率数组 })); - this.pageParm.total = res.data.totalPages; + this.pageParm.total = res.data[5].total; } else { this.tableData = []; } diff --git a/src/views/heatRecoverySys/thermalAnalysis/components/equipment.vue b/src/views/heatRecoverySys/thermalAnalysis/components/equipment.vue index 431ee88..37dda6a 100644 --- a/src/views/heatRecoverySys/thermalAnalysis/components/equipment.vue +++ b/src/views/heatRecoverySys/thermalAnalysis/components/equipment.vue @@ -516,7 +516,7 @@ export default { }; }), ]; - this.pageParm.total = res.data.totalPages; + this.pageParm.total = res.data[3].total; console.log("header", this.headers); } else { this.tableData = []; @@ -869,4 +869,7 @@ export default { width: 2.5rem !important; } } +.page { + margin-top: 0.1rem; +}