添加全部搜索类型

src/views/cloudPractice/cloudPractice.tsx

@@ -237,7 +237,8 @@ export default defineComponent({
             page: state.page,
             rows: state.rows,
             subjectId: state.subjectId === -1 ? null : state.subjectId,
-            categoriesId: state.typeId === -1 ? state.levelId : state.typeId,
+            // 级别添加 全部
+            categoriesId: state.typeId === -1 ? (state.levelId === -1 ? state.categoryId : state.levelId) : state.typeId,
             search: state.queryStr
          }
 
@@ -337,7 +338,7 @@ export default defineComponent({
             page: state.page,
             rows: state.rows,
             musicSubject: state.subjectId === -1 ? null : state.subjectId,
-            musicSheetCategoriesId: state.typeId === -1 ? state.levelId : state.typeId,
+            musicSheetCategoriesId: state.typeId === -1 ? (state.levelId === -1 ? state.firstTreeId : state.levelId) : state.typeId,
             keyword: state.queryStr,
             detailFlag: true,
             status: 1
@@ -641,12 +642,18 @@ export default defineComponent({
                state.categoryName = state.categoryList[0]?.label
                result = state.categoryList[0]?.sysMusicScoreCategoriesList || []
             }
-            state.levelList = result.map((item: any) => {
-               return {
-                  label: item.name,
-                  value: item.id,
-                  sysMusicScoreCategoriesList: item.sysMusicScoreCategoriesList || []
-               }
+            state.levelList =
+               result.map((item: any) => {
+                  return {
+                     label: item.name,
+                     value: item.id,
+                     sysMusicScoreCategoriesList: item.sysMusicScoreCategoriesList || []
+                  }
+               }) || []
+
+            state.levelList.unshift({
+               label: "全部级别",
+               value: -1
             })
 
             type && (await handleGetSubject_gym())
@@ -662,14 +669,15 @@ export default defineComponent({
                result = state.levelList[0]?.sysMusicScoreCategoriesList || []
             }
 
-            state.typeList = result.map((item: any) => {
-               return {
-                  label: item.name,
-                  value: item.id
-               }
-            })
+            state.typeList =
+               result?.map((item: any) => {
+                  return {
+                     label: item.name,
+                     value: item.id
+                  }
+               }) || []
             state.typeList.unshift({
-               label: "全部",
+               label: "全部类型",
                value: -1
             })
          }
@@ -685,13 +693,20 @@ export default defineComponent({
                result = storeData.value[0]?.musicSheetCategoriesList || []
             }
 
-            state.levelList = result.map((item: any) => {
-               return {
-                  label: item.name,
-                  value: item.id,
-                  musicSheetCategoriesList: item.musicSheetCategoriesList || []
-               }
+            state.levelList =
+               result?.map((item: any) => {
+                  return {
+                     label: item.name,
+                     value: item.id,
+                     musicSheetCategoriesList: item.musicSheetCategoriesList || []
+                  }
+               }) || []
+
+            state.levelList.unshift({
+               label: "全部级别",
+               value: -1
             })
+
             state.levelId = null
             state.typeId = -1
          }
@@ -704,15 +719,15 @@ export default defineComponent({
                state.levelId = state.levelList[0]?.value
                result = state.levelList[0]?.musicSheetCategoriesList || []
             }
-
-            state.typeList = result.map((item: any) => {
-               return {
-                  label: item.name,
-                  value: item.id
-               }
-            })
+            state.typeList =
+               result?.map((item: any) => {
+                  return {
+                     label: item.name,
+                     value: item.id
+                  }
+               }) || []
             state.typeList.unshift({
-               label: "全部",
+               label: "全部类型",
                value: -1
             })
             state.typeId = -1