From 4084fe5a0c3d504b33ddc869ebe8abd89992accb Mon Sep 17 00:00:00 2001
From: bai <1643359946@qq.com>
Date: Mon, 23 Oct 2023 14:39:46 +0800
Subject: [PATCH] =?UTF-8?q?2023=E5=B9=B410=E6=9C=8823=E6=97=A5=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E6=99=BA=E6=85=A7=E6=95=99=E5=AE=A4=E5=B7=B2=E7=9F=A5?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/kc/jiaoshi/index.vue | 80 ++++++++++++++++++++--------------
 1 file changed, 48 insertions(+), 32 deletions(-)

diff --git a/src/views/kc/jiaoshi/index.vue b/src/views/kc/jiaoshi/index.vue
index 285eed1..bcd5315 100644
--- a/src/views/kc/jiaoshi/index.vue
+++ b/src/views/kc/jiaoshi/index.vue
@@ -17,7 +17,7 @@
                 </div>
               </a-col>
               <a-col :xs="{ span: 8 }" :sm="{ span: 8 }" :lg="{ span: 8 }">
-                <div class="numberBlob handleCss" @click="() => queryParam = {}">
+                <div class="numberBlob handleCss" @click="() => (queryParam = {},queryParam.sfyx = '0')">
                   <div class="numSpan blue">{{ leftList.length }}</div>
                   <div class="numberName">
                     <!-- <RiseOutlined class="orange"/> -->
@@ -26,7 +26,7 @@
                 </div>
               </a-col>
               <a-col :xs="{ span: 8 }" :sm="{ span: 8 }" :lg="{ span: 8 }">
-                <div class="numberBlob handleCss">
+                <div class="numberBlob handleCss" @click="() => (queryParam = {},queryParam.onLineClassType = 'red')">
                   <div class="numSpan orange" style="font-size: 24px;height: 50px;line-height: 50px;">未检测</div>
                   <div class="numberName">
                     <!-- <RiseOutlined class="orange"/> -->
@@ -44,7 +44,7 @@
             <!-- -<i class="fa-sharp fa-solid fa-user"></i>- -->
             <a-row class="" :gutter="[16,16]">
               <a-col :xs="{ span: 6 }" :sm="{ span: 6 }" :lg="{ span: 6 }">
-                <div class="numberBlob handleCss" @click="() => queryParam = {}">
+                <div class="numberBlob handleCss" @click="() => (queryParam = {},queryParam.nowIsClass = true)">
                   <div class="numSpan">{{ (leftList.filter(x => x?.nowIsClass).length || 0) }}</div>
                   <div class="numberName">
                     <!-- <StockOutlined class="blue"/> -->
@@ -53,7 +53,7 @@
                 </div>
               </a-col>
               <a-col :xs="{ span: 6 }" :sm="{ span: 6 }" :lg="{ span: 6 }">
-                <div class="numberBlob handleCss">
+                <div class="numberBlob handleCss" @click="() => (queryParam = {},queryParam.sfyx2 = '0')">
                   <div class="numSpan orange" style="font-size: 24px;height: 50px;line-height: 50px;">{{ getSysConfig().flag5 == 0?'否':'是' }}</div>
                   <div class="numberName">
                     <!-- <RiseOutlined class="orange"/> -->
@@ -62,7 +62,7 @@
                 </div>
               </a-col>
               <a-col :xs="{ span: 6 }" :sm="{ span: 6 }" :lg="{ span: 6 }">
-                <div class="numberBlob handleCss" @click="() => queryParam = {}">
+                <div class="numberBlob handleCss" @click="() => (queryParam = {},queryParam.onLineClassType = 'green')">
                   <div class="numSpan blue">{{ (leftList.filter(x => x?.child['教师近景']?.isOnLine).length || 0) }}</div>
                   <div class="numberName">
                     <!-- <RiseOutlined class="orange"/> -->
