Browse Source

修改显示

lex-xin 4 months ago
parent
commit
852f8b3edd

+ 1 - 1
src/api/cloudPractice.api.ts

@@ -29,7 +29,7 @@ export const queryPage2_gym = (data: any) => {
    })
 }
 
-export const cbsDetail_gym = (id: number, data?: any) => {
+export const cbsDetail_gym = (id: number, data = {}) => {
    return httpAxios_gym.axioseRquest({
       method: "get",
       url: `/api-teacher/musicSheet/cbsDetail/${id}`,

+ 28 - 50
src/views/cloudPractice/cloudPractice.tsx

@@ -250,7 +250,7 @@ export default defineComponent({
       const handleGetDetail_gym = async () => {
          loading.value = true
          const { id } = state.list[state.listActive] || {}
-         if (!id) return
+         if (!id) return (loading.value = false)
          await httpAjaxErrMsg(cbsDetail_gym, id, { simpleFlag: "1" }).then(res => {
             loading.value = false
             if (res.code === 200) {
@@ -794,7 +794,7 @@ export default defineComponent({
 
          // 初始化数据
          // 是否显示总谱
-         if (row.isScoreRender) {
+         if (details.isScoreRender) {
             partColumns.value.unshift({
                label: "总谱",
                instrumentName: null,
@@ -803,34 +803,34 @@ export default defineComponent({
                xmlIndex: 999,
                value: 999
             })
-
-            if (row.defaultScoreRender) {
-               state.selectedPartIndex = 999
-            }
          }
-
-         console.log(partColumns.value, "partColumns.value")
          // gym 现在单独处理 管乐迷根据查询条件来筛选谱面
          let defaultShowStaff
-         // 这里筛选当前的声轨
-         const soundCodes = filterSoundCodes()
-         if (soundCodes) {
-            const soundCodesArr = soundCodes.split(",").map((code: string) => {
-               return code
-                  .toLowerCase()
-                  .replace(/^\d+|\d+$/g, "")
-                  .trim()
-            })
-            defaultShowStaff = partColumns.value.find((item: any) =>
-               soundCodesArr.includes(
-                  item.track &&
-                     item.track
-                        .toLowerCase()
-                        .replace(/^\d+|\d+$/g, "")
-                        .trim()
+
+         if (details.defaultScoreRender) {
+            state.selectedPartIndex = 999
+         } else {
+            // 这里筛选当前的声轨
+            const soundCodes = filterSoundCodes()
+            if (soundCodes) {
+               const soundCodesArr = soundCodes.split(",").map((code: string) => {
+                  return code
+                     .toLowerCase()
+                     .replace(/^\d+|\d+$/g, "")
+                     .trim()
+               })
+               defaultShowStaff = partColumns.value.find((item: any) =>
+                  soundCodesArr.includes(
+                     item.track &&
+                        item.track
+                           .toLowerCase()
+                           .replace(/^\d+|\d+$/g, "")
+                           .trim()
+                  )
                )
-            )
+            }
          }
+
          defaultShowStaff || (defaultShowStaff = partColumns.value.find((item: any) => item.value === state.selectedPartIndex))
 
          state.selectedPartName = defaultShowStaff?.instrumentName
@@ -907,32 +907,8 @@ export default defineComponent({
             }
          }
 
-         // gym 现在单独处理 管乐迷根据查询条件来筛选谱面
-         // let defaultShowStaff
-         // if (userStoreHook.roles === "GYM") {
-         //    // 这里筛选当前的声轨
-         //    const soundCodes = await filterSoundCodes()
-         //    if (soundCodes) {
-         //       const soundCodesArr = soundCodes.split(",").map((code: string) => {
-         //          return code
-         //             .toLowerCase()
-         //             .replace(/^\d+|\d+$/g, "")
-         //             .trim()
-         //       })
-         //       defaultShowStaff = partColumns.value.find((item: any) =>
-         //          soundCodesArr.includes(
-         //             item.track &&
-         //                item.track
-         //                   .toLowerCase()
-         //                   .replace(/^\d+|\d+$/g, "")
-         //                   .trim()
-         //          )
-         //       )
-         //    }
-         //    defaultShowStaff || (defaultShowStaff = partColumns.value.find((item: any) => item.value === state.selectedPartIndex))
-         // } else {
          const defaultShowStaff = partColumns.value.find((item: any) => item.value === state.selectedPartIndex)
-         // }
+
          state.selectedPartName = defaultShowStaff?.instrumentName
          state.selectedTrack = defaultShowStaff?.track
          state.partXmlIndex = defaultShowStaff?.xmlIndex
@@ -1017,6 +993,7 @@ export default defineComponent({
                // https://cdn.oss.dayaedu.com/daya202409/UODQffO.pdf
             } else {
                if (userStoreHook.roles === "GYM") {
+                  console.log(state.partXmlIndex, state.selectedTrack, "----------")
                   state.iframeSrc = getPreViewCloud(activeItem.value.id, state.partXmlIndex, state.selectedTrack)
                } else {
                   state.iframeSrc = `/osmd/index.html`
@@ -1499,6 +1476,7 @@ export default defineComponent({
                               state.selectedPartName = item.instrumentName
                               state.selectedTrack = item.track
                               state.partXmlIndex = item.xmlIndex
+                              state.imgs = []
                               nextTick(() => {
                                  let tempPdf = ""
                                  if (activeItem.value?.isScoreRender && value === 999) {

+ 10 - 3
src/views/coursewarePlay/coursewarePlay.vue

@@ -25,6 +25,7 @@
          </div>
          <div class="songPlayBox" v-if="fileType === 'SONG'">
             <iframe ref="songPlayDom" class="songIframe" @mousemove="handleMousemove" :src="songPlaySrc" frameborder="0"></iframe>
+            <!-- <span></span> -->
          </div>
       </div>
       <div class="leftTools posTools">
@@ -229,6 +230,11 @@ const songPlaySrc = computed<string>(() => {
          activeCourseware.value?.content
       }&Authorization=${getToken()}&platform=pc&isHideBack=true&isHideMusicList=true&isYjt=1&systemType=teacher`
    }
+
+   // const iframeRef = document.querySelector("#songPlayDom") as any
+   // iframeRef?.contentWindow.location.replace(urlObj[userStoreHook.roles!])
+   // console.log(iframeRef, "iframeRef")
+
    return urlObj[userStoreHook.roles!]
 })
 // 视频是否自动播放
@@ -439,7 +445,7 @@ function handleChangeCourseware(index: -1 | 1) {
 }
 function handleCourseClick(value: any) {
    // 选择之后初始化数据
-   searchObj.search = JSON.parse(JSON.stringify(searchObj.tempSearch))
+   searchObj.search = searchObj.tempSearch ? JSON.parse(JSON.stringify(searchObj.tempSearch)) : ""
    coursewareList.value = deepCopy(tempCoursewareList.value)
    flattenCoursewareList.value = deepCopy(tempFlattenCoursewareList.value)
    activeCoursewareIndex.value = flattenCoursewareList.value.findIndex((item: any) => {
@@ -554,7 +560,8 @@ function handleToolClick(type: string) {
       drawerMenuShow.value = true
    } else if (type === "point") {
       tempCoursewareList.value = deepCopy(coursewareList.value)
-      searchObj.queryStr = JSON.parse(JSON.stringify(searchObj.search))
+      searchObj.queryStr = searchObj.search ? JSON.parse(JSON.stringify(searchObj.search)) : ""
+
       tempActiveCourseware.value = null
       drawerShow.value = true
    }
@@ -685,7 +692,7 @@ function onTitleTip(type: "phaseGoals" | "checkItem", text: string) {
 function handleQuery() {
    //
    searchObj.isSearch = true
-   searchObj.tempSearch = JSON.parse(JSON.stringify(searchObj.queryStr))
+   searchObj.tempSearch = searchObj.queryStr ? JSON.parse(JSON.stringify(searchObj.queryStr)) : ""
    getLessCoursewareList()
 }
 </script>