Merge branch 'hqyNewVersion' of http://git.dayaedu.com/lex/resource-admin into develop

src/views/music-library/music-sheet/component/music-list.tsx

@@ -461,9 +461,20 @@ export default defineComponent({
         const { data } = await musicSheetCategoriesQueryTree({})
         // state.musicSheetCategories = filterPointCategory(data, 'musicSheetCategoriesList')
         state.musicSheetCategories = data || []
+        clearEmptyMusicCategory(state.musicSheetCategories)
       } catch (e) {}
     }
 
+    const clearEmptyMusicCategory = (data: any) => {
+      for (let i = 0; i < data.length; i++) {
+        if (data[i].musicSheetCategoriesList.length < 1) {
+          data[i].musicSheetCategoriesList = null
+        } else {
+          clearEmptyMusicCategory(data[i].musicSheetCategoriesList)
+        }
+      }
+    }
+
     // 获取声部
     const initSubjectList = async () => {
       try {

src/views/music-library/music-sheet/modal/musiceBeatTime/index.tsx

@@ -30,11 +30,12 @@ export default defineComponent({
     }
     async function handleBeatTimes(data:any){
       try {
-        const { beatTime, singBeatTime} = JSON.parse(data.data)
+        const { beatTime, singBeatTime, mingBeatTime} = JSON.parse(data.data)
         await musicSheetAddMix({
           id: props.id,
           playTimeList: beatTime,
-          singTimeList: singBeatTime
+          singTimeList: singBeatTime,
+          solmizationTimeList: mingBeatTime
         })
         message.success('生成成功')
         emit("close")