From f427c20a0ad6cd49fd85e586378bc2989e1b24e5 Mon Sep 17 00:00:00 2001 From: joseCorte-exe Date: Tue, 19 Jul 2022 19:10:11 -0300 Subject: [PATCH] fix --- src/components/graph/ChartView.ts | 2 +- src/pages/pld/index.tsx | 62 +++++++++---------- src/styles/globals.ts | 1 - .../layouts/Telemetria/TelemetriaView.ts | 4 +- src/styles/layouts/pld/PldView.ts | 44 +++---------- 5 files changed, 43 insertions(+), 70 deletions(-) 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/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 7a7e6cb..7217309 100644 --- a/src/styles/globals.ts +++ b/src/styles/globals.ts @@ -40,7 +40,6 @@ 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; diff --git a/src/styles/layouts/Telemetria/TelemetriaView.ts b/src/styles/layouts/Telemetria/TelemetriaView.ts index 63194e5..0bd8557 100644 --- a/src/styles/layouts/Telemetria/TelemetriaView.ts +++ b/src/styles/layouts/Telemetria/TelemetriaView.ts @@ -375,7 +375,7 @@ export const Uploads = styled.div` `; export const TableHeader = styled.div` - width: 100%; + width: 90%; display: flex; align-items: center; @@ -393,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`