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

This commit is contained in:
lnn19986213 2024-06-04 14:35:03 +08:00
commit 3d49cbf0ee
7 changed files with 454 additions and 338 deletions

View File

@ -1,5 +1,5 @@
<template>
<div ref="chart" style="width: 100%;height: 250px"></div>
<div ref="chart" style="width: 100%; height: 250px"></div>
</template>
<script setup>
@ -9,12 +9,7 @@ import * as echarts from "echarts";
const chart = ref(); // DOM
const data = [20, 20, 50, 80, 70, 10, 30];
// const lineData = [150, 230, 224, 218, 135, 147, 260];
// const max = data
// .concat(lineData)
// .reduce((pre, cur) => (pre > cur ? pre : cur), 0); //
// //
const data = [200, 120, 150, 110, 70];
const color = [
{
type: "linear",
@ -82,12 +77,12 @@ const option = {
axisTick: {
show: false, //
},
data: ["东华街道", "龙洲街道","湖镇镇","詹家镇","小南海镇",],
data: ["东华街道", "龙洲街道", "湖镇镇", "詹家镇", "小南海镇"],
},
{
type: "category",
show: false,
data: ["东华街道", "龙洲街道","湖镇镇","詹家镇","小南海镇",],
data: ["东华街道", "龙洲街道", "湖镇镇", "詹家镇", "小南海镇"],
},
],
yAxis: [
@ -122,74 +117,95 @@ const option = {
},
},
},
// {
// type: "value",
// scale: true,
// // name: "/",
// min: 0,
// max: max,
// splitLine: {//线
// show: false,
// lineStyle: {
// color: "#ffffff",
// width: 1,
// },
// },
// axisLabel: {//y
// textStyle: {
// color: "#ffffff",
// },
// },
// axisLine: {
// //y线
// show: false,
// lineStyle: {
// color: "#ffffff",
// width: 1,
// type: "solid",
// },
// },
// },
{
type: "value",
min: 0,
max: 100,
splitLine: {
show: false,
lineStyle: {
type: "solid",
color: "rgb(221, 242, 255,0.1)",
},
},
axisLine: {
show: false,
lineStyle: {
type: "dotted",
},
},
axisLabel: {
show: false,
fontSize: 16,
fontFamily: "MicrosoftYaHei",
color: "#ffffff",
fontSize: 16,
lineHeight: 19,
},
},
],
series: [
{
z: 1,
// name: "",
data: data,
barWidth: 20,
type: "bar",
label:{
show:true,
position:'top',
color:'#ffffff',
formatter:function(data){
return data.value
}
itemStyle: {
color: {
type: "linear",
x: 0,
x2: 1,
y: 0,
y2: 0,
colorStops: [
{ offset: 0, color: "rgba(47, 168, 215, .7)" },
{ offset: 0.5, color: "rgba(47, 168, 215, .7)" },
{ offset: 0.5, color: "rgba(47, 168, 215, .3)" },
{ offset: 1, color: "rgba(47, 168, 215, .5)" },
],
},
},
// {
// // name: "",
// data: lineData,
// type: "line", //线
// itemStyle: {
// borderColor: "#00FCFF",
// borderWidth: 1,
// color: "#00FCFF",
// },
// },
label: {
show: true,
position: "top",
color: "#ffffff",
formatter: function (data) {
return data.value;
},
},
},
//
{
xAxisIndex: 1,
yAxisIndex: 1,
showBackground: true,
itemStyle: {
normal: {
color: "rgba(180, 180, 180, 0)", //
}
},
},
// data: data.map(() => max),
data: data.map(() => Math.max(...data) * 1.02),
data: data.map(() => 100),
barWidth: 40, //
type: "bar",
},
//
{
z: 1,
type: "pictorialBar",
symbolPosition: "end",
data: data,
symbol: "diamond",
symbolOffset: ["0%", "-50%"],
symbolSize: [21, 15],
itemStyle: {
borderColor: "#2fffa4",
color: "rgba(47, 168, 215, 1)",
},
},
],
};

View File

