From 0173ddf253e0cf4b332e2c459530b0c1cd4e640f 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, 10 Oct 2019 15:19:59 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=A2=98=E5=BA=93=E9=97=AD?=
 =?UTF-8?q?=E7=8E=AF=E9=97=AE=E9=A2=98=EF=BC=8C=E8=B0=83=E6=95=B4=E5=AE=9E?=
 =?UTF-8?q?=E8=AE=AD=E4=BD=9C=E4=B8=9A=E8=AE=BE=E7=BD=AE=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=EF=BC=8C=E6=B6=88=E6=81=AF=E6=A8=A1=E5=9D=97=E7=BB=9F=E4=B8=80?=
 =?UTF-8?q?=E6=97=A0=E6=95=B0=E6=8D=AE=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/courses/graduation/tasks/index.js |  2 +-
 .../courses/graduation/topics/index.js        |  2 +-
 .../shixunHomework/Trainingjobsetting.js      |  4 +--
 .../react/src/modules/message/js/MessagSub.js | 29 ++++++++++---------
 .../src/modules/message/js/MessagePrivate.js  |  8 ++---
 .../src/modules/user/usersInfo/InfosTopics.js |  4 +--
 6 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/public/react/src/modules/courses/graduation/tasks/index.js b/public/react/src/modules/courses/graduation/tasks/index.js
index 58d6e37e5..9dac05a36 100644
--- a/public/react/src/modules/courses/graduation/tasks/index.js
+++ b/public/react/src/modules/courses/graduation/tasks/index.js
@@ -720,7 +720,7 @@ class GraduationTasks extends Component{
               <li className="li_line"><a className="color-grey-9" onClick={() => { this.publish() }}>立即发布</a></li>
               <li className="li_line"><a className="color-grey-9" onClick={() => { this.end() }}>立即截止</a></li>
               {course_public===true?<li className="li_line"><a className="color-grey-9" onClick={this.onOpen}>设为公开</a></li>:""}
-              <li className="li_line"><a className="color-grey-9" onClick={()=>this.ActionPoll()}>加入题库</a></li>
+              {/*<li className="li_line"><a className="color-grey-9" onClick={()=>this.ActionPoll()}>加入题库</a></li>*/}
             </div>
           </div>
         </div>:""}
diff --git a/public/react/src/modules/courses/graduation/topics/index.js b/public/react/src/modules/courses/graduation/topics/index.js
index ef4257e2e..2f02113bc 100644
--- a/public/react/src/modules/courses/graduation/topics/index.js
+++ b/public/react/src/modules/courses/graduation/topics/index.js
@@ -447,7 +447,7 @@ onBoardsNew=()=>{
                       {
                         course_public && course_public==1 ? <li className="li_line"><a href="javascript:void(0)" className="color-grey-9" onClick={()=>this.onDelete(2)}>设为公开</a></li>:""
                       }
-                      <li className="li_line"><a className="color-grey-9" onClick={()=>this.onDelete(3)}>加入题库</a></li>
+                      {/*<li className="li_line"><a className="color-grey-9" onClick={()=>this.onDelete(3)}>加入题库</a></li>*/}
                       {/* <li className="li_line"><a href="javascript:void(0)" className="color-grey-9">加入题库</a></li> */}
                     </div>
                   </div>
diff --git a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
index a7ed222cd..9f9eb3d5e 100644
--- a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
+++ b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
@@ -1723,7 +1723,7 @@ class Trainingjobsetting extends Component {
                             flagPageEditsthrees:deadline,
                             flagPageEditsfor:endtime,
                             completionefficiencyscore:true,
-                            work_efficiencys:true,
+                            work_efficiencys:this.state.work_efficiencys,
                             unifiedsetting:this.state.unifiedsetting,
                             latedeductiontwo:20,
                         });
@@ -1839,7 +1839,7 @@ class Trainingjobsetting extends Component {
                             flagPageEditsthrees:deadline,
                             flagPageEditsfor:endtime,
                             completionefficiencyscore:true,
-                            work_efficiencys:true,
+                            work_efficiencys:result.data.work_efficiency,
                             unifiedsetting:datas.data.unified_setting,
                             latedeductiontwo:20,
                         });
