diff --git a/src/views/cet/cet-ana-1.vue b/src/views/cet/cet-ana-1.vue
index cd8e35d..dfaa817 100644
--- a/src/views/cet/cet-ana-1.vue
+++ b/src/views/cet/cet-ana-1.vue
@@ -1,300 +1,363 @@
 <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-button style="margin-left: 10px" type="primary" @click="allQuery">查询</a-button>
-            </div>
-
-            <a-card title="查询全校各学院四级通过率" :loading="tab1loading" :bordered="false">
-              <template #extra>
-                <!-- <a-select v-model:value="college" style="width: 300px" mode="multiple" :max-tag-count="2"
-          :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: 18px; color: red">各年级四级通过率</span>
-                      </div>
-               
-                      <!-- <span style=" font-size: 18px;">&nbsp 变化</span> -->
-                    </div>
-                    <div id="map1" style="width: 100%; height: 600px"></div>
+      <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-button style="margin-left: 10px" type="primary" @click="allQuery">查询</a-button>
+        </div>
+        <a-card :bordered="true">
+          <a-row :gutter="12">
+            <a-col :xl="16">
+              <a-card :loading="map1loading">
+                <div id="span">
+                  <div style="display: flex; justify-content: center; align-items: center">
+                    <span style="font-size: 16px">点击柱状图可查看该学院&nbsp; </span>
+                    <span style="font-size: 16px; color: red">各年级四级通过率</span>
                   </div>
-                </a-col>
-              </a-row>
-            </a-card>
-          </div>
-        </a-tab-pane>
-      </a-tabs>
+
+                  <!-- <span style=" font-size: 18px;">&nbsp 变化</span> -->
+                </div>
+                <div id="map1" style="width: 100%; height: 500px"></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-card>
   </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';
+  import { defHttp } from '/@/utils/http/axios';
+  import * as echarts from 'echarts';
+  import { message } from 'ant-design-vue';
 
