Merge branch 'administativePages' into 'dev'
add milhar separator graphs See merge request kluppsoftware/smart-energia-web!83
This commit is contained in:
commit
796b57e705
@ -49,7 +49,16 @@ export default function Chart({ title, data1, data2, label, subtitle, dataset1,
|
||||
datalabels: {
|
||||
display: true,
|
||||
color: barLabel? 'black' : "rgba(255, 255, 255, 0)",
|
||||
formatter: Math.round,
|
||||
formatter: (value, ctx) => {
|
||||
let sum = 0;
|
||||
const dataArr = ctx.chart.data.datasets[0].data;
|
||||
dataArr.map(data => {
|
||||
sum += data;
|
||||
});
|
||||
const result = `${parseFloat(value).toLocaleString('pt-br')}`
|
||||
|
||||
return value==null? null : result
|
||||
},
|
||||
anchor: "end",
|
||||
offset: -20,
|
||||
align: "start",
|
||||
|
||||
@ -78,7 +78,6 @@ export function LineBarChart2({ title, subtitle, data1, data2, data3, label, red
|
||||
|
||||
const currentTime = new Date();
|
||||
|
||||
|
||||
const labels = label
|
||||
|
||||
const options: any = {
|
||||
@ -88,12 +87,21 @@ export function LineBarChart2({ title, subtitle, data1, data2, data3, label, red
|
||||
display: true,
|
||||
color: barLabel? 'black' : "rgba(255, 255, 255, 0)",
|
||||
// backgroundColor: '#255488',
|
||||
formatter: Math.round,
|
||||
anchor: "end",
|
||||
offset: -20,
|
||||
align: "start",
|
||||
font: {
|
||||
size: 12
|
||||
},
|
||||
formatter: (value, ctx) => {
|
||||
let sum = 0;
|
||||
const dataArr = ctx.chart.data.datasets[0].data;
|
||||
dataArr.map(data => {
|
||||
sum += data;
|
||||
});
|
||||
const result = `${parseFloat(value).toLocaleString('pt-br')}`
|
||||
|
||||
return value==null? null : result
|
||||
}
|
||||
},
|
||||
legend: {
|
||||
|
||||
@ -46,7 +46,7 @@ export function SingleBar({ title, subtitle, dataProps, label, dataset, barLabel
|
||||
sum += data;
|
||||
});
|
||||
const percentage = (dataProps[ctx.dataIndex].econ_percentual*100).toFixed(0)+"%";
|
||||
const result = `${parseFloat(value).toFixed(0)}\n ${percentage}`
|
||||
const result = `${parseFloat(value).toLocaleString('pt-br')}\n ${percentage}`
|
||||
|
||||
return value==null? null : result
|
||||
},
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user