页面布局改进

src/views/cet/cet-ana-1.vue

@@ -1,46 +1,40 @@
 <template>
   <div style="background: #ececec; padding: 15px">
     <a-card :bordered="false">
-      <a-tabs v-model:activeKey="activeKey" type="card">
-        <a-tab-pane key="1" tab="查询全校各学院四级通过率">
       <div>
         <div class="query">
           <span style="font-size: 15px; margin-right: 10px; display: flex; justify-content: center; align-items: center; font-weight: bold"
             >年级:
           </span>
-              <a-select v-model:value="oneentrydate" style="width: 200px" :options="entrydateOptions"></a-select>
+          <a-select v-model:value="oneentrydate" style="width: 200px" :options="entrydateOptions" />
           <a-button style="margin-left: 10px" type="primary" @click="allQuery">查询</a-button>
         </div>
-
+        <a-card :bordered="true">
-            <a-card title="查询全校各学院四级通过率" :loading="tab1loading" :bordered="false">
+          <a-row :gutter="12">
-              <template #extra>
+            <a-col :xl="16">
-                <!-- <a-select v-model:value="college" style="width: 300px" mode="multiple" :max-tag-count="2"
+              <a-card :loading="map1loading">
-          :options="collegeOptions" @change="onCollegeMajorChange"></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-select v-model:value="entrydate" style="margin-left: 10px;width: 150px"
-          :options="entrydateOptions"></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="span">
                   <div style="display: flex; justify-content: center; align-items: center">
-                        <span  style="font-size: 18px" >点击柱状图可查看该学院&nbsp </span>
+                    <span style="font-size: 16px">点击柱状图可查看该学院&nbsp; </span>
-                        <span  style="font-size: 18px; color: red">各年级四级通过率</span>
+                    <span style="font-size: 16px; color: red">各年级四级通过率</span>
                   </div>
 
                   <!-- <span style=" font-size: 18px;">&nbsp 变化</span> -->
                 </div>
-                    <div id="map1" style="width: 100%; height: 600px"></div>
+                <div id="map1" style="width: 100%; height: 500px"></div>
-                  </div>
+              </a-card>
+            </a-col>
+            <a-col :xl="8">
+              <a-card :style="{ marginBottom: '12px' }">
+                <div id="map2" style="width: 100%; height: 230px"></div>
+              </a-card>
+              <a-card>
+                <div id="map3" style="width: 100%; height: 230px"></div>
+              </a-card>
             </a-col>
           </a-row>
         </a-card>
       </div>
-        </a-tab-pane>
-      </a-tabs>
     </a-card>
   </div>
 </template>
@@ -48,12 +42,9 @@
 <script>
   import { defHttp } from '/@/utils/http/axios';
   import * as echarts from 'echarts';
-import bar from '/@/components/Scrollbar/src/bar';
   import { message } from 'ant-design-vue';