-export default {
-  name: 'Analysis',
-  data() {
-    return {
-      activeKey: '1',
-      allCollege: [],
-      showBox: false,
-      showGroup: false,
-      oneentrydate: null,
-      collegeentrydate: [],
-      majorentrydate: [],
-      lastMajorEntrydate: [],
-      checkedOptions: [],
-      collegetab2: [],
-      collegeMajorOptions: [],
-      collegeMajor: [],
+  export default {
+    data() {
+      return {
+        activeKey: '1',
+        allCollege: [],
+        showBox: false,
+        showGroup: false,
+        oneentrydate: null,
+        collegeentrydate: [],
+        majorentrydate: [],
+        lastMajorEntrydate: [],
+        checkedOptions: [],
+        collegetab2: [],
+        collegeMajorOptions: [],
+        collegeMajor: [],
 
-      Url: {
-        getBatch: '/cet/getBatch',
-        getEntrydate: '/cet/getEntrydate',
-        getCollege: '/cet/getCollege',
-        getCollegeRate: '/cet/getRateByCollege',
-        getAllRate: '/cet/getAllRate',
-        getCollegeMajor: '/cet/getCollegeMajor',
-        getRateByMajor: '/cet/getRateByMajor',
+        Url: {
+          getBatch: '/cet/getBatch',
+          getEntrydate: '/cet/getEntrydate',
+          getCollege: '/cet/getCollege',
+          getCollegeRate: '/cet/getRateByCollege',
+          getAllRate: '/cet/getAllRate',
+          getCollegeMajor: '/cet/getCollegeMajor',
+          getRateByMajor: '/cet/getRateByMajor',
+        },
+        map1loading: false,
+        tab2loading: false,
+        tab3loading: false,
+
+        collegeOptions: [],
+        batchOptions: [],
+        levelOptions: [
+          { value: 'cet4', label: '英语四级' },
+          { value: 'cet6', label: '英语六级' },
+        ],
+        visible: false,
+        level: null,
+        college: [],
+        batch: null,
+        entrydateOptions: [],
+        entrydate: [],
+        majorCheckOn: [],
+        //对不同的学院选择的专业进行记忆化
+        lastCollegeMajor: [],
+        majorLength: 0,
+        majorOptions: [],
+        //对学院对比学院进行记忆化上次选择结果
+        lastCollege: [],
+        //对学院对比学院进行记忆化上次选择结果
+        lastCollegeEntrydate: [],
+      };
+    },
+    mounted() {
+      this.getCollegeOptions();
+      // this.getBatch();
+      this.getEntrydate();
+      this.allQuery();
+      this.getCollegeMajorData();
+      this.gradePassRate();
+      this.majorPassRate();
+    },
+    methods: {
+      allQuery() {
+        this.map1loading = true;
+        let college = ['全校'];
+        let query = 'tab1';
+        if (this.oneentrydate == null) {
+          this.oneentrydate = '2017';
+        }
+        this.query(query, college, [this.oneentrydate]);
       },
-      tab1loading: false,
-      tab2loading: false,
-      tab3loading: false,
-
-      collegeOptions: [],
-      batchOptions: [],
-      levelOptions: [
-        { value: 'cet4', label: '英语四级' },
-        { value: 'cet6', label: '英语六级' },
-      ],
-      visible: false,
-      level: null,
-      college: [],
-      batch: null,
-      entrydateOptions: [],
-      entrydate: [],
-      majorCheckOn: [],
-      //对不同的学院选择的专业进行记忆化
-      lastCollegeMajor: [],
-      majorLength: 0,
-      majorOptions: [],
-      //对学院对比学院进行记忆化上次选择结果
-      lastCollege: [],
-      //对学院对比学院进行记忆化上次选择结果
-      lastCollegeEntrydate: [],
-    };
-  },
-  methods: {
-    allQuery() {
-      this.tab1loading = true;
-      let college = ['全校'];
-      let query = 'tab1';
-      if (this.oneentrydate == null) {
-        this.oneentrydate = '2017';
-      }
-      this.query(query, college, [this.oneentrydate]);
-    },
-    async majorQuery() {
-      if (this.majorentrydate.length == 0) {
-        message.error('请选择年级');
-        return;
-      }
-      if (this.collegeMajor.length == 0 || this.collegeMajor == null) {
-        message.error('请选择学院');
-        return;
-      }
-
-      if (this.lastCollegeMajor.length == 0 || this.lastCollegeMajor == null) {
-        message.error('请选择专业');
-        return;
-      }
-      this.tab3loading = true;
-      let res = null;
-      try {
-        let params = {
-          college: this.lastCollegeMajor,
-          entrydate: this.majorentrydate,
-        };
-        res = await defHttp.post({ url: this.Url.getRateByMajor, params });
-      } finally {
-        console.log(res, 'res');
-        this.tab3loading = false;
-        this.$nextTick(() => {
-          this.drawChart(res.data, 'tab3');
-        });
-      }
-    },
-
-    //获取学院专业级联数据
-    async getCollegeMajorData() {
-      const res = await defHttp.get({ url: this.Url.getCollegeMajor });
-      //通过map方法将数据转换为级联选择器需要的数据格式
-      this.collegeMajorOptions = res.collegeMajor.map((item) => {
-        return {
-          value: item.college,
-          label: item.college,
-          children: item.major.map((major) => {
-            return {
-              value: major,
-              label: major,
-            };
-          }),
-        };
-      });
-      // this.collegeMajor = ['东语学院'];
-      console.log(this.collegeMajor, 'collegeMajor');
-      console.log(this.collegeMajorOptions, 'collegeMajorOptions1');
-    },
-
-    getCollegeOptions() {
-      defHttp.get({ url: this.Url.getCollege }).then((res) => {
-        this.collegeOptions = res.colleges;
-        // 手动添加一个全校字段
-
-        // this.collegeOptions.unshift({ value: '全校', label: '全校' });
-        // this.collegeOptions.forEach(option => {
-        //  if (option.value !== '全校') {
-        //     option.disabled = true;
-        //}
-
-        //  });
-        //  this.college = ['全校'];
-        // this.collegetab2 = ['地理科学学院', '文学院'];
-        console.log(this.collegeOptions, 'collegeOptions');
-      });
-    },
-    dataChart(data, tab) {
-      let seriesData = [];
-      let xData = [];
-      let colors = [
-        '#5370c5',
-        '#91CC75',
-        '#fac858',
-        '#ee6666',
-        '#73c0de',
-        '#FF6A6A',
-        '#FFA500',
-        '#EE2C2C',
-        '#90EE90',
-        '#008B8B',
-        '#FFC0CB',
-        '#FFDAB9',
-        '#FFDEAD',
-        '#FFE4B5',
-        '#FFE4C4',
-        '#FFE4E1',
-        '#FFEBCD',
-        '#FFEFD5',
-        '#FFFAF0',
-        '#FFFAFA',
-        '#FFFFE0',
-        '#FFFFF0',
-        '#FFFFFF',
-        '#F0F8FF',
-        '#FAEBD7',
-        '#FAF0E6',
-        '#FAFAD2',
-        '#F5FFFA',
-        '#F8F8FF',
-        '#F0FFF0',
-        '#F0FFFF',
-        '#F0E68C',
-        '#F0F8FF',
-        '#F0FFF0',
-        '#F0FFFF',
-        '#F4A460',
-        '#F5DEB3',
-        '#F5F5DC',
-        '#F5F5F5',
-        '#F5FFFA',
-        '#F8F8FF',
-        '#F9EBEA',
-        '#FAD7A0',
-        '#FAF0E6',
-        '#FAFAD2',
-        '#FAF0E6  ',
-      ];
-      let j = 0;
-
-      for (let i in data) {
-        xData = [];
-        let yData = [];
-        for (let key in data[i]) {
-          xData.push(data[i][key].college);
-          // 将数据转换为百分比（加上%）
-          yData.push(data[i][key].passRate);
+      async majorQuery() {
+        if (this.majorentrydate.length == 0) {
+          message.error('请选择年级');
+          return;
+        }
+        if (this.collegeMajor.length == 0 || this.collegeMajor == null) {
+          message.error('请选择学院');
+          return;
         }
 
-        xData = xData.map((label) => label.split('').join('\n')); //将x轴竖着展示
-        seriesData.push({
-          name: i + '级累计总通过率',
-          type: 'bar',
-          //设置柱状图大小
-          barWidth: 25,
-          data: yData,
-          //柱子间距
-          barGap: '30%',
-          //颜色
-          itemStyle: {
-            normal: {
-              label: {
-                show: true, //开启显示
-                position: 'top', //在上方显示
-                formatter: '{c}%',
-                textStyle: {
-                  //数值样式
-                  color: 'black',
-                  fontSize: 13,
-                },
-              },
-              color: colors[j++],
+        if (this.lastCollegeMajor.length == 0 || this.lastCollegeMajor == null) {
+          message.error('请选择专业');
+          return;
+        }
+        this.tab3loading = true;
+        let res = null;
+        try {
+          let params = {
+            college: this.lastCollegeMajor,
+            entrydate: this.majorentrydate,
+          };
+          res = await defHttp.post({ url: this.Url.getRateByMajor, params });
+        } finally {
+          console.log(res, 'res');
+          this.tab3loading = false;
+          this.$nextTick(() => {
+            this.drawChart(res.data, 'tab3');
+          });
+        }
+      },
+
+      //获取学院专业级联数据
+      async getCollegeMajorData() {
+        const res = await defHttp.get({ url: this.Url.getCollegeMajor });
+        //通过map方法将数据转换为级联选择器需要的数据格式
+        this.collegeMajorOptions = res.collegeMajor.map((item) => {
+          return {
+            value: item.college,
+            label: item.college,
+            children: item.major.map((major) => {
+              return {
+                value: major,
+                label: major,
+              };
+            }),
+          };
+        });
+        // this.collegeMajor = ['东语学院'];
+        console.log(this.collegeMajor, 'collegeMajor');
+        console.log(this.collegeMajorOptions, 'collegeMajorOptions1');
+      },
+
+      getCollegeOptions() {
+        defHttp.get({ url: this.Url.getCollege }).then((res) => {
+          this.collegeOptions = res.colleges;
+          // 手动添加一个全校字段
+
+          // this.collegeOptions.unshift({ value: '全校', label: '全校' });
+          // this.collegeOptions.forEach(option => {
+          //  if (option.value !== '全校') {
+          //     option.disabled = true;
+          //}
+
+          //  });
+          //  this.college = ['全校'];
+          // this.collegetab2 = ['地理科学学院', '文学院'];
+          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,
             },
           },
-        });
-        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 + '级累计总通过率排名',
+          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',
-            yAxisIndex: 1,
-            data: rankData,
-            bar: {},
-            show: false,
+            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',
+          '#ffffff',
+          '#fac858',
+          '#ee6666',
+          '#73c0de',
+          '#FF6A6A',
+          '#FFA500',
+          '#EE2C2C',
+          '#90EE90',
+          '#008B8B',
+          '#FFC0CB',
+          '#FFDAB9',
+          '#FFDEAD',
+          '#FFE4B5',
+          '#FFE4C4',
+          '#FFE4E1',
+          '#FFEBCD',
+          '#FFEFD5',
+          '#FFFAF0',
+          '#FFFAFA',
+          '#FFFFE0',
+          '#FFFFF0',
+          '#FFFFFF',
+          '#F0F8FF',
+          '#FAEBD7',
+          '#FAF0E6',
+          '#FAFAD2',
+          '#F5FFFA',
+          '#F8F8FF',
+          '#F0FFF0',
+          '#F0FFFF',
+          '#F0E68C',
+          '#F0F8FF',
+          '#F0FFF0',
+          '#F0FFFF',
+          '#F4A460',
+          '#F5DEB3',
+          '#F5F5DC',
+          '#F5F5F5',
+          '#F5FFFA',
+          '#F8F8FF',
+          '#F9EBEA',
+          '#FAD7A0',
+          '#FAF0E6',
+          '#FAFAD2',
+          '#FAF0E6  ',
+        ];
+        let j = 0;
+
+        for (let i in data) {
+          xData = [];
+          let yData = [];
+          for (let key in data[i]) {
+            xData.push(data[i][key].college);
+            // 将数据转换为百分比（加上%）
+            yData.push(data[i][key].passRate);
+          }
+
+          xData = xData.map((label) => label.split('').join('\n')); //将x轴竖着展示
+          seriesData.push({
+            name: i + '级累计总通过率',
+            type: 'bar',
+            //设置柱状图大小
+            barWidth: 1,
+            data: yData,
+            //柱子间距
+            barGap: '30%',
+            //颜色
             itemStyle: {
               normal: {
                 label: {
-                  show: false, //开启显示
+                  show: true, //开启显示
                   position: 'top', //在上方显示
-                  formatter: '{c}',
+                  formatter: '{c}%',
                   textStyle: {
                     //数值样式
                     color: 'black',
@@ -308,102 +371,135 @@ export default {
           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: 8,
+                    },
+                  },
+                  color: colors[j++],
+                },
+              },
+            });
+            if (j == colors.length) {
+              j = 0;
+            }
+          }
         }
-      }
-      let myChart = null;
-      if (tab == 'tab1') {
+        let myChart = null;
         myChart = echarts.init(document.getElementById('map1'));
-      }
-      // 指定图表的配置项和数据
-      // const college1 = this.college;
-      let option = {
-        title: {
-          text: '本年级学院四级通过率排名',
-        },
-        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 + params[i].seriesName + ' : ' + 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: {
-          // show: true,
-          // feature: {
-          //   magicType: { show: true, type: ['line', 'bar'] },
-          //   restore: { show: true },
-          //   saveAsImage: { show: true },
-          // },
-        },
-        grid: {
-          left: '3%',
-          right: '4%',
-          bottom: '3%',
-          containLabel: true,
-        },
-        xAxis: [
-          {
-            type: 'category',
-            data: xData,
-            axisLabel: {
-              interval: 0, //代表显示所有x轴标签显示
-              rotate: 0, //代表倾斜0度显示
+        // 指定图表的配置项和数据
+        // const college1 = this.college;
+        let option = {
+          title: {
+            text: '本年级学院四级通过率排名',
+            textStyle: {
+              fontSize: 16,
             },
           },
-        ],
-        yAxis: [
-          {
-            type: 'value',
-            name: '通过率',
-            axisLabel: {
-              formatter: '{value} %',
+          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 + params[i].seriesName + ' : ' + 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;
             },
           },
-          {
-            type: 'value',
-            name: '排名',
-            show: false,
+          toolbox: {
+            // show: true,
+            // feature: {
+            //   magicType: { show: true, type: ['line', 'bar'] },
+            //   restore: { show: true },
+            //   saveAsImage: { show: true },
+            // },
           },
-        ],
-        series: seriesData,
-      };
-      if (tab == 'tab1') {
+          grid: {
+            left: '3%',
+            right: '4%',
+            bottom: '3%',
+            containLabel: true,
+          },
+          xAxis: [
+            {
+              type: 'category',
+              data: xData,
+              axisLabel: {
+                interval: 0, //代表显示所有x轴标签显示
+                rotate: 0, //代表倾斜0度显示
+              },
+            },
+          ],
+          yAxis: [
+            {
+              type: 'value',
+              name: '通过率',
+              axisLabel: {
+                formatter: '{value} %',
+              },
+            },
+            {
+              type: 'value',
+              name: '排名',
+              show: false,
+            },
+          ],
+          series: seriesData,
+        };
         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,221 +530,184 @@ export default {
             color: colors[1],
           },
         ];
-      }
-      myChart.setOption(option, true);
-      // 使用刚指定的配置项和数据显示图表。
-      myChart.on('click', async (params) => {
-        let name = params.name;
-        //将name的换行符去掉
-        name = name.replace(/\n/g, '');
-        console.log(
-          this.collegeOptions.map((item) => item.value),
-          'collegeOptions'
-        );
-        console.log(name, 'params');
-        console.log(this.collegeOptions.map((item) => item.value).includes(name), 'bool');
-        if (params != null && params != undefined && params.name != '' && this.collegeOptions.map((item) => item.value).includes(name)) {
-          console.log(params, 'params');
-          let entrydate = this.entrydateOptions.map((item) => item.value);
-          let queryParams = {
-            college: [name],
+        myChart.setOption(option, true);
+        // 使用刚指定的配置项和数据显示图表。
+        myChart.on('click', async (params) => {
+          let name = params.name;
+          //将name的换行符去掉
+          name = name.replace(/\n/g, '');
+          console.log(
+            this.collegeOptions.map((item) => item.value),
+            'collegeOptions'
+          );
+          console.log(name, 'params');
+          console.log(this.collegeOptions.map((item) => item.value).includes(name), 'bool');
+          if (params != null && params != undefined && params.name != '' && this.collegeOptions.map((item) => item.value).includes(name)) {
+            console.log(params, 'params');
+            let entrydate = this.entrydateOptions.map((item) => item.value);
+            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,
+            };
+            console.log(collegeOption, 'collegeOption');
+
+            //let spanElement = document.getElementById('span');
+
+            // 隐藏 span 元素
+            //spanElement.style.display = 'none';
+            var map2Chart = echarts.init(document.getElementById('map2'));
+            map2Chart.setOption(collegeOption, true);
+            //myChart.setOption(collegeOption, true);
+
+            console.log(myChart, 'mychart');
+            // this.college = [params];
+
+            // this.query(tab, this.college, this.entrydate);
+          }
+        });
+      },
+      // 获取批次数据
+      async getBatch() {
+        const getBatch = await defHttp.get({ url: this.Url.getBatch });
+        this.batchOptions = getBatch.batches;
+        this.batch = this.batchOptions[0].value;
+        this.level = this.levelOptions[0].value;
+      },
+      //获取年级数据
+      async getEntrydate() {
+        const getEntrydate = await defHttp.get({ url: this.Url.getEntrydate });
+        this.entrydateOptions = getEntrydate.entrydates;
+        this.oneentrydate = this.entrydateOptions[0].value;
+        // this.collegeentrydate = [this.entrydateOptions[0].value];
+        // this.majorentrydate = [this.entrydateOptions[0].value];
+        // this.entrydate.push (this.entrydateOptions[0].value);
+      },
+      // 查询数据
+      async query(query, college, entrydate) {
+        this.visible = false;
+        let result = null;
+        // console.log(this.college, this.entrydate);
+        // //如果this.college和this.batch为null则先赋静态值
+        // if (this.college === null || this.college.length === 0) {
+        //   this.college = ['全校'];
+        // }
+
+        // if (!this.entrydate || this.entrydate.length === 0) {
+        //   this.entrydate = ['2017'];
+        // }
+
+        try {
+          // console.log(this.college, this.entrydate)
+          let params = {
+            college: college,
             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 + '四级通过率',
-            },
-            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,
-            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');
-
-          // 隐藏 span 元素
-          spanElement.style.display = 'none';
-         
-          myChart.setOption(collegeOption, true);
-          console.log(myChart, 'mychart');
-          // this.college = [params];
-
-          // this.query(tab, this.college, this.entrydate);
+          let url = query == 'tab1' ? this.Url.getAllRate : this.Url.getCollegeRate;
+          console.log(params.college, 'college');
+          result = await defHttp.post({ url: url, params });
+          //使数据按照passRate从大到小排序
+          // result.data.sort((a, b) => {
+          //   return b.passRate - a.passRate;
+          // });
+          console.log('data', result.data);
+        } finally {
+          query == 'tab1' ? (this.map1loading = false) : (this.tab2loading = false);
+          this.$nextTick(() => {
+            if (query == 'tab1') {
+              this.dataChart(result.data, query);
+            }
+          });
         }
-      });
+      },
     },
-    // 获取批次数据
-    async getBatch() {
-      const getBatch = await defHttp.get({ url: this.Url.getBatch });
-      this.batchOptions = getBatch.batches;
-      this.batch = this.batchOptions[0].value;
-      this.level = this.levelOptions[0].value;
-    },
-    //获取年级数据
-    async getEntrydate() {
-      const getEntrydate = await defHttp.get({ url: this.Url.getEntrydate });
-      this.entrydateOptions = getEntrydate.entrydates;
-      this.oneentrydate = this.entrydateOptions[0].value;
-      // this.collegeentrydate = [this.entrydateOptions[0].value];
-      // this.majorentrydate = [this.entrydateOptions[0].value];
-      // this.entrydate.push (this.entrydateOptions[0].value);
-    },
-    // 查询数据
-    async query(query, college, entrydate) {
-      this.visible = false;
-      let result = null;
-      // console.log(this.college, this.entrydate);
-      // //如果this.college和this.batch为null则先赋静态值
-      // if (this.college === null || this.college.length === 0) {
-      //   this.college = ['全校'];
-      // }
-
-      // if (!this.entrydate || this.entrydate.length === 0) {
-      //   this.entrydate = ['2017'];
-      // }
-
-      try {
-        // console.log(this.college, this.entrydate)
-        let params = {
-          college: college,
-          entrydate: entrydate,
-          level: 'cet4',
-        };
-        let url = query == 'tab1' ? this.Url.getAllRate : this.Url.getCollegeRate;
-        console.log(params.college, 'college');
-        result = await defHttp.post({ url: url, params });
-        //使数据按照passRate从大到小排序
-        // result.data.sort((a, b) => {
-        //   return b.passRate - a.passRate;
-        // });
-        console.log('data', result.data);
-      } finally {
-        query == 'tab1' ? (this.tab1loading = false) : (this.tab2loading = false);
-        this.$nextTick(() => {
-          if (query == 'tab1') {
-            this.dataChart(result.data, query);
-          }
-        });
-      }
-    },
-  },
-  mounted() {
-    this.getCollegeOptions();
-    // this.getBatch();
-    this.getEntrydate();
-    this.allQuery();
-    this.getCollegeMajorData();
-  },
-};
+  };
 </script>
 
 <style lang="less" scoped>
-.container {
-  // display: flex;
-  background-color: #fff;
-  padding: 15px;
-  border-radius: 4px;
-  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.09);
-}
+  .container {
+    // display: flex;
+    background-color: #fff;
+    padding: 15px;
+    border-radius: 4px;
+    box-shadow: 0 2px 8px rgba(0, 0, 0, 0.09);
+  }
 
-.query {
-  //居左
-  display: flex;
-  justify-content: flex-start;
-  align-items: center;
-  margin-left: 24px;
-}
+  .query {
+    //居左
+    display: flex;
+    justify-content: flex-end;
+    align-items: center;
+    margin-left: 24px;
+    padding-bottom: 10px;
+  }
 
-.tab3 {
-  justify-content: flex-start;
-  align-items: center;
-  margin-left: 24px;
-}
+  .tab3 {
+    justify-content: flex-start;
+    align-items: center;
+    margin-left: 24px;
+  }
 
-.title {
-  font-size: 34px;
-  color: rgb(8, 8, 8);
-  font-weight: bold;
-}
+  .title {
+    font-size: 34px;
+    color: rgb(8, 8, 8);
+    font-weight: bold;
+  }
 </style>
diff --git a/src/views/cet/cet-ana-2.vue b/src/views/cet/cet-ana-2.vue
index 4b33473..44b956d 100644
--- a/src/views/cet/cet-ana-2.vue
+++ b/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>
-      <div>
+
+      <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">
@@ -19,204 +62,414 @@
                   <span style="font-size: 15px;"> 的四级通过率变化趋势 </span>
                 </div>
               </div>
-              <div id="map1" style="width: 100%; height: 500px"></div>
+               <div id="map1" style="width: 100%; height: 500px"></div>
             </div>
           </a-col>
         </a-row>
-      </div>
+      </div> -->
     </a-card>
   </div>
 </template>
 
 <script>
-import { defHttp } from '/@/utils/http/axios';
-import * as echarts from 'echarts';
+  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/getRateByAllBatch',
-        getCollegeMajor: '/cet/getCollegeMajor',
-      },
-      loading: false,
-      collegeOptions: [],
-      collegeMajorOptions: [],
-      batchOptions: [],
-      levelOptions: [
-        { value: 'cet4', label: '英语四级' },
-        { value: 'cet6', label: '英语六级' },
-      ],
-      level: null,
-      college: null,
-      batch: null,
-      collegeMajor: null,
-      topCollege: null,//顶部解释行
-      topMajor: null,//顶部解释行
-    };
-  },
-  methods: {
-    dataChart(data) {
-      let xData = [];
-      let yData = [];
-      for (let key in data) {
-        xData.push(key);
-        // 将数据转换为百分比（加上%）
-        yData.push(data[key].toFixed(1));
-      }
-      let myChart = echarts.init(document.getElementById('map1'));
-      // 指定图表的配置项和数据
-      let option = {
-        title: {
-          // text: '学院 / 专业四级通过率变化',
+  export default {
+    data() {
+      return {
+        Url: {
+          getBatch: '/cet/getBatch',
+          getCollege: '/cet/getCollege',
+          getRate: '/cet/getRateByAllBatch',
+          getCollegeMajor: '/cet/getCollegeMajor',
         },
-        xAxis: {
-          type: 'category',
-          data: xData,
-          axisLabel: {
-            interval: 0, //代表显示所有x轴标签显示
-            rotate: -10, //代表倾斜30度显示
+        loading: false,
+        collegeOptions: [],
+        collegeMajorOptions: [],
+        batchOptions: [],
+        levelOptions: [
+          { value: 'cet4', label: '英语四级' },
+          { value: 'cet6', label: '英语六级' },
+        ],
+        level: null,
+        college: null,
+        batch: null,
+        collegeMajor: null,
+        topCollege: null, //顶部解释行
+        topMajor: null, //顶部解释行
+      };
+    },
+    mounted() {
+      this.getCollegeMajorData();
+      this.getBatch();
+      this.query();
+    },
+    methods: {
+      dataChart(data) {
+        let xData = [];
+        let yData = [];
+        for (let key in data) {
+          xData.push(key);
+          // 将数据转换为百分比（加上%）
+          yData.push(data[key].toFixed(1));
+        }
+        let myChart = echarts.init(document.getElementById('map1'));
+        // 指定图表的配置项和数据
+        let option = {
+          title: {
+            // text: '学院 / 专业四级通过率变化',
           },
-        },
-        tooltip: {
-          trigger: 'axis',
-          axisPointer: {
-            type: 'shadow',
+          xAxis: {
+            type: 'category',
+            data: xData,
+            axisLabel: {
+              interval: 1, //代表显示所有x轴标签显示
+              rotate: -10, //代表倾斜30度显示
+            },
           },
-          formatter: function (params) {
-            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>' +
-              '</table>'
-            );
+          tooltip: {
+            trigger: 'axis',
+            axisPointer: {
+              type: 'shadow',
+            },
+            formatter: function (params) {
+              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>' +
+                '</table>'
+              );
+            },
           },
-        },
-        yAxis: {
-          type: 'value',
-          name: '通过率',
-          axisLabel: {
-            formatter: '{value} %',
+          yAxis: {
+            type: 'value',
+            name: '通过率',
+            axisLabel: {
+              formatter: '{value} %',
+            },
           },
-        },
-        series: [
-          {
-            data: yData,
-            type: 'line',
-            itemStyle: {
-              normal: {
-                label: {
-                  show: true, //开启显示
-                  position: 'top', //在上方显示
-                  textStyle: {
-                    //数值样式
-                    color: 'black',
-                    fontSize: 12,
+          series: [
+            {
+              data: yData,
+              type: 'line',
+              itemStyle: {
+                normal: {
+                  label: {
+                    show: true, //开启显示
+                    position: 'top', //在上方显示
+                    textStyle: {
+                      //数值样式
+                      color: 'black',
+                      fontSize: 12,
+                    },
+                    formatter: '{c}%',
                   },
-                  formatter: '{c}%',
                 },
               },
             },
+          ],
+        };
+        // 使用刚指定的配置项和数据显示图表。
+        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,
+            },
           },
-        ],
-      };
-      // 使用刚指定的配置项和数据显示图表。
-      myChart.setOption(option);
-    },
-    // 获取批次数据
-    async getBatch() {
-      const getBatch = await defHttp.get({ url: this.Url.getBatch });
-      // const getCollege = await defHttp.get({ url: this.Url.getCollege });
+          title: {
+            //text: '学院/专业每个批次通过人数饼图',
+            left: 'left',
+            top: '0%',
+            textStyle: {
+              fontSize: 14,
+            },
+          },
+          legend: {
+            top: '5%',
+            left: 'center',
+          },
+          color: ['#b3cde0', '#6497b1', '#005b96', '#03396c', '#e5e5e5'],
 
-      // this.collegeOptions = getCollege.colleges;
-      // this.college = this.collegeOptions[0].value;
-
-      this.level = this.levelOptions[0].value;
-
-      // this.query();
-    },
-    //获取学院专业级联数据
-    async getCollegeMajorData() {
-      const res = await defHttp.get({ url: this.Url.getCollegeMajor });
-      //通过map方法将数据转换为级联选择器需要的数据格式
-      this.collegeMajorOptions = res.collegeMajor.map((item) => {
-        return {
-          value: item.college,
-          label: item.college,
-          children: item.major.map((major) => {
-            return {
-              value: major,
-              label: major,
-            };
-          }),
+          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: '树莓' },
+              ],
+            },
+          ],
         };
-      });
-      this.collegeMajor = ['东语学院', '日语'];
-    },
-    // 查询数据
-    async query() {
-      let data = null;
-      console.log(this.collegeMajor, 'collegeMajor');
-      try {
+        myChart.setOption(option);
+      },
 
-        //如果this.collegeMajor为null则先赋个值
-        if (!this.collegeMajor) {
-          this.collegeMajor = ['东语学院', '日语'];
-        }
-        let major = null;
-        let college = null;
-        //如果this.collegeMajor[1]不存在则设为null
-        college = this.collegeMajor[0];
-        major = this.collegeMajor.length > 1 ? this.collegeMajor[1] : '';
-        this.topCollege = college;
-        this.topMajor = major;
-        this.loading = true;
-        console.log(college, major, "college,major");
-        let params = {
-          college: college,
-          major: major,
-          level: 'cet4',
+      //绘画饼图--每个批次参与人数-数据分析
+      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: '树莓' },
+              ],
+            },
+          ],
         };
-        data = await defHttp.get({ url: this.Url.getRate, params });
-      } finally {
-        this.loading = false;
-        this.$nextTick(() => {
-          this.dataChart(data);
+        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 });
+        // const getCollege = await defHttp.get({ url: this.Url.getCollege });
+
+        // this.collegeOptions = getCollege.colleges;
+        // this.college = this.collegeOptions[0].value;
+
+        this.level = this.levelOptions[0].value;
+
+        // this.query();
+      },
+      //获取学院专业级联数据
+      async getCollegeMajorData() {
+        const res = await defHttp.get({ url: this.Url.getCollegeMajor });
+        //通过map方法将数据转换为级联选择器需要的数据格式
+        this.collegeMajorOptions = res.collegeMajor.map((item) => {
+          return {
+            value: item.college,
+            label: item.college,
+            children: item.major.map((major) => {
+              return {
+                value: major,
+                label: major,
+              };
+            }),
+          };
+        });
+        this.collegeMajor = ['东语学院', '日语'];
+      },
+      // 查询数据
+      async query() {
+        let data = null;
+        console.log(this.collegeMajor, 'collegeMajor');
+        try {
+          //如果this.collegeMajor为null则先赋个值
+          if (!this.collegeMajor) {
+            this.collegeMajor = ['东语学院', '日语'];
+          }
+          let major = null;
+          let college = null;
+          //如果this.collegeMajor[1]不存在则设为null
+          college = this.collegeMajor[0];
+          major = this.collegeMajor.length > 1 ? this.collegeMajor[1] : '';
+          this.topCollege = college;
+          this.topMajor = major;
+          this.loading = true;
+          console.log(college, major, 'college,major');
+          let params = {
+            college: college,
+            major: major,
+            level: 'cet4',
+          };
+          data = await defHttp.get({ url: this.Url.getRate, params });
+        } finally {
+          this.loading = false;
+          this.$nextTick(() => {
+            this.dataChart(data);
+            this.draPieChart_Pass();
+            this.draPieChart_Participate();
+          });
+        }
+      },
     },
-  },
-  mounted() {
-    this.getCollegeMajorData();
-    this.getBatch();
-    this.query();
-  },
-};
+  };
 </script>
 
 <style lang="less" scoped>
-.container {
-  // display: flex;
-  background-color: #fff;
-  padding: 15px;
-  border-radius: 4px;
-  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.09);
-}
+  .container {
+    // display: flex;
+    background-color: #fff;
+    padding: 15px;
+    border-radius: 4px;
+    box-shadow: 0 2px 8px rgba(0, 0, 0, 0.09);
+  }
 
