This commit is contained in:
duanxiaohai 2024-06-04 16:17:56 +08:00
parent 9aac87f484
commit 2ee7da01a6
2 changed files with 15 additions and 17 deletions

View File

@ -246,7 +246,7 @@ const getOption = () => {
yAxisIndex: 0, yAxisIndex: 0,
name: "特困救助人次", name: "特困救助人次",
data: data.list1, data: data.list1,
barWidth: 15, barWidth: 10,
type: "bar", type: "bar",
// itemStyle: { // itemStyle: {
// color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [ // color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
@ -282,7 +282,7 @@ const getOption = () => {
yAxisIndex: 0, yAxisIndex: 0,
name: "低保救助人次", name: "低保救助人次",
data: data.list2, data: data.list2,
barWidth: 15, barWidth: 10,
type: "bar", type: "bar",
itemStyle: { itemStyle: {
color: { color: {
@ -318,7 +318,7 @@ const getOption = () => {
yAxisIndex: 0, yAxisIndex: 0,
name: "低边救助人次", name: "低边救助人次",
data: data.list3, data: data.list3,
barWidth: 15, barWidth: 10,
type: "bar", type: "bar",
itemStyle: { itemStyle: {
color: { color: {
@ -386,8 +386,8 @@ const getOption = () => {
symbolPosition: "end", symbolPosition: "end",
data: data.list1, data: data.list1,
symbol: "diamond", symbol: "diamond",
symbolOffset: ["-45%", "-50%"], symbolOffset: ["-20%", "-50%"],
symbolSize: [16, 8], symbolSize: [14, 8],
itemStyle: { itemStyle: {
borderColor: "#2fffa4", borderColor: "#2fffa4",
color: "rgba(142, 187, 255, 1)", color: "rgba(142, 187, 255, 1)",
@ -401,7 +401,7 @@ const getOption = () => {
data: data.list2, data: data.list2,
symbol: "diamond", symbol: "diamond",
symbolOffset: ["0", "-50%"], symbolOffset: ["0", "-50%"],
symbolSize: [16, 8], symbolSize: [14, 8],
itemStyle: { itemStyle: {
borderColor: "#2fffa4", borderColor: "#2fffa4",
color: "rgba(23, 136, 255, 1)", color: "rgba(23, 136, 255, 1)",
@ -414,8 +414,8 @@ const getOption = () => {
symbolPosition: "end", symbolPosition: "end",
data: data.list3, data: data.list3,
symbol: "diamond", symbol: "diamond",
symbolOffset: [7.5, "-50%"], symbolOffset: [5, "-50%"],
symbolSize: [16, 8], symbolSize: [14, 8],
itemStyle: { itemStyle: {
borderColor: "#32ffee", borderColor: "#32ffee",
color: "rgba(23, 237, 255, 1)", color: "rgba(23, 237, 255, 1)",

View File

@ -1173,20 +1173,18 @@ const getData = async () => {
const jzfwKeys = ["jzrc", "jzje", "nf"]; const jzfwKeys = ["jzrc", "jzje", "nf"];
if (data.salvageServices) { if (data.salvageServices) {
jzfwKeys.forEach((key) => { jzfwKeys.forEach((key) => {
data.salvageServices[key] = addThousandSeparator(res.data.jzfw[key]); data.salvageServices[key] = res.data.jzfw[key];
}); });
} }
// & // &
const jysyKeys = ["xxzs", "xszs", "jzgzs"]; const jysyKeys = ["xxzs", "xszs", "jzgzs"];
jysyKeys.forEach((key) => { jysyKeys.forEach((key) => {
data.education[key] = addThousandSeparator(res.data.xxgk[key]); data.education[key] = res.data.xxgk[key];
}); });
// //
const jyfwKeys = ["jypx", "jyjxfw", "jyyz"]; const jyfwKeys = ["jypx", "jyjxfw", "jyyz"];
jyfwKeys.forEach((key) => { jyfwKeys.forEach((key) => {
data.employmentService[key] = addThousandSeparator( data.employmentService[key] = res.data.jyfw[key].toString();
res.data.jyfw[key].toString()
);
}); });
// && // &&
data.PopulationData = res.data.rksj; data.PopulationData = res.data.rksj;
@ -1194,7 +1192,7 @@ const getData = async () => {
if (data.PopulationData) { if (data.PopulationData) {
const rkjsKeys = ["rkzs", "man", "woman"]; const rkjsKeys = ["rkzs", "man", "woman"];
rkjsKeys.forEach((key) => { rkjsKeys.forEach((key) => {
data.PopulationData[key] = addThousandSeparator(res.data.rksj[key]); data.PopulationData[key] = res.data.rksj[key];
}); });
// //
const ageGroupKeys = [ const ageGroupKeys = [
@ -1240,17 +1238,17 @@ const getData = async () => {
"cswsfwzs", "cswsfwzs",
]; ];
ylwsKeys.forEach((key, index) => { ylwsKeys.forEach((key, index) => {
data.ylwsList[index].value = addThousandSeparator(res.data.ylws[key]); data.ylwsList[index].value = res.data.ylws[key];
}); });
// //
const whsyKeys = ["ggtsg", "zcs", "sxxxcs", "bwgcgcs", "tsjycs"]; const whsyKeys = ["ggtsg", "zcs", "sxxxcs", "bwgcgcs", "tsjycs"];
whsyKeys.forEach((key, index) => { whsyKeys.forEach((key, index) => {
data.whsyList[index].value = addThousandSeparator(res.data.whtysy[key]); data.whsyList[index].value =res.data.whtysy[key];
}); });
// //
const tysyKeys = ["zqcs", "lqcs", "ppqcs", "ymqcs", "lsbdcd"]; const tysyKeys = ["zqcs", "lqcs", "ppqcs", "ymqcs", "lsbdcd"];
tysyKeys.forEach((key, index) => { tysyKeys.forEach((key, index) => {
data.tysyList[index].value = addThousandSeparator(res.data.whtysy[key]); data.tysyList[index].value =res.data.whtysy[key];
}); });
// //
} }