Smart/smartEnergyView-frontend
2
0
Fork 0
Code Issues 7 Pull Requests Actions Packages Projects Releases Wiki Activity

add fixed issues

Browse Source
This commit is contained in:
joseCorte-exe 2022-07-22 16:09:21 -03:00
parent c8e9a5305e
commit cb7e212953
3 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/components/graph/grossAnualChart/GrossAnualChart.tsx
View File

@ -3,6 +3,7 @@ import ChartDataLabels from 'chartjs-plugin-datalabels';
import { draw } from 'patternomaly' import { draw } from 'patternomaly'
import React, { useEffect } from 'react'; import React, { useEffect } from 'react';
import { Chart } from 'react-chartjs-2'; import { Chart } from 'react-chartjs-2';
import 'chartjs-plugin-style';
import { GrossAnualChartView } from './GrossAnualChartView'; import { GrossAnualChartView } from './GrossAnualChartView';
import ChartTitle from '../ChartTitle'; import ChartTitle from '../ChartTitle';
@ -14,7 +15,7 @@ ChartJS.register(
Title, Title,
Tooltip, Tooltip,
Legend, Legend,
ChartDataLabels ChartDataLabels,
); );
interface SingleBarInterface{ interface SingleBarInterface{
@ -59,13 +60,6 @@ export function GrossAnualChart({ title, subtitle, dataProps, label, dataset, ba
size: !miniature? 16 : 10 size: !miniature? 16 : 10
} }
}, },
// title: {
// display: true,
// text: 'titleY',
// font: {
// size: 00
// }
// }
}, },
}, },
series: { series: {
@ -88,7 +82,7 @@ export function GrossAnualChart({ title, subtitle, dataProps, label, dataset, ba
}, },
display: true, display: true,
anchor: "end", anchor: "end",
offset: !miniature?20 : 10, offset: !miniature? 5 : 5,
align: "start", align: "start",
font: { font: {
size: !miniature? 30 : 10, size: !miniature? 30 : 10,

3
src/pages/_document.tsx
View File

@ -51,6 +51,9 @@ export default class MyDocument extends Document {
<link rel="preconnect" href="https://fonts.gstatic.com" crossOrigin='true' /> <link rel="preconnect" href="https://fonts.gstatic.com" crossOrigin='true' />
<link href="https://fonts.googleapis.com/css2?family=Nunito+Sans:ital,wght@0,200;0,300;0,400;0,600;0,700;0,800;0,900;1,200;1,300;1,400;1,600;1,700;1,800;1,900&display=swap" rel="stylesheet"/> <link href="https://fonts.googleapis.com/css2?family=Nunito+Sans:ital,wght@0,200;0,300;0,400;0,600;0,700;0,800;0,900;1,200;1,300;1,400;1,600;1,700;1,800;1,900&display=swap" rel="stylesheet"/>
<script type="text/javascript" src="Chart.js"></script>
<script type="text/javascript" src="chartjs-plugin-style.js"></script>
</Head> </Head>
<body> <body>
<Main /> <Main />

4
src/pages/dashboard/index.tsx
View File

@ -75,7 +75,7 @@ export default function Dashboard({grossAnualGraph, grossAnualYears, grossMensal
label={grossAnualYears} barLabel bruta miniature/> label={grossAnualYears} barLabel bruta miniature/>
</GraphCard> </GraphCard>
<GraphCard title='Economia Bruta Mensal' subtitle='Economia Bruta Estimada e Acumulada Mensal - Valores em R$ x mil' singleBar> <GraphCard title='Economia Bruta Mensal' subtitle='Economia Bruta Estimada e Acumulada Mensal - Valores em R$ x mil'>
<GrossMensalChart title='' subtitle='' <GrossMensalChart title='' subtitle=''
data1={grossMensalGraph} data1={grossMensalGraph}
data2={grossMensalGraph} data2={grossMensalGraph}
@ -84,7 +84,7 @@ export default function Dashboard({grossAnualGraph, grossAnualYears, grossMensal
/> />
</GraphCard> </GraphCard>
<GraphCard title='Cativo x Livre Mensal' subtitle='Comparativo de Custo Estimado - Valores em R$ x mil' singleBar> <GraphCard title='Cativo x Livre Mensal' subtitle='Comparativo de Custo Estimado - Valores em R$ x mil'>
<CativoXLivreChart chartData={acumulatedGraph} <CativoXLivreChart chartData={acumulatedGraph}
dataset1="Economia (R$)" dataset2='Est. Cativo' dataset3='Est. Livre' dataset1="Economia (R$)" dataset2='Est. Cativo' dataset3='Est. Livre'
label={ConsumoEstimado.label} title='' subtitle='' barLabel hashurado miniature/> label={ConsumoEstimado.label} title='' subtitle='' barLabel hashurado miniature/>