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

This commit is contained in:
姚宇浩 2024-06-06 11:32:39 +08:00
commit a574e0eb16
6 changed files with 240 additions and 284 deletions

View File

@ -3,17 +3,34 @@
</template> </template>
<script setup> <script setup>
import { onMounted, reactive, ref } from "vue"; import {
onBeforeMount,
ref,
reactive,
defineProps,
watch,
nextTick,
} from "vue";
// echarts // echarts
import * as echarts from "echarts"; import * as echarts from "echarts";
const props = defineProps({
list: {
type: Array,
default: () => {
return [];
},
},
});
const chart = ref(); // DOM const chart = ref(); // DOM
const datas = { const data = reactive({
value: 92.96, list: 60,
}; option: {},
});
let option = { const getOption = () => {
data.option = {
series: [ series: [
// //
{ {
@ -63,7 +80,7 @@ let option = {
hoverAnimation: false, hoverAnimation: false,
data: [ data: [
{ {
value: datas.value, value: data.list,
label: { label: {
normal: { normal: {
position: "center", position: "center",
@ -111,7 +128,7 @@ let option = {
}, },
}, },
{ {
value: 100 - datas.value, value: 100 - data.list,
name: "", name: "",
itemStyle: { itemStyle: {
normal: { normal: {
@ -132,49 +149,20 @@ let option = {
}, },
], ],
}; };
// let option = { };
// tooltip: {
// trigger: 'item' const setChart = () => {
// }, var myChart = echarts.init(chart.value);
// legend: { myChart.setOption(data.option);
// top: '5%', };
// left: 'center'
// },
// series: [
// {
// name: 'Access From',
// type: 'pie',
// radius: ['40%', '70%'],
// center: ['50%', '70%'],
// // adjust the start and end angle
// startAngle: 180,
// endAngle: 360,
// data: [
// { value: 1048, name: 'Search Engine' },
// { value: 735, name: 'Direct' },
// { value: 580, name: 'Email' },
// { value: 484, name: 'Union Ads' },
// { value: 300, name: 'Video Ads' }
// ]
// }
// ]
// };
// 使 // 使
onMounted(() => { onBeforeMount(() => {
// domecharts setTimeout(() => {
// var myChart = echarts.init(document.getElementById('main')); data.list = props.list;
// Vue3 getOption();
var myChart = echarts.init(chart.value); setChart();
}, 600);
// init(); // vue3.2this
// 使
myChart.setOption(option);
// :
// window.addEventListener("resize", () => {
// myChart.resize();
// });
}); });
</script> </script>

View File

@ -3,17 +3,39 @@
</template> </template>
<script setup> <script setup>
import { onMounted, reactive, ref } from "vue"; import {
onBeforeMount,
onMounted,
ref,
reactive,
defineProps,
watch,
nextTick,
} from "vue";
// echarts // echarts
import * as echarts from "echarts"; import * as echarts from "echarts";
const props = defineProps({
list: {
type: Array,
default: () => {
return [];
},
},
});
const chart = ref(); // DOM const chart = ref(); // DOM
const datas = {
value: 62.16,
}
let option = {
const data = reactive({
list: 60,
option: {},
initialLegendData: ["特困救助金额", "低保救助金额"],
initialLegendData1: ["特困救助人次", "低保救助人次", "低边救助人次"],
});
const getOption = () => {
data.option = {
series: [ series: [
// //
{ {
@ -61,7 +83,7 @@ let option = {
center: ['55%', '55%'], center: ['55%', '55%'],
data: [ data: [
{ {
value: datas.value, value: data.list,
label: { label: {
normal: { normal: {
@ -102,7 +124,7 @@ let option = {
} }
}, },
{ {
value: 100 - datas.value, value: 100 - data.list,
name: '', name: '',
itemStyle: { itemStyle: {
normal: { normal: {
@ -122,22 +144,20 @@ let option = {
} }
] ]
}; };
};
const setChart = () => {
var myChart = echarts.init(chart.value);
myChart.setOption(data.option);
};
// 使 // 使
onMounted(() => { onBeforeMount(() => {
// domecharts setTimeout(() => {
// var myChart = echarts.init(document.getElementById('main')); data.list = props.list;
// Vue3 getOption();
var myChart = echarts.init(chart.value); setChart();
}, 600);
// init(); // vue3.2this
// 使
myChart.setOption(option);
// :
// window.addEventListener("resize", () => {
// myChart.resize();
// });
}); });
</script> </script>

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 = () => { const setChart = () => {
var myChart = echarts.init(chart.value); var myChart = echarts.init(chart.value);
myChart.setOption(data.option); myChart.setOption(data.option);
@ -324,12 +308,16 @@ const setChart = () => {
const setChart1 = () => { const setChart1 = () => {
data.list1 = []; data.list1 = [];
data.list2 = []; data.list2 = [];
// var myChart = echarts.init(chart.value);
// //
// myChart.showLoading();
if (data.list.length !== 0) { if (data.list.length !== 0) {
// console.log(data.list, "");
data.list.data.forEach((item) => { data.list.data.forEach((item) => {
data.list1.push(item.sc); // data.list1.push(item.sc); //
data.list2.push(item.fwcs); // data.list2.push(item.fwcs); //
}); });
// //
// myChart.hideLoading();
} }
}; };
@ -338,6 +326,7 @@ onBeforeMount(() => {
setTimeout(() => { setTimeout(() => {
data.list = props.list; data.list = props.list;
data.day = props.list.day; data.day = props.list.day;
console.log(data.list, "助老服务");
setChart1(); setChart1();
getOption(); getOption();
setChart(); setChart();

View File

@ -90,11 +90,7 @@
</div> </div>
</div> </div>
<div class="schoolb"> <div class="schoolb">
<img <img src="../assets/eduImg/xxgkTop.png" class="gkTop" alt="" />
src="../assets/eduImg/xxgkTop.png"
class="gkTop"
alt=""
>
<div class="grade"> <div class="grade">
<div class="schoolbs"> <div class="schoolbs">
<span class="spot">初中</span> <span class="spot">初中</span>
@ -191,11 +187,11 @@
<div class="czr-sl"> <div class="czr-sl">
<div class="historyimg historyimg1"> <div class="historyimg historyimg1">
<span>覆盖医疗机构数量</span> <span>覆盖医疗机构数量</span>
<span>22</span> <span>{{data.whistleblower.yljgsl}}</span>
</div> </div>
<div class="historyimg historyimg2"> <div class="historyimg historyimg2">
<span>启用角色数量</span> <span>启用角色数量</span>
<span>101</span> <span>{{data.whistleblower.qyjssl}}</span>
</div> </div>
<!-- <img src="@/assets/eduImg/jyImg14.png" alt="" /> <!-- <img src="@/assets/eduImg/jyImg14.png" alt="" />
<img src="@/assets/eduImg/jyImg15.png" alt="" /> --> <img src="@/assets/eduImg/jyImg15.png" alt="" /> -->
@ -206,7 +202,7 @@
<div class="earlyWarning"> <div class="earlyWarning">
<div class="earlyWarning1"> <div class="earlyWarning1">
<div> <div>
<span class="green">16</span> <span class="green">{{data.whistleblower.green}}</span>
</div> </div>
<img src="@/assets/eduImg/jyImg10.png" alt="" /> <img src="@/assets/eduImg/jyImg10.png" alt="" />
<img src="@/assets/eduImg/pp3.gif" alt="" class="ppImg" /> <img src="@/assets/eduImg/pp3.gif" alt="" class="ppImg" />
@ -216,7 +212,7 @@
</div> </div>
<div class="earlyWarning1"> <div class="earlyWarning1">
<div> <div>
<span class="yellow">239</span> <span class="yellow">{{data.whistleblower.yellow}}</span>
</div> </div>
<img src="@/assets/eduImg/jyImg9.png" alt="" /> <img src="@/assets/eduImg/jyImg9.png" alt="" />
<img src="@/assets/eduImg/pp2.gif" alt="" class="ppImg" /> <img src="@/assets/eduImg/pp2.gif" alt="" class="ppImg" />
@ -226,7 +222,7 @@
</div> </div>
<div class="earlyWarning1"> <div class="earlyWarning1">
<div> <div>
<span class="red">139</span> <span class="red">{{data.whistleblower.red}}</span>
</div> </div>
<img src="@/assets/eduImg/jyImg8.png" alt="" /> <img src="@/assets/eduImg/jyImg8.png" alt="" />
<img src="@/assets/eduImg/pp1.gif" alt="" class="ppImg" /> <img src="@/assets/eduImg/pp1.gif" alt="" class="ppImg" />
@ -460,6 +456,7 @@ const data = reactive({
xxgk: {}, xxgk: {},
xzncjszcsl: [], xzncjszcsl: [],
xzncxxsl: [[], []], xzncxxsl: [[], []],
whistleblower: {},
zzxm: [], zzxm: [],
schoolData: [ schoolData: [
{ name: "副高级", value: "" }, { name: "副高级", value: "" },
@ -485,6 +482,7 @@ const getData = async () => {
data.zdgz[1].value = res.data.zdgz.dszn; data.zdgz[1].value = res.data.zdgz.dszn;
data.zdgz[2].value = res.data.zdgz.dqjt; data.zdgz[2].value = res.data.zdgz.dqjt;
data.zdgz[3].value = res.data.zdgz.xsdb; data.zdgz[3].value = res.data.zdgz.xsdb;
//
// //
data.xxgk = res.data.xxgk; data.xxgk = res.data.xxgk;
// //
@ -498,8 +496,8 @@ const getData = async () => {
data.xzncjszcsl = res.data.xzncjszcsl; data.xzncjszcsl = res.data.xzncjszcsl;
// //
data.zzxm = res.data.zzxm; data.zzxm = res.data.zzxm;
// ratingBtn("");
// //
data.whistleblower = res.data.whistleblower;
} }
}); });
}; };

View File

@ -123,7 +123,7 @@
<div class="minTop"> <div class="minTop">
<div class="minTopPart"> <div class="minTopPart">
<div class="history2"> <div class="history2">
<div class="va">33.67</div> <div class="va">{{ data.jkda.jdfs }}</div>
<img <img
src="@/assets/images/hygiene/shang_left.png" src="@/assets/images/hygiene/shang_left.png"
alt="" alt=""
@ -144,20 +144,20 @@
<div class="minTopPart2"> <div class="minTopPart2">
<div class="left"> <div class="left">
<div class="leftImg"> <div class="leftImg">
<eP4></eP4> <eP4 :list="data.jkda.jdl"></eP4>
</div> </div>
<div class="left_me"> <div class="left_me">
<div>建档率</div> <div>建档率</div>
<div class="bo">92.96%</div> <div class="bo">{{ data.jkda.jdl }}%</div>
</div> </div>
</div> </div>
<div class="right"> <div class="right">
<div class="rightImg"> <div class="rightImg">
<eP4_1></eP4_1> <eP4_1 :list="data.jkda.jtysqyl"></eP4_1>
</div> </div>
<div class="right_me"> <div class="right_me">
<div>家庭医生签约率</div> <div>家庭医生签约率</div>
<div class="bo">62.16%</div> <div class="bo">{{ data.jkda.jtysqyl }}%</div>
</div> </div>
</div> </div>
</div> </div>
@ -293,7 +293,7 @@ const data = reactive({
medicalInsurance: {}, // medicalInsurance: {}, //
lmb: {}, // lmb: {}, //
mz: {}, // mz: {}, //
jkda: [], // jkda: {}, //
jsbgl: [], // jsbgl: [], //
fyglrs: {}, // fyglrs: {}, //
jktj: {}, //65 jktj: {}, //65
@ -345,7 +345,7 @@ const getData = async () => {
data.medicalInsurance = res.data.medicalInsurance; data.medicalInsurance = res.data.medicalInsurance;
data.lmb = res.data.lmb; data.lmb = res.data.lmb;
data.mz = res.data.mz; data.mz = res.data.mz;
// data.jkda = res.data.jkda; data.jkda = res.data.jkda;
data.jsbgl = res.data.jsbgl; data.jsbgl = res.data.jsbgl;
data.fyglrs = res.data.fyglrs; data.fyglrs = res.data.fyglrs;
data.jktj = res.data.jktj; data.jktj = res.data.jktj;

View File

@ -48,10 +48,7 @@
:year="data.leftTopYear" :year="data.leftTopYear"
></ePie2> ></ePie2>
</div> </div>
<div <div class="flex1" style="margin-top: 10px">
class="flex1"
style="margin-top: 10px"
>
<div class="yd_title left_2"> <div class="yd_title left_2">
<div class="animate-border"> <div class="animate-border">
<i></i> <i></i>
@ -97,10 +94,7 @@
:year="data.leftCenterYear" :year="data.leftCenterYear"
/> />
</div> </div>
<div <div class="flex1" style="margin-top: 10px">
class="flex1"
style="margin-top: 10px"
>
<div class="yd_title left_3"> <div class="yd_title left_3">
<div class="animate-border"> <div class="animate-border">
<i></i> <i></i>
@ -193,19 +187,9 @@
<div> <div>
<span>{{ data.yljgzlzx.yljg }}<span class="unit"></span></span> <span>{{ data.yljgzlzx.yljg }}<span class="unit"></span></span>
</div> </div>
<img <img src="@/assets/YLimg/ylimg11.png" alt="" />
src="@/assets/YLimg/ylimg11.png" <img class="historyimg" src="@/assets/YLimg/ylimg5.png" alt="" />
alt="" <img src="@/assets/YLimg/yljg.gif" class="historyMoveImg" />
/>
<img
class="historyimg"
src="@/assets/YLimg/ylimg5.png"
alt=""
/>
<img
src="@/assets/YLimg/yljg.gif"
class="historyMoveImg"
/>
</div> </div>
<!-- <div class="history1"> <!-- <div class="history1">
<div> <div>
@ -218,19 +202,9 @@
<div> <div>
<span>{{ data.yljgzlzx.zlzx }}<span class="unit"></span></span> <span>{{ data.yljgzlzx.zlzx }}<span class="unit"></span></span>
</div> </div>
<img <img src="@/assets/YLimg/ylimg12.png" alt="" />
src="@/assets/YLimg/ylimg12.png" <img class="historyimg" src="@/assets/YLimg/ylimg10.png" alt="" />
alt="" <img src="@/assets/YLimg/yljg.gif" class="historyMoveImg" />
/>
<img
class="historyimg"
src="@/assets/YLimg/ylimg10.png"
alt=""
/>
<img
src="@/assets/YLimg/yljg.gif"
class="historyMoveImg"
/>
</div> </div>
</div> </div>
</div> </div>
@ -244,30 +218,14 @@
<div class="serviceBox"> <div class="serviceBox">
<div class="serviceTop"> <div class="serviceTop">
<div class="visit"> <div class="visit">
<img <img class="serviceimg" src="@/assets/YLimg/ylimg8.png" alt="" />
class="serviceimg"
src="@/assets/YLimg/ylimg8.png"
alt=""
/>
<ylSMFW v-if="showR" :list="data.smfwcs"></ylSMFW> <ylSMFW v-if="showR" :list="data.smfwcs"></ylSMFW>
</div> </div>
<div class="medicalService"> <div class="medicalService">
<img <img class="serviceimg" src="@/assets/YLimg/ylimg9.png" alt="" />
class="serviceimg" <img class="moveYl" src="@/assets/YLimg/turn.gif" alt="" />
src="@/assets/YLimg/ylimg9.png"
alt=""
/>
<img
class="moveYl"
src="@/assets/YLimg/turn.gif"
alt=""
/>
<div class="medicalServiceTop"> <div class="medicalServiceTop">
<img <img class="ylimg" src="@/assets/YLimg/ylimg1.png" alt="" />
class="ylimg"
src="@/assets/YLimg/ylimg1.png"
alt=""
/>
<span>36,234</span> <span>36,234</span>
</div> </div>
</div> </div>
@ -332,7 +290,7 @@ const leftchoose = ref({
second: "1", second: "1",
third: "1", third: "1",
}); });
const showR=ref(false) const showR = ref(false);
// //
const dialogShow = ref(false); const dialogShow = ref(false);
const tableType = reactive({ const tableType = reactive({
@ -442,7 +400,10 @@ const data = reactive({
yljgzlzx: { yljg: "", zlzx: "" }, yljgzlzx: { yljg: "", zlzx: "" },
zccs1: [], zccs1: [],
zccs2: [], zccs2: [],
smfwcs: [], smfwcs: {
data: [{ nf: "2024", yf: "5", rq: "22", fwcs: "16", sc: "22" }],
day: ["5.22"],
},
}); });
onBeforeMount(() => { onBeforeMount(() => {
getData(); getData();
@ -451,6 +412,7 @@ onBeforeMount( () => {
const getData = () => { const getData = () => {
http.get("/api/ggfwyth/yl").then((res) => { http.get("/api/ggfwyth/yl").then((res) => {
if (res.code == 200) { if (res.code == 200) {
console.log(res.data, "养老");
// //
// //
res.data.endowmentInsurance.ffrc.forEach((element) => { res.data.endowmentInsurance.ffrc.forEach((element) => {
@ -506,7 +468,6 @@ const getData = () => {
data.yljgzlzx.zlzx = res.data.yljgzlzx.zlzx; data.yljgzlzx.zlzx = res.data.yljgzlzx.zlzx;
// //
data.smfwcs = res.data.zlfw.smfwcs; data.smfwcs = res.data.zlfw.smfwcs;
console.log(data.smfwcs,6666);
// //
res.data.zlfw.xzzccs.forEach((element) => { res.data.zlfw.xzzccs.forEach((element) => {
data.zccs1.push(element.xzjd); // data.zccs1.push(element.xzjd); //