|
@@ -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) {
|