@@ -71,7 +71,7 @@
                 </div>
               </a-col>
               <a-col :xs="{ span: 6 }" :sm="{ span: 6 }" :lg="{ span: 6 }">
-                <div class="numberBlob handleCss">
+                <div class="numberBlob handleCss" @click="() => (queryParam = {},queryParam.onLineClassType = 'red')">
                   <div class="numSpan orange">{{ (leftList.filter(x => !x?.child['教师近景']?.isOnLine).length || 0) }}</div>
                   <div class="numberName">
                     <!-- <RiseOutlined class="orange"/> -->
@@ -131,8 +131,8 @@
             <a-form-item label="直播功能">
               <a-select placeholder="请选择直播功能" v-model:value="queryParam.sfyx">
                 <a-select-option :value="undefined">请选择</a-select-option>
-                <a-select-option value="1">是</a-select-option>
-                <a-select-option value="0">否</a-select-option>
+                <a-select-option value="0">是</a-select-option>
+                <a-select-option value="1">否</a-select-option>
               </a-select>
             </a-form-item>
           </a-col>
@@ -140,8 +140,8 @@
             <a-form-item label="开放听课">
               <a-select placeholder="请选择开放听课" v-model:value="queryParam.sfyx2">
                 <a-select-option :value="undefined">请选择</a-select-option>
-                <a-select-option value="1">是</a-select-option>
-                <a-select-option value="0">否</a-select-option>
+                <a-select-option value="0">是</a-select-option>
+                <a-select-option value="1">否</a-select-option>
               </a-select>
             </a-form-item>
           </a-col>
@@ -159,8 +159,8 @@
             <a-form-item label="当前有课">
               <a-select placeholder="请选择当前有课" v-model:value="queryParam.nowIsClass">
                 <a-select-option :value="undefined">请选择</a-select-option>
-                <a-select-option :value="1">是</a-select-option>
-                <a-select-option :value="0">否</a-select-option>
+                <a-select-option :value="true">是</a-select-option>
+                <a-select-option :value="false">否</a-select-option>
               </a-select>
             </a-form-item>
           </a-col>
@@ -168,8 +168,8 @@
             <a-form-item label="下节有课">
               <a-select placeholder="请选择下节有课" v-model:value="queryParam.nextIsClass">
                 <a-select-option :value="undefined">请选择</a-select-option>
-                <a-select-option :value="1">是</a-select-option>
-                <a-select-option :value="0">否</a-select-option>
+                <a-select-option :value="true">是</a-select-option>
+                <a-select-option :value="false">否</a-select-option>
               </a-select>
             </a-form-item>
           </a-col>
@@ -193,7 +193,7 @@
     </div>
 
     <a-table v-show="true" :loading="loading" :data-source="filterComputedDataSource" :pagination="false" bordered size="middle" class="ant-table-striped" :scroll="{ y: 650 }">
-      <a-table-column title="序号" align="center" data-index="index">
+      <a-table-column width="70px" title="序号" align="center" data-index="index">
         <template #default="{ index }">
           {{ index+1 }}
         </template>
@@ -225,12 +225,12 @@
       </a-table-column>
       <a-table-column title="当前有课" align="center" data-index="nowIsClass">
         <template #default="{ record }">
-          {{ record?.nowIsClass == 0?'是':'否' }}
+          {{ record?.nowIsClass?'是':'否' }}
         </template>
       </a-table-column>
       <a-table-column title="下节有课" align="center" data-index="nextIsClass">
         <template #default="{ record }">
-          {{ record?.nextIsClass == 0?'是':'否' }}
+          {{ record?.nextIsClass?'是':'否' }}
         </template>
       </a-table-column>
       <a-table-column title="备注" data-index="bfStatusInfo"/>
@@ -279,10 +279,11 @@
         </a-table-column> -->
 
         <!-- <a-table-column title="数量" data-index="allIsOnLine"/> -->
