From 44ec6a0c851f4b21b4348ef092d452531414774b Mon Sep 17 00:00:00 2001
From: bai <1643359946@qq.com>
Date: Wed, 1 Nov 2023 00:32:15 +0800
Subject: [PATCH] =?UTF-8?q?2023=E5=B9=B411=E6=9C=881=E6=97=A5=20=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E7=9B=B4=E6=92=AD=E9=A1=B5=EF=BC=88=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E7=AB=AF=EF=BC=89=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9=EF=BC=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jiaoshi/KcZhihuijiaoshiAccessLog.data.ts  | 60 +++++++-------
 .../jiaoshi/KcZhihuijiaoshiOperateLog.data.ts | 78 +++++++++----------
 src/views/kc/jiaoshi/index.vue                | 15 ++--
 .../site/common/video/videojs/viewPage2.vue   | 34 +++++---
 4 files changed, 98 insertions(+), 89 deletions(-)

diff --git a/src/views/kc/jiaoshi/KcZhihuijiaoshiAccessLog.data.ts b/src/views/kc/jiaoshi/KcZhihuijiaoshiAccessLog.data.ts
index 9da6424..69fc4b4 100644
--- a/src/views/kc/jiaoshi/KcZhihuijiaoshiAccessLog.data.ts
+++ b/src/views/kc/jiaoshi/KcZhihuijiaoshiAccessLog.data.ts
@@ -79,41 +79,41 @@ export const searchFormSchema: FormSchema[] = [
         ],
       },
   },
+  // {
+  //     label: "教学楼编号",
+  //     field: 'jxlId',
+  //     component: 'Input',
+  //     colProps: {span: 6},
+  //  },
   {
-      label: "教学楼编号",
-      field: 'jxlId',
-      component: 'Input',
-      colProps: {span: 6},
-   },
+    label: "教学楼名称",
+    field: 'jxlName',
+    component: 'Input',
+    colProps: {span: 6},
+  },
   {
-      label: "教学楼名称",
-      field: 'jxlName',
-      component: 'Input',
-      colProps: {span: 6},
-   },
+    label: "教室编号",
+    field: 'jsbh',
+    component: 'Input',
+    colProps: {span: 6},
+  },
   {
-      label: "教室编号",
-      field: 'jsbh',
-      component: 'Input',
-      colProps: {span: 6},
-   },
+    label: "教室名称",
+    field: 'jsmc',
+    component: 'Input',
+    colProps: {span: 6},
+  },
   {
-      label: "教室名称",
-      field: 'jsmc',
-      component: 'Input',
-      colProps: {span: 6},
-   },
+    label: "课堂ID",
+    field: 'ketangbiaoId',
+    component: 'Input',
+    colProps: {span: 6},
+  },
   {
-      label: "课堂ID",
-      field: 'ketangbiaoId',
-      component: 'Input',
-      colProps: {span: 6},
-   },
-  {
-      label: "课堂名称",
-      field: 'ketangbiaoName',
-      component: 'Input',
-      colProps: {span: 6},
+    label: "课堂名称",
+    field: 'ketangbiaoName',
+    component: 'Input',
+    colProps: {span: 6},
    },
 ];
 //表单数据
diff --git a/src/views/kc/jiaoshi/KcZhihuijiaoshiOperateLog.data.ts b/src/views/kc/jiaoshi/KcZhihuijiaoshiOperateLog.data.ts
index 583c14d..22d5eae 100644
--- a/src/views/kc/jiaoshi/KcZhihuijiaoshiOperateLog.data.ts
+++ b/src/views/kc/jiaoshi/KcZhihuijiaoshiOperateLog.data.ts
@@ -89,49 +89,49 @@ export const searchFormSchema: FormSchema[] = [
       ],
     },
   },
