|
@@ -2,6 +2,7 @@ import React, { useState, useEffect, useRef } from 'react';
|
|
|
import { Line } from '@ant-design/plots';
|
|
|
import { Spin } from 'antd';
|
|
|
import styles from './index.less';
|
|
|
+import TdbRHchart from './TdbRHchart.jsx';
|
|
|
import { queryPropertyData } from '@/services/sagacare_service/environment';
|
|
|
export default ({ paramObj, spaceId }) => {
|
|
|
let [data, setData] = useState([]);
|
|
@@ -27,8 +28,20 @@ export default ({ paramObj, spaceId }) => {
|
|
|
const resData = getChartData(item, type);
|
|
|
resArr.push(resData);
|
|
|
});
|
|
|
+
|
|
|
Promise.all(resArr).then((res) => {
|
|
|
- const resData = [...res[0], ...res[1]];
|
|
|
+ let resData = [];
|
|
|
+ if (res[0].length === 1 && res[1] === 1) {
|
|
|
+ // 都没有数据
|
|
|
+ resData = res[0];
|
|
|
+ } else {
|
|
|
+ res[0] = res[0].length !== 1 ? res[0] : [];
|
|
|
+ res[1] = res[1].length !== 1 ? res[1] : [];
|
|
|
+ for (let i = 0; i < res[0].length; i++) {
|
|
|
+ let tempObj = { ...res[0][i], ...res[1][i] };
|
|
|
+ resData.push(tempObj);
|
|
|
+ }
|
|
|
+ }
|
|
|
setData(resData);
|
|
|
});
|
|
|
} else {
|
|
@@ -50,6 +63,11 @@ export default ({ paramObj, spaceId }) => {
|
|
|
setLevelMax(max); // 最大值
|
|
|
res.propertyData.shift();
|
|
|
arr = res.propertyData;
|
|
|
+ let key = 'scales';
|
|
|
+
|
|
|
+ if (objId === 'RH' || objId === 'Tdb') {
|
|
|
+ key = objId;
|
|
|
+ }
|
|
|
arr.forEach((itemArr) => {
|
|
|
let scales = '--';
|
|
|
if (itemArr[1] == '-9999') {
|
|
@@ -58,9 +76,7 @@ export default ({ paramObj, spaceId }) => {
|
|
|
} else {
|
|
|
scales = Number(itemArr[1].toFixed(paramObj.pointNum));
|
|
|
}
|
|
|
- // const scales =
|
|
|
- // itemArr[1] == '-9999' ? '--' : Number(itemArr[1].toFixed(paramObj.pointNum));
|
|
|
- chartArr.push({ Date: dealTime(itemArr[0]), scales: scales, type: type });
|
|
|
+ chartArr.push({ Date: dealTime(itemArr[0]), [key]: scales, type: type });
|
|
|
});
|
|
|
if (scalesCheckArr.length == arr.length) {
|
|
|
// 有返回时间且数据都是-9999 显示暂无数据
|
|
@@ -108,14 +124,25 @@ export default ({ paramObj, spaceId }) => {
|
|
|
} else if (data[0] == 'noNum') {
|
|
|
return <div className={styles.noNum}>暂无数据</div>;
|
|
|
} else if (data.length > 3) {
|
|
|
- return (
|
|
|
- <>
|
|
|
- <Line {...config} />
|
|
|
- <div className={styles.chartText}>
|
|
|
- <span>{paramObj.id == 'Tdb,RH' ? '温湿度逐时分布' : '浓度逐时分布'}</span>
|
|
|
- </div>
|
|
|
- </>
|
|
|
- );
|
|
|
+ if (paramObj.id == 'Tdb,RH') {
|
|
|
+ return (
|
|
|
+ <>
|
|
|
+ <TdbRHchart data={data} />
|
|
|
+ <div className={styles.chartText}>
|
|
|
+ <span>温湿度逐时分布</span>
|
|
|
+ </div>
|
|
|
+ </>
|
|
|
+ );
|
|
|
+ } else {
|
|
|
+ return (
|
|
|
+ <>
|
|
|
+ <Line {...config} />
|
|
|
+ <div className={styles.chartText}>
|
|
|
+ <span>浓度逐时分布</span>
|
|
|
+ </div>
|
|
|
+ </>
|
|
|
+ );
|
|
|
+ }
|
|
|
} else {
|
|
|
return (
|
|
|
<div className={styles.noNum}>
|