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

fix

Browse Source
This commit is contained in:
joseCorte-exe 2022-07-19 18:08:26 -03:00
parent 144d9a4aa4
commit 745c198306
6 changed files with 55 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/graph/costIndicatorChart/index.tsx
View File

@ -63,7 +63,7 @@ export default function CostIndicatorChart({ title, data1, data2, label, subtitl
dataArr.map(data => {
sum += data;
});
const result = `${(parseFloat(value)/10).toLocaleString('pt-br').slice(0, 4)}`
const result = `${parseInt((parseInt(value)/10).toLocaleString('pt-br'))}`
return value==null? null : result
},

2
src/components/graph/grossMensalChart/GrossMensalChart.tsx
View File

@ -103,7 +103,7 @@ export default function GrossMensalChart({ title, data1, data2, label, subtitle,
{
type: 'bar',
label: 'Consolidado',
data: data1.map(value => value?.economia_acumulada),
data: data1.map(value => !value.dad_estimado? value?.economia_acumulada : null),
backgroundColor: '#255488'
},
{

2
src/components/sidebar/Sidebar.tsx
View File

@ -129,7 +129,7 @@ export default function Sidebar() {
<Link href='/telemetria'><li className={router.pathname=='/telemetria'? 'actualPath' : null}><Image src='/assets/sidebar/telemetryIcon.svg' width={25} height={25} />{'Telemetria'}</li></Link>
<Link href='/resumoOperacao'><li className={router.pathname=='/resumoOperacao'? 'actualPath' : null} ><Image src='/assets/sidebar/summaryOperationsIcon.svg' width={25} height={25} />{'Resumo de Op. '}</li></Link>
<Link href='/news'><li className={router.pathname=='/news'? 'actualPath' : null}><Image src='/assets/sidebar/newsIcon.svg' width={25} height={25} />{'Notícias'}</li></Link>
<Link href='/pld'><li onClick={() => setPldDrawer(!pldDrawer)} className={router.pathname=='/pld'? 'actualPath' : null}><Image src='/assets/sidebar/newsIcon.svg' width={25} height={25} />{'PLD >'}</li></Link>
<Link href='/pld'><li onClick={() => setPldDrawer(!pldDrawer)} className={router.pathname=='/pld'? 'actualPath' : null}><Image src='/assets/sidebar/newsIcon.svg' width={25} height={25} />{'PLD'}</li></Link>
{/* <div className='pldDrawer drawer'>
<Link href='/pld'><li onClick={() => setPldMenu(0)} className={pldMenu==0? 'actualPathDrawer' : null}>PLD Histórico</li></Link>
<Link href='/pld'><li onClick={() => setPldMenu(1)} className={pldMenu===1? 'actualPathDrawer' : null}>Valores Diários</li></Link>

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

@ -175,17 +175,17 @@ export default function economy({userName, anual, years, brutaMensal, yearsBruta
</Select>
</FormControl>
</div>
<section>
<CostIndicatorChart title='' subtitle=''
data1={unity!=''? indicatorDataState?.filter((value, index) => value.mes.slice(4, 8).includes('2021'))
:
indicatorCost?.filter((value, index) => value.mes.slice(4, 8).includes('2021'))}
data2={unity!=''? indicatorDataState?.filter((value, index) => value.mes.slice(4, 8).includes('2022'))
:
indicatorCost?.filter((value, index) => value.mes.slice(4, 8).includes('2022'))}
label={months}
/>
</section>
<section>
<CostIndicatorChart title='' subtitle=''
data1={unity!=''? indicatorDataState?.filter((value, index) => value.mes.slice(4, 8).includes('2021'))
:
indicatorCost?.filter((value, index) => value.mes.slice(4, 8).includes('2021'))}
data2={unity!=''? indicatorDataState?.filter((value, index) => value.mes.slice(4, 8).includes('2022'))
:
indicatorCost?.filter((value, index) => value.mes.slice(4, 8).includes('2022'))}
label={months}
/>
</section>
</RenderIf>
</EconomyView>
)

56
src/pages/news/index.tsx
View File

@ -14,42 +14,44 @@ import { Button, NewsView } from '../../styles/layouts/news/NewsView'
export default function aboutUs({userName, news}: any) {
return (
<NewsView>
<main style={{display: 'flex', flexDirection: 'column'}}>
<Head>
<title>Smart Energia - Noticias</title>
</Head>
<Header name={userName}>
<PageTitle title='Notícias' subtitle='Tudo de importante no setor de energia'/>
</Header>
{/* <Banner title='Notícias' subtitle='Tudo de importante no setor de energia' imgSource='/assets/banners/newsBanner.webp'/> */}
<NewsView>
{/* <Banner title='Notícias' subtitle='Tudo de importante no setor de energia' imgSource='/assets/banners/newsBanner.webp'/> */}
{
news.slice(0, 3).map(data => {
{
news.slice(0, 3).map(data => {
return <>
<section>
<h2 dangerouslySetInnerHTML={{__html: data.pubDate.slice(0, -8)}} />
<strong dangerouslySetInnerHTML={{__html: data.title}} />
<strong>ANEEL APROVA REAJUSTE TARIFÁRIO ANUAL DA ENERGISA SERGIPE DE 16,46 % PARA O CONSUMIDOR RESIDENCIAL</strong>
<br />
<br />
{
<p dangerouslySetInnerHTML={{__html: data.description}} className='description'/>
}
<Button>
<fieldset>
<legend> <BasicButton title='Ver Mais...' onClick={() => window.open(data.guid)}/></legend>
</fieldset>
</Button>
</section>
</>
})
}
return <>
<section>
<h2 dangerouslySetInnerHTML={{__html: data.pubDate.slice(0, -8)}} />
<strong dangerouslySetInnerHTML={{__html: data.title}} />
<strong>ANEEL APROVA REAJUSTE TARIFÁRIO ANUAL DA ENERGISA SERGIPE DE 16,46 % PARA O CONSUMIDOR RESIDENCIAL</strong>
<br />
<br />
{
<p dangerouslySetInnerHTML={{__html: data.description}} className='description'/>
}
<Button>
<fieldset>
<legend> <BasicButton title='Ver Mais...' onClick={() => window.open(data.guid)}/></legend>
</fieldset>
</Button>
</section>
</>
})
}
<a href='https://www.energiasmart.com.br/noticias/'
target={"_blank"}
rel={"noreferrer"}><BasicButton title='Noticias Atualizadas' onClick={() => console.log()}/></a>
</NewsView>
<a href='https://www.energiasmart.com.br/noticias/'
target={"_blank"}
rel={"noreferrer"}><BasicButton title='Noticias Atualizadas' onClick={() => console.log()}/></a>
</NewsView>
</main>
)
}

19
src/styles/globals.ts
View File

@ -42,6 +42,11 @@ export const GlobalStyle = createGlobalStyle`
.datePicker {
.MuiOutlinedInput-input, .MuiInputBase-input, .MuiInputBase-inputAdornedEnd, .css-nxo287-MuiInputBase-input-MuiOutlinedInput-input {
padding: 0 0 0 15px;
width: 100%;
height: 63px!important;
}
.css-1u3bzj6-MuiFormControl-root-MuiTextField-root,
.css-o9k5xi-MuiInputBase-root-MuiOutlinedInput-root,
.css-o9k5xi-MuiInputBase-root-MuiOutlinedInput-root,
@ -54,8 +59,8 @@ export const GlobalStyle = createGlobalStyle`
.css-nxo287-MuiInputBase-input-MuiOutlinedInput-input{
/* background-color: red; */
/* position: relative; */
width: 100%;
height:68px;
/* width: 100%;
height:63px; */
}
.MuiFormControl-root,
@ -76,7 +81,7 @@ export const GlobalStyle = createGlobalStyle`
.MuiOutlinedInput-input,
.MuiInputBase-input .MuiInputBase-inputAdornedEnd,
.css-nxo287-MuiInputBase-input-MuiOutlinedInput-input {
padding-top: 6px;
/* padding-top: 6px; */
}
.MuiButtonBase-root,
@ -84,8 +89,8 @@ export const GlobalStyle = createGlobalStyle`
.MuiIconButton-edgeEnd,
.MuiIconButton-sizeMedium,
.css-1yq5fb3-MuiButtonBase-root-MuiIconButton-root {
width: 30px;
height: 30px;
/* width: 30px;
height: 30px; */
}
}
@ -97,7 +102,7 @@ export const GlobalStyle = createGlobalStyle`
.MuiFormLabel-colorPrimary,
.MuiFormLabel-filled,
.css-1sumxir-MuiFormLabel-root-MuiInputLabel-root {
color: rgba(0, 0, 0, 0.6);
/* color: rgba(0, 0, 0, 0.6);
font-family: "Roboto","Helvetica","Arial",sans-serif;
font-weight: 400;
font-size: 1rem;
@ -115,6 +120,6 @@ export const GlobalStyle = createGlobalStyle`
left: 0;
user-select: none;
z-index: 1;
pointer-events: auto;
pointer-events: auto; */
}
`;