Commit 512400e2 authored by 陈龙's avatar 陈龙

feat: 发布历史曲线

parent fb72383e
...@@ -3,13 +3,13 @@ import HistoryView from '../index'; ...@@ -3,13 +3,13 @@ import HistoryView from '../index';
import {MobileHistoryChart} from "../mobile"; import {MobileHistoryChart} from "../mobile";
const deviceParams = [ const deviceParams = [
/* { {
deviceCode: 'EGBF00000141', deviceCode: 'EGBF00000141',
// sensors: '进水压力,出水瞬时流量,出水累计流量', // sensors: '进水压力,出水瞬时流量,出水累计流量',
sensors: '进水压力', sensors: '进水压力',
deviceType: '二供泵房', deviceType: '二供泵房',
pointAddressID: 208, pointAddressID: 208,
},*/ },
/* { /* {
"deviceCode": "SYJ00000008", "deviceCode": "SYJ00000008",
"sensors": "瞬时流量", "sensors": "瞬时流量",
...@@ -63,11 +63,11 @@ const deviceParams = [ ...@@ -63,11 +63,11 @@ const deviceParams = [
"sensors": "出水瞬时流量,是否在线", "sensors": "出水瞬时流量,是否在线",
"deviceType": "水厂" "deviceType": "水厂"
}*/ }*/
{ // {
"deviceCode": "XNCDC00000001", // "deviceCode": "XNCDC00000001",
"sensors": "沉淀池1号进水管流量", // "sensors": "沉淀池1号进水管流量",
"deviceType": "絮凝沉淀池" // "deviceType": "絮凝沉淀池"
} // }
]; ];
const Demo = () => { const Demo = () => {
return ( return (
......
...@@ -1180,10 +1180,11 @@ const HistoryView = (props) => { ...@@ -1180,10 +1180,11 @@ const HistoryView = (props) => {
<div className={classNames(`${prefixCls}-spin`)} style={{position: "relative"}}> <div className={classNames(`${prefixCls}-spin`)} style={{position: "relative"}}>
{ {
(loading || percent !== 0) ? <div className={classNames(`${prefixCls}-progressWrapper`)}> (loading || percent !== 0) ? <div className={classNames(`${prefixCls}-progressWrapper`)}>
<div className={classNames(`${prefixCls}-header`)}/> {/*<div className={classNames(`${prefixCls}-header`)}/>*/}
<div className={classNames(`${prefixCls}-contentWrapper`)}> <div className={classNames(`${prefixCls}-contentWrapper`)}>
{console.log(dateRange)}
{ {
lineDataType === '原始曲线' ? <><Progress percent={percent} lineDataType === '原始曲线' || lineDataType === '特征曲线'&& moment(dateRange?.[0]?.dateTo).diff(moment(dateRange?.[0]?.dateFrom), 'days') >= 30? <><Progress percent={percent}
steps={20} steps={20}
className={classNames(`${prefixCls}-progress`, `${prefixCls}-blink-2`)} className={classNames(`${prefixCls}-progress`, `${prefixCls}-blink-2`)}
showInfo={false}/> showInfo={false}/>
......
...@@ -248,8 +248,8 @@ ...@@ -248,8 +248,8 @@
} }
.@{history-view}-blink-2 { .@{history-view}-blink-2 {
-webkit-animation: blink-2 5s infinite both; -webkit-animation: blink-2 3s infinite both;
animation: blink-2 5s infinite both; animation: blink-2 3s infinite both;
} }
/** /**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment