Merge branch 'main' of git.zdool.com:xs/ggfwjsc

This commit is contained in:
lnn19986213 2024-06-06 10:50:50 +08:00
commit e19874c3d7
3 changed files with 54 additions and 106 deletions

View File

@ -45,6 +45,7 @@ const getOption = () => {
textStyle: {
fontSize: 16,
color: "#ffffff",
// color: ["rgba(255, 234, 90, 1)", "rgba(23, 255, 206, 1)"],
},
},
grid: {
@ -125,17 +126,12 @@ const getOption = () => {
},
},
itemStyle: {
normal: {
color: function (params) {
var colorList = [
new echarts.graphic.LinearGradient(0, 0, 1, 0, [
{ offset: 0, color: "rgba(255, 234, 90, 0)" },
{ offset: 0.5, color: "rgba(255, 234, 90, 0.5)" },
{ offset: 1, color: "rgba(255, 234, 90, 1)" },
]),
];
return colorList[params.dataIndex % colorList.length];
},
color: {
type: "linear",
colorStops: [
{ offset: 0, color: "rgba(255, 234, 90, 0.2)" },
{ offset: 1, color: "rgba(255, 234, 90, 1)" },
],
},
},
},
@ -156,17 +152,12 @@ const getOption = () => {
},
},
itemStyle: {
normal: {
color: function (params) {
var colorList = [
new echarts.graphic.LinearGradient(0, 0, 1, 0, [
{ offset: 0, color: "rgba(0, 255, 208,0)" },
{ offset: 0.5, color: "rgba(23, 255, 202, 0.20)" },
{ offset: 1, color: "rgba(23, 255, 206, 1)" },
]),
];
return colorList[params.dataIndex % colorList.length];
},
color: {
type: "linear",
colorStops: [
{ offset: 0, color: "rgba(23, 255, 206, 0.2)" },
{ offset: 1, color: "rgba(23, 255, 206, 1)" },
],
},
},
},

View File