-import { last } from 'xe-utils';
 
   export default {
-  name: 'Analysis',
     data() {
       return {
         activeKey: '1',
@@ -78,7 +69,7 @@ export default {
           getCollegeMajor: '/cet/getCollegeMajor',
           getRateByMajor: '/cet/getRateByMajor',
         },
-      tab1loading: false,
+        map1loading: false,
         tab2loading: false,
         tab3loading: false,
 
@@ -105,9 +96,18 @@ export default {
         lastCollegeEntrydate: [],
       };
     },
+    mounted() {
+      this.getCollegeOptions();
+      // this.getBatch();
+      this.getEntrydate();
+      this.allQuery();
+      this.getCollegeMajorData();
+      this.gradePassRate();
+      this.majorPassRate();
+    },
     methods: {
       allQuery() {
-      this.tab1loading = true;
+        this.map1loading = true;
         let college = ['全校'];
         let query = 'tab1';
         if (this.oneentrydate == null) {
@@ -184,12 +184,108 @@ export default {
           console.log(this.collegeOptions, 'collegeOptions');
         });
       },
+      // 年级通过率
+      async gradePassRate() {
+        var myChart = echarts.init(document.getElementById('map2'));
+        const getEntrydate = await defHttp.get({ url: this.Url.getEntrydate });
+        this.entrydateOptions = getEntrydate.entrydates;
+        let entrydate = this.entrydateOptions.map((item) => item.value);
+        const name = ['西语学院'];
+        let queryParams = {
+          college: name,
+          entrydate: entrydate,
+          level: 'cet4',
+        };
+        let url = this.Url.getCollegeRate;
+        console.log(queryParams, 'queryParams');
+        let result = await defHttp.post({ url: url, data: queryParams });
+
+        console.log(myChart, 'mychart');
+        if (!result) {
+          return;
+        }
+        console.log(result.data, 'result');
+        result = result.data[name];
+        let collegeOption = {
+          title: {
+            text: name + '四级通过率',
+            textStyle: {
+              fontSize: 14,
+            },
+          },
+          xAxis: {
+            data: result.map((item) => item.entrydate),
+          },
+          //显示数据
+          tooltip: {
+            trigger: 'axis',
+            axisPointer: {
+              type: 'shadow',
+            },
+            formatter: function (params) {
+              //生成tooltip,加上小圆球
+              let result = params[0].name + '<br>';
+              for (let i = 0; i < params.length; i++) {
+                result += params[i].marker + name + ' : ' + params[i].value + '%' + '<br>';
+              }
+              return result;
+            },
+          },
+          series: {
+            type: 'line',
+            data: result.map((item) => item.passRate),
+            label: {
+              show: true, // 开启标签显示
+              position: 'top', // 设置标签显示的位置为上方
+              formatter: function (params) {
+                // 在标签文本后面添加百分号
+                return params.value + '%';
+              },
+              // 你可以设置其他的标签样式选项，如颜色、字体大小等
+            },
+            universalTransition: {
+              // enabled: true,
+              // divideShape: 'clone',
+            },
+          },
+          yAxis: {},
+
+          animationDurationUpdate: 500,
+        };
+        myChart.setOption(collegeOption);
+      },
+      // 各专业通过率
+      majorPassRate() {
+        var myChart = echarts.init(document.getElementById('map3'));
+        var option = {
+          title: {
+            text: '西语学院各专业四级通过率',
+            textStyle: {
+              fontSize: 14,
+            },
+          },
+          xAxis: {
+            type: 'category',
+            data: ['英语', '翻译', '法语', '葡萄牙语', '西班牙语'],
+          },
+          yAxis: {
+            type: 'value',
+          },
+          series: [
+            {
+              data: [200, 150, 80, 70, 110, 130],
+              type: 'bar',
+            },
+          ],
+        };
+        myChart.setOption(option);
+      },
       dataChart(data, tab) {
         let seriesData = [];
         let xData = [];
         let colors = [
           '#5370c5',
-        '#91CC75',
+          '#ffffff',
           '#fac858',
           '#ee6666',
           '#73c0de',
@@ -251,7 +347,7 @@ export default {
             name: i + '级累计总通过率',
             type: 'bar',
             //设置柱状图大小
-          barWidth: 25,
+            barWidth: 1,
             data: yData,
             //柱子间距
             barGap: '30%',
@@ -298,7 +394,7 @@ export default {
                     textStyle: {
                       //数值样式
                       color: 'black',
-                    fontSize: 13,
+                      fontSize: 8,
                     },
                   },
                   color: colors[j++],
@@ -311,14 +407,15 @@ export default {
           }
         }
         let myChart = null;
-      if (tab == 'tab1') {
         myChart = echarts.init(document.getElementById('map1'));
-      }
         // 指定图表的配置项和数据
         // const college1 = this.college;
         let option = {
           title: {
             text: '本年级学院四级通过率排名',
+            textStyle: {
+              fontSize: 16,
+            },
           },
           tooltip: {
             trigger: 'axis',
@@ -396,14 +493,13 @@ export default {
           ],
           series: seriesData,
         };
-      if (tab == 'tab1') {
         option.series = [
           {
             name: '累计总通过率',
             type: 'bar',
             data: seriesData[0].data,
             //设置柱状图大小
-            barWidth: 25,
+            barWidth: 16,
             // barWidth: '60%',
             itemStyle: {
               normal: {
@@ -414,7 +510,7 @@ export default {
                   textStyle: {
                     //数值样式
                     color: 'black',
-                    fontSize: 13,
+                    fontSize: 10,
                   },
                 },
                 color: colors[0],
@@ -434,7 +530,6 @@ export default {
             color: colors[1],
           },
         ];
-      }
         myChart.setOption(option, true);
         // 使用刚指定的配置项和数据显示图表。
         myChart.on('click', async (params) => {
@@ -468,6 +563,9 @@ export default {
             let collegeOption = {
               title: {
                 text: name + '四级通过率',
+                textStyle: {
+                  fontSize: 14,
+                },
               },
               xAxis: {
                 data: result.map((item) => item.entrydate),
@@ -507,50 +605,17 @@ export default {
               yAxis: {},
 
               animationDurationUpdate: 500,
-            graphic: [
-              {
-                type: 'rect',
-                left: 30,
-                top: 43,
-                z: 1, // 确保矩形在文本下方
-                shape: {
-                  width: 55, // 矩形的宽度
-                  height: 30, // 矩形的高度
-                },
-                style: {
-                  fill: 'rgba(24, 144, 255)', // 矩形的填充色
-                },
-              },
-              {
-                type: 'text',
-                left: 35,
-                top: 50,
-                z: 2, // 确保文本在矩形上方
-                style: {
-                  text: '返 回',
-                  fontSize: 20,
-                  fill: 'white', // 设置文本颜色为白色
-                },
-                onclick: function () {
-                  
-                  myChart.setOption(option, true);
-                  let spanElement = document.getElementById('span');
-
-                  // 隐藏 span 元素
-                  spanElement.style.display = 'block';
-                
-                },
-              },
-            ],
             };
             console.log(collegeOption, 'collegeOption');
 
-          let spanElement = document.getElementById('span');
+            //let spanElement = document.getElementById('span');
 
             // 隐藏 span 元素
-          spanElement.style.display = 'none';
+            //spanElement.style.display = 'none';
+            var map2Chart = echarts.init(document.getElementById('map2'));
+            map2Chart.setOption(collegeOption, true);
+            //myChart.setOption(collegeOption, true);
 
-          myChart.setOption(collegeOption, true);
             console.log(myChart, 'mychart');
             // this.college = [params];
 
@@ -604,7 +669,7 @@ export default {
           // });
           console.log('data', result.data);
         } finally {
-        query == 'tab1' ? (this.tab1loading = false) : (this.tab2loading = false);
+          query == 'tab1' ? (this.map1loading = false) : (this.tab2loading = false);
           this.$nextTick(() => {
             if (query == 'tab1') {
               this.dataChart(result.data, query);
@@ -613,13 +678,6 @@ export default {
         }
       },
     },
-  mounted() {
-    this.getCollegeOptions();
-    // this.getBatch();
-    this.getEntrydate();
-    this.allQuery();
-    this.getCollegeMajorData();
-  },
   };
 </script>
 
@@ -635,9 +693,10 @@ export default {
   .query {
     //居左
     display: flex;
-  justify-content: flex-start;
+    justify-content: flex-end;
     align-items: center;
     margin-left: 24px;
+    padding-bottom: 10px;
   }
 
   .tab3 {

src/views/cet/cet-ana-2.vue

@@ -6,7 +6,50 @@
         <a-cascader v-model:value="collegeMajor" :options="collegeMajorOptions" change-on-select />
         <a-button style="margin-left: 10px" type="primary" @click="query">查询</a-button>
       </template>
+
+      <a-row :gutter="12">
+        <a-col :xl="16" :style="{ marginBottom: '24px' }">
+          <!-- 根据需求 删除 或 更改-->
+          <a-card class="tip">
+            <div style="display: flex">
+              <div v-if="topCollege != null">
+                <span style="font-size: 15px; padding-left: 100px">该数据为 </span>
+                <span style="color: red; font-size: 18px">{{ topCollege }}</span>
+                <span v-if="topMajor != null && topMajor != ''" style="color: red; font-size: 18px"> / {{ topMajor }}</span>
+                <span style="font-size: 15px"> 的四级通过率变化趋势 </span>
+              </div>
+            </div>
+          </a-card>
+
+          <a-card>
+            <!--<template #extra>
+              <div style="display: flex">
+                <div v-if="topCollege != null">
+                  <span style="font-size: 15px; padding-left: 100px">该数据为 </span>
+                  <span style="color: red; font-size: 18px">{{ topCollege }}</span>
+                  <span v-if="topMajor != null && topMajor != ''" style="color: red; font-size: 18px"> / {{ topMajor }}</span>
+                  <span style="font-size: 15px"> 的四级通过率变化趋势 </span>
+                </div>
+              </div>
+            </template>-->
             <div>
+              <div id="map1" style="width: 100%; height: 400px"></div>
+            </div>
+          </a-card>
+        </a-col>
+
+        <a-col :xl="8">
+          <a-card style="margin-bottom: 10px">
+            <div style="width: 100%; height: 210px; padding: 10px" class="participate_Piechart" id="participate_Piechart"></div>
+          </a-card>
+
+          <a-card>
+            <div style="width: 100%; height: 210px; padding: 10px" class="pass_Piechart" id="pass_Piechart"></div>
+          </a-card>
+        </a-col>
+      </a-row>
+
+      <!-- <div>
         <a-row :gutter="24">
           <a-col :xl="24" :style="{ marginBottom: '24px' }">
             <div class="container">
@@ -23,7 +66,7 @@
             </div>
           </a-col>
         </a-row>
-      </div>
+      </div> -->
     </a-card>
   </div>
 </template>
@@ -33,7 +76,6 @@ import { defHttp } from '/@/utils/http/axios';
   import * as echarts from 'echarts';
 
   export default {
-  name: 'Analysis',
     data() {
       return {
         Url: {
@@ -58,6 +100,11 @@ export default {
         topMajor: null, //顶部解释行
       };
     },
+    mounted() {
+      this.getCollegeMajorData();
+      this.getBatch();
+      this.query();
+    },
     methods: {
       dataChart(data) {
         let xData = [];
@@ -77,7 +124,7 @@ export default {
             type: 'category',
             data: xData,
             axisLabel: {
-            interval: 0, //代表显示所有x轴标签显示
+              interval: 1, //代表显示所有x轴标签显示
               rotate: -10, //代表倾斜30度显示
             },
           },
@@ -134,6 +181,211 @@ export default {
         // 使用刚指定的配置项和数据显示图表。
         myChart.setOption(option);
       },
+
+      //绘画饼图--每个批次通过-数据分析
+      draPieChart_Pass() {
+        //console.log(this.passRatePie);
+        //console.log('piedata', piedata);
+        let myChart = echarts.init(document.getElementById('pass_Piechart'));
+
+        let option = {
+          tooltip: {
+            trigger: '',
+            conginee: false,
+            //字体大小
+            itemStytle: {
+              fontSize: 100,
+            },
+          },
+          title: {
+            //text: '学院/专业每个批次通过人数饼图',
+            left: 'left',
+            top: '0%',
+            textStyle: {
+              fontSize: 14,
+            },
+          },
+          legend: {
+            top: '5%',
+            left: 'center',
+          },
+          color: ['#b3cde0', '#6497b1', '#005b96', '#03396c', '#e5e5e5'],
+
+          series: [
+            {
+              name: '学院/专业每个批次通过人数饼图',
+              type: 'pie',
+              radius: ['0', '100%'],
+              top: 80,
+              itemStyle: {
+                borderRadius: 5,
+                borderColor: '#fff',
+                borderWideth: 2,
+              },
+              label: {
+                show: true,
+                fontSize: 14,
+                overflow: 'truncate',
+              },
+              emphasis: {
+                itemStyle: {
+                  shadowBlur: 10,
+                  shadowOffsetX: 0,
+                  shadowColor: 'rgba(0, 0, 0, 0.5)',
+                },
+                label: {
+                  show: true,
+                  fontSize: 15,
+                  fontWeight: 'bold',
+                },
+              },
+              data: [
+                { value: 1048, name: '计算机' },
+                { value: 735, name: '东语' },
+                { value: 580, name: '物理' },
+                { value: 484, name: '大数据' },
+                { value: 300, name: '树莓' },
+              ],
+            },
+          ],
+        };
+        myChart.setOption(option);
+      },
+
+      //绘画饼图--每个批次参与人数-数据分析
+      draPieChart_Participate() {
+        //console.log(this.passRatePie);
+        //console.log('piedata', piedata);
+        let myChart = echarts.init(document.getElementById('participate_Piechart'));
+
+        let option = {
+          tooltip: {
+            trigger: 'item',
+            conginee: false,
+            //字体大小
+            itemStytle: {
+              // 设置阴影效果
+              shadowBlur: 10, // 阴影模糊大小
+              shadowColor: 'rgba(0, 0, 0, 0.3)', // 阴影颜色
+              shadowOffsetX: 5, // 阴影水平方向偏移
+              shadowOffsetY: 5, // 阴影垂直方向偏移
+              fontSize: 100,
+            },
+          },
+          // title: {
+          //   text: '学院/专业该批次通过人数饼图',
+          //   left: 'top',
+          //   top: '0%',
+          //   textStyle: {
+          //     fontSize: 12,
+          //   },
+          // },
+          legend: {
+            top: '5%',
+            left: 'center',
+            // orient: 'vertical',
+            itemGap: 3,
+            selectedMode: true,
+            // inactiveColor: '#ccc',
+            // icon: 'circle',
+
+            // formatter: function (name) {
+            //   var value;
+            //   for (var i = 0; i < data.length; i++){
+            //     if(data[i].name == name){
+            //       value = data[i].value;
+            //     }
+            //   }
+            //   return name + ' : ' + Math.round(value / num * 10000) / 100 + "%";
+            // },
+          },
+          color: ['#b3cde0', '#6497b1', '#005b96', '#03396c', '#e5e5e5'],
+          series: [
+            {
+              name: '学院/专业该批次通过人数饼图',
+              type: 'pie',
+              radius: ['50%', '100%'],
+              center: ['50%', '50%'],
+              startAngle: 130,
+              top: 80,
+              //暂时没有
+              itemStyle: {
+                // borderRadius: 5,
+                // borderColor: '#fff',
+                borderWidth: 2,
+              },
+              label: {
+                show: true,
+                // position: 'inside',
+                fontSize: 12,
+                overflow: 'truncate',
+              },
+              labelLine: {
+                show: true,
+                smooth: true,
+                length: 10,
+              },
+              emphasis: {
+                itemStyle: {
+                  shadowBlur: 10,
+                  shadowOffsetX: 0,
+                  shadowColor: 'rgba(0, 0, 0, 0.5)',
+                },
+                label: {
+                  show: true,
+                  fontSize: 15,
+                  fontWeight: 'bold',
+                },
+              },
+              data: [
+                { value: 1048, name: '计算机' },
+                { value: 735, name: '东语' },
+                { value: 580, name: '物理' },
+                { value: 484, name: '大数据' },
+                { value: 300, name: '树莓' },
+              ],
+            },
+            {
+              type: 'pie',
+              startAngle: 130,
+              top: 80,
+              radius: ['40%', '51%'],
+              center: ['50%', '50%'],
+              //暂时没有
+              itemStyle: {
+                // borderRadius: 3,
+                // borderColor: '#fff',
+                borderWidth: 2,
+              },
+              label: {
+                show: false,
+              },
+              hoverAnimation: false,
+              legendHoverLink: false,
+              // animationn：false,
+              tooltip: {
+                show: false,
+              },
+              data: [
+                { value: 1048, name: '计算机' },
+                { value: 735, name: '东语' },
+                { value: 580, name: '物理' },
+                { value: 484, name: '大数据' },
+                { value: 300, name: '树莓' },
+              ],
+            },
+          ],
+        };
+        myChart.setOption(option);
+        myChart.dispatchAction({
+          type: 'highlight',
+          seriesIndex: 1,
+        });
+        window.addEventListener('resize', function () {
+          myChart.resize();
+        });
+      },
+
       // 获取批次数据
       async getBatch() {
         const getBatch = await defHttp.get({ url: this.Url.getBatch });
@@ -169,7 +421,6 @@ export default {
         let data = null;
         console.log(this.collegeMajor, 'collegeMajor');
         try {
-
           //如果this.collegeMajor为null则先赋个值
           if (!this.collegeMajor) {
             this.collegeMajor = ['东语学院', '日语'];
@@ -182,7 +433,7 @@ export default {
           this.topCollege = college;
           this.topMajor = major;
           this.loading = true;
-        console.log(college, major, "college,major");
+          console.log(college, major, 'college,major');
           let params = {
             college: college,
             major: major,
@@ -193,15 +444,12 @@ export default {
           this.loading = false;
           this.$nextTick(() => {
             this.dataChart(data);
+            this.draPieChart_Pass();
+            this.draPieChart_Participate();
           });
         }
       },
     },
-  mounted() {
-    this.getCollegeMajorData();
-    this.getBatch();
-    this.query();
-  },
   };
 </script>
 
@@ -219,4 +467,9 @@ export default {
     color: rgb(8, 8, 8);
     font-weight: bold;
   }
+  .tip {
+    margin-bottom: 10px;
+    background-color: #d0e5fe;
+    opacity: 0.9;
+  }
 </style>

src/views/cet/cet-ana-3.vue

@@ -1,13 +1,56 @@
 <template>
   <div style="background: #ececec; padding: 15px">
-    <a-card title="按批次对比分析" :loading="loading" :bordered="false">
+    <a-card title="按单批次对比分析" :loading="loading" :bordered="false">
       <template #extra>
-        <a-select v-model:value="collegeMajor" style="width: 300px" :options="collegeMajorOptions"></a-select>
+        <a-select v-model:value="collegeMajor" style="width: 300px" :options="collegeMajorOptions" />
-        <a-select v-model:value="batch" :options="batchOptions" change-on-select
+        <a-select v-model:value="batch" :options="batchOptions" change-on-select style="margin-left: 10px; width: 120px" />
-          style="margin-left: 10px;width: 120px" />
+        <a-button style="margin-left: 10px" type="primary" @click="query">查询</a-button>
-        <a-button style="margin-left: 10px;" type="primary" @click="query">查询</a-button>
       </template>
+
+      <a-row :grutter="24">
+        <a-col :xl="16" :style="{ marginBottom: '24px' }">
+          <!-- 根据需求 删除 或 更改-->
+          <a-card style="margin-bottom: 10px" class="tip">
+            <div style="display: flex">
+              <div v-if="topCollege != null">
+                <span style="color: red; font-size: 18px; padding-left: 100px"> {{ topCollege }}</span>
+                <span style="font-size: 15px"> 在 </span>
+                <span style="color: red; font-size: 18px"> {{ topBath }} </span>
+                <span style="font-size: 15px"> 批次的四级通过率为：</span>
+                <span style="color: red; font-size: 18px"> {{ sumRate }}%</span>
+              </div>
+            </div>
+          </a-card>
+
+          <a-card>
+            <!--<template #extra>
+              <div style="display: flex">
+                <div v-if="topCollege != null">
+                  <span style="color: red; font-size: 18px; padding-left: 100px"> {{ topCollege }}</span>
+                  <span style="font-size: 15px"> 在 </span>
+                  <span style="color: red; font-size: 18px"> {{ topBath }} </span>
+                  <span style="font-size: 15px"> 批次的四级通过率为：</span>
+                  <span style="color: red; font-size: 18px"> {{ sumRate }}%</span>
+                </div>
+              </div>
+            </template>-->
             <div>
+              <div id="map1" style="width: 100%; height: 400px"></div>
+            </div>
+          </a-card>
+        </a-col>
+
+        <a-col :xl="8" style="padding-left: 10px">
+          <a-card style="margin-bottom: 10px">
+            <div style="width: 100%; height: 210px; padding: 10px" class="participate_Piechart" id="participate_Piechart"></div>
+          </a-card>
+          <a-card>
+            <div style="width: 100%; height: 210px; padding: 10px" class="pass_Piechart" id="pass_Piechart"></div>
+          </a-card>
+        </a-col>
+      </a-row>
+
+      <!-- <div>
         <a-row :gutter="24">
           <a-col :xl="24" :style="{ marginBottom: '24px' }">
             <div class="container">
@@ -25,26 +68,23 @@
             </div>
           </a-col>
         </a-row>
-      </div>
+      </div> -->
     </a-card>
   </div>
 </template>
 
 <script>
-import { result } from 'lodash-es';
   import { defHttp } from '/@/utils/http/axios';
   import * as echarts from 'echarts';
 
   export default {
-  name: "Analysis",
-
     data() {
       return {
         Url: {
           getBatch: '/cet/getBatch',
           getCollege: '/cet/getCollege',
           getRate: '/cet/getRateByBatch',
-        getCollegeMajor: '/cet/getCollegeMajor'
+          getCollegeMajor: '/cet/getCollegeMajor',
         },
         loading: false,
         collegeOptions: [],
@@ -52,7 +92,7 @@ export default {
         batchOptions: [],
         levelOptions: [
           { value: 'cet4', label: '英语四级' },
-        { value: 'cet6', label: '英语六级' }
+          { value: 'cet6', label: '英语六级' },
         ],
         level: null,
         college: null,
@@ -63,6 +103,11 @@ export default {
         topBath: null, //顶部选择器选择的批次
       };
     },
+    mounted() {
+      this.getCollegeMajorData();
+      this.getBatch();
+      this.query();
+    },
     methods: {
       dataChart(data) {
         let xData = [];
@@ -70,10 +115,10 @@ export default {
         for (let key in data) {
           xData.push(key);
           // 将数据转换为百分比（加上%）
-        yData.push((data[key]).toFixed(1));
+          yData.push(data[key].toFixed(1));
         }
-      xData = xData.map(label => label.split("").join("\n"));//将x轴竖着展示
+        xData = xData.map((label) => label.split('').join('\n')); //将x轴竖着展示
-      let myChart = echarts.init(document.getElementById("map1"));
+        let myChart = echarts.init(document.getElementById('map1'));
         // 指定图表的配置项和数据
         let option = {
           title: {
@@ -85,21 +130,30 @@ export default {
             axisLabel: {
               interval: 0, //代表显示所有x轴标签显示
               rotate: 0, //代表倾斜30度显示
-          }
+            },
           },
           //提示框
           tooltip: {
             trigger: 'axis',
             axisPointer: {
-            type: 'shadow'
+              type: 'shadow',
             },
             formatter: function (params) {
-            return params[0].name + '<br/>' +
+              return (
+                params[0].name +
+                '<br/>' +
                 '<table>' +
-              '<tr><td>' + params[0].marker + '</td><td style="font-weight: bold;">' + '&nbsp;&nbsp;&nbsp;&nbsp;' + params[0].value + '%' + '</td></tr>' +
+                '<tr><td>' +
-              '<tr>'
+                params[0].marker +
-              + '</table>';
+                '</td><td style="font-weight: bold;">' +
-          }
+                '&nbsp;&nbsp;&nbsp;&nbsp;' +
+                params[0].value +
+                '%' +
+                '</td></tr>' +
+                '<tr>' +
+                '</table>'
+              );
+            },
           },
           toolbox: {
             // show: true,
@@ -114,14 +168,14 @@ export default {
             left: '3%',
             right: '4%',
             bottom: '1%', //网格距离容器底部的距离是容器高度的3%
-          containLabel: true
+            containLabel: true,
           },
           yAxis: {
             type: 'value',
             name: '通过率',
             axisLabel: {
-            formatter: '{value} %'
+              formatter: '{value} %',
-          }
+            },
           },
           series: [
             {
@@ -132,16 +186,17 @@ export default {
                   label: {
                     show: true, //开启显示
                     position: 'top', //在上方显示
-                  textStyle: { //数值样式
+                    textStyle: {
+                      //数值样式
                       color: 'black',
-                    fontSize: 12
+                      fontSize: 12,
                     },
                     formatter: '{c}%',
-                }
+                  },
-              }
+                },
-            }
+              },
-          }
+            },
-        ]
+          ],
         };
         // 使用刚指定的配置项和数据显示图表。
         myChart.setOption(option);
@@ -149,11 +204,11 @@ export default {
       // 获取批次数据
       async getBatch() {
         const getBatch = await defHttp.get({ url: this.Url.getBatch });
-      this.batchOptions = getBatch.batches.map(item => {
+        this.batchOptions = getBatch.batches.map((item) => {
           return {
             value: item.value,
-          label: item.label
+            label: item.label,
-        }
+          };
         });
         // const getCollege = await defHttp.get({ url: this.Url.getCollege });
 
@@ -169,21 +224,21 @@ export default {
         const res = await defHttp.get({ url: this.Url.getCollegeMajor });
 
         //通过map方法将数据转换为级联选择器需要的数据格式
-      this.collegeMajorOptions = res.collegeMajor.map(item => {
+        this.collegeMajorOptions = res.collegeMajor.map((item) => {
           return {
             value: item.college,
             label: item.college,
-          children: item.major.map(major => {
+            children: item.major.map((major) => {
               return {
                 value: major,
-              label: major
+                label: major,
-            }
+              };
-          })
+            }),
-        }
+          };
         });
         this.collegeMajorOptions.unshift({ value: '全校', label: '全校' });
         this.collegeMajor = this.collegeMajorOptions[0].value;
-      console.log(this.collegeMajor)
+        console.log(this.collegeMajor);
         console.log(this.collegeMajorOptions);
       },
       // 查询数据
@@ -198,7 +253,7 @@ export default {
             this.collegeMajor = '全校';
           }
           //如果this.batch[1]不存在则设为null
-        let major = this.batch.length > 1 ? this.batch[1] : "";
+          let major = this.batch.length > 1 ? this.batch[1] : '';
           this.topCollege = this.collegeMajor;
           this.topBath = this.batch;
           this.loading = true;
@@ -206,25 +261,226 @@ export default {
             batch: this.batch,
             college: this.collegeMajor,
             level: 'cet4',
-        }
+          };
           resultData = await defHttp.get({ url: this.Url.getRate, params });
           this.sumRate = resultData.sumRate;
-        console.log("result", resultData)
+          console.log('result', resultData);
         } finally {
           this.loading = false;
           this.$nextTick(() => {
             this.dataChart(resultData.data);
-        })
+            this.draPieChart_Pass();
-      }
+            this.draPieChart_Participate();
+          });
         }
       },
-  mounted() {
-    this.getCollegeMajorData();
-    this.getBatch();
-    this.query();
-  }
 
-}
+      //绘画饼图--cet4通过的数据分析
+      draPieChart_Pass() {
+        //console.log(this.passRatePie);
+        //console.log('piedata', piedata);
+        let myChart = echarts.init(document.getElementById('pass_Piechart'));
+
+        let option = {
+          tooltip: {
+            trigger: 'item',
+            conginee: false,
+            //字体大小
+            itemStytle: {
+              fontSize: 100,
+            },
+          },
+          //title: {
+          //  text: '学院/专业该批次通过人数饼图',
+          //  left: 'top',
+          //  top: '0%',
+          //  textStyle: {
+          //    fontSize: 12,
+          //  },
+          //},
+          legend: {
+            top: '5%',
+            left: 'center',
+          },
+          color: ['#ec2e30', '#c75af1', '#2b9eef', '#eee03f', '#2aed91', '#c5ed3c'],
+
+          series: [
+            {
+              name: '学院/专业该批次通过人数饼图',
+              type: 'pie',
+              radius: ['0', '100%'],
+              top: 80,
+              itemStyle: {
+                borderRadius: 5,
+                borderColor: '#fff',
+                borderWideth: 2,
+              },
+              label: {
+                show: true,
+                fontSize: 12,
+                overflow: 'truncate',
+              },
+              emphasis: {
+                itemStyle: {
+                  shadowBlur: 10,
+                  shadowOffsetX: 0,
+                  shadowColor: 'rgba(0, 0, 0, 0.5)',
+                },
+                label: {
+                  show: true,
+                  fontSize: 15,
+                  fontWeight: 'bold',
+                },
+              },
+              data: [
+                { value: 1048, name: '你好' },
+                { value: 735, name: '不好' },
+                { value: 580, name: '孤寡' },
+                { value: 484, name: '小鸟伏特加' },
+                { value: 300, name: '喜喜' },
+              ],
+            },
+          ],
+        };
+        myChart.setOption(option);
+      },
+
+      //绘画饼图--参与人数数据分析
+      draPieChart_Participate() {
+        //console.log(this.passRatePie);
+        //console.log('piedata', piedata);
+        let myChart = echarts.init(document.getElementById('participate_Piechart'));
+
+        let option = {
+          tooltip: {
+            trigger: 'item',
+            conginee: false,
+            //字体大小
+            itemStytle: {
+              // 设置阴影效果
+              shadowBlur: 10, // 阴影模糊大小
+              shadowColor: 'rgba(0, 0, 0, 0.3)', // 阴影颜色
+              shadowOffsetX: 5, // 阴影水平方向偏移
+              shadowOffsetY: 5, // 阴影垂直方向偏移
+              fontSize: 100,
+            },
+          },
+          // title: {
+          //   text: '学院/专业该批次通过人数饼图',
+          //   left: 'top',
+          //   top: '0%',
+          //   textStyle: {
+          //     fontSize: 12,
+          //   },
+          // },
+          legend: {
+            top: '5%',
+            left: 'center',
+            // orient: 'vertical',
+            itemGap: 3,
+            selectedMode: true,
+            // inactiveColor: '#ccc',
+            // icon: 'circle',
+
+            // formatter: function (name) {
+            //   var value;
+            //   for (var i = 0; i < data.length; i++){
+            //     if(data[i].name == name){
+            //       value = data[i].value;
+            //     }
+            //   }
+            //   return name + ' : ' + Math.round(value / num * 10000) / 100 + "%";
+            // },
+          },
+          color: ['#ec2e30', '#c75af1', '#2b9eef', '#eee03f', '#2aed91', '#c5ed3c'],
+
+          series: [
+            {
+              name: '学院/专业该批次通过人数饼图',
+              type: 'pie',
+              radius: ['50%', '100%'],
+              center: ['50%', '50%'],
+              startAngle: 130,
+              top: 80,
+              //暂时没有
+              itemStyle: {
+                // borderRadius: 5,
+                // borderColor: '#fff',
+                borderWidth: 2,
+              },
+              label: {
+                show: true,
+                // position: 'inside',
+                fontSize: 12,
+                overflow: 'truncate',
+              },
+              labelLine: {
+                show: true,
+                smooth: true,
+                length: 10,
+              },
+              emphasis: {
+                itemStyle: {
+                  shadowBlur: 10,
+                  shadowOffsetX: 0,
+                  shadowColor: 'rgba(0, 0, 0, 0.5)',
+                },
+                label: {
+                  show: true,
+                  fontSize: 15,
+                  fontWeight: 'bold',
+                },
+              },
+              data: [
+                { value: 1048, name: '你好' },
+                { value: 735, name: '不好' },
+                { value: 580, name: '孤寡' },
+                { value: 484, name: '小鸟伏特加' },
+                { value: 300, name: '喜喜' },
+              ],
+            },
+            {
+              type: 'pie',
+              startAngle: 130,
+              top: 80,
+              radius: ['40%', '51%'],
+              center: ['50%', '50%'],
+              //暂时没有
+              itemStyle: {
+                // borderRadius: 3,
+                // borderColor: '#fff',
+                borderWidth: 2,
+              },
+              label: {
+                show: false,
+              },
+              hoverAnimation: false,
+              legendHoverLink: false,
+              // animationn：false,
+              tooltip: {
+                show: false,
+              },
+              data: [
+                { value: 1048, name: '你好' },
+                { value: 735, name: '不好' },
+                { value: 580, name: '孤寡' },
+                { value: 484, name: '小鸟伏特加' },
+                { value: 300, name: '喜喜' },
+              ],
+            },
+          ],
+        };
+        myChart.setOption(option);
+        myChart.dispatchAction({
+          type: 'highlight',
+          seriesIndex: 1,
+        });
+        window.addEventListener('resize', function () {
+          myChart.resize();
+        });
+      },
+    },
+  };
 </script>
 
 <style lang="less" scoped>
@@ -241,4 +497,9 @@ export default {
     color: rgb(8, 8, 8);
     font-weight: bold;
   }
+  .tip {
+    margin-bottom: 10px;
+    background-color: #d0e5fe;
+    opacity: 0.9;
+  }
 </style>

src/views/cet/cet-ana-college.vue

@@ -1,9 +1,6 @@
 <template>
-  <div>
+  <div style="background: #ececec; padding: 15px">
-    <div>
     <a-card :bordered="false">
-        <a-tabs v-model:activeKey="activeKey" type="card">
-          <a-tab-pane key="1" tab="对比多学院四级通过率">
       <div class="query">
         <div>
           <div style="display: flex">
@@ -19,64 +16,36 @@
             <a-checkbox-group :options="collegeOptions" v-model:value="collegetab2" @change="onCollegeChange" />
           </div>
 
-                <div style="margin-top: 20px; margin-right: 20px; display: flex; justify-content: flex-end; align-items: center">
+          <div style="margin-top: 10px; margin-right: 20px; display: flex; justify-content: flex-end; align-items: center">
             <a-button style="margin-left: 10px" type="primary" @click="clearCollege">清除</a-button>
             <a-button style="margin-left: 10px" type="primary" @click="collegeQuery">查询</a-button>
           </div>
         </div>
-
-              <!-- <a-select
-                v-model:value="collegetab2"
-                style="width: 300px; margin-right: 20px"
-                mode="multiple"
-                :max-tag-count="5"
-                :options="collegeOptions"
-                @change="onCollegeChange"
-              ></a-select> -->
-
-              <!-- <a-select
-                v-model:value="collegeentrydate"
-                style="width: 200px"
-                :options="entrydateOptions"
-                mode="multiple"
-                :max-tag-count="5"
-                @change="onCollegeChange"
-              ></a-select> -->
       </div>
-          </a-tab-pane>
-        </a-tabs>
     </a-card>
-      <a-card title="按学院分析" :loading="tab2loading" :bordered="false">
+    <a-card title="学院四级通过率对比" :loading="tab2loading" :bordered="false">
-        <template #extra>
+      <a-row :gutter="12">
-          <!-- <a-select v-model:value="college" style="width: 300px" mode="multiple" :max-tag-count="2"
+        <a-col :xl="14">
-          :options="collegeOptions" @change="onCollegeMajorChange"></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-select v-model:value="entrydate" style="margin-left: 10px;width: 150px"
-          :options="entrydateOptions"></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="map2" style="width: 100%; height: 600px"></div>
+            <div id="map2" style="width: 100%; min-height: 400px"></div>
+          </div>
+        </a-col>
+        <a-col :xl="10">
+          <div class="container">
+            <div id="map3" style="width: 100%; min-height: 400px"></div>
           </div>
         </a-col>
       </a-row>
     </a-card>
   </div>
-  </div>
 </template>
 
 <script>
   import { defHttp } from '/@/utils/http/axios';
   import * as echarts from 'echarts';
-import bar from '/@/components/Scrollbar/src/bar';
   import { message } from 'ant-design-vue';
-import { last } from 'xe-utils';
 
   export default {
-  name: 'Analysis',
     data() {
       return {
         activeKey: '1',
@@ -127,6 +96,13 @@ export default {
         lastCollegeEntrydate: [],
       };
     },
+    mounted() {
+      this.getCollegeOptions();
+      // this.getBatch();
+      this.getEntrydate();
+      this.allQuery();
+      this.getCollegeMajorData();
+    },
     methods: {
       onMajorChange(value) {
         console.log(value, 'value');
@@ -462,7 +438,7 @@ export default {
             name: i,
             type: 'bar',
             //设置柱状图大小
-          barWidth: 25,
+            barWidth: 16,
             data: yData,
             //柱子间距
             barGap: '30%',
@@ -476,7 +452,7 @@ export default {
                   textStyle: {
                     //数值样式
                     color: 'black',
-                  fontSize: 13,
+                    fontSize: 10,
                   },
                 },
                 color: colors[k++],
@@ -489,7 +465,6 @@ export default {
         // debugger
         let myChart = null;
         console.log(tab, 'tab');
-      if (tab == 'tab2') {
         myChart = document.getElementById('map2');
         if (myChart) {
           myChart = echarts.getInstanceByDom(myChart);
@@ -498,21 +473,14 @@ export default {
           }
         }
         myChart = echarts.init(document.getElementById('map2'));
-      } else if (tab == 'tab3') {
-        myChart = document.getElementById('map3');
-        if (myChart) {
-          myChart = echarts.getInstanceByDom(myChart);
-          if (myChart) {
-            myChart.dispose();
-          }
-        }
-        myChart = echarts.init(document.getElementById('map3'));
-      }
         // 指定图表的配置项和数据
         let option = {
-        title: {
+          //title: {
-          text: '学院四级通过率对比',
+          //  text: '学院四级通过率对比',
-        },
+          //  textStyle: {
+          //    fontSize: 14,
+          //  },
+          //},
           legend: {},
           tooltip: {
             trigger: 'axis',
@@ -528,14 +496,14 @@ export default {
               return result;
             },
           },
-        toolbox: {
+          //toolbox: {
-          show: true,
+          //  show: true,
-          feature: {
+          //  feature: {
-            magicType: { show: true, type: ['line', 'bar'] },
+          //    magicType: { show: true, type: ['line', 'bar'] },
-            restore: { show: true },
+          //    restore: { show: true },
-            saveAsImage: { show: true },
+          //    saveAsImage: { show: true },
-          },
+          //  },
-        },
+          //},
           grid: {
             left: '3%',
             right: '4%',
@@ -570,10 +538,15 @@ export default {
           myChart.setOption(option);
         }, 1);
       },
-
+      drawChart2(data, tab) {
-    dataChart(data, tab) {
         let seriesData = [];
-      let xData = [];
+
+        let xData = this.majorentrydate.sort((a, b) => a - b);
+        if (tab == 'tab2') {
+          xData = this.collegeentrydate.sort((a, b) => a - b);
+        }
+        let k = 0;
+        let legendData = [];
         let colors = [
           '#5370c5',
           '#91CC75',
@@ -622,23 +595,26 @@ export default {
           '#FAFAD2',
           '#FAF0E6  ',
         ];
-      let j = 0;
+        let isJK = false;
-
         for (let i in data) {
-        xData = [];
+          console.log(i, 'i');
+          legendData.push(i);
           let yData = [];
-        for (let key in data[i]) {
+          // legendData=[];
-          xData.push(data[i][key].college);
+          console.log(data[i], 'data[i]');
-          // 将数据转换为百分比（加上%）
-          yData.push(data[i][key].passRate);
-        }
 
-        xData = xData.map((label) => label.split('').join('\n')); //将x轴竖着展示
+          for (let j in data[i]) {
+            console.log(data[i][j].college, 'data[i][j].college111');
+            // if(data[i][j].college == ''){
+            yData.push(data[i][j].passRate);
+            // legendData.push(data[i][j].college);
+          }
+          console.log(yData, 'yData');
           seriesData.push({
-          name: i + '级累计总通过率',
+            name: i,
-          type: 'bar',
+            type: 'line',
             //设置柱状图大小
-          barWidth: 25,
+            barWidth: 18,
             data: yData,
             //柱子间距
             barGap: '30%',
@@ -652,65 +628,28 @@ export default {
                   textStyle: {
                     //数值样式
                     color: 'black',
-                  fontSize: 13,
+                    fontSize: 10,
                   },
                 },
-              color: colors[j++],
+                color: colors[k++],
               },
             },
           });
-        if (j == colors.length) {
-          j = 0;
-        }
-        let rankData = yData
-          .slice()
-          .sort((a, b) => b - a)
-          .map((value) => yData.indexOf(value) + 1);
-        //如果选择全校，增加排名
-        if (tab == 'tab1') {
-          seriesData.push({
-            name: i + '级累计总通过率排名',
-            type: 'line',
-            yAxisIndex: 1,
-            data: rankData,
-            bar: {},
-            show: false,
-
-            itemStyle: {
-              normal: {
-                label: {
-                  show: false, //开启显示
-                  position: 'top', //在上方显示
-                  formatter: '{c}',
-                  textStyle: {
-                    //数值样式
-                    color: 'black',
-                    fontSize: 13,
-                  },
-                },
-                color: colors[j++],
-              },
-            },
-          });
-          if (j == colors.length) {
-            j = 0;
-          }
-        }
         }
+        // debugger
         let myChart = null;
-      if (tab == 'tab2') {
+        console.log(tab, 'tab');
-        myChart = echarts.init(document.getElementById('map2'));
+        myChart = document.getElementById('map3');
-      } else if (tab == 'tab1') {
+        if (myChart) {
-        myChart = echarts.init(document.getElementById('map1'));
+          myChart = echarts.getInstanceByDom(myChart);
-      } else if (tab == 'tab3') {
+          if (myChart) {
-        myChart = echarts.init(document.getElementById('map3'));
+            myChart.dispose();
           }
+        }
+        myChart = echarts.init(document.getElementById('map3'));
         // 指定图表的配置项和数据
-      // const college1 = this.college;
         let option = {
-        title: {
+          legend: {},
-          text: '本批次学院通过率排名',
-        },
           tooltip: {
             trigger: 'axis',
             axisPointer: {
@@ -718,43 +657,21 @@ export default {
             },
             formatter: function (params) {
               //生成tooltip,加上小圆球
-            let result = params[0].name + '<br>';
+              let result = params[0].name + '级通过率<br>';
               for (let i = 0; i < params.length; i++) {
-              result += params[i].marker + params[i].seriesName + ' : ' + params[i].value + '%' + '<br>';
+                result += params[i].marker + legendData[i] + ' : ' + params[i].value + '%' + '<br>';
-            }
-            if (tab == 'tab1') {
-              result =
-                params[0].name +
-                '<br/>' +
-                '<table>' +
-                '<tr><td>' +
-                params[0].marker +
-                params[0].seriesName +
-                '</td><td style="font-weight: bold;">' +
-                '&nbsp;&nbsp;&nbsp;&nbsp;' +
-                params[0].value +
-                '%' +
-                '</td></tr>' +
-                '<tr><td>' +
-                params[1].marker +
-                params[1].seriesName +
-                '</td><td style="font-weight: bold;">' +
-                '&nbsp;&nbsp;&nbsp;&nbsp;' +
-                params[1].value +
-                '</td></tr>' +
-                '</table>';
               }
               return result;
             },
           },
-        toolbox: {
+          //toolbox: {
-          show: true,
+          //  show: true,
-          feature: {
+          //  feature: {
-            magicType: { show: true, type: ['line', 'bar'] },
+          //    magicType: { show: true, type: ['line', 'bar'] },
-            restore: { show: true },
+          //    restore: { show: true },
-            saveAsImage: { show: true },
+          //    saveAsImage: { show: true },
-          },
+          //  },
-        },
+          //},
           grid: {
             left: '3%',
             right: '4%',
@@ -779,56 +696,15 @@ export default {
                 formatter: '{value} %',
               },
             },
-          {
-            type: 'value',
-            name: '排名',
-            show: false,
-          },
           ],
           series: seriesData,
         };
-      if (tab == 'tab1') {
-        option.series = [
-          {
-            name: '累计总通过率',
-            type: 'bar',
-            data: seriesData[0].data,
-            //设置柱状图大小
-            barWidth: 25,
-            // barWidth: '60%',
-            itemStyle: {
-              normal: {
-                label: {
-                  show: true, //开启显示
-                  position: 'top', //在上方显示
-                  formatter: '{c}%',
-                  textStyle: {
-                    //数值样式
-                    color: 'black',
-                    fontSize: 13,
-                  },
-                },
-                color: colors[0],
-              },
-            },
-          },
-          {
-            name: '排名',
-            type: 'bar',
-            data: seriesData[1].data,
-            label: {
-              show: false,
-              position: 'inside',
-              formatter: '{c}',
-            },
-            yAxisIndex: 1,
-            color: colors[1],
-          },
-        ];
-      }
         // 使用刚指定的配置项和数据显示图表。
-
+        console.log(option, 'option');
+        console.log(myChart, 'myChart');
+        setTimeout(() => {
           myChart.setOption(option);
+        }, 1);
       },
       // 获取批次数据
       async getBatch() {
@@ -882,18 +758,12 @@ export default {
               this.dataChart(result.data, query);
             } else if (query == 'tab2') {
               this.drawChart(result.data, query);
+              this.drawChart2(result.data, query);
             }
           });
         }
       },
     },
-  mounted() {
-    this.getCollegeOptions();
-    // this.getBatch();
-    this.getEntrydate();
-    this.allQuery();
-    this.getCollegeMajorData();
-  },
   };
 </script>
 

src/views/dashboard/Analysis/index.vue

@@ -3,42 +3,43 @@
     <a-card title="四级总通过率查询" :loading="loading" :bordered="false">
       <template #extra>
         <a-cascader v-model:value="collegeMajor" :options="collegeMajorOptions" change-on-select />
-        <a-select v-model:value="entrydate" style="margin-left: 10px;width: 100px"
+        <a-select v-model:value="entrydate" style="margin-left: 10px; width: 100px" :options="entrydateOptions" />
-          :options="entrydateOptions"></a-select>
+        <a-button style="margin-left: 10px" type="primary" @click="query">查询</a-button>
-        <a-button style="margin-left: 10px;" type="primary" @click="query">查询</a-button>
         <!-- <a-button @click=test()>test</a-button> -->
       </template>
-      <a-row :gutter="24">
+      <a-row :gutter="12">
         <a-col :xl="13">
-          <div style="padding-left: 10px;min-height: 400px;">
+          <div style="padding-left: 10px; min-height: 400px">
-            <div v-if="topCollege != null" style="margin-bottom: 5px;">
+            <div v-if="topCollege != null" style="margin-bottom: 5px">
-              <span style="font-size: 15px;">当前数据为 </span>
+              <span style="font-size: 15px">当前数据为 </span>
-              <span style="color: red; font-size: 18px;">{{ topCollege }}</span>
+              <span style="color: red; font-size: 18px">{{ topCollege }}</span>
-              <span v-if="topMajor != null && topMajor != '' " style="color: red; font-size: 18px;"> / {{ topMajor }}</span>
+              <span v-if="topMajor != null && topMajor != ''" style="color: red; font-size: 18px"> / {{ topMajor }}</span>
-              <span style="font-size: 15px;"> 的 </span>
+              <span style="font-size: 15px"> 的 </span>
-              <span style="color: red; font-size: 20px;">{{ topEntrydate }}</span>
+              <span style="color: red; font-size: 20px">{{ topEntrydate }}</span>
-              <span style="font-size: 15px;"> 级数据</span>
+              <span style="font-size: 15px"> 级数据</span>
             </div>
-            <a-table :dataSource="dataSourceCet4" :columns="columns" :pagination='false' bordered>
+            <a-table :dataSource="dataSourceCet4" :columns="columns" :pagination="false" bordered>
-              <template v-slot:passRateSlot>
+              <template #passRateSlot>
                 累计总通过率
-                <a-tooltip :title="'累计通过人数 / ' + this.totalName + '总人数'" placement="top">
+                <a-tooltip :title="'累计通过人数 / ' + totalName + '总人数'" placement="top">
                   <a-icon type="question-circle" />
                 </a-tooltip>
               </template>
             </a-table>
-            <div style="display: flex; justify-content: space-between; font-size: 15px; margin-top: 10px;"
+            <div style="display: flex; justify-content: space-between; font-size: 15px; margin-top: 10px" v-if="total && total > 0">
-              v-if="total && total > 0">
+              <span>{{ totalName }}总人数：{{ total }}</span>
-              <span>{{ this.totalName }}总人数：{{ total }}</span>
               <span>累计通过人数: {{ passNumberBottom }}</span>
               <span>累计总通过率: {{ passRateBottom }}</span>
             </div>
           </div>
         </a-col>
         <a-col :xl="11">
-          <div style="width: 100%;height: 500px;padding: 10px;" class="piechart" id="piechart">
+          <a-card style="margin-top: 33px; margin-bottom: 12px">
-
+            <div style="width: 100%; height: 215px" class="piechart" id="piechart"> </div>
-          </div>
+          </a-card>
+          <a-card>
+            <div style="width: 100%; height: 180px" id="map2"> </div>
+          </a-card>
         </a-col>
       </a-row>
       <!-- <div style="height: 300px;">
@@ -53,7 +54,6 @@ import { defHttp } from '/@/utils/http/axios';
   import * as echarts from 'echarts';
 
   export default {
-  name: "Analysis",
     data() {
       return {
         loading: false,
@@ -100,13 +100,13 @@ export default {
             customCell: (_, index) => ({
               rowSpan: index % 2 === 0 ? 2 : 0,
             }),
-        }
+          },
         ],
         Url: {
           getEntrydate: '/cet/getEntrydate',
           getCollege: '/cet/getCollege',
           getData: '/cet/getData',
-        getCollegeMajor: '/cet/getCollegeMajor'
+          getCollegeMajor: '/cet/getCollegeMajor',
         },
         total: 0,
         totalName: '',
@@ -125,6 +125,12 @@ export default {
         topEntrydate: null, //顶部选择器
       };
     },
+    mounted() {
+      this.getEntrydateAndCollegeData();
+      this.getCollegeMajorData();
+      this.query();
+      this.map2Chart();
+    },
     methods: {
       // 获取年级和学院数据
       async getEntrydateAndCollegeData() {
@@ -141,17 +147,17 @@ export default {
       async getCollegeMajorData() {
         const res = await defHttp.get({ url: this.Url.getCollegeMajor });
         //通过map方法将数据转换为级联选择器需要的数据格式
-      this.collegeMajorOptions = res.collegeMajor.map(item => {
+        this.collegeMajorOptions = res.collegeMajor.map((item) => {
           return {
             value: item.college,
             label: item.college,
-          children: item.major.map(major => {
+            children: item.major.map((major) => {
               return {
                 value: major,
-              label: major
+                label: major,
-            }
+              };
-          })
+            }),
-        }
+          };
         });
         //手动添加一个专升本字段
         this.collegeMajorOptions.unshift({ value: '专升本', label: '专升本' });
@@ -165,65 +171,64 @@ export default {
       async query() {
         try {
           //如果this.collegeMajor[1]不存在则设为null
-        let major = this.collegeMajor.length > 1 ? this.collegeMajor[1] : "";
+          let major = this.collegeMajor.length > 1 ? this.collegeMajor[1] : '';
           this.topCollege = this.collegeMajor[0];
           this.topMajor = major;
           this.topEntrydate = this.entrydate;
-        if (this.college)
+          if (this.college) this.loading = true;
-          this.loading = true;
           let params = {
             college: this.collegeMajor[0],
             major: major,
-          entrydate: this.entrydate
+            entrydate: this.entrydate,
-        }
+          };
-        console.log("params", params);
+          console.log('params', params);
           const result = await defHttp.get({ url: this.Url.getData, params });
           let tableData = [];
           let piedata = [];
           let passrate = 0;
           let index = 0;
-        const passRate = {}
+          const passRate = {};
-        if(result.cet4["大一学年"] != undefined) {
+          if (result.cet4['大一学年'] != undefined) {
-          passRate["大一学年"] = result.cet4["大一学年"];
+            passRate['大一学年'] = result.cet4['大一学年'];
           }
-        if(result.cet4["大二学年"] != undefined) {
+          if (result.cet4['大二学年'] != undefined) {
-          passRate["大二学年"] = result.cet4["大二学年"];
+            passRate['大二学年'] = result.cet4['大二学年'];
           }
-        if(result.cet4["大三学年"] != undefined) {
+          if (result.cet4['大三学年'] != undefined) {
-          passRate["大三学年"] = result.cet4["大三学年"];
+            passRate['大三学年'] = result.cet4['大三学年'];
           }
-        if(result.cet4["大四学年"] != undefined) {
+          if (result.cet4['大四学年'] != undefined) {
-          passRate["大四学年"] = result.cet4["大四学年"];
+            passRate['大四学年'] = result.cet4['大四学年'];
           }
           result.cet4 = passRate;
           for (let grade in result.cet4) {
-          result.cet4[grade].forEach(item => {
+            result.cet4[grade].forEach((item) => {
               if (index % 2 == 0) {
-              piedata.push({ value: parseFloat(item.gradepassrate - passrate).toFixed(3), name: grade + "时通过" });
+                piedata.push({ value: parseFloat(item.gradepassrate - passrate).toFixed(3), name: grade + '时通过' });
                 passrate = parseFloat(item.gradepassrate).toFixed(3);
               }
-            index++
+              index++;
               tableData.push({
                 grade: grade,
                 attendNumber: item.attendNumber,
                 batch: item.batch,
                 gradepassrate: (item.gradepassrate * 100).toFixed(1) + '%',
                 passNumber: item.passNumber,
-              batchpassrate: (item.batchpassrate * 100).toFixed(1) + '%'
+                batchpassrate: (item.batchpassrate * 100).toFixed(1) + '%',
               });
             });
           }
 
-        console.log("tableData", tableData);
+          console.log('tableData', tableData);
           this.dataSourceCet4 = tableData; //表格数据
           this.total = result.total; //总人数
           this.totalName = result.totalName; //总人数名称
           this.passNumberBottom = result.passNumber; //通过人数
           this.passRateBottom = (result.passRate * 100).toFixed(1) + '%'; //通过率
           //内置饼图
-        this.passRatePie = []//清空数据
+          this.passRatePie = []; //清空数据
           this.passRatePie.push({ value: result.passRate, name: '已通过' });
-        this.passRatePie.push({ value: 1 - result.passRate, name: '未通过' })
+          this.passRatePie.push({ value: 1 - result.passRate, name: '未通过' });
           piedata.push({ value: (1 - passrate).toFixed(3), name: '未通过' }); //外置饼图
           setTimeout(() => {
             this.drawPieChart(piedata);
@@ -234,21 +239,58 @@ export default {
         }
       },
       test() {
-      defHttp.get({ url: "/cet/getTest" });
+        defHttp.get({ url: '/cet/getTest' });
       },
+      map2Chart() {
+        var myChart = echarts.init(document.getElementById('map2'));
+        var option = {
+          title: {
+            text: '各批次通过率分析',
+            left: 'left',
+            top: '0%',
+            textStyle: {
+              fontSize: 16,
+            },
+          },
+          tooltip: {
+            trigger: 'item',
+          },
+          grid: {
+            top: '50px',
+            left: '50px',
+            right: '50px',
+            bottom: '30px',
+          },
+          xAxis: {
+            type: 'category',
+            data: ['2017-12-01', '2017-12-01', '2017-12-01', '2017-12-01', '2017-12-01'],
+          },
+          yAxis: {
+            type: 'value',
+          },
+          series: [
+            {
+              data: [150, 230, 224, 218, 135],
+              type: 'line',
+            },
+          ],
+        };
 
+        option && myChart.setOption(option);
+      },
       drawPieChart(piedata) {
-      console.log(this.passRatePie)
+        console.log(this.passRatePie);
-      console.log("piedata", piedata)
+        console.log('piedata', piedata);
         let myChart = echarts.init(document.getElementById('piechart'));
         let option = {
           tooltip: {
             trigger: 'item',
             confine: false,
+            avoidLabelOverlap: true,
             //字体大小
             itemStyle: {
-            fontSize: 100
+              fontSize: 100,
-          }
+            },
           },
 
           title: {
@@ -256,45 +298,23 @@ export default {
             left: 'left',
             top: '0%',
             textStyle: {
-            fontSize: 20
+              fontSize: 16,
-          }
+            },
           },
           legend: {
-          top: '5%',
+            top: 'center',
-          left: 'center'
+            right: '0%',
+            orient: 'vertical',
           },
           color: ['#b3cde0', '#6497b1', '#005b96', '#03396c', '#e5e5e5'],
 
           series: [
-          //内圈饼图
-          // {
-          //   name: '四级通过率',
-          //   type: 'pie',
-          //   radius: ['0', '30%'],
-          //   avoidLabelOverlap: false,
-          //   itemStyle: {
-          //     borderRadius: 3,
-          //     borderColor: '#fff',
-          //     borderWidth: 2,
-          //   },
-          //   label: {
-          //     position: 'inner',
-          //     fontSize: 14
-          //   },
-          //   emphasis: {
-          //     label: {
-          //       show: true,
-          //       fontSize: 20,
-          //       fontWeight: 'bold'
-          //     }
-          //   },
-          //   data: this.passRatePie
-          // },
             //外圈饼图
             {
               name: '四级通过率',
               type: 'pie',
-            radius: ['35%', '60%'],
+              center: ['30%', '50%'],
+              radius: ['35%', '70%'],
               itemStyle: {
                 borderRadius: 10,
                 borderColor: '#fff',
@@ -303,38 +323,30 @@ export default {
               label: {
                 show: true,
                 fontSize: 14,
-              overflow: 'truncate'
+                overflow: 'truncate',
+                minMargin: -1,
               },
               emphasis: {
                 itemStyle: {
                   shadowBlur: 10,
                   shadowOffsetX: 0,
-                shadowColor: 'rgba(0, 0, 0, 0.5)'
+                  shadowColor: 'rgba(0, 0, 0, 0.5)',
                 },
                 label: {
                   show: true,
                   fontSize: 15,
-                fontWeight: 'bold'
+                  fontWeight: 'bold',
-              }
                 },
-            data: piedata
+              },
-          }
+              data: piedata,
-        ]
+            },
+          ],
         };
 
-
-
         myChart.setOption(option);
-    }
       },
-  mounted() {
+    },
-    this.getEntrydateAndCollegeData();
+  };
-    this.getCollegeMajorData();
-    this.query();
-  }
-
-
-}
 </script>
 
 <style lang="less" scoped>