Merge branch 'zcwy-master' into 'master'

Zcwy master

See merge request !97

src/components/PortalHeader.vue

@@ -146,6 +146,7 @@ import popup from '@/components/AlertPopup.vue';
 import yearMedal from '@/components/Popup/China2023.vue';
 import apiBoeCourse from '@/api/boe/course.js';
 import {userAvatarText} from "@/utils/tools.js";
+import apiCase from "@/api/modules/cases.js";
 export default {
   props: {
     current: {
@@ -167,7 +168,7 @@ export default {
     keywords:{
       type:String,
       default:''
-    }
+    },
   },
 
   components:{popup,yearMedal},
@@ -273,6 +274,7 @@ export default {
       }
     },
     searchJump() {
+      this.$emit('type1', '')
   if(this.current == 'index') {
     if (this.findType == '1') {
           if(this.keyword==''){return;}

src/views/portal/case/Index.vue

@@ -1,7 +1,7 @@
 <template>
   <div id="case-list-content">
     <div style="margin-bottom:30px" class="case-banner">
-      <portal-header current="case" textColor="#fff" @emitInput="emitInput" @showClass="showClass"></portal-header>
+      <portal-header @type1="handleType" :type="queryCondition" current="case" textColor="#fff" @emitInput="emitInput" @showClass="showClass"></portal-header>
     </div>
     <div class="xcontent2">
       <!-- 新增的案例分类 -->
@@ -706,6 +706,9 @@ export default {
 
   },
   methods: {
+    handleType(msg){
+      this.queryCondition.type = msg
+    },
     handleOptionClick(treeItem){
       this.treeList.forEach(one => {
         one.checked = false;
@@ -1088,10 +1091,20 @@ export default {
       this.search(true);
     },
     searchexcellent(num) {
-      //this.queryCondition.excellent =true;
+      if(this.queryCondition.type==num){
+        this.queryCondition.excellent =false;
+        this.queryCondition.type = '';
+        this.search(true)
+        return
+      }
+      this.queryCondition.excellent =false;
       this.queryCondition.type = num;
+      if(num == 'excellent'){
+        this.queryCondition.excellent =true;
+        this.queryCondition.type = num;
+      }
       this.search(true);
-      //this.getCaseData();
+      // this.getCaseData();
     },
     // searchData(num) {
     //   // if(num == 1){