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

fix telemetry and resumo operação header

Browse Source
This commit is contained in:
joseCorte-exe 2022-08-09 10:28:16 -03:00
parent 62afd28f90
commit 22c09a7e26
5 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/components/graph/DemRegXDemConChart.tsx
View File

@ -138,12 +138,23 @@ export function DemRegXDemConChart({
datasets: [ datasets: [
{ {
type: 'line' as const, type: 'line' as const,
label: 'Demanda Contratada', label: 'Tolerância',
borderColor: red? borderColor: red?
'#f00' : '#0c9200', '#f00' : '#0c9200',
borderWidth: 2, borderWidth: 2,
fill: false, fill: false,
borderDash: [5, 5], borderDash: [5, 5],
data: data1?.map(value => value.dem_tolerancia),
pointBorderColor: 'rgba(255, 145, 0, 0)',
},
{
type: 'line' as const,
label: 'Demanda Contratada',
borderColor: red?
'#000' : '#0c9200',
borderWidth: 2,
fill: false,
borderDash: [5, 5],
data: data1?.map(value => value.dem_cont), data: data1?.map(value => value.dem_cont),
pointBorderColor: 'rgba(255, 145, 0, 0)', pointBorderColor: 'rgba(255, 145, 0, 0)',
}, },

8
src/pages/dashboard/index.tsx
View File

@ -44,14 +44,14 @@ export default function Dashboard({grossAnualGraph, grossAnualYears, grossMensal
lastDataMensal=grossMensalGraph[index].economia_acumulada lastDataMensal=grossMensalGraph[index].economia_acumulada
index++ index++
} }
setLastDataBrutaMensal(`economia acumulada: R$ ${parseFloat(lastDataMensal).toFixed(3)}`) setLastDataBrutaMensal(`${parseFloat(lastDataMensal).toFixed(3)}`)
index=0 index=0
while (index < grossAnualGraph.length) { while (index < grossAnualGraph.length) {
if (!grossAnualGraph[index].dad_estimado) if (!grossAnualGraph[index].dad_estimado)
lastDataAnual=grossAnualGraph[index].economia_acumulada lastDataAnual=grossAnualGraph[index].economia_acumulada
index++ index++
} }
setLastDataBrutaAnual(`economia acumulada: R$ ${parseFloat(lastDataAnual).toFixed(3)}`) setLastDataBrutaAnual(`${parseFloat(lastDataAnual).toFixed(3)}`)
}, []) }, [])
return ( return (
@ -79,7 +79,7 @@ export default function Dashboard({grossAnualGraph, grossAnualYears, grossMensal
<> <>
<section className='dashboard'> <section className='dashboard'>
<GraphCard title='Economia Bruta Anual' subtitle='Economia Bruta Estimada e Acumulada Anual - Valores em R$ x mil'> <GraphCard title='Economia Bruta Anual' subtitle='Economia Bruta Estimada e Acumulada Anual - Valores em R$ x mil'>
<p style={{color: '#254F7F'}}>{lastDataBrutaAnualS}</p> <p style={{color: '#254F7F'}}><b>Economia Acumulada:</b> R${lastDataBrutaAnualS}</p>
<GrossAnualChart title='' subtitle='' <GrossAnualChart title='' subtitle=''
dataset='Consolidada' dataset='Consolidada'
dataProps={grossAnualGraph} dataProps={grossAnualGraph}
@ -87,7 +87,7 @@ export default function Dashboard({grossAnualGraph, grossAnualYears, grossMensal
</GraphCard> </GraphCard>
<GraphCard title='Economia Bruta Mensal' subtitle='Economia Bruta Estimada e Acumulada Mensal - Valores em R$ x mil'> <GraphCard title='Economia Bruta Mensal' subtitle='Economia Bruta Estimada e Acumulada Mensal - Valores em R$ x mil'>
<p style={{color: '#254F7F'}}>{lastDataBrutaMensalS}</p> <p style={{color: '#254F7F'}}><b>Economia Acumulada:</b> R${lastDataBrutaMensalS}</p>
<GrossMensalChart title='' subtitle='' <GrossMensalChart title='' subtitle=''
data1={grossMensalGraph} data1={grossMensalGraph}
data2={grossMensalGraph} data2={grossMensalGraph}

4
src/pages/economy/index.tsx
View File

@ -64,7 +64,7 @@ export default function economy({userName, anual, years, brutaMensal, yearsBruta
index++ index++
} }
} }
setLastDataBrutaMensal(`economia acumulada: R$ ${parseFloat(lastData).toFixed(3)}`) setLastDataBrutaMensal(`${parseFloat(lastData).toFixed(3)}`)
}, [economyMenu]) }, [economyMenu])
useEffect(() => { useEffect(() => {
@ -115,7 +115,7 @@ export default function economy({userName, anual, years, brutaMensal, yearsBruta
} }
<p>{ <p>{
economyMenu===0 || economyMenu===1? economyMenu===0 || economyMenu===1?
lastDataBrutaMensalS <><b>Economia Acumulada:</b> R${lastDataBrutaMensalS}</>
: :
null null
}</p> }</p>

2
src/pages/telemetria/index.tsx
View File

@ -528,7 +528,7 @@ export default function Telemetria({userName, clients}: any) {
</div> </div>
</ChartFilters> </ChartFilters>
<FatorPotenciaChart title='Fator de Potencia' subtitle='' data1={fatorPotenciaData} <FatorPotenciaChart title='Fator de Potencia' subtitle='' data1={fatorPotenciaData}
data2={fatorPotenciaData} dataset1='Fator de Potencia' dataset2='Fator ref' label={fatorPotenciaData.map(value => parseFloat(value.dia_num))} /> data2={fatorPotenciaData} dataset1='Fator de Potencia' dataset2='Fator ref' label={fatorPotenciaData.map(value => (value.day_formatted))} />
</RenderIf> </RenderIf>
<RenderIf isTrue={menu===3}> <RenderIf isTrue={menu===3}>

4
src/styles/layouts/ResumoOperacao/ResumoOperacaoView.ts
View File

@ -13,10 +13,6 @@ export const TableView = styled.div`
height: 100%; height: 100%;
img{
margin-left:30rem;
}
.btn{ .btn{
margin-top: 10px; margin-top: 10px;
} }