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

This commit is contained in:
姚宇浩 2024-06-04 13:42:20 +08:00
commit cbf2c9ae0d
12 changed files with 278 additions and 144 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 39 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 56 KiB

After

Width:  |  Height:  |  Size: 8.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 40 KiB

BIN
src/assets/ylMove.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 38 KiB

View File

@ -164,6 +164,7 @@ onMounted(() => {
display: flex;
position: absolute;
align-items: center;
z-index: 2;
}
&-left {

View File

@ -302,7 +302,7 @@ onBeforeMount(() => {
setTimeout(() => {
data.list = props.list;
setChart1();
console.log(data.list, "教育");
// console.log(data.list, "");
getOption();
setChart();
}, 600);

View File

@ -37,7 +37,7 @@ const data = reactive({
list3: [],
lineData: [],
lineData1: [],
year: [],
month: [],
option: {},
initialLegendData: ["特困救助金额", "低保救助金额"],
initialLegendData1: ["特困救助人次", "低保救助人次", "低边救助人次"],
@ -72,7 +72,7 @@ const getOption = () => {
tooltip: {
trigger: "axis",
formatter:
"{b0}<br/> {a0}:{c0}<br/>{a1}:{c1}<br/>{a2}:{c2}<br/>{a3}:{c3}<br/>{a4}:{c4}",
"{b0}<br/> {a0}:{c0}<br/>{a1}:{c1}<br/>{a2}:{c2}<br/>{a3}:{c3}<br/>{a4}:{c4}",
},
legend: [
{
@ -118,12 +118,12 @@ const getOption = () => {
axisTick: {
show: false, //
},
data: data.year,
data: data.month,
},
{
type: "category",
show: false,
data: data.year,
data: data.month,
},
],
yAxis: [
@ -354,7 +354,7 @@ const getOption = () => {
itemStyle: {
color: "rgba(180, 180, 180, 0.2)", //
},
data: data.list.subsidyInformation.map(() => 100),
data: data.list.data.map(() => 100),
barWidth: 60, //
emphasis: {
itemStyle: {
@ -436,21 +436,20 @@ const setChart1 = () => {
data.list3 = [];
data.lineData = [];
data.lineData1 = [];
data.list.subsidyInformation.forEach((item) => {
data.list1.push(item.btsx); //
data.list2.push(item.btje1); //
data.list3.push(item.btje2); //
data.lineData.push(item.btje3); //
data.lineData1.push(item.btje4); //
data.list.data.forEach((item) => {
data.lineData.push(item.tkjzje); //
data.lineData1.push(item.dbjzje); //
data.list1.push(item.tkjzrs); //
data.list2.push(item.dbjzrs); //
data.list3.push(item.dibianJzrs); //
});
// console.log("2", data.list1, data.list2);
};
// 使
onBeforeMount(() => {
setTimeout(() => {
data.list = props.list;
data.year = props.list.year;
data.month = props.list.month;
// console.log(data.list, "");
setChart1();
getOption();

View File

@ -250,11 +250,11 @@ onBeforeMount(async () => {
});
onMounted(() => {
startAutoScroll();
console.log(
mainRef.value.scrollTop,
mainRef.value.scrollHeight,
mainRef.value.clientHeight
);
// console.log(
// mainRef.value.scrollTop,
// mainRef.value.scrollHeight,
// mainRef.value.clientHeight
// );
});
const getData = async () => {
await http.get("/api/ggfwyth/health").then((res) => {

View File

@ -16,16 +16,13 @@
</div>
<div class="item_content">
<div class="sr">
<span class="left">收入</span
><span class="right"
>{{ data.LivelihoodWelfare.zgylbxzsr }}万元</span
>
<span class="left">收入</span><span class="right">{{ data.LivelihoodWelfare.zgylbxzsr }}万元</span>
</div>
<div class="sr" style="margin-top: 5px">
<span class="left">支出</span
><span class="right"
>{{ data.LivelihoodWelfare.zgylbxzzc }}万元</span
<div
class="sr"
style="margin-top: 5px"
>
<span class="left">支出</span><span class="right">{{ data.LivelihoodWelfare.zgylbxzzc }}万元</span>
</div>
</div>
</div>
@ -33,16 +30,13 @@
<div class="item_title"><span class="blue">工伤</span>保险</div>
<div class="item_content">
<div class="sr">
<span class="left">收入</span
><span class="right"
>{{ data.LivelihoodWelfare.gsbxzsr }}万元</span
>
<span class="left">收入</span><span class="right">{{ data.LivelihoodWelfare.gsbxzsr }}万元</span>
</div>
<div class="sr" style="margin-top: 5px">
<span class="left">支出</span
><span class="right"
>{{ data.LivelihoodWelfare.gsbxzzc }}万元</span
<div
class="sr"
style="margin-top: 5px"
>
<span class="left">支出</span><span class="right">{{ data.LivelihoodWelfare.gsbxzzc }}万元</span>
</div>
</div>
</div>
@ -52,16 +46,13 @@
</div>
<div class="item_content">
<div class="sr">
<span class="left">收入</span
><span class="right"
>{{ data.LivelihoodWelfare.cxylbxzsr }}万元</span
>
<span class="left">收入</span><span class="right">{{ data.LivelihoodWelfare.cxylbxzsr }}万元</span>
</div>
<div class="sr" style="margin-top: 5px">
<span class="left">支出</span
><span class="right"
>{{ data.LivelihoodWelfare.cxylbxzzc }}万元</span
<div
class="sr"
style="margin-top: 5px"
>
<span class="left">支出</span><span class="right">{{ data.LivelihoodWelfare.cxylbxzzc }}万元</span>
</div>
</div>
</div>
@ -71,16 +62,13 @@
</div>
<div class="item_content">
<div class="sr">
<span class="left">收入</span
><span class="right"
>{{ data.LivelihoodWelfare.zgyilbxzsr }}万元</span
>
<span class="left">收入</span><span class="right">{{ data.LivelihoodWelfare.zgyilbxzsr }}万元</span>
</div>
<div class="sr" style="margin-top: 5px">
<span class="left">支出</span
><span class="right"
>{{ data.LivelihoodWelfare.zgyilbxzzc }}万元</span
<div
class="sr"
style="margin-top: 5px"
>
<span class="left">支出</span><span class="right">{{ data.LivelihoodWelfare.zgyilbxzzc }}万元</span>
</div>
</div>
</div>
@ -90,16 +78,13 @@
</div>
<div class="item_content">
<div class="sr">
<span class="left">收入</span
><span class="right"
>{{ data.LivelihoodWelfare.cxyilbxzsr }}万元</span
>
<span class="left">收入</span><span class="right">{{ data.LivelihoodWelfare.cxyilbxzsr }}万元</span>
</div>
<div class="sr" style="margin-top: 5px">
<span class="left">支出</span
><span class="right"
>{{ data.LivelihoodWelfare.cxyilbxzzc }}万元</span
<div
class="sr"
style="margin-top: 5px"
>
<span class="left">支出</span><span class="right">{{ data.LivelihoodWelfare.cxyilbxzzc }}万元</span>
</div>
</div>
</div>
@ -116,7 +101,10 @@
</div>
</div>
</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>
@ -141,35 +129,41 @@
<div class="left_2_bottom_item">
<div class="left_2_bottom_item_shang">
<div class="left">
<span class="span1">{{ jysyList[0].title }}</span
>学校师生比
<span class="span1">{{ jysyList[0].title }}</span>学校师生比
</div>
<div class="right">
<span class="span1">{{ jysyList[0].teacher }}</span
>:{{ jysyList[0].student }}
<span class="span1">{{ jysyList[0].teacher }}</span>:{{ jysyList[0].student }}
</div>
</div>
<div class="left_2_bottom_item_xia">
<div class="csbl" :style="cs"></div>
<div
class="csbl"
:style="cs"
></div>
</div>
</div>
<div class="left_2_bottom_item">
<div class="left_2_bottom_item_shang">
<div class="left">
<span class="span2">{{ jysyList[1].title }}</span
>学校师生比
<span class="span2">{{ jysyList[1].title }}</span>学校师生比
</div>
<div class="right">
{{ jysyList[1].teacher }}:{{ jysyList[1].student }}
</div>
</div>
<div class="left_2_bottom_item_xia">
<div class="ncbl" :style="nc"></div>
<div
class="ncbl"
:style="nc"
></div>
</div>
</div>
</div>
</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>
@ -183,6 +177,7 @@
>
<div>{{ data.employmentService.jypx }}</div>
<div>就业培训</div>
<div class="moveImg"></div>
</div>
<div
class="left_3_1_item"
@ -190,6 +185,7 @@
>
<div>{{ data.employmentService.jyjxfw }}</div>
<div>就业见习服务</div>
<div class="moveImg"></div>
</div>
<div
class="left_3_1_item"
@ -197,6 +193,7 @@
>
<div>{{ data.employmentService.jyyz }}</div>
<div>就业援助</div>
<div class="moveImg"></div>
</div>
</div>
</div>
@ -204,24 +201,44 @@
<div class="displayFlex center_bg">
<div class="flex1">
<div class="people_total">
<img
src="../assets/images/sy/主页人口.gif"
style="width:70%;height:112%; margin: -2% 15%;"
alt=""
>
<div class="people_total_item left">
<div class="number">{{ data.PopulationData.man }}</div>
<img src="../assets/images/sy/man.png" alt="" />
<img
src="../assets/images/sy/man.png"
alt=""
/>
<div class="sex">男性人口</div>
</div>
<div class="people_total_item2 center">
<img src="../assets/images/sy/people_total.png" alt="" />
<img
src="../assets/images/sy/people_total.png"
alt=""
/>
<div class="number">{{ data.PopulationData.rkzs }}</div>
<div class="total">人口总数</div>
</div>
<div class="people_total_item right">
<div class="number">{{ data.PopulationData.woman }}</div>
<img src="../assets/images/sy/woman.png" alt="" />
<img
src="../assets/images/sy/woman.png"
alt=""
/>
<div class="sex">女性人口</div>
</div>
</div>
<ePie2 style="margin-top: 20px" :list="data.ageRatio"></ePie2>
<ePie style="margin-bottom: 20px" :list="data.ageGroup"></ePie>
<ePie2
style="margin-top: 20px"
:list="data.ageRatio"
></ePie2>
<ePie
style="margin-bottom: 20px"
:list="data.ageGroup"
></ePie>
<div class="table">
<div class="table_choose">
<div
@ -251,13 +268,20 @@
:header-cell-style="tableHeaderColor"
v-if="choose == '1'"
>
<el-table-column prop="company" label="企业名称" width="200" />
<el-table-column
prop="company"
label="企业名称"
width="200"
/>
<el-table-column
prop="address"
label="项目事项牵头单位"
width="200"
/>
<el-table-column prop="finish" label="完成情况">
<el-table-column
prop="finish"
label="完成情况"
>
<template #default="scope">
<div
style="letter-spacing: 3px"
@ -268,36 +292,57 @@
</template>
</el-table-column>
</el-table>
<div class="zwfw" v-if="choose == '3'">
<div
class="zwfw"
v-if="choose == '3'"
>
<div class="shang">
<div class="shang_item">
<div class="title">一网通办事</div>
<div class="i"><zwfw1 /></div>
<div class="i">
<zwfw1 />
</div>
</div>
<div class="shang_item">
<div class="title">超期受理率</div>
<div class="i"><zwfw2 /></div>
<div class="i">
<zwfw2 />
</div>
</div>
<div class="shang_item">
<div class="title">超期办理率</div>
<div class="i"><zwfw3 /></div>
<div class="i">
<zwfw3 />
</div>
</div>
</div>
<div class="xia">
<div class="xia_item">
<img class="left" src="@/assets/images/sy/zwfw_sl.png" />
<img
class="left"
src="@/assets/images/sy/zwfw_sl.png"
/>
<div class="right">
<div class="name">平均受理时长</div>
<img class="line" src="@/assets/images/sy/zwfw_line.png" />
<img
class="line"
src="@/assets/images/sy/zwfw_line.png"
/>
<div class="time"><span>0.22</span>小时</div>
</div>
</div>
<div class="fgx"></div>
<div class="xia_item">
<img class="left" src="@/assets/images/sy/zwfw_bl.png" />
<img
class="left"
src="@/assets/images/sy/zwfw_bl.png"
/>
<div class="right">
<div class="name">平均办理时长</div>
<img class="line" src="@/assets/images/sy/zwfw_line.png" />
<img
class="line"
src="@/assets/images/sy/zwfw_line.png"
/>
<div class="time"><span>0.54</span>小时</div>
</div>
</div>
@ -325,7 +370,10 @@
</div>
</div>
</div>
<div class="flex1" style="margin-top: 10px">
<div
class="flex1"
style="margin-top: 10px"
>
<div class="yd_title service">
<div class="animate-border">
<i></i>
@ -345,7 +393,10 @@
</div>
</div>
</div>
<div class="flex1" style="margin-top: 10px">
<div
class="flex1"
style="margin-top: 10px"
>
<div class="yd_title last">
<div class="animate-border">
<i></i>
@ -362,12 +413,18 @@
{{ item.value }}<span>{{ item.dw ? item.dw : "" }}</span>
</div>
<img :src="item.img" />
<img src="../assets/images/sy/tyBon.png" style="margin-top: -60px;">
<img
src="../assets/images/sy/tyBon.png"
style="margin-top: -60px;"
>
<div class="name">{{ item.name }}</div>
</div>
</div>
</div>
<div class="flex1" style="margin-top: 10px">
<div
class="flex1"
style="margin-top: 10px"
>
<div class="yd_title last_1">
<div class="animate-border">
<i></i>
@ -396,7 +453,15 @@
<div class="jtsyBox">
<div class="jtsyBoxtop">
<div class="jtsyBoxtop1">
<img :src="data.jtsyList[0].img" alt="" />
<img
:src="data.jtsyList[0].img"
alt=""
/>
<img
src="../assets/images/sy/jtsy.gif"
class="turn"
alt=""
>
<div>
<div class="jtsyname">{{ data.jtsyList[0].name }}</div>
<div class="jtsytext">
@ -410,7 +475,15 @@
</div>
</div>
<div class="jtsyBoxtop1">
<img :src="data.jtsyList[1].img" alt="" />
<img
:src="data.jtsyList[1].img"
alt=""
/>
<img
src="../assets/images/sy/jtsy.gif"
class="turn"
alt=""
>
<div>
<div class="jtsyname">{{ data.jtsyList[1].name }}</div>
<div class="jtsytext">
@ -454,7 +527,15 @@
</div>
</div>
<div class="jtsyBoxtop1">
<img :src="data.jtsyList[4].img" alt="" />
<img
:src="data.jtsyList[4].img"
alt=""
/>
<img
src="../assets/images/sy/jtsy.gif"
class="turn"
alt=""
>
<div>
<div class="jtsyname">{{ data.jtsyList[4].name }}</div>
<div class="jtsytext">
@ -997,15 +1078,13 @@ const jtsyList = ref([
//
const cs = computed(() => {
let str = `--teacher: ${jysyList.value[0].teacher}; --total: ${
jysyList.value[0].teacher + jysyList.value[0].student
let str = `--teacher: ${jysyList.value[0].teacher}; --total: ${jysyList.value[0].teacher + jysyList.value[0].student
}`;
return str;
});
//
const nc = computed(() => {
let str = `--teacher: ${jysyList.value[1].teacher}; --total: ${
jysyList.value[1].teacher + jysyList.value[1].student
let str = `--teacher: ${jysyList.value[1].teacher}; --total: ${jysyList.value[1].teacher + jysyList.value[1].student
}`;
return str;
});
@ -1403,7 +1482,6 @@ onBeforeMount(async () => {
}
}
.mechanism {
background-image: url(@/assets/images/sy/new_ylws.png);
background-repeat: no-repeat;
@ -1935,19 +2013,47 @@ onBeforeMount(async () => {
//
.left_3_1 {
width: 94%;
margin-top: 15px;
margin-top: 40px;
display: flex;
justify-content: space-around;
&_item {
box-sizing: border-box;
width: 160px;
height: 133px;
height: 112px;
background-image: url(@/assets/images/sy/jyfw.png);
background-repeat: no-repeat;
background-size: 100% 100%;
text-align: center;
padding-top: 22px;
position: relative;
.moveImg {
position: absolute;
width: 160px;
height: 140px;
bottom: 18px;
background-image: url(@/assets/images/sy/jyfwM.png);
background-repeat: no-repeat;
background-size: 100% 100%;
animation: example 3s infinite linear;
}
@keyframes example {
0% {
transform: translateY(0);
}
25% {
transform: translateY(-4px);
}
50% {
transform: translateY(0);
}
75% {
transform: translateY(4px);
}
100% {
transform: translateY(0);
}
}
div:nth-child(1) {
font-family: PangMenZhengDao, PangMenZhengDao;
@ -2441,13 +2547,22 @@ table {
height: 96px;
margin-right: 4px;
}
.jtsyBoxtop {
display: flex;
justify-content: space-evenly;
margin-bottom: 15px;
padding-top: 20px;
.jtsyBoxtop1 {
position: relative;
display: flex;
.turn {
width: 146px;
height: 104px;
position: absolute;
left: -40px;
top: -31px;
}
span {
font-family: TCloudNumber, TCloudNumber;
font-weight: 400;
@ -2490,6 +2605,14 @@ table {
justify-content: space-between;
.jtsyBoxtop1 {
display: flex;
position: relative;
.turn {
width: 146px;
height: 104px;
position: absolute;
left: -40px;
top: -31px;
}
span {
font-family: TCloudNumber, TCloudNumber;
font-weight: 400;
@ -2527,5 +2650,4 @@ table {
}
}
}
</style>

View File

@ -71,7 +71,7 @@
<i></i>
</div>
</div>
<eP3 :list="data.lifeAssistance1"></eP3>
<eP3 :list="data.salvation"></eP3>
</div>
<div class="flex1">
<div class="fundingBox">
@ -272,19 +272,18 @@ const data = reactive({
btje: "11515620", //
},
],
}, //
lifeAssistance1: {
subsidyInformation: [
}, //
salvation: {
data: [
{
nf: "2019", //
btsx: "11", //
btje1: "22", //
btje2: "33", //
btje3: "44", //
btje4: "55", //
tkjzje:"868.4888", //
tkjzrs: "9430", //
dbjzrs: "9430", //
dbjzje: "868.4888", //
dibianJzrs: "2310", //
},
],
year: ["2019"],
month: ["1"],
}, //
difficultSoldiers: {
data: [
@ -369,6 +368,8 @@ const getData = async () => {
data.lifeAssistance.subsidyInformation[index].btje =
addThousandSeparator((item.btje / 10000).toFixed(2));
});
//
data.salvation = res.data.lifeAssistance.jz;
//
// &&
//

View File

@ -150,6 +150,7 @@
</div>
</div>
<div class="minTopPart">
<div class="moveImg"></div>
<div class="mtpImg1"></div>
<div class="mtpImg2"></div>
<div class="mtpImg3"></div>
@ -1042,6 +1043,16 @@ const getData = async () => {
margin-top: 10px;
position: relative;
.moveImg{
position: absolute;
background-image: url(@/assets/ylMove.gif);
background-repeat: no-repeat;
background-size: 100% 100%;
left: 170px;
width: 190px;
height: 173px;
}
.mtpImg1 {
width: 140px;
height: 24px;