|
@@ -62,10 +62,11 @@ const typeChange = () => {
|
|
|
};
|
|
|
});
|
|
|
map.sort((a, b) => a.value - b.value);
|
|
|
- xAxisData.value = map.map(v => v.name);
|
|
|
+ // xAxisData.value = map.map(v => v.name);
|
|
|
seriesMax.value = largeScreenGlobalData.value?.total;
|
|
|
seriesData.value = map.map(v => {
|
|
|
return {
|
|
|
+ name: v.name,
|
|
|
value: formatterScale(v.value, seriesMax.value),
|
|
|
rawVal: v.value
|
|
|
}
|
|
@@ -73,19 +74,20 @@ const typeChange = () => {
|
|
|
} else {
|
|
|
let diseaseRiskMap = [...largeScreenGlobalData.value?.diseaseRiskMap];
|
|
|
diseaseRiskMap.sort((a, b) => a[tabType.value] - b[tabType.value]);
|
|
|
- xAxisData.value = diseaseRiskMap.map(v => v.name);
|
|
|
+ // xAxisData.value = diseaseRiskMap.map(v => v.name);
|
|
|
// seriesData.value = diseaseRiskMap.map(v => parseFloat((v[tabType.value] / largeScreenGlobalData.value?.assessedArchivesTotal).toFixed(2)))
|
|
|
seriesMax.value = largeScreenGlobalData.value?.assessedArchivesTotal;
|
|
|
seriesData.value = diseaseRiskMap.map(v => {
|
|
|
return {
|
|
|
+ name: v.name,
|
|
|
value: formatterScale(v[tabType.value], seriesMax.value),
|
|
|
rawVal: v[tabType.value]
|
|
|
}
|
|
|
})
|
|
|
}
|
|
|
console.log(xAxisData.value ,seriesData.value );
|
|
|
- xAxisData.value = xAxisData.value.slice(-10);
|
|
|
- seriesData.value = seriesData.value.slice(-10);
|
|
|
+ seriesData.value = seriesData.value.filter(v => v.value).slice(-10);
|
|
|
+ xAxisData.value = seriesData.value.map(v => v.name)
|
|
|
console.log(xAxisData.value ,seriesData.value );
|
|
|
nextTick(() => {
|
|
|
initChart();
|
|
@@ -181,7 +183,7 @@ const initChart = () => {
|
|
|
return params.value + "%";
|
|
|
}
|
|
|
},
|
|
|
- // barWidth: 23,
|
|
|
+ barWidth: 23,
|
|
|
data: seriesData.value
|
|
|
}
|
|
|
]
|