From 461e30575cb46f695bc220991f2871c82f2e1da1 Mon Sep 17 00:00:00 2001
From: duanxiaohai <1812246227@qq.com>
Date: Wed, 17 Apr 2024 17:30:39 +0800
Subject: [PATCH] gx

---
 src/view/echarts_education/edXX.vue |  6 +--
 src/view/education.vue              | 72 ++++++++++++++++++++++++++---
 src/view/hygiene.vue                |  2 +-
 3 files changed, 70 insertions(+), 10 deletions(-)

diff --git a/src/view/echarts_education/edXX.vue b/src/view/echarts_education/edXX.vue
index e51b031..c7f94f2 100644
--- a/src/view/echarts_education/edXX.vue
+++ b/src/view/echarts_education/edXX.vue
@@ -1,5 +1,5 @@
 <template>
-  <div ref="chart" style="width: 50%; height: 50%; min-height: 205px"></div>
+  <div ref="chart" style="width: 100%; height: 50%; min-height: 205px"></div>
 </template>
 
 <script setup>
@@ -27,7 +27,7 @@ let option = {
     // 外圈背景
     {
       type: "pie",
-      center: ["60%", "55%"],
+      center: ["50%", "50%"],
       radius: ["50%", "82%"],
       hoverAnimation: false,
       clockWise: false,
@@ -67,7 +67,7 @@ let option = {
       },
       radius: ["50%", "70%"],
       hoverAnimation: false,
-      center: ["60%", "55%"],
+      center: ["50%", "50%"],
       data: [
         // {
         //   value: datas.value,
diff --git a/src/view/education.vue b/src/view/education.vue
index 8d7a239..c1cd723 100644
--- a/src/view/education.vue
+++ b/src/view/education.vue
@@ -63,8 +63,12 @@
               <span>1,211</span>
               <span class="schoola1">学校总数</span>
             </div>
-            <div class="schoola"><span>46,718</span> <span class="schoola1" >学生总数</span></div>
-            <div class="schoola"><span>883</span> <span class="schoola1">班级总数</span></div>
+            <div class="schoola">
+              <span>46,718</span> <span class="schoola1">学生总数</span>
+            </div>
+            <div class="schoola">
+              <span>883</span> <span class="schoola1">班级总数</span>
+            </div>
             <div class="schoola">
               <span>4,381</span> <span class="schoola1">教职工总数</span>
             </div>
@@ -107,7 +111,20 @@
           "
         >
           <edie></edie>
-          <edXX></edXX>
+          <div class="rating">
+            <edXX></edXX>
+            <div class="ratingBtn">
+              <div class="onImg" id="img1">
+                <span>城市</span>
+              </div>
+              <div class="onImg">
+                <span>县镇</span>
+              </div>
+              <div class="onImg">
+                <span>农村</span>
+              </div>
+            </div>
+          </div>
         </div>
       </div>
       <div class="flex1">
@@ -864,7 +881,7 @@ onBeforeMount(() => {
     width: 124px;
     height: 79px;
     margin-top: 20px;
-    padding: 10px 0 14px 0;
+    padding: 2px 0 14px 0;
     box-sizing: border-box;
     background-image: url(@/assets/eduImg/jyImg3.png);
     background-repeat: no-repeat;
@@ -883,8 +900,8 @@ onBeforeMount(() => {
       // font-family: PingFangSC, PingFang SC;
 
       font-family: DINAlternate, DINAlternate;
-      font-weight: bold;
-      font-size: 26px;
+      // font-weight: bold;
+      font-size: 23px;
       color: #ffffff;
       line-height: 30px;
       letter-spacing: 1px;
@@ -1025,6 +1042,49 @@ onBeforeMount(() => {
     }
   }
 }
+.rating {
+  width: 50%;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  .ratingBtn {
+    display: flex;
+    // align-items: center;
+    .ratingImg {
+      width: 62px;
+      height: 29px;
+      background-image: url(@/assets/eduImg/jyImg18.png);
+      background-repeat: no-repeat;
+      background-size: 100% 100%;
+    }
+    .onImg {
+      width: 62px;
+      height: 29px;
+      background-image: url(@/assets/eduImg/jyImg19.png);
+      background-repeat: no-repeat;
+      background-size: 100% 100%;
+      cursor: pointer; /* 添加指针样式以指示可点击 */
+    }
+    .onImg.active {
+      width: 62px;
+      height: 29px;
+      background-image: url(@/assets/eduImg/jyImg18.png);
+      background-repeat: no-repeat;
+      background-size: 100% 100%;
+    }
+    span {
+      height: 100%;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      font-weight: 400;
+      font-size: 14px;
+      color: #ffffff;
+      letter-spacing: 1px;
+      font-family: PingFangSC, PingFang SC;
+    }
+  }
+}
 
 .selectLint {
   width: 94%;
diff --git a/src/view/hygiene.vue b/src/view/hygiene.vue
index cfff88a..65971b5 100644
--- a/src/view/hygiene.vue
+++ b/src/view/hygiene.vue
@@ -654,7 +654,7 @@ const change = (name, index) => {
   box-sizing: border-box;
   margin-top: 10px;
   width: 95%;
-  height: 220px;
+  height: 200px;
   // height: calc(100% - 115px);
   // background: red;
   overflow-y: auto;