Update coursewarePlay.vue

src/views/coursewarePlay/coursewarePlay.vue

@@ -136,8 +136,8 @@
             />
             <courseCollapse
                :activeCollapse="tempActiveCourseware || activeCourseware"
-               :search="searchObj.tempSearch || searchObj.search"
                :courseList="tempCoursewareList"
+               :search="searchObj.tempSearch || searchObj.search"
                @handleClick="handleCourseSearchClick"
             />
          </ElScrollbar>
@@ -156,12 +156,7 @@
                :image="require('@/img/layout/empty.png')"
                description="暂无搜索结果"
             />
-            <courseCollapse
-               :activeCollapse="tempActiveCourseware || activeCourseware"
-               :search="searchObj.tempSearch || searchObj.search"
-               :courseList="tempCoursewareList"
-               @handleClick="handleCourseClick"
-            />
+            <courseCollapse :activeCollapse="activeCourseware" :courseList="tempCoursewareList" @handleClick="handleCourseClick" />
          </ElScrollbar>
       </el-drawer>
       <el-drawer class="elDrawer elCourseMenu" direction="ltr" v-model="drawerMenuShow" :show-close="false">
@@ -336,6 +331,7 @@ async function getCoursewareList(id?: string) {
    })
 
    // 请求带搜索条件数据
+   searchObj.queryStr = null
    searchObj.lessonCoursewareId && getLessCoursewareList("onlySearch", searchObj.lessonCoursewareId)
 }
 
@@ -374,9 +370,9 @@ async function getLessCoursewareList(type?: string, id?: string) {
             itemResult.children = itemResult.knowledgePointList || []
             itemResult.knowledgePointList = []
          }
-
          if (type === "onlySearch") {
             handlePointListOnlySearch(result)
+            return
          } else {
             handlePointList(result, searchObj.isSearch)
          }
@@ -453,17 +449,18 @@ function handlePointList(pointList: any[], isSearch?: boolean) {
 function handlePointListOnlySearch(pointList: any[]) {
    flattenCoursewareListData = []
    const list = filterPointList(pointList)
-   if (flattenCoursewareListData[0]) {
-      // 默认展开第一个
-      tempActiveCourseware.value = {
-         ...flattenCoursewareListData[0],
-         id: null
-      }
-   }
    if (!searchObj.isSearch) {
       coursewareSearchList.value = list
+   } else {
+      if (flattenCoursewareListData[0]) {
+         // 默认展开第一个
+         tempActiveCourseware.value = {
+            ...flattenCoursewareListData[0],
+            id: null
+         }
+      }
+      tempCoursewareList.value = list
    }
-   tempCoursewareList.value = list
 }
 function filterPointList(pointList: any[], parentData?: { ids: string[]; name: string }): any[] {
    // 设置父级及以上id数组和父级name
@@ -539,7 +536,6 @@ function handleCourseSearchClick(value: any) {
             search: searchObj.tempSearch ? JSON.parse(JSON.stringify(searchObj.tempSearch)) : ""
          }
       })
-      console.log(urls, "urls")
 
       const url = window.location.origin + window.location.pathname + urls.href
       window.open(url)
@@ -579,6 +575,7 @@ async function handleCourseMenuClick(value: any) {
    isCurrentCoursewareMenu.value = value.id === route.params.id ? true : false
    flattenCoursewareListData = [] // 重置数据
    isTempAutoPlay.value = true
+   searchObj.isSearch = false
    await getCoursewareList(value.id)
    getCoursewareMenuList(value.id)
    drawerMenuShow.value = false
@@ -586,8 +583,10 @@ async function handleCourseMenuClick(value: any) {
    nextTick(() => {
       //    if (!activeCourseware.value?.phaseGoals) {
       // 切换之后默认打开课程目录
-      drawerShow.value = true
+
       //    }
+
+      drawerShow.value = true
    })
    LoadingBar.loading(false)
 }
@@ -676,7 +675,7 @@ function handleToolClick(type: string) {
       drawerMenuShow.value = true
    } else if (type === "point") {
       tempCoursewareList.value = deepCopy(coursewareList.value)
-      searchObj.queryStr = searchObj.search ? JSON.parse(JSON.stringify(searchObj.search)) : ""
+      // searchObj.queryStr = searchObj.search ? JSON.parse(JSON.stringify(searchObj.search)) : ""
 
       tempActiveCourseware.value = null
       drawerShow.value = true
@@ -684,13 +683,14 @@ function handleToolClick(type: string) {
       if (searchObj.source === "search") {
          tempCoursewareList.value = deepCopy(coursewareList.value)
          tempActiveCourseware.value = null
+         searchObj.queryStr = searchObj.search ? JSON.parse(JSON.stringify(searchObj.search)) : ""
       } else {
          tempCoursewareList.value = deepCopy(coursewareSearchList.value)
          tempActiveCourseware.value = {}
+         searchObj.tempSearch = ""
+         searchObj.queryStr = ""
       }
 
-      searchObj.queryStr = searchObj.search ? JSON.parse(JSON.stringify(searchObj.search)) : ""
-
       drawerSearchShow.value = true
    }
 }