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

update

Browse Source
This commit is contained in:
Alex Santos 2022-06-27 16:24:08 -03:00
parent e5bc75c60e
commit 99f51b87cc
5 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/graph/graphCard/ChartCard.tsx
View File

@ -70,7 +70,7 @@ export default function ChartCard({ title, subtitle, consumption, className, lin
<div className='header'> <div className='header'>
<div> <div>
<h2>{title}</h2> <h2>{title}</h2>
<span>{subtitle}</span> <span style={{display:'block'}}>{subtitle}</span>
</div> </div>
{/* <ButtonGroup /> */} {/* <ButtonGroup /> */}
</div> </div>

5
src/components/graph/graphCard/ChartCardView.ts
View File

@ -37,6 +37,11 @@ export const ChartCardView = styled.article`
color: #2F4CDD; color: #2F4CDD;
} }
span{
display:block;
font-size: 12.8px;
}
.statusDot { .statusDot {
max-width: 11px; max-width: 11px;
max-height: 11px; max-height: 11px;

3
src/components/header/Header.tsx
View File

@ -62,7 +62,8 @@ export default function Header({ name, admin, profile_picture }: headerInterface
</div> </div>
{ {
!admin? !admin?
<Image src={profile_picture} alt='teste' height={45} width={50} /> // <Image src={profile_picture} alt='teste' height={45} width={50} />
null
: :
null null
} }

15
src/pages/administrative/industryInfo/index.tsx
View File

@ -78,7 +78,7 @@ export default function industryInfo({userName}: any) {
<form action=""> <form action="">
<div className='testess'> <div className='testess'>
<label htmlFor="arquivo"> <p className='TitleButton'> Enviar PDF </p> </label> <label htmlFor="arquivo"> <p className='TitleButton'> Enviar PDF </p> </label>
{/* <input type="file" name='arquivo' id='arquivo' onChange={onChange} /> */}
<input type="file" name='arquivo' id='arquivo' accept=".pdf" onChange={onChange} /> <input type="file" name='arquivo' id='arquivo' accept=".pdf" onChange={onChange} />
</div> </div>
</form> </form>
@ -87,16 +87,13 @@ export default function industryInfo({userName}: any) {
{/* <InputUploadPdf/> */} {/* <InputUploadPdf/> */}
</div> </div>
<div className="update"> <div style={{marginTop:'20px'}}>
<form action=""> <input type="file" name='arquivo' id='arquivo' onChange={onChange} />
<div className='testess'>
<label htmlFor="arquivo"> <p className='TitleButton'> Enviar PDF </p> </label>
<input type="file" accept=".pdf" onChange={onChange} />
</div>
</form>
</div> </div>
<BasicButton onClick={() => handleCreateClient()} title='Atualizar'/>
<br />
{/* <BasicButton onClick={() => handleCreateClient()} title='Atualizar'/> */}
</IndustryInfoView> </IndustryInfoView>
) )

12
src/pages/dashboard.tsx
View File

@ -44,14 +44,14 @@ export default function Dashboard({grossAnualGraph, grossAnualYears, grossMensal
</Link> </Link>
<section className='dashboard'> <section className='dashboard'>
<GraphCard title='Economia Bruta Anual' subtitle='Economia Bruta Estimada e Acumulada anual'> <GraphCard title='Economia Bruta Anual' subtitle='Economia Bruta Estimada e Acumulada anual - (Valores em R$ mil)'>
<SingleBar title='Economia Bruta' subtitle='(Valores em R$ mil)' <SingleBar title='' subtitle=''
dataset='Consolidada' dataset1='Estimada' dataset='Consolidada' dataset1='Estimada'
dataProps={grossAnualGraph} dataProps={grossAnualGraph}
label={grossAnualYears} barLabel year/> label={grossAnualYears} barLabel year/>
</GraphCard> </GraphCard>
<GraphCard title='Economia Bruta Mensal' subtitle='Economia Bruta Estimada e Acumulada mensal' singleBar> <GraphCard title='Economia Bruta Mensal' subtitle='Economia Bruta Estimada e Acumulada mensal - (Valores em R$)' singleBar>
<SingleBar title='Economia Bruta Estimada e Acumulada' subtitle='(Valores em R$)' <SingleBar title='Economia Bruta Estimada e Acumulada' subtitle='(Valores em R$)'
dataset='Acumulada' dataset1='Estimado' dataset='Acumulada' dataset1='Estimado'
dataProps={grossMensalGraph} dataProps={grossMensalGraph}
@ -59,14 +59,14 @@ export default function Dashboard({grossAnualGraph, grossAnualYears, grossMensal
barLabel month/> barLabel month/>
</GraphCard> </GraphCard>
<GraphCard title='Cativo x Livre mensal' subtitle='Comparativo de Custo Estimado' singleBar> <GraphCard title='Cativo x Livre mensal' subtitle='Comparativo de Custo Estimado - (Valores em R$/MWh)' singleBar>
<LineBarChart2 data1={acumulatedGraph} data2={acumulatedGraph} data3={acumulatedGraph} <LineBarChart2 data1={acumulatedGraph} data2={acumulatedGraph} data3={acumulatedGraph}
label={ConsumoEstimado.label} dataset1='Custo' dataset2='Cativo' dataset3='Livre' label={ConsumoEstimado.label} dataset1='Custo' dataset2='Cativo' dataset3='Livre'
title='Custo Estimado' subtitle='(Valores em R$/MWh)' barLabel hashurado/> title='' subtitle='' barLabel hashurado/>
</GraphCard> </GraphCard>
<GraphCard title='Indicador de Custo' subtitle='Valores em R$/ MWh'> <GraphCard title='Indicador de Custo' subtitle='Valores em R$/ MWh'>
<Chart title='Indicador de Custo' subtitle='(Valores em R$/MWh)' <Chart title='' subtitle=''
data1={costIndicator.filter((value, index) => value.mes.slice(3, 7).includes('2021')).sort((a, b) => { data1={costIndicator.filter((value, index) => value.mes.slice(3, 7).includes('2021')).sort((a, b) => {
if (parseFloat(a.mes.slice(0,2)) > parseFloat(b.mes.slice(1,2))) return 1 if (parseFloat(a.mes.slice(0,2)) > parseFloat(b.mes.slice(1,2))) return 1
if (parseFloat(a.mes.slice(0,2)) < parseFloat(b.mes.slice(1,2))) return -1 if (parseFloat(a.mes.slice(0,2)) < parseFloat(b.mes.slice(1,2))) return -1