From 54474ccbb5706bcaaf51115baf719d0ba93a71f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Thu, 2 Jan 2020 10:12:36 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../courses/busyWork/CommonWorkList.js        | 40 +++++++++++--------
 1 file changed, 23 insertions(+), 17 deletions(-)

diff --git a/public/react/src/modules/courses/busyWork/CommonWorkList.js b/public/react/src/modules/courses/busyWork/CommonWorkList.js
index d60f68b22..35b2a1ee8 100644
--- a/public/react/src/modules/courses/busyWork/CommonWorkList.js
+++ b/public/react/src/modules/courses/busyWork/CommonWorkList.js
@@ -403,7 +403,8 @@ class CommonWorkList extends Component{
       left_time: {},
       category: {},
 			b_order: 'desc',
-      searchtypes:false
+      searchtypes:false,
+      loadingstate:false
     }
   }
   onTablePagination = (page) => {
@@ -420,9 +421,11 @@ class CommonWorkList extends Component{
       })
     }else{
       this.setState({
-        searchtypes:true
+        searchtypes:true,
+        loadingstate:true
       })
     }
+
     this.fetchList()
   }
   onSearchValueInput = (e) => {
@@ -482,7 +485,8 @@ class CommonWorkList extends Component{
       if (response.data) {
         this.setState({
 					...response.data,
-					isSpin:false
+					isSpin:false,
+          loadingstate:false
         })
 
         this.props.initWorkDetailCommonState && this.props.initWorkDetailCommonState( Object.assign({...response.data}, {
@@ -492,7 +496,8 @@ class CommonWorkList extends Component{
      }).catch((error)=>{
        console.log(error)
 			this.setState({
-				isSpin:false
+				isSpin:false,
+        loadingstate:false
 			})
      })
 
@@ -850,9 +855,9 @@ class CommonWorkList extends Component{
 
             <div className={"justify break_full_word new_li edu-back-white course_table_wrap"} style={{minHeight:"480px", marginBottom: '30px'}}>
               <style>{`
-              .ant-spin-nested-loading > div > .ant-spin .ant-spin-dot {
-                          top: 72%;}
-                }
+              // .ant-spin-nested-loading > div > .ant-spin .ant-spin-dot {
+              //             top: 72%;}
+              //   }
               .singleLine tr.ant-table-row {
                 background: #f1f9ff;
               }
@@ -875,16 +880,17 @@ class CommonWorkList extends Component{
 								</Spin>
 								:
               <React.Fragment>
-
-								<Table
-								className="stageTable"
-								dataSource={student_works}
-								columns={columns}
-								showQuickJumper
-								pagination={false}
-								onChange={this.table1handleChange}
-								loading={loadingstate}
-              />
+                <Spin tip="正在加载..." spinning={loadingstate}>
+                  <Table
+                  className="stageTable"
+                  dataSource={student_works}
+                  columns={columns}
+                  showQuickJumper
+                  pagination={false}
+                  onChange={this.table1handleChange}
+                  // loading={loadingstate}
+                  />
+                </Spin>
               </React.Fragment>
 
               }