diff --git a/src/assets/images/work/dyh.png b/src/assets/images/work/dyh.png
new file mode 100644
index 0000000..314a50a
Binary files /dev/null and b/src/assets/images/work/dyh.png differ
diff --git a/src/assets/images/work/dyh1.png b/src/assets/images/work/dyh1.png
new file mode 100644
index 0000000..56ea77d
Binary files /dev/null and b/src/assets/images/work/dyh1.png differ
diff --git a/src/assets/images/work/dyh2.png b/src/assets/images/work/dyh2.png
new file mode 100644
index 0000000..77a2a42
Binary files /dev/null and b/src/assets/images/work/dyh2.png differ
diff --git a/src/view/echarts_yl/ylJHSY.vue b/src/view/echarts_yl/ylJHSY.vue
index a999cd1..e284d51 100644
--- a/src/view/echarts_yl/ylJHSY.vue
+++ b/src/view/echarts_yl/ylJHSY.vue
@@ -126,7 +126,6 @@ const getOption = () => {
type: "value",
scale: true,
name: "计划生育人数",
-
splitLine: {
//分割线配置
show: false,
@@ -158,7 +157,6 @@ const getOption = () => {
type: "value",
scale: true,
min: 0,
-
name: "计划生育补贴金额/元",
splitLine: {
show: false,
@@ -173,7 +171,6 @@ const getOption = () => {
color: "#ffffff",
fontSize: 16,
},
-
},
axisLine: {
//y轴线的颜色以及宽度
@@ -188,7 +185,7 @@ const getOption = () => {
},
{
type: "value",
- max:100,
+ max: 100,
splitLine: {
show: false,
lineStyle: {
@@ -218,12 +215,28 @@ const getOption = () => {
data: data.list1,
barWidth: 20,
type: "bar",
+ label:{
+ show:true,
+ position:'inside',
+ color:'#ffffff',
+ formatter:function(data){
+ return data.value
+ }
+ },
},
{
yAxisIndex: 1,
name: "计划生育补贴金额",
data: data.list2,
type: "line", //线状图
+ label:{
+ show:true,
+ position:'top',
+ color:'rgba(0, 252, 255, 1)',
+ formatter:function(data){
+ return data.value
+ }
+ },
itemStyle: {
borderColor: "#00FCFF",
borderWidth: 1,
diff --git a/src/view/education.vue b/src/view/education.vue
index 47bf5fd..1a7591f 100644
--- a/src/view/education.vue
+++ b/src/view/education.vue
@@ -140,15 +140,20 @@
资助数量
资助金额
-
+
- {{ item.zzxm }}
- {{ item.zzsl }}
- {{ item.zzje }}
+ {{ item.zzxm }}
+ {{ item.zzsl }}
+ {{ item.zzje }}
@@ -438,35 +443,77 @@ const data = reactive({
const getData = async () => {
await http.get("/api/ggfwyth/education").then((res) => {
if (res.code == 200) {
+ // 学生情况
data.xsql.push(res.data.xssl.zz);
data.xsql.push(res.data.xssl.gz);
data.xsql.push(res.data.xssl.cz);
data.xsql.push(res.data.xssl.xx);
data.xsql.push(res.data.xssl.yey);
data.xsql.push(res.data.xssl.tsjy);
+ // 重点关注
data.zdgz[0].value = res.data.zdgz.lset;
data.zdgz[1].value = res.data.zdgz.dszn;
data.zdgz[2].value = res.data.zdgz.dqjt;
data.zdgz[3].value = res.data.zdgz.xsdb;
+ // 学校概况
data.xxgk = res.data.xxgk;
-
- data.xzncjszcsl = res.data.xzncjszcsl;
+ // 县镇农村学校数量 初始化数据
data.xzncxxsl[0].push(res.data.xzncxxsl.ncxx.ncxx);
data.xzncxxsl[0].push(res.data.xzncxxsl.ncxx.nccz);
data.xzncxxsl[0].push(res.data.xzncxxsl.ncxx.ncgz);
data.xzncxxsl[1].push(res.data.xzncxxsl.xzxx.xzxx);
data.xzncxxsl[1].push(res.data.xzncxxsl.xzxx.xzcz);
data.xzncxxsl[1].push(res.data.xzncxxsl.xzxx.xzgz);
+ // 县镇农村教师职称数量
+ data.xzncjszcsl = res.data.xzncjszcsl;
+ // 资助项目
data.zzxm = res.data.zzxm;
ratingBtn("县镇");
+ // 吹哨人
}
});
};
+//自动滚动
+const mainRef = ref(null);
+let isAutoScrolling = true;
+
+const stopAutoScroll = () => {
+ isAutoScrolling = false;
+};
+
+const startAutoScroll = () => {
+ isAutoScrolling = true;
+ autoScroll();
+};
+
+const autoScroll = () => {
+ if (!isAutoScrolling) return;
+
+ const mainEl = mainRef.value;
+ mainEl.scrollTop += 1; // 每次滚动的距离
+
+ if (mainEl.scrollTop + 1 >= mainEl.scrollHeight - mainEl.clientHeight) {
+ setTimeout(() => {
+ mainEl.scrollTo({ top: 0, behavior: "smooth" });
+ setTimeout(autoScroll, 2000); // 2秒后再次滚动到底部
+ }, 1000); // 暂停1秒后开始快速滚回顶部
+ } else {
+ requestAnimationFrame(autoScroll);
+ }
+};
onBeforeMount(async () => {
selectData.list = roseData1.value;
getData();
});
+onMounted(() => {
+ startAutoScroll();
+ console.log(
+ mainRef.value.scrollTop,
+ mainRef.value.scrollHeight,
+ mainRef.value.clientHeight
+ );
+});
-