@ -213,6 +213,7 @@ const getOption = () => {
},
},
{
z: 1,
yAxisIndex: 0,
name: "救助人数",
data: data.list1,
@ -227,16 +228,19 @@ const getOption = () => {
},
},
itemStyle: {
color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
{
offset: 0,
color: "rgba(255, 243, 119, 1)",
color: {
type: "linear",
x: 0,
x2: 1,
y: 0,
y2: 0,
colorStops: [
{ offset: 0, color: "rgba(255, 242, 142, .7)" },
{ offset: 0.5, color: "rgba(255, 242, 142, .7)" },
{ offset: 0.5, color: "rgba(255, 242, 142, .3)" },
{ offset: 1, color: "rgba(255, 242, 142, .5)" },
],
},
{
offset: 1,
color: "rgba(255, 242, 142, 0.20)",
},
]),
},
},
{
@ -270,6 +274,20 @@ const getOption = () => {
data: data.list.year.map(() => 100),
barWidth: 50,
},
{
z: 1,
type: "pictorialBar",
symbolPosition: "end",
data: data.list1,
symbol: "diamond",
symbolOffset: ["0%", "-50%"],
symbolSize: [21, 15],
itemStyle: {
borderColor: "#2fffa4",
color: "rgba(255, 242, 142, 1)",
},
},
],
};
};

View File

@ -47,12 +47,6 @@ const data = reactive({
// max: null,
});
// const data1 = [120, 200, 50, 80, 70];
// const lineData = [1500, 2300, 204, 2018, 1305];
// const max = data1
// .concat(lineData)
// .reduce((pre, cur) => (pre > cur ? pre : cur), 0); //
const getOption = () => {
data.option = {
tooltip: {
@ -213,6 +207,7 @@ const getOption = () => {
},
},
{
z: 1,
yAxisIndex: 0,
name: "救助人数",
data: data.list1,
@ -227,16 +222,19 @@ const getOption = () => {
},
},
itemStyle: {
color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
{
offset: 0,
color: "rgba(23, 237, 255, 1)",
color: {
type: "linear",
x: 0,
x2: 1,
y: 0,
y2: 0,
colorStops: [
{ offset: 0, color: "rgba(23, 237, 255, .7)" },
{ offset: 0.5, color: "rgba(23, 237, 255, .7)" },
{ offset: 0.5, color: "rgba(23, 237, 255, .3)" },
{ offset: 1, color: "rgba(23, 237, 255, .5)" },
],
},
{
offset: 1,
color: "rgba(23, 237, 255, 0.20)",
},
]),
},
},
{
@ -271,6 +269,21 @@ const getOption = () => {
// data: 100,
barWidth: 50,
},
//
{
z: 1,
type: "pictorialBar",
symbolPosition: "end",
data: data.list1,
symbol: "diamond",
symbolOffset: ["0%", "-50%"],
symbolSize: [21, 15],
itemStyle: {
borderColor: "#2fffa4",
color: "rgba(23, 237, 255, 1)",
},
},
],
};
};

View File

@ -209,6 +209,7 @@ const getOption = () => {
},
},
{
z: 1,
yAxisIndex: 0,
name: "生活补贴人数",
data: data.list1,
@ -223,16 +224,19 @@ const getOption = () => {
},
},
itemStyle: {
color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
{
offset: 0,
color: "rgba(23, 237, 255, 1)",
color: {
type: "linear",
x: 0,
x2: 1,
y: 0,
y2: 0,
colorStops: [
{ offset: 0, color: "rgba(23, 237, 255, .7)" },
{ offset: 0.5, color: "rgba(23, 237, 255, .7)" },
{ offset: 0.5, color: "rgba(23, 237, 255, .3)" },
{ offset: 1, color: "rgba(23, 237, 255, .5)" },
],
},
{
offset: 1,
color: "rgba(23, 237, 255, 0.20)",
},
]),
},
},
{
@ -266,6 +270,20 @@ const getOption = () => {
data: data.list.year.map(() => 100),
barWidth: 50,
},
{
z: 1,
type: "pictorialBar",
symbolPosition: "end",
data: data.list1,
symbol: "diamond",
symbolOffset: ["0%", "-50%"],
symbolSize: [21, 15],
itemStyle: {
borderColor: "#2fffa4",
color: "rgba(23, 237, 255, 1)",
},
},
],
};
};

View File

