diff --git a/public/react/src/modules/courses/Resource/Fileslistitem.js b/public/react/src/modules/courses/Resource/Fileslistitem.js
index d364f7ada..620e33178 100644
--- a/public/react/src/modules/courses/Resource/Fileslistitem.js
+++ b/public/react/src/modules/courses/Resource/Fileslistitem.js
@@ -209,6 +209,9 @@ class Fileslistitem extends Component{
                 text-overflow:ellipsis;
                 white-space:nowrap
             }
+            .mt2{
+             margin-top:2px;
+            }
           `}</style>
                 <div className="clearfix ds pr contentSection" style={{cursor : this.props.isAdmin ? "pointer" : "default"}} onClick={() => window.$(`.sourceitem${index} input`).click() }>
                     <h6 onClick={(event)=>this.eventStop(event)}>
@@ -248,6 +251,29 @@ class Fileslistitem extends Component{
                                 :""
                         }
 											{discussMessage.is_publish===false?<CoursesListType typelist={["未发布"]} typesylename={""}/>:""}
+
+											{this.props.isAdmin?
+												<span className={"fr mrf2 mr10 mt2"} onClick={(event)=>this.eventStop(event)}>
+                      <WordsBtn style="blue" className="colorblue font-16 mr20 fr">
+                          <a className="btn colorblue"
+														 onClick={()=>this.settingList()}>设置</a>
+                        </WordsBtn>
+                      </span>:""}
+
+											{this.props.isStudent===true&&this.props.current_user.login===discussMessage.author.login?
+												<span className={"fr mrf2 mr10 mt2"} onClick={(event)=>this.eventStop(event)}>
+
+                      <WordsBtn style="blue" className="colorblue font-16 mr20 fr">
+                        <a className="btn colorblue"
+													 onClick={()=>this.settingList()}>设置</a>
+                      </WordsBtn>
+
+										  <WordsBtn style="blue" className="colorblue font-16 mr20 fr">
+                        <a className="btn colorblue"
+													 onClick={()=>this.onDelete(discussMessage.id)}>删除</a>
+                      </WordsBtn>
+
+                      </span>:""}
                     </h6>
                   <style>
                     {
@@ -303,29 +329,10 @@ class Fileslistitem extends Component{
                            { discussMessage.publish_time===null?"":discussMessage.is_publish===true?moment(discussMessage.publish_time).fromNow():moment(discussMessage.publish_time).format('YYYY-MM-DD HH:mm')}
                         </span>
                       </span>
-											{this.props.isAdmin?
-												<span className={"fr mrf2 mr10"} onClick={(event)=>this.eventStop(event)}>
-                      <WordsBtn style="blue" className="colorblue font-16 mr20 fr">
-                          <a className="btn colorblue"
-                            onClick={()=>this.settingList()}>设置</a>
-                        </WordsBtn>
-                      </span>:""}
-
-											{this.props.isStudent===true&&this.props.current_user.login===discussMessage.author.login?
-												<span className={"fr mrf2 mr10"} onClick={(event)=>this.eventStop(event)}>
-
-                      <WordsBtn style="blue" className="colorblue font-16 mr20 fr">
-                        <a className="btn colorblue"
-													 onClick={()=>this.settingList()}>设置</a>
-                      </WordsBtn>
-
-										  <WordsBtn style="blue" className="colorblue font-16 mr20 fr">
-                        <a className="btn colorblue"
-													 onClick={()=>this.onDelete(discussMessage.id)}>删除</a>
-                      </WordsBtn>
-
-                      </span>:""}
-                    </p>
+											{discussMessage&&discussMessage.category_name===null?"":<div className=" color-grey9 task-hide fr" title={discussMessage&&discussMessage.category_name}
+													 style={{"max-width":"268px"}}>所属目录：{discussMessage&&discussMessage.category_name}
+											</div>}
+										</p>
 
 
 
diff --git a/public/react/src/modules/courses/Resource/index.js b/public/react/src/modules/courses/Resource/index.js
index d61dec15b..12a3e1362 100644
--- a/public/react/src/modules/courses/Resource/index.js
+++ b/public/react/src/modules/courses/Resource/index.js
@@ -784,7 +784,18 @@ class Fileslists extends Component{
               has_course_groups={this.state.has_course_groups}
 							attachmentId={this.state.coursesecondcategoryid}
           />:""}
-
+						{child===false?"":<style>
+							{
+								`
+								 .filesnameslist{
+										max-width: 486px;
+										overflow: hidden;
+										text-overflow: ellipsis;
+										white-space: nowrap;
+								 }
+								`
+							}
+						</style>}
             <Titlesearchsection
                 title={child===false?"全部资源":name}
                 searchValue={ searchValue }
diff --git a/public/react/src/modules/courses/common/titleSearch/TitleSearchSection.js b/public/react/src/modules/courses/common/titleSearch/TitleSearchSection.js
index 4cb69a8d7..aa7a54cce 100644
--- a/public/react/src/modules/courses/common/titleSearch/TitleSearchSection.js
+++ b/public/react/src/modules/courses/common/titleSearch/TitleSearchSection.js
@@ -61,7 +61,7 @@ class Titlesearchsection extends Component{
 
           <p className="clearfix padding30 bor-bottom-greyE">
             <p style={{height: '20px'}}>
-              <span className="font-18 fl color-dark-21">{title}</span>
+              <span className="font-18 fl color-dark-21 filesnameslist" title={title}>{title}</span>
               <li className="fr font-16">
                 { firstRowRight }
               </li>
diff --git a/public/react/src/modules/courses/coursesPublic/SelectSetting.js b/public/react/src/modules/courses/coursesPublic/SelectSetting.js
index 0b7aad29e..0582a3dbd 100644
--- a/public/react/src/modules/courses/coursesPublic/SelectSetting.js
+++ b/public/react/src/modules/courses/coursesPublic/SelectSetting.js
@@ -55,32 +55,12 @@ class Selectsetting extends Component{
 			})
 			.then((response) => {
 				if(response.status===200){
-
-					let newcourse_groups=[];
-					let list =response.data.course_groups;
-
-					if(list.length!=0){
-						list.forEach((item,key)=>{
-							newcourse_groups.push	({
-								course_group_id:item.course_group_id,
-								course_group_name:item.course_group_id,
-								publish_time:moment(item.course_group_publish_time).format(dateFormat)
-							})
-						})
-					}else{
-						newcourse_groups.push	({
-							course_group_id:undefined,
-							course_group_name:undefined,
-							publish_time:""
-						})
-					}
-
 					this.setState({
 						datalist:response.data,
 						description: response.data.description,
 						is_public:response.data.is_public,
 						datatime:response.data.publish_time,
-						Radiovalue:response.data.delay_publish===false?0:1,
+						Radiovalue:response.data.delay_publish==false?0:1,
 						//attachment_histories:response.data.attachment_histories
 					})
 
@@ -276,7 +256,7 @@ class Selectsetting extends Component{
 			lineHeight: '30px',
 		};
 
-		console.log(this.state.datatime)
+		console.log(this.state.Radiovalue)
 		return(
 			<div>
 				<style>
diff --git a/public/react/src/modules/courses/coursesPublic/SendToFilesModal.js b/public/react/src/modules/courses/coursesPublic/SendToFilesModal.js
index 319ab8304..fa63bf6db 100644
--- a/public/react/src/modules/courses/coursesPublic/SendToFilesModal.js
+++ b/public/react/src/modules/courses/coursesPublic/SendToFilesModal.js
@@ -193,7 +193,7 @@ class  Sendtofilesmodal extends Component{
 
 					<p className="clearfix ModalWrappertitle">
 						<div className="task-hide fl pagemancenter" style={{"width":'215px'}}>课堂名称</div>
-						<div className="task-hide fl pagemancenter" style={{"width":'140px'}}>更新时间</div>
+						<div className="task-hide fl pagemancenter" style={{"width":'140px'}}>创建时间</div>
 						<div className="task-hide fl pagemancenter" style={{"width":'110px'}}>结束时间</div>
 					</p>
 					<div className="edu-back-skyblue padding15" style={{"height":"300px", overflowY: "scroll", overflowAnchor: 'none' }}>
@@ -212,7 +212,7 @@ class  Sendtofilesmodal extends Component{
 										<p className="clearfix mb7" key={course.id}>
 											<Checkbox className="fl" value={course.id}  key={course.id} ></Checkbox>
 										 <div className="task-hide fl" style={{"width":'215px'}} title={course.name}>{course.name}</div>
-										 <div className="task-hide fl" style={{"width":'140px'}}>{moment(course.updated_at).format('YYYY-MM-DD HH:mm')}</div>
+										 <div className="task-hide fl" style={{"width":'140px'}}>{moment(course.created_at).format('YYYY-MM-DD HH:mm')}</div>
 										 <div className="task-hide fl" style={{"width":'110px'}}>{course.end_date}</div>
 										</p>
 									)
diff --git a/public/react/src/modules/courses/shixunHomework/shixunHomework.js b/public/react/src/modules/courses/shixunHomework/shixunHomework.js
index 3acb02739..415b283f6 100644
--- a/public/react/src/modules/courses/shixunHomework/shixunHomework.js
+++ b/public/react/src/modules/courses/shixunHomework/shixunHomework.js
@@ -1142,11 +1142,38 @@ class ShixunHomework extends Component{
           addsave={addsave}
         />
 
-
+				{
+					datas&&datas.category_name===undefined||datas&&datas.category_name===null?"":
+					<style>
+					{
+						`
+							.category_namehome{
+							  max-width: 558px;
+								overflow: hidden;
+								text-overflow: ellipsis;
+								white-space: nowrap;
+								display: inline-block;
+								margin-right: 5px;
+							}
+						 .category_namehomelist{
+								 display: inline-block;
+								overflow: hidden;
+								text-overflow: ellipsis;
+								white-space: nowrap;
+							}
+						`
+					}
+				</style>
+				}
         <div className="edu-back-white">
           <p className="clearfix padding30 bor-bottom-greyE">
             <p style={{height: '20px'}}>
-            <span className="font-18 fl color-dark-21">{datas&&datas.category_name===undefined||datas&&datas.category_name===null?datas&&datas.main_category_name:datas&&datas.category_name+" 作业列表"}</span>
+							<span className="font-18 fl color-dark-21">
+								{datas&&datas.category_name===undefined||datas&&datas.category_name===null?datas&&datas.main_category_name:<span>
+									<span className={"category_namehome"}>{datas&&datas.category_name} </span>
+									<span className={"category_namehomelist"}> 作业列表</span>
+								</span>}
+							</span>
               <li className="fr">
 								{datas===undefined?"":datas.homeworks && datas.homeworks.length>1?this.props.isAdminOrCreator()===true?datas&&datas.category_name===undefined||datas&&datas.category_name===null?
 									<span>