diff --git a/src/components/BottomBar/gasii/gasChart/index.jsx b/src/components/BottomBar/gasii/gasChart/index.jsx
index daf4e37..a62987b 100644
--- a/src/components/BottomBar/gasii/gasChart/index.jsx
+++ b/src/components/BottomBar/gasii/gasChart/index.jsx
@@ -18,7 +18,7 @@ function GasChart(props) {
: Array(dataSource == 'gas-i' ? 8 : 5).fill(Array(7).fill(0));
// debug
- // console.log('gasII series data', dataName, hisState?.[dataName], seriesData)
+ console.log('天然气 series data', dataName, hisState?.[dataName], seriesData);
return (
diff --git a/src/components/BottomBar/gasii/gridList/index.jsx b/src/components/BottomBar/gasii/gridList/index.jsx
index 72ea02a..87eb59b 100644
--- a/src/components/BottomBar/gasii/gridList/index.jsx
+++ b/src/components/BottomBar/gasii/gridList/index.jsx
@@ -1,5 +1,6 @@
import cls from './index.module.css';
-import { useEffect, useState } from 'react';
+import { useContext, useEffect, useState } from 'react';
+import SocketContext from '../../../../store/socket-data-provider';
function getData(type) {
let data = [];
@@ -30,7 +31,13 @@ function getData(type) {
}
function GridList(props) {
- const dataList = getData(props.dataSource);
+ const { runState } = useContext(SocketContext);
+ const key = props.dataSource == 'gas-i' ? 'gasFlowArr' : 'furnaceGasFlowArr';
+
+ let dataList = getData(props.dataSource);
+ dataList = runState?.[key]
+ ? dataList.map((v, i) => ({ ...v, value: runState[key][i] ?? '/' }))
+ : dataList;
return (
diff --git a/src/components/RightBar/EnergyCost/index.jsx b/src/components/RightBar/EnergyCost/index.jsx
index d2c0b07..b1a3cbb 100644
--- a/src/components/RightBar/EnergyCost/index.jsx
+++ b/src/components/RightBar/EnergyCost/index.jsx
@@ -17,7 +17,7 @@ function EnergyCost(props) {
水 耗 量 : 32Km³
天 然 气 I : 83m³
-
电 耗 量 : 52Km³
+
电 耗 量 : 52kWh
天 然 气 II: 32m³