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

This commit is contained in:
姚宇浩 2024-06-12 09:02:54 +08:00
commit a41f816df0
4 changed files with 42 additions and 20 deletions

View File

@ -1,5 +1,5 @@
<template>
<div ref="chart" style="width: 270px; height: 210px"></div>
<div ref="chart" style="width:100%; height: 210px"></div>
</template>
<script setup >

View File

@ -1,5 +1,5 @@
<template>
<div ref="chart" style="width: 270px; height: 210px"></div>
<div ref="chart" style="width: 100%; height: 210px"></div>
</template>
<script setup >

View File

@ -1,5 +1,5 @@
<template>
<div ref="chart" style="width: 270px; height: 210px"></div>
<div ref="chart" style="width: 100%; height: 210px"></div>
</template>
<script setup >

View File

@ -92,32 +92,34 @@
<div class="schoolb">
<img src="../assets/eduImg/xxgkTop.png" class="gkTop" alt="" />
<div class="grade">
<div class="schoolbs" @click="showDialog('学校','')">
<div class="schoolbs" @click="showDialog('学校', '')">
<span class="spot">初中</span>
<span>{{ data.xxgk.czxxsl }}</span>
</div>
<div class="schoolbs" @click="showDialog('学校','')">
<div class="schoolbs" @click="showDialog('学校', '')">
<span class="spot">高中</span>
<span>{{ data.xxgk.gzxxsl }}</span>
</div>
</div>
<div class="grade">
<div class="schoolbs" @click="showDialog('学校','')">
<div class="schoolbs" @click="showDialog('学校', '')">
<span class="spot">小学</span>
<span>{{ data.xxgk.xxxxsl }}</span>
</div>
<div class="schoolbs" @click="showDialog('学校','')">
<div class="schoolbs" @click="showDialog('学校', '')">
<span class="spot">中职</span>
<span>{{ data.xxgk.zzxxsl }}</span>
</div>
</div>
<div class="grade grade1">
<div class="schoolbs" @click="showDialog('学校','')">
<div class="schoolbs" @click="showDialog('学校', '')">
<span class="spot">幼儿园</span>
<span>{{ data.xxgk.yeyxxsl }}</span>
</div>
<div class="schoolbs">
<span class="spot" @click="showDialog('学校','')">特殊教育</span>
<span class="spot" @click="showDialog('学校', '')"
>特殊教育</span
>
<span>{{ data.xxgk.tsjyxxsl }}</span>
</div>
</div>
@ -238,21 +240,21 @@
<div>
<div class="czrBox">
<div class="situation situation1"></div>
<edxs :list="data.xs.gxyrs" :month="data.xs.month"></edxs>
<edxs :list="data.whistleblower.culeTotal.data" :month="data.whistleblower.culeTotal.time"></edxs>
</div>
<div class="czrBox">
<div class="situation situation2"></div>
<edxs1 :list="data.xs.gxyrs" :month="data.xs.month"></edxs1>
<edxs1 :list="data.whistleblower.gaCules.data" :month="data.whistleblower.gaCules.time"></edxs1>
</div>
</div>
<div>
<div class="czrBox">
<div class="situation situation3"></div>
<edxs2 :list="data.xs.gxyrs" :month="data.xs.month"></edxs2>
<edxs2 :list="data.whistleblower.newCules.data" :month="data.whistleblower.newCules.time"></edxs2>
</div>
<div class="czrBox">
<div class="situation situation4"></div>
<edxs3 :list="data.xs.gxyrs" :month="data.xs.month"></edxs3>
<edxs3 :list="data.whistleblower.jcgCules.data" :month="data.whistleblower.jcgCules.time"></edxs3>
</div>
</div>
</div>
@ -513,7 +515,6 @@ const data = reactive({
xxgk: {},
xzncjszcsl: [],
xzncxxsl: [[], []],
whistleblower: {},
zzxm: [],
schoolData: [
{ name: "副高级", value: "" },
@ -523,10 +524,29 @@ const data = reactive({
{ name: "中级", value: "" },
{ name: "助理级", value: "" },
],
xs: {
gxyrs: ["255", "165", "165", "165", "165"],
month: ["5.31", "6.1", "6.2", "6.3", "6.4"],
}, //线
whistleblower: {
yljgsl: 10, //
qyjssl: 3, //
green: 316895, //绿
yellow: 16676, //
red: 6242, //
culeTotal: {
data: ["255", "165", "165", "165", "165"],
time: ["5.31", "6.1", "6.2", "6.3", "6.4"],
}, //线
newCules: {
data: ["255", "165", "165", "165", "165"],
time: ["5.31", "6.1", "6.2", "6.3", "6.4"],
}, //线
gaCules: {
data: ["255", "165", "165", "165", "165"],
time: ["5.31", "6.1", "6.2", "6.3", "6.4"],
}, //线
jcgCules: {
data: ["255", "165", "165", "165", "165"],
time: ["5.31", "6.1", "6.2", "6.3", "6.4"],
}, //线
},
});
const getData = async () => {
await http.get("/api/ggfwyth/education").then((res) => {
@ -559,6 +579,7 @@ const getData = async () => {
data.zzxm = res.data.zzxm;
//
data.whistleblower = res.data.whistleblower;
// 线
}
});
};
@ -1207,7 +1228,7 @@ onMounted(() => {
.czr-bj {
width: 529px;
border-radius: 2px;
padding: 20px 0 0 14px;
padding-top: 20px;
display: flex;
justify-content: space-around;
@ -1219,6 +1240,7 @@ onMounted(() => {
.czrBox {
// height: 104px;
width: 280px;
min-height: 310px;
display: flex;
flex-direction: column;