From 454511a44805acb1077a148e52e4f46352d5f16d Mon Sep 17 00:00:00 2001
From: zhangsir <z1823137@163.com>
Date: Fri, 11 Oct 2024 11:15:13 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E9=9D=A2=E6=8E=88=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=E5=88=97=E8=A1=A8=E5=85=88=E7=BD=AE=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/courselibrary/CoursewareManage.vue | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index 5a2bcea8..7f736a10 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -3557,6 +3557,7 @@ function onFocusEnd(){
     // };
     // 渲染开课操作
     const getTableDate3 = async (type) => {
+      state.tableData6 = []
       state.tableLoading = true;
       state.tableCoursePlanLoading = true
       // let datas = state.tableData6;
@@ -3586,7 +3587,21 @@ function onFocusEnd(){
         offcourseId: state.offcourseId,
       };
       console.log("获取开obj", obj, state.selectTime);
-      let res = await planList(obj);
+      let res = null
+      await planList(obj).then(rs=>{
+        res = rs
+      }).catch(err=>{
+        message.error(err.message=='timeout of 15000ms exceeded'?'系统超时，请稍后再试':err.data.msg)
+        state.tableCoursePlanLoading = false
+        res ={ 
+          data:{data:{
+          "pageNo": "1",
+          "pageSize": "10",
+          "total": "0",
+          "pages": "0",
+          "rows": []
+        }}}
+      })
       state.tableLoading = false;
       console.log("开课res", res);
       const { rows, total, pageNo } = res.data.data;

From a529fd8b3bd88610f3d98e064edbfdab07aa32db Mon Sep 17 00:00:00 2001
From: zhangsir <z1823137@163.com>
Date: Mon, 14 Oct 2024 10:11:39 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E9=9D=A2=E6=8E=88=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E6=97=B6=E5=AE=9A=E4=BD=8D=E5=88=B0=E7=AC=AC=E4=B8=80=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/courselibrary/CoursewareManage.vue | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index 7f736a10..1b68f3ec 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -3229,6 +3229,7 @@ function onFocusEnd(){
       getTableDate();
     };
     const handleSearch1 = () => {
+      state.currentPage1 = 1;
       getTableDate();
     };
     const handleRest1 = () => {
@@ -3238,6 +3239,7 @@ function onFocusEnd(){
       state.auditStatus = null;
       state.sysTypeId = null;
       state.projectTime = "";
+      state.currentPage1 = 1;
       getTableDate();
     };
 
@@ -4806,9 +4808,10 @@ function onFocusEnd(){
       console.log(state.kk_inputV1);
       console.log(state.kk_inputV2);
       console.log(state.selectTime);
-      state.pageSize222 = 10
-      state.currentPage1 = 1
-      getTableDate();
+      // state.pageSize222 = 10
+      // state.currentPage1 = 1
+      // getTableDate();
+      state.currentPage2 = 1;
       getTableDate3();
     };
     const handleRestTable = () => {
@@ -4817,9 +4820,9 @@ function onFocusEnd(){
       state.selectTime = "";
       state.currentPage2 = 1;
       state.tableDataTotal2 = [];
-      state.pageSize222 = 10
-      state.currentPage1 = 1
-      getTableDate();
+      // state.pageSize222 = 10
+      // state.currentPage1 = 1
+      // getTableDate();
       getTableDate3();
     };
 

From feac9214a7e7b37d589605c7a153afae35f17593 Mon Sep 17 00:00:00 2001
From: zhangsir <z1823137@163.com>
Date: Mon, 14 Oct 2024 16:42:08 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E9=9D=A2=E6=8E=88=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=B9=9F=E5=81=9A=E5=BC=82=E5=B8=B8=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/courselibrary/CoursewareManage.vue | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index 1b68f3ec..f93ebafe 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -3201,7 +3201,7 @@ function onFocusEnd(){
           "Y-M-D"
         );
       }
-      let res = await list({
+      await list({
         pageNo: state.currentPage1,
         pageSize: state.pageSize1,
         auditStatus: state.auditStatus,
@@ -3212,11 +3212,17 @@ function onFocusEnd(){
         createName: state.createName,
         endTime: endTime,
         beginTime: startTime,
-      });
-      const { rows, total } = res.data.data;
-      state.tableData1 = rows;
-      state.tableDataTotal1 = total;
-      state.tableLoading = false;
+      }).then(res=>{
+        const { rows, total } = res.data.data;
+        state.tableData1 = rows;
+        state.tableDataTotal1 = total;
+        state.tableLoading = false;
+      }).catch(err=>{
+        state.tableData1 = [];
+        state.tableLoading = false;
+        state.tableDataTotal1 = 0;
+        message.error(err.message=='timeout of 15000ms exceeded'?'系统超时，请稍后再试':err.data.msg)
+      })
       // itm.pageNo = pageNo;
       // itm.contentTxt = findClassFullName(sysTypeOptions.value, itm.sysTypeId) || "-";
       console.log("state.tableData1", state.tableData1);