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

This commit is contained in:
姚宇浩 2024-04-15 17:00:05 +08:00
commit 61ef83027b
4 changed files with 339 additions and 195 deletions

View File

@ -9,33 +9,80 @@ import * as echarts from "echarts";
const chart = ref(); // DOM
let option = {
const data = [120, 200, 150, 80, 70, 110, 130];
const lineData = [150, 230, 224, 218, 135, 147, 260];
const max = data
.concat(lineData)
.reduce((pre, cur) => (pre > cur ? pre : cur), 0); //
//
const color = [
{
type: "linear",
x: 0,
x2: 0,
y: 0,
y2: 1,
colorStops: [
{
offset: 0,
color: "rgba(142, 187, 255, 1)",
},
{
offset: 0.5,
color: "rgba(142, 187, 255, 0.5)",
},
{
offset: 1,
color: "rgba(142, 187, 255, 0.20)",
},
],
},
];
const option = {
tooltip: {
trigger: "axis",
formatter: "{b0}<br/> {a0}:{c0}<br/>{a1}:{c1}",
axisPointer: {
type: "cross",
label: {
backgroundColor: "#ff0000", //
backgroundColor: "#3F82F7", //
},
},
},
legend: {
data: ["计划生育人数", "计划生育补贴金额"],
top: "8%",
textStyle: {
fontSize: 12,
color: "#ccc",
},
},
grid: {
left: "3%",
right: "4%",
bottom: "3%",
right: "6%",
bottom: "0%",
containLabel: true,
color: "#ffffff",
},
calculable: true,
color: "rgba(0, 252, 255, 1)",
// color: "rgba(0, 252, 255, 1)",
color,
xAxis: [
{
// type: "category",
// scale: true,
type: "category",
// name: "/",
axisLabel: {
//
textStyle: {
color: "#ccc",
},
},
data: ["2019", "2020", "2021", "2022", "2023"],
},
{
type: "category",
show: false,
data: ["2019", "2020", "2021", "2022", "2023"],
},
],
@ -44,55 +91,86 @@ let option = {
type: "value",
scale: true,
name: "计划生育人数",
color: "rgba(255, 252, 0, 1)",
max: max,
splitLine: {
show: false,
lineStyle: {
color: "rgba(226, 226, 226, 0.3)",
width: 1,
},
},
axisLabel: {
//
textStyle: {
color: "#ccc",
},
},
},
{
type: "value",
scale: true,
name: "计划生育补贴金额/元",
position: "right",
max: 1200,
min: 0,
boundaryGap: [0.2, 0.2]
// alignTicks: true,
// offset: 80,
// axisLine: {
// show: true,
// lineStyle: {
// color: colors[1]
// }
// },
// axisLabel: {
// formatter: '{value} ml'
// }
max: max,
splitLine: {
show: false,
lineStyle: {
color: "rgba(226, 226, 226, 0.3)",
width: 1,
},
},
axisLabel: {
//
textStyle: {
color: "#ccc",
},
},
// max: 300,
// position: "right",
// boundaryGap: [0.2, 0.2]
},
],
series: [
{
name: "计划生育人数",
data: data,
barWidth: 20,
type: "bar",
data: [2.0, 4.9, 7.0, 23.2, 25.6],
showBackground: true,
backgroundStyle: {
color: "rgba(180, 180, 180, 0.2)",
},
itemStyle: {
color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
{ offset: 0, color: "#83bff6" },
{ offset: 0.5, color: "#188df0" },
{ offset: 1, color: "#188df0" },
]),
}, //
},
{
name: "计划生育补贴金额",
data: lineData,
type: "line", //线
data: [2.6, 5.9, 9.0, 16.4, 28.7],
showBackground: true,
backgroundStyle: {
color: "rgba(180, 180, 180, 0.2)",
},
{
xAxisIndex: 1,
itemStyle: {
color: "rgba(180, 180, 180, 0.2)", //
},
data: data.map(() => max),
barWidth: 40, //
emphasis: {
itemStyle: {
color: {
type: "linear",
x: 0,
x2: 0,
y: 0,
y2: 1,
colorStops: [
{
offset: 0,
color: "rgba(64, 247, 176, 0.25)",
},
{
offset: 1,
color: "rgba(17, 34, 64, 0.25)",
},
],
},
},
},
type: "bar",
},
],
};

