|
@@ -37,7 +37,10 @@ import {
|
|
|
api_classLessonCoursewareQuery,
|
|
|
api_lessonCoursewareKnowledgeDetailDetail
|
|
|
} from './api';
|
|
|
-import { api_lessonDetailCourseware, api_classDetailCourseware } from '../courseware-list/api'
|
|
|
+import {
|
|
|
+ api_lessonDetailCourseware,
|
|
|
+ api_classDetailCourseware
|
|
|
+} from '../courseware-list/api';
|
|
|
import VideoItem from './component/video-item';
|
|
|
import Chapter from './component/chapter';
|
|
|
import {
|
|
@@ -48,8 +51,9 @@ import detail from '../information/help-center/detail';
|
|
|
import { state } from '@/state';
|
|
|
import Theory from './component/theory';
|
|
|
import InstrumentInfo from './component/instrument-info';
|
|
|
-import TempoPractice from '../../views/tempo-practice'
|
|
|
+import TempoPractice from '../../views/tempo-practice';
|
|
|
import SelectCoursewarePop from '@/components/select-courseware-pop';
|
|
|
+import { activedNode } from 'element/element.model';
|
|
|
|
|
|
export default defineComponent({
|
|
|
name: 'CoursewarePlay',
|
|
@@ -157,7 +161,7 @@ export default defineComponent({
|
|
|
videoState: 'init' as 'init' | 'play',
|
|
|
videoItemRef: null as any,
|
|
|
animationState: 'start' as 'start' | 'end',
|
|
|
- coursewareList: [],
|
|
|
+ coursewareList: []
|
|
|
});
|
|
|
const activeData = reactive({
|
|
|
isAutoPlay: true, // 是否自动播放
|
|
@@ -176,7 +180,7 @@ export default defineComponent({
|
|
|
item: null as any
|
|
|
});
|
|
|
const getDetail = async () => {
|
|
|
- data.allList = []
|
|
|
+ data.allList = [];
|
|
|
let courseList: any[] = [];
|
|
|
if (route.query.tab == 'course') {
|
|
|
// const res = await api_classLessonCoursewareQuery({
|
|
@@ -186,7 +190,8 @@ export default defineComponent({
|
|
|
// rows: -1
|
|
|
// });
|
|
|
const res = await api_classDetailCourseware({
|
|
|
- lessonCoursewareKnowledgeDetailId: activeData.coursewareDetailKnowledgeId, // 章节id
|
|
|
+ lessonCoursewareKnowledgeDetailId:
|
|
|
+ activeData.coursewareDetailKnowledgeId // 章节id
|
|
|
});
|
|
|
if (res?.code === 200 && Array.isArray(res.data)) {
|
|
|
// const tempRows = res.data.rows || [];
|
|
@@ -203,13 +208,15 @@ export default defineComponent({
|
|
|
// });
|
|
|
// });
|
|
|
res.data.forEach((item: any) => {
|
|
|
- item.knowledgeList = item.resourceList
|
|
|
+ item.knowledgeList = item.resourceList;
|
|
|
item.resourceList.forEach((n: any) => {
|
|
|
- n.materialInfo = n.resourceList
|
|
|
- })
|
|
|
- })
|
|
|
- data.allList = res.data
|
|
|
- const currentCourse = res.data.find((item: any) => item.id === data.kjId)
|
|
|
+ n.materialInfo = n.resourceList;
|
|
|
+ });
|
|
|
+ });
|
|
|
+ data.allList = res.data;
|
|
|
+ const currentCourse = res.data.find(
|
|
|
+ (item: any) => item.id === data.kjId
|
|
|
+ );
|
|
|
data.zsdId = currentCourse?.knowledgeList?.[0].id;
|
|
|
courseList = currentCourse?.knowledgeList?.[0].materialInfo || [];
|
|
|
}
|
|
@@ -220,14 +227,17 @@ export default defineComponent({
|
|
|
// subjectId: activeData.subjectId
|
|
|
// });
|
|
|
const res = await api_lessonDetailCourseware({
|
|
|
- lessonCoursewareKnowledgeDetailId: activeData.coursewareDetailKnowledgeId, // 章节id
|
|
|
+ lessonCoursewareKnowledgeDetailId:
|
|
|
+ activeData.coursewareDetailKnowledgeId // 章节id
|
|
|
});
|
|
|
if (res?.code === 200 && Array.isArray(res.data)) {
|
|
|
- data.allList = res.data
|
|
|
- const currentCourse = res.data.find((item: any) => item.id === data.kjId)
|
|
|
+ data.allList = res.data;
|
|
|
+ const currentCourse = res.data.find(
|
|
|
+ (item: any) => item.id === data.kjId
|
|
|
+ );
|
|
|
data.zsdId = currentCourse?.knowledgeList?.[0].id;
|
|
|
courseList = currentCourse?.knowledgeList?.[0].materialInfo || [];
|
|
|
- console.log('课件类型',data.allList)
|
|
|
+ console.log('课件类型', data.allList);
|
|
|
}
|
|
|
}
|
|
|
// 课程
|
|
@@ -249,18 +259,22 @@ export default defineComponent({
|
|
|
data.allList.forEach((item: any) => {
|
|
|
item.knowledgeList.forEach((material: any) => {
|
|
|
material.materialInfo.forEach((resource: any) => {
|
|
|
- resource.zsdId = material.id // 知识点id
|
|
|
- resource.kjId = item.id // 课件id
|
|
|
- resource.bizId = route.query.tab == 'course' ? resource.materialId : resource.bizId
|
|
|
- resource.url = resource.type === 'SONG'
|
|
|
- ? 'https://oss.dayaedu.com/ktqy/1698420034679a22d3f7a.png'
|
|
|
- : resource.type === 'PPT'
|
|
|
- ? 'https://oss.dayaedu.com/ktqy/12/1701931810284.png'
|
|
|
- : resource.coverImg
|
|
|
- })
|
|
|
- allResource = allResource.concat(material.materialInfo)
|
|
|
- })
|
|
|
- })
|
|
|
+ resource.zsdId = material.id; // 知识点id
|
|
|
+ resource.kjId = item.id; // 课件id
|
|
|
+ resource.bizId =
|
|
|
+ route.query.tab == 'course'
|
|
|
+ ? resource.materialId
|
|
|
+ : resource.bizId;
|
|
|
+ resource.url =
|
|
|
+ resource.type === 'SONG'
|
|
|
+ ? 'https://oss.dayaedu.com/ktqy/1698420034679a22d3f7a.png'
|
|
|
+ : resource.type === 'PPT'
|
|
|
+ ? 'https://oss.dayaedu.com/ktqy/12/1701931810284.png'
|
|
|
+ : resource.coverImg;
|
|
|
+ });
|
|
|
+ allResource = allResource.concat(material.materialInfo);
|
|
|
+ });
|
|
|
+ });
|
|
|
|
|
|
data.itemList = allResource.map((m: any, index: number) => {
|
|
|
if (!popupData.itemActive) {
|
|
@@ -276,7 +290,7 @@ export default defineComponent({
|
|
|
isRender: false // 是否渲染了
|
|
|
};
|
|
|
});
|
|
|
- console.log('资源',data.allList,data.itemList)
|
|
|
+ // console.log('资源', data.allList, data.itemList);
|
|
|
setTimeout(() => {
|
|
|
data.animationState = 'end';
|
|
|
}, 500);
|
|
@@ -485,6 +499,7 @@ export default defineComponent({
|
|
|
let lessonCoursewareDetailId = '';
|
|
|
let coursewareDetailKnowledgeId = '';
|
|
|
let coursewareDetailKnowledgeName = '';
|
|
|
+ let coursewareItem = {} as any;
|
|
|
while (lessonIndex >= 0) {
|
|
|
lessonIndex--;
|
|
|
|
|
@@ -495,6 +510,7 @@ export default defineComponent({
|
|
|
detailItem[lessonIndex].lessonCoursewareDetailId;
|
|
|
coursewareDetailKnowledgeId = detailItem[lessonIndex].id;
|
|
|
coursewareDetailKnowledgeName = detailItem[lessonIndex].name;
|
|
|
+ coursewareItem = detailItem[lessonIndex];
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -504,21 +520,25 @@ export default defineComponent({
|
|
|
}
|
|
|
// 判断当前章节下面课程是否有内容,否则往上一个章节走
|
|
|
if (lessonStatus) {
|
|
|
- loadingClass.value = true;
|
|
|
- activeData.coursewareDetailKnowledgeId = coursewareDetailKnowledgeId;
|
|
|
- activeData.lessonCoursewareDetailId = lessonCoursewareDetailId;
|
|
|
- await getDetail();
|
|
|
- popupData.activeIndex = data.itemList.length - 1 || 0;
|
|
|
- popupData.itemActive =
|
|
|
- data.knowledgePointList[data.itemList.length - 1]?.id ||
|
|
|
- data.knowledgePointList[0]?.id;
|
|
|
- popupData.itemPointName = coursewareDetailKnowledgeName;
|
|
|
- popupData.itemName =
|
|
|
- data.knowledgePointList[data.itemList.length - 1]?.name ||
|
|
|
- data.knowledgePointList[0]?.name;
|
|
|
- localStorage.setItem(lastTimeKey, coursewareDetailKnowledgeId);
|
|
|
- popupData.chapterOpen = false;
|
|
|
- loadingClass.value = false;
|
|
|
+ // loadingClass.value = true;
|
|
|
+ // activeData.coursewareDetailKnowledgeId = coursewareDetailKnowledgeId;
|
|
|
+ // activeData.lessonCoursewareDetailId = lessonCoursewareDetailId;
|
|
|
+ // await getDetail();
|
|
|
+ // popupData.activeIndex = data.itemList.length - 1 || 0;
|
|
|
+ // popupData.itemActive =
|
|
|
+ // data.knowledgePointList[data.itemList.length - 1]?.id ||
|
|
|
+ // data.knowledgePointList[0]?.id;
|
|
|
+ // popupData.itemPointName = coursewareDetailKnowledgeName;
|
|
|
+ // popupData.itemName =
|
|
|
+ // data.knowledgePointList[data.itemList.length - 1]?.name ||
|
|
|
+ // data.knowledgePointList[0]?.name;
|
|
|
+ // localStorage.setItem(lastTimeKey, coursewareDetailKnowledgeId);
|
|
|
+ // popupData.chapterOpen = false;
|
|
|
+ // loadingClass.value = false;
|
|
|
+ checkCourseware({
|
|
|
+ ...coursewareItem,
|
|
|
+ itemActive: coursewareDetailKnowledgeId
|
|
|
+ });
|
|
|
return;
|
|
|
}
|
|
|
|
|
@@ -536,6 +556,7 @@ export default defineComponent({
|
|
|
coursewareDetailKnowledgeId = tempDetail[tempLessonLength - 1].id;
|
|
|
coursewareDetailKnowledgeName =
|
|
|
tempDetail[tempLessonLength - 1].name;
|
|
|
+ coursewareItem = tempDetail[tempLessonLength - 1];
|
|
|
}
|
|
|
tempLessonLength--;
|
|
|
if (prevLessonStatus) {
|
|
@@ -550,21 +571,26 @@ export default defineComponent({
|
|
|
|
|
|
// 判断当前章节下面课程是否有内容,否则往上一个章节走
|
|
|
if (prevLessonStatus) {
|
|
|
- loadingClass.value = true;
|
|
|
- activeData.coursewareDetailKnowledgeId = coursewareDetailKnowledgeId;
|
|
|
- activeData.lessonCoursewareDetailId = lessonCoursewareDetailId;
|
|
|
- await getDetail();
|
|
|
- popupData.activeIndex = data.itemList.length - 1 || 0;
|
|
|
- popupData.itemActive =
|
|
|
- data.knowledgePointList[data.itemList.length - 1]?.id ||
|
|
|
- data.knowledgePointList[0]?.id;
|
|
|
- localStorage.setItem(lastTimeKey, coursewareDetailKnowledgeId);
|
|
|
- popupData.itemPointName = coursewareDetailKnowledgeName;
|
|
|
- popupData.itemName =
|
|
|
- data.knowledgePointList[data.itemList.length - 1]?.name ||
|
|
|
- data.knowledgePointList[0]?.name;
|
|
|
- popupData.chapterOpen = false;
|
|
|
- loadingClass.value = false;
|
|
|
+ // loadingClass.value = true;
|
|
|
+ // activeData.coursewareDetailKnowledgeId = coursewareDetailKnowledgeId;
|
|
|
+ // activeData.lessonCoursewareDetailId = lessonCoursewareDetailId;
|
|
|
+ // await getDetail();
|
|
|
+ // popupData.activeIndex = data.itemList.length - 1 || 0;
|
|
|
+ // popupData.itemActive =
|
|
|
+ // data.knowledgePointList[data.itemList.length - 1]?.id ||
|
|
|
+ // data.knowledgePointList[0]?.id;
|
|
|
+ // localStorage.setItem(lastTimeKey, coursewareDetailKnowledgeId);
|
|
|
+ // popupData.itemPointName = coursewareDetailKnowledgeName;
|
|
|
+ // popupData.itemName =
|
|
|
+ // data.knowledgePointList[data.itemList.length - 1]?.name ||
|
|
|
+ // data.knowledgePointList[0]?.name;
|
|
|
+ // popupData.chapterOpen = false;
|
|
|
+ // loadingClass.value = false;
|
|
|
+ // console.log('2', coursewareItem, coursewareDetailKnowledgeId);
|
|
|
+ checkCourseware({
|
|
|
+ ...coursewareItem,
|
|
|
+ itemActive: coursewareDetailKnowledgeId
|
|
|
+ });
|
|
|
return;
|
|
|
}
|
|
|
} else {
|
|
@@ -577,7 +603,7 @@ export default defineComponent({
|
|
|
let detailIndex = data.courseDetails.findIndex(
|
|
|
(item: any) => item.id == activeData.lessonCoursewareDetailId
|
|
|
);
|
|
|
- // 当前章节列表
|
|
|
+ // 当前章节列表
|
|
|
const detailItem = data.courseDetails[detailIndex]?.knowledgeList || [];
|
|
|
// 获取当前是哪个章节
|
|
|
let lessonIndex = detailItem.findIndex(
|
|
@@ -588,6 +614,7 @@ export default defineComponent({
|
|
|
let lessonCoursewareDetailId = '';
|
|
|
let coursewareDetailKnowledgeId = '';
|
|
|
let coursewareDetailKnowledgeName = '';
|
|
|
+ let coursewareItem = {} as any;
|
|
|
while (lessonIndex < detailItem.length - 1) {
|
|
|
lessonIndex++;
|
|
|
if (lessonIndex >= 0) {
|
|
@@ -597,6 +624,7 @@ export default defineComponent({
|
|
|
detailItem[lessonIndex].lessonCoursewareDetailId;
|
|
|
coursewareDetailKnowledgeId = detailItem[lessonIndex].id;
|
|
|
coursewareDetailKnowledgeName = detailItem[lessonIndex].name;
|
|
|
+ coursewareItem = detailItem[lessonIndex];
|
|
|
}
|
|
|
}
|
|
|
if (lessonStatus) {
|
|
@@ -605,17 +633,21 @@ export default defineComponent({
|
|
|
}
|
|
|
// 判断当前章节下面课程是否有内容,否则往下一个章节走
|
|
|
if (lessonStatus) {
|
|
|
- loadingClass.value = true;
|
|
|
- activeData.coursewareDetailKnowledgeId = coursewareDetailKnowledgeId;
|
|
|
- activeData.lessonCoursewareDetailId = lessonCoursewareDetailId;
|
|
|
- await getDetail();
|
|
|
- popupData.activeIndex = 0;
|
|
|
- popupData.itemActive = data.knowledgePointList[0].id;
|
|
|
- popupData.itemName = data.knowledgePointList[0].name;
|
|
|
- localStorage.setItem(lastTimeKey, coursewareDetailKnowledgeId);
|
|
|
- popupData.itemPointName = coursewareDetailKnowledgeName;
|
|
|
- popupData.chapterOpen = false;
|
|
|
- loadingClass.value = false;
|
|
|
+ // loadingClass.value = true;
|
|
|
+ // activeData.coursewareDetailKnowledgeId = coursewareDetailKnowledgeId;
|
|
|
+ // activeData.lessonCoursewareDetailId = lessonCoursewareDetailId;
|
|
|
+ // await getDetail();
|
|
|
+ // popupData.activeIndex = 0;
|
|
|
+ // popupData.itemActive = data.knowledgePointList[0].id;
|
|
|
+ // popupData.itemName = data.knowledgePointList[0].name;
|
|
|
+ // localStorage.setItem(lastTimeKey, coursewareDetailKnowledgeId);
|
|
|
+ // popupData.itemPointName = coursewareDetailKnowledgeName;
|
|
|
+ // popupData.chapterOpen = false;
|
|
|
+ // loadingClass.value = false;
|
|
|
+ checkCourseware({
|
|
|
+ ...coursewareItem,
|
|
|
+ itemActive: coursewareDetailKnowledgeId
|
|
|
+ });
|
|
|
return;
|
|
|
}
|
|
|
|
|
@@ -632,6 +664,7 @@ export default defineComponent({
|
|
|
tempDetail[tempLessonLength].lessonCoursewareDetailId;
|
|
|
coursewareDetailKnowledgeId = tempDetail[tempLessonLength].id;
|
|
|
coursewareDetailKnowledgeName = tempDetail[tempLessonLength].name;
|
|
|
+ coursewareItem = tempDetail[tempLessonLength];
|
|
|
}
|
|
|
tempLessonLength++;
|
|
|
if (nextLessonStatus) {
|
|
@@ -646,17 +679,21 @@ export default defineComponent({
|
|
|
|
|
|
// 判断当前章节下面课程是否有内容,否则往上一个章节走
|
|
|
if (nextLessonStatus) {
|
|
|
- loadingClass.value = true;
|
|
|
- activeData.coursewareDetailKnowledgeId = coursewareDetailKnowledgeId;
|
|
|
- activeData.lessonCoursewareDetailId = lessonCoursewareDetailId;
|
|
|
- await getDetail();
|
|
|
- popupData.activeIndex = 0;
|
|
|
- popupData.itemActive = data.knowledgePointList[0].id;
|
|
|
- localStorage.setItem(lastTimeKey, coursewareDetailKnowledgeId);
|
|
|
- popupData.itemName = data.knowledgePointList[0].name;
|
|
|
- popupData.itemPointName = coursewareDetailKnowledgeName;
|
|
|
- popupData.chapterOpen = false;
|
|
|
- loadingClass.value = false;
|
|
|
+ // loadingClass.value = true;
|
|
|
+ // activeData.coursewareDetailKnowledgeId = coursewareDetailKnowledgeId;
|
|
|
+ // activeData.lessonCoursewareDetailId = lessonCoursewareDetailId;
|
|
|
+ // await getDetail();
|
|
|
+ // popupData.activeIndex = 0;
|
|
|
+ // popupData.itemActive = data.knowledgePointList[0].id;
|
|
|
+ // localStorage.setItem(lastTimeKey, coursewareDetailKnowledgeId);
|
|
|
+ // popupData.itemName = data.knowledgePointList[0].name;
|
|
|
+ // popupData.itemPointName = coursewareDetailKnowledgeName;
|
|
|
+ // popupData.chapterOpen = false;
|
|
|
+ // loadingClass.value = false;
|
|
|
+ checkCourseware({
|
|
|
+ ...coursewareItem,
|
|
|
+ itemActive: coursewareDetailKnowledgeId
|
|
|
+ });
|
|
|
return;
|
|
|
}
|
|
|
}
|
|
@@ -812,39 +849,44 @@ export default defineComponent({
|
|
|
const loadNewCourseware = async (item: any) => {
|
|
|
loadingClass.value = true;
|
|
|
activeData.coursewareDetailKnowledgeId = item.coursewareDetailKnowledgeId;
|
|
|
+ activeData.lessonCoursewareDetailId = item.lessonCoursewareDetailId;
|
|
|
+ localStorage.setItem(lastTimeKey, item.coursewareDetailKnowledgeId);
|
|
|
popupData.chapterOpen = false;
|
|
|
showSelectCourseware.value = false;
|
|
|
- data.kjId = item.id
|
|
|
+ data.kjId = item.id;
|
|
|
await getDetail();
|
|
|
popupData.activeIndex = 0;
|
|
|
popupData.itemActive = data.knowledgePointList[0].id;
|
|
|
popupData.itemName = data.knowledgePointList[0].name;
|
|
|
loadingClass.value = false;
|
|
|
- }
|
|
|
+ };
|
|
|
// 通过章节id,检测此章节有几个课件
|
|
|
const checkCourseware = async (item: any) => {
|
|
|
- // 如果有多个课件,需要选择一个课件进入上课页面
|
|
|
- if (item.coursewareNum) {
|
|
|
- try {
|
|
|
- const res = route.query.tab == 'all' ? await api_lessonDetailCourseware({
|
|
|
- lessonCoursewareKnowledgeDetailId: item.itemActive,
|
|
|
- }): await api_classDetailCourseware({
|
|
|
- lessonCoursewareKnowledgeDetailId: item.itemActive,
|
|
|
- })
|
|
|
- if (res?.code == 200 && res.data?.length) {
|
|
|
- data.coursewareList = res.data;
|
|
|
- // 如果只有一个课件,直接进入该课件
|
|
|
- if (res.data.length == 1) {
|
|
|
- loadNewCourseware(res.data[0])
|
|
|
- } else {
|
|
|
- // 如果有多个课件,需要选择一个课件进入上课页面
|
|
|
- showSelectCourseware.value = true;
|
|
|
- }
|
|
|
- }
|
|
|
- } catch {
|
|
|
- //
|
|
|
+ // 如果有多个课件,需要选择一个课件进入上课页面
|
|
|
+ if (item.coursewareNum) {
|
|
|
+ try {
|
|
|
+ const res =
|
|
|
+ route.query.tab == 'all'
|
|
|
+ ? await api_lessonDetailCourseware({
|
|
|
+ lessonCoursewareKnowledgeDetailId: item.itemActive
|
|
|
+ })
|
|
|
+ : await api_classDetailCourseware({
|
|
|
+ lessonCoursewareKnowledgeDetailId: item.itemActive
|
|
|
+ });
|
|
|
+ if (res?.code == 200 && res.data?.length) {
|
|
|
+ data.coursewareList = res.data;
|
|
|
+ // 如果只有一个课件,直接进入该课件
|
|
|
+ if (res.data.length == 1) {
|
|
|
+ loadNewCourseware(res.data[0]);
|
|
|
+ } else {
|
|
|
+ // 如果有多个课件,需要选择一个课件进入上课页面
|
|
|
+ showSelectCourseware.value = true;
|
|
|
+ }
|
|
|
}
|
|
|
+ } catch {
|
|
|
+ //
|
|
|
}
|
|
|
+ }
|
|
|
};
|
|
|
|
|
|
return () => (
|
|
@@ -1015,24 +1057,35 @@ export default defineComponent({
|
|
|
)}
|
|
|
|
|
|
{/* 新增:RHYTHM:节奏练习,THEORY:乐理知识,MUSIC_WIKI:名曲鉴赏 INSTRUMENT:乐器 MUSICIAN:音乐家 资源类型 */}
|
|
|
- {m.type === 'RHYTHM' &&
|
|
|
- <TempoPractice
|
|
|
- dataJson={m?.dataJson ? JSON.parse(m?.dataJson) : {}}
|
|
|
+ {m.type === 'RHYTHM' && (
|
|
|
+ <TempoPractice
|
|
|
+ class={styles.tempoPracticeGroup}
|
|
|
+ dataJson={m?.dataJson ? JSON.parse(m?.dataJson) : {}}
|
|
|
modeType={'courseware'}
|
|
|
/>
|
|
|
- }
|
|
|
- {m.type === 'THEORY' && (
|
|
|
- <Theory id={m.bizId} />
|
|
|
)}
|
|
|
+ {m.type === 'THEORY' && <Theory id={m.bizId} />}
|
|
|
{m.type === 'MUSIC_WIKI' && (
|
|
|
- <InstrumentInfo type={'wiki'} id={m.bizId} />
|
|
|
+ <InstrumentInfo
|
|
|
+ type={'wiki'}
|
|
|
+ id={m.bizId}
|
|
|
+ show={popupData.activeIndex === mIndex}
|
|
|
+ />
|
|
|
)}
|
|
|
{m.type === 'INSTRUMENT' && (
|
|
|
- <InstrumentInfo type={'instrument'} id={m.bizId} />
|
|
|
+ <InstrumentInfo
|
|
|
+ type={'instrument'}
|
|
|
+ id={m.bizId}
|
|
|
+ show={popupData.activeIndex === mIndex}
|
|
|
+ />
|
|
|
)}
|
|
|
{m.type === 'MUSICIAN' && (
|
|
|
- <InstrumentInfo type={'musician'} id={m.bizId} />
|
|
|
- )}
|
|
|
+ <InstrumentInfo
|
|
|
+ type={'musician'}
|
|
|
+ id={m.bizId}
|
|
|
+ show={popupData.activeIndex === mIndex}
|
|
|
+ />
|
|
|
+ )}
|
|
|
</div>
|
|
|
) : (
|
|
|
<div
|
|
@@ -1152,20 +1205,18 @@ export default defineComponent({
|
|
|
onHandleSelect={async (item: any) => {
|
|
|
activeData.lessonCoursewareDetailId = item.tabActive;
|
|
|
popupData.itemPointName = item.itemName;
|
|
|
- checkCourseware(item)
|
|
|
+ checkCourseware(item);
|
|
|
}}
|
|
|
/>
|
|
|
</Popup>
|
|
|
- {
|
|
|
- showSelectCourseware.value &&
|
|
|
- <SelectCoursewarePop
|
|
|
- list={data.coursewareList}
|
|
|
+ {showSelectCourseware.value && (
|
|
|
+ <SelectCoursewarePop
|
|
|
+ list={data.coursewareList}
|
|
|
onClose={() => {
|
|
|
showSelectCourseware.value = false;
|
|
|
}}
|
|
|
- onSelect={(item) => loadNewCourseware(item)}
|
|
|
- ></SelectCoursewarePop>
|
|
|
- }
|
|
|
+ onSelect={item => loadNewCourseware(item)}></SelectCoursewarePop>
|
|
|
+ )}
|
|
|
</div>
|
|
|
);
|
|
|
}
|