diff --git a/src/components/graph/Chart.tsx b/src/components/graph/Chart.tsx index 36016c2..d41ed15 100644 --- a/src/components/graph/Chart.tsx +++ b/src/components/graph/Chart.tsx @@ -101,7 +101,7 @@ export default function Chart({ title, data1, data2, label, subtitle, dataset1, data: data2.map(value => value.custo_unit>0? value.custo_unit : null), // backgroundColor: '#C2d5fb' backgroundColor: (value, ctx) => { - return data2[value.dataIndex]?.dad_estimado == false ? '#C2d5fb' : draw('diagonal-right-left', '#C2d5fb'); + return data2[value.dataIndex]?.dad_estimado == false ? '#C2d5fb' : document ? document ? draw('diagonal-right-left', '#C2d5fb') : null: null; }, } ], diff --git a/src/components/graph/Chart2.tsx b/src/components/graph/Chart2.tsx index 00bc95f..d8b3008 100644 --- a/src/components/graph/Chart2.tsx +++ b/src/components/graph/Chart2.tsx @@ -102,7 +102,7 @@ export default function Chart({ title, data1, data2, label, subtitle, dataset1, type: 'bar', label: 'Estimado', data: data2.map(value => value.dad_estimado? value?.economia_acumulada : null), - backgroundColor: draw('diagonal-right-left', '#C2d5fb') + backgroundColor: document ? document ? draw('diagonal-right-left', '#C2d5fb') : null: null }, ], } diff --git a/src/components/graph/ChartView.ts b/src/components/graph/ChartView.ts index 85a743b..d02148b 100644 --- a/src/components/graph/ChartView.ts +++ b/src/components/graph/ChartView.ts @@ -1,7 +1,11 @@ import styled from "styled-components" export const ChartView = styled.div` - width: 100%!important; + display: flex; + align-items: center; + justify-content: center; + + width: 100%; div{ /* margin-top: 10px; */ diff --git a/src/components/graph/DemRegXDemConChart.tsx b/src/components/graph/DemRegXDemConChart.tsx index 4e5d94b..b3efb90 100644 --- a/src/components/graph/DemRegXDemConChart.tsx +++ b/src/components/graph/DemRegXDemConChart.tsx @@ -155,7 +155,7 @@ export function DemRegXDemConChart({ return ( {/* */} -
+
diff --git a/src/components/graph/DiscretizedConsumptionChart.tsx b/src/components/graph/DiscretizedConsumptionChart.tsx index 6b0b543..7688a91 100644 --- a/src/components/graph/DiscretizedConsumptionChart.tsx +++ b/src/components/graph/DiscretizedConsumptionChart.tsx @@ -98,7 +98,7 @@ export function DiscretizedConsumptionChart({ title, subtitle, dataProps, label, return ( {/* */} -
+
diff --git a/src/components/graph/LineBarChart.tsx b/src/components/graph/LineBarChart.tsx index 39f026d..474b00d 100644 --- a/src/components/graph/LineBarChart.tsx +++ b/src/components/graph/LineBarChart.tsx @@ -179,9 +179,7 @@ export function LineBarChart({ title, subtitle, data1, data2, data3, label, red, return ( -
- -
+ ) } diff --git a/src/components/graph/SingleBar.tsx b/src/components/graph/SingleBar.tsx index bcd9179..f34f1d8 100644 --- a/src/components/graph/SingleBar.tsx +++ b/src/components/graph/SingleBar.tsx @@ -104,7 +104,7 @@ export function SingleBar({ title, subtitle, dataProps, label, dataset, barLabel return parseFloat(value.economia_acumulada).toFixed(2) }), backgroundColor: (value, ctx) => { - return dataProps[value.dataIndex]?.dad_estimado == false ? '#255488' : draw('diagonal-right-left', '#C2d5fb'); + return dataProps[value.dataIndex]?.dad_estimado == false ? '#255488' : document ? document ? draw('diagonal-right-left', '#C2d5fb') : null: null; }, }, { diff --git a/src/components/graph/cativoXLivreChart/index.tsx b/src/components/graph/cativoXLivreChart/index.tsx index 1ba2fd2..d4e79e6 100644 --- a/src/components/graph/cativoXLivreChart/index.tsx +++ b/src/components/graph/cativoXLivreChart/index.tsx @@ -136,7 +136,7 @@ export function CativoXLivreChart({ title, subtitle, chartData, label, red, data }, borderWidth: 2, fill: false, - data: chartData.map(value => parseInt(value.economia_mensal)), + data: chartData?.map(value => parseInt(value.economia_mensal)), }, { type: 'bar' as const, @@ -144,7 +144,7 @@ export function CativoXLivreChart({ title, subtitle, chartData, label, red, data backgroundColor: (value, ctx) => { return '#C2D5FB' }, - data: chartData.map(value => { + data: chartData?.map(value => { if (!value.dad_estimado) return parseInt(value.custo_cativo) }), @@ -156,7 +156,7 @@ export function CativoXLivreChart({ title, subtitle, chartData, label, red, data backgroundColor: (value, ctx) => { return '#255488' }, - data: chartData.map(value => { + data: chartData?.map(value => { if (!value.dad_estimado) return parseInt(value.custo_livre) }), @@ -165,7 +165,7 @@ export function CativoXLivreChart({ title, subtitle, chartData, label, red, data type: 'bar', label: 'Est. Cativo', backgroundColor: pattern.draw('diagonal', '#C2D5FB'), - data: chartData.map(value => { + data: chartData?.map(value => { if (value.dad_estimado) return parseInt(value.custo_cativo) }), @@ -174,7 +174,7 @@ export function CativoXLivreChart({ title, subtitle, chartData, label, red, data type: 'bar', label: 'Est. Livre', backgroundColor: pattern.draw('diagonal', '#255488'), - data: chartData.map(value => { + data: chartData?.map(value => { if (value.dad_estimado) return parseInt(value.custo_livre) }), diff --git a/src/components/graph/costIndicatorChart/index.tsx b/src/components/graph/costIndicatorChart/index.tsx index 49c8734..31e3db3 100644 --- a/src/components/graph/costIndicatorChart/index.tsx +++ b/src/components/graph/costIndicatorChart/index.tsx @@ -89,7 +89,7 @@ export default function CostIndicatorChart({ title, data1, data2, label, subtitl datasets: [ { label: '2021', - data: data1.map(value => value.custo_unit>0? value.custo_unit : null), + data: data1?.map(value => value.custo_unit>0? value.custo_unit : null), // backgroundColor: '#C2d5fb' backgroundColor: (value, ctx) => { if (value.dad_estimado) @@ -100,7 +100,7 @@ export default function CostIndicatorChart({ title, data1, data2, label, subtitl }, { label: '2022', - data: data2.map(value => value.custo_unit>0? value.custo_unit : null), + data: data2?.map(value => value.custo_unit>0? value.custo_unit : null), // backgroundColor: '#255488' backgroundColor: (value, ctx) => { if (value.dad_estimado) diff --git a/src/components/graph/fatorPotenciaChart.tsx b/src/components/graph/fatorPotenciaChart.tsx index 6034d2e..94e170e 100644 --- a/src/components/graph/fatorPotenciaChart.tsx +++ b/src/components/graph/fatorPotenciaChart.tsx @@ -82,6 +82,8 @@ export default function FatorPotenciaChart({ title, subtitle, data1, data2, labe const labels = label; + console.log(data1) + const data = { labels, datasets: [ @@ -106,7 +108,9 @@ export default function FatorPotenciaChart({ title, subtitle, data1, data2, labe return ( {/* */} - +
+ +
) } diff --git a/src/components/graph/graphCard/ChartCard.tsx b/src/components/graph/graphCard/ChartCard.tsx index 262e47e..a339b99 100644 --- a/src/components/graph/graphCard/ChartCard.tsx +++ b/src/components/graph/graphCard/ChartCard.tsx @@ -33,7 +33,6 @@ export default function ChartCard({ title, subtitle, consumption, className, lin const labels = ['0', '2', '4', '6', '8', '0', '2', '4', '6', '8', '0', '2', '4', '6', '8', '0', '2', '4', '6', '8', '0', '2', '4', '6', '8', '0', '2', '4', '6', '8', '0', '2', '4', '6', '8', '0', '2', '4', '6', '8', '0', '2', '4', '6', '8', '0', '2', '4', '6', '8',]; - const data = { labels, datasets: [ @@ -43,24 +42,6 @@ export default function ChartCard({ title, subtitle, consumption, className, lin borderColor: 'rgb(53, 162, 235)', backgroundColor: 'rgba(53, 162, 235, 0.5)', }, - // { - // label: 'Dataset 2', - // data: [6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6], - // borderColor: 'rgb(255, 114, 32)', - // backgroundColor: 'rgba(255, 145, 0, 0.5)', - // }, - // { - // label: 'Dataset 3', - // data: [1, 2, 3, 5, 7, 8, 9, 8, 9, 7, 8, 6, 4, 3, 2, 3, 3, 4, 4, 5, 5, 5, 6, 6, 7, 7, 9, 10, 11, 12, 12, 14, 15, 17, 20, 21, 18, 15, 14, 12, 11, 10, 8, 6, 7, 8, 7, 9], - // borderColor: 'rgb(109, 109, 109)', - // backgroundColor: 'rgba(90, 90, 90, 0.5)', - // }, - // { - // label: 'Dataset4', - // data: [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1], - // borderColor: 'rgb(255, 166, 0)', - // backgroundColor: 'rgba(255, 187, 0, 0.5)', - // }, ], }; diff --git a/src/components/graph/grossAnualChart/GrossAnualChart.tsx b/src/components/graph/grossAnualChart/GrossAnualChart.tsx index 734a93b..85fe2ab 100644 --- a/src/components/graph/grossAnualChart/GrossAnualChart.tsx +++ b/src/components/graph/grossAnualChart/GrossAnualChart.tsx @@ -30,7 +30,7 @@ interface SingleBarInterface{ export function GrossAnualChart({ title, subtitle, dataProps, label, dataset, barLabel, miniature, bruta }: SingleBarInterface) { function spacement(string) { - const spaces = string.length===1?'' : string.length===2? '⠀⠀⠀⠀' : string.length===3? '⠀⠀⠀' : string.length===4? '⠀⠀' : string.length===5? '⠀' : '' + const spaces = string.length===1?'' : string.length===2? '' : string.length===3? ' ' : string.length===4? ' ' : string.length===5? ' ' : '' console.log(string.length) diff --git a/src/components/graph/grossMensalChart/GrossMensalChart.tsx b/src/components/graph/grossMensalChart/GrossMensalChart.tsx index 52035bb..9fb61ec 100644 --- a/src/components/graph/grossMensalChart/GrossMensalChart.tsx +++ b/src/components/graph/grossMensalChart/GrossMensalChart.tsx @@ -43,7 +43,8 @@ interface ChartInterface { export default function GrossMensalChart({ title, data1, data2, label, subtitle, miniature }: ChartInterface) { function spacement(string) { - const spaces = string.length===1?'' : string.length===2? '⠀⠀⠀⠀' : string.length===3? '⠀⠀⠀' : string.length===4? '⠀⠀' : string.length===5? '⠀' : '' + const spaces = string.length===1?'' : string.length===2? '' : string.length===3? ' ' : string.length===4? ' ' : string.length===5? ' ' : '' + // const spaces = string.length===1?'' : string.length===2? '⠀⠀⠀⠀' : string.length===3? '⠀⠀⠀' : string.length===4? '⠀⠀' : string.length===5? '⠀' : '' console.log(string.length) diff --git a/src/pages/dashboard/index.tsx b/src/pages/dashboard/index.tsx index 8660d94..f8a9ea5 100644 --- a/src/pages/dashboard/index.tsx +++ b/src/pages/dashboard/index.tsx @@ -64,39 +64,45 @@ export default function Dashboard({grossAnualGraph, grossAnualYears, grossMensal -
- - - + { + typeof window === 'undefined' || typeof window === undefined? null : + <> +
+ + + - - value.mes)} - miniature - /> - + + value.mes)} + miniature + /> + - - - + + + + + + value.mes.slice(4, 8).includes('2021'))} + // data1={graphData} + data2={costIndicator.filter((value, index) => value.mes.slice(4, 8).includes('2022'))} + label={months} + miniature + /> + +
+ + } - - value.mes.slice(4, 8).includes('2021'))} - // data1={graphData} - data2={costIndicator.filter((value, index) => value.mes.slice(4, 8).includes('2022'))} - label={months} - miniature - /> - -
) } diff --git a/src/pages/economy/index.tsx b/src/pages/economy/index.tsx index 7600b8b..20eae5a 100644 --- a/src/pages/economy/index.tsx +++ b/src/pages/economy/index.tsx @@ -37,6 +37,8 @@ import { ConsumoEstimado } from '../../services/consumoEstimado'; import CostIndicatorChart from '../../components/graph/costIndicatorChart'; import { EconomyView } from '../../styles/layouts/economy/economy'; +import dynamic from 'next/dynamic'; + export default function economy({userName, anual, years, brutaMensal, yearsBrutaMensal, catLiv, clients, indicatorCost}: any) { const {economyMenu, setEconomyMenu} = useContext(MenuContext) @@ -74,20 +76,20 @@ export default function economy({userName, anual, years, brutaMensal, yearsBruta }, [unity]) useEffect(() => { - api.post('/economy/estimates', unity!==''?{ + api.post('/economy/MWh', unity!==''?{ "filters": [ {"type" : "=", "field":"dados_cadastrais.cod_smart_unidade", "value": unity} ] }:{}).then(res => { setIndicatorDataState(res.data.data) - console.log() + console.log('res', res.data.data) }).catch(res => { // console.log(res) }) }, [unity]) return ( - + Smart Energia - PLD @@ -105,88 +107,94 @@ export default function economy({userName, anual, years, brutaMensal, yearsBruta - -
- + +
+ -
- + dataProps={anual} + label={years} barLabel bruta + /> +
+ - - - + +
+ +
+ - -
- - Unidade - - -
-
- -
- + +
+ + Unidade + + +
+
+ +
+ + + +
+ + Unidade + + +
+
+ value.mes.slice(4, 8).includes('2021'))} + data2={indicatorDataState?.filter((value, index) => value.mes.slice(4, 8).includes('2022'))} + label={months} + /> +
+ + + } - -
- - Unidade - - -
-
- 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 e194536..a8c04b7 100644 --- a/src/pages/news/index.tsx +++ b/src/pages/news/index.tsx @@ -49,7 +49,8 @@ export default function aboutUs({userName, news}: any) { console.log()}/> + rel={"noreferrer"}>Ver Mais + ) diff --git a/src/pages/telemetria/index.tsx b/src/pages/telemetria/index.tsx index e46a2ee..128d43b 100644 --- a/src/pages/telemetria/index.tsx +++ b/src/pages/telemetria/index.tsx @@ -197,7 +197,7 @@ export default function Telemetria({userName, clients}: any) { }, [discretization]) return( - +
Smart Energia - Telemetria @@ -245,443 +245,445 @@ export default function Telemetria({userName, clients}: any) {
- {/* */} + + {/* */} - - - setMenu(nv)} aria-label=""> - - - - - - + + + setMenu(nv)} aria-label=""> + + + + + + - - -
- - Unidade - - -
-
- - Discretização - - -
- -
- } - /> + + +
+ + Unidade + +
-
- + + Discretização + + +
+ +
+ } + /> +
+
+ handleChangeEndDate(newValue)} - renderInput={(params) => } - /> + discretization === '15_min'?new Date(startDate).setUTCDate(startDate.getUTCDate()+7) + : + new Date(startDate).setUTCDate(startDate.getUTCDate()+1) + } + onChange={(newValue: any) => handleChangeEndDate(newValue)} + renderInput={(params) => } + /> +
+ +
+ { + getDiscretization(unity, startDate, endDate, discretization) + .then(result => setDiscretizedConsumptionData(result)) + .catch(exception => console.log(exception)) + }}/>
- -
- { - getDiscretization(unity, startDate, endDate, discretization) - .then(result => setDiscretizedConsumptionData(result)) - .catch(exception => console.log(exception)) - }}/> -
- - {/* */} - value.minut)} dataset={'Consumo'} dataset1='Estimado' month/> - {/*

{`Mês - ${startDate}`}

*/} - {/* */} - + + {/* */} + value.minut)} dataset={'Consumo'} dataset1='Estimado' month/> + {/*

{`Mês - ${startDate}`}

*/} + {/* */} + - - -
- - Unidade - - -
-
- - Discretização - - -
- -
- } - /> + + +
+ + Unidade + +
-
- + + Discretização + + +
+ +
+ } + /> +
+
+ handleChangeEndDate(newValue)} - renderInput={(params) => } - /> + discretization === '15_min'?new Date(startDate).setUTCDate(startDate.getUTCDate()+7) + : + new Date(startDate).setUTCDate(startDate.getUTCDate()+1) + } + onChange={(newValue: any) => handleChangeEndDate(newValue)} + renderInput={(params) => } + /> +
+ +
+ { + getDemand(unity, startDate, endDate, discretization) + .then(result => setDemRegXDemCon(result)) + .catch(exception => console.log(exception)) + }}/>
- -
- { - getDiscretization(unity, startDate, endDate, discretization) - .then(result => setDiscretizedConsumptionData(result)) - .catch(exception => console.log(exception)) - }}/> -
- - value.hora)} title='Demanda Contratada X Registrada' subtitle='' red/> - + + value.hora)} title='Demanda Contratada X Registrada' subtitle='' red/> + - - -
- - Unidade - - -
-
- - Discretização - - -
- -
- } - /> + + +
+ + Unidade + +
-
- + + Discretização + + +
+ +
+ } + /> +
+
+ handleChangeEndDate(newValue)} - renderInput={(params) => } - /> + discretization === '15_min'?new Date(startDate).setUTCDate(startDate.getUTCDate()+7) + : + new Date(startDate).setUTCDate(startDate.getUTCDate()+1) + } + onChange={(newValue: any) => handleChangeEndDate(newValue)} + renderInput={(params) => } + /> +
+ +
+ { + getPowerFactorData(unity, startDate, endDate, discretization) + .then(result => setFatorPotenciaData(result)) + .catch(exception => console.log(exception)) + }}/>
- -
- { - getDiscretization(unity, startDate, endDate, discretization) - .then(result => setDiscretizedConsumptionData(result)) - .catch(exception => console.log(exception)) - }}/> -
- - parseFloat(value.dia_num))} /> + + parseFloat(value.dia_num))} /> + + + + +
+ + Unidade + + +
+
+ + Discretização + + +
+
+ { + getDemand(unity, startDate, endDate, discretization) + .then(result => setDiscretizedConsumptionData(result)) + .catch(exception => console.log(exception)) + }}/> +
+ + value.hora)} title='Demanda Contratada X Registrada' subtitle='' red/> + - - -
- - Unidade - - + +
+
+ + + + +
-
- - Discretização - - -
-
- { - getDiscretization(unity, startDate, endDate, discretization) - .then(result => setDiscretizedConsumptionData(result)) - .catch(exception => console.log(exception)) - }}/> -
- - value.hora)} title='Demanda Contratada X Registrada' subtitle='' red/> - - - - -
-
- - - - -
-
- - - - - - - - - - - - - - - - { - tableData!==null? - tableData?.map((value, index) => { - return <> - - - - - - - - - - - }) - : - null + + +
PontoNumero do diaDia formatadoHoraMinutoConsumoReativa
{value.ponto}{parseFloat(value.dia_num)}{value.day_formatted}{value.hora}{value.minut}{parseFloat(value.consumo).toLocaleString('pt-br',{style: 'currency', currency: 'BRL', minimumFractionDigits: 2})}{parseFloat(value.reativa).toLocaleString('pt-br',{style: 'currency', currency: 'BRL', minimumFractionDigits: 2})}
+ + + + + + + + + + + + + { + tableData!==null? + tableData?.map((value, index) => { + return <> + + + + + + + + + + + }) + : + null + } + +
PontoNumero do diaDia formatadoHoraMinutoConsumoReativa
{value.ponto}{parseFloat(value.dia_num)}{value.day_formatted}{value.hora}{value.minut}{parseFloat(value.consumo).toLocaleString('pt-br',{style: 'currency', currency: 'BRL', minimumFractionDigits: 2})}{parseFloat(value.reativa).toLocaleString('pt-br',{style: 'currency', currency: 'BRL', minimumFractionDigits: 2})}
+ + + + value.hora)} title='Demanda Contratada X Registrada' subtitle='' red/> + + + + {/* setShowChart(!showChart)} purple /> */} + {/* handleVerifyFields()} orange /> */} + { + if (send) { + const html = document.querySelector("table").outerHTML; + htmlToCSV(html, "telemetria.csv"); } - - - + else { + setSend(true) + getTableData() + } + }}/> + +

