diff --git a/src/components/graph/graphCard/ChartCardView.ts b/src/components/graph/graphCard/ChartCardView.ts index b8b39a7..351fc21 100644 --- a/src/components/graph/graphCard/ChartCardView.ts +++ b/src/components/graph/graphCard/ChartCardView.ts @@ -36,7 +36,8 @@ export const ChartCardView = styled.article` color: #254F7F; p { font-size: 20px; - text-decoration: underline; + color: #018A8A; + margin-left: 5px } } diff --git a/src/components/graph/grossAnualChart/GrossAnualChart.tsx b/src/components/graph/grossAnualChart/GrossAnualChart.tsx index 145630f..bce3b4d 100644 --- a/src/components/graph/grossAnualChart/GrossAnualChart.tsx +++ b/src/components/graph/grossAnualChart/GrossAnualChart.tsx @@ -51,7 +51,9 @@ export function GrossAnualChart({ title, subtitle, dataProps, label, dataset, ba }, }, y: { - stacked: true, + stacked: false, + min: 0, + max: 1100, grid: { display: false }, @@ -82,14 +84,14 @@ export function GrossAnualChart({ title, subtitle, dataProps, label, dataset, ba }, display: true, anchor: "end", - offset: !miniature? 0 : -5, + offset: !miniature? 0 : -60, align: "start", font: { weight: 'bold', size: !miniature? window.innerWidth/70 : window.innerWidth/90, }, color: (value) => { - return value.dataset.label==='Consolidada'? '#fff' : '#255488' + return value.dataset.label==='Consolidada'? '#000' : '#000' }, }, legend: { @@ -109,6 +111,8 @@ export function GrossAnualChart({ title, subtitle, dataProps, label, dataset, ba labels = label } + console.log(dataProps) + const data: any = { labels, datasets: [ diff --git a/src/pages/dashboard/index.tsx b/src/pages/dashboard/index.tsx index a4d5ddd..3bbdd8c 100644 --- a/src/pages/dashboard/index.tsx +++ b/src/pages/dashboard/index.tsx @@ -79,7 +79,7 @@ export default function Dashboard({grossAnualGraph, grossAnualYears, grossMensal <>
- Economia Acumulada:

R${lastDataBrutaMensalS}

+ Economia Acumulada:

R${lastDataBrutaMensalS}