diff --git a/src/components/graph/ChartView.ts b/src/components/graph/ChartView.ts index 8fb2fd7..85a743b 100644 --- a/src/components/graph/ChartView.ts +++ b/src/components/graph/ChartView.ts @@ -1,7 +1,7 @@ import styled from "styled-components" export const ChartView = styled.div` - min-width: 90%; + width: 100%!important; div{ /* margin-top: 10px; */ 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/pages/pld/index.tsx b/src/pages/pld/index.tsx index 793b1c7..97aad2e 100644 --- a/src/pages/pld/index.tsx +++ b/src/pages/pld/index.tsx @@ -372,7 +372,7 @@ export default function pld({tableData, userName, clientMonth}: pldInterface) { {/* grafico de grafico por seleção de data (mês) (diario)*/} -
    +
    @@ -388,36 +388,36 @@ export default function pld({tableData, userName, clientMonth}: pldInterface) { Sul Sudeste - - - Mês - + Nenhum + { + clientMonth.sort((a, b) => { + if (parseFloat(a.mes_ref.slice(0, 2)) < parseFloat(b.mes_ref.slice(0, 2))) + if (parseFloat(a.mes_ref.slice(3, 7)) > parseFloat(b.mes_ref.slice(3, 7))) return -1 + else return 1 + if (parseFloat(a.mes_ref.slice(0, 2)) > parseFloat(b.mes_ref.slice(0, 2))) + if (parseFloat(a.mes_ref.slice(3, 7)) < parseFloat(b.mes_ref.slice(3, 7))) return 1 + else return -1 - return 0 - }).map((data, index) => { - return {data.mes_ref} - }) - } - - + return 0 + }).map((data, index) => { + return {data.mes_ref} + }) + } + +
    value.mmovel)} data3={dataByDay} @@ -441,7 +441,7 @@ export default function pld({tableData, userName, clientMonth}: pldInterface) { inputFormat="dd/MM/yyyy" value={date} onChange={handleChangeDate} - renderInput={(params) => } + renderInput={(params) => } /> diff --git a/src/styles/globals.ts b/src/styles/globals.ts index bcdb4d5..7217309 100644 --- a/src/styles/globals.ts +++ b/src/styles/globals.ts @@ -40,8 +40,12 @@ export const GlobalStyle = createGlobalStyle` box-sizing: border-box; } - .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 +58,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 +80,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 +88,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 +101,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 +119,6 @@ export const GlobalStyle = createGlobalStyle` left: 0; user-select: none; z-index: 1; - pointer-events: auto; + pointer-events: auto; */ } `; diff --git a/src/styles/layouts/Telemetria/TelemetriaView.ts b/src/styles/layouts/Telemetria/TelemetriaView.ts index a8d87ee..0bd8557 100644 --- a/src/styles/layouts/Telemetria/TelemetriaView.ts +++ b/src/styles/layouts/Telemetria/TelemetriaView.ts @@ -176,6 +176,8 @@ export const TelemetriaView = styled.main` input { width: 15rem; + height: 63px!important; + font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif; font-weight: 400; @@ -373,7 +375,7 @@ export const Uploads = styled.div` `; export const TableHeader = styled.div` - width: 100%; + width: 90%; display: flex; align-items: center; @@ -391,7 +393,7 @@ export const ChartFilters = styled.section` align-self: flex-start; - width: 100%; + width: 90%; margin-top: 20px; diff --git a/src/styles/layouts/pld/PldView.ts b/src/styles/layouts/pld/PldView.ts index 42984d8..8d18787 100644 --- a/src/styles/layouts/pld/PldView.ts +++ b/src/styles/layouts/pld/PldView.ts @@ -442,24 +442,28 @@ export const PldGraphView = styled.main` .toolsbar { display: flex; justify-content: center; - align-items: flex-start!important; + align-items: flex-start; align-self: flex-start; flex-direction: row; flex-wrap: nowrap; + + width: 90%!important; + + padding-left: 25px; } .toolsbar2 { display: flex; justify-content: flex-start; align-items: flex-start!important; - flex-direction: column; + min-width: 320px; - /* margin-bottom: 9px; */ + padding-left: 25px; - /* transform: translateY(-8px); */ + width: 100%; p { margin: 0; @@ -468,9 +472,7 @@ export const PldGraphView = styled.main` input { width: 16.6rem; - height: 3.5rem; - - /* padding: 14px; */ + height: 63px; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif; font-weight: 400; @@ -480,34 +482,6 @@ export const PldGraphView = styled.main` background-color: #F9F9F9; } - - section { - display: flex; - align-items: center; - - flex-wrap: wrap; - - :first-child { - justify-content: flex-start; - align-items: center; - } - :nth-child(2) { - margin-top: 50px; - margin-bottom: 50px; - justify-content: space-evenly; - } - - width: 100%; - } - - - - footer { - label { - cursor: pointer; - margin: 20px; - } - } ` export const GoBack = styled.label`