From a0e8a7954139ebd9625acabd45cc11c86e8fa28e Mon Sep 17 00:00:00 2001 From: yaoyuhao Date: Fri, 6 Sep 2024 13:18:56 +0800 Subject: [PATCH] 11111 --- src/view/echarts_sy/pie.vue | 43 +++++++++++++------------ src/view/echarts_yl/pie3d.vue | 16 +++++----- src/view/sy.vue | 60 +++++++++++++++++------------------ src/view/yl.vue | 8 ++--- 4 files changed, 65 insertions(+), 62 deletions(-) diff --git a/src/view/echarts_sy/pie.vue b/src/view/echarts_sy/pie.vue index 5b56470..b15be8f 100644 --- a/src/view/echarts_sy/pie.vue +++ b/src/view/echarts_sy/pie.vue @@ -26,43 +26,43 @@ const props = defineProps({ const data = reactive({ list: [ { - name: "1-10岁", + name: "0-9岁", value: 95, }, { - name: "11-20岁", + name: "10-19岁", value: 120, }, { - name: "21-30岁", + name: "20-29岁", value: 98, }, { - name: "31-40岁", + name: "30-39岁", value: 90, }, { - name: "41-50岁", + name: "40-49岁", value: 100, }, { - name: "51-60岁", + name: "50-59岁", value: 97, }, { - name: "61-70岁", + name: "60-69岁", value: 100, }, { - name: "71-80岁", + name: "70-79岁", value: 100, }, { - name: "81-90岁", + name: "80-89岁", value: 100, }, { - name: "91-100岁", + name: "90-99岁", value: 100, }, { @@ -146,17 +146,18 @@ const getOption1 = () => { // data.list[2].value = data.list.nl3569; // data.list[0].value = data.list.nl60; - data.list[0].value = parseInt(data.list1.nl110); - data.list[1].value = parseInt(data.list1.nl1120); - data.list[2].value = parseInt(data.list1.nl2130); - data.list[3].value = parseInt(data.list1.nl3140); - data.list[4].value = parseInt(data.list1.nl4150); - data.list[5].value = parseInt(data.list1.nl5160); - data.list[6].value = parseInt(data.list1.nl6170); - data.list[7].value = parseInt(data.list1.nl7180); - data.list[8].value = parseInt(data.list1.nl8190); - data.list[9].value = parseInt(data.list1.nl91100); + data.list[0].value = parseInt(data.list1.nl09); + data.list[1].value = parseInt(data.list1.nl1019); + data.list[2].value = parseInt(data.list1.nl2029); + data.list[3].value = parseInt(data.list1.nl3039); + data.list[4].value = parseInt(data.list1.nl4049); + data.list[5].value = parseInt(data.list1.nl5059); + data.list[6].value = parseInt(data.list1.nl6069); + data.list[7].value = parseInt(data.list1.nl7079); + data.list[8].value = parseInt(data.list1.nl8089); + data.list[9].value = parseInt(data.list1.nl9099); data.list[10].value = parseInt(data.list1.nl100); +console.log(666,data.list); let sum = 0; @@ -317,6 +318,8 @@ const setChart = () => { onBeforeMount(() => { setTimeout(() => { data.list1 = props.list; + console.log(777,data.list1); + getOption1(); getOption(); setChart(); diff --git a/src/view/echarts_yl/pie3d.vue b/src/view/echarts_yl/pie3d.vue index 2f218a5..a039678 100644 --- a/src/view/echarts_yl/pie3d.vue +++ b/src/view/echarts_yl/pie3d.vue @@ -68,19 +68,19 @@ const colorList = [ const pieData = reactive([ { - name: "61-70岁", //名称 + name: "60-69岁", //名称 value: 0, //值 }, { - name: "71-80岁", + name: "70-79岁", value: 0, }, { - name: "81-90岁", + name: "80-89岁", value: 0, }, { - name: "91-100岁", + name: "90-99岁", value: 0, }, { @@ -561,10 +561,10 @@ const setChart = () => { onBeforeMount(() => { setTimeout(() => { data.list = props.list; - pieData[0].value = data.list.nl6170; - pieData[1].value = data.list.nl7180; - pieData[2].value = data.list.nl8190; - pieData[3].value = data.list.nl91100; + pieData[0].value = data.list.nl6069; + pieData[1].value = data.list.nl7079; + pieData[2].value = data.list.nl8089; + pieData[3].value = data.list.nl9099; pieData[4].value = data.list.nl100; getOption(); diff --git a/src/view/sy.vue b/src/view/sy.vue index 21d879f..9576c95 100644 --- a/src/view/sy.vue +++ b/src/view/sy.vue @@ -1274,29 +1274,29 @@ const getData = async () => { "nl1834", "nl3569", "nl60", - "nl110", - "nl1120", - "nl2130", - "nl3140", - "nl4150", - "nl5160", - "nl6170", - "nl7180", - "nl8190", - "nl91100", + "nl09", + "nl1019", + "nl2029", + "nl3039", + "nl4049", + "nl5059", + "nl6069", + "nl7079", + "nl8089", + "nl9099", "nl100", ]; const ageBt = [ - "nl110", - "nl1120", - "nl2130", - "nl3140", - "nl4150", - "nl5160", - "nl6170", - "nl7180", - "nl8190", - "nl91100", + "nl09", + "nl1019", + "nl2029", + "nl3039", + "nl4049", + "nl5059", + "nl6069", + "nl7079", + "nl8089", + "nl9099", "nl100", ]; ageGroupKeys.forEach((key) => { @@ -1757,43 +1757,43 @@ const bt = computed(() => { }); const btList = ref([ { - name: "1-10岁人口总数", + name: "0-9岁人口总数", value: "", }, { - name: "11-20岁人口总数", + name: "10-19岁人口总数", value: "", }, { - name: "21-30岁人口总数", + name: "20-29岁人口总数", value: "", }, { - name: "31-40岁人口总数", + name: "30-39岁人口总数", value: "", }, { - name: "41-50岁人口总数", + name: "40-49岁人口总数", value: "", }, { - name: "51-60岁人口总数", + name: "50-59岁人口总数", value: "", }, { - name: "61-70岁人口总数", + name: "60-69岁人口总数", value: "", }, { - name: "71-80岁人口总数", + name: "70-79岁人口总数", value: "", }, { - name: "81-90岁人口总数", + name: "80-89岁人口总数", value: "", }, { - name: "91-100岁人口总数", + name: "90-99岁人口总数", value: "", }, { diff --git a/src/view/yl.vue b/src/view/yl.vue index e2c27f4..f394278 100644 --- a/src/view/yl.vue +++ b/src/view/yl.vue @@ -509,10 +509,10 @@ const btList = ref([ }, ]); const ageGroups = [ - { ageRange: "6170", index: 0 }, - { ageRange: "7180", index: 1 }, - { ageRange: "8190", index: 2 }, - { ageRange: "91100", index: 3 }, + { ageRange: "6069", index: 0 }, + { ageRange: "7079", index: 1 }, + { ageRange: "8089", index: 2 }, + { ageRange: "9099", index: 3 }, { ageRange: "100", index: 4 }, ]; //扇形图颜色数据