Browse Source

Merge branch 'iteration-20240902-free' into jenkins-main

lex-xin 6 months ago
parent
commit
b1dafdd3fc

+ 1 - 1
src/views/accompany/index.tsx

@@ -31,7 +31,7 @@ export default defineComponent({
           }
         )
         console.log(res, 'res')
-        const result = res.data.rows || []
+        const result = res.data || []
         if (Array.isArray(result)) {
           data.svgs = result.map((n: any, index: number) => {
             return {

+ 15 - 5
src/views/unit-test/unit-create/unit-edit-test/music-list.tsx

@@ -43,14 +43,24 @@ export default defineComponent({
 
     const getTree = async () => {
       try {
-        const res: any = await request.get(
-          state.platformApi + '/musicSheetCategories/queryTree?enable=true'
+        // const res: any = await request.get(
+        //   state.platformApi + '/musicSheetCategories/queryTree?enable=true'
+        // )
+
+        const res: any = await request.post(
+          state.platformApi + '/musicSheetCategories/page', {
+            data: {
+              parentId: 0,
+              enable: true,
+              page: 1,
+              rows: 10
+            }
+          }
         )
         if (Array.isArray(res?.data)) {
           data.musicTree = res.data
-
-          // 默认选择独奏曲目
-          const item = data.musicTree.find((item: any) => item.name === '独奏曲目')
+          // 默认选择独奏云练
+          const item = data.musicTree.find((item: any) => item.name === '独奏云练')
           if (item) {
             data.value0 = item.id
           }