From e87bca96d65aa3b48bd161a87a244b73c3c8aa2c Mon Sep 17 00:00:00 2001 From: lb Date: Wed, 19 Jul 2023 10:54:24 +0800 Subject: [PATCH] update --- src/components/BottomBar/gasii/gasChart/index.jsx | 2 +- src/components/BottomBar/gasii/gridList/index.jsx | 2 +- src/components/CenterTopData/LeftBoxes/index.jsx | 7 +++---- src/components/Head/index.jsx | 2 +- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/components/BottomBar/gasii/gasChart/index.jsx b/src/components/BottomBar/gasii/gasChart/index.jsx index a62987b..5238a7c 100644 --- a/src/components/BottomBar/gasii/gasChart/index.jsx +++ b/src/components/BottomBar/gasii/gasChart/index.jsx @@ -15,7 +15,7 @@ function GasChart(props) { ? Object.keys(hisState?.[dataName]) .sort() .map((key, index) => hisState?.[dataName][key]) - : Array(dataSource == 'gas-i' ? 8 : 5).fill(Array(7).fill(0)); + : Array(dataSource == 'gas-i' ? 8 : 4).fill(Array(7).fill(0)); // debug console.log('天然气 series data', dataName, hisState?.[dataName], seriesData); diff --git a/src/components/BottomBar/gasii/gridList/index.jsx b/src/components/BottomBar/gasii/gridList/index.jsx index 87eb59b..1788ce1 100644 --- a/src/components/BottomBar/gasii/gridList/index.jsx +++ b/src/components/BottomBar/gasii/gridList/index.jsx @@ -23,7 +23,7 @@ function getData(type) { { id: 12, name: '2#天然气II', value: '0m³/h' }, { id: 13, name: '3#天然气II', value: '0m³/h' }, { id: 14, name: '4#天然气II', value: '0m³/h' }, - { id: 15, name: '5#天然气II', value: '0m³/h' }, + // { id: 15, name: '5#天然气II', value: '0m³/h' }, ]; break; } diff --git a/src/components/CenterTopData/LeftBoxes/index.jsx b/src/components/CenterTopData/LeftBoxes/index.jsx index e512099..6416531 100644 --- a/src/components/CenterTopData/LeftBoxes/index.jsx +++ b/src/components/CenterTopData/LeftBoxes/index.jsx @@ -9,14 +9,13 @@ import cls from './leftbox.module.less'; const Chart2 = () => { const ctx = useContext(SocketContext); - let [restTime, setResttime] = useState( - ctx.runState?.lastFireChangeTime || '0分0秒', - ); let [time, setTime] = useState([0, 0]); useEffect(() => { - let timer = null; + const restTime = ctx.runState?.lastFireChangeTime; if (restTime == null) return; + console.log('restTime is:', restTime); + let timer = null; if (/分/.test(restTime) && /秒/.test(restTime)) { let [min, sec] = restTime.replace(/分/, ':').replace(/秒/, '').split(':'); timer = setInterval(() => { diff --git a/src/components/Head/index.jsx b/src/components/Head/index.jsx index ab42731..5b656a0 100644 --- a/src/components/Head/index.jsx +++ b/src/components/Head/index.jsx @@ -32,7 +32,7 @@ export default function index() { 图片丢失
图片丢失 -

单位:中建材智能自动化研究院

+

单位:河南汇融科技服务有限公司