diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..0611228 Binary files /dev/null and b/dist.zip differ diff --git a/src/view/dialog/dialogSf.vue b/src/view/dialog/dialogSf.vue index ffcd6e7..5aec9f1 100644 --- a/src/view/dialog/dialogSf.vue +++ b/src/view/dialog/dialogSf.vue @@ -51,7 +51,7 @@
- 概况模型 + 模型概况
diff --git a/src/view/echarts_infabt/eP4.vue b/src/view/echarts_infabt/eP4.vue index 793b6a9..40fa4c5 100644 --- a/src/view/echarts_infabt/eP4.vue +++ b/src/view/echarts_infabt/eP4.vue @@ -12,16 +12,16 @@ const props = defineProps({ type: Array, default: () => [], }, - list2: { - type: Array, - default: () => [], - }, + // list2: { + // type: Array, + // default: () => [], + // }, }); const data = reactive({ - list: [], + list: [], //乡镇街道 list2: [], - zgffrc: [], //育龄妇女 - cxffrc: [], //婴幼儿 + ylfnrs: [], //育龄妇女 + yyers: [], //婴幼儿 option: {}, bg: [], }); @@ -65,8 +65,8 @@ const getOption = () => { data.option = { tooltip: { trigger: "axis", - // formatter: "{b}
{a1}:{c1}
{a}:{c} ", - formatter: "{b}
{a}:{c} ", + formatter: "{b}
{a1}:{c1}
{a}:{c} ", + // formatter: "{b}
{a}:{c} ", }, legend: { data: ["育龄妇女", "婴幼儿"], @@ -123,7 +123,7 @@ const getOption = () => { fontSize: 16, }, }, - data: data.list2, + data: data.list, }, { type: "category", @@ -157,14 +157,14 @@ const getOption = () => { name: "育龄妇女", type: "bar", barGap: 0.3 /*多个并排柱子设置柱子之间的间距*/, - data: data.list , + data: data.ylfnrs, barWidth: "18%", label: { show: true, color: "#ffffff", position: "right", formatter: function (data) { - return data.value ; + return data.value; }, }, itemStyle: { @@ -181,35 +181,35 @@ const getOption = () => { }, }, }, - // { - // z: 2, - // name: "婴幼儿", - // type: "bar", - // barGap: 0.3 /*多个并排柱子设置柱子之间的间距*/, - // data: data.cxffrc, - // barWidth: "18%", - // label: { - // show: true, - // color: "#ffffff", - // position: "right", - // formatter: function (data) { - // return data.value + "万"; - // }, - // }, - // itemStyle: { - // color: { - // type: "linear", - // x: 0, - // x2: 1, - // y: 0, - // y2: 0, - // colorStops: [ - // { offset: 0, color: "rgba(24, 234, 254, 0.2)" }, - // { offset: 1, color: "rgba(24, 234, 254, 0.7)" }, - // ], - // }, - // }, - // }, + { + z: 2, + name: "婴幼儿", + type: "bar", + barGap: 0.3 /*多个并排柱子设置柱子之间的间距*/, + data: data.yyers, + barWidth: "18%", + label: { + show: true, + color: "#ffffff", + position: "right", + formatter: function (data) { + return data.value; + }, + }, + itemStyle: { + color: { + type: "linear", + x: 0, + x2: 1, + y: 0, + y2: 0, + colorStops: [ + { offset: 0, color: "rgba(24, 234, 254, 0.2)" }, + { offset: 1, color: "rgba(24, 234, 254, 0.7)" }, + ], + }, + }, + }, // { // type: "bar", @@ -235,10 +235,12 @@ const setChart = () => { onBeforeMount(() => { setTimeout(() => { - data.list = props.list; - data.list2 = props.list2; + data.list = props.list.xzjd; + data.ylfnrs = props.list.ylfnrs; + data.yyers = props.list.yyers; + // data.list2 = props.list2; // data.year = props.year; - console.log(1111,data.list, data.list2); + // console.log(222, data.list); // data.list.forEach((item) => { // data.zgffrc.push((item.zgffrc / 10000).toFixed(0)); diff --git a/src/view/person/rwTable.vue b/src/view/person/rwTable.vue index 667ebd8..538d5aa 100644 --- a/src/view/person/rwTable.vue +++ b/src/view/person/rwTable.vue @@ -23,7 +23,7 @@ - + @@ -97,16 +97,16 @@ style="width: 100%" > - + - + - + - + @@ -166,7 +166,7 @@ - + diff --git a/src/view/table_gk/gk_infant.vue b/src/view/table_gk/gk_infant.vue index 0bfac42..2afa555 100644 --- a/src/view/table_gk/gk_infant.vue +++ b/src/view/table_gk/gk_infant.vue @@ -107,10 +107,7 @@
- +
@@ -131,8 +128,6 @@ const data = reactive({ ylfnzb: {}, // 育龄妇女占比 ylfnyyefb: {}, // 育龄妇女婴幼儿分布 - - medicalInsurance: {}, //医疗保险 lmb: {}, //两慢病 mfyyqk: [