From 7187158a71e960113991b0ddcc545c50c9cae28a Mon Sep 17 00:00:00 2001
From: bai <1643359946@qq.com>
Date: Sun, 7 Jan 2024 20:41:22 +0800
Subject: [PATCH] =?UTF-8?q?2024=E5=B9=B41=E6=9C=887=E6=97=A5=20=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E5=85=B6=E4=BB=96=E6=95=99=E5=AE=A4=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/http/axios/index.ts  | 14 +++++++-------
 src/views/kc/jiaoshi/index.vue |  9 +++++++--
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/utils/http/axios/index.ts b/src/utils/http/axios/index.ts
index 284bb91..23fc682 100644
--- a/src/utils/http/axios/index.ts
+++ b/src/utils/http/axios/index.ts
@@ -71,13 +71,13 @@ export const transform: AxiosTransform = {
     // 如果不希望中断当前请求，请return数据，否则直接抛出异常即可
     let timeoutMsg = '';
     switch (code) {
-      case ResultEnum.TIMEOUT:
-        timeoutMsg = t('sys.api.timeoutMessage');
-        //请求超时，不再退出登录。
-        // const userStore = useUserStoreWithOut();
-        // userStore.setToken(undefined);
-        // userStore.logout(true);
-        break;
+      // case ResultEnum.TIMEOUT:
+      //   timeoutMsg = t('sys.api.timeoutMessage');
+      //   //请求超时，不再退出登录。
+      //   // const userStore = useUserStoreWithOut();
+      //   // userStore.setToken(undefined);
+      //   // userStore.logout(true);
+      //   break;
       default:
         if (message) {
           timeoutMsg = message;
diff --git a/src/views/kc/jiaoshi/index.vue b/src/views/kc/jiaoshi/index.vue
index a764433..28dd51e 100644
--- a/src/views/kc/jiaoshi/index.vue
+++ b/src/views/kc/jiaoshi/index.vue
@@ -672,7 +672,7 @@ function loadData(){
     })
   }
 
-  list({ pageSize: -1, changshang: '奥威亚',...queryParam.value }).then(res => {
+  list({ pageSize: -1, changshang: '奥威亚', queryNoZhiHuiJiaoShi: true, ...queryParam.value }).then(res => {
     let list = (res?.records) ?? [];
     //聚合
     let map = {};
@@ -681,6 +681,9 @@ function loadData(){
       // x.nowIsClass = true //debug
 
       x.zbgn = 0;
+      if(!x.xm){
+        x.zbgn = 1;
+      }
       let item = map[x.jsmc];
       x.isOnLine = false;
       if(item){
@@ -735,7 +738,9 @@ function loadData(){
         Object.values(child).forEach(item => {
           let x:any = item;
           // if(x.pullUrl == 'https://kczx.nenu.edu.cn:9553/live_hls/yfjxl101s_lbzj.m3u8')
-          getListAction.push(liveIsExist(x));
+          if(x.pullUrl){
+            getListAction.push(liveIsExist(x));
+          }
         });
       });
       Promise.all(getListAction).then(resList => {