From bcf6dc6e050fd3ab289fe2bc16ec76a0874ce9cd Mon Sep 17 00:00:00 2001
From: bai <1643359946@qq.com>
Date: Mon, 23 Oct 2023 21:37:58 +0800
Subject: [PATCH] =?UTF-8?q?2023=E5=B9=B410=E6=9C=8823=E6=97=A5=20=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E6=99=BA=E6=85=A7=E6=95=99=E5=AE=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/kc/jiaoshi/index.vue | 38 ++++++++++++++++------------------
 1 file changed, 18 insertions(+), 20 deletions(-)

diff --git a/src/views/kc/jiaoshi/index.vue b/src/views/kc/jiaoshi/index.vue
index bcd5315..e4ac29a 100644
--- a/src/views/kc/jiaoshi/index.vue
+++ b/src/views/kc/jiaoshi/index.vue
@@ -90,7 +90,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" :class="currentCardIndex == index?'active':''">
+          <a-card bordered hoverable @click="() => (currentCardIndex = index,searchReset())" :class="currentCardIndex == index?'active':''">
             <div style="font-size: 15px;font-weight: 600;margin-bottom: 10px;">{{ item.jxlName }}</div>
             <a-row style="margin-bottom: 10px;text-align: center;border-bottom: 1px #f0f0f0 solid ;padding-bottom: 10px;">
               <a-col :span="8" style="font-weight: 600;">{{ item.jsNum }}</a-col>
@@ -173,11 +173,11 @@
               </a-select>
             </a-form-item>
           </a-col>
-          <!-- <a-col :xl="6" :lg="7" :md="8" :sm="24">
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
-              <a-col :lg="6"> -->
-                <!-- <a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
-                <a-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset" style="margin-left: 8px">重置</a-button> -->
+              <a-col :lg="6">
+                <a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
+                <a-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset" style="margin-left: 8px">重置</a-button>
 
                 <!-- <a-button type="primary" preIcon="ant-design:check-square-outlined" @click="closeQuartz" v-if="shangXianQuartz.status == 0" style="margin-left: 8px">停止自动调整教室</a-button> -->
                 <!-- 永远开启 <a-button type="primary" preIcon="ant-design:border-outlined" @click="openQuartz" v-if="shangXianQuartz.status == -1" style="margin-left: 8px">开启自动调整教室</a-button> -->
@@ -185,9 +185,9 @@
                   {{ toggleSearchStatus ? '收起' : '展开' }}
                   <Icon :icon="toggleSearchStatus ? 'ant-design:up-outlined' : 'ant-design:down-outlined'" />
                 </a>-->
-              <!-- </a-col>
+              </a-col>
             </span>
-          </a-col> -->
+          </a-col>
         </a-row>
       </a-form>
     </div>
@@ -235,13 +235,6 @@
       </a-table-column>
       <a-table-column title="备注" data-index="bfStatusInfo"/>
 
-
-<!-- 9.相关操作
-  A）预览（绿灯、黄灯可预览，红灯按钮变灰不可预览）
-  b)开启直播/关闭直播
-  c)开放听课/关闭听课
-10.备注（显示黄灯原因，如：ppt没有信号） -->
-
         <!-- <a-table-column title="教师近景" align="center" data-index="child_教师近景">
           <template #default="{ record }">
             <span :class="record?.child['教师近景']?.isOnLine?'green':'red'">
@@ -333,9 +326,11 @@ onMounted(() => {
   loadData();
 });
 
-const filterComputedDataSource = computed(() => {
-  return filterDataSource();
-});
+const filterComputedDataSource:Ref<any> = ref([]);
+
+// const filterComputedDataSource = computed(() => {
+//   return filterDataSource();
+// });
 
 enum Api {
   list = '/jiaoshi/kcZhihuijiaoshi/list',
@@ -443,6 +438,7 @@ function loadData(){
         }
       });
       cardList.value = Object.values(jxlMap);
+      filterComputedDataSource.value = filterDataSource();
     }
 
 
@@ -558,7 +554,7 @@ function changeLive(record, isEnable){
         if(x.resText.includes('ok')){
           text = (isEnable?'开启':'关闭')+'直播-操作成功!'
         }else{
-          text = (isEnable?'开启':'关闭')+'直播-操作失败:' + x.resText
+          text = (isEnable?'开启':'关闭')+'直播-操作失败: 录播主机故障，请联系管理员。'
         }
       }
       content += "  " + text + "<br/>"
@@ -656,7 +652,8 @@ function filterDataSource() {
  * 查询
  */
 function searchQuery() {
-  loadData();
+  filterComputedDataSource.value = filterDataSource();
+  //loadData();
 }
 
 /**
@@ -665,7 +662,8 @@ function searchQuery() {
 function searchReset() {
   queryParam.value = {};
   //刷新数据
-  loadData();
+  filterComputedDataSource.value = filterDataSource();
+  //loadData();
 }
 
 function getAutoShangXianQuartz(){