diff --git a/src/views/cet/cet-ana-3.vue b/src/views/cet/cet-ana-3.vue
index 195427f..d9a6b6c 100644
--- a/src/views/cet/cet-ana-3.vue
+++ b/src/views/cet/cet-ana-3.vue
@@ -334,7 +334,7 @@
             },
           },
           title: {
-            text: '该批次每一年级的通过率饼图',
+            text: '该批次每一年级的通过率环形图',
             left: 'top',
             top: '0%',
             textStyle: {
@@ -352,7 +352,7 @@
 
           series: [
             {
-              name: '学院/专业该批次通过人数饼图',
+              name: '学院/专业该批次通过人数环形图',
               type: 'pie',
               radius: ['50%', '100%'],
               center: ['50%', '50%'],
diff --git a/src/views/cet/collegeDashboard.vue b/src/views/cet/collegeDashboard.vue
index 8d0e9e5..86751f5 100644
--- a/src/views/cet/collegeDashboard.vue
+++ b/src/views/cet/collegeDashboard.vue
@@ -1,408 +1,697 @@
 <template>
-  <div style="background: #ececec; padding: 15px">
-    <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-button style="margin-left: 10px" type="primary" @click="query">查询</a-button>
-        <!-- <a-button @click=test()>test</a-button> -->
-      </template>
-      <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>
-            <a-table :dataSource="dataSourceCet4" :columns="columns" :pagination="false" bordered>
-              <template #passRateSlot>
-                累计总通过率
-                <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>{{ totalName }}总人数：{{ total }}</span>
-              <span>累计通过人数: {{ passNumberBottom }}</span>
-              <span>累计总通过率: {{ passRateBottom }}</span>
-            </div>
-          </div>
-        </a-col>
-        <a-col :xl="11">
-          <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;">
-        <a-empty style="margin-top: 100px" />
-      </div> -->
-    </a-card>
-  </div>
+  <a-card>
+    <!--<a-row :gutter="1">
+      <a-card-grid class="card-title">/
+        <span>学院总人数：{{ collegeStudentCount }}</span>
+      </a-card-grid>
+      <a-card-grid class="card-title">
+        <span>积累通过人数：{{ collegeStudentPassCount }}</span>
+      </a-card-grid>
+      <a-card-grid class="card-title">
+        <span>学院通过率：{{ collegeStudentPassRate }}</span>
+      </a-card-grid>
+      <a-card-grid class="card-title">
+        <span> 全校通过率：{{ schoolStudentPassRate }}</span>
+      </a-card-grid>
+      <a-card-grid style="margin-left: 24%; width: 10%; height: 10%; margin-bottom: 10px; border-radius: 10%; text-align: center">
+        <a-select v-model:value="entrydate" style="border-radius: 10%; width: 100px; margin-left: -20px" :options="entrydateOptions" />
+      </a-card-grid>
+    </a-row>-->
+
+    <a-row :gutter="1">
+      <a-card-grid class="card-center">
+        <div>
+          <a-table
+            :dataSource="dataSourceCet4"
+            :columns="columns"
+            :pagination="false"
+            bordered
+            class="custom-table"
+            :style="{ fontSize: '10px', color: '#333', marginTop: '-11px' }"
+          />
+        </div>
+      </a-card-grid>
+
+      <a-card-grid class="card-center">
+        <div style="width: 100%; height: 210px; padding: 10px" class="map2" id="map2"></div>
+      </a-card-grid>
+
+      <a-card-grid class="card-center">
+        <a-select
+          v-model:value="entrydate"
+          style="border-radius: 10%; width: 100px; margin-left: -20px"
+          :options="entrydateOptions"
+          @change="handleSelectChange"
+        />
+
+        <div id="map3" style="width: 100%; height: 230px"></div>
+      </a-card-grid>
+    </a-row>
+    <a-row :gutter="1">
+      <a-card-grid class="card-bottom" style="width: 32%">
+        <div id="map4" style="width: 100%; height: 100%"></div>
+      </a-card-grid>
+      <a-card-grid style="width: 65%" class="card-bottom">
+        <div id="map5" style="width: 100%; height: 100%"></div>
+      </a-card-grid>
+    </a-row>
+  </a-card>
 </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 {
-  data() {
-    return {
-      loading: false,
-      dataSourceCet4: [],
-      columns: [
-        {
-          title: '学年',
-          dataIndex: 'grade',
-          key: 'grade',
-          align: 'center',
-          customCell: (_, index) => ({
-            rowSpan: index % 2 === 0 ? 2 : 0, //每两行合并一次grade列的单元格，rowSpan为跨度
-          }),
+  export default {
+    data() {
+      return {
+        collegeStudentCount: '11',
+        collegeStudentPassCount: '11',
+        collegeStudentPassRate: '11',
+        schoolStudentPassRate: '11',
+        loading: false,
+        dataSourceCet4: [],
+        batch: '',
+        college: '',
+        majors: [],
+        majorentrydate: [],
+        entrydate: '2017',
+        entrydateOptions: [],
+        columns: [
+          {
+            title: '年级',
+            dataIndex: 'grade',
+            key: 'grade',
+            align: 'center',
+          },
+          {
+            title: '参加人数',
+            dataIndex: 'attendNumber',
+            key: 'attendNumber',
+            align: 'center',
+          },
+          {
+            title: '通过人数',
+            dataIndex: 'passNumber',
+            key: 'passNumber',
+            align: 'center',
+          },
+          {
+            title: '通过率',
+            dataIndex: 'passrate',
+            key: 'passrate',
+            align: 'center',
+          },
+        ],
+        Url: {
+          getDataForHead: '/cet/getDataForHLeadersHome',
+          getData: '/cet/getRateByBatch',
+          getRateByMajor: '/cet/getRateByMajor',
+          getCollegeRate: '/cet/getRateByCollege',
+          getEntrydate: '/cet/getEntrydate',
+          getCollegeMajor: '/cet/getCollegeMajor',
         },
-        {
-          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',
+      };
+    },
+    mounted() {
+      this.query();
+      this.majorPassRate();
+      this.gradePassRate();
+      this.queryMajorByCollege();
+    },
+    methods: {
+      //查询页面头部的数据
+      async queryTopData() {
+        let result = await defHttp.get({ url: this.Url.getDataForHead });
+        console.log('0000', result.data);
       },
-      total: 0,
-      totalName: '',
-      passNumberBottom: 0,
-      passRateBottom: 0,
-      passRatePie: [],
-      lineXData: [],
-      lineYData: [],
-      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() {
+        let resultData = null;
+        try {
+          //如果this.batch为null则先赋个值
+          if (!this.batch) {
+            this.batch = '2024-06-01';
+          }
+          if (!this.college) {
+            this.college = '计算机科学与信息工程学院';
+          }
+          this.loading = true;
+          let params = {
+            batch: this.batch,
+            college: this.college,
+            level: 'cet4',
+          };
+          resultData = await defHttp.get({ url: this.Url.getData, params });
 
-    // 查询数据
-    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;
-        this.lineXData = [];
-        this.lineYData = [];
-        for (let grade in result.cet4) {
-          result.cet4[grade].forEach((item) => {
-            this.lineXData.push(item.batch);
-            this.lineYData.push((item.batchpassrate * 100).toFixed(1));
-            if (index % 2 == 0) {
-              piedata.push({ value: parseFloat(item.gradepassrate - passrate).toFixed(3), name: grade + '时通过' });
-              passrate = parseFloat(item.gradepassrate).toFixed(3);
-            }
-            index++;
+          console.log('result', resultData);
+          //表格数据
+          let tableData = [];
+          for (let grade in resultData.gradeData) {
             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) + '%',
+              grade: grade + '级',
+              attendNumber: resultData.gradeData[grade].allStudent,
+              passNumber: resultData.gradeData[grade].passed,
+              passrate: resultData.gradeData[grade].passRate,
             });
+          }
+          this.dataSourceCet4 = tableData; //表格数据
+          console.log(this.dataSourceCet4, 'dataSourceCet4');
+        } finally {
+          this.loading = false;
+          this.$nextTick(() => {
+            //this.dataChart(resultData.data);
+            console.log('cet4:', resultData.data);
+            this.card_Table();
           });
         }
+      },
+      async queryMajorByCollege() {
+        if (!this.college) {
+          this.college = '计算机科学与信息工程学院';
+        }
+        let resultData = await defHttp.get({ url: this.Url.getCollegeMajor });
+        let collegeAndMajor = resultData.collegeMajor;
+        console.log('11111111111', collegeAndMajor);
+        // 从 collegeAndMajor 中查找对应学院的专业
+        let majors = collegeAndMajor.find((item) => item.college === this.college);
+        console.log('3333', majors);
+        majors = majors.major;
+        this.majors = majors;
+        console.log('444', this.majors);
+        let collegeAndMajors = this.majors.map((major) => [this.college, major]);
+        console.log('777', collegeAndMajors);
+        //this.major = resultData.
+        const getEntrydate = await defHttp.get({ url: this.Url.getEntrydate });
+        this.entrydateOptions = getEntrydate.entrydates;
+        let entrydate = this.entrydateOptions.map((item) => item.value).splice(-5);
+        this.majorentrydate = entrydate;
+        let params = {
+          college: collegeAndMajors,
+          entrydate: entrydate,
+        };
+        console.log('666');
+        let res = await defHttp.post({ url: this.Url.getRateByMajor, params });
+        console.log('55555', res.data);
+        this.$nextTick(() => {
+          this.drawChart(res.data);
+        });
+      },
+      //绘画饼图--该批次每一年级的通过率饼图
+      async card_Table() {
+        //console.log(this.passRatePie);
+        //console.log('piedata', piedata);
+        //如果this.batch为null则先赋个值
+        if (!this.batch) {
+          this.batch = '2024-06-01';
+        }
+        if (!this.college) {
+          this.college = '计算机科学与信息工程学院';
+        }
+        let queryParams = {
+          batch: this.batch,
+          college: this.college,
+          level: 'cet4',
+        };
+        console.log(queryParams, 'queryParams');
 
-        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);
-          this.map2Chart();
-        }, 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,
+        let result = await defHttp.get({ url: this.Url.getData, params: queryParams });
+        console.log(result, 'result');
+        let chartsData = [];
+        for (let key in result.gradeData) {
+          chartsData.push({
+            name: key + '级',
+            value: result.gradeData[key].passRate,
+          });
+        }
+        let option = {
+          tooltip: {
+            trigger: 'item',
+            conginee: false,
+            //字体大小
+            itemStytle: {
+              // 设置阴影效果
+              shadowBlur: 10, // 阴影模糊大小
+              shadowColor: 'rgba(0, 0, 0, 0.3)', // 阴影颜色
+              shadowOffsetX: 5, // 阴影水平方向偏移
+              shadowOffsetY: 5, // 阴影垂直方向偏移
+              fontSize: 100,
+            },
           },
-        },
-        tooltip: {
-          trigger: 'axis',
-          axisPointer: {
-            type: 'shadow',
+          title: {
+            text: '最新批次每一年级的通过率环形图',
+            left: 'top',
+            top: '0%',
+            textStyle: {
+              fontSize: 12,
+            },
           },
-          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>'
-            );
+          legend: {
+            top: '10%',
+            left: 'center',
+
+            itemGap: 3,
+            selectedMode: true,
           },
-        },
-        grid: {
-          top: '50px',
-          left: '50px',
-          right: '50px',
-          bottom: '30px',
-        },
-        xAxis: {
-          type: 'category',
-          data: this.lineXData,
-        },
-        yAxis: {
-          type: 'value',
-        },
-        series: [
-          {
-            data: this.lineYData,
+          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: chartsData,
+            },
+            {
+              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: chartsData,
+            },
+          ],
+          animationDurationUpate: 500,
+        };
+        this.$nextTick(() => {
+          var myChart = echarts.init(document.getElementById('map2'));
+          myChart.setOption(option);
+        });
+      },
+      handleSelectChange() {
+        this.majorPassRate();
+      },
+      // 本学院各专业通过率-map3---------------------------------------------
+      async majorPassRate() {
+        console.log('55555555', this.entrydate);
+        if (!this.batch) {
+          this.batch = '2024-06-01';
+        }
+        if (!this.college) {
+          this.college = ['计算机科学与信息工程学院'];
+        }
+        this.map3loading = true;
+        //将选择后的entrydate转化为数组
+        let entrydateArray = [];
+        entrydateArray.push(this.entrydate);
+        let queryParams = {
+          college: [[this.college]],
+          entrydate: entrydateArray,
+          level: 'cet4',
+        };
+        let url = this.Url.getRateByMajor;
+        console.log(queryParams, 'queryParams');
+        let result = await defHttp.post({ url: url, data: queryParams });
+        console.log('88888', result.data);
+        if (!result) {
+          return;
+        }
+
+        //result = result.data[name];
+        // 遍历 result.data 中的所有专业
+        const majors = Object.keys(result.data); // 获取所有专业名称
+        const passRates = majors.map((major) => {
+          const entries = result.data[major];
+          return entries.length > 0 ? parseFloat(entries[0].passRate) : 0; // 获取通过率
+        });
+        let xData = majors.map((label) => label.split('').join('\n')); //将x轴竖着展示
+
+        var majorOption = {
+          tooltip: {
+            trigger: 'item',
+            conginee: false,
+            //字体大小
+            itemStytle: {
+              fontSize: 100,
+            },
+            formatter: function (params) {
+              // 在默认格式基础上添加 %
+              return `${params.marker}${params.name}  ${params.value}%`;
+            },
+          },
+          title: {
+            text: this.college + '各专业四级通过率',
+            textStyle: {
+              fontSize: 14,
+            },
+          },
+          xAxis: {
+            type: 'category',
+            data: xData,
+            axisLabel: {
+              interval: 0, //代表显示所有x轴标签显示
+              //rotate: -10, //代表倾斜30度显示
+            },
+            //data: result.map((item) => item.major),
+            //data: ['英语', '翻译', '法语', '葡萄牙语', '西班牙语'],
+          },
+          yAxis: {
+            type: 'value',
+          },
+          series: [
+            {
+              label: {
+                show: true,
+                fontSize: 14,
+                overflow: 'truncate',
+                position: 'top',
+                formatter: function (params) {
+                  // 在标签文本后面添加百分号
+                  return params.value + '%';
+                },
+              },
+              emphasis: {
+                itemStyle: {
+                  shadowBlur: 10,
+                  shadowOffsetX: 0,
+                  shadowColor: 'rgba(0, 0, 0, 0.5)',
+                },
+                //鼠标进入时的标签
+                label: {
+                  show: false,
+                  fontSize: 14,
+                  fontWeight: 'bold',
+                },
+              },
+              data: passRates,
+              //data: result.map((item) => item.passRate),
+              //data: [200, 150, 80, 70, 110, 130],
+              type: 'bar',
+            },
+          ],
+          animationDurationUpdate: 500,
+        };
+        this.map3loading = false;
+        this.$nextTick(() => {
+          var myChart = echarts.init(document.getElementById('map3'));
+          myChart.setOption(majorOption);
+        });
+      },
+      // 年级通过率
+      async gradePassRate() {
+        this.map2loading = true;
+        const getEntrydate = await defHttp.get({ url: this.Url.getEntrydate });
+        this.entrydateOptions = getEntrydate.entrydates;
+        let entrydate = this.entrydateOptions.map((item) => item.value);
+
+        const college = ['计算机科学与信息工程学院'];
+
+        let queryParams = {
+          college: college,
+          entrydate: entrydate,
+          level: 'cet4',
+        };
+        let url = this.Url.getCollegeRate;
+        let result = await defHttp.post({ url: url, data: queryParams });
+        if (!result) {
+          return;
+        }
+        result = result.data[college];
+        let collegeOption = {
+          title: {
+            text: college + '四级通过率',
+            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,
+        };
+        this.map2loading = false;
+        this.$nextTick(() => {
+          var myChart = echarts.init(document.getElementById('map4'));
+          myChart.setOption(collegeOption);
+        });
+      },
+      //各专业通过率详情
+      drawChart(data) {
+        let seriesData = [];
+        let xData = this.majorentrydate.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  ',
+        ];
+        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: 16,
+            data: yData,
+            //柱子间距
+            barGap: '30%',
+            //颜色
             itemStyle: {
               normal: {
                 label: {
                   show: true, //开启显示
                   position: 'top', //在上方显示
+                  formatter: '{c}%',
                   textStyle: {
                     //数值样式
                     color: 'black',
-                    fontSize: 12,
+                    fontSize: 13,
                   },
-                  formatter: '{c}%',
                 },
+                color: colors[k++],
               },
             },
-          },
-        ],
-      };
+          });
+        }
+        // debugger
+        let myChart = null;
 
-      option && myChart.setOption(option);
+        myChart = document.getElementById('map5');
+        if (myChart) {
+          myChart = echarts.getInstanceByDom(myChart);
+          if (myChart) {
+            myChart.dispose();
+          }
+        }
+        myChart = echarts.init(document.getElementById('map5'));
+
+        // 指定图表的配置项和数据
+        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);
+      },
     },
-    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: {
-            fontSize: 100,
-          },
-        },
-
-        title: {
-          text: '四级通过率分析',
-          left: 'left',
-          top: '0%',
-          textStyle: {
-            fontSize: 16,
-          },
-        },
-        legend: {
-          top: 'center',
-          right: '0%',
-          orient: 'vertical',
-        },
-        color: ['#b3cde0', '#6497b1', '#005b96', '#03396c', '#e5e5e5'],
-
-        series: [
-          //外圈饼图
-          {
-            name: '四级通过率',
-            type: 'pie',
-            center: ['30%', '50%'],
-            radius: ['35%', '70%'],
-            itemStyle: {
-              borderRadius: 10,
-              borderColor: '#fff',
-              borderWidth: 2,
-            },
-            label: {
-              show: true,
-              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,
-          },
-        ],
-      };
-
-      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);
-}
-
-.title {
-  font-size: 34px;
-  color: rgb(8, 8, 8);
-  font-weight: bold;
-}
+  .card-title {
+    width: 15%;
+    height: 10%;
+    //text-align: top center;
+    margin-right: 10px;
+    margin-bottom: 10px;
+    border-radius: 10%;
+  }
+  .card-center {
+    width: 31%;
+    margin-right: 25px;
+    margin-bottom: 10px;
+    border-radius: 2%;
+  }
+  .card-bottom {
+    margin-right: 10px;
+    height: 300px;
+  }
 </style>