@ -300,22 +300,6 @@ const getOption = () => {
};
};
// // 使
// onMounted(() => {
// // domecharts
// // var myChart = echarts.init(document.getElementById('main'));
// // Vue3
// var myChart = echarts.init(chart.value);
// // init(); // vue3.2this
// // 使
// myChart.setOption(option);
// // :
// // window.addEventListener("resize", () => {
// // myChart.resize();
// // });
// });
const setChart = () => {
var myChart = echarts.init(chart.value);
myChart.setOption(data.option);
@ -324,10 +308,17 @@ const setChart = () => {
const setChart1 = () => {
data.list1 = [];
data.list2 = [];
data.list.data.forEach((item) => {
data.list1.push(item.sc); //
data.list2.push(item.fwcs); //
});
// var myChart = echarts.init(chart.value);
// //
// myChart.showLoading();
if (data.list.length !== 0) {
data.list.data.forEach((item) => {
data.list1.push(item.sc); //
data.list2.push(item.fwcs); //
});
// //
// myChart.hideLoading();
}
};
// 使
@ -335,7 +326,7 @@ onBeforeMount(() => {
setTimeout(() => {
data.list = props.list;
data.day = props.list.day;
// console.log(data.list, "");
console.log(data.list, "助老服务");
setChart1();
getOption();
setChart();

View File

@ -36,7 +36,7 @@
</span>
</div>
<ePie
v-if="leftchoose.first == '1'"
v-if="leftchoose.first == '1' && showR"
:list1="data.leftTop1"
:list2="data.leftTop2"
:year="data.leftTopYear"
@ -48,10 +48,7 @@
:year="data.leftTopYear"
></ePie2>
</div>
<div
class="flex1"
style="margin-top: 10px"
>
<div class="flex1" style="margin-top: 10px">
<div class="yd_title left_2">
<div class="animate-border">
<i></i>
@ -85,7 +82,7 @@
</span>
</div>
<eP2
v-if="leftchoose.second == '1'"
v-if="leftchoose.second == '1' && showR"
:list1="data.leftCenter1"
:list2="data.leftCenter2"
:year="data.leftCenterYear"
@ -97,10 +94,7 @@
:year="data.leftCenterYear"
/>
</div>
<div
class="flex1"
style="margin-top: 10px"
>
<div class="flex1" style="margin-top: 10px">
<div class="yd_title left_3">
<div class="animate-border">
<i></i>
@ -134,7 +128,7 @@
</span>
</div>
<eP3
v-if="leftchoose.third == '1'"
v-if="leftchoose.third == '1' && showR"
:list1="data.leftbottom1"
:list2="data.leftbottom2"
:year="data.leftbottomYear"
@ -163,7 +157,7 @@
<div class="mtpText1">{{ data.oldAgeTotal }}</div>
<div class="mtpText2">{{ data.oldAgePercent }}%</div>
</div>
<ePie3d :list="data.rkgk"></ePie3d>
<ePie3d v-if="showR" :list="data.rkgk"></ePie3d>
</div>
<div class="flex1">
<div class="yd_title familyPlanning">
@ -173,6 +167,7 @@
</div>
</div>
<ylJHSY
v-if="showR"
:list1="data.centerBottom1"
:list2="data.centerBottom2"
:year="data.centerBottomYear"
@ -192,19 +187,9 @@
<div>
<span>{{ data.yljgzlzx.yljg }}<span class="unit"></span></span>
</div>
<img
src="@/assets/YLimg/ylimg11.png"
alt=""
/>
<img
class="historyimg"
src="@/assets/YLimg/ylimg5.png"
alt=""
/>
<img
src="@/assets/YLimg/yljg.gif"
class="historyMoveImg"
/>
<img src="@/assets/YLimg/ylimg11.png" alt="" />
<img class="historyimg" src="@/assets/YLimg/ylimg5.png" alt="" />
<img src="@/assets/YLimg/yljg.gif" class="historyMoveImg" />
</div>
<!-- <div class="history1">
<div>
@ -217,19 +202,9 @@
<div>
<span>{{ data.yljgzlzx.zlzx }}<span class="unit"></span></span>
</div>
<img
src="@/assets/YLimg/ylimg12.png"
alt=""
/>
<img
class="historyimg"
src="@/assets/YLimg/ylimg10.png"
alt=""
/>
<img
src="@/assets/YLimg/yljg.gif"
class="historyMoveImg"
/>
<img src="@/assets/YLimg/ylimg12.png" alt="" />
<img class="historyimg" src="@/assets/YLimg/ylimg10.png" alt="" />
<img src="@/assets/YLimg/yljg.gif" class="historyMoveImg" />
</div>
</div>
</div>
@ -243,30 +218,14 @@
<div class="serviceBox">
<div class="serviceTop">
<div class="visit">
<img
class="serviceimg"
src="@/assets/YLimg/ylimg8.png"
alt=""
/>
<ylSMFW :list="data.smfwcs"></ylSMFW>
<img class="serviceimg" src="@/assets/YLimg/ylimg8.png" alt="" />
<ylSMFW v-if="showR" :list="data.smfwcs"></ylSMFW>
</div>
<div class="medicalService">
<img
class="serviceimg"
src="@/assets/YLimg/ylimg9.png"
alt=""
/>
<img
class="moveYl"
src="@/assets/YLimg/turn.gif"
alt=""
/>
<img class="serviceimg" src="@/assets/YLimg/ylimg9.png" alt="" />
<img class="moveYl" src="@/assets/YLimg/turn.gif" alt="" />
<div class="medicalServiceTop">
<img
class="ylimg"
src="@/assets/YLimg/ylimg1.png"
alt=""
/>
<img class="ylimg" src="@/assets/YLimg/ylimg1.png" alt="" />
<span>36,234</span>
</div>
</div>
@ -282,6 +241,7 @@
/>
</div>
<ylXZZC
v-if="showR"
:list1="data.zccs1"
:list2="data.zccs2"
@village="chooseVillage"
@ -330,6 +290,7 @@ const leftchoose = ref({
second: "1",
third: "1",
});
const showR = ref(false);
//
const dialogShow = ref(false);
const tableType = reactive({
@ -439,15 +400,19 @@ const data = reactive({
yljgzlzx: { yljg: "", zlzx: "" },
zccs1: [],
zccs2: [],
smfwcs: [],
smfwcs: {
data: [{ nf: "2024", yf: "5", rq: "22", fwcs: "16", sc: "22" }],
day: ["5.22"],
},
});
onBeforeMount(async () => {
onBeforeMount(() => {
getData();
});
const getData = async () => {
await http.get("/api/ggfwyth/yl").then((res) => {
const getData = () => {
http.get("/api/ggfwyth/yl").then((res) => {
if (res.code == 200) {
console.log(res.data, "养老");
//
//
res.data.endowmentInsurance.ffrc.forEach((element) => {
@ -509,6 +474,7 @@ const getData = async () => {
data.zccs2.push(element.zccs); //
});
}
showR.value = true;
});
};
</script>