From e10c88e9cb290819d481342aa62a86f56daf2d85 Mon Sep 17 00:00:00 2001 From: joseCorte-exe Date: Fri, 8 Jul 2022 17:52:06 -0300 Subject: [PATCH] pld table fix --- .../graph/grossAnualChart/GrossAnualChart.tsx | 2 +- src/pages/estimatedCost/index.tsx | 1 + src/pages/pld/index.tsx | 10 +++++----- src/pages/resumoOperacao/index.tsx | 13 +++++++------ src/styles/layouts/pld/PldView.ts | 6 +++--- 5 files changed, 17 insertions(+), 15 deletions(-) diff --git a/src/components/graph/grossAnualChart/GrossAnualChart.tsx b/src/components/graph/grossAnualChart/GrossAnualChart.tsx index 58f36a8..9225adc 100644 --- a/src/components/graph/grossAnualChart/GrossAnualChart.tsx +++ b/src/components/graph/grossAnualChart/GrossAnualChart.tsx @@ -74,7 +74,7 @@ export function GrossAnulChart({ title, subtitle, dataProps, label, dataset, bar sum += data; }); const percentage = (dataProps[ctx.dataIndex].econ_percentual*100).toFixed(0)+"%"; - const result = `${spacement(parseInt(value).toLocaleString('pt-br'))}${percentage}\n${parseInt(value).toLocaleString('pt-br')}` + const result = `${spacement(parseInt(value).toLocaleString('pt-br'))} ${percentage}\n${parseInt(value).toLocaleString('pt-br')}` return value==null? null : result }, diff --git a/src/pages/estimatedCost/index.tsx b/src/pages/estimatedCost/index.tsx index 1b05e39..2f41e09 100644 --- a/src/pages/estimatedCost/index.tsx +++ b/src/pages/estimatedCost/index.tsx @@ -72,6 +72,7 @@ export const getServerSideProps: GetServerSideProps = async (ctx) => { "fields": ["cod_smart_unidade", "codigo_scde"], "distinct": true }).then(res => { + console.log(res.data.data) clients = res.data.data }).catch(res => { // console.log(res) diff --git a/src/pages/pld/index.tsx b/src/pages/pld/index.tsx index 640a836..ee0c33b 100644 --- a/src/pages/pld/index.tsx +++ b/src/pages/pld/index.tsx @@ -210,13 +210,13 @@ export default function pld({tableData, userName, clientMonth}: pldInterface) { }, []) return ( -
+
Smart Energia - PLD
- +
setPage(nv)} aria-label=""> @@ -236,7 +236,7 @@ export default function pld({tableData, userName, clientMonth}: pldInterface) { - + @@ -301,7 +301,7 @@ export default function pld({tableData, userName, clientMonth}: pldInterface) { }
Mês

(R$/MWh)

Mês Nordeste

(R$/MWh)

 Norte

(R$/MWh)

 Sudeste

(R$/MWh)
-
+ {/*
setPage(1)} className="btn btn-1"> @@ -314,7 +314,7 @@ export default function pld({tableData, userName, clientMonth}: pldInterface) {

Valores Horários

-
+
*/} diff --git a/src/pages/resumoOperacao/index.tsx b/src/pages/resumoOperacao/index.tsx index 21a85ca..0a539cb 100644 --- a/src/pages/resumoOperacao/index.tsx +++ b/src/pages/resumoOperacao/index.tsx @@ -20,7 +20,7 @@ import data from '../../services/dados.json' import getAPIClient from '../../services/ssrApi'; import { Pagination, TableHeader, TableView } from '../../styles/layouts/ResumoOperacao/ResumoOperacaoView'; -export default function ResumoOperacao({tableData, clientsData, userName, clientMonth}: any) { +export default function ResumoOperacao({tableData, clients, userName, clientMonth}: any) { const csvData = tableData; const [month, setMonth] = useState(''); @@ -114,7 +114,7 @@ export default function ResumoOperacao({tableData, clientsData, userName, client > Todas { - clientsData.map((value) => { + clients.map((value) => { return {value.cod_smart_unidade} }) } @@ -195,7 +195,6 @@ export const getServerSideProps: GetServerSideProps = async (ctx) => { const { ['user-name']: userName } = parseCookies(ctx) let tableData = []; - let clientsData = []; let clientMonth = []; await apiClient.post('/operation/summary', { @@ -206,6 +205,8 @@ export const getServerSideProps: GetServerSideProps = async (ctx) => { // console.log(res) }) + let clients = []; + await apiClient.post('/units', { "filters": [ {"type" : "not_in", "field": "dados_cadastrais.codigo_scde", "value":["0P"]}, @@ -215,9 +216,9 @@ export const getServerSideProps: GetServerSideProps = async (ctx) => { "distinct": true }).then(res => { console.log(res.data.data) - clientsData = res.data.data + clients = res.data.data }).catch(res => { - console.log(res) + // console.log(res) }) await apiClient.post('/operation', { @@ -244,7 +245,7 @@ export const getServerSideProps: GetServerSideProps = async (ctx) => { return { props: { tableData, - clientsData, + clients, clientMonth, userName } diff --git a/src/styles/layouts/pld/PldView.ts b/src/styles/layouts/pld/PldView.ts index 027f242..c9fa789 100644 --- a/src/styles/layouts/pld/PldView.ts +++ b/src/styles/layouts/pld/PldView.ts @@ -11,7 +11,7 @@ export const PldTableView = styled.main` } thead { - border-radius: 8px!important; + /* border-radius: 2px!important; */ } } @@ -120,12 +120,12 @@ export const PldTableView = styled.main` table, th:last-child{ border: transparent; - border-top-right-radius: 20px; + border-top-right-radius: 8px; } table, th:first-child { border: transparent; - border-top-left-radius: 20px; + border-top-left-radius: 8px; } h3{