-.title {
-  font-size: 20px;
-  color: rgb(8, 8, 8);
-  font-weight: bold;
-}
+  .title {
+    font-size: 20px;
+    color: rgb(8, 8, 8);
+    font-weight: bold;
+  }
+  .tip {
+    margin-bottom: 10px;
+    background-color: #d0e5fe;
+    opacity: 0.9;
+  }
 </style>
diff --git a/src/views/cet/cet-ana-3.vue b/src/views/cet/cet-ana-3.vue
index 0670cee..50648a5 100644
--- a/src/views/cet/cet-ana-3.vue
+++ b/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="batch" :options="batchOptions" change-on-select
-          style="margin-left: 10px;width: 120px" />
-        <a-button style="margin-left: 10px;" type="primary" @click="query">查询</a-button>
+        <a-select v-model:value="collegeMajor" style="width: 300px" :options="collegeMajorOptions" />
+        <a-select v-model:value="batch" :options="batchOptions" change-on-select style="margin-left: 10px; width: 120px" />
+        <a-button style="margin-left: 10px" type="primary" @click="query">查询</a-button>
       </template>
-      <div>
+
+      <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,220 +68,438 @@
             </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';
+  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'
-      },
-      loading: false,
-      collegeOptions: [],
-      collegeMajorOptions: [],
-      batchOptions: [],
-      levelOptions: [
-        { value: 'cet4', label: '英语四级' },
-        { value: 'cet6', label: '英语六级' }
-      ],
-      level: null,
-      college: null,
-      batch: null,
-      collegeMajor: null,
-      sumRate: null,//总通过率
-      topCollege: null,//顶部选择器选择的学院
-      topBath: null,//顶部选择器选择的批次
-    };
-  },
-  methods: {
-    dataChart(data) {
-      let xData = [];
-      let yData = [];
-      for (let key in data) {
-        xData.push(key);
-        // 将数据转换为百分比（加上%）
-        yData.push((data[key]).toFixed(1));
-      }
-      xData = xData.map(label => label.split("").join("\n"));//将x轴竖着展示
-      let myChart = echarts.init(document.getElementById("map1"));
-      // 指定图表的配置项和数据
-      let option = {
-        title: {
-          // text: "学院 / 专业通过率变化",
+  export default {
+    data() {
+      return {
+        Url: {
+          getBatch: '/cet/getBatch',
+          getCollege: '/cet/getCollege',
+          getRate: '/cet/getRateByBatch',
+          getCollegeMajor: '/cet/getCollegeMajor',
         },
-        xAxis: {
-          type: 'category',
-          data: xData,
-          axisLabel: {
-            interval: 0,//代表显示所有x轴标签显示
-            rotate: 0,//代表倾斜30度显示
-          }
-        },
-        //提示框
-        tooltip: {
-          trigger: 'axis',
-          axisPointer: {
-            type: 'shadow'
-          },
-          formatter: function (params) {
-            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>'
-              + '</table>';
-          }
-        },
-        toolbox: {
-          // show: true,
-          // feature: {
-          //   magicType: { show: true, type: ['line', 'bar'] },
-          //   restore: { show: true },
-          //   saveAsImage: { show: true },
-          // },
-        },
-        //网格
-        grid: {
-          left: '3%',
-          right: '4%',
-          bottom: '1%',//网格距离容器底部的距离是容器高度的3%
-          containLabel: true
-        },
-        yAxis: {
-          type: 'value',
-          name: '通过率',
-          axisLabel: {
-            formatter: '{value} %'
-          }
-        },
-        series: [
-          {
-            data: yData,
-            type: 'bar',
-            itemStyle: {
-              normal: {
-                label: {
-                  show: true, //开启显示
-                  position: 'top', //在上方显示
-                  textStyle: { //数值样式
-                    color: 'black',
-                    fontSize: 12
-                  },
-                  formatter: '{c}%',
-                }
-              }
-            }
-          }
-        ]
+        loading: false,
+        collegeOptions: [],
+        collegeMajorOptions: [],
+        batchOptions: [],
+        levelOptions: [
+          { value: 'cet4', label: '英语四级' },
+          { value: 'cet6', label: '英语六级' },
+        ],
+        level: null,
+        college: null,
+        batch: null,
+        collegeMajor: null,
+        sumRate: null, //总通过率
+        topCollege: null, //顶部选择器选择的学院
+        topBath: null, //顶部选择器选择的批次
       };
-      // 使用刚指定的配置项和数据显示图表。
-      myChart.setOption(option);
     },
-    // 获取批次数据
-    async getBatch() {
-      const getBatch = await defHttp.get({ url: this.Url.getBatch });
-      this.batchOptions = getBatch.batches.map(item => {
-        return {
-          value: item.value,
-          label: item.label
-        }
-      });
-      // const getCollege = await defHttp.get({ url: this.Url.getCollege });
-
-      // this.collegeOptions = getCollege.colleges;
-      // this.college = this.collegeOptions[0].value;
-
-      this.level = this.levelOptions[0].value;
-
-      // this.query();
+    mounted() {
+      this.getCollegeMajorData();
+      this.getBatch();
+      this.query();
     },
-    //获取学院专业级联数据
-    async getCollegeMajorData() {
-      const res = await defHttp.get({ url: this.Url.getCollegeMajor });
-
-      //通过map方法将数据转换为级联选择器需要的数据格式
-      this.collegeMajorOptions = res.collegeMajor.map(item => {
-        return {
-          value: item.college,
-          label: item.college,
-          children: item.major.map(major => {
-            return {
-              value: major,
-              label: major
-            }
-          })
+    methods: {
+      dataChart(data) {
+        let xData = [];
+        let yData = [];
+        for (let key in data) {
+          xData.push(key);
+          // 将数据转换为百分比（加上%）
+          yData.push(data[key].toFixed(1));
         }
-      });
-      this.collegeMajorOptions.unshift({ value: '全校', label: '全校' });
-      this.collegeMajor = this.collegeMajorOptions[0].value;
-      console.log(this.collegeMajor)
-      console.log(this.collegeMajorOptions);
+        xData = xData.map((label) => label.split('').join('\n')); //将x轴竖着展示
+        let myChart = echarts.init(document.getElementById('map1'));
+        // 指定图表的配置项和数据
+        let option = {
+          title: {
+            // text: "学院 / 专业通过率变化",
+          },
+          xAxis: {
+            type: 'category',
+            data: xData,
+            axisLabel: {
+              interval: 0, //代表显示所有x轴标签显示
+              rotate: 0, //代表倾斜30度显示
+            },
+          },
+          //提示框
+          tooltip: {
+            trigger: 'axis',
+            axisPointer: {
+              type: 'shadow',
+            },
+            formatter: function (params) {
+              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>' +
+                '</table>'
+              );
+            },
+          },
+          toolbox: {
+            // show: true,
+            // feature: {
+            //   magicType: { show: true, type: ['line', 'bar'] },
+            //   restore: { show: true },
+            //   saveAsImage: { show: true },
+            // },
+          },
+          //网格
+          grid: {
+            left: '3%',
+            right: '4%',
+            bottom: '1%', //网格距离容器底部的距离是容器高度的3%
+            containLabel: true,
+          },
+          yAxis: {
+            type: 'value',
+            name: '通过率',
+            axisLabel: {
+              formatter: '{value} %',
+            },
+          },
+          series: [
+            {
+              data: yData,
+              type: 'bar',
+              itemStyle: {
+                normal: {
+                  label: {
+                    show: true, //开启显示
+                    position: 'top', //在上方显示
+                    textStyle: {
+                      //数值样式
+                      color: 'black',
+                      fontSize: 12,
+                    },
+                    formatter: '{c}%',
+                  },
+                },
+              },
+            },
+          ],
+        };
+        // 使用刚指定的配置项和数据显示图表。
+        myChart.setOption(option);
+      },
+      // 获取批次数据
+      async getBatch() {
+        const getBatch = await defHttp.get({ url: this.Url.getBatch });
+        this.batchOptions = getBatch.batches.map((item) => {
+          return {
+            value: item.value,
+            label: item.label,
+          };
+        });
+        // const getCollege = await defHttp.get({ url: this.Url.getCollege });
+
+        // this.collegeOptions = getCollege.colleges;
+        // this.college = this.collegeOptions[0].value;
+
+        this.level = this.levelOptions[0].value;
+
+        // this.query();
+      },
+      //获取学院专业级联数据
+      async getCollegeMajorData() {
+        const res = await defHttp.get({ url: this.Url.getCollegeMajor });
+
+        //通过map方法将数据转换为级联选择器需要的数据格式
+        this.collegeMajorOptions = res.collegeMajor.map((item) => {
+          return {
+            value: item.college,
+            label: item.college,
+            children: item.major.map((major) => {
+              return {
+                value: major,
+                label: major,
+              };
+            }),
+          };
+        });
+        this.collegeMajorOptions.unshift({ value: '全校', label: '全校' });
+        this.collegeMajor = this.collegeMajorOptions[0].value;
+        console.log(this.collegeMajor);
+        console.log(this.collegeMajorOptions);
+      },
+      // 查询数据
+      async query() {
+        let resultData = null;
+        try {
+          //如果this.batch为null则先赋个值
+          if (!this.batch) {
+            this.batch = '2017-12-01';
+          }
+          if (!this.collegeMajor) {
+            this.collegeMajor = '全校';
+          }
+          //如果this.batch[1]不存在则设为null
+          let major = this.batch.length > 1 ? this.batch[1] : '';
+          this.topCollege = this.collegeMajor;
+          this.topBath = this.batch;
+          this.loading = true;
+          let params = {
+            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);
+        } finally {
+          this.loading = false;
+          this.$nextTick(() => {
+            this.dataChart(resultData.data);
+            this.draPieChart_Pass();
+            this.draPieChart_Participate();
+          });
+        }
+      },
+
+      //绘画饼图--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();
+        });
+      },
     },
-    // 查询数据
-    async query() {
-      let resultData = null;
-      try {
-        //如果this.batch为null则先赋个值
-        if (!this.batch) {
-          this.batch = '2017-12-01';
-        }
-        if (!this.collegeMajor) {
-          this.collegeMajor = '全校';
-        }
-        //如果this.batch[1]不存在则设为null
-        let major = this.batch.length > 1 ? this.batch[1] : "";
-        this.topCollege = this.collegeMajor;
-        this.topBath = this.batch;
-        this.loading = true;
-        let params = {
-          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)
-      } finally {
-        this.loading = false;
-        this.$nextTick(() => {
-          this.dataChart(resultData.data);
-        })
-      }
-    }
-  },
-  mounted() {
-    this.getCollegeMajorData();
-    this.getBatch();
-    this.query();
-  }
-
-}
+  };
 </script>
 
 <style lang="less" scoped>
-.container {
-  // display: flex;
-  background-color: #fff;
-  padding: 15px;
-  border-radius: 4px;
-  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.09);
-}
+  .container {
+    // display: flex;
+    background-color: #fff;
+    padding: 15px;
+    border-radius: 4px;
+    box-shadow: 0 2px 8px rgba(0, 0, 0, 0.09);
+  }
 
