From b040e6efb6c9d4ebbaa3a16b628641ac35d2c0bd Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Wed, 26 Jun 2019 09:52:03 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=B0=8F=E6=A0=B7=E5=BC=8F=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../courses/busyWork/CommonWorkAppraise.js    | 61 +++++++++----------
 .../tasks/GraduationTasksappraise.js          | 14 ++---
 .../shixunHomework/ShixunhomeWorkItem.js      | 10 +--
 3 files changed, 42 insertions(+), 43 deletions(-)

diff --git a/public/react/src/modules/courses/busyWork/CommonWorkAppraise.js b/public/react/src/modules/courses/busyWork/CommonWorkAppraise.js
index 77317792e..08832a059 100644
--- a/public/react/src/modules/courses/busyWork/CommonWorkAppraise.js
+++ b/public/react/src/modules/courses/busyWork/CommonWorkAppraise.js
@@ -186,32 +186,32 @@ class CommonWorkAppraise extends Component{
             }
           `}</style>
           <div className={"workAppraise"}>
-          {(description || (attachments && attachments.length != 0)) && <div className={"stud-class-set bor-bottom-greyE edu-back-white"} style={{ padding: '20px 20px 20px 20px'}}>
-            <div className={"color-grey-6 h20 mb20 font-16"}>
+          {(description || (attachments && attachments.length != 0)) && <div className={"stud-class-set edu-back-white padding20-30"}>
+            <div className={"color-grey-6 mb15 font-16"}>
               内容
             </div>
-            <div className={"ml20"} className="markdown-body" dangerouslySetInnerHTML={{__html: markdownToHTML(description)}}>
-            </div>
+            <div className="pl20">
+              <div className={"ml20"} className="markdown-body" dangerouslySetInnerHTML={{__html: markdownToHTML(description)}}>
+              </div>
+              {attachments.map((item,key)=>{
+                return(
+                  <div className="color-grey" key={key}>
+                    <a className="color-grey">
+                      <i className="font-14 color-green iconfont icon-fujian mr8" aria-hidden="true"></i>
+                    </a>
+                    <a href={item.url}
+                        className="mr12 color9B9B" length="58">
+                      {item.title}
+                    </a>
+                    <span className="color656565 mt2 color-grey-6 font-12 mr8">{item.filesize}</span>
+                    {/*{item.delete===true?<i className="font-14 iconfont  icon-guanbi " id={item.id} aria-hidden="true" onClick={()=>this.onAttachmentRemove(item.id)}></i>:""}*/}
+                    {item.delete===true?<i className="font-14 iconfont  icon-guanbi " style={{display: 'none'}} id={item.id} aria-hidden="true" onClick={()=>this.onAttachmentRemove(item.id)}></i>:""}
+                  </div>
+                )
+              })}
+            </div>  
 
-            {attachments.map((item,key)=>{
-              return(
-                <div className="color-grey" key={key}>
-                  <a className="color-grey ml20">
-                    <i className="font-14 color-green iconfont icon-fujian mr8" aria-hidden="true"></i>
-                  </a>
-                  <a href={item.url}
-                      className="mr12 color9B9B" length="58">
-                    {item.title}
-                  </a>
-                  <span className="color656565 mt2 color-grey-6 font-12 mr8">{item.filesize}</span>
-                  {/*{item.delete===true?<i className="font-14 iconfont  icon-guanbi " id={item.id} aria-hidden="true" onClick={()=>this.onAttachmentRemove(item.id)}></i>:""}*/}
-                  {item.delete===true?<i className="font-14 iconfont  icon-guanbi " style={{display: 'none'}} id={item.id} aria-hidden="true" onClick={()=>this.onAttachmentRemove(item.id)}></i>:""}
-                </div>
-              )
-            })}
-          
-
-            <div className={"color-grey-6 h20 ml20"}>
+            <div className={"color-grey-6 clearfix lineh-25 ml20"}>
               { update_time &&
               <React.Fragment>
                 <span className={"color9B9B fr"}>更新</span>
@@ -233,7 +233,7 @@ class CommonWorkAppraise extends Component{
 
           </div> }
 
-          {revise_attachments.length===0?"":<div className={"stud-class-set bor-bottom-greyE pd20 edu-back-white"}>
+          {revise_attachments.length===0?"":<div className={"stud-class-set bor-top-greyE padding20-30 edu-back-white"}>
               <style>{`
                 .color-grey:hover i {
                   display: inline !important;
@@ -261,18 +261,17 @@ class CommonWorkAppraise extends Component{
                   </div>
                 )
               })}
