Merge branch 'zcwy_0712_bug' into dev_master

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);
@@ -3229,6 +3235,7 @@ function onFocusEnd(){
       getTableDate();
     };
     const handleSearch1 = () => {
+      state.currentPage1 = 1;
       getTableDate();
     };
     const handleRest1 = () => {
@@ -3238,6 +3245,7 @@ function onFocusEnd(){
       state.auditStatus = null;
       state.sysTypeId = null;
       state.projectTime = "";
+      state.currentPage1 = 1;
       getTableDate();
     };
 
@@ -3557,6 +3565,7 @@ function onFocusEnd(){
     // };
     // 渲染开课操作
     const getTableDate3 = async (type) => {
+      state.tableData6 = []
       state.tableLoading = true;
       state.tableCoursePlanLoading = true
       // let datas = state.tableData6;
@@ -3586,7 +3595,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;
@@ -4791,9 +4814,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 = () => {
@@ -4802,9 +4826,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();
     };