From 56cff6ecdd7ba9750b8ae88441ba2eba2cb395f0 Mon Sep 17 00:00:00 2001
From: Qi <3194726156@qq.com>
Date: Sat, 22 Mar 2025 19:07:09 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8C=89=E5=8D=95?=
 =?UTF-8?q?=E6=89=B9=E6=AC=A1=E9=A5=BC=E5=9B=BE=E9=BC=A0=E6=A0=87=E8=81=9A?=
 =?UTF-8?q?=E7=84=A6=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/cet/cet-ana-3.vue | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/views/cet/cet-ana-3.vue b/src/views/cet/cet-ana-3.vue
index 011935e..6adfafb 100644
--- a/src/views/cet/cet-ana-3.vue
+++ b/src/views/cet/cet-ana-3.vue
@@ -54,6 +54,7 @@
 
 <script>
   //import { pagination } from 'mock/_util';
+  import { red } from '@ant-design/colors';
   import { defHttp } from '/@/utils/http/axios';
   import * as echarts from 'echarts';
 
@@ -326,18 +327,31 @@
         this.participate_Piechartloading = true;
         this.tableloading = true;
         let result = await defHttp.get({ url: url, params: queryParams });
+        let totalRate = 0;
+        for (let key in result.gradeData) {
+          totalRate += parseFloat(result.gradeData[key].passRate);
+        }
+        console.log(totalRate, 'totalRate');
         console.log(result, 'result');
         let chartsData = [];
         for (let key in result.gradeData) {
           chartsData.push({
             name: key + '级',
-            value: result.gradeData[key].passRate,
+            value: (parseFloat(result.gradeData[key].passRate) / totalRate) * 100,
           });
         }
         let option = {
           tooltip: {
             trigger: 'item',
             conginee: false,
+            formatter: function (params) {
+              return params.name + ': ' + params.value.toFixed(1) + '%';
+            },
+            textStyle: {
+              color: '#ec2e30', // 设置文本颜色
+              fontSize: 14, // 设置字体大小
+              fontWeight: 'bold', // 设置字体加粗
+            },
             //字体大小
             itemStytle: {
               // 设置阴影效果
-- 
2.41.0


From 13d5df6d051743c68dd1505f35d353f413b3f133 Mon Sep 17 00:00:00 2001
From: Qi <3194726156@qq.com>
Date: Sun, 23 Mar 2025 20:42:12 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E8=A7=86=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/cet/universityDashboard.vue | 37 +++++++++++++++++++--------
 1 file changed, 27 insertions(+), 10 deletions(-)

diff --git a/src/views/cet/universityDashboard.vue b/src/views/cet/universityDashboard.vue
index b84e5d3..22c9c13 100644
--- a/src/views/cet/universityDashboard.vue
+++ b/src/views/cet/universityDashboard.vue
@@ -15,7 +15,7 @@
           <!--<a-cascader v-model:value="collegeMajor" expand-trigger="hover" :options="collegeMajorOptions" change-on-select />-->
 
           <!-- 主外层容器：包括一级和二级菜单并排 -->
-          <div class="dropdown-wrapper">
+          <div class="dropdown-wrapper" @blur="loseFocus" tabindex="0">
             <div class="dropdown-trigger" @click="toggleDropdown">
               <span class="trigger-label">{{ selectedLabel || '请选择学院' }}</span>
               <DownOutlined class="trigger-icon" />
@@ -26,7 +26,7 @@
               <div class="main-menu">
                 <div class="main-menu-scroll">
                   <div v-for="item in collegeMajorOptions" :key="item.key" class="menu-item">
-                    <span @click.stop="selectItem(item)">{{ item.label }}</span>
+                    <span @click.stop="selectItem(item)" style="width: 90%">{{ item.label }}</span>
                     <span v-if="item.children" class="expand-icon" @click.stop="expandSubMenu(item)">
                       <RightOutlined />
                     </span>
@@ -38,7 +38,7 @@
               <div v-if="subMenuVisible" class="sub-menu">
                 <div class="sub-menu-scroll">
                   <div v-for="subItem in currentSubMenu" :key="subItem.key" class="menu-item">
-                    <span @click.stop="selectItem(subItem)">{{ subItem.label }}</span>
+                    <span @click.stop="selectItem(subItem)" style="width: 100%">{{ subItem.label }}</span>
                   </div>
                 </div>
               </div>
@@ -139,6 +139,7 @@
         selectedLabel: '全校',
         currentSubMenu: [],
         currentSubSubMenu: [],
+        losefocus: false,
         //测试构造数据
         //menuData: [
         //  { key: '1', label: '全校' },
@@ -342,6 +343,9 @@
       this.getEntrydate();
     },
     methods: {
+      loseFocus() {
+        this.dropdownVisible = false;
+      },
       toggleDropdown() {
         this.dropdownVisible = !this.dropdownVisible;
         this.subMenuVisible = false;
@@ -519,17 +523,30 @@
           '#FAF0E6  ',
         ];
         let j = 0;
-
-        for (let i in data) {
+        //过滤掉不需要的数据
+        let filteredData = [];
+        if (this.selectedLabel === '全校（不含艺体美外语）') {
+          for (let i in data) {
+            // 过滤函数
+            filteredData[i] = data[i].filter((college) => {
+              return !['体育科学学院', '美术学院', '音乐学院'].includes(college.college);
+            });
+          }
+        } else {
+          filteredData = data;
+        }
+        console.log('filteredData', filteredData);
+        for (let i in filteredData) {
           xData = [];
           let yData = [];
-          for (let key in data[i]) {
-            xData.push(data[i][key].college);
+          for (let key in filteredData[i]) {
+            xData.push(filteredData[i][key].college);
             // 将数据转换为百分比（加上%）
-            yData.push(data[i][key].passRate);
+            yData.push(filteredData[i][key].passRate);
           }
-
+          console.log('xData', xData);
           xData = xData.map((label) => label.split('').join('\n')); //将x轴竖着展示
+
           seriesData.push({
             name: i + '级累计总通过率',
             type: 'bar',
@@ -1151,7 +1168,7 @@
     display: inline-block;
   }
   .dropdown-trigger {
-    width: 160px; /* ✅ 设置选择框宽度 */
+    width: 190px; /* ✅ 设置选择框宽度 */
     height: 32px;
     border: 1px solid #ccc; /* ✅ 添加边框 */
     padding: 6px 12px;
-- 
2.41.0