@ -560,11 +560,11 @@ const setChart = () => {
onBeforeMount(() => {
setTimeout(() => {
data.list = props.list;
pieData[0].value = data.list.nl5160;
pieData[1].value = data.list.nl6170;
pieData[2].value = data.list.nl7180;
pieData[3].value = data.list.nl8190;
pieData[4].value = data.list.nl91100;
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[4].value = data.list.nl100;
getOption();
setChart();

View File

@ -3,17 +3,43 @@
</template>
<script setup>
import { onMounted, reactive, ref } from "vue";
import {
onBeforeMount,
onMounted,
ref,
reactive,
defineProps,
watch,
nextTick,
} from "vue";
// echarts
import * as echarts from "echarts";
const props = defineProps({
list: {
type: Array,
default: () => {
return [];
},
},
});
const chart = ref(); // DOM
const data = [120, 200, 150, 80, 70];
const lineData = [150, 230, 224, 218, 135];
const max = data
.concat(lineData)
.reduce((pre, cur) => (pre > cur ? pre : cur), 0); //
const data = reactive({
list: [],
list1: [],
list2: [],
day: [],
option: {},
initialLegendData: ["上门服务时长", "上门服务次数"],
});
// const data1 = [120, 200, 150, 80, 70];
// const lineData = [150, 230, 224, 218, 135];
// const max = data
// .concat(lineData)
// .reduce((pre, cur) => (pre > cur ? pre : cur), 0); //
//
const color = [
{
@ -38,7 +64,8 @@ const color = [
],
},
];
const option = {
const getOption = () => {
data.option = {
color,
tooltip: {
trigger: "axis",
@ -46,7 +73,7 @@ const option = {
axisPointer: {},
},
legend: {
data: ["上门服务时长", "上门服务次数"],
data: data.initialLegendData,
// top: "8%",
textStyle: {
fontSize: 16,
@ -77,12 +104,12 @@ const option = {
axisTick: {
show: false, //
},
data: ["4.07", "4.08", "4.09", "4.10", "4.11"],
data: data.day,
},
{
type: "category",
show: false,
data: ["4.07", "4.08", "4.09", "4.10", "4.11"],
data: data.day,
},
],
yAxis: [
@ -178,7 +205,7 @@ const option = {
z: 1,
yAxisIndex: 0,
name: "上门服务时长",
data: data,
data: data.list1,
barWidth: 20,
type: "bar",
itemStyle: {
@ -207,7 +234,7 @@ const option = {
{
yAxisIndex: 1,
name: "上门服务次数",
data: lineData,
data: data.list2,
type: "line", //线
label: {
show: true,
@ -229,7 +256,7 @@ const option = {
itemStyle: {
color: "rgba(180, 180, 180, 0.2)", //
},
data: data.map(() => 100),
data: data.list1.map(() => 100),
barWidth: 40, //
emphasis: {
itemStyle: {
@ -260,7 +287,7 @@ const option = {
name: "上部1",
type: "pictorialBar",
symbolPosition: "end",
data: data,
data: data.list1,
symbol: "diamond",
symbolOffset: ["0%", "-50%"],
symbolSize: [22, 15],
@ -270,23 +297,49 @@ const option = {
},
},
],
};
};
// // 使
// 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);
};
const setChart1 = () => {
data.list1 = [];
data.list2 = [];
data.list.data.forEach((item) => {
data.list1.push(item.sc); //
data.list2.push(item.fwcs); //
});
};
// 使
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();
// });
onBeforeMount(() => {
setTimeout(() => {
data.list = props.list;
data.day = props.list.day;
// console.log(data.list, "");
setChart1();
getOption();
setChart();
}, 600);
});
</script>

View File

@ -243,12 +243,8 @@
<div class="serviceBox">
<div class="serviceTop">
<div class="visit">
<img
class="serviceimg"
src="@/assets/YLimg/ylimg8.png"
alt=""
/>
<ylSMFW></ylSMFW>
<img class="serviceimg" src="@/assets/YLimg/ylimg8.png" alt="" />
<ylSMFW :list="data.smfwcs"></ylSMFW>
</div>
<div class="medicalService">
<img
@ -433,6 +429,7 @@ const data = reactive({
yljgzlzx: { yljg: "", zlzx: "" },
zccs1: [],
zccs2: [],
smfwcs: [],
});
onBeforeMount(async () => {
getData();
@ -495,6 +492,7 @@ const getData = async () => {
data.yljgzlzx.yljg = res.data.yljgzlzx.yljg;
data.yljgzlzx.zlzx = res.data.yljgzlzx.zlzx;
//
data.smfwcs = res.data.zlfw.smfwcs;
//
res.data.zlfw.xzzccs.forEach((element) => {
data.zccs1.push(element.xzjd); //