diff --git a/public/react/src/modules/message/js/MessagSub.js b/public/react/src/modules/message/js/MessagSub.js
index 24f2df5ed..791b5c063 100644
--- a/public/react/src/modules/message/js/MessagSub.js
+++ b/public/react/src/modules/message/js/MessagSub.js
@@ -545,7 +545,7 @@ class MessagSub extends Component {
 				{/*下面内容页面*/}
 				<div className="bor-top-greyE mycenter">
 					{/*这里可以进行数据处理*/}
-					<div className="myw100baifenbi">
+					<div className="myw100baifenbi edu-back-white">
 						<Spin size="large" className="myw100baifenbi mt10" spinning={isSpin}>
 
 							{
@@ -641,23 +641,24 @@ class MessagSub extends Component {
 									})}
 						</Spin>
 
-						{/*页数*/}
-						{data === undefined ? ""
-							:
-							(count > 10 ?
-									<div style={{textAlign: "center"}} className="new_expand mt10">
-										<div className="edu-txt-center mt30">
-											<Pagination showQuickJumper current={page}
-																	onChange={this.paginationonChanges} pageSize={limit}
-																	total={count}></Pagination>
-										</div>
-									</div> : ""
-							)
 
-						}
 					</div>
 
 				</div>
+				{/*页数*/}
+				{data === undefined ? ""
+					:
+					(count > 10 ?
+							<div style={{textAlign: "center"}} className="new_expand mt10">
+								<div className="edu-txt-center mt30">
+									<Pagination showQuickJumper current={page}
+															onChange={this.paginationonChanges} pageSize={limit}
+															total={count}></Pagination>
+								</div>
+							</div> : ""
+					)
+
+				}
 			</div>
 		)
 	}
diff --git a/public/react/src/modules/message/js/MessagePrivate.js b/public/react/src/modules/message/js/MessagePrivate.js
index ec7c20121..dc8e32e67 100644
--- a/public/react/src/modules/message/js/MessagePrivate.js
+++ b/public/react/src/modules/message/js/MessagePrivate.js
@@ -8,6 +8,7 @@ import moment from 'moment';
 import {getImageUrl,markdownToHTML} from 'educoder';
 import "../css/messagemy.css"
 import WriteaprivateletterModal from '../messagemodal/WriteaprivateletterModal';
+import NoneData from '../../../modules/courses/coursesPublic/NoneData'
 //私信页面
 class MessagePrivate extends Component{
 	constructor(props) {
@@ -160,11 +161,8 @@ class MessagePrivate extends Component{
 			<Spin size="large" className="myw100baifenbi" spinning={isSpin}>
 
 					{
-						data===undefined?"":data.length===0?
-							<div className="edu-tab-con-box clearfix edu-txt-center">
-								<img className="edu-nodata-img mb20"  src={getImageUrl("images/educoder/nodata.png")}/>
-								<p className="edu-nodata-p mb20">暂无数据哦~</p>
-							</div>
+						data===undefined?<NoneData></NoneData> :data.length===0?
+							<NoneData></NoneData>
 							:data.map((item,key)=>{
 								return(
 										<div className="private-item clearfix df" key={key} onClick={()=>this.smyJump(3,item.target.id)}>
diff --git a/public/react/src/modules/user/usersInfo/InfosTopics.js b/public/react/src/modules/user/usersInfo/InfosTopics.js
index 76979c9f5..3b76bfa28 100644
--- a/public/react/src/modules/user/usersInfo/InfosTopics.js
+++ b/public/react/src/modules/user/usersInfo/InfosTopics.js
@@ -297,8 +297,8 @@ class InfosTopics extends Component{
 		let categorylist=[
 			{val:"普通作业",type:"normal"},
 			{val:"分组作业",type:"group"},
-			{val:"毕设选题",type:"gtopic"},
-			{val:"毕设任务",type:"gtask"},
+			// {val:"毕设选题",type:"gtopic"},
+			// {val:"毕设任务",type:"gtask"},
 			{val:"试卷",type:"exercise"},
 			{val:"问卷",type:"poll"},
 			]