-.title {
-  font-size: 20px;
-  color: rgb(8, 8, 8);
-  font-weight: bold;
-}
-</style>
\ No newline at end of file
+  .title {
+    font-size: 20px;
+    color: rgb(8, 8, 8);
+    font-weight: bold;
+  }
+  .tip {
+    margin-bottom: 10px;
+    background-color: #d0e5fe;
+    opacity: 0.9;
+  }
+</style>
diff --git a/src/views/cet/cet-ana-college.vue b/src/views/cet/cet-ana-college.vue
index e4a4be3..788193a 100644
--- a/src/views/cet/cet-ana-college.vue
+++ b/src/views/cet/cet-ana-college.vue
@@ -1,801 +1,448 @@
 <template>
-  <div>
-    <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">
-                  <span style="font-size: 15px; margin-right: 10px; display: flex; justify-content: center; align-items: center; font-weight: bold"
-                    >年级:
-                  </span>
-                  <a-checkbox-group :options="entrydateOptions" v-model:value="collegeentrydate" @change="onCollegeEntrydateChange" />
-                </div>
-                <div style="display: flex; margin-top: 10px">
-                  <span style="font-size: 15px; margin-right: 10px; display: flex; justify-content: center; align-items: center; font-weight: bold"
-                    >学院:
-                  </span>
-                  <a-checkbox-group :options="collegeOptions" v-model:value="collegetab2" @change="onCollegeChange" />
-                </div>
+  <div style="background: #ececec; padding: 15px">
+    <a-card :bordered="false">
+      <div class="query">
+        <div>
+          <div style="display: flex">
+            <span style="font-size: 15px; margin-right: 10px; display: flex; justify-content: center; align-items: center; font-weight: bold"
+              >年级:
+            </span>
+            <a-checkbox-group :options="entrydateOptions" v-model:value="collegeentrydate" @change="onCollegeEntrydateChange" />
+          </div>
+          <div style="display: flex; margin-top: 10px">
+            <span style="font-size: 15px; margin-right: 10px; display: flex; justify-content: center; align-items: center; font-weight: bold"
+              >学院:
+            </span>
+            <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">
-                  <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">
-        <template #extra>
-          <!-- <a-select v-model:value="college" style="width: 300px" mode="multiple" :max-tag-count="2"
-          :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>
-          </a-col>
-        </a-row>
-      </a-card>
-    </div>
+          <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>
+      </div>
+    </a-card>
+    <a-card title="学院四级通过率对比" :loading="tab2loading" :bordered="false">
+      <a-row :gutter="12">
+        <a-col :xl="14">
+          <div class="container">
+            <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>
 </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';
+  import { defHttp } from '/@/utils/http/axios';
+  import * as echarts from 'echarts';
+  import { message } from 'ant-design-vue';
 
