diff --git a/src/components/graph/costIndicatorChart/index.tsx b/src/components/graph/costIndicatorChart/index.tsx
index 387a840..49c8734 100644
--- a/src/components/graph/costIndicatorChart/index.tsx
+++ b/src/components/graph/costIndicatorChart/index.tsx
@@ -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
},
diff --git a/src/components/graph/grossMensalChart/GrossMensalChart.tsx b/src/components/graph/grossMensalChart/GrossMensalChart.tsx
index 318b599..52035bb 100644
--- a/src/components/graph/grossMensalChart/GrossMensalChart.tsx
+++ b/src/components/graph/grossMensalChart/GrossMensalChart.tsx
@@ -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'
},
{
diff --git a/src/components/sidebar/Sidebar.tsx b/src/components/sidebar/Sidebar.tsx
index 4f805fc..8bb3158 100644
--- a/src/components/sidebar/Sidebar.tsx
+++ b/src/components/sidebar/Sidebar.tsx
@@ -129,7 +129,7 @@ export default function Sidebar() {
{'Telemetria'}
{'Resumo de Op. '}
{'Notícias'}
- setPldDrawer(!pldDrawer)} className={router.pathname=='/pld'? 'actualPath' : null}>{'PLD >'}
+ setPldDrawer(!pldDrawer)} className={router.pathname=='/pld'? 'actualPath' : null}>{'PLD'}
{/*
setPldMenu(0)} className={pldMenu==0? 'actualPathDrawer' : null}>PLD Histórico
setPldMenu(1)} className={pldMenu===1? 'actualPathDrawer' : null}>Valores Diários
diff --git a/src/pages/economy/index.tsx b/src/pages/economy/index.tsx
index 1ad93a3..7600b8b 100644
--- a/src/pages/economy/index.tsx
+++ b/src/pages/economy/index.tsx
@@ -175,17 +175,17 @@ export default function economy({userName, anual, years, brutaMensal, yearsBruta
-
- 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}
- />
-
+
+ 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}
+ />
+
)
diff --git a/src/pages/news/index.tsx b/src/pages/news/index.tsx
index fff5df3..e194536 100644
--- a/src/pages/news/index.tsx
+++ b/src/pages/news/index.tsx
@@ -14,42 +14,44 @@ import { Button, NewsView } from '../../styles/layouts/news/NewsView'
export default function aboutUs({userName, news}: any) {
return (
-
+
Smart Energia - Noticias
- {/* */}
+
+ {/* */}
- {
- news.slice(0, 3).map(data => {
+ {
+ news.slice(0, 3).map(data => {
- return <>
-
-
-
- ANEEL APROVA REAJUSTE TARIFÁRIO ANUAL DA ENERGISA SERGIPE DE 16,46 % PARA O CONSUMIDOR RESIDENCIAL
-
-
- {
-
- }
-
-
-
- })
- }
+ return <>
+
+
+
+ ANEEL APROVA REAJUSTE TARIFÁRIO ANUAL DA ENERGISA SERGIPE DE 16,46 % PARA O CONSUMIDOR RESIDENCIAL
+
+
+ {
+
+ }
+
+
+
+ })
+ }
- console.log()}/>
-
+ console.log()}/>
+
+
)
}
diff --git a/src/styles/globals.ts b/src/styles/globals.ts
index bcdb4d5..7a7e6cb 100644
--- a/src/styles/globals.ts
+++ b/src/styles/globals.ts
@@ -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; */
}
`;