Smart/smartEnergyView-frontend
2
0
Fork 0
Code Issues 7 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'administativePages' of https://gitlab.com/kluppsoftware/smart-energia-web into administativePages

Browse Source
This commit is contained in:
Alex Santos 2022-06-29 01:42:36 -03:00
commit dcf35c419b
2 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/pages/chartTelemetry.tsx
View File

@ -68,7 +68,7 @@ export default function chartTelemetry({userName}) {
console.log(router.query) console.log(router.query)
await api.post('/telemetry/powerFactor', { await api.post('/telemetry/powerFactor', {
"filters": [ "filters": [
{"type" : "=", "field": discretization, "value": unity}, {"type" : "=", "field": "med_5min.ponto", "value": unity},
{"type" : "between", "field": "dia_num", "value": [startDate, endDate]} {"type" : "between", "field": "dia_num", "value": [startDate, endDate]}
] ]
}).then(res => { }).then(res => {
@ -78,9 +78,9 @@ export default function chartTelemetry({userName}) {
}) })
await api.post('/telemetry/discretization', { await api.post('/telemetry/discretization', {
"type": "5_min", "type": discretization,
"filters": [ "filters": [
{"type" : "=", "field": discretization, "value": unity}, {"type" : "=", "field": "med_5min.ponto", "value": unity},
{"type" : "between", "field": "dia_num", "value": [startDate, endDate]} {"type" : "between", "field": "dia_num", "value": [startDate, endDate]}
] ]
}).then(res => { }).then(res => {
@ -90,9 +90,9 @@ export default function chartTelemetry({userName}) {
}) })
await api.post('/telemetry/discretization', { await api.post('/telemetry/discretization', {
"type": "5_min", "type": discretization,
"filters": [ "filters": [
{"type" : "=", "field": discretization, "value": unity}, {"type" : "=", "field": "med_5min.ponto", "value": unity},
{"type" : "between", "field": "dia_num", "value": [startDate, endDate]} {"type" : "between", "field": "dia_num", "value": [startDate, endDate]}
] ]
}).then(res => { }).then(res => {
@ -103,7 +103,7 @@ export default function chartTelemetry({userName}) {
await api.post('/telemetry/demand', { await api.post('/telemetry/demand', {
"filters": [ "filters": [
{"type" : "=", "field": discretization, "value": unity}, {"type" : "=", "field": 'med_5min.ponto', "value": unity},
{"type" : "between", "field": "dia_num", "value": [startDate, endDate]} {"type" : "between", "field": "dia_num", "value": [startDate, endDate]}
] ]
}).then(res => { }).then(res => {
@ -154,7 +154,10 @@ export default function chartTelemetry({userName}) {
</Modal> </Modal>
<div onClick={() => setOpenConsumoDiscretizado1(true)}> <div onClick={() => setOpenConsumoDiscretizado1(true)}>
<DiscretizedConsumptionChartLine title='Consumo discretizado em 1 hora' subtitle='' data1={discretizedConsumptionDataReativa} dataset1='Demanda registrada' label={discretizedConsumptionDataReativa.map(data => parseFloat(data.reativa).toFixed(3))} /> <DiscretizedConsumptionChartLine title={
discretization==='5_min'? 'Consumo discretizado em 5 minutos' :
discretization==='15_min'? 'Consumo discretizado em 15 minutos' : discretization==='1_hora'? 'Consumo discretizado em 1 hora' : 'Consumo discretizado em 1 dia'
} subtitle='' data1={discretizedConsumptionDataReativa} dataset1='Demanda registrada' label={discretizedConsumptionDataReativa.map(data => parseFloat(data.reativa).toFixed(3))} />
</div> </div>
<Modal <Modal
open={openConsumoDiscretizado1} open={openConsumoDiscretizado1}
@ -163,12 +166,18 @@ export default function chartTelemetry({userName}) {
aria-describedby="modal-modal-description" aria-describedby="modal-modal-description"
> >
<Box sx={style}> <Box sx={style}>
<DiscretizedConsumptionChartLine title='Consumo discretizado em 1 hora' subtitle='' data1={discretizedConsumptionDataReativa} dataset1='Demanda registrada' label={discretizedConsumptionDataReativa.map(data => data.reativa)} /> <DiscretizedConsumptionChartLine title={
discretization==='5_min'? 'Consumo discretizado em 5 minutos' :
discretization==='15_min'? 'Consumo discretizado em 15 minutos' : discretization==='1_hora'? 'Consumo discretizado em 1 hora' : 'Consumo discretizado em 1 dia'
} subtitle='' data1={discretizedConsumptionDataReativa} dataset1='Demanda registrada' label={discretizedConsumptionDataReativa.map(data => data.reativa)} />
</Box> </Box>
</Modal> </Modal>
<div onClick={() => setOpenConsumoDiscretizado2(true)}> <div onClick={() => setOpenConsumoDiscretizado2(true)}>
<DiscretizedConsumptionChart title='Consumo discretizado em 5 minutos' subtitle='' dataProps={discretizedConsumptionData} label={discretizedConsumptionData.map(value => value.minut)} dataset={'Consumo'} dataset1='Estimado' month/> <DiscretizedConsumptionChart title={
discretization==='5_min'? 'Consumo discretizado em 5 minutos' :
discretization==='15_min'? 'Consumo discretizado em 15 minutos' : discretization==='1_hora'? 'Consumo discretizado em 1 hora' : 'Consumo discretizado em 1 dia'
} subtitle='' dataProps={discretizedConsumptionData} label={discretizedConsumptionData.map(value => value.minut)} dataset={'Consumo'} dataset1='Estimado' month/>
</div> </div>
<Modal <Modal
open={openConsumoDiscretizado2} open={openConsumoDiscretizado2}
@ -177,7 +186,10 @@ export default function chartTelemetry({userName}) {
aria-describedby="modal-modal-description" aria-describedby="modal-modal-description"
> >
<Box sx={style}> <Box sx={style}>
<DiscretizedConsumptionChart title='Consumo discretizado em 5 minutos' subtitle='' dataProps={discretizedConsumptionData} label={discretizedConsumptionData.map(value => value.minut)} dataset={'Consumo'} dataset1='Estimado' month/> <DiscretizedConsumptionChart title={
discretization==='5_min'? 'Consumo discretizado em 5 minutos' :
discretization==='15_min'? 'Consumo discretizado em 15 minutos' : discretization==='1_hora'? 'Consumo discretizado em 1 hora' : 'Consumo discretizado em 1 dia'
} subtitle='' dataProps={discretizedConsumptionData} label={discretizedConsumptionData.map(value => value.minut)} dataset={'Consumo'} dataset1='Estimado' month/>
</Box> </Box>
</Modal> </Modal>

4
src/pages/telemetria.tsx
View File

@ -108,7 +108,7 @@ export default function Telemetria({userName, clients}: any) {
if (startDate!=='' && endDate!=='' && send) if (startDate!=='' && endDate!=='' && send)
setOpen(true) setOpen(true)
await api.post('/telemetry/powerFactor', { await api.post('/telemetry/powerFactor', {
"type": "15_min", "type": discretization,
"filters": [ "filters": [
{"type" : "=", "field": "med_5min.ponto", "value": "RSZFNAENTR101P"}, {"type" : "=", "field": "med_5min.ponto", "value": "RSZFNAENTR101P"},
{"type" : "between", "field": "dia_num", "value": ["2022-01-03", "2022-01-03"]} {"type" : "between", "field": "dia_num", "value": ["2022-01-03", "2022-01-03"]}
@ -292,7 +292,7 @@ export default function Telemetria({userName, clients}: any) {
query: { query: {
startDate, startDate,
endDate, endDate,
discretization: discretization==='5_min'? 'med_5min.ponto' : discretization==='15_min'? '15min.ponto' : discretization==='1_hora'? 'med_1hora.ponto' : discretization==='1_dia'? 'med_1dia.ponto' : 'med_5min.ponto', discretization,
unity unity
}, },
}} > }} >