2023年6月11日 修复问题

src/views/kc/jiaoshi/index.vue

@@ -2,9 +2,9 @@
   <div style="width:100%;height: 100%;">
     <a-table :loading="loading" :data-source="leftList" :pagination="false" bordered size="middle" class="ant-table-striped">
         <a-table-column title="教室" data-index="jsmc"/>
-        <a-table-column title="教师近景" align="center" data-index="child_教师定位">
+        <a-table-column title="教师近景" align="center" data-index="child_教师全景">
           <template #default="{ record }">
-            <span :class="record?.child['教师定位']?.isOnLine?'green':'red'">
+            <span :class="record?.child['教师全景']?.isOnLine?'green':'red'">
               <i class="fas fa-circle" />
             </span>
           </template>
@@ -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

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;

src/views/site/renKeJiaoCheng/index.vue

@@ -6,14 +6,14 @@
     </template>
     <!-- <template #extra></template> -->
     <div class="cardBody">
-      <a-tabs>
-        <a-tab-pane key="teacherjjskList" tab="即将上课" >
+
       <a-row>
-            <a-col :span="8" :key="index" v-for="(item, index) in teacherjjskList">
+        <a-col :span="8" :key="index" v-for="(item, index) in allList" :hidden="currentPageSize * 3 <= index">
           <div class="ketangCard">
             <div class="rjkcTopDiv">
               <span>{{ item.skrq }}&nbsp;{{ toWeek(item.WEEK) }}&nbsp;第{{ item.hh }}节</span>
-                  <span class="nDayDiv">即将上课</span>
+              <span class="nDayDiv" v-if="item.cardType != '近6日课程'">{{ item.cardType }}</span>
+              <span class="nDayDiv" v-else>{{ item.nth }}天后</span>
             </div>
             <div class="rjkcBodyDiv">
               <div class="kcmcDiv">{{ item.kcmc }}</div>
@@ -24,80 +24,12 @@
           </div>
         </a-col>
       </a-row>
-        </a-tab-pane>
-        <a-tab-pane key="teacherzzskList" tab="正在上课" >
       <a-row>
-            <a-col :span="8" :key="index" v-for="(item, index) in teacherzzskList">
-              <div class="ketangCard">
-                <div class="rjkcTopDiv">
-                  <span>{{ item.skrq }}&nbsp;{{ toWeek(item.WEEK) }}&nbsp;第{{ item.hh }}节</span>
-                  <span class="nDayDiv">正在上课</span>
-                </div>
-                <div class="rjkcBodyDiv">
-                  <div class="kcmcDiv">{{ item.kcmc }}</div>
-                  <div><a-rate v-model:value="item.stars" disabled/></div>
-                  <div class="skddDiv">{{ item.skdd }}</div>
-                  <div class="xkrsDiv">{{ item.xkrs }}人选课&nbsp;&nbsp;&nbsp;<a-button @click="toLivePage(item)" :disabled="!item.jsbh" class="buttonClass">进入课堂</a-button></div>
-                </div>
-              </div>
+        <a-col :span="24" style="text-align: center;padding: 0.5rem;">
+          <a @click="loadNext">加载更多</a>
+          <a v-if="currentPageSize != 1" style="float: right;" @click="closePage">收起</a>
         </a-col>
       </a-row>
-        </a-tab-pane>
-        <a-tab-pane key="teacherdskcList" tab="待上课程" >
-          <a-row>
-            <a-col :span="8" :key="index" v-for="(item, index) in teacherdskcList">
-              <div class="ketangCard">
-                <div class="rjkcTopDiv">
-                  <span>{{ item.skrq }}&nbsp;{{ toWeek(item.WEEK) }}&nbsp;第{{ item.hh }}节</span>
-                  <span class="nDayDiv">待上课程</span>
-                </div>
-                <div class="rjkcBodyDiv">
-                  <div class="kcmcDiv">{{ item.kcmc }}</div>
-                  <div><a-rate v-model:value="item.stars" disabled/></div>
-                  <div class="skddDiv">{{ item.skdd }}</div>
-                  <div class="xkrsDiv">{{ item.xkrs }}人选课&nbsp;&nbsp;&nbsp;<a-button @click="toLivePage(item)" :disabled="!item.jsbh" class="buttonClass">进入课堂</a-button></div>
-                </div>
-              </div>
-            </a-col>
-          </a-row>
-        </a-tab-pane>
-        <a-tab-pane key="teacheryskcList" tab="已上课程" >
-          <a-row>
-            <a-col :span="8" :key="index" v-for="(item, index) in teacheryskcList">
-              <div class="ketangCard">
-                <div class="rjkcTopDiv">
-                  <span>{{ item.skrq }}&nbsp;{{ toWeek(item.WEEK) }}&nbsp;第{{ item.hh }}节</span>
-                  <span class="nDayDiv">已上课程</span>
-                </div>
-                <div class="rjkcBodyDiv">
-                  <div class="kcmcDiv">{{ item.kcmc }}</div>
-                  <div><a-rate v-model:value="item.stars" disabled/></div>
-                  <div class="skddDiv">{{ item.skdd }}</div>
-                  <div class="xkrsDiv">{{ item.xkrs }}人选课&nbsp;&nbsp;&nbsp;<a-button @click="toLivePage(item)" :disabled="!item.jsbh" class="buttonClass">进入课堂</a-button></div>
-                </div>
-              </div>
-            </a-col>
-          </a-row>
-        </a-tab-pane>
-        <a-tab-pane key="teacherjlrkcbList" tab="近6日课程表" >
-          <a-row>
-            <a-col :span="8" :key="index" v-for="(item, index) in teacherjlrkcbList">
-              <div class="ketangCard">
-                <div class="rjkcTopDiv">
-                  <span>{{ item.skrq }}&nbsp;{{ toWeek(item.WEEK) }}&nbsp;第{{ item.hh }}节</span>
-                  <span class="nDayDiv">{{ item.nth }}天后</span>
-                </div>
-                <div class="rjkcBodyDiv">
-                  <div class="kcmcDiv">{{ item.kcmc }}</div>
-                  <div><a-rate v-model:value="item.stars" disabled/></div>
-                  <div class="skddDiv">{{ item.skdd }}</div>
-                  <div class="xkrsDiv">{{ item.xkrs }}人选课&nbsp;&nbsp;&nbsp;<a-button @click="toLivePage(item)" :disabled="!item.jsbh" class="buttonClass">进入课堂</a-button></div>
-                </div>
-              </div>
-            </a-col>
-          </a-row>
-        </a-tab-pane>
-      </a-tabs>
       <a hidden @click="initData">刷新</a>
     </div>
   </a-card>
@@ -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<any>([]);
 const teacherzzskList = ref<any>([]);
+const teacherjjskList = ref<any>([]);
 const teacherdskcList = ref<any>([]);
 const teacheryskcList = ref<any>([]);
 const teacherjlrkcbList = ref<any>([]);
+const allList = ref<any>([]);
+const currentPageSize = ref<number>(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;
 }
 
 </script>

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';//学生
   }
 }