-              <div className={"color-grey-6 h20 ml20"}>
-                <span className={"color9B9B fr mr10"}>更新</span>
+              <div className={"color-grey-6 clearfix lineh-25 ml20"}>
+                <span className={"color9B9B fr"}>更新</span>
                 <span className={"fr font-13 mr10 ml10"}>{atta_update_user}</span>
                 <span className={"color9B9B fr"}>
                   {moment(atta_update_time).format('YYYY-MM-DD HH:mm')==="Invalid date"?"":moment(atta_update_time).format('YYYY-MM-DD HH:mm')}
                 </span>
-
               </div>
             </div>}
 
-            {is_evaluation != true && project_info && project_info.name && <div className={"stud-class-set bor-bottom-greyE edu-back-white"} style={{ padding: '18px 20px 20px 20px'}}>
-              <div className={"color-grey-6 h20 mb20"}>
+            {is_evaluation != true && project_info && project_info.name && <div className={"stud-class-set bor-top-greyE edu-back-white padding20-30"}>
+              <div className={"color-grey-6 mb10"}>
                 关联项目
               </div>
               <div className={"ml20"}>
@@ -281,8 +280,8 @@ class CommonWorkAppraise extends Component{
             </div>
             }
 
-            {is_evaluation != true && work_members && !!work_members.length && <div className={"stud-class-set bor-bottom-greyE edu-back-white"} style={{ padding: '18px 20px 20px 20px'}}>
-              <div className={"color-grey-6 h20 mb20"}>
+            {is_evaluation != true && work_members && !!work_members.length && <div className={"stud-class-set bor-top-greyE edu-back-white padding20-30"}>
+              <div className={"color-grey-6 mb10"}>
                 其他组员
               </div>
               <div className={"ml20"}>
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraise.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraise.js
index ce7822d97..638a09507 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraise.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraise.js
@@ -197,7 +197,7 @@ class GraduationTasksappraise extends Component{
 
               <div className="edu-back-white">
 
-                <div className={"stud-class-set edu-back-white padding20-30 bor-bottom-greyE"}>
+                <div className={"stud-class-set edu-back-white padding20-30"}>
 
                     <div className={"color-grey-6 h20 mb20"}>
                       内容
@@ -231,7 +231,7 @@ class GraduationTasksappraise extends Component{
                   })}
 
 
-                  <div className={"color-grey-6 h20 ml20"}>
+                  <div className={"color-grey-6 lineh-25 clearfix ml20"}>
 
                       {/*<span className={"color9B9B fr"}>更新</span>*/}
                       {/*<span className={"fr font-13 mr10 ml10"}>{datalist&&datalist.update_user_name}</span>*/}
@@ -249,7 +249,7 @@ class GraduationTasksappraise extends Component{
                 </div>
 
                 {firelistdata===undefined?"":firelistdata.length===0?"":firelistdata.revise_attachments.length===0?"":
-                <div className={"stud-class-set bor-bottom-greyE padding20-30 edu-back-white"}>
+                <div className={"stud-class-set bor-top-greyE padding20-30 edu-back-white"}>
                     <div className={"color-grey-6 mb10 "}>
                       补交附件
                     </div>
@@ -278,9 +278,9 @@ class GraduationTasksappraise extends Component{
 
 								  	</div>
 
-                    <div className={"color-grey-6 h20 ml20"}>
+                    <div className={"color-grey-6 lineh-25 clearfix ml20"}>
 
-                      <span className={"color9B9B fr mr10"}>更新</span>
+                      <span className={"color9B9B fr"}>更新</span>
                       <span className={"fr font-13 mr10 ml10"}>{firelistdata&&firelistdata.atta_update_user}</span>
                       <span className={"color9B9B fr"}>
                         {moment(firelistdata&&firelistdata.atta_update_time).format('YYYY-MM-DD HH:mm:ss')==="Invalid date"?"":moment(firelistdata&&firelistdata.atta_update_time).format('YYYY-MM-DD HH:mm:ss')}
@@ -291,7 +291,7 @@ class GraduationTasksappraise extends Component{
 
                 </div>}
                 {datalist&&datalist.project_info===undefined?"":
-                  <div className={"stud-class-set edu-back-white padding20-30 bor-bottom-greyE"}>
+                  <div className={"stud-class-set edu-back-white padding20-30 bor-top-greyE"}>
                     <div className={"color-grey-6 mb10"}>
                       关联项目
                     </div>
@@ -301,7 +301,7 @@ class GraduationTasksappraise extends Component{
                 </div>}
                 {/*{*/}
                 { datalist === undefined?"": datalist && datalist.task_type===undefined ?"" : datalist.task_type===1? "": datalist && datalist.work_members && datalist.work_members.length == 0 ?"":
-                  <div className={"stud-class-set edu-back-white padding20-30 bor-bottom-greyE"} style={{height:"100%"}}>
+                  <div className={"stud-class-set edu-back-white padding20-30 bor-top-greyE"} style={{height:"100%"}}>
                     <div className={"color-grey-6 mb10"}>
                       其他组员
                     </div>
diff --git a/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js b/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js
index 272ac6418..afd3ee6e2 100644
--- a/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js
+++ b/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js
@@ -295,27 +295,27 @@ class ShixunhomeWorkItem extends Component{
               {/*to={`/courses/${this.props.match.params.coursesId}/${discussMessage.homework_id}/jobsettings`}*/}
               {
                 this.props.isAdmin?<Link to={"/courses/"+this.props.match.params.coursesId+"/"+this.state.shixuntypes+"/"+discussMessage.homework_id+"/list"}
-                                      className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.name}</Link>:""
+                                      className="fl font-16 font-bd color-dark maxwidth580">{discussMessage.name}</Link>:""
               }
 
               {
                 this.props.isStudent? <Link to={`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${discussMessage.homework_id}/openlist`}
-                                                  className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.name}</Link>:""
+                                                  className="fl font-16 font-bd color-dark maxwidth580">{discussMessage.name}</Link>:""
               }
 
               {
                 this.props.isNotMember?this.props.discussMessage.private_icon===false?
-                  <span className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.name}</span>
+                  <span className="fl font-16 font-bd color-dark maxwidth580">{discussMessage.name}</span>
                   :
                   <Link to={`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${discussMessage.homework_id}/openlist`}
-                     className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.name}</Link>:""
+                     className="fl font-16 font-bd color-dark maxwidth580">{discussMessage.name}</Link>:""
               }
 
 
               {
                  this.props.discussMessage.private_icon===false?
                   <Tooltip title={ this.props.isNotMember?"私有属性，非课堂成员不能访问":"私有属性"} placement="bottom">
-                    <i className="iconfont icon-guansuo color-grey-c ml10 font-16 fl mt4"></i>
+                    <i className="iconfont icon-guansuo color-grey-c ml10 font-16 fl"></i>
                   </Tooltip>
                   :
                   <div></div>

From 99e86faa5b0976cd5a3bd8168daabf323cb557c9 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Wed, 26 Jun 2019 17:48:29 +0800
Subject: [PATCH 2/2] bug

---
 .../src/modules/courses/busyWork/UseBank.js   | 17 ++++-----
 .../courses/coursesPublic/ModulationModal.js  | 37 ++++++-------------
 .../graduation/topics/GraduateTopicDetail.js  |  8 ++--
 .../topics/GraduateTopicDetailInfo.js         | 18 ++++-----
 .../topics/GraduateTopicDetailTable.js        |  9 +++--
 .../graduation/topics/GraduateTopicNew.js     |  4 +-
 public/react/src/modules/courses/poll/Poll.js |  2 +-
 .../modules/courses/poll/PollDetailIndex.js   |  2 +-
 .../courses/poll/PollDetailTabForth.js        | 29 +++++++++------
 .../courses/poll/PollDetailTabThird.js        |  2 +-
 .../courses/shixunHomework/Listofworks.js     |  4 +-
 .../shixunHomework/ShixunhomeWorkItem.js      | 10 ++---
 12 files changed, 68 insertions(+), 74 deletions(-)

diff --git a/public/react/src/modules/courses/busyWork/UseBank.js b/public/react/src/modules/courses/busyWork/UseBank.js
index eca077cfd..a6ea333c6 100644
--- a/public/react/src/modules/courses/busyWork/UseBank.js
+++ b/public/react/src/modules/courses/busyWork/UseBank.js
@@ -185,6 +185,9 @@ class UseBank extends Component{
           align-items: center;
           display: -webkit-flex;
         }
+        .setImgW .edu-nodata-img{
+          width:218px!important;
+        }
         `}</style>
 
 
@@ -224,7 +227,7 @@ class UseBank extends Component{
                 ></Search>
               </div>
               {
-                nav_my==='myself'? 
+                object_list && object_list.length == 0 && page == 1 ? "" : nav_my==='myself'? 
                 <p className="color-grey-6 mb25 edu-txt-center">选用对象：你在课堂{engNameMap[object_type]}列表中已<span className="color-orange-tip">“加入题库”</span>的{engNameMap[object_type]}</p>
                 :
                 <p className="color-grey-6 mb25 edu-txt-center">选用对象：题库中已设置成公共属性的所有{engNameMap[object_type]}</p>
@@ -240,7 +243,7 @@ class UseBank extends Component{
                 </div>
                 :
                   object_list && object_list.length == 0 && page == 1 ?
-                    <NoneData></NoneData>
+                    <div className="setImgW"><NoneData></NoneData></div>
                   :
                 <div className="edu-back-skyblue padding20" style={{"height":"230px", "overflowY": 'auto'}}>
                   <InfiniteScroll
@@ -262,14 +265,10 @@ class UseBank extends Component{
                       return (
                         <p className="clearfix mb7" key={item.id}>
                           <Checkbox className="fl" value={item.id}></Checkbox>
-                          <span className="fl with45">
-                            <ConditionToolTip title={item.name} condition={item.name && item.name.length > 19 }>
-                              <label className="task-hide fl" style={{"maxWidth":"208px;"}}>{item.name}</label>
-                            </ConditionToolTip>
+                          <span className="fl with65">
+                            <label className="task-hide fl" title={item.name && item.name.length > 30 ? item.name:""} style={{"maxWidth":"100%"}}>{item.name}</label>
                           </span>
-                          <ConditionToolTip title={item.course_list_name} condition={item.course_list_name && item.course_list_name.length > 13 }>
-                            <span className={nav_my==='myself'?"fl with50 color-grey-6 task-hide pl5":"fl with30 color-grey-6 task-hide pl5"}>{item.course_list_name}</span>
-                          </ConditionToolTip>
+                          <span title={item.course_list_name && item.course_list_name.length > 14 && item.course_list_name} className={nav_my==='myself'?"fl with30 color-grey-6 task-hide pl5":"fl with30 color-grey-6 task-hide pl5"}>{item.course_list_name}</span>
                           {
                             nav_my==='public' && 
                             <span className="fl with16 color-grey-6 task-hide pl10">{item.username}</span>
diff --git a/public/react/src/modules/courses/coursesPublic/ModulationModal.js b/public/react/src/modules/courses/coursesPublic/ModulationModal.js
index e201914f6..1c9a9a84d 100644
--- a/public/react/src/modules/courses/coursesPublic/ModulationModal.js
+++ b/public/react/src/modules/courses/coursesPublic/ModulationModal.js
@@ -77,41 +77,28 @@ class ModulationModal extends Component{
             </p>
 
 
-            <p  style={{
-              width: '100%',
-              height:'150px',
-
-            }}>
-
-              <textarea   style={{
-                width: '100%',
-                height:'150px',
-                border:'1px solid rgba(234,234,234,1)'
-              }}
-              placeholder="请填写您对作品调分的原因" className={"mt20"}
-               value={textareaval}
+            <div className="clearfix">
+              <textarea
+              className="winput-100-150"
+              placeholder="请填写您对作品调分的原因"
+              value={textareaval}
               onInput={this.settextarea}
               ></textarea>
-              <span className={textareavaltype===true?"color-red":"none"}>原因不能为空</span>
-            </p>
-
-            <p>
-              <Input   style={{
+              <li style={{height:"20px",lineHeight:"20px"}}><span className={textareavaltype===true?"color-red":"none"}>原因不能为空</span></li>
+            </div>
+            <li>
+              <Input style={{
                 width: '20%',
-                marginTop: textareavaltype===true?'50px':'40px'
               }}
               placeholder="请填写分数"
               value={Inputsval}
               onInput={this.setInputs}/> <span className="ml10">分</span>
-            </p>
-
-            <span className={Inputsvaltype===true?"color-red":"none"}>分数不能为空</span>
-
-            <div className="clearfix mt30 edu-txt-center mb10">
+            </li>
+            <li style={{height:"20px",lineHeight:"20px"}}><span className={Inputsvaltype===true?"color-red":"none"}>分数不能为空</span></li>
+            <div className="clearfix edu-txt-center">
               <a  className="task-btn color-white mr30" onClick={this.props.Cancel}>{this.props.Cancelname || '取消'}</a>
               <a className="task-btn task-btn-orange" onClick={this.Saves}>{this.props.Savesname || '保存'}</a>
             </div>
-
           </div>
         </Modal>
       </div>
diff --git a/public/react/src/modules/courses/graduation/topics/GraduateTopicDetail.js b/public/react/src/modules/courses/graduation/topics/GraduateTopicDetail.js
index 2f6a364a5..8764e00ab 100644
--- a/public/react/src/modules/courses/graduation/topics/GraduateTopicDetail.js
+++ b/public/react/src/modules/courses/graduation/topics/GraduateTopicDetail.js
@@ -103,17 +103,17 @@ class GraduateTopicDetail extends Component{
     return(
       <div className="newMain">
         <div className="educontent mt10 mb50">
-          <p className="clearfix mb20">
+          <p className="clearfix mb10">
             <WordsBtn style="grey" className="fl" to={`/courses/${tableData.course_id}`}>{tableData && tableData.course_name}</WordsBtn>
             <span className="color-grey-9 fl ml3 mr3">&gt;</span>
             <WordsBtn style="grey" className="fl" to={`/courses/${tableData.course_id}/graduation_topics/${tableData.graduation_id}`}>{tableData.graduation_name}</WordsBtn>
             <span className="color-grey-9 fl ml3 mr3">&gt;</span>
             <span>选题详情</span>
           </p>
-          <p className="clearfix mb20">
+          <p className="clearfix mb20 lineh-25">
             <span className="color-grey-3 font-24 fl task-hide" style={{lineHeight:"30px",maxWidth:"900px"}}>{tableData && tableData.graduation_topic_name}</span>
-            <CoursesListType typelist={[`${tableData && tableData.status_name}`]} typesylename={""} />
-            <WordsBtn className="fr font-16" style="grey" onClick={()=>this.props.history.goBack()}>返回</WordsBtn>
+            <span className="fl mt4" style={{height:"25px"}}><CoursesListType typelist={[`${tableData && tableData.status_name}`]} typesylename={""} /></span>
+            <WordsBtn className="fr font-16 mt2" style="grey" onClick={()=>this.props.history.goBack()}>返回</WordsBtn>
           </p>
           <div>
             <div className="clearfix edu-back-white bor-bottom-greyE" >
diff --git a/public/react/src/modules/courses/graduation/topics/GraduateTopicDetailInfo.js b/public/react/src/modules/courses/graduation/topics/GraduateTopicDetailInfo.js
index b1cfe7c6e..0c76cd9de 100644
--- a/public/react/src/modules/courses/graduation/topics/GraduateTopicDetailInfo.js
+++ b/public/react/src/modules/courses/graduation/topics/GraduateTopicDetailInfo.js
@@ -79,20 +79,20 @@ class GraduateTopicDetailTable extends Component{
           <div className="mt30">
             {
               topicInfo && 
-              <p className="mb20">
-                <span className="mr60">
+              <p className="clearfix exu-txt-left mb20">
+                <span className="fl with25">
                   <span className="color-grey-9">课题类型：</span>
                   <span className="color-grey-3">{topicInfo.topic_type ? type[`${topicInfo.topic_type}`] :"--"}</span>
                 </span>
-                <span className="mr60">
+                <span className="fl with25">
                   <span className="color-grey-9">课题来源：</span>
                   <span className="color-grey-3">{topicInfo.topic_source ? source[`${topicInfo.topic_source}`] :"--"}</span>
                 </span>
-                <span className="mr60">
+                <span className="fl with25">
                   <span className="color-grey-9">课题性质1：</span>
                   <span className="color-grey-3">{topicInfo.topic_property_first ? first[`${topicInfo.topic_property_first}`] :"--"}</span>
                 </span>
-                <span className="mr60">
+                <span className="fl with25">
                   <span className="color-grey-9">课题性质2：</span>
                   <span className="color-grey-3">{topicInfo.topic_property_second ? second[`${topicInfo.topic_property_second}`] :"--"}</span>
                 </span>
@@ -100,16 +100,16 @@ class GraduateTopicDetailTable extends Component{
             }
             {
               topicInfo && 
-              <p>
-                <span className="mr60">
+              <p className="clearfix exu-txt-left">
+                <span className="fl with25">
                   <span className="color-grey-9">课题重复情况：</span>
                   <span className="color-grey-3">{topicInfo.topic_repeat ? repeat[`${topicInfo.topic_repeat}`] :"--"}</span>
                 </span>
-                <span className="mr60">
+                <span className="fl with25">
                   <span className="color-grey-9">调研或实习地点：</span>
                   <span className="color-grey-3">{topicInfo.city || "--"}</span>
                 </span>
-                <span className="mr60">
+                <span className="fl with50">
                   <span className="color-grey-9">课题来源单位：</span>
                   <span className="color-grey-3">{topicInfo.source_unit || "--"}</span>
                 </span>
diff --git a/public/react/src/modules/courses/graduation/topics/GraduateTopicDetailTable.js b/public/react/src/modules/courses/graduation/topics/GraduateTopicDetailTable.js
index 963c7a4f9..bd58e555b 100644
--- a/public/react/src/modules/courses/graduation/topics/GraduateTopicDetailTable.js
+++ b/public/react/src/modules/courses/graduation/topics/GraduateTopicDetailTable.js
@@ -74,7 +74,8 @@ class GraduateTopicDetailTable extends Component{
   }
   hideAgreeTopic=()=>{
     this.setState({
-      agreeFlag:false
+      agreeFlag:false,
+      classesId:undefined
     })
   }
   sureAgreeTopic=(count)=>{
@@ -116,6 +117,7 @@ class GraduateTopicDetailTable extends Component{
 
   //切换分班
   changeClasses=(value)=>{
+    debugger
     this.setState({
       classesId:value
     })
@@ -130,7 +132,8 @@ class GraduateTopicDetailTable extends Component{
   }
   hideClasses=()=>{
     this.setState({
-      visible:false
+      visible:false,
+      classesId:undefined
     })
   }
 
@@ -209,7 +212,7 @@ class GraduateTopicDetailTable extends Component{
                   {
                     tableData.group_list && tableData.group_list.map((item,key)=>{
                       return(
-                        <Option value={item.course_group_id} key={key}>{item.group_name}</Option>
+                        <Option value={item.group_id} key={key}>{item.group_name}</Option>
                       )
                     })
                   }
diff --git a/public/react/src/modules/courses/graduation/topics/GraduateTopicNew.js b/public/react/src/modules/courses/graduation/topics/GraduateTopicNew.js
index c3c0d18e2..d71cec73b 100644
--- a/public/react/src/modules/courses/graduation/topics/GraduateTopicNew.js
+++ b/public/react/src/modules/courses/graduation/topics/GraduateTopicNew.js
@@ -328,8 +328,8 @@ class GraduateTopicNew extends Component{
               <span className="color-grey-9 fl ml3 mr3">&gt;</span>
               <span>{topicId==undefined?"新建":"编辑"}</span>
             </p>
-            <div className="clearfix mb30">
-              <p className="fl color-black summaryname mt5">{topicId==undefined?"新建":"编辑"}毕设选题</p>
+            <div className="clearfix mb20 lineh-25">
+              <p className="fl color-black summaryname">{topicId==undefined?"新建":"编辑"}毕设选题</p>
               <a onClick={()=>this.props.history.goBack()} className="color-grey-6 fr font-16">返回</a>
             </div>
 
diff --git a/public/react/src/modules/courses/poll/Poll.js b/public/react/src/modules/courses/poll/Poll.js
index 3a7cd6aec..a41f65ccd 100644
--- a/public/react/src/modules/courses/poll/Poll.js
+++ b/public/react/src/modules/courses/poll/Poll.js
@@ -348,7 +348,7 @@ class Poll extends Component{
         }
         this.setState({
           course_groups:list,
-					checkBoxValues:checkValue
+					checkBoxValues:value
         })
         this.setState({
           modalname:"立即发布",
diff --git a/public/react/src/modules/courses/poll/PollDetailIndex.js b/public/react/src/modules/courses/poll/PollDetailIndex.js
index 33f779591..8e456efd1 100644
--- a/public/react/src/modules/courses/poll/PollDetailIndex.js
+++ b/public/react/src/modules/courses/poll/PollDetailIndex.js
@@ -97,7 +97,7 @@ class PollDetailIndex extends Component{
                 <Menu mode="horizontal" selectedKeys={tab} onClick={this.changeTab}>
                   <Menu.Item key="0">答题列表</Menu.Item>
                   { 
-                    (isAdmin || (isStudent && pollDetail && pollDetail.show_result == 1 && pollDetail.polls_status == 3)) && <Menu.Item key="1">统计结果</Menu.Item>
+                    (isAdmin || (isStudent && pollDetail && pollDetail.show_result == 1 && pollDetail.polls_status == 3 && user_permission && user_permission.current_status==1)) && <Menu.Item key="1">统计结果</Menu.Item>
                   }
                   { isAdmin && <Menu.Item key="2">问卷预览</Menu.Item> }
                   <Menu.Item key="3">设置</Menu.Item>
diff --git a/public/react/src/modules/courses/poll/PollDetailTabForth.js b/public/react/src/modules/courses/poll/PollDetailTabForth.js
index a23411a14..01366c2f9 100644
--- a/public/react/src/modules/courses/poll/PollDetailTabForth.js
+++ b/public/react/src/modules/courses/poll/PollDetailTabForth.js
@@ -556,7 +556,9 @@ class PollDetailTabForth extends Component{
 					<div className="edu-back-white">
 						<div className="bor-bottom-greyE padding30">
 							<p className="mb30 clearfix">
-								<span className="font-16 fl">发布设置	 <span className="color-grey-c font-14">（课堂管理员、教师、助教拥有发布设置权限）</span></span>
+								<span className="font-16 fl">发布设置	 
+								{/* <span className="color-grey-c font-14">（课堂管理员、教师、助教拥有发布设置权限）</span> */}
+								</span>
 								{
 									!flagPageEdit && isAdmin ?
 										<a className="fr" onClick={this.editSetting}><Tooltip title="编辑"><i className="iconfont icon-bianjidaibeijing font-20 color-green"></i></Tooltip></a>
@@ -564,17 +566,20 @@ class PollDetailTabForth extends Component{
 								}
 							</p>
 							<div className="pl25">
-								<p className="clearfix mb20">
-									<Form.Item className="fl pollForm">
-										{getFieldDecorator('unitSet')
-										(
-											<Checkbox disabled={un_change_unified == true ? true : !flagPageEdit}
-																className="mr15 font-16 color-grey-6" checked={ unitSetting }
-																onChange={this.changeUnit}>统一设置</Checkbox>
-										)}
-									</Form.Item>
-									<span className="color-grey-c font-14">（选中则所有分班使用相同的发布设置，仅课堂管理员可修改；否则各个分班允许单独设置）</span>
-								</p>
+								{
+									course_group && course_group.length > 0 &&
+									<p className="clearfix mb20">
+										<Form.Item className="fl pollForm">
+											{getFieldDecorator('unitSet')
+											(
+												<Checkbox disabled={un_change_unified == true ? true : !flagPageEdit}
+																	className="mr15 font-16 color-grey-6" checked={ unitSetting }
+																	onChange={this.changeUnit}>统一设置</Checkbox>
+											)}
+										</Form.Item>
+										<span className="color-grey-c font-14">（选中则所有分班使用相同的发布设置，仅课堂管理员可修改；否则各个分班允许单独设置）</span>
+									</p>
+								}
 								{
 									unitSetting ?
 										<div>
diff --git a/public/react/src/modules/courses/poll/PollDetailTabThird.js b/public/react/src/modules/courses/poll/PollDetailTabThird.js
index 4cecf3744..5d9a01fb8 100644
--- a/public/react/src/modules/courses/poll/PollDetailTabThird.js
+++ b/public/react/src/modules/courses/poll/PollDetailTabThird.js
@@ -46,7 +46,7 @@ class PollDetailTabThird extends Component{
               <span className="color-grey-3">
                 {
                   pollDetail && pollDetail.question_types.q_counts > 0 &&
-                  <span>合计12{pollDetail.question_types.q_counts}题：</span>
+                  <span>合计{pollDetail.question_types.q_counts}题：</span>
                 }
                 {
                   pollDetail && pollDetail.question_types.q_singles > 0 &&
diff --git a/public/react/src/modules/courses/shixunHomework/Listofworks.js b/public/react/src/modules/courses/shixunHomework/Listofworks.js
index 6d19b13ef..9650ad32a 100644
--- a/public/react/src/modules/courses/shixunHomework/Listofworks.js
+++ b/public/react/src/modules/courses/shixunHomework/Listofworks.js
@@ -1842,11 +1842,11 @@ class Listofworks extends Component {
 															border-bottom: none!important;
 															height: 85px;
 														}
-														.ant-table-tbody > tr > td {
+														.ant-tables .ant-table-tbody > tr > td {
 														height: 85px;
 															}
 						              `}</style>
-									<div className="edu-table edu-back-white ">
+									<div className="edu-table edu-back-white ant-tables">
 										{data === undefined ? "" : <Table
 											dataSource={data}
 											columns={columns}
diff --git a/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js b/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js
index afd3ee6e2..272ac6418 100644
--- a/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js
+++ b/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js
@@ -295,27 +295,27 @@ class ShixunhomeWorkItem extends Component{
               {/*to={`/courses/${this.props.match.params.coursesId}/${discussMessage.homework_id}/jobsettings`}*/}
               {
                 this.props.isAdmin?<Link to={"/courses/"+this.props.match.params.coursesId+"/"+this.state.shixuntypes+"/"+discussMessage.homework_id+"/list"}
-                                      className="fl font-16 font-bd color-dark maxwidth580">{discussMessage.name}</Link>:""
+                                      className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.name}</Link>:""
               }
 
               {
                 this.props.isStudent? <Link to={`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${discussMessage.homework_id}/openlist`}
-                                                  className="fl font-16 font-bd color-dark maxwidth580">{discussMessage.name}</Link>:""
+                                                  className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.name}</Link>:""
               }
 
               {
                 this.props.isNotMember?this.props.discussMessage.private_icon===false?
-                  <span className="fl font-16 font-bd color-dark maxwidth580">{discussMessage.name}</span>
+                  <span className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.name}</span>
                   :
                   <Link to={`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${discussMessage.homework_id}/openlist`}
-                     className="fl font-16 font-bd color-dark maxwidth580">{discussMessage.name}</Link>:""
+                     className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.name}</Link>:""
               }
 
 
               {
                  this.props.discussMessage.private_icon===false?
                   <Tooltip title={ this.props.isNotMember?"私有属性，非课堂成员不能访问":"私有属性"} placement="bottom">
-                    <i className="iconfont icon-guansuo color-grey-c ml10 font-16 fl"></i>
+                    <i className="iconfont icon-guansuo color-grey-c ml10 font-16 fl mt4"></i>
                   </Tooltip>
                   :
                   <div></div>