From 73df60c7cec1d64b5bec6417fefea26de04f908c Mon Sep 17 00:00:00 2001
From: yaoyuhao <yaoyuhao@ydool.com>
Date: Thu, 18 Apr 2024 11:07:22 +0800
Subject: [PATCH 1/2] gx

---
 src/view/echarts_hygiene/eP2.vue  | 2 +-
 src/view/echarts_hygiene/eP3.vue  | 2 +-
 src/view/echarts_hygiene/eP5.vue  | 2 +-
 src/view/echarts_hygiene/eP6.vue  | 2 +-
 src/view/echarts_hygiene/eP7.vue  | 2 +-
 src/view/echarts_hygiene/pie.vue  | 2 +-
 src/view/echarts_hygiene/pie2.vue | 2 +-
 src/view/echarts_yl/eP2.vue       | 2 +-
 src/view/echarts_yl/eP2_2.vue     | 2 +-
 src/view/echarts_yl/eP3.vue       | 2 +-
 src/view/echarts_yl/eP3_2.vue     | 2 +-
 src/view/echarts_yl/pie.vue       | 2 +-
 src/view/echarts_yl/pie2.vue      | 2 +-
 src/view/echarts_yl/ylJHSY.vue    | 2 +-
 src/view/echarts_yl/ylSMFW.vue    | 2 +-
 src/view/echarts_yl/ylXZZC.vue    | 2 +-
 src/view/hygiene.vue              | 4 ++--
 src/view/yl.vue                   | 4 ++--
 18 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/view/echarts_hygiene/eP2.vue b/src/view/echarts_hygiene/eP2.vue
index 32a8ed6..c11a487 100644
--- a/src/view/echarts_hygiene/eP2.vue
+++ b/src/view/echarts_hygiene/eP2.vue
@@ -1,7 +1,7 @@
 <template>
   <div
     ref="chart"
-    style="width: 100%; height: calc(100% - 46px); min-height: 250px"
+    style="width: 100%; height: 350px"
   ></div>
 </template>
 
diff --git a/src/view/echarts_hygiene/eP3.vue b/src/view/echarts_hygiene/eP3.vue
index 981592d..5a1214a 100644
--- a/src/view/echarts_hygiene/eP3.vue
+++ b/src/view/echarts_hygiene/eP3.vue
@@ -1,7 +1,7 @@
 <template>
   <div
     ref="chart"
-    style="width: 100%; height: calc(100% - 46px); min-height: 215px"
+    style="width: 100%; height: 250px"
   ></div>
 </template>
 
diff --git a/src/view/echarts_hygiene/eP5.vue b/src/view/echarts_hygiene/eP5.vue
index f220929..52b08fb 100644
--- a/src/view/echarts_hygiene/eP5.vue
+++ b/src/view/echarts_hygiene/eP5.vue
@@ -1,7 +1,7 @@
 <template>
   <div
     ref="chart"
-    style="width: 100%; height: calc(100% - 60px); min-height: 320px"
+    style="width: 100%;height: 450px"
   ></div>
 </template>
 
diff --git a/src/view/echarts_hygiene/eP6.vue b/src/view/echarts_hygiene/eP6.vue
index 76dc00f..5996580 100644
--- a/src/view/echarts_hygiene/eP6.vue
+++ b/src/view/echarts_hygiene/eP6.vue
@@ -1,5 +1,5 @@
 <template>
-  <div ref="chart" style="width: 100%; height: calc(100% - 46px);min-height:205px;"></div>
+  <div ref="chart" style="width: 100%;height:230px;"></div>
 </template>
 
 <script setup >
diff --git a/src/view/echarts_hygiene/eP7.vue b/src/view/echarts_hygiene/eP7.vue
index baad6cf..68d23ca 100644
--- a/src/view/echarts_hygiene/eP7.vue
+++ b/src/view/echarts_hygiene/eP7.vue
@@ -1,7 +1,7 @@
 <template>
   <div
     ref="chart"
-    style="width: 100%; height: calc(100% - 36px); min-height: 205px"
+    style="width: 100%;height: 350px"
   ></div>
 </template>
 
diff --git a/src/view/echarts_hygiene/pie.vue b/src/view/echarts_hygiene/pie.vue
index 786f828..ac7f336 100644
--- a/src/view/echarts_hygiene/pie.vue
+++ b/src/view/echarts_hygiene/pie.vue
@@ -1,5 +1,5 @@
 <template>
