From 2566b67acf159e03a4ea5c0df78f958d827eaaab Mon Sep 17 00:00:00 2001
From: yaoyuhao <yaoyuhao@ydool.com>
Date: Sat, 13 Jul 2024 13:37:35 +0800
Subject: [PATCH] gx

---
 src/view/echarts_education/edXS2.vue | 11 +++++++--
 src/view/echarts_education/pie.vue   |  1 +
 src/view/echarts_education/pie5.vue  |  2 ++
 src/view/education.vue               | 35 +++++++++++++++-------------
 src/view/sy.vue                      |  8 +------
 src/view/work.vue                    |  2 +-
 6 files changed, 33 insertions(+), 26 deletions(-)

diff --git a/src/view/echarts_education/edXS2.vue b/src/view/echarts_education/edXS2.vue
index 32294c6..8967746 100644
--- a/src/view/echarts_education/edXS2.vue
+++ b/src/view/echarts_education/edXS2.vue
@@ -24,7 +24,7 @@ const data = reactive({
   option: {},
   bg: [],
 });
-
+const max=ref(100);
 const getOption = () => {
   data.option = {
     tooltip: {
@@ -62,6 +62,7 @@ const getOption = () => {
     },
     yAxis: {
       type: "value",
+      max:max,
       splitLine: {
         show: true,
         lineStyle: {
@@ -94,9 +95,10 @@ const getOption = () => {
         symbol: "emptyCircle",
 
         symbolSize: 10,
-              label: {
+            label: {
           show: true,
           color: "#ffffff",
+          fontSize:17,
          position:'top',
           formatter: function (data) {
             return data.value;
@@ -138,6 +140,9 @@ const getOption = () => {
     ],
   };
 };
+const  getMaxValue=(arr)=> {
+  return Math.max(...arr);
+}
 const setChart = () => {
   // Vue3中： 需要引入
   var myChart = echarts.init(chart.value);
@@ -150,6 +155,8 @@ onBeforeMount(() => {
   setTimeout(() => {
     data.list = props.list;
     data.year = props.month;
+    max.value=getMaxValue(data.list);
+    max.value=max.value+20;
     // console.log(data.list,props.month,'教育');
     data.year.forEach(() => {
       data.bg.push(0);
diff --git a/src/view/echarts_education/pie.vue b/src/view/echarts_education/pie.vue
index 60cc04a..4d1b8fc 100644
--- a/src/view/echarts_education/pie.vue
+++ b/src/view/echarts_education/pie.vue
@@ -157,6 +157,7 @@ const getOption = () => {
           show: true,
           position: "top",
           color: "#ffffff",
+          fontSize:'17',
           formatter: function (data) {
             return data.value;
           },
diff --git a/src/view/echarts_education/pie5.vue b/src/view/echarts_education/pie5.vue
index 7668c8e..eca87f8 100644
--- a/src/view/echarts_education/pie5.vue
+++ b/src/view/echarts_education/pie5.vue
@@ -121,6 +121,7 @@ const getOption = () => {
           show: true,
           position: "right",
           color: "#ffffff",
+          fontSize: 17,
           formatter: function (data) {
             return data.value;
           },
@@ -148,6 +149,7 @@ const getOption = () => {
           show: true,
           position: "right",
           color: "#ffffff",
+              fontSize: 17,
           formatter: function (data) {
             return data.value;
           },
diff --git a/src/view/education.vue b/src/view/education.vue
index d4e5e10..982826d 100644
--- a/src/view/education.vue
+++ b/src/view/education.vue
@@ -96,15 +96,15 @@
                 class="schoolbs"
                 @click="showDialog('学校', '/api/ggfwyth/schoolList')"
               >
-                <span class="spot">初中</span>
-                <span>{{ data.xxgk.czxxsl }}</span>
+                <span class="spot font" >初中</span>
+                <span class="font">{{ data.xxgk.czxxsl }}</span>
               </div>
               <div
                 class="schoolbs"
                 @click="showDialog('学校', '/api/ggfwyth/schoolList')"
               >
-                <span class="spot">高中</span>
-                <span>{{ data.xxgk.gzxxsl }}</span>
+                <span class="spot font">高中</span>
+                <span class="font">{{ data.xxgk.gzxxsl }}</span>
               </div>
             </div>
             <div class="grade">
@@ -112,15 +112,15 @@
                 class="schoolbs"
                 @click="showDialog('学校', '/api/ggfwyth/schoolList')"
               >
-                <span class="spot">小学</span>
-                <span>{{ data.xxgk.xxxxsl }}</span>
+                <span class="spot font">小学</span>
+                <span class="font">{{ data.xxgk.xxxxsl }}</span>
               </div>
               <div
                 class="schoolbs"
                 @click="showDialog('学校', '/api/ggfwyth/schoolList')"
               >
-                <span class="spot">中职</span>
-                <span>{{ data.xxgk.zzxxsl }}</span>
+                <span class="spot font">中职</span>
+                <span class="font">{{ data.xxgk.zzxxsl }}</span>
               </div>
             </div>
             <div class="grade grade1">
@@ -128,16 +128,16 @@
                 class="schoolbs"
                 @click="showDialog('学校', '/api/ggfwyth/schoolList')"
               >
-                <span class="spot">幼儿园</span>
-                <span>{{ data.xxgk.yeyxxsl }}</span>
+                <span class="spot font">幼儿园</span>
+                <span class="font">{{ data.xxgk.yeyxxsl }}</span>
               </div>
               <div class="schoolbs">
                 <span
-                  class="spot"
+                  class="spot font"
                   @click="showDialog('学校', '/api/ggfwyth/schoolList')"
                   >特殊教育</span
                 >
-                <span>{{ data.xxgk.tsjyxxsl }}</span>
+                <span class="font">{{ data.xxgk.tsjyxxsl }}</span>
               </div>
             </div>
           </div>
@@ -226,7 +226,7 @@
             <img src="@/assets/eduImg/jyImg10.png" alt="" />
             <img src="@/assets/eduImg/pp3.gif" alt="" class="ppImg" />
             <div class="historyimg historyimg1">
-              <span>绿色预警</span>
+              <span style="fontSize:18px;">绿色预警</span>
             </div>
           </div>
           <div class="earlyWarning1">
@@ -236,7 +236,7 @@
             <img src="@/assets/eduImg/jyImg9.png" alt="" />
             <img src="@/assets/eduImg/pp2.gif" alt="" class="ppImg" />
             <div class="historyimg historyimg2">
-              <span>黄色预警</span>
+              <span style="fontSize:18px;">黄色预警</span>
             </div>
           </div>
           <div class="earlyWarning1">
@@ -246,7 +246,7 @@
             <img src="@/assets/eduImg/jyImg8.png" alt="" />
             <img src="@/assets/eduImg/pp1.gif" alt="" class="ppImg" />
             <div class="historyimg historyimg3">
-              <span>红色预警</span>
+              <span style="fontSize:18px;">红色预警</span>
             </div>
           </div>
         </div>
@@ -1819,7 +1819,9 @@ onMounted(() => {
     }
   }
 }
-
+.font{
+  font-size: 16px !important;
+}
 :deep(.el-table) {
   background: rgba(32, 64, 115, 1);
 
@@ -1867,4 +1869,5 @@ onMounted(() => {
     font-size: 18px !important;
   }
 }
+
 </style>
diff --git a/src/view/sy.vue b/src/view/sy.vue
index 8ffb515..d29f2aa 100644
--- a/src/view/sy.vue
+++ b/src/view/sy.vue
@@ -566,13 +566,7 @@
       @handle="handlePagination"
     >
       <template #pxkssj="{ currentCol, currentData }">
-        <div>
-          {{ currentData.pxkssj.slice(0, 4) }}-{{
-            currentData.pxkssj.slice(4, 6)
-          }}-{{ currentData.pxkssj.slice(6, 8) }}/{{
-            currentData.pxjssj.slice(4, 6)
-          }}-{{ currentData.pxjssj.slice(6, 8) }}
-        </div>
+        <div>{{ currentData.pxkssj }}/{{ currentData.pxjssj }}</div>
       </template>
       <!-- <template #pxjssj="{ currentCol, currentData }">
         <div>
diff --git a/src/view/work.vue b/src/view/work.vue
index 6417c15..b6a5df4 100644
--- a/src/view/work.vue
+++ b/src/view/work.vue
@@ -459,7 +459,7 @@ onMounted(() => {
    setTimeout(()=>{
  startAutoScroll();
   },600)
-  startAutoSwitching();
+  // startAutoSwitching();
 });
 
 onBeforeMount(() => {