From daff63566b19d8f4e038f1275e618fc1c78181b4 Mon Sep 17 00:00:00 2001
From: hh <2397241381@qq.com>
Date: Wed, 27 Mar 2024 18:26:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/cet/cet-ana-1.vue            | 13 +++++--
 src/views/cet/cet-ana-2.vue            | 51 ++++++++++++++------------
 src/views/dashboard/Analysis/index.vue | 29 +++++++--------
 3 files changed, 50 insertions(+), 43 deletions(-)

diff --git a/src/views/cet/cet-ana-1.vue b/src/views/cet/cet-ana-1.vue
index fc1e5f9..d4c6972 100644
--- a/src/views/cet/cet-ana-1.vue
+++ b/src/views/cet/cet-ana-1.vue
@@ -1,6 +1,6 @@
 <template>
   <div style="background: #ececec; padding: 25px">
-    <a-card title="按学院分析" :bordered="false">
+    <a-card title="按学院分析" :loading="loading" :bordered="false">
       <template #extra>
         <!-- <a-select v-model:value="college" style="width: 300px" :options="collegeOptions"></a-select> -->
         <a-select v-model:value="batch" style="margin-left: 10px;width: 120px" :options="batchOptions"></a-select>
@@ -31,6 +31,7 @@ export default {
         getCollege: '/cet/getCollege',
         getRate: '/cet/getRateByBatch'
       },
