From cef5143262d8a6301d84e97dea849b56047af12d Mon Sep 17 00:00:00 2001
From: lnn19986213 <1667908750@qq.com>
Date: Wed, 17 Apr 2024 15:30:18 +0800
Subject: [PATCH 1/3] gx

---
 src/view/echarts_education/pieRose.vue | 188 ++++++++++++-------------
 src/view/education.vue                 | 151 +++++++++++++++++---
 2 files changed, 220 insertions(+), 119 deletions(-)

diff --git a/src/view/echarts_education/pieRose.vue b/src/view/echarts_education/pieRose.vue
index d20b300..3d2eacf 100644
--- a/src/view/echarts_education/pieRose.vue
+++ b/src/view/echarts_education/pieRose.vue
@@ -3,11 +3,24 @@
 </template>
 
 <script setup>
-import { onMounted, reactive, ref } from "vue";
+import { onMounted, reactive, ref, onBeforeMount, defineProps, watch } from "vue";
 // 局部引入echarts核心模块
 import * as echarts from "echarts";
 
+const props = defineProps({
+    list: {
+        type: Array,
+        default: () => {
+            return [];
+        },
+    },
+});
+
 const chart = ref(); // 创建DOM引用
+const data = reactive({
+    list: [],
+    option: {}
+})
 
 var colors = [
     '#4EC2FF',
@@ -16,114 +29,93 @@ var colors = [
     '#268FFF',
     '#FFE986'
 ]
-
-var data = [
-    {
-        name: '正常',
-        value: 17
-    },
-    {
-        name: '关注',
-        value: 16
-    },
-    {
-        name: '追踪',
-        value: 14
-    },
-    {
-        name: '异常',
-        value: 8
-    },
-    {
-        name: '警戒',
-        value: 8
-    }
-];
-
-let option = {
-    color: colors,
-    legend: {
-        orient: 'vertical',
-        top: 'center',
-        right: '6%',
-        icon: "circle",
-        itemGap: 20,
-        itemWidth: 10,
-        itemHeight: 10,
-        textStyle: {
-            color: '#fff',
-            fontSize: 18
-        },
-        formatter: function (name) {
-            var target;
-            for (var i = 0, l = data.length; i < l; i++) {
-                if (data[i].name == name) {
-                    target = data[i].value;
+const getOption = () => {
+    data.option = {
+        color: colors,
+        legend: {
+            orient: 'vertical',
+            top: 'center',
+            right: '6%',
+            icon: "circle",
+            itemGap: 20,
+            itemWidth: 10,
+            itemHeight: 10,
+            textStyle: {
+                color: '#fff',
+                fontSize: 18
+            },
+            formatter: function (name) {
+                var target;
+                for (var i = 0, l = data.list.length; i < l; i++) {
+                    if (data.list[i].name == name) {
+                        target = data.list[i].value;
+                    }
                 }
-            }
-
-            return `   ${name}        ${target} `;
-        },
-    },
-    tooltip: {
-        trigger: 'item',
-        formatter: '{a} <br/>{b} : {c} ({d}%)'
-    },
-    series: [
-        
-        /*内心原型图，展示整体数据概览*/
-        {
-            name: '测评分析',
-            type: 'pie',
-            radius: ['20%', '70%'],
-            center: ['30%', '50%'],
-            roseType: 'radius',
-            minShowLabelAngle: 30,
-            label: {
-                show: false,
+                return `   ${name}        ${target} `;
             },
-            data: data
         },
-        // 内圈背景
-        {
-            type: "pie",
-            center: ["30%", "50%"],
-            radius: ["20%", "26%"],
-            hoverAnimation: false,
-            clockWise: false,
-            itemStyle: {
-                normal: {
-                    borderWidth: 1,
-                    borderColor: "rgba(193, 229, 255, .1)",
-                    color: 'rgba(14, 59, 123, 0.60)'
+        tooltip: {
+            trigger: 'item',
+            formatter: '{a} <br/>{b} : {c} ({d}%)'
+        },
+        series: [
+            /*内心原型图，展示整体数据概览*/
+            {
+                name: '测评分析',
+                type: 'pie',
+                radius: ['20%', '70%'],
+                center: ['30%', '50%'],
+                roseType: 'radius',
+                minShowLabelAngle: 30,
+                label: {
+                    show: false,
                 },
+                data: data.list
             },
-            tooltip: {
-                show: false,
+            // 内圈背景
+            {
+                type: "pie",
+                center: ["30%", "50%"],
+                radius: ["20%", "26%"],
+                hoverAnimation: false,
+                clockWise: false,
+                itemStyle: {
+                    normal: {
+                        borderWidth: 1,
+                        borderColor: "rgba(193, 229, 255, .1)",
+                        color: 'rgba(14, 59, 123, 0.60)'
+                    },
+                },
+                tooltip: {
+                    show: false,
+                },
+                label: {
+                    show: false,
+                },
+                data: [100],
             },
-            label: {
-                show: false,
-            },
-            data: [100],
-        },
-    ]
-};
-
-// 使用生命钩子
-onMounted(() => {
-    // 基于准备好的dom，初始化echarts实例
-    // var myChart = echarts.init(document.getElementById('main'));
+        ]
+    };
+}
+const setChart = () => {
     // Vue3中： 需要引入
     var myChart = echarts.init(chart.value);
 
-    // init(); // vue3.2没有this
     // 使用刚指定的配置项和数据显示图表。
-    myChart.setOption(option);
+    myChart.setOption(data.option);
+}
+watch(() => props.list, (newVal, oldVal) => {
+    data.list = newVal
+    getOption()
+    setChart()
+    console.log('333', newVal, oldVal)
+})
+// 使用生命钩子
+onMounted(() => {
+    data.list = props.list
+    getOption()
+    setChart()
 
-    // 单图表响应式: 跟随浏览器大小改变
-    //   window.addEventListener("resize", () => {
-    //     myChart.resize();
-    //   });
 });
 </script>
 
diff --git a/src/view/education.vue b/src/view/education.vue
index 5ee2184..8c7dd27 100644
--- a/src/view/education.vue
+++ b/src/view/education.vue
@@ -14,17 +14,19 @@
         <div class="yd_title left_2"></div>
         <div class="selectLint">
           <div class="selectBox">
-            <el-select v-model="value" placeholder="Select" size="large" class="selClass">
-              <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
+            <el-select v-model="selectData.value1" placeholder="请选择" size="large" @change="selectChange1">
+              <el-option v-for="item in selectData.options1" :key="item.value" :label="item.label"
+                :value="item.value" />
             </el-select>
           </div>
           <div class="selectBox">
-            <el-select v-model="value" placeholder="Select" size="large">
-              <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
+            <el-select v-model="selectData.value2" placeholder="请选择" size="large" @change="selectChange1">
+              <el-option v-for="item in selectData.options2" :key="item.value" :label="item.label"
+                :value="item.value" />
             </el-select>
           </div>
         </div>
-        <ePieRose></ePieRose>
+        <ePieRose :list="selectData.list"></ePieRose>
       </div>
     </div>
     <div class="displayFlex center_bg">
@@ -102,37 +104,119 @@
 </template>
 
 <script setup>
+import { ref, reactive, onMounted, onBeforeMount } from 'vue'
 import edCSR from "./echarts_education/edCSR.vue";
 import ePie1 from "./echarts_education/pie1.vue";
 import ePie2 from "./echarts_education/pie2.vue";
 import ePie3 from "./echarts_education/pie3.vue";
 import ePie4 from "./echarts_education/pie4.vue";
 import ePieRose from "./echarts_education/pieRose.vue";
-import { ref } from 'vue'
 
-const value = ref('')
-const options = [
-  {
-    value: 'Option1',
-    label: 'Option1',
+const selectData = reactive({
+  value1: '111',
+  value2: 'tes1',
+  options1: [{
+    value: '111',
+    label: '2023秋季检查',
   },
   {
-    value: 'Option2',
-    label: 'Option2',
+    value: '222',
+    label: '2024春季检查',
+  },],
+  options2: [{
+    value: 'tes1',
+    label: '中小学心理健康诊断测验(MHT）',
   },
   {
-    value: 'Option3',
-    label: 'Option3',
+    value: 'tes2',
+    label: '小学心理健康诊断测验',
   },
   {
-    value: 'Option4',
-    label: 'Option4',
+    value: 'tes3',
+    label: '中学心理健康诊断',
+  },],
+  list: [],
+})
+var roseData1 = ref([
+  {
+    name: '正常',
+    value: 17
   },
   {
-    value: 'Option5',
-    label: 'Option5',
+    name: '关注',
+    value: 16
   },
-]
+  {
+    name: '追踪',
+    value: 14
+  },
+  {
+    name: '异常',
+    value: 8
+  },
+  {
+    name: '警戒',
+    value: 8
+  }
+]);
+var roseData2 = ref([
+  {
+    name: '正常',
+    value: 37
+  },
+  {
+    name: '关注',
+    value: 26
+  },
+  {
+    name: '追踪',
+    value: 24
+  },
+  {
+    name: '异常',
+    value: 18
+  },
+  {
+    name: '警戒',
+    value: 18
+  }
+]);
+var roseData3 = ref([
+  {
+    name: '正常',
+    value: 227
+  },
+  {
+    name: '关注',
+    value: 169
+  },
+  {
+    name: '追踪',
+    value: 114
+  },
+  {
+    name: '异常',
+    value: 98
+  },
+  {
+    name: '警戒',
+    value: 78
+  }
+]);
+const selectChange1 = () => {
+  if(selectData.value1 == '111'){
+    selectData.list = roseData1.value
+  }else if(selectData.value2 == 'tes1'){
+    selectData.list = roseData2.value
+  }else if(selectData.value2 == 'tes2'){
+    selectData.list = roseData3.value
+  }else{
+    selectData.list = roseData1.value
+  }
+}
+onBeforeMount(() => {
+  selectData.list = roseData1.value
+});
 </script>
 
 <style lang="scss" scoped>
@@ -168,6 +252,7 @@ const options = [
   background-repeat: no-repeat;
   background-size: 100% 100%;
 }
+
 .center_bg {
   width: 582px;
   box-sizing: border-box;
@@ -177,6 +262,7 @@ const options = [
   background-repeat: no-repeat;
   background-size: 100% 100%;
 }
+
 .right_bg {
   width: 642px;
   box-sizing: border-box;
@@ -484,6 +570,7 @@ const options = [
 
 .czr-sl {
   display: flex;
+
   .historyimg {
     width: 255px;
     height: 56px;
@@ -495,6 +582,7 @@ const options = [
     justify-content: space-between;
 
     padding-left: 70px;
+
     span {
       font-weight: 400;
       font-size: 16px;
@@ -507,23 +595,28 @@ const options = [
       padding-right: 10px;
     }
   }
+
   .historyimg1 {
     background-image: url(@/assets/eduImg/jyImg14.png);
     margin-right: 10px;
   }
+
   .historyimg2 {
     background-image: url(@/assets/eduImg/jyImg15.png);
   }
 }
+
 .flex11 {
   padding: 12px 0;
 }
+
 .earlyWarning {
   height: calc(100% - 10px);
 
   display: flex;
   align-items: center;
   justify-content: space-around;
+
   .earlyWarning1 {
     font-size: 26px;
     color: #ffffff;
@@ -535,10 +628,12 @@ const options = [
     display: flex;
     flex-direction: column;
     align-items: center;
+
     img {
       width: 136px;
       height: 100px;
     }
+
     .green {
       font-size: 26px;
       font-weight: bold;
@@ -551,6 +646,7 @@ const options = [
       -webkit-background-clip: text;
       -webkit-text-fill-color: transparent;
     }
+
     .yellow {
       font-size: 26px;
       font-weight: bold;
@@ -563,6 +659,7 @@ const options = [
       -webkit-background-clip: text;
       -webkit-text-fill-color: transparent;
     }
+
     .red {
       font-size: 26px;
       font-weight: bold;
@@ -585,6 +682,7 @@ const options = [
       display: flex;
       align-items: center;
       justify-content: center;
+
       span {
         font-weight: 500;
         font-size: 14px;
@@ -594,17 +692,21 @@ const options = [
         font-family: PingFangSC, PingFang SC;
       }
     }
+
     .historyimg1 {
       background-image: url(@/assets/eduImg/jyImg4.png);
     }
+
     .historyimg2 {
       background-image: url(@/assets/eduImg/jyImg6.png);
     }
+
     .historyimg3 {
       background-image: url(@/assets/eduImg/jyImg5.png);
     }
   }
 }
+
 .czr-bj {
   width: 529px;
   height: calc(100% - 26px);
@@ -617,22 +719,29 @@ const options = [
   .czrBox {
     height: 8vh;
   }
+
   .situation {
     width: 495px;
     height: 26px;
     background-repeat: no-repeat;
     background-size: 100% 100%;
   }
+
   .situation1 {
     background-image: url(@/assets/eduImg/jyImg11.png);
   }
+
   .situation2 {
     background-image: url(@/assets/eduImg/jyImg12.png);
   }
+
   .situation3 {
     background-image: url(@/assets/eduImg/jyImg13.png);
   }
-};
+}
+
+;
+
 .selectLint {
   width: 94%;
   display: flex;

From f264cff9a5608ed0c2ad024c02c4e79f1ea43fbf Mon Sep 17 00:00:00 2001
From: yaoyuhao <yaoyuhao@ydool.com>
Date: Wed, 17 Apr 2024 15:45:52 +0800
Subject: [PATCH 2/3] 1

---
 src/assets/images/hygiene/jd.png | Bin 0 -> 12889 bytes
 src/view/hygiene.vue             |  32 ++++++++++++++++++++++++++-----
 2 files changed, 27 insertions(+), 5 deletions(-)
 create mode 100644 src/assets/images/hygiene/jd.png

diff --git a/src/assets/images/hygiene/jd.png b/src/assets/images/hygiene/jd.png
new file mode 100644
index 0000000000000000000000000000000000000000..361f6478b4971807b2adee474632ad2faac39715
GIT binary patch
literal 12889
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
b!W8!ZCgTV0`}40>1fU?JEM4`^B=G+Md>~6&

literal 0
HcmV?d00001

diff --git a/src/view/hygiene.vue b/src/view/hygiene.vue
index f954aeb..a6084f2 100644
--- a/src/view/hygiene.vue
+++ b/src/view/hygiene.vue
@@ -45,7 +45,7 @@
         <div class="yd_title center_1"></div>
         <div class="minTopPart">
           <div class="mtpImg1"></div>
-          <div class="mtpImg2"></div>
+          <div class="mtpImg2">建档份数</div>
           <div class="mtpText2">33.67万</div>
         </div>
         <div class="minTopPart2">
@@ -83,7 +83,7 @@
         <div class="yd_title service"></div>
         <eP7></eP7>
       </div>
-      <div >
+      <div class="flex1" style="height:100vh;">
         <div class="yd_title last"></div>
         <div class="table">
           <div class="item" >3月2日健康日，在龙中公园进行健康活动宣</div>
@@ -581,13 +581,17 @@ const change = (name, index) => {
   }
   .mtpImg2 {
     width: 140px;
-    height: 24px;
-    background-image: url(@/assets/minTop2.png);
+    height: 50px;
+    background-image: url(@/assets/images/hygiene/jd.png);
     background-repeat: no-repeat;
     background-size: 100% 100%;
     position: absolute;
     top: 59px;
     right: 50px;
+    text-align: center;
+    color: #ffffff;
+     letter-spacing: 5px; 
+     font-size: 20px;
   }
   .mtpText2 {
     width: 140px;
@@ -654,7 +658,7 @@ const change = (name, index) => {
   height: 200px;
   height: calc(100% - 75px);
   // background: red;
-  overflow-y: auto;
+  overflow-y: scroll;
   .item {
     margin-top: 10px;
     padding: 16px 20px;
@@ -664,4 +668,22 @@ const change = (name, index) => {
     color: #ffffff;
   }
 }
+/* 滚动条整体部分 */
+.table::-webkit-scrollbar {
+	width: 8px;
+	height: 10px;
+}
+/* 滚动槽 */
+.table::-webkit-scrollbar-track {
+	border-radius: 1px;
+	background: rgba(41, 157, 255, 0.56);
+	-webkit-box-shadow: inset 0 0 6px rgba(139, 139, 139, 0.3);
+}
+/* 滚动条滑块样式 */
+.table::-webkit-scrollbar-thumb {
+	background-clip: content-box;
+	border-radius: 6px;
+	background: rgba(41, 157, 255, 1);
+	-webkit-box-shadow: inset 0 0 6px rgba(20, 20, 20, 0.3);
+}
 </style>

From a1a454ef8cb7ebb787501ce0e110b63dd030a60c Mon Sep 17 00:00:00 2001
From: yaoyuhao <yaoyuhao@ydool.com>
Date: Wed, 17 Apr 2024 16:03:20 +0800
Subject: [PATCH 3/3] 1

---
 src/view/echarts_hygiene/eP3.vue  | 8 ++++----
 src/view/echarts_hygiene/eP4.vue  | 1 -
 src/view/echarts_hygiene/eP5.vue  | 6 +++---
 src/view/echarts_hygiene/pie.vue  | 5 +++--
 src/view/echarts_hygiene/pie2.vue | 5 +++--
 src/view/hygiene.vue              | 5 +++--
 6 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/view/echarts_hygiene/eP3.vue b/src/view/echarts_hygiene/eP3.vue
index 7a3ebd5..981592d 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% - 76px); min-height: 205px"
+    style="width: 100%; height: calc(100% - 46px); min-height: 215px"
   ></div>
 </template>
 
@@ -27,7 +27,7 @@ let option = {
   },
 
   grid: {
-    top: "20%",
+    top: "10%",
     left: "1%",
     right: "10%",
     bottom: "0%",
@@ -41,7 +41,7 @@ let option = {
         formatter: function (params) {
           var str = ""; // 最终拼接成的字符串
           var paramsLen = params.length; // 获取每项文字的个数
-          var len = 4; // 每行能显示的字的个数（根据实际情况自己设置）
+          var len = 5; // 每行能显示的字的个数（根据实际情况自己设置）
           var rowNumber = Math.ceil(paramsLen / len); // 换行的话，需要显示几行，向上取整
           if (paramsLen > len) {
             //大于设定的len就换行，不大于就不变化
@@ -67,7 +67,7 @@ let option = {
         textStyle: {
           color: "#ccc",
         },
-        // rotate: 60,
+        rotate: 30,
       },
       data: data1,
     },
diff --git a/src/view/echarts_hygiene/eP4.vue b/src/view/echarts_hygiene/eP4.vue
index 83250eb..37897c8 100644
--- a/src/view/echarts_hygiene/eP4.vue
+++ b/src/view/echarts_hygiene/eP4.vue
@@ -11,7 +11,6 @@ const chart = ref(); // 创建DOM引用
 
 const datas = {
     value: 92.96,
-    text: "留 守 儿 童"
 }
 
 let option = {
diff --git a/src/view/echarts_hygiene/eP5.vue b/src/view/echarts_hygiene/eP5.vue
index 7540f39..f220929 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% - 66px); min-height: 320px"
+    style="width: 100%; height: calc(100% - 60px); min-height: 320px"
   ></div>
 </template>
 
@@ -41,7 +41,7 @@ let option = {
         formatter: function (params) {
           var str = ""; // 最终拼接成的字符串
           var paramsLen = params.length; // 获取每项文字的个数
-          var len = 5; // 每行能显示的字的个数（根据实际情况自己设置）
+          var len = 6; // 每行能显示的字的个数（根据实际情况自己设置）
           var rowNumber = Math.ceil(paramsLen / len); // 换行的话，需要显示几行，向上取整
           if (paramsLen > len) {
             //大于设定的len就换行，不大于就不变化
@@ -80,7 +80,7 @@ let option = {
       splitLine: {
         show: true,
         lineStyle: {
-          color: "rgba(226, 226, 226, 0.3)",
+          color: "rgba(226, 226, 226, 0.2)",
           width: 1,
         },
       },
diff --git a/src/view/echarts_hygiene/pie.vue b/src/view/echarts_hygiene/pie.vue
index e743c70..786f828 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:155px;"></div>
+  <div ref="chart" style="width: 100%; height: calc(100% - 46px);min-height:165px;"></div>
 </template>
 
 <script setup >
@@ -15,7 +15,7 @@ let option = {
     formatter: "{b0}<br />{a0}:{c0} <br />{a1}:{c1} ",
   },
   legend: {
-    top: "8%",
+    top: "3%",
     right: "11%",
     textStyle: {
       fontSize: 12,
@@ -23,6 +23,7 @@ let option = {
     },
   },
   grid: {
+    top:'23%',
     left: "1%",
     right: "10%",
     bottom: "0%",
diff --git a/src/view/echarts_hygiene/pie2.vue b/src/view/echarts_hygiene/pie2.vue
index 9ca95a7..0fcf78e 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:155px;"></div>
+  <div ref="chart" style="width: 100%; height: calc(100% - 46px);min-height:165px;"></div>
 </template>
 
 <script setup >
@@ -17,7 +17,7 @@ let option = {
   },
   legend: {
     data: ["职工医疗保险金额", "城乡医疗保险金额"],
-    top: "8%",
+    top: "3%",
     right: "11%",
     textStyle: {
       fontSize: 12,
@@ -25,6 +25,7 @@ let option = {
     },
   },
   grid: {
+    top:'23%',
     left: "1%",
     right: "10%",
     bottom: "3%",
diff --git a/src/view/hygiene.vue b/src/view/hygiene.vue
index a6084f2..a4ccadf 100644
--- a/src/view/hygiene.vue
+++ b/src/view/hygiene.vue
@@ -654,6 +654,7 @@ const change = (name, index) => {
   }
 }
 .table {
+  margin-top: 10px;
   width: 95%;
   height: 200px;
   height: calc(100% - 75px);
@@ -670,8 +671,8 @@ const change = (name, index) => {
 }
 /* 滚动条整体部分 */
 .table::-webkit-scrollbar {
-	width: 8px;
-	height: 10px;
+	width: 5px;
+	// height: 10px;
 }
 /* 滚动槽 */
 .table::-webkit-scrollbar-track {