View File

@ -9,34 +9,81 @@ import * as echarts from "echarts";
const chart = ref(); // DOM
let option = {
const data = [120, 200, 150, 80, 70, 110, 130];
const lineData = [150, 230, 224, 218, 135, 147, 260];
const max = data
.concat(lineData)
.reduce((pre, cur) => (pre > cur ? pre : cur), 0); //
//
const color = [
{
type: "linear",
x: 0,
x2: 0,
y: 0,
y2: 1,
colorStops: [
{
offset: 0,
color: "rgba(142, 187, 255, 1)",
},
{
offset: 0.5,
color: "rgba(142, 187, 255, 0.5)",
},
{
offset: 1,
color: "rgba(142, 187, 255, 0.20)",
},
],
},
];
const option = {
tooltip: {
trigger: "axis",
formatter: "{b0}<br/> {a0}:{c0}<br/>{a1}:{c1}",
axisPointer: {
type: "cross",
label: {
backgroundColor: "#ff0000", //
backgroundColor: "#3F82F7", //
},
},
},
legend: {
data: ["上门服务时长", "上门服务次数"],
top: "8%",
textStyle: {
fontSize: 12,
color: "#ccc",
},
},
grid: {
left: "3%",
right: "4%",
bottom: "3%",
right: "6%",
bottom: "0%",
containLabel: true,
color: "#ffffff",
},
calculable: true,
color: "rgba(0, 252, 255, 1)",
// color: "rgba(0, 252, 255, 1)",
color,
xAxis: [
{
// type: "category",
// scale: true,
// name: "",
data: ["4-07", "4-08", "4-09", "4-10", "4-11"],
type: "category",
// name: "/",
axisLabel: {
//
textStyle: {
color: "#ccc",
},
},
data: ["4.07", "4.08", "4.09", "4.10", "4.11"],
},
{
type: "category",
show: false,
data: ["4.07", "4.08", "4.09", "4.10", "4.11"],
},
],
yAxis: [
@ -44,55 +91,86 @@ let option = {
type: "value",
scale: true,
name: "上门服务时长",
color: "rgba(255, 252, 0, 1)",
max: max,
splitLine: {
show: false,
lineStyle: {
color: "rgba(226, 226, 226, 0.3)",
width: 1,
},
},
axisLabel: {
//
textStyle: {
color: "#ccc",
},
},
},
{
type: "value",
scale: true,
name: "上门服务次数",
position: "right",
max: 1200,
min: 0,
boundaryGap: [0.2, 0.2]
// alignTicks: true,
// offset: 80,
// axisLine: {
// show: true,
// lineStyle: {
// color: colors[1]
// }
// },
// axisLabel: {
// formatter: '{value} ml'
// }
max: max,
splitLine: {
show: false,
lineStyle: {
color: "rgba(226, 226, 226, 0.3)",
width: 1,
},
},
axisLabel: {
//
textStyle: {
color: "#ccc",
},
},
// max: 300,
// position: "right",
// boundaryGap: [0.2, 0.2]
},
],
series: [
{
name: "上门服务时长",
data: data,
barWidth: 20,
type: "bar",
data: [2.0, 4.9, 7.0, 23.2, 25.6],
showBackground: true,
backgroundStyle: {
color: "rgba(180, 180, 180, 0.2)",
},
itemStyle: {
color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
{ offset: 0, color: "#83bff6" },
{ offset: 0.5, color: "#188df0" },
{ offset: 1, color: "#188df0" },
]),
}, //
},
{
name: "上门服务次数",
data: lineData,
type: "line", //线
data: [2.6, 5.9, 9.0, 16.4, 28.7],
showBackground: true,
backgroundStyle: {
color: "rgba(180, 180, 180, 0.2)",
},
{
xAxisIndex: 1,
itemStyle: {
color: "rgba(180, 180, 180, 0.2)", //
},
data: data.map(() => max),
barWidth: 40, //
emphasis: {
itemStyle: {
color: {
type: "linear",
x: 0,
x2: 0,
y: 0,
y2: 1,
colorStops: [
{
offset: 0,
color: "rgba(64, 247, 176, 0.25)",
},
{
offset: 1,
color: "rgba(17, 34, 64, 0.25)",
},
],
},
},
},
type: "bar",
},
],
};