+ + Fonte: Dados coletados do Sistema de Coleta de Dados + de Energia - SCDE da Câmara de Comercialização
+ Energia Elétrica – CCEE, sendo que as quantidades aqui + informadas são de responsabilidade
do agente de + medição - Distribuidora. + +

- - value.hora)} title='Demanda Contratada X Registrada' subtitle='' red/> - - - - {/* setShowChart(!showChart)} purple /> */} - {/* handleVerifyFields()} orange /> */} - { - if (send) { - const html = document.querySelector("table").outerHTML; - htmlToCSV(html, "telemetria.csv"); - } - else { - setSend(true) - getTableData() - } - }}/> - -

- - Fonte: Dados coletados do Sistema de Coleta de Dados - de Energia - SCDE da Câmara de Comercialização
- Energia Elétrica – CCEE, sendo que as quantidades aqui - informadas são de responsabilidade
do agente de - medição - Distribuidora. - -

- - + +
) } diff --git a/src/services/charts/telemetry/getDemand.ts b/src/services/charts/telemetry/getDemand.ts index 12012dd..7ccdd11 100644 --- a/src/services/charts/telemetry/getDemand.ts +++ b/src/services/charts/telemetry/getDemand.ts @@ -10,6 +10,7 @@ export async function getDemand( ) { const { '@smartAuth-token': token } = parseCookies() const { data } = await api.post('https://smart-energia-api.herokuapp.com/api/telemetry/demand', { + "type": discretization, "filters": [ {"type" : "=", "field": `med_5min.ponto`, "value": unity}, {"type" : "between", "field": "dia_num", "value": [startDate.toLocaleDateString().split('/').reverse().join('-'), endDate.toLocaleDateString().split('/').reverse().join('-')]} diff --git a/src/services/charts/telemetry/getPowerFactor.ts b/src/services/charts/telemetry/getPowerFactor.ts index 3b3dc80..54860db 100644 --- a/src/services/charts/telemetry/getPowerFactor.ts +++ b/src/services/charts/telemetry/getPowerFactor.ts @@ -9,6 +9,7 @@ export async function getPowerFactorData( discretization: string ) { const { data } = await api.post('http://smart-energia-api.herokuapp.com/api/telemetry/powerFactor', { + "type": discretization, "filters": [ {"type" : "=", "field": "med_5min.ponto", "value": unity}, {"type" : "between", "field": "dia_num", "value": [startDate.toLocaleDateString().split('/').reverse().join('-'), endDate.toLocaleDateString().split('/').reverse().join('-')]} diff --git a/src/styles/globals.ts b/src/styles/globals.ts index 7217309..9083802 100644 --- a/src/styles/globals.ts +++ b/src/styles/globals.ts @@ -44,7 +44,7 @@ export const GlobalStyle = createGlobalStyle` .MuiOutlinedInput-input, .MuiInputBase-input, .MuiInputBase-inputAdornedEnd, .css-nxo287-MuiInputBase-input-MuiOutlinedInput-input { padding: 0 0 0 15px; width: 100%; - height: 63px!important; + height: 63px; } .css-1u3bzj6-MuiFormControl-root-MuiTextField-root, .css-o9k5xi-MuiInputBase-root-MuiOutlinedInput-root, diff --git a/src/styles/layouts/Telemetria/TelemetriaView.ts b/src/styles/layouts/Telemetria/TelemetriaView.ts index 0bd8557..8243996 100644 --- a/src/styles/layouts/Telemetria/TelemetriaView.ts +++ b/src/styles/layouts/Telemetria/TelemetriaView.ts @@ -7,7 +7,7 @@ export const TelemetriaView = styled.main` flex-direction: column; - padding: 20px; + padding: 0; width: 100%; .modal { @@ -95,14 +95,12 @@ export const TelemetriaView = styled.main` table { display: none; } - .tg{ border-collapse:collapse; border-spacing:0; font-family:Poppins; width: 100%; } - .tg td{ border-color:#DDDFE1; border-style:solid; @@ -113,7 +111,6 @@ export const TelemetriaView = styled.main` padding:17px 30px; word-break:normal; } - .tg th{ border-color:#DDDFE1; border-style:solid; @@ -158,7 +155,6 @@ export const TelemetriaView = styled.main` text-align:center; vertical-align:top } - .tg .tg-baqh{ text-align:center; vertical-align:top @@ -173,6 +169,10 @@ export const TelemetriaView = styled.main` vertical-align:top } + canvas { + align-self: center; + } + input { width: 15rem; @@ -383,13 +383,15 @@ export const TableHeader = styled.div` flex-direction: row; - padding: 0 40px 0 40px + /* padding: 0 40px 0 40px */ ` export const ChartFilters = styled.section` display: flex; - align-items: center; - justify-content: center!important; + align-items: flex-start; + justify-content: flex-start!important; + + margin-left: 72px; align-self: flex-start; diff --git a/src/styles/layouts/economy/economy.ts b/src/styles/layouts/economy/economy.ts index 3e9e035..e101aaa 100644 --- a/src/styles/layouts/economy/economy.ts +++ b/src/styles/layouts/economy/economy.ts @@ -1,9 +1,28 @@ import styled from 'styled-components' export const EconomyView = styled.main` + width: 100%; + + .MuiInputLabel-root, .MuiInputLabel-formControl { + margin-top: 11px; + } + section { display: flex; justify-content: center; align-items: center; } + + input { + width: 16.6rem; + height: 63px!important; + + font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif; + font-weight: 400; + + border-radius: 6px; + border: solid gray 1px; + + background-color: #F9F9F9; + } ` diff --git a/src/styles/layouts/news/NewsView.ts b/src/styles/layouts/news/NewsView.ts index ce39590..8a3aa42 100644 --- a/src/styles/layouts/news/NewsView.ts +++ b/src/styles/layouts/news/NewsView.ts @@ -1,6 +1,12 @@ import styled from "styled-components"; export const NewsView = styled.main` + display: flex; + justify-content: center; + align-items: center; + + flex-direction: column; + width: 100%; margin-bottom: 100px; @@ -71,6 +77,35 @@ export const NewsView = styled.main` } } } + + a { + display: flex; + justify-content: center; + align-items: center; + margin-top: 1px; + + width: 140px; + height: 45px; + + cursor: pointer; + + background: #dadada; + border-radius: 8px; + border-style: none; + + font-family: 'Poppins'; + font-size: 90%; + + transition: all 350ms ease-in; + + :hover { + transform: scale(1.02); + opacity: 0.9; + box-shadow: rgb(0, 0, 0, 0.2) 0px 2px 4px -1px; + } + + color: #000; + } `; export const Button = styled.div`