fix telemetry and resumo operação header

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

View File

@ -138,12 +138,23 @@ export function DemRegXDemConChart({
datasets: [
{
type: 'line' as const,
label: 'Demanda Contratada',
label: 'Tolerância',
borderColor: red?
'#f00' : '#0c9200',
borderWidth: 2,
fill: false,
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),
pointBorderColor: 'rgba(255, 145, 0, 0)',
},

View File

@ -44,14 +44,14 @@ export default function Dashboard({grossAnualGraph, grossAnualYears, grossMensal
lastDataMensal=grossMensalGraph[index].economia_acumulada
index++
}
setLastDataBrutaMensal(`economia acumulada: R$ ${parseFloat(lastDataMensal).toFixed(3)}`)
setLastDataBrutaMensal(`${parseFloat(lastDataMensal).toFixed(3)}`)
index=0
while (index < grossAnualGraph.length) {
if (!grossAnualGraph[index].dad_estimado)
lastDataAnual=grossAnualGraph[index].economia_acumulada
index++
}
setLastDataBrutaAnual(`economia acumulada: R$ ${parseFloat(lastDataAnual).toFixed(3)}`)
setLastDataBrutaAnual(`${parseFloat(lastDataAnual).toFixed(3)}`)
}, [])
return (
@ -79,7 +79,7 @@ export default function Dashboard({grossAnualGraph, grossAnualYears, grossMensal
<>
<section className='dashboard'>
<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=''
dataset='Consolidada'
dataProps={grossAnualGraph}
@ -87,7 +87,7 @@ export default function Dashboard({grossAnualGraph, grossAnualYears, grossMensal
</GraphCard>
<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=''
data1={grossMensalGraph}
data2={grossMensalGraph}

View File

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

View File

@ -528,7 +528,7 @@ export default function Telemetria({userName, clients}: any) {
</div>
</ChartFilters>
<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 isTrue={menu===3}>

View File

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