+  // {
+  //     label: "教学楼编号",
+  //     field: 'jxlId',
+  //     component: 'JInput',
+  //     colProps: {span: 6},
+  //  },
   {
-      label: "教学楼编号",
-      field: 'jxlId',
-      component: 'JInput',
-      colProps: {span: 6},
-   },
+    label: "教学楼名称",
+    field: 'JInput',
+    component: 'Input',
+    colProps: {span: 6},
+  },
   {
-      label: "教学楼名称",
-      field: 'JInput',
-      component: 'Input',
-      colProps: {span: 6},
-   },
+    label: "教室编号",
+    field: 'jsbh',
+    component: 'JInput',
+    colProps: {span: 6},
+  },
   {
-      label: "教室编号",
-      field: 'jsbh',
-      component: 'JInput',
-      colProps: {span: 6},
-   },
+    label: "教室名称",
+    field: 'jsmc',
+    component: 'JInput',
+    colProps: {span: 6},
+  },
   {
-      label: "教室名称",
-      field: 'jsmc',
-      component: 'JInput',
-      colProps: {span: 6},
-   },
-  {
-      label: "操作类型",
-      field: 'operateType',
-      component: 'Select',
-      colProps: {span: 6},
-      componentProps: {
-        options: [
-          {
-            label: '关闭',
-            value: '0',
-            key: '0',
-          },
-          {
-            label: '开启',
-            value: '1',
-            key: '1',
-          },
-          ],
-      },
+    label: "操作类型",
+    field: 'operateType',
+    component: 'Select',
+    colProps: {span: 6},
+    componentProps: {
+      options: [
+        {
+          label: '关闭',
+          value: '0',
+          key: '0',
+        },
+        {
+          label: '开启',
+          value: '1',
+          key: '1',
+        },
+        ],
+    },
   },
   {
       label: "操作地址",
diff --git a/src/views/kc/jiaoshi/index.vue b/src/views/kc/jiaoshi/index.vue
index 566dc70..ba6d308 100644
--- a/src/views/kc/jiaoshi/index.vue
+++ b/src/views/kc/jiaoshi/index.vue
@@ -31,7 +31,7 @@
               </a-col>
               <a-col :span="6">
                 <div class="numberBlob handleCss" @click="openDetail({ sfyx2: '0' })">
-                  <div class="numSpan orange" style="font-size: 24px;height: 50px;line-height: 50px;">{{ getSysConfig().flag5 == 0?'否':'是' }}</div>
+                  <div class="numSpan orange" style="font-size: 24px;height: 50px;line-height: 50px;">{{ getSysConfig().flag5 == 0?'否': leftList.filter(x => x.sfyx == 0).length || 0}}</div>
                   <div class="numberName">
                     <!-- <RiseOutlined class="orange"/> -->
                     开放听课
@@ -41,7 +41,7 @@
               <a-col :span="6">
                 <div class="numberBlob">
                   <div v-if="!statusLogList.length" class="numSpan orange" style="font-size: 24px;height: 50px;line-height: 50px;">未检测</div>
-                  <div v-else class="numSpan orange" style="font-size: 24px;height: 50px;line-height: 50px;">{{ statusLogList.filter(x => x.type != 'green' ).length }}</div>
+                  <div v-else class="numSpan orange" style="font-size: 24px;height: 50px;line-height: 50px;">{{ statusLogList.filter(x => x.type != 'green' ).length || 0 }}</div>
                   <div class="numberName">
                     <!-- <RiseOutlined class="orange"/> -->
                     设备异常
@@ -96,8 +96,7 @@
     <div class="" style="padding: 1rem;">
       <a-row :gutter="[16,16]">
         <a-col :span="6" v-for="(item,index) of cardList" :key="index">
-          <!-- <a-card bordered hoverable @click="() => (currentCardIndex = index,searchReset())" :class="currentCardIndex == index?'active':''"> -->
-          <a-card bordered >
+          <a-card bordered hoverable @click="() => (currentCardIndex = index,searchReset())" :class="currentCardIndex == index?'active':''">
             <template #title>
               <div style="float: left;font-size: 15px;font-weight: 600;margin-bottom: 10px;">{{ item.jxlName }}</div>
               <div style="float: right"><a-button type="primary" @click="refreshLogsFn(item.jxlName)">设备检测</a-button></div>
@@ -105,7 +104,7 @@
             <a-row style="margin-bottom: 10px;text-align: center;border-bottom: 1px #f0f0f0 solid ;padding-bottom: 10px;">
               <a-col :span="6" style="font-weight: 600;" @click="openDetail({ jxlName: item.jxlName})">{{ item.jsNum }}</a-col>
               <a-col :span="6" style="font-weight: 600;" @click="openDetail({ jxlName: item.jxlName, sfyx: '0'})">{{ item.child.length }}</a-col>
-              <a-col :span="6" style="font-weight: 600;" @click="openDetail({ jxlName: item.jxlName})">{{ item.child.filter(x => x.allIsOnLine == 4).length || 0 }}</a-col>
+              <a-col :span="6" style="font-weight: 600;" @click="openDetail({ jxlName: item.jxlName})">{{ item.child.filter(x => x.sfyx == 0).length || 0 }}</a-col>
               <a-col :span="6" style="font-weight: 600;" v-if="!statusLogList.length">未检测</a-col>
               <a-col :span="6" style="font-weight: 600;" v-else>{{ statusLogList.filter(x => x.jxlName == item.jxlName && x.type != 'green' ).length }}</a-col>
               <a-col :span="6" @click="openDetail({ jxlName: item.jxlName})">总数</a-col>
@@ -724,7 +723,7 @@ function batchTingkeClose(){
 }
 
 function ylLiveNew(record) {
-  let routeData = route.resolve({ path:'/site/liveRoom2',query:{ id: record.jsbh } });
+  let routeData = route.resolve({ path:'/site/liveRoom2',query:{ id: record.jsbh, ktId: record.nowIsClassId } });
   window.open(routeData.href, '_blank');
 }
 
@@ -803,8 +802,8 @@ function tableChange(pagination) {
 
 function filterDataSource() {
   let dataSource:any = [];
-  //let list = cardList.value[currentCardIndex.value]?.child??[];
-  let list = leftList.value??[];
+  let list = cardList.value[currentCardIndex.value]?.child??[];
+  // let list = leftList.value??[];
   let qw = queryParam.value;
 
   console.log('->',qw, qw.nowIsClass);
diff --git a/src/views/site/common/video/videojs/viewPage2.vue b/src/views/site/common/video/videojs/viewPage2.vue
index aef47c7..a0b55cd 100644
--- a/src/views/site/common/video/videojs/viewPage2.vue
+++ b/src/views/site/common/video/videojs/viewPage2.vue
@@ -11,22 +11,27 @@
               <a-col :xs="{ span: 24 }" :sm="{ span: 19 }" :lg="{ span: 19 }">
                 <div>
                   <a-card class="videoCardMain" style="width:100%">
-                    <!-- <template #title>
-                      <span class="" style="border-radius: 5px;">
-                        {{ ktangInfo.kcmc || ' ' }}
-                      </span>
-                      <span style="margin-left: 10px;background: #1c84c6;color: #fff;padding: 3px;border-radius: 5px;font-size: 12px;" @click="() => tingKeZuJiAddModal.view({ ketangbiaoid: route.query.ktId })">填写评价表</span>
-                      <div style="font-size: .5rem;">
-                        {{ ktangInfo.zc || ' ' }}-{{ ktangInfo.skjs || ' ' }}
-                      </div>
-                    </template> -->
                     <template #title>
+                      <span v-if="ktangInfo && route.query.ktId">
+                        <span class="" style="border-radius: 5px;">
+                          {{ ktangInfo.kcmc || ' ' }}
+                        </span>
+                        <!-- <span style="margin-left: 10px;background: #1c84c6;color: #fff;padding: 3px;border-radius: 5px;font-size: 12px;" @click="() => tingKeZuJiAddModal.view({ ketangbiaoid: route.query.ktId })">填写评价表</span> -->
+                        <div style="font-size: .5rem;">
+                          {{ ktangInfo.zc || ' ' }}-{{ ktangInfo.skjs || ' ' }}
+                        </div>
+                      </span>
+                      <span v-else>
+                        当前无课
+                      </span>
+                    </template>
+                    <!-- <template #title>
                       <span class="" style="border-radius: 5px;">
                         {{ ((tableData[0])?.xq) || '' }}
                       </span>
-                    </template>
+                    </template> -->
                     <div style="padding: 1rem;">
-                      <!-- <div >{{ mainVideoCardBoxTitle || '' }}</div> -->
+                      <div >{{ mainVideoCardBoxTitle || '' }}</div>
                       <bVideo ref="mainVideo" videoId="mainVideo" :videoOption="{ autoplay: true }" @load-end="mainVideoLoadEnd"/>
                       <!-- <div style="width: 100%;margin-top:10px;">
                         <a-textarea style="width: calc(100% - 7rem);height:120px;float: left;" v-model:value="model.notes" placeholder="您可以填写听课笔记"></a-textarea>
@@ -152,7 +157,7 @@ onMounted(() => {
       })
     });
     //getSuibi();
-    //getKcxx();
+    getKcxx();
     isError.value = true;
   }else{
     isError.value = false;
@@ -232,6 +237,11 @@ function getSuibi(){
 function getKcxx(){
   //查询课程信息
   //route.query.ktId
+  if(!route.query.ktId){
+    ktangInfo.value = {};
+    kcCardBoxTitle.value = '当前无课';
+    return;
+  }
   let param = {
     id: route.query.ktId
   }