-export default {
-  name: 'Analysis',
-  data() {
-    return {
-      activeKey: '1',
-      allCollege: [],
-      showBox: false,
-      showGroup: false,
-      oneentrydate: null,
-      collegeentrydate: [],
-      majorentrydate: [],
-      lastMajorEntrydate: [],
-      checkedOptions: [],
-      collegetab2: [],
-      collegeMajorOptions: [],
-      collegeMajor: [],
-      Url: {
-        getBatch: '/cet/getBatch',
-        getEntrydate: '/cet/getEntrydate',
-        getCollege: '/cet/getCollege',
-        getCollegeRate: '/cet/getRateByCollege',
-        getAllRate: '/cet/getAllRate',
-        getCollegeMajor: '/cet/getCollegeMajor',
-        getRateByMajor: '/cet/getRateByMajor',
+  export default {
+    data() {
+      return {
+        activeKey: '1',
+        allCollege: [],
+        showBox: false,
+        showGroup: false,
+        oneentrydate: null,
+        collegeentrydate: [],
+        majorentrydate: [],
+        lastMajorEntrydate: [],
+        checkedOptions: [],
+        collegetab2: [],
+        collegeMajorOptions: [],
+        collegeMajor: [],
+        Url: {
+          getBatch: '/cet/getBatch',
+          getEntrydate: '/cet/getEntrydate',
+          getCollege: '/cet/getCollege',
+          getCollegeRate: '/cet/getRateByCollege',
+          getAllRate: '/cet/getAllRate',
+          getCollegeMajor: '/cet/getCollegeMajor',
+          getRateByMajor: '/cet/getRateByMajor',
+        },
+        tab1loading: false,
+        tab2loading: false,
+        tab3loading: false,
+
+        collegeOptions: [],
+        batchOptions: [],
+        levelOptions: [
+          { value: 'cet4', label: '英语四级' },
+          { value: 'cet6', label: '英语六级' },
+        ],
+        visible: false,
+        level: null,
+        college: [],
+        batch: null,
+        entrydateOptions: [],
+        entrydate: [],
+        majorCheckOn: [],
+        //对不同的学院选择的专业进行记忆化
+        lastCollegeMajor: [],
+        majorLength: 0,
+        majorOptions: [],
+        //对学院对比学院进行记忆化上次选择结果
+        lastCollege: [],
+        //对学院对比学院进行记忆化上次选择结果
+        lastCollegeEntrydate: [],
+      };
+    },
+    mounted() {
+      this.getCollegeOptions();
+      // this.getBatch();
+      this.getEntrydate();
+      this.allQuery();
+      this.getCollegeMajorData();
+    },
+    methods: {
+      onMajorChange(value) {
+        console.log(value, 'value');
+        let length = value.length;
+        //遍历value,与this.collegeMajorOptions比较，如果value中的数据在this.collegeMajorOptions中则获得他的children长度
+        for (let i = 0; i < value.length; i++) {
+          for (let j = 0; j < this.collegeMajorOptions.length; j++) {
+            if (value[i] == this.collegeMajorOptions[j].value) {
+              length += this.collegeMajorOptions[j].children.length;
+              length -= 1;
+            }
+            if (length > 5) {
+              message.error('最多选择五个专业');
+              //删除value最后一个数据
+              value.pop();
+              return;
+            }
+          }
+        }
+        console.log(length, 'length');
       },
-      tab1loading: false,
-      tab2loading: false,
-      tab3loading: false,
-
-      collegeOptions: [],
-      batchOptions: [],
-      levelOptions: [
-        { value: 'cet4', label: '英语四级' },
-        { value: 'cet6', label: '英语六级' },
-      ],
-      visible: false,
-      level: null,
-      college: [],
-      batch: null,
-      entrydateOptions: [],
-      entrydate: [],
-      majorCheckOn: [],
-      //对不同的学院选择的专业进行记忆化
-      lastCollegeMajor: [],
-      majorLength: 0,
-      majorOptions: [],
-      //对学院对比学院进行记忆化上次选择结果
-      lastCollege: [],
-      //对学院对比学院进行记忆化上次选择结果
-      lastCollegeEntrydate: [],
-    };
-  },
-  methods: {
-    onMajorChange(value) {
-      console.log(value, 'value');
-      let length = value.length;
-      //遍历value,与this.collegeMajorOptions比较，如果value中的数据在this.collegeMajorOptions中则获得他的children长度
-      for (let i = 0; i < value.length; i++) {
-        for (let j = 0; j < this.collegeMajorOptions.length; j++) {
-          if (value[i] == this.collegeMajorOptions[j].value) {
-            length += this.collegeMajorOptions[j].children.length;
-            length -= 1;
-          }
-          if (length > 5) {
-            message.error('最多选择五个专业');
-            //删除value最后一个数据
-            value.pop();
-            return;
-          }
+      allQuery() {
+        this.tab1loading = true;
+        let college = ['全校'];
+        let query = 'tab1';
+        if (this.oneentrydate == null) {
+          this.oneentrydate = '2017';
         }
-      }
-      console.log(length, 'length');
-    },
-    allQuery() {
-      this.tab1loading = true;
-      let college = ['全校'];
-      let query = 'tab1';
-      if (this.oneentrydate == null) {
-        this.oneentrydate = '2017';
-      }
-      this.query(query, college, [this.oneentrydate]);
-    },
-    async majorQuery() {
-      if (this.majorentrydate.length == 0) {
-        message.error('请选择年级');
-        return;
-      }
-      if (this.collegeMajor.length == 0 || this.collegeMajor == null) {
-        message.error('请选择学院');
-        return;
-      }
-
-      if (this.lastCollegeMajor.length == 0 || this.lastCollegeMajor == null) {
-        message.error('请选择专业');
-        return;
-      }
-      this.tab3loading = true;
-      let res = null;
-      try {
-        let params = {
-          college: this.lastCollegeMajor,
-          entrydate: this.majorentrydate,
-        };
-        res = await defHttp.post({ url: this.Url.getRateByMajor, params });
-      } finally {
-        console.log(res, 'res');
-        this.tab3loading = false;
-        this.$nextTick(() => {
-          this.drawChart(res.data, 'tab3');
-        });
-      }
-    },
-    collegeQuery() {
-      if (this.collegeentrydate.length == 0) {
-        message.error('请选择年级');
-        return;
-      }
-      if (this.collegetab2.length == 1) {
-        message.error('请至少选择两个学院');
-        return;
-      }
-      if (this.collegetab2.length == 0) {
-        message.error('请选择学院');
-        return;
-      }
-
-      this.tab2loading = true;
-      let query = 'tab2';
-      this.query(query, this.collegetab2, this.collegeentrydate);
-    },
-    test(value) {
-      console.log(this.collegeMajor);
-      console.log(value);
-    },
-    //选择全校
-    checkAll(e) {
-      this.college = ['全校'];
-      this.showGroup = !this.showGroup;
-    },
-
-    //选择学院
-    checkOne(e) {
-      console.log(e);
-      this.college = e;
-      this.showBox = true;
-      if (e.length == 0) {
-        this.showBox = false;
-      }
-    },
-    //选择年级
-    checkoneentrydate(e) {
-      console.log(e.target.value, 'e');
-      this.entrydate = [e.target.value];
-    },
-
-    //获取学院专业级联数据
-    async getCollegeMajorData() {
-      const res = await defHttp.get({ url: this.Url.getCollegeMajor });
-      //通过map方法将数据转换为级联选择器需要的数据格式
-      this.collegeMajorOptions = res.collegeMajor.map((item) => {
-        return {
-          value: item.college,
-          label: item.college,
-          children: item.major.map((major) => {
-            return {
-              value: major,
-              label: major,
-            };
-          }),
-        };
-      });
-      // this.collegeMajor = ['东语学院'];
-      console.log(this.collegeMajor, 'collegeMajor');
-      console.log(this.collegeMajorOptions, 'collegeMajorOptions1');
-    },
-
-    getCollegeOptions() {
-      defHttp.get({ url: this.Url.getCollege }).then((res) => {
-        this.collegeOptions = res.colleges;
-        // 手动添加一个全校字段
-
-        // this.collegeOptions.unshift({ value: '全校', label: '全校' });
-        // this.collegeOptions.forEach(option => {
-        //  if (option.value !== '全校') {
-        //     option.disabled = true;
-        //}
-
-        //  });
-        //  this.college = ['全校'];
-        // this.collegetab2 = ['地理科学学院', '文学院'];
-        console.log(this.collegeOptions, 'collegeOptions');
-      });
-    },
-    onMajorEntrydateChange(value) {
-      console.log(value, 'value');
-      if (value.length > 5) {
-        //找到value中不在this.lastMajorEntrydate中的数据
-        for (let i = 0; i < value.length; i++) {
-          if (!this.lastMajorEntrydate.includes(value[i])) {
-            message.error('最多选择五个');
-            //删除value[i]
-            value.splice(i, 1);
-            return;
-          }
+        this.query(query, college, [this.oneentrydate]);
+      },
+      async majorQuery() {
+        if (this.majorentrydate.length == 0) {
+          message.error('请选择年级');
+          return;
         }
-      }
-      this.lastMajorEntrydate = value;
-    },
-    //学院对比 学院选项回调函数
-    onCollegeChange(value) {
-      console.log(value, 'value');
-      if (value.length > 5) {
-        message.error('最多选择五个');
-        //和lastCollege比较，如果value中的数据不在lastCollege中则删除
-        for (let i = 0; i < value.length; i++) {
-          if (!this.lastCollege.includes(value[i])) {
-            value.splice(i, 1);
-            return;
-          }
-        }
-        return;
-      }
-      this.lastCollege = value;
-    },
-    //学院对比 年级选项回调函数
-    onCollegeEntrydateChange(value) {
-      console.log(value, 'value');
-      if (value.length > 5) {
-        message.error('最多选择五个');
-        //和lastCollegeEntrydate比较，如果value中的数据不在lastCollegeEntrydate中则删除
-        for (let i = 0; i < value.length; i++) {
-          if (!this.lastCollegeEntrydate.includes(value[i])) {
-            value.splice(i, 1);
-            return;
-          }
-        }
-        return;
-      }
-      this.lastCollegeEntrydate = value;
-    },
-    //专业选项回调函数
-    onCollegeMajorChange(value) {
-      //将value中的数据与this.lastCollegeMajor比较，如果value中的有this.lastCollegeMajor中没有的数据则添加,反之寻找在this.majorOptions中并且在this.lastCollegeMajor中但是不在value中的数据删除
-      for (let i = 0; i < value.length; i++) {
-        if (!this.lastCollegeMajor.map((item) => item[1]).includes(value[i])) {
-          if (this.majorLength == 5) {
-            message.error('最多选择五个');
-            //从value中删除value[i]
-            value.splice(i, 1);
-            return;
-          }
-          this.lastCollegeMajor.push([this.collegeMajor, value[i]]);
-          this.majorLength++;
-        }
-      }
-      for (let i = 0; i < this.lastCollegeMajor.length; i++) {
-        if (!value.includes(this.lastCollegeMajor[i][1])) {
-          //查看该数据是都在this.majorOptions中
-          if (this.majorOptions.find((item) => item.value == this.lastCollegeMajor[i][1])) {
-            this.lastCollegeMajor.splice(i, 1);
-            console.log('splice');
-            this.majorLength--;
-          }
-        }
-      }
-      console.log(value, 'value');
-    },
-    removeTag(index) {
-      if (this.majorCheckOn.includes(this.lastCollegeMajor[index][1])) {
-        let index1 = this.majorCheckOn.indexOf(this.lastCollegeMajor[index][1]);
-        this.majorCheckOn.splice(index1, 1);
-      }
-      this.lastCollegeMajor.splice(index, 1);
-      this.majorLength--;
-    },
-    //学院选项回调函数
-    onMajorCollegeChange(value) {
-      let val = value.target.value;
-      console.log(val, 'value');
-      console.log(this.collegeMajorOptions.find((item) => item.value == val).children, 'majorOptions');
-      this.majorOptions = this.collegeMajorOptions.find((item) => item.value == val).children;
-      //将this.majorCheckOn中的数据与this.lastCollegeMajor比较，如果this.lastCollegeMajor中有this.majorCheckOn中没有的数据则删除,反之添加
-      // for (let i = 0; i < this.majorCheckOn.length; i++) {
-      //   if (!this.lastCollegeMajor.includes(this.majorCheckOn[i])) {
-      //     this.lastCollegeMajor.push(this.majorCheckOn[i]);
-      //   }
-      // }
-      // for (let i = 0; i < this.lastCollegeMajor.length; i++) {
-      //   if (!this.majorCheckOn.includes(this.lastCollegeMajor[i])) {
-      //     this.lastCollegeMajor.splice(i, 1);
-      //     console.log("splice")
-      //   }
-      // }
-      // this.lastCollegeMajor = this.majorCheckOn;
-      console.log(this.lastCollegeMajor, 'lastCollegeMajor');
-      this.majorCheckOn = this.lastCollegeMajor.map((item) => item[1]);
-      console.log(this.majorCheckOn, 'majorCheckOn');
-    },
-
-    clearMajor() {
-      this.majorCheckOn = [];
-      this.lastCollegeMajor = [];
-      this.majorLength = 0;
-    },
-    clearCollege() {
-      this.collegetab2 = [];
-      this.collegeentrydate = [];
-      this.lastCollege = [];
-      this.lastCollegeEntrydate = [];
-    },
-    //tab2\3图标
-    drawChart(data, tab) {
-      let seriesData = [];
-
-      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',
-        '#fac858',
-        '#ee6666',
-        '#73c0de',
-        '#FF6A6A',
-        '#FFA500',
-        '#EE2C2C',
-        '#90EE90',
-        '#008B8B',
-        '#FFC0CB',
-        '#FFDAB9',
-        '#FFDEAD',
-        '#FFE4B5',
-        '#FFE4C4',
-        '#FFE4E1',
-        '#FFEBCD',
-        '#FFEFD5',
-        '#FFFAF0',
-        '#FFFAFA',
-        '#FFFFE0',
-        '#FFFFF0',
-        '#FFFFFF',
-        '#F0F8FF',
-        '#FAEBD7',
-        '#FAF0E6',
-        '#FAFAD2',
-        '#F5FFFA',
-        '#F8F8FF',
-        '#F0FFF0',
-        '#F0FFFF',
-        '#F0E68C',
-        '#F0F8FF',
-        '#F0FFF0',
-        '#F0FFFF',
-        '#F4A460',
-        '#F5DEB3',
-        '#F5F5DC',
-        '#F5F5F5',
-        '#F5FFFA',
-        '#F8F8FF',
-        '#F9EBEA',
-        '#FAD7A0',
-        '#FAF0E6',
-        '#FAFAD2',
-        '#FAF0E6  ',
-      ];
-      let isJK = false;
-      for (let i in data) {
-        console.log(i, 'i');
-        legendData.push(i);
-        let yData = [];
-        // legendData=[];
-        console.log(data[i], 'data[i]');
-
-        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,
-          type: 'bar',
-          //设置柱状图大小
-          barWidth: 25,
-          data: yData,
-          //柱子间距
-          barGap: '30%',
-          //颜色
-          itemStyle: {
-            normal: {
-              label: {
-                show: true, //开启显示
-                position: 'top', //在上方显示
-                formatter: '{c}%',
-                textStyle: {
-                  //数值样式
-                  color: 'black',
-                  fontSize: 13,
-                },
-              },
-              color: colors[k++],
-            },
-          },
-        });
-      }
-      console.log(legendData, 'legendData');
-      console.log(seriesData, 'dasaaseriresdata');
-      // debugger
-      let myChart = null;
-      console.log(tab, 'tab');
-      if (tab == 'tab2') {
-        myChart = document.getElementById('map2');
-        if (myChart) {
-          myChart = echarts.getInstanceByDom(myChart);
-          if (myChart) {
-            myChart.dispose();
-          }
-        }
-        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: {
-          text: '学院四级通过率对比',
-        },
-        legend: {},
-        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 + legendData[i] + ' : ' + params[i].value + '%' + '<br>';
-            }
-            return result;
-          },
-        },
-        toolbox: {
-          show: true,
-          feature: {
-            magicType: { show: true, type: ['line', 'bar'] },
-            restore: { show: true },
-            saveAsImage: { show: true },
-          },
-        },
-        grid: {
-          left: '3%',
-          right: '4%',
-          bottom: '3%',
-          containLabel: true,
-        },
-        xAxis: [
-          {
-            type: 'category',
-            data: xData,
-            axisLabel: {
-              interval: 0, //代表显示所有x轴标签显示
-              rotate: 0, //代表倾斜0度显示
-            },
-          },
-        ],
-        yAxis: [
-          {
-            type: 'value',
-            name: '通过率',
-            axisLabel: {
-              formatter: '{value} %',
-            },
-          },
-        ],
-        series: seriesData,
-      };
-      // 使用刚指定的配置项和数据显示图表。
-      console.log(option, 'option');
-      console.log(myChart, 'myChart');
-      setTimeout(() => {
-        myChart.setOption(option);
-      }, 1);
-    },
-
-    dataChart(data, tab) {
-      let seriesData = [];
-      let xData = [];
-      let colors = [
-        '#5370c5',
-        '#91CC75',
-        '#fac858',
-        '#ee6666',
-        '#73c0de',
-        '#FF6A6A',
-        '#FFA500',
-        '#EE2C2C',
-        '#90EE90',
-        '#008B8B',
-        '#FFC0CB',
-        '#FFDAB9',
-        '#FFDEAD',
-        '#FFE4B5',
-        '#FFE4C4',
-        '#FFE4E1',
-        '#FFEBCD',
-        '#FFEFD5',
-        '#FFFAF0',
-        '#FFFAFA',
-        '#FFFFE0',
-        '#FFFFF0',
-        '#FFFFFF',
-        '#F0F8FF',
-        '#FAEBD7',
-        '#FAF0E6',
-        '#FAFAD2',
-        '#F5FFFA',
-        '#F8F8FF',
-        '#F0FFF0',
-        '#F0FFFF',
-        '#F0E68C',
-        '#F0F8FF',
-        '#F0FFF0',
-        '#F0FFFF',
-        '#F4A460',
-        '#F5DEB3',
-        '#F5F5DC',
-        '#F5F5F5',
-        '#F5FFFA',
-        '#F8F8FF',
-        '#F9EBEA',
-        '#FAD7A0',
-        '#FAF0E6',
-        '#FAFAD2',
-        '#FAF0E6  ',
-      ];
-      let j = 0;
-
-      for (let i in data) {
-        xData = [];
-        let yData = [];
-        for (let key in data[i]) {
-          xData.push(data[i][key].college);
-          // 将数据转换为百分比（加上%）
-          yData.push(data[i][key].passRate);
+        if (this.collegeMajor.length == 0 || this.collegeMajor == null) {
+          message.error('请选择学院');
+          return;
         }
 
-        xData = xData.map((label) => label.split('').join('\n')); //将x轴竖着展示
-        seriesData.push({
-          name: i + '级累计总通过率',
-          type: 'bar',
-          //设置柱状图大小
-          barWidth: 25,
-          data: yData,
-          //柱子间距
-          barGap: '30%',
-          //颜色
-          itemStyle: {
-            normal: {
-              label: {
-                show: true, //开启显示
-                position: 'top', //在上方显示
-                formatter: '{c}%',
-                textStyle: {
-                  //数值样式
-                  color: 'black',
-                  fontSize: 13,
-                },
-              },
-              color: colors[j++],
-            },
-          },
-        });
-        if (j == colors.length) {
-          j = 0;
+        if (this.lastCollegeMajor.length == 0 || this.lastCollegeMajor == null) {
+          message.error('请选择专业');
+          return;
         }
-        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++],
-              },
-            },
+        this.tab3loading = true;
+        let res = null;
+        try {
+          let params = {
+            college: this.lastCollegeMajor,
+            entrydate: this.majorentrydate,
+          };
+          res = await defHttp.post({ url: this.Url.getRateByMajor, params });
+        } finally {
+          console.log(res, 'res');
+          this.tab3loading = false;
+          this.$nextTick(() => {
+            this.drawChart(res.data, 'tab3');
           });
-          if (j == colors.length) {
-            j = 0;
+        }
+      },
+      collegeQuery() {
+        if (this.collegeentrydate.length == 0) {
+          message.error('请选择年级');
+          return;
+        }
+        if (this.collegetab2.length == 1) {
+          message.error('请至少选择两个学院');
+          return;
+        }
+        if (this.collegetab2.length == 0) {
+          message.error('请选择学院');
+          return;
+        }
+
+        this.tab2loading = true;
+        let query = 'tab2';
+        this.query(query, this.collegetab2, this.collegeentrydate);
+      },
+      test(value) {
+        console.log(this.collegeMajor);
+        console.log(value);
+      },
+      //选择全校
+      checkAll(e) {
+        this.college = ['全校'];
+        this.showGroup = !this.showGroup;
+      },
+
+      //选择学院
+      checkOne(e) {
+        console.log(e);
+        this.college = e;
+        this.showBox = true;
+        if (e.length == 0) {
+          this.showBox = false;
+        }
+      },
+      //选择年级
+      checkoneentrydate(e) {
+        console.log(e.target.value, 'e');
+        this.entrydate = [e.target.value];
+      },
+
+      //获取学院专业级联数据
+      async getCollegeMajorData() {
+        const res = await defHttp.get({ url: this.Url.getCollegeMajor });
+        //通过map方法将数据转换为级联选择器需要的数据格式
+        this.collegeMajorOptions = res.collegeMajor.map((item) => {
+          return {
+            value: item.college,
+            label: item.college,
+            children: item.major.map((major) => {
+              return {
+                value: major,
+                label: major,
+              };
+            }),
+          };
+        });
+        // this.collegeMajor = ['东语学院'];
+        console.log(this.collegeMajor, 'collegeMajor');
+        console.log(this.collegeMajorOptions, 'collegeMajorOptions1');
+      },
+
+      getCollegeOptions() {
+        defHttp.get({ url: this.Url.getCollege }).then((res) => {
+          this.collegeOptions = res.colleges;
+          // 手动添加一个全校字段
+
+          // this.collegeOptions.unshift({ value: '全校', label: '全校' });
+          // this.collegeOptions.forEach(option => {
+          //  if (option.value !== '全校') {
+          //     option.disabled = true;
+          //}
+
+          //  });
+          //  this.college = ['全校'];
+          // this.collegetab2 = ['地理科学学院', '文学院'];
+          console.log(this.collegeOptions, 'collegeOptions');
+        });
+      },
+      onMajorEntrydateChange(value) {
+        console.log(value, 'value');
+        if (value.length > 5) {
+          //找到value中不在this.lastMajorEntrydate中的数据
+          for (let i = 0; i < value.length; i++) {
+            if (!this.lastMajorEntrydate.includes(value[i])) {
+              message.error('最多选择五个');
+              //删除value[i]
+              value.splice(i, 1);
+              return;
+            }
           }
         }
-      }
-      let myChart = null;
-      if (tab == 'tab2') {
-        myChart = echarts.init(document.getElementById('map2'));
-      } else if (tab == 'tab1') {
-        myChart = echarts.init(document.getElementById('map1'));
-      } else if (tab == 'tab3') {
-        myChart = echarts.init(document.getElementById('map3'));
-      }
-      // 指定图表的配置项和数据
-      // const college1 = this.college;
-      let option = {
-        title: {
-          text: '本批次学院通过率排名',
-        },
-        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 + params[i].seriesName + ' : ' + params[i].value + '%' + '<br>';
+        this.lastMajorEntrydate = value;
+      },
+      //学院对比 学院选项回调函数
+      onCollegeChange(value) {
+        console.log(value, 'value');
+        if (value.length > 5) {
+          message.error('最多选择五个');
+          //和lastCollege比较，如果value中的数据不在lastCollege中则删除
+          for (let i = 0; i < value.length; i++) {
+            if (!this.lastCollege.includes(value[i])) {
+              value.splice(i, 1);
+              return;
             }
-            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;
+        }
+        this.lastCollege = value;
+      },
+      //学院对比 年级选项回调函数
+      onCollegeEntrydateChange(value) {
+        console.log(value, 'value');
+        if (value.length > 5) {
+          message.error('最多选择五个');
+          //和lastCollegeEntrydate比较，如果value中的数据不在lastCollegeEntrydate中则删除
+          for (let i = 0; i < value.length; i++) {
+            if (!this.lastCollegeEntrydate.includes(value[i])) {
+              value.splice(i, 1);
+              return;
             }
-            return result;
-          },
-        },
-        toolbox: {
-          show: true,
-          feature: {
-            magicType: { show: true, type: ['line', 'bar'] },
-            restore: { show: true },
-            saveAsImage: { show: true },
-          },
-        },
-        grid: {
-          left: '3%',
-          right: '4%',
-          bottom: '3%',
-          containLabel: true,
-        },
-        xAxis: [
-          {
-            type: 'category',
-            data: xData,
-            axisLabel: {
-              interval: 0, //代表显示所有x轴标签显示
-              rotate: 0, //代表倾斜0度显示
-            },
-          },
-        ],
-        yAxis: [
-          {
-            type: 'value',
-            name: '通过率',
-            axisLabel: {
-              formatter: '{value} %',
-            },
-          },
-          {
-            type: 'value',
-            name: '排名',
-            show: false,
-          },
-        ],
-        series: seriesData,
-      };
-      if (tab == 'tab1') {
-        option.series = [
-          {
-            name: '累计总通过率',
+          }
+          return;
+        }
+        this.lastCollegeEntrydate = value;
+      },
+      //专业选项回调函数
+      onCollegeMajorChange(value) {
+        //将value中的数据与this.lastCollegeMajor比较，如果value中的有this.lastCollegeMajor中没有的数据则添加,反之寻找在this.majorOptions中并且在this.lastCollegeMajor中但是不在value中的数据删除
+        for (let i = 0; i < value.length; i++) {
+          if (!this.lastCollegeMajor.map((item) => item[1]).includes(value[i])) {
+            if (this.majorLength == 5) {
+              message.error('最多选择五个');
+              //从value中删除value[i]
+              value.splice(i, 1);
+              return;
+            }
+            this.lastCollegeMajor.push([this.collegeMajor, value[i]]);
+            this.majorLength++;
+          }
+        }
+        for (let i = 0; i < this.lastCollegeMajor.length; i++) {
+          if (!value.includes(this.lastCollegeMajor[i][1])) {
+            //查看该数据是都在this.majorOptions中
+            if (this.majorOptions.find((item) => item.value == this.lastCollegeMajor[i][1])) {
+              this.lastCollegeMajor.splice(i, 1);
+              console.log('splice');
+              this.majorLength--;
+            }
+          }
+        }
+        console.log(value, 'value');
+      },
+      removeTag(index) {
+        if (this.majorCheckOn.includes(this.lastCollegeMajor[index][1])) {
+          let index1 = this.majorCheckOn.indexOf(this.lastCollegeMajor[index][1]);
+          this.majorCheckOn.splice(index1, 1);
+        }
+        this.lastCollegeMajor.splice(index, 1);
+        this.majorLength--;
+      },
+      //学院选项回调函数
+      onMajorCollegeChange(value) {
+        let val = value.target.value;
+        console.log(val, 'value');
+        console.log(this.collegeMajorOptions.find((item) => item.value == val).children, 'majorOptions');
+        this.majorOptions = this.collegeMajorOptions.find((item) => item.value == val).children;
+        //将this.majorCheckOn中的数据与this.lastCollegeMajor比较，如果this.lastCollegeMajor中有this.majorCheckOn中没有的数据则删除,反之添加
+        // for (let i = 0; i < this.majorCheckOn.length; i++) {
+        //   if (!this.lastCollegeMajor.includes(this.majorCheckOn[i])) {
+        //     this.lastCollegeMajor.push(this.majorCheckOn[i]);
+        //   }
+        // }
+        // for (let i = 0; i < this.lastCollegeMajor.length; i++) {
+        //   if (!this.majorCheckOn.includes(this.lastCollegeMajor[i])) {
+        //     this.lastCollegeMajor.splice(i, 1);
+        //     console.log("splice")
+        //   }
+        // }
+        // this.lastCollegeMajor = this.majorCheckOn;
+        console.log(this.lastCollegeMajor, 'lastCollegeMajor');
+        this.majorCheckOn = this.lastCollegeMajor.map((item) => item[1]);
+        console.log(this.majorCheckOn, 'majorCheckOn');
+      },
+
+      clearMajor() {
+        this.majorCheckOn = [];
+        this.lastCollegeMajor = [];
+        this.majorLength = 0;
+      },
+      clearCollege() {
+        this.collegetab2 = [];
+        this.collegeentrydate = [];
+        this.lastCollege = [];
+        this.lastCollegeEntrydate = [];
+      },
+      //tab2\3图标
+      drawChart(data, tab) {
+        let seriesData = [];
+
+        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',
+          '#fac858',
+          '#ee6666',
+          '#73c0de',
+          '#FF6A6A',
+          '#FFA500',
+          '#EE2C2C',
+          '#90EE90',
+          '#008B8B',
+          '#FFC0CB',
+          '#FFDAB9',
+          '#FFDEAD',
+          '#FFE4B5',
+          '#FFE4C4',
+          '#FFE4E1',
+          '#FFEBCD',
+          '#FFEFD5',
+          '#FFFAF0',
+          '#FFFAFA',
+          '#FFFFE0',
+          '#FFFFF0',
+          '#FFFFFF',
+          '#F0F8FF',
+          '#FAEBD7',
+          '#FAF0E6',
+          '#FAFAD2',
+          '#F5FFFA',
+          '#F8F8FF',
+          '#F0FFF0',
+          '#F0FFFF',
+          '#F0E68C',
+          '#F0F8FF',
+          '#F0FFF0',
+          '#F0FFFF',
+          '#F4A460',
+          '#F5DEB3',
+          '#F5F5DC',
+          '#F5F5F5',
+          '#F5FFFA',
+          '#F8F8FF',
+          '#F9EBEA',
+          '#FAD7A0',
+          '#FAF0E6',
+          '#FAFAD2',
+          '#FAF0E6  ',
+        ];
+        let isJK = false;
+        for (let i in data) {
+          console.log(i, 'i');
+          legendData.push(i);
+          let yData = [];
+          // legendData=[];
+          console.log(data[i], 'data[i]');
+
+          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,
             type: 'bar',
-            data: seriesData[0].data,
             //设置柱状图大小
-            barWidth: 25,
-            // barWidth: '60%',
+            barWidth: 16,
+            data: yData,
+            //柱子间距
+            barGap: '30%',
+            //颜色
             itemStyle: {
               normal: {
                 label: {
@@ -805,123 +452,346 @@ export default {
                   textStyle: {
                     //数值样式
                     color: 'black',
-                    fontSize: 13,
+                    fontSize: 10,
                   },
                 },
-                color: colors[0],
+                color: colors[k++],
               },
             },
-          },
-          {
-            name: '排名',
-            type: 'bar',
-            data: seriesData[1].data,
-            label: {
-              show: false,
-              position: 'inside',
-              formatter: '{c}',
-            },
-            yAxisIndex: 1,
-            color: colors[1],
-          },
-        ];
-      }
-      // 使用刚指定的配置项和数据显示图表。
-
-      myChart.setOption(option);
-    },
-    // 获取批次数据
-    async getBatch() {
-      const getBatch = await defHttp.get({ url: this.Url.getBatch });
-      this.batchOptions = getBatch.batches;
-      this.batch = this.batchOptions[0].value;
-      this.level = this.levelOptions[0].value;
-    },
-    //获取年级数据
-    async getEntrydate() {
-      const getEntrydate = await defHttp.get({ url: this.Url.getEntrydate });
-      this.entrydateOptions = getEntrydate.entrydates;
-      this.oneentrydate = this.entrydateOptions[0].value;
-      // this.collegeentrydate = [this.entrydateOptions[0].value];
-      // this.majorentrydate = [this.entrydateOptions[0].value];
-      // this.entrydate.push (this.entrydateOptions[0].value);
-    },
-    // 查询数据
-    async query(query, college, entrydate) {
-      this.visible = false;
-      let result = null;
-      // console.log(this.college, this.entrydate);
-      // //如果this.college和this.batch为null则先赋静态值
-      // if (this.college === null || this.college.length === 0) {
-      //   this.college = ['全校'];
-      // }
-
-      // if (!this.entrydate || this.entrydate.length === 0) {
-      //   this.entrydate = ['2017'];
-      // }
-
-      try {
-        // console.log(this.college, this.entrydate)
-        let params = {
-          college: college,
-          entrydate: entrydate,
-          level: 'cet4',
-        };
-        let url = query == 'tab1' ? this.Url.getAllRate : this.Url.getCollegeRate;
-        console.log(params.college, 'college');
-        result = await defHttp.post({ url: url, params });
-        //使数据按照passRate从大到小排序
-        // result.data.sort((a, b) => {
-        //   return b.passRate - a.passRate;
-        // });
-        console.log('data', result.data);
-      } finally {
-        query == 'tab1' ? (this.tab1loading = false) : (this.tab2loading = false);
-        this.$nextTick(() => {
-          if (query == 'tab1') {
-            this.dataChart(result.data, query);
-          } else if (query == 'tab2') {
-            this.drawChart(result.data, query);
+          });
+        }
+        console.log(legendData, 'legendData');
+        console.log(seriesData, 'dasaaseriresdata');
+        // debugger
+        let myChart = null;
+        console.log(tab, 'tab');
+        myChart = document.getElementById('map2');
+        if (myChart) {
+          myChart = echarts.getInstanceByDom(myChart);
+          if (myChart) {
+            myChart.dispose();
           }
-        });
-      }
+        }
+        myChart = echarts.init(document.getElementById('map2'));
+        // 指定图表的配置项和数据
+        let option = {
+          //title: {
+          //  text: '学院四级通过率对比',
+          //  textStyle: {
+          //    fontSize: 14,
+          //  },
+          //},
+          legend: {},
+          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 + legendData[i] + ' : ' + params[i].value + '%' + '<br>';
+              }
+              return result;
+            },
+          },
+          //toolbox: {
+          //  show: true,
+          //  feature: {
+          //    magicType: { show: true, type: ['line', 'bar'] },
+          //    restore: { show: true },
+          //    saveAsImage: { show: true },
+          //  },
+          //},
+          grid: {
+            left: '3%',
+            right: '4%',
+            bottom: '3%',
+            containLabel: true,
+          },
+          xAxis: [
+            {
+              type: 'category',
+              data: xData,
+              axisLabel: {
+                interval: 0, //代表显示所有x轴标签显示
+                rotate: 0, //代表倾斜0度显示
+              },
+            },
+          ],
+          yAxis: [
+            {
+              type: 'value',
+              name: '通过率',
+              axisLabel: {
+                formatter: '{value} %',
+              },
+            },
+          ],
+          series: seriesData,
+        };
+        // 使用刚指定的配置项和数据显示图表。
+        console.log(option, 'option');
+        console.log(myChart, 'myChart');
+        setTimeout(() => {
+          myChart.setOption(option);
+        }, 1);
+      },
+      drawChart2(data, tab) {
+        let seriesData = [];
+
+        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',
+          '#fac858',
+          '#ee6666',
+          '#73c0de',
+          '#FF6A6A',
+          '#FFA500',
+          '#EE2C2C',
+          '#90EE90',
+          '#008B8B',
+          '#FFC0CB',
+          '#FFDAB9',
+          '#FFDEAD',
+          '#FFE4B5',
+          '#FFE4C4',
+          '#FFE4E1',
+          '#FFEBCD',
+          '#FFEFD5',
+          '#FFFAF0',
+          '#FFFAFA',
+          '#FFFFE0',
+          '#FFFFF0',
+          '#FFFFFF',
+          '#F0F8FF',
+          '#FAEBD7',
+          '#FAF0E6',
+          '#FAFAD2',
+          '#F5FFFA',
+          '#F8F8FF',
+          '#F0FFF0',
+          '#F0FFFF',
+          '#F0E68C',
+          '#F0F8FF',
+          '#F0FFF0',
+          '#F0FFFF',
+          '#F4A460',
+          '#F5DEB3',
+          '#F5F5DC',
+          '#F5F5F5',
+          '#F5FFFA',
+          '#F8F8FF',
+          '#F9EBEA',
+          '#FAD7A0',
+          '#FAF0E6',
+          '#FAFAD2',
+          '#FAF0E6  ',
+        ];
+        let isJK = false;
+        for (let i in data) {
+          console.log(i, 'i');
+          legendData.push(i);
+          let yData = [];
+          // legendData=[];
+          console.log(data[i], 'data[i]');
+
+          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,
+            type: 'line',
+            //设置柱状图大小
+            barWidth: 18,
+            data: yData,
+            //柱子间距
+            barGap: '30%',
+            //颜色
+            itemStyle: {
+              normal: {
+                label: {
+                  show: true, //开启显示
+                  position: 'top', //在上方显示
+                  formatter: '{c}%',
+                  textStyle: {
+                    //数值样式
+                    color: 'black',
+                    fontSize: 10,
+                  },
+                },
+                color: colors[k++],
+              },
+            },
+          });
+        }
+        // debugger
+        let myChart = null;
+        console.log(tab, 'tab');
+        myChart = document.getElementById('map3');
+        if (myChart) {
+          myChart = echarts.getInstanceByDom(myChart);
+          if (myChart) {
+            myChart.dispose();
+          }
+        }
+        myChart = echarts.init(document.getElementById('map3'));
+        // 指定图表的配置项和数据
+        let option = {
+          legend: {},
+          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 + legendData[i] + ' : ' + params[i].value + '%' + '<br>';
+              }
+              return result;
+            },
+          },
+          //toolbox: {
+          //  show: true,
+          //  feature: {
+          //    magicType: { show: true, type: ['line', 'bar'] },
+          //    restore: { show: true },
+          //    saveAsImage: { show: true },
+          //  },
+          //},
+          grid: {
+            left: '3%',
+            right: '4%',
+            bottom: '3%',
+            containLabel: true,
+          },
+          xAxis: [
+            {
+              type: 'category',
+              data: xData,
+              axisLabel: {
+                interval: 0, //代表显示所有x轴标签显示
+                rotate: 0, //代表倾斜0度显示
+              },
+            },
+          ],
+          yAxis: [
+            {
+              type: 'value',
+              name: '通过率',
+              axisLabel: {
+                formatter: '{value} %',
+              },
+            },
+          ],
+          series: seriesData,
+        };
+        // 使用刚指定的配置项和数据显示图表。
+        console.log(option, 'option');
+        console.log(myChart, 'myChart');
+        setTimeout(() => {
+          myChart.setOption(option);
+        }, 1);
+      },
+      // 获取批次数据
+      async getBatch() {
+        const getBatch = await defHttp.get({ url: this.Url.getBatch });
+        this.batchOptions = getBatch.batches;
+        this.batch = this.batchOptions[0].value;
+        this.level = this.levelOptions[0].value;
+      },
+      //获取年级数据
+      async getEntrydate() {
+        const getEntrydate = await defHttp.get({ url: this.Url.getEntrydate });
+        this.entrydateOptions = getEntrydate.entrydates;
+        this.oneentrydate = this.entrydateOptions[0].value;
+        // this.collegeentrydate = [this.entrydateOptions[0].value];
+        // this.majorentrydate = [this.entrydateOptions[0].value];
+        // this.entrydate.push (this.entrydateOptions[0].value);
+      },
+      // 查询数据
+      async query(query, college, entrydate) {
+        this.visible = false;
+        let result = null;
+        // console.log(this.college, this.entrydate);
+        // //如果this.college和this.batch为null则先赋静态值
+        // if (this.college === null || this.college.length === 0) {
+        //   this.college = ['全校'];
+        // }
+
+        // if (!this.entrydate || this.entrydate.length === 0) {
+        //   this.entrydate = ['2017'];
+        // }
+
+        try {
+          // console.log(this.college, this.entrydate)
+          let params = {
+            college: college,
+            entrydate: entrydate,
+            level: 'cet4',
+          };
+          let url = query == 'tab1' ? this.Url.getAllRate : this.Url.getCollegeRate;
+          console.log(params.college, 'college');
+          result = await defHttp.post({ url: url, params });
+          //使数据按照passRate从大到小排序
+          // result.data.sort((a, b) => {
+          //   return b.passRate - a.passRate;
+          // });
+          console.log('data', result.data);
+        } finally {
+          query == 'tab1' ? (this.tab1loading = false) : (this.tab2loading = false);
+          this.$nextTick(() => {
+            if (query == 'tab1') {
+              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>
 
 <style lang="less" scoped>
-.container {
-  display: flex;
-  background-color: #fff;
-  padding: 15px;
-  border-radius: 4px;
-  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.09);
-}
+  .container {
+    display: flex;
+    background-color: #fff;
+    padding: 15px;
+    border-radius: 4px;
+    box-shadow: 0 2px 8px rgba(0, 0, 0, 0.09);
+  }
 
-.query {
-  display: flex;
-  justify-content: flex-start;
-  align-items: center;
-  margin-left: 24px;
-}
+  .query {
+    display: flex;
+    justify-content: flex-start;
+    align-items: center;
+    margin-left: 24px;
+  }
 
-.tab3 {
-  justify-content: flex-start;
-  align-items: center;
-  margin-left: 24px;
-}
+  .tab3 {
+    justify-content: flex-start;
+    align-items: center;
+    margin-left: 24px;
+  }
 
-.title {
-  font-size: 34px;
-  color: rgb(8, 8, 8);
-  font-weight: bold;
-}
+  .title {
+    font-size: 34px;
+    color: rgb(8, 8, 8);
+    font-weight: bold;
+  }
 </style>
diff --git a/src/views/dashboard/Analysis/index.vue b/src/views/dashboard/Analysis/index.vue
index a4d993f..ddb1b60 100644
--- a/src/views/dashboard/Analysis/index.vue
+++ b/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"
-          :options="entrydateOptions"></a-select>
-        <a-button style="margin-left: 10px;" type="primary" @click="query">查询</a-button>
+        <a-select v-model:value="entrydate" style="margin-left: 10px; width: 100px" :options="entrydateOptions" />
+        <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 v-if="topCollege != null" style="margin-bottom: 5px;">
-              <span style="font-size: 15px;">当前数据为 </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>
-              <span style="color: red; font-size: 20px;">{{ topEntrydate }}</span>
-              <span style="font-size: 15px;"> 级数据</span>
+          <div style="padding-left: 10px; min-height: 400px">
+            <div v-if="topCollege != null" style="margin-bottom: 5px">
+              <span style="font-size: 15px">当前数据为 </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>
+              <span style="color: red; font-size: 20px">{{ topEntrydate }}</span>
+              <span style="font-size: 15px"> 级数据</span>
             </div>
-            <a-table :dataSource="dataSourceCet4" :columns="columns" :pagination='false' bordered>
-              <template v-slot:passRateSlot>
+            <a-table :dataSource="dataSourceCet4" :columns="columns" :pagination="false" bordered>
+              <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;"
-              v-if="total && total > 0">
-              <span>{{ this.totalName }}总人数：{{ total }}</span>
+            <div style="display: flex; justify-content: space-between; font-size: 15px; margin-top: 10px" v-if="total && total > 0">
+              <span>{{ 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">
-
-          </div>
+          <a-card style="margin-top: 33px; margin-bottom: 12px">
+            <div style="width: 100%; height: 215px" class="piechart" id="piechart"> </div>
+          </a-card>
+          <a-card>
+            <div style="width: 100%; height: 180px" id="map2"> </div>
+          </a-card>
         </a-col>
       </a-row>
       <!-- <div style="height: 300px;">
@@ -49,306 +50,317 @@
 </template>
 
 <script>
-import { defHttp } from '/@/utils/http/axios';
-import * as echarts from 'echarts';
+  import { defHttp } from '/@/utils/http/axios';
+  import * as echarts from 'echarts';
 
-export default {
-  name: "Analysis",
-  data() {
-    return {
-      loading: false,
-      dataSourceCet4: [],
-      columns: [
-        {
-          title: '学年',
-          dataIndex: 'grade',
-          key: 'grade',
-          align: 'center',
-          customCell: (_, index) => ({
-            rowSpan: index % 2 === 0 ? 2 : 0,//每两行合并一次grade列的单元格，rowSpan为跨度
-          }),
-        },
-        {
-          title: '考试批次',
-          dataIndex: 'batch',
-          key: 'batch',
-          align: 'center',
-        },
-        {
-          title: '参加人数',
-          dataIndex: 'attendNumber',
-          key: 'attendNumber',
-          align: 'center',
-        },
-        {
-          title: '通过人数',
-          dataIndex: 'passNumber',
-          key: 'passNumber',
-          align: 'center',
-        },
-        {
-          title: '本批次通过率',
-          dataIndex: 'batchpassrate',
-          key: 'batchpassrate',
-          align: 'center',
-        },
-        {
-          slots: { title: 'passRateSlot' },
-          dataIndex: 'gradepassrate',
-          key: 'gradepassrate',
-          align: 'center',
-          customCell: (_, index) => ({
-            rowSpan: index % 2 === 0 ? 2 : 0,
-          }),
-        }
-      ],
-      Url: {
-        getEntrydate: '/cet/getEntrydate',
-        getCollege: '/cet/getCollege',
-        getData: '/cet/getData',
-        getCollegeMajor: '/cet/getCollegeMajor'
-      },
-      total: 0,
-      totalName: '',
-      passNumberBottom: 0,
-      passRateBottom: 0,
-      passRatePie: [],
-      collegeOptions: [],
-      collegeMajorOptions: [],
-      entrydateOptions: [],
-      college: null,
-      entrydate: 2017,//年级选择器
-      //设置默认值为全校
-      collegeMajor: ['全校'],//学院专业选择器
-      topCollege: null,//顶部选择器
-      topMajor: null,//顶部选择器
-      topEntrydate: null,//顶部选择器
-    };
-  },
-  methods: {
-    // 获取年级和学院数据
-    async getEntrydateAndCollegeData() {
-      const getEntrydate = await defHttp.get({ url: this.Url.getEntrydate });
-      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.entrydateOptions = getEntrydate.entrydates;
-      // this.entrydate = this.entrydateOptions[0].value;
-    },
-    //获取学院专业级联数据
-    async getCollegeMajorData() {
-      const res = await defHttp.get({ url: this.Url.getCollegeMajor });
-      //通过map方法将数据转换为级联选择器需要的数据格式
-      this.collegeMajorOptions = res.collegeMajor.map(item => {
-        return {
-          value: item.college,
-          label: item.college,
-          children: item.major.map(major => {
-            return {
-              value: major,
-              label: major
-            }
-          })
-        }
-      });
-      //手动添加一个专升本字段
-      this.collegeMajorOptions.unshift({ value: '专升本', label: '专升本' });
-      // 手动添加一个全校字段
-      this.collegeMajorOptions.unshift({ value: '全校', label: '全校' });
-      // this.collegeMajor = ['全校'];
-      console.log(this.collegeMajorOptions);
-    },
-
-    // 查询数据
-    async query() {
-      try {
-        //如果this.collegeMajor[1]不存在则设为null
-        let major = this.collegeMajor.length > 1 ? this.collegeMajor[1] : "";
-        this.topCollege = this.collegeMajor[0];
-        this.topMajor = major;
-        this.topEntrydate = this.entrydate;
-        if (this.college)
-          this.loading = true;
-        let params = {
-          college: this.collegeMajor[0],
-          major: major,
-          entrydate: this.entrydate
-        }
-        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 = {}
-        if(result.cet4["大一学年"] != undefined) {
-          passRate["大一学年"] = result.cet4["大一学年"];
-        }
-        if(result.cet4["大二学年"] != undefined) {
-          passRate["大二学年"] = result.cet4["大二学年"];
-        }
-        if(result.cet4["大三学年"] != undefined) {
-          passRate["大三学年"] = result.cet4["大三学年"];
-        }
-        if(result.cet4["大四学年"] != undefined) {
-          passRate["大四学年"] = result.cet4["大四学年"];
-        }
-        result.cet4 = passRate;
-        for (let grade in result.cet4) {
-          result.cet4[grade].forEach(item => {
-            if (index % 2 == 0) {
-              piedata.push({ value: parseFloat(item.gradepassrate - passrate).toFixed(3), name: grade + "时通过" });
-              passrate = parseFloat(item.gradepassrate).toFixed(3);
-            }
-            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) + '%'
-            });
-          });
-        }
-
-        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.push({ value: result.passRate, name: '已通过' });
-        this.passRatePie.push({ value: 1 - result.passRate, name: '未通过' })
-        piedata.push({ value: (1 - passrate).toFixed(3), name: '未通过' });//外置饼图
-        setTimeout(() => {
-          this.drawPieChart(piedata);
-        }, 100);
-        // this.drawPieChart();
-      } finally {
-        this.loading = false;
-      }
-    },
-    test() {
-      defHttp.get({ url: "/cet/getTest" });
-    },
-
-    drawPieChart(piedata) {
-      console.log(this.passRatePie)
-      console.log("piedata", piedata)
-      let myChart = echarts.init(document.getElementById('piechart'));
-      let option = {
-        tooltip: {
-          trigger: 'item',
-          confine: false,
-          //字体大小
-          itemStyle: {
-            fontSize: 100
-          }
-        },
-
-        title: {
-          text: '四级通过率分析',
-          left: 'left',
-          top: '0%',
-          textStyle: {
-            fontSize: 20
-          }
-        },
-        legend: {
-          top: '5%',
-          left: 'center'
-        },
-        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
-          // },
-          //外圈饼图
+  export default {
+    data() {
+      return {
+        loading: false,
+        dataSourceCet4: [],
+        columns: [
           {
-            name: '四级通过率',
-            type: 'pie',
-            radius: ['35%', '60%'],
+            title: '学年',
+            dataIndex: 'grade',
+            key: 'grade',
+            align: 'center',
+            customCell: (_, index) => ({
+              rowSpan: index % 2 === 0 ? 2 : 0, //每两行合并一次grade列的单元格，rowSpan为跨度
+            }),
+          },
+          {
+            title: '考试批次',
+            dataIndex: 'batch',
+            key: 'batch',
+            align: 'center',
+          },
+          {
+            title: '参加人数',
+            dataIndex: 'attendNumber',
+            key: 'attendNumber',
+            align: 'center',
+          },
+          {
+            title: '通过人数',
+            dataIndex: 'passNumber',
+            key: 'passNumber',
+            align: 'center',
+          },
+          {
+            title: '本批次通过率',
+            dataIndex: 'batchpassrate',
+            key: 'batchpassrate',
+            align: 'center',
+          },
+          {
+            slots: { title: 'passRateSlot' },
+            dataIndex: 'gradepassrate',
+            key: 'gradepassrate',
+            align: 'center',
+            customCell: (_, index) => ({
+              rowSpan: index % 2 === 0 ? 2 : 0,
+            }),
+          },
+        ],
+        Url: {
+          getEntrydate: '/cet/getEntrydate',
+          getCollege: '/cet/getCollege',
+          getData: '/cet/getData',
+          getCollegeMajor: '/cet/getCollegeMajor',
+        },
+        total: 0,
+        totalName: '',
+        passNumberBottom: 0,
+        passRateBottom: 0,
+        passRatePie: [],
+        collegeOptions: [],
+        collegeMajorOptions: [],
+        entrydateOptions: [],
+        college: null,
+        entrydate: 2017, //年级选择器
+        //设置默认值为全校
+        collegeMajor: ['全校'], //学院专业选择器
+        topCollege: null, //顶部选择器
+        topMajor: null, //顶部选择器
+        topEntrydate: null, //顶部选择器
+      };
+    },
+    mounted() {
+      this.getEntrydateAndCollegeData();
+      this.getCollegeMajorData();
+      this.query();
+      this.map2Chart();
+    },
+    methods: {
+      // 获取年级和学院数据
+      async getEntrydateAndCollegeData() {
+        const getEntrydate = await defHttp.get({ url: this.Url.getEntrydate });
+        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.entrydateOptions = getEntrydate.entrydates;
+        // this.entrydate = this.entrydateOptions[0].value;
+      },
+      //获取学院专业级联数据
+      async getCollegeMajorData() {
+        const res = await defHttp.get({ url: this.Url.getCollegeMajor });
+        //通过map方法将数据转换为级联选择器需要的数据格式
+        this.collegeMajorOptions = res.collegeMajor.map((item) => {
+          return {
+            value: item.college,
+            label: item.college,
+            children: item.major.map((major) => {
+              return {
+                value: major,
+                label: major,
+              };
+            }),
+          };
+        });
+        //手动添加一个专升本字段
+        this.collegeMajorOptions.unshift({ value: '专升本', label: '专升本' });
+        // 手动添加一个全校字段
+        this.collegeMajorOptions.unshift({ value: '全校', label: '全校' });
+        // this.collegeMajor = ['全校'];
+        console.log(this.collegeMajorOptions);
+      },
+
+      // 查询数据
+      async query() {
+        try {
+          //如果this.collegeMajor[1]不存在则设为null
+          let major = this.collegeMajor.length > 1 ? this.collegeMajor[1] : '';
+          this.topCollege = this.collegeMajor[0];
+          this.topMajor = major;
+          this.topEntrydate = this.entrydate;
+          if (this.college) this.loading = true;
+          let params = {
+            college: this.collegeMajor[0],
+            major: major,
+            entrydate: this.entrydate,
+          };
+          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 = {};
+          if (result.cet4['大一学年'] != undefined) {
+            passRate['大一学年'] = result.cet4['大一学年'];
+          }
+          if (result.cet4['大二学年'] != undefined) {
+            passRate['大二学年'] = result.cet4['大二学年'];
+          }
+          if (result.cet4['大三学年'] != undefined) {
+            passRate['大三学年'] = result.cet4['大三学年'];
+          }
+          if (result.cet4['大四学年'] != undefined) {
+            passRate['大四学年'] = result.cet4['大四学年'];
+          }
+          result.cet4 = passRate;
+          for (let grade in result.cet4) {
+            result.cet4[grade].forEach((item) => {
+              if (index % 2 == 0) {
+                piedata.push({ value: parseFloat(item.gradepassrate - passrate).toFixed(3), name: grade + '时通过' });
+                passrate = parseFloat(item.gradepassrate).toFixed(3);
+              }
+              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) + '%',
+              });
+            });
+          }
+
+          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.push({ value: result.passRate, name: '已通过' });
+          this.passRatePie.push({ value: 1 - result.passRate, name: '未通过' });
+          piedata.push({ value: (1 - passrate).toFixed(3), name: '未通过' }); //外置饼图
+          setTimeout(() => {
+            this.drawPieChart(piedata);
+          }, 100);
+          // this.drawPieChart();
+        } finally {
+          this.loading = false;
+        }
+      },
+      test() {
+        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('piedata', piedata);
+        let myChart = echarts.init(document.getElementById('piechart'));
+        let option = {
+          tooltip: {
+            trigger: 'item',
+            confine: false,
+            avoidLabelOverlap: true,
+            //字体大小
             itemStyle: {
-              borderRadius: 10,
-              borderColor: '#fff',
-              borderWidth: 2,
+              fontSize: 100,
             },
-            label: {
-              show: true,
-              fontSize: 14,
-              overflow: 'truncate'
+          },
+
+          title: {
+            text: '四级通过率分析',
+            left: 'left',
+            top: '0%',
+            textStyle: {
+              fontSize: 16,
             },
-            emphasis: {
+          },
+          legend: {
+            top: 'center',
+            right: '0%',
+            orient: 'vertical',
+          },
+          color: ['#b3cde0', '#6497b1', '#005b96', '#03396c', '#e5e5e5'],
+
+          series: [
+            //外圈饼图
+            {
+              name: '四级通过率',
+              type: 'pie',
+              center: ['30%', '50%'],
+              radius: ['35%', '70%'],
               itemStyle: {
-                shadowBlur: 10,
-                shadowOffsetX: 0,
-                shadowColor: 'rgba(0, 0, 0, 0.5)'
+                borderRadius: 10,
+                borderColor: '#fff',
+                borderWidth: 2,
               },
               label: {
                 show: true,
-                fontSize: 15,
-                fontWeight: 'bold'
-              }
+                fontSize: 14,
+                overflow: 'truncate',
+                minMargin: -1,
+              },
+              emphasis: {
+                itemStyle: {
+                  shadowBlur: 10,
+                  shadowOffsetX: 0,
+                  shadowColor: 'rgba(0, 0, 0, 0.5)',
+                },
+                label: {
+                  show: true,
+                  fontSize: 15,
+                  fontWeight: 'bold',
+                },
+              },
+              data: piedata,
             },
-            data: piedata
-          }
-        ]
-      };
+          ],
+        };
 
-
-
-      myChart.setOption(option);
-    }
-  },
-  mounted() {
-    this.getEntrydateAndCollegeData();
-    this.getCollegeMajorData();
-    this.query();
-  }
-
-
-}
+        myChart.setOption(option);
+      },
+    },
+  };
 </script>
 
 <style lang="less" scoped>
-.container {
-  display: flex;
-  background-color: #fff;
-  padding: 15px;
-  border-radius: 4px;
-  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.09);
-}
+  .container {
+    display: flex;
+    background-color: #fff;
+    padding: 15px;
+    border-radius: 4px;
+    box-shadow: 0 2px 8px rgba(0, 0, 0, 0.09);
+  }
 
-.title {
-  font-size: 34px;
-  color: rgb(8, 8, 8);
-  font-weight: bold;
-}
-</style>
\ No newline at end of file
+  .title {
+    font-size: 34px;
+    color: rgb(8, 8, 8);
+    font-weight: bold;
+  }
+</style>