From f2faa9560f723cdf73fc0bd3d370c121c13c27c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=AE=81?= <18339727226@163.com>
Date: Fri, 21 Jun 2024 15:14:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A6=E4=B8=8B=E8=A7=92=E8=BF=9B=E5=BA=A6?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AEtooltips=EF=BC=8C=E5=B7=A6=E4=BE=A7=E4=B8=AD?=
 =?UTF-8?q?=E9=97=B4=E6=95=B0=E6=8D=AE=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/chart/chart.vue       | 34 +++++++++++++++++++---------
 src/components/chart/pieChart.vue    | 17 +++++++++++---
 src/views/index/center-map.vue       |  2 +-
 src/views/index/left-center.vue      | 10 +++++---
 src/views/index/right-bottom-two.vue |  2 +-
 src/views/index/right-center.vue     |  2 +-
 6 files changed, 47 insertions(+), 20 deletions(-)

diff --git a/src/components/chart/chart.vue b/src/components/chart/chart.vue
index a067875..528371f 100644
--- a/src/components/chart/chart.vue
+++ b/src/components/chart/chart.vue
@@ -8,10 +8,10 @@
 <script setup lang="ts" name="chart">
 import * as echarts from 'echarts';
 
-const myChart = ref(null)
-const chartMax = ref(null)
-const chartValues = ref(null)
-const chartRate = ref(null)
+const myChart: any = ref(null)
+const chartMax: any = ref(0)
+const chartValues: any = ref(0)
+const chartRate: any = ref(0)
 
 onMounted(() => {
     //   window.addEventListener('resize',()=>{this.resize();getRem(1920,100)})
@@ -26,8 +26,8 @@ onBeforeUnmount(() => {
 const resize = () => {
     myChart.resize();
 }
-const init = (max, value) => {
-    chartMax.value = max ? max : 100;
+const init = (max: any, value: any) => {
+    chartMax.value = max ? max : 0;
     chartValues.value = value ? value : 0;
     chartRate.value = 0
     if (chartMax && chartValues) {
@@ -36,11 +36,12 @@ const init = (max, value) => {
     if (chartRate.value === "100.0") {
         chartRate.value = "100"; // 如果百分比等于100，则更新为整数形式
     }
+
     let option = {
         title: {
             text: (chartRate.value || '0.0') + '%',
             x: 'center',
-            y: '20%',
+            y: '25%',
             textStyle: {
                 color: '#fff',
                 fontSize: '18',
@@ -49,7 +50,7 @@ const init = (max, value) => {
             },
         },
         tooltip: {
-            trigger: 'item'
+            trigger: 'item',
         },
         angleAxis: {
             axisLine: {
@@ -83,14 +84,14 @@ const init = (max, value) => {
         },
         polar: {
             radius: ['40%', '65%'],
-            center: ['50%', '30%'],
+            center: ['50%', '35%'],
         },
         series: [
             {
                 type: 'bar',
                 data: [{ name: '预报到填写报到人数', value: chartValues.value }],
                 startAngle: 225,
-                z: 1,
+                z: 2,
                 coordinateSystem: 'polar',
                 barMaxWidth: 35,
                 roundCap: 1,
@@ -110,7 +111,18 @@ const init = (max, value) => {
             },
             {
                 type: 'bar',
-                data: [chartMax.value],
+                data: [{ name: "预报到填写总数", value: chartMax.value }],
+                startAngle: 0,
+                z: 1,
+                coordinateSystem: 'polar',
+                barMaxWidth: 35,
+                roundCap: 1,
+                color: '#00214d',
+                barGap: '-100%',
+            },
+            {
+                type: 'bar',
+                data: [{ name: "预报到填写总数", value: chartMax.value }],
                 z: 0,
                 silent: true,
                 coordinateSystem: 'polar',
diff --git a/src/components/chart/pieChart.vue b/src/components/chart/pieChart.vue
index 28f423b..f4decde 100644
--- a/src/components/chart/pieChart.vue
+++ b/src/components/chart/pieChart.vue
@@ -34,7 +34,7 @@ const init=(max, value) =>{
         title: {
             text: (chartRate.value || '0.0') + '%',
             x: 'center',
-            y: '20%',
+            y: '25%',
             textStyle: {
                 color: '#fff',
                 fontSize: '18',
@@ -77,7 +77,7 @@ const init=(max, value) =>{
         },
         polar: {
             radius: ['40%', '65%'],
-            center: ['50%', '30%'],
+            center: ['50%', '35%'],
         },
         series: [
             {
@@ -104,7 +104,18 @@ const init=(max, value) =>{
             },
             {
                 type: 'bar',
-                data: [chartMax.value],
+                data: [{ name: "新生总人数", value: chartMax.value }],
+                startAngle: 0,
+                z: 1,
+                coordinateSystem: 'polar',
+                barMaxWidth: 35,
+                roundCap: 1,
+                color: '#00214d',
+                barGap: '-100%',
+            },
+            {
+                type: 'bar',
+                data: [{ name: "新生总人数", value: chartMax.value }],
                 z: 0,
                 silent: true,
                 coordinateSystem: 'polar',
diff --git a/src/views/index/center-map.vue b/src/views/index/center-map.vue
index 97c7bb9..55d56f9 100644
--- a/src/views/index/center-map.vue
+++ b/src/views/index/center-map.vue
@@ -160,7 +160,7 @@ const getMapChart = (data) => {
         itemStyle: {
           areaColor: 'white' // 这里使用了两个颜色值来表示渐变色
         },
-        // data: data,
+        data: data,
 
         // data:[
         //   {name: '北京', value1: 10,value:5,value:6},
diff --git a/src/views/index/left-center.vue b/src/views/index/left-center.vue
index ca53f85..39d6385 100644
--- a/src/views/index/left-center.vue
+++ b/src/views/index/left-center.vue
@@ -7,21 +7,25 @@ const rate = (total: any, registers: any) => {
 }
 const bkRate = computed(() => {
   if (degreeDto.value?.length ) {
-    return rate(degreeDto.value[2].studentNumber, degreeDto.value[2].reportNumber)
+    const datas = degreeDto.value.filter((item:any) => item.degree === "统招本科");
+    return rate(datas.studentNumber, datas.reportNumber)
   } else {
     return 0
   }
 })
 const zkRate = computed(() => {
   if (degreeDto.value?.length) {
-    return rate(degreeDto.value[0].studentNumber, degreeDto.value[0].reportNumber)
+    const datas = degreeDto.value.filter((item:any) => item.degree === "统招专科");
+    return rate(datas.studentNumber, datas.reportNumber)
   } else {
     return 0
   }
 })
+
 const zsbRate = computed(() => {
   if (degreeDto.value?.length) {
-    return rate(degreeDto.value[1].studentNumber, degreeDto.value[1].reportNumber)
+    const datas = degreeDto.value.filter((item:any) => item.degree === "统招专升本");
+    return rate(datas.studentNumber, datas.reportNumber)
   } else {
     return 0
   }
diff --git a/src/views/index/right-bottom-two.vue b/src/views/index/right-bottom-two.vue
index 3b0e33d..73915d2 100644
--- a/src/views/index/right-bottom-two.vue
+++ b/src/views/index/right-bottom-two.vue
@@ -46,7 +46,7 @@ const option = reactive({
         data: yData,
         type: "bar",
         smooth: false,
-        name: "当日缴费人数",
+        name: "缴费人数",
         color: "#2265ff",
         label: {
           show: true, // 开启显示  
diff --git a/src/views/index/right-center.vue b/src/views/index/right-center.vue
index 28784c5..5210cc3 100644
--- a/src/views/index/right-center.vue
+++ b/src/views/index/right-center.vue
@@ -112,7 +112,7 @@ const setOption = async (xData: any[], yData: any[]) => {
         smooth: false,
         symbol: "circle", // 拐点样式 -- 这里是个圆
         symbolSize: 7, // 拐点大小
-        name: "当日缴费人数",
+        name: "缴费人数",
         // color: "rgba(9,202,243,.7)",
         color: '#fff',
         markPoint: {