修复冲突 修改bug

public/react/src/modules/courses/Resource/Fileslistitem.js

@@ -18,7 +18,7 @@ class Fileslistitem extends Component {
 
 	settingList = (bools) => {
 		let {discussMessage} = this.props
-
+		console.log(discussMessage);
 		this.setState({
 			discussMessageid: discussMessage.id
 		})

public/react/src/modules/courses/Resource/index.js

@@ -49,6 +49,8 @@ class Fileslists extends Component{
       link: "",
       //是否展开
       istowshowid:'',
+      //新增参数判断几级目录
+      parent_category_id:'',
     }
   }
 
@@ -250,7 +252,8 @@ class Fileslists extends Component{
 						 unpublish_count:list.unpublish_count,
 						 files:list.files,
 						 filesId:list.id,
-						 name:list.name,
+             name:list.name,
+             parent_category_id:list.parent_category_id,
 						 course_is_public:result.data.data.course_is_public,
 
              page:page
@@ -445,7 +448,6 @@ class Fileslists extends Component{
   onPressEnter = () => {
     let {searchValue}=this.state;
     let{pagesize,page,tagname,sort,sorttype,coursesecondcategoryid}=this.state;
-    console.log(2)
     this.getfileslist(pagesize,1,tagname,searchValue,sort,sorttype,coursesecondcategoryid);
   }
 
@@ -457,12 +459,12 @@ class Fileslists extends Component{
 
   addDir = () => {
     let {filesId,course_modules,coursesecondcategoryid}=this.state;
+
     //调用获取资源接口 刷新数据 
     this.setState({
 			checkBoxValues:[]
     })
     
-    console.log(this.props);
 		if(parseInt(this.props.match.params.main_id)!=parseInt(this.props.coursesids)){
 
 			trigger('attachmentAddlog', {id: parseInt(		course_modules&&course_modules.course_modules[0].value),name:'资源',coursesecondcategoryid:coursesecondcategoryid})
@@ -636,7 +638,6 @@ class Fileslists extends Component{
 
 
 	Updateresourcepage=()=>{
-    console.log(4)
 		let{pagesize,tagname,searchValue,page,sort,sorttype,coursesecondcategoryid}=this.state;
 		this.getfileslist(pagesize,page,tagname,searchValue,sort,sorttype,coursesecondcategoryid);
 	}
@@ -967,7 +968,7 @@ class Fileslists extends Component{
                 firstRowRight={
                   <React.Fragment>
                     {/*{this.props.isAdmin()?parseInt(this.props.match.params.main_id)===parseInt(this.props.coursesids)?<WordsBtn style="blue" onClick={()=>this.addDir()} className={"mr30 font-16"}>新建目录</WordsBtn>:"":""}*/}
-										{this.props.isAdmin()?<WordsBtn style="blue" onClick={()=>this.addDir()} className={"mr30 font-16"}>新建目录</WordsBtn>:""}
+										{this.props.isAdmin()?this.state.parent_category_id===null||this.state.parent_category_id===undefined||this.state.parent_category_id===0?<WordsBtn style="blue" onClick={()=>this.addDir()} className={"mr30 font-16"}>新建目录</WordsBtn>:"":''}
                     {this.props.isAdmin()?parseInt(this.props.match.params.main_id)!=parseInt(this.props.coursesids)?<WordsBtn style="blue" onClick={()=>this.editDir(name)} className={"mr30 font-16"}>目录重命名</WordsBtn>:"":""}
 
                     {this.props.isAdmin()||this.props.isStudent() ? this.props.user&&this.props.user.main_site===true? <WordsBtn style="blue" className="mr30 font-16" onClick={()=>this.addResource()}>选用资源</WordsBtn>:"":""}
@@ -1029,7 +1030,7 @@ class Fileslists extends Component{
 
                       {course_modules&&course_modules.course_modules.map((item,key)=>{
                         return(
-													filesId&&filesId===item.value?"":<li key={key} id={item.value} onClick={() => this.moveTos(0)} title={item.module_name}>{item.module_name}</li>
+													filesId&&filesId===item.value?"":<li key={key} id={item.value} onClick={() => this.moveTos(0)} title={item.title}>{item.title}</li>
                         )
                       })}
 

public/react/src/modules/courses/signin/css/signincdi.css

@@ -105,6 +105,9 @@
 .ws40s{
     width: 40%;
 }
+.ws45s{
+    width: 45%;
+}
 .hs30s{
     height: 30%;
 }
@@ -343,6 +346,9 @@
 .h40s{
     line-height: 40px  !important;
 }
+.h36s{
+    line-height: 36px !important;
+}
 .h28s{
     line-height: 28px !important;
 }

public/react/src/modules/courses/videostatistics/component/Videostatisticscom.js

@@ -36,10 +36,10 @@ class Videostatisticscom extends Component {
 					<div className="ws100s teacherentrydivss ">
 						<div className="ws100s sortinxdirection">
 								<p className="sortinxdirection h40s" onClick={()=>this.props.statisticsy(false)} style={{color:'#5091FF'}}>
-									<i className="iconfont icon-zuojiantou  posiivsiconmyss mr5 colorbluesigin xiaoshou h40s" onClick={()=>this.props.statisticsy(false)} style={{color:'#5091FF'}}></i>
-									<p style={{color:'#5091FF'}} className="fh mr20 colorbluesigin xiaoshou h40s" onClick={()=>this.props.statisticsy(false)}>返回</p>
+									<i className="iconfont icon-zuojiantou  posiivsiconmyss mr5 colorbluesigin xiaoshou h36s" onClick={()=>this.props.statisticsy(false)} style={{color:'#5091FF'}}></i>
+									{/*<p style={{color:'#5091FF'}} className="fh mr20 colorbluesigin xiaoshou h40s" onClick={()=>this.props.statisticsy(false)}>返回</p>*/}
 								</p>
-							<div className="ws40s sptits font-18">视频统计总览</div>
+							<div className="ws45s sptits font-18">视频统计总览</div>
 							<div className="ws50s sptitss xaxisreverseorder">播放数据从{this.props.watch_staticsdata&&this.props.watch_staticsdata.begin_at?this.props.watch_staticsdata.begin_at:0}开始统计</div>
 						</div>
 						<style>
@@ -67,7 +67,7 @@ class Videostatisticscom extends Component {
               `
 							}
 						</style>
-						<div className="ws100s spacearound mt20">
+						<div className="ws100s spacearound mt10">
 							<div className="yslsprenshu" style={{width:260,height:100}}>
 								<div className="ws100s verticallayout tbrt">
                  <div className="ws100s ts">观看总人数（人）</div>

public/react/src/modules/courses/videostatistics/component/Videostatisticslist.js

@@ -252,7 +252,7 @@ class Videostatisticslist extends Component {
 					<div className="ws100s edu-back-white">
 						<div className="ws100s teacherentrydivss ">
 							<div className="ws100s sortinxdirection">
-								<div className="ws100s sptits font-16">统计详情</div>
+								<div className="ws100s sptits font-16">统计列表</div>
 							</div>
 
 						</div>