diff --git a/src/views/kc/jiaoshi/index.vue b/src/views/kc/jiaoshi/index.vue index 05804d3..bcbcda8 100644 --- a/src/views/kc/jiaoshi/index.vue +++ b/src/views/kc/jiaoshi/index.vue @@ -2,9 +2,9 @@
- + @@ -188,6 +188,11 @@ function loadData(){ } function ylLive(record){ + + console.log(`🚀 ---------------------------------------------------🚀`); + console.log(`🚀 ~ file: index.vue:192 ~ ylLive ~ ----record:`, record); + console.log(`🚀 ---------------------------------------------------🚀`); + isShowAllLive.value = true nextTick(() => { currentItem.value = record diff --git a/src/views/kc/jiaoshi/showAllLive.vue b/src/views/kc/jiaoshi/showAllLive.vue index c847d33..1aa91d5 100644 --- a/src/views/kc/jiaoshi/showAllLive.vue +++ b/src/views/kc/jiaoshi/showAllLive.vue @@ -178,9 +178,9 @@ function calcOtherVideo() :any{ // if(key != '录播主机' && key.indexOf('音频处理器') ==-1){ // console.log('currentItem.value.child[key] ->',currentItem.value.child[key]); - if(currentItem.value.child[key]?.sfyx == 0){ + // if(currentItem.value.child[key]?.sfyx == 0){ map[key] = currentItem.value.child[key]; - } + // } // } }); return map; diff --git a/src/views/site/renKeJiaoCheng/index.vue b/src/views/site/renKeJiaoCheng/index.vue index 882d03d..84303b5 100644 --- a/src/views/site/renKeJiaoCheng/index.vue +++ b/src/views/site/renKeJiaoCheng/index.vue @@ -6,98 +6,30 @@
- - - - -
-
- {{ item.skrq }} {{ toWeek(item.WEEK) }} 第{{ item.hh }}节 - 即将上课 -
-
-
{{ item.kcmc }}
-
-
{{ item.skdd }}
-
{{ item.xkrs }}人选课   进入课堂
-
-
- - - - - - -
-
- {{ item.skrq }} {{ toWeek(item.WEEK) }} 第{{ item.hh }}节 - 正在上课 -
-
-
{{ item.kcmc }}
-
-
{{ item.skdd }}
-
{{ item.xkrs }}人选课   进入课堂
-
-
- - - - - - -
-
- {{ item.skrq }} {{ toWeek(item.WEEK) }} 第{{ item.hh }}节 - 待上课程 -
-
-
{{ item.kcmc }}
-
-
{{ item.skdd }}
-
{{ item.xkrs }}人选课   进入课堂
-
-
- - - - - - -
-
- {{ item.skrq }} {{ toWeek(item.WEEK) }} 第{{ item.hh }}节 - 已上课程 -
-
-
{{ item.kcmc }}
-
-
{{ item.skdd }}
-
{{ item.xkrs }}人选课   进入课堂
-
-
- - - - - - -
-
- {{ item.skrq }} {{ toWeek(item.WEEK) }} 第{{ item.hh }}节 - {{ item.nth }}天后 -
-
-
{{ item.kcmc }}
-
-
{{ item.skdd }}
-
{{ item.xkrs }}人选课   进入课堂
-
-
- - - - + + + +
+
+ {{ item.skrq }} {{ toWeek(item.WEEK) }} 第{{ item.hh }}节 + {{ item.cardType }} + {{ item.nth }}天后 +
+
+
{{ item.kcmc }}
+
+
{{ item.skdd }}
+
{{ item.xkrs }}人选课   进入课堂
+
+
+ + + + + 加载更多 + 收起 + +
@@ -132,6 +64,14 @@ function toLivePage(item){ window.open(routeData.href, '_blank'); }; +function loadNext(){ + currentPageSize.value++; +} + +function closePage(){ + currentPageSize.value = 1; +} + const weebMap = { '1': '星期一', @@ -146,64 +86,73 @@ function toWeek(week){ return weebMap[week]; } - -const teacherjjskList = ref([]); const teacherzzskList = ref([]); +const teacherjjskList = ref([]); const teacherdskcList = ref([]); const teacheryskcList = ref([]); const teacherjlrkcbList = ref([]); +const allList = ref([]); +const currentPageSize = ref(1); -function initData() { - getTeacherjjsk(); - getTeacherzzsk(); - getTeacherdskc(); - getTeacheryskc(); - getTeacherjlrkcb(); +async function initData() { + currentPageSize.value = 1; + let l1 = await getTeacherzzsk(); + let l2 = await getTeacherjjsk(); + let l3 = await getTeacherdskc(); + let l4 = await getTeacheryskc(); + let l5 = await getTeacherjlrkcb(); + + allList.value = [...l1,...l2,...l3,...l4,...l5]; } -function getTeacherjjsk() { +async function getTeacherzzsk() { let params = { userid: getUserId(), }; - defHttp.get({ url: '/ktgl/kcKetangbiao/getTeacherjjsk', params }).then(res => { - teacherjjskList.value = res; - }); + let list = await defHttp.get({ url: '/ktgl/kcKetangbiao/getTeacherzzsk', params }); + list.forEach(x => x.cardType = '正在上课'); + teacherzzskList.value = list; + return list; } -function getTeacherzzsk() { +async function getTeacherjjsk() { let params = { userid: getUserId(), }; - defHttp.get({ url: '/ktgl/kcKetangbiao/getTeacherzzsk', params }).then(res => { - teacherzzskList.value = res; - }); + let list = await defHttp.get({ url: '/ktgl/kcKetangbiao/getTeacherjjsk', params }); + list.forEach(x => x.cardType = '即将上课'); + teacherjjskList.value = list; + return list; } -function getTeacherdskc() { +async function getTeacherdskc() { let params = { userid: getUserId(), }; - defHttp.get({ url: '/ktgl/kcKetangbiao/getTeacherdskc', params }).then(res => { - teacherdskcList.value = res; - }); + let list = await defHttp.get({ url: '/ktgl/kcKetangbiao/getTeacherdskc', params }); + list.forEach(x => x.cardType = '待上课程'); + teacherdskcList.value = list; + return list; } -function getTeacheryskc() { +async function getTeacheryskc() { let params = { userid: getUserId(), }; - defHttp.get({ url: '/ktgl/kcKetangbiao/getTeacheryskc', params }).then(res => { - teacheryskcList.value = res; - }); + let list = await defHttp.get({ url: '/ktgl/kcKetangbiao/getTeacheryskc', params }); + list.forEach(x => x.cardType = '已上课程'); + teacheryskcList.value = list; + return list; } -function getTeacherjlrkcb() { +async function getTeacherjlrkcb() { let params = { userid: getUserId(), }; - defHttp.get({ url: '/ktgl/kcKetangbiao/getTeacherjlrkcb', params }).then(res => { - teacherjlrkcbList.value = res; - }); + let list = await defHttp.get({ url: '/ktgl/kcKetangbiao/getTeacherjlrkcb', params }); + list.forEach(x => x.cardType = '近6日课程'); + teacherjlrkcbList.value = list; + return list; } diff --git a/src/views/site/utils/index.ts b/src/views/site/utils/index.ts index 015bd4e..2f469b7 100644 --- a/src/views/site/utils/index.ts +++ b/src/views/site/utils/index.ts @@ -25,7 +25,7 @@ export const getUserId = () => { }else{ console.log(`🚀 ~ file: index.ts:17 ~ getUserId ~ isOpenSSO2:`, isOpenSSO) //固定某值 - return '2016900057';//教师//2002900176 //2016900057 + return '2016900057';//教师//2016900057//2002900176//2001900153 // return '2022010920';//学生 } }