布局调整，更改加载方式

src/views/cet/universityDashboard.vue

@@ -53,21 +53,21 @@
   </div>
   <div class="bottom-box">
     <div class="left-side">
-      <a-card  :loading="loading">
+      <a-card :loading="loading" :bordered="false">
         <div style="width: 100%; height: 350px" id="map2"> </div>
       </a-card>
     </div>
     <div class="right-side">
       <!-- <a-row :gutter="12"> -->
       <!-- <a-col :xl="16"> -->
-      <a-card>
-        <div class="query">
+      <a-card :loading="map1loading">
+        <!-- <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>
+        </div> -->
         <div id="map1" style="width: 100%; height: 350px"></div>
       </a-card>
       <!-- </a-col> -->
@@ -207,22 +207,21 @@ export default {
     this.getEntrydateAndCollegeData();
     this.getCollegeMajorData();
     this.query();
-    this.allQuery();
+    // this.allQuery();
     this.getCollegeOptions();
     this.getEntrydate();
 
   },
   methods: {
     allQuery() {
-      console.log('查询===========');
-
       this.map1loading = true;
+      console.log('查询===========ddddddddddd');
       let college = ['全校'];
       let query = 'tab1';
       if (this.oneentrydate == null) {
         this.oneentrydate = '2017';
       }
-      this.queryChart(query, college, [this.oneentrydate]);
+      this.queryChart(query, college, [this.entrydate]);
       this.majorPassRate();
       this.gradePassRate();
     },
@@ -589,7 +588,6 @@ export default {
     // 查询数据
     async queryChart(query, college, entrydate) {
       console.log('dddddddddddddddddddddddd');
-
       this.visible = false;
       let result = null;
       // console.log(this.college, this.entrydate);
@@ -606,7 +604,7 @@ export default {
         // console.log(this.college, this.entrydate)
         let params = {
           college: college,
-          entrydate: entrydate,
+          entrydate: [String(entrydate[0])],
           level: 'cet4',
         };
         let url = query == 'tab1' ? this.Url.getAllRate : this.Url.getCollegeRate;
@@ -618,10 +616,9 @@ export default {
         // });
         console.log('data', result.data);
       } finally {
-        this.map1loading = false;
+        this.map1loading=false;
         this.$nextTick(() => {
           console.log('调用==============');
-
           this.dataChart(result.data, query);
         });
       }
@@ -665,6 +662,7 @@ export default {
     // 查询数据
     async query() {
       try {
+        this.allQuery();
         //如果this.collegeMajor[1]不存在则设为null
         let major = this.collegeMajor.length > 1 ? this.collegeMajor[1] : '';
         this.topCollege = this.collegeMajor[0];
@@ -952,6 +950,7 @@ export default {
 .bottom-box {
   display: flex;
   column-gap: 10px;
+  padding: 0 5px;
 
   .left-side {
     // margin-top: 41px;