)
+ {v.data?.map((s, i) => )
}
diff --git a/web/client/src/sections/bigScreen/components/basis/right_2.js b/web/client/src/sections/bigScreen/components/basis/right_2.js
index 564258f..b2731d2 100644
--- a/web/client/src/sections/bigScreen/components/basis/right_2.js
+++ b/web/client/src/sections/bigScreen/components/basis/right_2.js
@@ -63,7 +63,7 @@ export default function Right_2 ({ depthWater }) {
areaStyle: {
color: '#0e9cff26',
},
- data: depthWater?.map(v => v.sLiquid_level)
+ data: depthWater?.map(v => (v.sLiquid_level?.toFixed(2) || 0))
},
{
type: 'line',
@@ -72,7 +72,7 @@ export default function Right_2 ({ depthWater }) {
areaStyle: {
color: '#0e9cff26',
},
- data: depthWater?.map(v => v.sGrille_level)
+ data: depthWater?.map(v => (v.sGrille_level?.toFixed(2) || 0))
},
]
diff --git a/web/client/src/sections/bigScreen/components/capacity.js b/web/client/src/sections/bigScreen/components/capacity.js
index 77a23de..c125dca 100644
--- a/web/client/src/sections/bigScreen/components/capacity.js
+++ b/web/client/src/sections/bigScreen/components/capacity.js
@@ -5,15 +5,15 @@ import moment from 'moment'
import ReactECharts from 'echarts-for-react';
import './index.less'
-const Capacity = ({ actions, dispatch, user, }) => {
+const Capacity = ({ actions, dispatch, siteList, }) => {
const { bigScreen } = actions
const [pageLeft, setPageLeft] = useState(0) //左边翻页
const [pageRight, setPageRight] = useState(0) //左边翻页
- const [siteList, setSiteList] = useState([]) //站点列表
+ // const [siteList, setSiteList] = useState([]) //站点列表
const [pumpList, setPumpList] = useState([]) //水泵列表
const [strucId, setStrucId] = useState() //站点ID
- const [pumpId, setPumpId] = useState() //水泵id
- const [usePumpId, setUsePumpId] = useState() //水泵id
+ const [pumpId, setPumpId] = useState([]) //水泵id
+ const [usePumpId, setUsePumpId] = useState([]) //水泵id
const [pumpData, setPumpData] = useState([]) //水泵数据
const [cabinetData, setCabinetData] = useState([]) //进线柜数据
const [centreData, setCentreData] = useState({}) //中间数据
@@ -23,20 +23,20 @@ const Capacity = ({ actions, dispatch, user, }) => {
+
+
useEffect(() => {
- dispatch(bigScreen.axyData({ type: 'get', url: `organizations/{orgId}/structures` })).then(res => {
- if (res.success) {
- setSiteList(res.payload.data?.map(v => ({ value: v.id, label: v.name })) || [])
- setStrucId(res.payload.data[0]?.id)
- }
- })
- }, [])
+ setStrucId(siteList[0]?.value)
+ }, [siteList])
useEffect(async () => {
let pump = []
let cabinetSun = []
- let pumpSun = []
let sun = {}
+ let day1 = 0
+ let day30 = 0
+ let day365 = 0
+ let daySun = 0
if (strucId) {
await dispatch(bigScreen.axyData({ type: 'get', url: `structures/${strucId}/factors` })).then(async r => {
if (r.success) {
@@ -49,98 +49,106 @@ const Capacity = ({ actions, dispatch, user, }) => {
})).then(async p => {
if (p.success) {
let dataId = []
+ let voltageId = []
p.payload.data?.map(v => {
v.groups?.map(s => {
s.stations?.map(f => {
dataId.push(f.id)
+ if (voltageId?.length < 3) {
+ voltageId.push(f.id)
+ }
})
})
})
setPumpList(p.payload.data[0]?.groups[0]?.stations)
- setPumpId(p.payload.data[0]?.groups[0]?.stations[0]?.id)
- setUsePumpId(p.payload.data[0]?.groups[0]?.stations[0]?.id)
+ setPumpId(voltageId)
+ setUsePumpId(voltageId)
if (dataId.length) {
- let sameDay //当天最新一条数据
- let beforeDay //前一天最新一条数据
- let month //上个月最新一条数据
- let year //去年最新一条数据
// 当前时间
await dispatch(bigScreen.axyData({
type: 'get', url: `stations/theme/data`, params: {
query: {
stations: dataId.join(),
- startTime: moment().startOf('day').format('YYYY:MM:DD HH:mm:ss'),
- endTime: moment().endOf('day').format('YYYY:MM:DD HH:mm:ss'),
+ startTime: moment().startOf('day').format('YYYY-MM-DD HH:mm:ss'),
+ endTime: moment().endOf('day').format('YYYY-MM-DD HH:mm:ss'),
limit: 1
}
}
})).then(d => {
if (d.success) {
pump = d.payload.data?.stations || []
- sameDay = d.payload.data?.stations || []
+ d.payload.data?.stations?.map(f => {
+ daySun += f?.data[0]?.eMotor_EQ
+ })
}
})
- // 昨天最后一条数据
+ // 今天
await dispatch(bigScreen.axyData({
- type: 'get', url: `stations/theme/data`, params: {
+ type: 'get', url: `stations/data/theme`, params: {
query: {
stations: dataId.join(),
- startTime: moment().day(moment().day() - 7).startOf('day').format('YYYY-MM-DD HH:mm:ss'),
- endTime: moment().day(moment().day() - 1).endOf('day').format('YYYY-MM-DD HH:mm:ss'),
- limit: 1
+ begin: moment().startOf('day').format('x'),
+ end: moment().endOf('day').format('x'),
+ aggtype: "h",
+ method: 'diff'
}
}
})).then(d => {
if (d.success) {
- beforeDay = d.payload.data?.stations || []
-
+ d.payload.data[0]?.stations.map(f => {
+ f.data?.map(h => {
+ if (!h.changData) {
+ day1 += h.values.eMotor_EQ
+ }
+ })
+ })
}
})
- // 上月最后一条数据
+ // 本月
await dispatch(bigScreen.axyData({
- type: 'get', url: `stations/theme/data`, params: {
+ type: 'get', url: `stations/data/theme`, params: {
query: {
stations: dataId.join(),
- startTime: moment().month(moment().month() - 1).startOf('month').format('YYYY-MM-DD HH:mm:ss'),
- endTime: moment().month(moment().month() - 1).endOf('month').format('YYYY-MM-DD HH:mm:ss'),
- limit: 1
+ begin: moment().startOf('month').format('x'),
+ end: moment().endOf('month').format('x'),
+ aggtype: "d",
+ method: 'diff'
}
}
})).then(d => {
if (d.success) {
- month = d.payload.data?.stations || []
-
+ d.payload.data[0]?.stations.map(f => {
+ f.data?.map(h => {
+ if (!h.changData) {
+ day30 += h.values.eMotor_EQ
+ }
+ })
+ })
}
})
- //去年最后一条数据
+ // 今年
await dispatch(bigScreen.axyData({
- type: 'get', url: `stations/theme/data`, params: {
+ type: 'get', url: `stations/data/theme`, params: {
query: {
stations: dataId.join(),
- startTime: moment().year(moment().year() - 1).month(moment().month() - 1).startOf('year').format('YYYY-MM-DD HH:mm:ss'),
- endTime: moment().year(moment().year() - 1).month(moment().month() - 1).endOf('year').format('YYYY-MM-DD HH:mm:ss'),
- limit: 1
+ begin: moment().startOf('year').format('x'),
+ end: moment().endOf('year').format('x'),
+ aggtype: "d",
+ method: 'diff'
}
}
})).then(d => {
if (d.success) {
- year = d.payload.data?.stations || []
+ d.payload.data[0]?.stations.map(f => {
+ f.data?.map(h => {
+ if (!h.changData) {
+ day365 += h.values.eMotor_EQ
+ }
+ })
+ })
}
})
- sameDay?.map(u => {
- let find1 = beforeDay?.find(c => c.id == u.id)
- let find2 = month?.find(c => c.id == u.id)
- let find3 = year?.find(c => c.id == u.id)
-
- pumpSun.push({
- today: u?.data[0]?.eMotor_EQ && find1?.data[0]?.eMotor_EQ ? (u?.data[0]?.eMotor_EQ - find1?.data[0]?.eMotor_EQ) : '--',
- sameMonth: u?.data[0]?.eMotor_EQ && find2?.data[0]?.eMotor_EQ ? (u?.data[0]?.eMotor_EQ - find2?.data[0]?.eMotor_EQ) : '--',
- thisYear: u?.data[0]?.eMotor_EQ && find3?.data[0]?.eMotor_EQ ? (u?.data[0]?.eMotor_EQ - find3?.data[0]?.eMotor_EQ) : '--',
- eMotor_EQ: u?.data[0]?.eMotor_EQ,
- id: u.id,
- name: u.name,
- })
- })
+
}
}
@@ -163,11 +171,7 @@ const Capacity = ({ actions, dispatch, user, }) => {
})
})
if (dataId.length) {
- let sameDay //当天最新一条数据
- let beforeDay //前一天最新一条数据
- let month //上个月最新一条数据
- let year //去年最新一条数据
- // 当前时间
+ // // 当前时间
await dispatch(bigScreen.axyData({
type: 'get', url: `stations/theme/data`, params: {
query: {
@@ -179,73 +183,107 @@ const Capacity = ({ actions, dispatch, user, }) => {
}
})).then(d => {
if (d.success) {
- sameDay = d.payload.data?.stations || []
+ d.payload.data?.stations?.map(f => {
+ daySun += f?.data[0]?.eQF_EQ
+ cabinetSun.push({
+ today: 0,
+ sameMonth: 0,
+ thisYear: 0,
+ eQF_EQ: f?.data[0]?.eQF_EQ,
+ id: f.id,
+ name: f.name,
+ sQF_CLOSING: f?.data[0]?.sQF_CLOSING
+ })
+ })
}
})
- // 昨天最后一条数据
+ // 今天
await dispatch(bigScreen.axyData({
- type: 'get', url: `stations/theme/data`, params: {
+ type: 'get', url: `stations/data/theme`, params: {
query: {
stations: dataId.join(),
- startTime: moment().day(moment().day() - 7).startOf('day').format('YYYY-MM-DD HH:mm:ss'),
- endTime: moment().day(moment().day() - 1).endOf('day').format('YYYY-MM-DD HH:mm:ss'),
- limit: 1
+ begin: moment().startOf('day').format('x'),
+ end: moment().endOf('day').format('x'),
+ aggtype: "h",
+ method: 'diff'
}
}
})).then(d => {
if (d.success) {
- beforeDay = d.payload.data?.stations || []
-
+ cabinetSun.forEach(p => {
+ d.payload.data[0]?.stations.map(f => {
+ if (p.id == f.id) {
+ f.data?.map(h => {
+ if (!h.changData) {
+ p.today = p.today + h.values.eQF_EQ
+ p.sameMonth = p.sameMonth + h.values.eQF_EQ
+ p.thisYear = p.thisYear + h.values.eQF_EQ
+ day1 += h.values.eQF_EQ
+ }
+ })
+ }
+ })
+ })
}
})
- // 上月最后一条数据
+ // 本月
await dispatch(bigScreen.axyData({
- type: 'get', url: `stations/theme/data`, params: {
+ type: 'get', url: `stations/data/theme`, params: {
query: {
stations: dataId.join(),
- startTime: moment().month(moment().month() - 1).startOf('month').format('YYYY-MM-DD HH:mm:ss'),
- endTime: moment().month(moment().month() - 1).endOf('month').format('YYYY-MM-DD HH:mm:ss'),
- limit: 1
+ begin: moment().startOf('month').format('x'),
+ end: moment().endOf('month').format('x'),
+ aggtype: "d",
+ method: 'diff'
}
}
})).then(d => {
if (d.success) {
- month = d.payload.data?.stations || []
-
+ cabinetSun.forEach(p => {
+ d.payload.data[0]?.stations.map(f => {
+ if (p.id == f.id) {
+ f.data?.map(h => {
+ if (!h.changData) {
+ p.sameMonth = p.sameMonth + h.values.eQF_EQ
+ day30 += h.values.eQF_EQ
+ }
+ })
+ }
+ })
+ })
}
})
- //去年最后一条数据
+ // 今年
await dispatch(bigScreen.axyData({
- type: 'get', url: `stations/theme/data`, params: {
+ type: 'get', url: `stations/data/theme`, params: {
query: {
stations: dataId.join(),
- startTime: moment().year(moment().year() - 1).month(moment().month() - 1).startOf('year').format('YYYY-MM-DD HH:mm:ss'),
- endTime: moment().year(moment().year() - 1).month(moment().month() - 1).endOf('year').format('YYYY-MM-DD HH:mm:ss'),
- limit: 1
+ begin: moment().startOf('year').format('x'),
+ end: moment().endOf('year').format('x'),
+ aggtype: "d",
+ method: 'diff'
}
}
})).then(d => {
if (d.success) {
- year = d.payload.data?.stations || []
+ // year = d.payload.data[0]?.stations
+ cabinetSun.forEach(p => {
+ d.payload.data[0]?.stations.map(f => {
+ if (p.id == f.id) {
+ f.data?.map(h => {
+ if (!h.changData) {
+ p.thisYear = p.thisYear + h.values.eQF_EQ
+ day365 += h.values.eQF_EQ
+ }
+ })
+ }
+ })
+ })
}
})
- sameDay?.map(u => {
- let find1 = beforeDay?.find(c => c.id == u.id)
- let find2 = month?.find(c => c.id == u.id)
- let find3 = year?.find(c => c.id == u.id)
- cabinetSun.push({
- today: u?.data[0]?.eQF_EQ && find1?.data[0]?.eQF_EQ ? (u?.data[0]?.eQF_EQ - find1?.data[0]?.eQF_EQ) : '--',
- sameMonth: u?.data[0]?.eQF_EQ && find2?.data[0]?.eQF_EQ ? (u?.data[0]?.eQF_EQ - find2?.data[0]?.eQF_EQ) : '--',
- thisYear: u?.data[0]?.eQF_EQ && find3?.data[0]?.eQF_EQ ? (u?.data[0]?.eQF_EQ - find3?.data[0]?.eQF_EQ) : '--',
- eQF_EQ: u?.data[0]?.eQF_EQ,
- id: u.id,
- name: u.name,
- sQF_CLOSING: u?.data[0]?.sQF_CLOSING
- })
- })
}
}
})
@@ -260,7 +298,6 @@ const Capacity = ({ actions, dispatch, user, }) => {
params: { query: { factorId: informationId } }
})).then(async p => {
if (p.success) {
-
await dispatch(bigScreen.axyData({
type: 'get', url: `stations/theme/data`, params: {
query: {
@@ -305,38 +342,22 @@ const Capacity = ({ actions, dispatch, user, }) => {
setCabinetData(cabinetSun)
//计算各个阶段的总点电量
- let day1 = 0
- let day30 = 0
- let day365 = 0
- let daySun = 0
- pumpSun?.map(h => {
- if (!isNaN(h.today)) day1 += h.today
- if (!isNaN(h.sameMonth)) day30 += h.sameMonth
- if (!isNaN(h.thisYear)) day365 += h.thisYear
- if (!isNaN(h.eQF_EQ)) daySun += h.eQF_EQ
- })
- cabinetSun?.map(h => {
- if (!isNaN(h.today)) day1 += h.today
- if (!isNaN(h.sameMonth)) day30 += h.sameMonth
- if (!isNaN(h.thisYear)) day365 += h.thisYear
- if (!isNaN(h.eQF_EQ)) daySun += h.eQF_EQ
- })
sun.day1 = day1
- sun.day30 = day30
- sun.day365 = day365
+ sun.day30 = day30 + day1
+ sun.day365 = day365 + day1
sun.daySun = daySun
setCentreData(sun)
}, [strucId])
useEffect(async () => {
- if (pumpId) {
+ if (pumpId?.length > 0) {
//电流趋势
await dispatch(bigScreen.axyData({
type: 'get', url: `stations/theme/data`, params: {
query: {
- stations: pumpId,
+ stations: pumpId?.join(),
startTime: moment().add(-12, 'hours').format('YYYY-MM-DD HH:mm:ss'),
endTime: moment().format('YYYY-MM-DD HH:mm:ss'),
limit: 1440
@@ -344,11 +365,12 @@ const Capacity = ({ actions, dispatch, user, }) => {
}
})).then(d => {
if (d.success) {
- let trend = []
- d.payload.data?.stations[0]?.data?.map((s, i) => {
- trend.push({ time: s.time, eMotor_A_A: s.eMotor_A_A })
- })
- setElectricityTrend(trend)
+ // let trend = []
+ // d.payload.data?.stations[0]?.data?.map((s, i) => {
+ // trend.push({ time: s.time, eMotor_A_A: s.eMotor_A_A })
+ // })
+
+ setElectricityTrend(d.payload.data?.stations)
}
})
@@ -357,28 +379,20 @@ const Capacity = ({ actions, dispatch, user, }) => {
}, [pumpId])
useEffect(async () => {
- if (usePumpId) {
+ if (usePumpId?.length > 0) {
//电流趋势
await dispatch(bigScreen.axyData({
type: 'get', url: `stations/theme/data`, params: {
query: {
- stations: usePumpId,
+ stations: usePumpId?.join(),
startTime: moment().add(-12, 'hours').format('YYYY-MM-DD HH:mm:ss'),
endTime: moment().format('YYYY-MM-DD HH:mm:ss'),
- limit: 1440
+ limit: 3
}
}
})).then(d => {
if (d.success) {
- let trend = []
- let front = {}
- d.payload.data?.stations[0]?.data?.map((s, i) => {
- front = s
- if (i > 0) {
- trend.push({ time: front.time, value: front?.eMotor_EQ - s.eMotor_EQ })
- }
- })
- setUseTrend(trend)
+ setUseTrend(d.payload.data?.stations)
}
})
@@ -533,7 +547,7 @@ const Capacity = ({ actions, dispatch, user, }) => {
+ 
+ 
+ 
{
+ if (page > 0) setPage(page - 1)
+ }} />
+ {
+ softStartData?.slice(page * 2, (page + 1) * 2)?.map((v, index) => {
+ return 
{
+ if (page + 1 < Math.ceil(softStartData?.length / 2)) setPage(page + 1)
+ }} />
+ }
+ 
+ 
@@ -77,6 +245,7 @@ function mapStateToProps (state) {
return {
user: auth.user,
clientHeight: global.clientHeight,
+ actions: global.actions,
};
}
diff --git a/web/client/src/sections/bigScreen/components/realTime/runTime.js b/web/client/src/sections/bigScreen/components/realTime/runTime.js
new file mode 100644
index 0000000..ee8870a
--- /dev/null
+++ b/web/client/src/sections/bigScreen/components/realTime/runTime.js
@@ -0,0 +1,64 @@
+import React, { useEffect, useState } from 'react';
+import { connect } from 'react-redux';
+import { Select } from 'antd';
+import ReactECharts from 'echarts-for-react';
+import moment from 'moment'
+
+const { Option } = Select;
+
+const RunTime = ({ user, softStartData }) => {
+
+ const [page, setPage] = useState(0)
+
+
+
+ return 
-
-