diff --git a/public/react/src/modules/courses/Resource/Fileslistitem.js b/public/react/src/modules/courses/Resource/Fileslistitem.js index 35c558d8e..96ea3d1b9 100644 --- a/public/react/src/modules/courses/Resource/Fileslistitem.js +++ b/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 }) diff --git a/public/react/src/modules/courses/Resource/index.js b/public/react/src/modules/courses/Resource/index.js index 92eeafe3e..097fdb1a2 100644 --- a/public/react/src/modules/courses/Resource/index.js +++ b/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={ {/*{this.props.isAdmin()?parseInt(this.props.match.params.main_id)===parseInt(this.props.coursesids)?this.addDir()} className={"mr30 font-16"}>新建目录:"":""}*/} - {this.props.isAdmin()?this.addDir()} className={"mr30 font-16"}>新建目录:""} + {this.props.isAdmin()?this.state.parent_category_id===null||this.state.parent_category_id===undefined||this.state.parent_category_id===0?this.addDir()} className={"mr30 font-16"}>新建目录:"":''} {this.props.isAdmin()?parseInt(this.props.match.params.main_id)!=parseInt(this.props.coursesids)?this.editDir(name)} className={"mr30 font-16"}>目录重命名:"":""} {this.props.isAdmin()||this.props.isStudent() ? this.props.user&&this.props.user.main_site===true? this.addResource()}>选用资源:"":""} @@ -1029,7 +1030,7 @@ class Fileslists extends Component{ {course_modules&&course_modules.course_modules.map((item,key)=>{ return( - filesId&&filesId===item.value?"":
  • this.moveTos(0)} title={item.module_name}>{item.module_name}
  • + filesId&&filesId===item.value?"":
  • this.moveTos(0)} title={item.title}>{item.title}
  • ) })} diff --git a/public/react/src/modules/courses/signin/css/signincdi.css b/public/react/src/modules/courses/signin/css/signincdi.css index 53f621471..750d27a28 100644 --- a/public/react/src/modules/courses/signin/css/signincdi.css +++ b/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; } diff --git a/public/react/src/modules/courses/videostatistics/component/Videostatisticscom.js b/public/react/src/modules/courses/videostatistics/component/Videostatisticscom.js index c819e76c9..849143b21 100644 --- a/public/react/src/modules/courses/videostatistics/component/Videostatisticscom.js +++ b/public/react/src/modules/courses/videostatistics/component/Videostatisticscom.js @@ -36,10 +36,10 @@ class Videostatisticscom extends Component {

    this.props.statisticsy(false)} style={{color:'#5091FF'}}> - this.props.statisticsy(false)} style={{color:'#5091FF'}}> -

    this.props.statisticsy(false)}>返回

    + this.props.statisticsy(false)} style={{color:'#5091FF'}}> + {/*

    this.props.statisticsy(false)}>返回

    */}

    -
    视频统计总览
    +
    视频统计总览
    播放数据从{this.props.watch_staticsdata&&this.props.watch_staticsdata.begin_at?this.props.watch_staticsdata.begin_at:0}开始统计
    -
    +
    观看总人数(人)
    diff --git a/public/react/src/modules/courses/videostatistics/component/Videostatisticslist.js b/public/react/src/modules/courses/videostatistics/component/Videostatisticslist.js index bba642e6a..056191a4d 100644 --- a/public/react/src/modules/courses/videostatistics/component/Videostatisticslist.js +++ b/public/react/src/modules/courses/videostatistics/component/Videostatisticslist.js @@ -252,7 +252,7 @@ class Videostatisticslist extends Component {
    -
    统计详情
    +
    统计列表