View File

@ -1,5 +1,5 @@
<template>
<div ref="chart" style="width: 100%; height: 220px"></div>
<div ref="chart" style="width: 100%; height: 150px"></div>
</template>
<script setup>
@ -7,98 +7,103 @@ import { onMounted, reactive, ref } from "vue";
// echarts
import * as echarts from "echarts";
const chart = ref(); // DOM
const chart = ref(null); // DOM
const data = [
"大街乡",
"社阳乡",
"沐尘畲族乡",
"庙下乡",
"溪口镇",
"罗家乡",
"罗家乡",
"罗家乡",
"罗家乡",
"罗家乡",
"罗家乡",
];
let zoomShow = false;
if (data.length > 7) {
zoomShow = true;
} else {
zoomShow = false;
}
let option = {
tooltip: {
trigger: "axis",
axisPointer: {
type: "shadow",
label: {
backgroundColor: "#ff0000", //
},
},
},
legend: {
data: ["计划生育人数", "计划生育补贴金额"],
},
legend: {},
grid: {
top: "-2%",
left: "3%",
right: "4%",
bottom: "3%",
containLabel: true,
color: "#ffffff",
},
calculable: true,
color: "rgba(0, 252, 255, 1)",
xAxis: [
// {
// // type: "category",
// // scale: true,
// // name: "/",
// },
dataZoom: [
{
type: "value",
scale: true,
name: "计划生育人数",
color: "rgba(255, 252, 0, 1)",
show: zoomShow,
type: "inside",
startValue: 0,
endValue: 2,
minValueSpan: 2,
maxValueSpan: 2,
yAxisIndex: [0],
zoomOnMouseWheel: false, //
moveOnMouseWheel: true, //
moveOnMouseMove: true, //
},
{
type: "value",
scale: true,
name: "计划生育补贴金额/元",
position: "right",
max: 1200,
min: 0,
boundaryGap: [0.2, 0.2]
// alignTicks: true,
// offset: 80,
// axisLine: {
// show: true,
// lineStyle: {
// color: colors[1]
// }
// },
// axisLabel: {
// formatter: '{value} ml'
// }
show: zoomShow,
type: "slider",
realtime: true,
startValue: 0,
endValue: 2,
width: "3.5",
height: "80%",
yAxisIndex: [0], // y
fillerColor: "rgba(154, 181, 215, 1)", //
borderColor: "rgba(17, 100, 210, 0.12)",
backgroundColor: "#cfcfcf", //
handleSize: 0, //
showDataShadow: false, // auto
showDetail: false, //
top: "1%",
right: "5",
},
],
calculable: true,
color: "rgba(0, 252, 255, 1)",
xAxis: {},
yAxis: {
type: 'category',
data: ["2019", "2020", "2021", "2022", "2023"],
}
,
type: "category",
data: data,
},
series: [
{
name: "计划生育人数",
type: "bar",
data: [2.0, 4.9, 7.0, 23.2, 25.6],
showBackground: true,
backgroundStyle: {
color: "rgba(180, 180, 180, 0.2)",
},
data: [2, 4, 7, 23, 25, 250],
itemStyle: {
color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
{ offset: 0, color: "rgba(26,255,217,0)" },
{ offset: 0.5, color: "#00B7FF" },
{ offset: 1, color: "#00B7FF" },
]), //
borderRadius: [0, 0, 50, 0],
},
},
{
name: "计划生育补贴金额",
type: "line", //线
data: [2.6, 5.9, 9.0, 16.4, 28.7],
showBackground: true,
backgroundStyle: {
color: "rgba(180, 180, 180, 0.2)",
normal: {
color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
{
offset: 0,
color: "rgba(5, 213, 255, 1)", // 0%
},
{
offset: 0.98,
color: "rgba(5, 213, 255, 0)", // 100%
},
]), //
// borderColor: "#00B7FF", //
// borderWidth: 5,
borderRadius: [0, 0, 50, 0], //
},
},
},
],

View File