-  <div ref="chart" style="width: 100%; height: calc(100% - 46px);min-height:165px;"></div>
+  <div ref="chart" style="width: 100%; height:230px;"></div>
 </template>
 
 <script setup >
diff --git a/src/view/echarts_hygiene/pie2.vue b/src/view/echarts_hygiene/pie2.vue
index 0fcf78e..d815592 100644
--- a/src/view/echarts_hygiene/pie2.vue
+++ b/src/view/echarts_hygiene/pie2.vue
@@ -1,5 +1,5 @@
 <template>
-  <div ref="chart" style="width: 100%; height: calc(100% - 46px);min-height:165px;"></div>
+  <div ref="chart" style="width: 100%; height:230px;"></div>
 </template>
 
 <script setup >
diff --git a/src/view/echarts_yl/eP2.vue b/src/view/echarts_yl/eP2.vue
index 0c29ad1..ec2b56f 100644
--- a/src/view/echarts_yl/eP2.vue
+++ b/src/view/echarts_yl/eP2.vue
@@ -1,5 +1,5 @@
 <template>
-  <div ref="chart" style="width: 100%; height: calc(100% - 46px);min-height:205px;"></div>
+  <div ref="chart" style="width: 100%;height:250px;"></div>
 </template>
 
 <script setup >
diff --git a/src/view/echarts_yl/eP2_2.vue b/src/view/echarts_yl/eP2_2.vue
index 0c29ad1..ec2b56f 100644
--- a/src/view/echarts_yl/eP2_2.vue
+++ b/src/view/echarts_yl/eP2_2.vue
@@ -1,5 +1,5 @@
 <template>
-  <div ref="chart" style="width: 100%; height: calc(100% - 46px);min-height:205px;"></div>
+  <div ref="chart" style="width: 100%;height:250px;"></div>
 </template>
 
 <script setup >
diff --git a/src/view/echarts_yl/eP3.vue b/src/view/echarts_yl/eP3.vue
index 5baf0f5..5640193 100644
--- a/src/view/echarts_yl/eP3.vue
+++ b/src/view/echarts_yl/eP3.vue
@@ -1,5 +1,5 @@
 <template>
-  <div ref="chart" style="width: 100%; height: calc(100% - 46px);min-height:205px;"></div>
+  <div ref="chart" style="width: 100%;height:300px;"></div>
 </template>
 
 <script setup >
diff --git a/src/view/echarts_yl/eP3_2.vue b/src/view/echarts_yl/eP3_2.vue
index 985ad66..906ee8a 100644
--- a/src/view/echarts_yl/eP3_2.vue
+++ b/src/view/echarts_yl/eP3_2.vue
@@ -1,5 +1,5 @@
 <template>
-  <div ref="chart" style="width: 100%; height: calc(100% - 46px);min-height:205px;"></div>
+  <div ref="chart" style="width: 100%;height:300px;"></div>
 </template>
 
 <script setup >
diff --git a/src/view/echarts_yl/pie.vue b/src/view/echarts_yl/pie.vue
index 1a46cac..4c1e51b 100644
--- a/src/view/echarts_yl/pie.vue
+++ b/src/view/echarts_yl/pie.vue
@@ -1,5 +1,5 @@
 <template>
-  <div ref="chart" style="width: 100%; height: calc(100% - 46px);min-height:205px;"></div>
+  <div ref="chart" style="width: 100%; height:250px;"></div>
 </template>
 
 <script setup >
diff --git a/src/view/echarts_yl/pie2.vue b/src/view/echarts_yl/pie2.vue
index 5baf0f5..ca1cbf5 100644
--- a/src/view/echarts_yl/pie2.vue
+++ b/src/view/echarts_yl/pie2.vue
@@ -1,5 +1,5 @@
 <template>
-  <div ref="chart" style="width: 100%; height: calc(100% - 46px);min-height:205px;"></div>
+  <div ref="chart" style="width: 100%; height:250px;"></div>
 </template>
 
 <script setup >
diff --git a/src/view/echarts_yl/ylJHSY.vue b/src/view/echarts_yl/ylJHSY.vue
index 9482375..034c948 100644
--- a/src/view/echarts_yl/ylJHSY.vue
+++ b/src/view/echarts_yl/ylJHSY.vue
@@ -1,5 +1,5 @@
 <template>