+      loading: false,
       collegeOptions: [],
       batchOptions: [],
       levelOptions: [
@@ -43,7 +44,7 @@ export default {
     };
   },
   methods: {
-    map1Chart() {
+    dataChart() {
       // 基于准备好的dom，初始化echarts实例  这个和上面的main对应
       let myChart = echarts.init(document.getElementById("map1"));
       // 指定图表的配置项和数据
@@ -110,17 +111,21 @@ export default {
     },
     // 查询数据
     async query() {
+      this.loading = true;
       let params = {
         batch: this.batch,
         level: 'cet4'
       }
       const data = await defHttp.get({ url: this.Url.getRate, params });
-      this.$message.info(`查询结果：${JSON.stringify(data)}`);
+      this.loading = false;
+      this.$nextTick(() => {
+        this.dataChart();
+      })
     }
   },
   mounted() {
     this.getBatch();
-    this.map1Chart();
+    this.dataChart();
   }
 
 }
diff --git a/src/views/cet/cet-ana-2.vue b/src/views/cet/cet-ana-2.vue
index 106e04f..5915d75 100644
--- a/src/views/cet/cet-ana-2.vue
+++ b/src/views/cet/cet-ana-2.vue
@@ -1,19 +1,21 @@
 <template>
   <div style="background: #ececec; padding: 25px">
-    <a-card title="按学院分析" :bordered="false">
+    <a-card title="按批次分析" :loading="loading" :bordered="false">
       <template #extra>
-        <!-- <a-select v-model:value="college" style="width: 300px" :options="collegeOptions"></a-select> -->
-        <a-select v-model:value="batch" style="margin-left: 10px;width: 120px" :options="batchOptions"></a-select>
+        <a-select v-model:value="college" style="width: 300px" :options="collegeOptions"></a-select>
+        <!-- <a-select v-model:value="batch" style="margin-left: 10px;width: 120px" :options="batchOptions"></a-select> -->
         <!-- <a-select v-model:value="level" style="margin-left: 10px;width: 120px" :options="levelOptions"></a-select> -->
         <a-button style="margin-left: 10px;" type="primary" @click="query">查询</a-button>
       </template>
-      <a-row :gutter="24">
-        <a-col :xl="24" :style="{ marginBottom: '24px' }">
-          <div class="container">
-            <div id="map1" style="width: 660px; height: 400px;"></div>
-          </div>
-        </a-col>
-      </a-row>
+      <div>
+        <a-row :gutter="24">
+          <a-col :xl="24" :style="{ marginBottom: '24px' }">
+            <div class="container">
+              <div id="map1" style="width: 660px; height: 400px;"></div>
+            </div>
+          </a-col>
+        </a-row>
+      </div>
     </a-card>
   </div>
 </template>
@@ -29,8 +31,9 @@ export default {
       Url: {
         getBatch: '/cet/getBatch',
         getCollege: '/cet/getCollege',
-        getRate: '/cet/getRateByBatch'
+        getRate: '/cet/getRateByCollege'
       },
+      loading: false,
       collegeOptions: [],
       batchOptions: [],
       levelOptions: [
@@ -43,7 +46,7 @@ export default {
     };
   },
   methods: {
-    map1Chart() {
+    dataChart() {
       // 基于准备好的dom，初始化echarts实例  这个和上面的main对应
       let myChart = echarts.init(document.getElementById("map1"));
       // 指定图表的配置项和数据
@@ -95,32 +98,34 @@ export default {
     // 获取批次数据
     async getBatch() {
       const getBatch = await defHttp.get({ url: this.Url.getBatch });
-      // const getCollege = await defHttp.get({ url: this.Url.getCollege });
+      const getCollege = await defHttp.get({ url: this.Url.getCollege });
 
-      // this.collegeOptions = getCollege.colleges;
-      // 手动添加一个全校字段
-      // this.collegeOptions.unshift({ value: '全校', label: '全校' });
-      // this.college = this.collegeOptions[0].value;
+      this.collegeOptions = getCollege.colleges;
+      this.college = this.collegeOptions[0].value;
 
-      this.batchOptions = getBatch.batches;
-      this.batch = this.batchOptions[0].value;
+      // this.batchOptions = getBatch.batches;
+      // this.batch = this.batchOptions[0].value;
       this.level = this.levelOptions[0].value;
 
-      this.query();
+      // this.query();
     },
     // 查询数据
     async query() {
+      this.loading = true;
       let params = {
-        batch: this.batch,
+        college: this.college,
         level: 'cet4'
       }
       const data = await defHttp.get({ url: this.Url.getRate, params });
-      this.$message.info(`查询结果：${JSON.stringify(data)}`);
+      this.loading = false;
+      this.$nextTick(() => {
+        this.dataChart();
+      })
     }
   },
   mounted() {
     this.getBatch();
-    this.map1Chart();
+    this.dataChart();
   }
 
 }
diff --git a/src/views/dashboard/Analysis/index.vue b/src/views/dashboard/Analysis/index.vue
index 4a22c87..d668241 100644
--- a/src/views/dashboard/Analysis/index.vue
+++ b/src/views/dashboard/Analysis/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div style="background: #ececec; padding: 25px">
-    <a-card title="四六级总通过率查询" :bordered="false">
+    <a-card title="四级总通过率查询" :bordered="false">
       <template #extra>
         <a-select v-model:value="college" style="width: 300px" :options="collegeOptions"></a-select>
         <a-select v-model:value="entrydate" style="margin-left: 10px;width: 100px"
@@ -8,19 +8,16 @@
         <a-button style="margin-left: 10px;" type="primary" @click="query">查询</a-button>
       </template>
       <a-row :gutter="24">
-        <a-col :xl="12" :style="{ marginBottom: '24px' }">
-          <a-table :dataSource="dataSourceCet4" bordered :columns="columns" :pagination='false'>
-            <template #title>
-              <span style="font-size: 20px;font-weight:bold">四级成绩分析</span>
-            </template>
-          </a-table>
-        </a-col>
-        <a-col :xl="12" :style="{ marginBottom: '24px' }">
-          <a-table :dataSource="dataSourceCet6" bordered :columns="columns" :pagination='false'>
-            <template #title>
-              <span style="font-size: 20px;font-weight:bold">六级成绩分析</span>
-            </template>
-          </a-table>
+        <a-col :xl="12">
+          <div style="padding-left: 10px;min-height: 400px;">
+            <a-table :dataSource="dataSourceCet4" :columns="columns" :pagination='false'>
+              <template #title>
+                <span style="font-size: 15px;float: right;" v-if="total && total > 0">
+                  学院总人数: {{ total }}
+                </span>
+              </template>
+            </a-table>
+          </div>
         </a-col>
       </a-row>
     </a-card>
@@ -36,7 +33,6 @@ export default {
   data() {
     return {
       dataSourceCet4: [],
-      dataSourceCet6: [],
       columns: [
         {
           title: '年级',
@@ -64,6 +60,7 @@ export default {
         getCollege: '/cet/getCollege',
         getData: '/cet/getData'
       },
+      total: 0,
       collegeOptions: [],
       entrydateOptions: [],
       college: null,
@@ -90,7 +87,7 @@ export default {
       }
       const result = await defHttp.get({ url: this.Url.getData, params });
       this.dataSourceCet4 = result.data.cet4;
-      this.dataSourceCet6 = result.data.cet6;
+      this.total = result.data.total;
     }
   },
   mounted() {