From dee7e226bea21805e4ed352809a91e363b387e82 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Thu, 22 Aug 2019 18:23:06 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=BE=E5=A0=82=E5=90=84=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E7=9A=84=E7=82=B9=E5=87=BB=E4=BA=8B=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/config/webpack.config.dev.js     |  3 +-
 .../courses/exercise/ExerciseListItem.js      |  8 ++---
 .../graduation/tasks/GraduateTaskItem.js      | 15 ++++-----
 .../modules/courses/graduation/tasks/index.js |  3 +-
 .../graduation/topics/GraduateTopicItem.js    |  4 +--
 .../members/modal/CreateGroupByImportModal.js | 32 +++++++------------
 .../src/modules/courses/poll/PollListItem.js  |  6 ++--
 7 files changed, 30 insertions(+), 41 deletions(-)

diff --git a/public/react/config/webpack.config.dev.js b/public/react/config/webpack.config.dev.js
index 510bcaa4f..f126bc363 100644
--- a/public/react/config/webpack.config.dev.js
+++ b/public/react/config/webpack.config.dev.js
@@ -30,7 +30,8 @@ module.exports = {
   // You may want 'eval' instead if you prefer to see the compiled output in DevTools.
   // See the discussion in https://github.com/facebookincubator/create-react-app/issues/343.s
 	// devtool: "cheap-module-eval-source-map",
-	// 开启调试
+  // 开启调试
+  devtool: "source-map",  // 开启调试
   // These are the "entry points" to our application.
   // This means they will be the "root" imports that are included in JS bundle.
   // The first two entry points enable "hot" CSS and auto-refreshes for JS.
diff --git a/public/react/src/modules/courses/exercise/ExerciseListItem.js b/public/react/src/modules/courses/exercise/ExerciseListItem.js
index e890b92ef..639f5bdc8 100644
--- a/public/react/src/modules/courses/exercise/ExerciseListItem.js
+++ b/public/react/src/modules/courses/exercise/ExerciseListItem.js
@@ -52,17 +52,17 @@ class ExerciseListItem extends Component{
 			})
 	  }
     render(){
-        let{item,checkBox}=this.props;
+        let{item,checkBox,key}=this.props;
         let {coursesId,Id}=this.props.match.params
         const IsAdmin =this.props.isAdmin();
         const IsStudent =this.props.isStudent();
 
         // console.log(this.props.current_user.user_id)
         return(
-            <div className="workList_Item" style={{padding:"30px"}}>
+            <div className="workList_Item" style={{cursor : IsAdmin ? "pointer" : "default",padding:"30px" }} onClick={() => window.$(`.exerciseitem${key} input`).click() }>
                 {
-                    IsAdmin &&
-                    <span className="fl mr12">
+                  IsAdmin &&
+                  <span className={`exerciseitem${key} fl mr12`}>
 										{checkBox}
 									</span>
                 }
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js b/public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js
index d30944ef0..92a4832db 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js
@@ -151,16 +151,12 @@ class GraduateTaskItem extends Component{
       coursesId,
       categoryid,
       taskid,
-
+      index,
+      isAdmin
     } = this.props;
 
-      // console.log(discussMessage)
-
-
-
-
     return(
-        <div className="graduateTopicList boardsList">
+        <div className="graduateTopicList boardsList" style={{cursor : isAdmin ? "pointer" : "default" }} onClick={() => window.$(`.taskitem${index} input`).click() }>
           <Modals
             modalsType={Modalstype}
             modalsTopval={Modalstopval}
@@ -193,8 +189,9 @@ class GraduateTaskItem extends Component{
               margin-right: 15px;
             }
           `}</style>
-          { checkBox }
-
+          <span className={`taskitem${index} fl`} style={{"height":"59px"}}>
+            { checkBox }
+          </span>
           {/*
           style={{borderTop:data===undefined?"":data.course_identity<4?'1px solid #EBEBEB':'1px solid transparent'}}
             */}
diff --git a/public/react/src/modules/courses/graduation/tasks/index.js b/public/react/src/modules/courses/graduation/tasks/index.js
index f405f69c9..1610ff772 100644
--- a/public/react/src/modules/courses/graduation/tasks/index.js
+++ b/public/react/src/modules/courses/graduation/tasks/index.js
@@ -731,7 +731,7 @@ class GraduationTasks extends Component{
               { tasks.map((item, index) => {
                 // console.log(item)
                 return (
-                  <div className="mt20 edu-back-white padding02010" key={index}>
+                  <div className="mt20 edu-back-white pt10 pl30 pr30" key={index}>
                     <div className="clearfix">
                     <GraduateTaskItem
                       discussMessage={item}
@@ -748,6 +748,7 @@ class GraduationTasks extends Component{
                       coursesId={this.props.match.params.coursesId}
                       categoryid={this.props.match.params.Id}
                       workid={item.work_id}
+                      index={index}
                     ></GraduateTaskItem>
                   </div>
                  </div>
diff --git a/public/react/src/modules/courses/graduation/topics/GraduateTopicItem.js b/public/react/src/modules/courses/graduation/topics/GraduateTopicItem.js
index 9f61e69d4..bac04c699 100644
--- a/public/react/src/modules/courses/graduation/topics/GraduateTopicItem.js
+++ b/public/react/src/modules/courses/graduation/topics/GraduateTopicItem.js
@@ -47,7 +47,7 @@ class GraduateTopicItem extends Component{
           }
         </style>
 
-        <div className="graduateTopicList boardsList mb20">
+        <div className="graduateTopicList boardsList mb20" style={{cursor : isAdmin ? "pointer" : "default" }} onClick={() => window.$(`.topicItem${index} input`).click() }>
           <style>{`
             
             .graduateTopicList .ant-checkbox-input {s
@@ -58,7 +58,7 @@ class GraduateTopicItem extends Component{
                   padding: 17px 30px 20px!important;
               }
           `}</style>
-          { isAdmin ? checkBox : ""}
+          { isAdmin ? <span className={`topicItem${index} fl`} style={{"height":"64px"}}>{checkBox}</span> : ""}
           <div className="clearfix ds pr flex1">
 						<style>{`
             .maxwidth580{
diff --git a/public/react/src/modules/courses/members/modal/CreateGroupByImportModal.js b/public/react/src/modules/courses/members/modal/CreateGroupByImportModal.js
index fe2a88dce..d5e77da9d 100644
--- a/public/react/src/modules/courses/members/modal/CreateGroupByImportModal.js
+++ b/public/react/src/modules/courses/members/modal/CreateGroupByImportModal.js
@@ -112,12 +112,13 @@ class CreateGroupByImportModal extends Component{
 
   render(){
     const { candidates, checkBoxValues, loading, hasMore, name, school_name, school_names
-        , graduationGroup, graduation_groups, courseGroup, course_groups } = this.state
+        , graduationGroup, graduation_groups, courseGroup, course_groups , fileList } = this.state
     const { moduleName } = this.props
     
     const props = {
         name: 'file',
         multiple: true,
+        fileList:fileList,
         action: getUploadActionUrl(),
         onRemove: this.onAttachmentRemove,
         onChange: this.handleChange
@@ -131,26 +132,15 @@ class CreateGroupByImportModal extends Component{
         onOk={this.onOk}
         className="createGroupByImport"
       >
-      
-        <style>
-        {`
-        
-        `}
-        </style>
-        <div className="df">
-
-        
-        
-        </div>
-        <Dragger {...props}>
-            <p className="ant-upload-drag-icon">
-                <Icon type="inbox" />
-            </p>
-            <p className="ant-upload-text">点击或拖拽文件到这里上传</p>
-            <p className="ant-upload-hint">
-                单个文件最大150MB
-            </p>
-        </Dragger>
+      <Dragger {...props}>
+        <p className="ant-upload-drag-icon">
+          <Icon type="inbox" />
+        </p>
+        <p className="ant-upload-text">点击或拖拽文件到这里上传</p>
+        <p className="ant-upload-hint">
+          单个文件最大150MB
+        </p>
+      </Dragger>
       </ModalWrapper>
     )
   }
diff --git a/public/react/src/modules/courses/poll/PollListItem.js b/public/react/src/modules/courses/poll/PollListItem.js
index 50c471e76..368fda32b 100644
--- a/public/react/src/modules/courses/poll/PollListItem.js
+++ b/public/react/src/modules/courses/poll/PollListItem.js
@@ -16,7 +16,7 @@ class PollListItem extends Component{
     super(props);
   }
   render(){
-    let{item,checkBox,courseType}=this.props;
+    let{item,checkBox,courseType,key}=this.props;
     let {coursesId}=this.props.match.params;
     
     const IsAdmin =this.props.isAdmin();
@@ -28,10 +28,10 @@ class PollListItem extends Component{
     let canNotLink = !isAdminOrStudent && item.lock_status == 0
     return(
 
-      <div className="workList_Item polllisthover" style={{padding:"30px"}}>
+      <div className="workList_Item polllisthover" style={{cursor : IsAdmin ? "pointer" : "default",padding:"30px" }} onClick={() => window.$(`.pollitem${key} input`).click() }>
         {
           IsAdmin && 
-          <span className="fl mr12">
+          <span className={`pollitem${key} fl mr12`}>
             {checkBox}
           </span>
         }