-  <div ref="chart" style="width: 100%; height: calc(100% - 56px);min-height:250px;"></div>
+  <div ref="chart" style="width: 100%; height:450px;"></div>
 </template>
 
 <script setup>
diff --git a/src/view/echarts_yl/ylSMFW.vue b/src/view/echarts_yl/ylSMFW.vue
index cf061e0..d9e94d9 100644
--- a/src/view/echarts_yl/ylSMFW.vue
+++ b/src/view/echarts_yl/ylSMFW.vue
@@ -1,5 +1,5 @@
 <template>
-  <div ref="chart" style="width: 340px;height: calc(100% - 38px)"></div>
+  <div ref="chart" style="width: 340px;height:250px"></div>
 </template>
 
 <script setup>
diff --git a/src/view/echarts_yl/ylXZZC.vue b/src/view/echarts_yl/ylXZZC.vue
index bf59c6c..abc7cc1 100644
--- a/src/view/echarts_yl/ylXZZC.vue
+++ b/src/view/echarts_yl/ylXZZC.vue
@@ -1,7 +1,7 @@
 <template>
   <div
     ref="chart"
-    style="width: 100%; height: calc(100% - 46px); min-height: 150px"
+    style="width: 100%; height: 260px"
   ></div>
 </template>
 
diff --git a/src/view/hygiene.vue b/src/view/hygiene.vue
index 01970eb..24fd653 100644
--- a/src/view/hygiene.vue
+++ b/src/view/hygiene.vue
@@ -608,7 +608,7 @@ const change = (name, index) => {
   background-image: url(@/assets/images/hygiene/xia.png);
   background-repeat: no-repeat;
   background-size: 100% 100%;
-  margin: 0px auto;
+  margin: 60px auto;
   position: relative;
   display: flex;
   margin-top: 80px;
@@ -653,7 +653,7 @@ const change = (name, index) => {
   box-sizing: border-box;
   margin-top: 10px;
   width: 95%;
-  height: 200px;
+  height: 240px;
   // height: calc(100% - 115px);
   // background: red;
   overflow-y: auto;
diff --git a/src/view/yl.vue b/src/view/yl.vue
index 42248dd..f3712c1 100644
--- a/src/view/yl.vue
+++ b/src/view/yl.vue
@@ -292,8 +292,8 @@ const change = (name, index) => {
         position: relative;
         span {
           position: absolute;
-          left: 4.5vh;
-          top: 8vh;
+          left: 45px;
+          top: 70px;
           font-weight: bold;
           font-size: 32px;
           color: #ffffff;

From 74db0a023123b6208d1c6e4b33043489370be545 Mon Sep 17 00:00:00 2001
From: yaoyuhao <yaoyuhao@ydool.com>
Date: Thu, 18 Apr 2024 11:51:31 +0800
Subject: [PATCH 2/2] title

---
 src/view/echarts_hygiene/eP7.vue |  2 +-
 src/view/echarts_yl/eP3.vue      |  2 +-
 src/view/echarts_yl/eP3_2.vue    |  2 +-
 src/view/echarts_yl/ylJHSY.vue   |  2 +-
 src/view/education.vue           |  2 +-
 src/view/home.vue                | 45 --------------------------------
 src/view/hygiene.vue             | 19 ++++++++------
 src/view/yl.vue                  | 33 +++++++++++++----------
 8 files changed, 35 insertions(+), 72 deletions(-)

diff --git a/src/view/echarts_hygiene/eP7.vue b/src/view/echarts_hygiene/eP7.vue
index 68d23ca..4d38fdc 100644
--- a/src/view/echarts_hygiene/eP7.vue
+++ b/src/view/echarts_hygiene/eP7.vue
@@ -1,7 +1,7 @@
 <template>
   <div
     ref="chart"
-    style="width: 100%;height: 350px"
+    style="width: 100%;height: 330px"
   ></div>
 </template>
 
diff --git a/src/view/echarts_yl/eP3.vue b/src/view/echarts_yl/eP3.vue
index 5640193..2bccd28 100644
--- a/src/view/echarts_yl/eP3.vue
+++ b/src/view/echarts_yl/eP3.vue
@@ -1,5 +1,5 @@
 <template>
-  <div ref="chart" style="width: 100%;height:300px;"></div>
+  <div ref="chart" style="width: 100%;height:280px;"></div>
 </template>
 
 <script setup >
diff --git a/src/view/echarts_yl/eP3_2.vue b/src/view/echarts_yl/eP3_2.vue
index 906ee8a..4ae1777 100644
--- a/src/view/echarts_yl/eP3_2.vue
+++ b/src/view/echarts_yl/eP3_2.vue
@@ -1,5 +1,5 @@
 <template>
-  <div ref="chart" style="width: 100%;height:300px;"></div>
+  <div ref="chart" style="width: 100%;height:280px;"></div>
 </template>
 
 <script setup >
diff --git a/src/view/echarts_yl/ylJHSY.vue b/src/view/echarts_yl/ylJHSY.vue
index 034c948..f1bf112 100644
--- a/src/view/echarts_yl/ylJHSY.vue
+++ b/src/view/echarts_yl/ylJHSY.vue
@@ -1,5 +1,5 @@
 <template>
-  <div ref="chart" style="width: 100%; height:450px;"></div>
+  <div ref="chart" style="width: 100%; height:430px;"></div>
 </template>
 
 <script setup>
diff --git a/src/view/education.vue b/src/view/education.vue
index e40b3cf..271c27f 100644
--- a/src/view/education.vue
+++ b/src/view/education.vue
@@ -668,7 +668,7 @@ onBeforeMount(() => {
   // background-size: 100% 100%;
   box-sizing: border-box;
   width: 98%;
-  height: 36px;
+  height: 42px;
   position: relative;
 
   .text {
diff --git a/src/view/home.vue b/src/view/home.vue
index 130bc6d..f06d75d 100644
--- a/src/view/home.vue
+++ b/src/view/home.vue
@@ -15,51 +15,6 @@ import Header from "../components/header.vue";
 
 import { ref, onMounted, onBeforeMount } from "vue";
 
-// 监听缩放
-// window.addEventListener("resize", () =>
-//   setTimeout(function () {
-//     //监测分辨率发生改变就对页面进行刷新，可以改变zoom的值
-//     location.reload();
-//     // bodyScale();
-//   }, 10)
-// );
-
-// const insertCss = (select, styles) => {
-//   console.log(styles);
-//   if (document.styleSheets.length === 0) {
-//     //如果没有style标签,则创建一个style标签
-//     var style = document.createElement("style");
-//     document.head.appendChild(style);
-//   }
-//   var styleSheet = document.styleSheets[document.styleSheets.length - 1]; //如果有style 标签.则插入到最后一个style标签中
-//   var str = select + " {"; //插入的内容必须是字符串,所以得把obj转化为字符串
-//   for (var prop in styles) {
-//     str +=
-//       prop.replace(/([A-Z])/g, function (item) {
-//         //使用正则把大写字母替换成 '-小写字母'
-//         return "-" + item.toLowerCase();
-//       }) +
-//       ":" +
-//       styles[prop] +
-//       ";";
-//   }
-//   str += "}";
-//   styleSheet.insertRule(str, styleSheet.cssRules.length); //插入样式到最后一个style标签中的最后面
-// };
-
-// onBeforeMount(() => {
-//   let zoom = document.body.clientWidth / 1920;
-//   document.getElementsByTagName("body")[0].style.setProperty("--zoom", zoom);
-//   //解决zoom放大缩小导致echarts位置偏移问题
-//   let strScale = `scale(${zoom})`;
-//   var obj = {
-//     zoom: 1 / zoom,
-//     transform: strScale,
-//     transformOrigin: "0 0",
-//   };
-//   insertCss("canvas", obj);
-// });
-
 const reset_font = () => {
   let width = document.documentElement.clientWidth || document.body.clientWidth;
   let height =
diff --git a/src/view/hygiene.vue b/src/view/hygiene.vue
index 24fd653..ae2132f 100644
--- a/src/view/hygiene.vue
+++ b/src/view/hygiene.vue
@@ -7,23 +7,23 @@
             <img
               v-if="leftchoose.first == '1'"
               src="@/assets/images/hygiene/yb_1.png"
-              style="width: 130px; height: 30px; cursor: pointer"
+              class="c"
             />
             <img
               v-else
               src="@/assets/images/hygiene/yb_1_1.png"
-              style="width: 130px; height: 30px; cursor: pointer"
+              class="c"
               @click="change('first', '1')"
             />
             <img
               v-if="leftchoose.first == '2'"
               src="@/assets/images/hygiene/yb_2.png"
-              style="width: 130px; height: 30px; cursor: pointer"
+              class="c"
             />
             <img
               v-else
               src="@/assets/images/hygiene/yb_1_1.png"
-              style="width: 130px; height: 30px; cursor: pointer"
+             class="c"
               @click="change('first', '2')"
             />
           </span>
@@ -147,7 +147,7 @@ const change = (name, index) => {
   // background-size: 100% 100%;
   box-sizing: border-box;
   width: 94%;
-  height: 36px;
+  height: 42px;
   position: relative;
 
   .text {
@@ -159,7 +159,10 @@ const change = (name, index) => {
     color: #ffffff;
     position: absolute;
     right: 5px;
-    top: 3px;
+    top: 1px;
+  }
+  .c{
+    width: 130px; height: 42px; cursor: pointer
   }
 }
 
@@ -654,11 +657,11 @@ const change = (name, index) => {
   margin-top: 10px;
   width: 95%;
   height: 240px;
-  // height: calc(100% - 115px);
-  // background: red;
+  
   overflow-y: auto;
  
   .item {
+    width: 98%;
     box-sizing: border-box;
     margin-top: 10px;
     padding: 16px 20px;
diff --git a/src/view/yl.vue b/src/view/yl.vue
index f3712c1..9797359 100644
--- a/src/view/yl.vue
+++ b/src/view/yl.vue
@@ -7,23 +7,23 @@
             <img
               v-if="leftchoose.first == '1'"
               src="@/assets/images/ylbx_1.png"
-              style="width: 130px; height: 30px; cursor: pointer"
+           class="c"
             />
             <img
               v-else
               src="@/assets/images/ylbx_1_1.png"
-              style="width: 130px; height: 30px; cursor: pointer"
+           class="c"
               @click="change('first', '1')"
             />
             <img
               v-if="leftchoose.first == '2'"
               src="@/assets/images/ylbx_1.png"
-              style="width: 130px; height: 30px; cursor: pointer"
+             class="c"
             />
             <img
               v-else
               src="@/assets/images/ylbx_2_1.png"
-              style="width: 130px; height: 30px; cursor: pointer"
+             class="c"
               @click="change('first', '2')"
             />
           </span>
@@ -37,23 +37,23 @@
             <img
               v-if="leftchoose.second == '1'"
               src="@/assets/images/gllrbt_1.png"
-              style="width: 130px; height: 30px; cursor: pointer"
+            class="c"
             />
             <img
               v-else
               src="@/assets/images/gllrbt_1_1.png"
-              style="width: 130px; height: 30px; cursor: pointer"
+              class="c"
               @click="change('second', '1')"
             />
             <img
               v-if="leftchoose.second == '2'"
               src="@/assets/images/gllrbt_1.png"
-              style="width: 130px; height: 30px; cursor: pointer"
+              class="c"
             />
             <img
               v-else
               src="@/assets/images/gllrbt_2_1.png"
-              style="width: 130px; height: 30px; cursor: pointer"
+             class="c"
               @click="change('second', '2')"
             />
           </span>
@@ -67,23 +67,23 @@
             <img
               v-if="leftchoose.third == '1'"
               src="@/assets/images/tkjz_1.png"
-              style="width: 130px; height: 30px; cursor: pointer"
+             class="c"
             />
             <img
               v-else
               src="@/assets/images/tkjz_1_1.png"
-              style="width: 130px; height: 30px; cursor: pointer"
+              class="c"
               @click="change('third', '1')"
             />
             <img
               v-if="leftchoose.third == '2'"
               src="@/assets/images/tkjz_1.png"
-              style="width: 130px; height: 30px; cursor: pointer"
+              class="c"
             />
             <img
               v-else
               src="@/assets/images/tkjz_2_1.png"
-              style="width: 130px; height: 30px; cursor: pointer"
+              class="c"
               @click="change('third', '2')"
             />
           </span>
@@ -224,7 +224,7 @@ const change = (name, index) => {
   // background-size: 100% 100%;
   box-sizing: border-box;
   width: 94%;
-  height: 36px;
+  height: 42px;
   position: relative;
 
   .text {
@@ -236,7 +236,12 @@ const change = (name, index) => {
     color: #ffffff;
     position: absolute;
     right: 5px;
-    top: 3px;
+    top: 1px;
+  }
+  .c {
+    width: 130px;
+    height: 42px;
+    cursor: pointer;
   }
 }