@ -109,52 +109,17 @@
<div class="yd_title familyPlanning">
<!-- <span class="text">计划生育</span> -->
</div>
<!-- <div class="visitLog">
<div class="visitLog_item">
<img src="../assets/img_02.png" width="48px" height="51px" alt="" />
<div class="visitLog_item_box">
<h4>故居走访</h4>
<p>走访人员陈思思</p>
<p>走访时间2023-03-19 09:00:03</p>
</div>
<span class="check">点击查看</span>
</div>
<div class="visitLog_item">
<img src="../assets/img_02.png" width="48px" height="51px" alt="" />
<div class="visitLog_item_box">
<h4>节日走访</h4>
<p>走访人员陈思思</p>
<p>走访时间2023-03-19 09:00:03</p>
</div>
<span class="check">点击查看</span>
</div>
<div class="visitLog_item">
<img src="../assets/img_02.png" width="48px" height="51px" alt="" />
<div class="visitLog_item_box">
<h4>新年走访</h4>
<p>走访人员陈思思</p>
<p>走访时间2023-03-19 09:00:03</p>
</div>
<span class="check">点击查看</span>
</div>
</div> -->
<div style="width: 490px; height: 400px">
<div style="width: 100%; height: 280px">
<ylJHSY></ylJHSY>
</div>
</div>
</div>
<div class="displayFlex">
<div class="displayFlex center_bg">
<div class="flex2">
<div class="yd_title mechanism">
<!-- <span class="text">养老机构</span> -->
</div>
<div class="history">
<!-- <p>2002年至2009年担任浙江大学计算机学院和软件学院院长</p>
<p>1984年获得浙江大学计算机应用专业硕士学位之后留校任教</p>
<p>1990年获得浙江大学计算机应用专业博士学位</p>
<p>1994年至1996年担任浙江大学计算机系副系主任</p>
<p>1997年至2002年担任浙江大学计算机系系主任</p>
<p>2002年至2009年担任浙江大学计算机学院和软件学院院长</p> -->
<div class="history1">
<div>
<span>16<span class="unit"></span></span>
@ -186,7 +151,7 @@
<div class="serviceTop">
<div class="visit">
<img class="serviceimg" src="@/assets/YLimg/ylimg8.png" alt="" />
<div style="width: 290px">
<div style="width: 340px;height: 220px">
<ylSMFW></ylSMFW>
</div>
</div>
@ -199,8 +164,12 @@
</div>
</div>
<div class="mealAssistance">
<img class="mealAssistanceimg" src="@/assets/YLimg/ylimg7.png" alt="" />
<div style="width: 490px">
<img
class="mealAssistanceimg"
src="@/assets/YLimg/ylimg7.png"
alt=""
/>
<div style="width: 490px;height: 150px">
<ylXZZC></ylXZZC>
</div>
</div>
@ -241,7 +210,8 @@ const change = (name, index) => {
height: 90vh;
display: flex;
flex-direction: column;
flex: 1;
// flex: 1;
width: 33.333333333%;
}
.flex1 {
@ -284,19 +254,26 @@ const change = (name, index) => {
.familyPlanning {
background-image: url(@/assets/YLTitle/titleImg9.png);
background-repeat: no-repeat;
background-size: 100% 100%;
}
.mechanism {
background-image: url(@/assets/YLTitle/titleImg10.png);
background-repeat: no-repeat;
background-size: 100% 100%;
}
.service {
background-image: url(@/assets/YLTitle/titleImg11.png);
background-repeat: no-repeat;
background-size: 100% 100%;
}
.serviceBox {
display: flex;
flex-direction: column;
box-sizing: border-box;
.serviceimg {
width: 182px;
@ -306,15 +283,21 @@ const change = (name, index) => {
.serviceTop {
display: flex;
justify-content: space-between;
padding: 10px 36px 0px 20px ;
box-sizing: border-box;
.visit {
display: flex;
flex-direction: column;
align-items: center;
}
.medicalService {
display: flex;
flex-direction: column;
align-items: center;
.ylimg {
width: 205px;
height: 239px;
width: 200px;
height: 220px;
}
.medicalServiceTop {
@ -322,10 +305,10 @@ const change = (name, index) => {
span {
position: absolute;
left: 38px;
left: 39px;
top: 35%;
font-weight: bold;
font-size: 36px;
font-size: 32px;
color: #ffffff;
line-height: 41px;
letter-spacing: 1px;
@ -491,7 +474,7 @@ const change = (name, index) => {
.history {
padding-top: 12px;
display: flex;
justify-content: space-around;
.history1 {
font-size: 26px;
color: #ffffff;