feat 决策

src/views/xjc-integratedmachine/decision/choose_subjects_1.vue

@@ -57,7 +57,7 @@
         </span>
         <br>
         院校分类:<span @click="choose_categoryid(null)">全部</span>&nbsp;
-        <span v-for="(item,index) in school_category" @click="choose_categoryid(item.value)">
+        <span v-for="(item,index) in school_category" @click="choose_categoryid(item)">
             {{item.label}}
         </span>
         <br>
@@ -88,18 +88,25 @@
     </div>
 
     <div>
-        <div v-if="universityForm.educationname != null">
-            {{universityForm.educationname}}
-            <el-button @click="choose_educationlevel(null)">x</el-button>
-        </div>
-        <div v-if="universityForm.name != null">
-            {{universityForm.name}}
-            <el-button @click="choose_areaid(null)">x</el-button>
-        </div>
-        <div v-for="(item,index) in tsArr">
-            {{item.label}}
-            <el-button @click="removeChooseTS(item)">x</el-button>
+        <div v-show="gxArr.length == 0">
+            <div v-if="universityForm.educationname != null">
+                {{universityForm.educationname}}
+                <el-button @click="choose_educationlevel(null)">x</el-button>
+            </div>
+            <div v-if="universityForm.name != null">
+                {{universityForm.name}}
+                <el-button @click="choose_areaid(null)">x</el-button>
+            </div>
+            <div v-for="(item,index) in tsArr">
+                {{item.label}}
+                <el-button @click="removeChooseTS(item)">x</el-button>
+            </div>
+            <div v-if="universityForm.categoryname != null">
+                {{universityForm.categoryname}}
+                <el-button @click="removeChooseCategory(null)">x</el-button>
+            </div>
         </div>
+
         <div v-for="(item,index) in gxArr">
             {{item.name}}
             <el-button>x</el-button>
@@ -243,7 +250,13 @@
     const gxArr = ref([])
 
     function choose_categoryid(item) {
-        universityForm.value.categoryid = item
+        universityForm.value.categoryid = item.value
+        universityForm.value.categoryname = item.label
+        getUniversity()
+    }
+    function removeChooseCategory(item) {
+        universityForm.value.categoryid = null
+        universityForm.value.categoryname = null
         getUniversity()
     }
 
@@ -287,11 +300,6 @@
             item.checked = false
             gxArr.value = gxArr.value.filter((element, idx) => item.id !== element.id);
         }
-        if (gxArr.value.length == 0) {
-            choose_educationlevel(null, null)
-            choose_areaid(null)
-            removeChooseTS(null)
-        }
     }
 
     function removeChooseGX(item) {