mirror of
https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/learning-system-portal.git
synced 2025-12-11 20:06:44 +08:00
Merge branch 'master' into zcwy-master
This commit is contained in:
@@ -146,6 +146,7 @@ import popup from '@/components/AlertPopup.vue';
|
|||||||
import yearMedal from '@/components/Popup/China2023.vue';
|
import yearMedal from '@/components/Popup/China2023.vue';
|
||||||
import apiBoeCourse from '@/api/boe/course.js';
|
import apiBoeCourse from '@/api/boe/course.js';
|
||||||
import {userAvatarText} from "@/utils/tools.js";
|
import {userAvatarText} from "@/utils/tools.js";
|
||||||
|
import apiCase from "@/api/modules/cases.js";
|
||||||
export default {
|
export default {
|
||||||
props: {
|
props: {
|
||||||
current: {
|
current: {
|
||||||
@@ -167,7 +168,7 @@ export default {
|
|||||||
keywords:{
|
keywords:{
|
||||||
type:String,
|
type:String,
|
||||||
default:''
|
default:''
|
||||||
}
|
},
|
||||||
},
|
},
|
||||||
|
|
||||||
components:{popup,yearMedal},
|
components:{popup,yearMedal},
|
||||||
@@ -273,6 +274,7 @@ export default {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
searchJump() {
|
searchJump() {
|
||||||
|
this.$emit('type1', '')
|
||||||
if(this.current == 'index') {
|
if(this.current == 'index') {
|
||||||
if (this.findType == '1') {
|
if (this.findType == '1') {
|
||||||
if(this.keyword==''){return;}
|
if(this.keyword==''){return;}
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
<template>
|
<template>
|
||||||
<div id="case-list-content">
|
<div id="case-list-content">
|
||||||
<div style="margin-bottom:30px" class="case-banner">
|
<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>
|
||||||
<div class="xcontent2">
|
<div class="xcontent2">
|
||||||
<!-- 新增的案例分类 -->
|
<!-- 新增的案例分类 -->
|
||||||
@@ -706,6 +706,9 @@ export default {
|
|||||||
|
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
handleType(msg){
|
||||||
|
this.queryCondition.type = msg
|
||||||
|
},
|
||||||
handleOptionClick(treeItem){
|
handleOptionClick(treeItem){
|
||||||
this.treeList.forEach(one => {
|
this.treeList.forEach(one => {
|
||||||
one.checked = false;
|
one.checked = false;
|
||||||
|
|||||||
Reference in New Issue
Block a user