From 7cb5a9e2bbe22ca82f8ab14b0db2d82b75aab615 Mon Sep 17 00:00:00 2001
From: xbx <1827135378@qq.com>
Date: Sun, 28 Apr 2024 13:35:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/cet/cet-ana-1.vue | 70 +++++++++++++++++++++----------------
 1 file changed, 39 insertions(+), 31 deletions(-)

diff --git a/src/views/cet/cet-ana-1.vue b/src/views/cet/cet-ana-1.vue
index 441f0d6..4a7367b 100644
--- a/src/views/cet/cet-ana-1.vue
+++ b/src/views/cet/cet-ana-1.vue
@@ -5,8 +5,8 @@
         <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
+                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>
@@ -35,28 +35,16 @@
         <a-tab-pane key="2" tab="对比多学院" force-render>
           <div>
             <div class="query">
-              <span style="font-size: 15px; margin-right: 10px; display: flex; justify-content: center; align-items: center; font-weight: bold"
-                >学院:
+              <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="collegetab2"
-                style="width: 300px; margin-right: 20px"
-                mode="multiple"
-                :max-tag-count="5"
-                :options="collegeOptions"
-                @change="onCollegeChange"
-              ></a-select>
-              <span style="font-size: 15px; margin-right: 10px; display: flex; justify-content: center; align-items: center; font-weight: bold"
-                >年级:
+              <a-select v-model:value="collegetab2" style="width: 300px; margin-right: 20px" mode="multiple"
+                :max-tag-count="5" :options="collegeOptions" @change="onCollegeChange"></a-select>
+              <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="collegeentrydate"
-                style="width: 200px"
-                :options="entrydateOptions"
-                mode="multiple"
-                :max-tag-count="5"
-                @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>
               <a-button style="margin-left: 10px" type="primary" @click="collegeQuery">查询</a-button>
             </div>
 
@@ -94,23 +82,35 @@
                 :max-tag-count="5" @change="onCollegeMajorChange"></a-select>
               <a-button style="margin-left: 10px;" type="primary" @click="majorQuery">查询</a-button> -->
               <div style="display: flex">
-                <span style="font-size: 15px; margin-right: 10px; font-weight: bold; display: flex; justify-content: center; align-items: center"
-                  >年级:
+                <span
+                  style="font-size: 15px; margin-right: 10px; font-weight: bold; display: flex; justify-content: center; align-items: center">年级:
                 </span>
-                <a-checkbox-group v-model:value="majorentrydate" :options="entrydateOptions" @change="onMajorEntrydateChange" />
+                <a-checkbox-group v-model:value="majorentrydate" :options="entrydateOptions"
+                  @change="onMajorEntrydateChange" />
               </div>
               <div style="display: flex; margin-top: 10px">
-                <span style="font-size: 15px; margin-right: 10px; font-weight: bold; display: flex; justify-content: center; align-items: center"
-                  >学院:
+                <span
+                  style="font-size: 15px; margin-right: 10px; font-weight: bold; display: flex; justify-content: center; align-items: center">学院:
                 </span>
-                <a-radio-group v-model:value="collegeMajor" :options="collegeMajorOptions" @change="onMajorCollegeChange" />
+                <a-radio-group v-model:value="collegeMajor" :options="collegeMajorOptions"
+                  @change="onMajorCollegeChange" />
               </div>
               <div style="display: flex; margin-top: 10px">
-                <span style="font-size: 15px; margin-right: 10px; font-weight: bold; display: flex; justify-content: center; align-items: center"
-                  >专业:
+                <span
+                  style="font-size: 15px; margin-right: 10px; font-weight: bold; display: flex; justify-content: center; align-items: center">专业:
                 </span>
                 <a-checkbox-group v-model:value="majorCheckOn" :options="majorOptions" @change="onCollegeMajorChange" />
               </div>
+              <div style="margin-top: 10px">
+                <span
+                  style="font-size: 15px; margin-right: 10px; font-weight: bold; display: flex;  align-items: center">已选择:
+                  <a-tag v-for="(item, index) in lastCollegeMajor" :key="item[1]"
+                    style="margin-left: 10px; font-size: 13px;" color="blue">
+                    {{ item[1] }}
+                    <a-icon type="close" style="font-size: 15px;" @click="removeTag(index)" />
+                  </a-tag>
+                </span>
+              </div>
               <div style="margin-top: 20px;margin-right: 20px;
            
               display: flex;
@@ -119,7 +119,7 @@
 
               ">
                 <a-button style="margin-left: 10px;" type="primary" @click="clear">清除</a-button>
-                <a-button style="margin-left: 10px;" type="primary" @click="majorQuery">查询</a-button> 
+                <a-button style="margin-left: 10px;" type="primary" @click="majorQuery">查询</a-button>
 
               </div>
             </div>
@@ -442,6 +442,14 @@ export default {
       }
       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;