-        <a-table-column width="200px" title="操作" data-index="action">
+        <a-table-column width="210px" title="操作" data-index="action">
           <template #default="{ record }">
-            <a :disabled="record.allIsOnLine == 0 " @click="ylLiveNew(record)" >预览 |</a>
-            <a @click="ylLive(record)" hidden>预览 |</a>
+            <a-button type="link" :disabled="record.allIsOnLine == 0" @click="ylLiveNew(record)">预览 |</a-button>
+            <!-- <a v-if="record.allIsOnLine == 0" :disabled="true" @click="ylLiveNew(record)" >预览 |</a>
+            <a v-else @click="ylLiveNew(record)" >预览 |</a> -->
             <a v-if="!record?.child['教师全景']?.isOnLine" @click="changeLive(record,true)">开启直播 |</a>
             <a v-else @click="changeLive(record,false)">关闭直播 |</a>
             <a v-if="record.sfyx == 1" @click="changeKt(record,true)">开放听课</a>
@@ -494,14 +495,18 @@ function getIsOnLineClass(record){
   record.allIsOnLine = allIsOnLine;
   let bfStatusInfo = '';
   record.bfStatusInfo = bfStatusInfo;
+  let bfStatusInfoList:any = [];
   if(!record?.child['教师近景']?.isOnLine){
-    bfStatusInfo = '教师近景没有信号';
-  }else if(!record?.child['教师全景']?.isOnLine){
-    bfStatusInfo = '教师全景没有信号';
-  }else if(!record?.child['学生全景']?.isOnLine){
-    bfStatusInfo = '学生全景没有信号';
-  }else if(!record?.child['PPT']?.isOnLine){
-    bfStatusInfo = 'PPT没有信号';
+    bfStatusInfoList.push('教师近景没有信号');
+  }
+  if(!record?.child['教师全景']?.isOnLine){
+    bfStatusInfoList.push('教师全景没有信号');
+  }
+  if(!record?.child['学生全景']?.isOnLine){
+    bfStatusInfoList.push('学生全景没有信号');
+  }
+  if(!record?.child['PPT']?.isOnLine){
+    bfStatusInfoList.push('PPT没有信号');
   }
   if(allIsOnLine == 4){
     resClas = 'green';
@@ -509,7 +514,7 @@ function getIsOnLineClass(record){
     resClas = 'red';
   }else{
     resClas = 'yellow';
-    record.bfStatusInfo = bfStatusInfo;
+    record.bfStatusInfo = bfStatusInfoList.join(',');
   }
   record.onLineClassType = resClas;
   return resClas;
@@ -605,6 +610,9 @@ function filterDataSource() {
   let list = cardList.value[currentCardIndex.value]?.child??[];
   let qw = queryParam.value;
 
+  console.log('->',qw, qw.nowIsClass);
+
+
   list.forEach(x => {
     let isReturn = true;
     if(qw.jxlName){
@@ -622,11 +630,19 @@ function filterDataSource() {
     if(qw.onLineClassType){
       isReturn = x.onLineClassType == qw.onLineClassType;
     }
-    if(qw.nowIsClass){
-      isReturn = x.nowIsClass == qw.nowIsClass;
+    if(qw.nowIsClass != undefined){
+      if(qw.nowIsClass == true){
+        isReturn = x.nowIsClass == true;
+      }else{
+        isReturn = x.nowIsClass == false || x.nowIsClass == undefined || x.nowIsClass == null;
+      }
     }
-    if(qw.nextIsClass){
-      isReturn = x.nextIsClass == qw.nextIsClass;
+    if(qw.nextIsClass != undefined){
+      if(qw.nextIsClass == true){
+        isReturn = x.nextIsClass == true;
+      }else{
+        isReturn = x.nextIsClass == false || x.nextIsClass == undefined || x.nextIsClass == null;
+      }
     }
     if(isReturn){
       dataSource.push(x);