diff --git a/public/react/src/modules/courses/Resource/index.js b/public/react/src/modules/courses/Resource/index.js index 1719a3eb2..1248f6138 100644 --- a/public/react/src/modules/courses/Resource/index.js +++ b/public/react/src/modules/courses/Resource/index.js @@ -51,6 +51,7 @@ class Fileslists extends Component{ istowshowid:'', //新增参数判断几级目录 parent_category_id:'', + isToggleOn:false, } } @@ -673,8 +674,10 @@ class Fileslists extends Component{ //判断二级链接是否显示 istowshow(item){ + let toggleon=this.state.isToggleOn; this.setState({ - istowshowid:item.value + istowshowid:item.value, + isToggleOn:!toggleon }) } @@ -1032,9 +1035,9 @@ class Fileslists extends Component{ {course_modules&&course_modules.course_modules.map((item,key)=>{ return( - -
  • this.moveTos(0)} title={item.title}>{item.title}
    • - +
    +
  • this.moveTos(0)} title={item.title}>{item.title}
    • +
    ) })} @@ -1046,7 +1049,7 @@ class Fileslists extends Component{ return(
    -
  • this.moveTos(0)} title={itm.title}>{itm.title}
    • +
  • this.moveTos(itm.value)} title={itm.title}>{itm.title}
    • {/*
    this.moveTos(itm.value )} style={{marginLeft:15,width:itm.title.length>13?200:undefined,color:'#000000',overflow: 'hidden',textOverflow:'ellipsis',whiteSpace: 'nowrap'}}>{itm.title}
    */} {itm.children.length===0?'': this.istowshow(itm,filesId)} className="iconfont icon-xiajiantou font-12 ml2">} @@ -1056,10 +1059,10 @@ class Fileslists extends Component{ itm.children.map((tt,ti) => { return( filesId&&filesId===itm.id?"": -
    -
    +
    +
    -
  • 13?200:undefined,overflow: 'hidden',textOverflow:'ellipsis',whiteSpace: 'nowrap'}} key={ti} id={tt.value} onClick={() => this.moveTos(tt.value )} title={tt.title}>{tt.title}
    • +
  • 13?200:undefined,overflow: 'hidden',textOverflow:'ellipsis',whiteSpace: 'nowrap'}} key={ti} id={tt.value} onClick={() => this.moveTos(tt.value )} title={tt.title}>{tt.title}
    • diff --git a/public/react/src/modules/courses/coursesDetail/CoursesLeftNav.js b/public/react/src/modules/courses/coursesDetail/CoursesLeftNav.js index 309f536c7..b14b30a96 100644 --- a/public/react/src/modules/courses/coursesDetail/CoursesLeftNav.js +++ b/public/react/src/modules/courses/coursesDetail/CoursesLeftNav.js @@ -1200,14 +1200,13 @@ class Coursesleftnav extends Component{ >
    {this.state.Navmodalziyname==="资源"?
    -
    上级目录：
    +
    上级目录：
    document.getElementById('ddd')} dropdownClassName={{display:this.state.dropdownStyleshow}} - // dropdownMenuStyle={{display:this.state.dropdownStyleshow}} treeData={this.state.treeData} placeholder={this.state.treeDataname} disabled={this.state.showPreson} diff --git a/public/react/src/modules/courses/coursesDetail/MainLeftNav.css b/public/react/src/modules/courses/coursesDetail/MainLeftNav.css index 6b344fbe3..955d1d3d1 100644 --- a/public/react/src/modules/courses/coursesDetail/MainLeftNav.css +++ b/public/react/src/modules/courses/coursesDetail/MainLeftNav.css @@ -36,11 +36,8 @@ display:inline-block; max-width:200px; } -.ant-select-tree-title{ - overflow:hidden; - text-overflow:ellipsis; - white-space:nowrap; - max-width:200px; +.ant-select-tree{ + max-height:300px; } /*鼠标悬浮在滚动条上的主干部分*/ diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js index fb9c244cd..23869ac62 100644 --- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js +++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js @@ -510,7 +510,7 @@ class Listofworksstudentone extends Component { ), }, ], - orders: "update_time", + orders: "work_score", columnsstu2: [ { title: '序号', diff --git a/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js b/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js index c539cb7b2..cc88065a6 100644 --- a/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js +++ b/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js @@ -279,7 +279,7 @@ class ShixunHomeworkPage extends Component { typelist={teacherdatapage === undefined ? [""] : teacherdatapage.homework_status} /> this.gotohome()}>返回 - {teacherdatapage&&teacherdatapage.shixun_status>1?1?实训详情:""} diff --git a/public/react/src/modules/courses/statistics/Statistics.js b/public/react/src/modules/courses/statistics/Statistics.js index 589d8eb90..8d0d0984e 100644 --- a/public/react/src/modules/courses/statistics/Statistics.js +++ b/public/react/src/modules/courses/statistics/Statistics.js @@ -172,6 +172,8 @@ class Statistics extends Component{ } }) + + // console.log(getRandomcode(`${url}?${urllist}`)) this.props.slowDownload(getRandomcode(`${url}?${urllist}`)); } @@ -420,7 +422,7 @@ class Statistics extends Component{ { this.props.isAdmin()===true? // 这里是文件下载 不能替换路由 - this.derivefun(this.state.activeKey==="1"?`/classrooms/${this.props.match.params.coursesId}/export_member_scores_excel.xlsx`:`/courses/${this.props.match.params.coursesId}/export_member_act_score.xlsx`)}>导出 + this.derivefun(this.state.activeKey==="1"?`/courses/${this.props.match.params.coursesId}/export_member_scores_excel.xlsx`:`/courses/${this.props.match.params.coursesId}/export_member_act_score.xlsx`)}>导出 :"" } ; diff --git a/public/react/src/modules/tpm/TPMIndexHOC.js b/public/react/src/modules/tpm/TPMIndexHOC.js index 1731a55fa..dcf723ee6 100644 --- a/public/react/src/modules/tpm/TPMIndexHOC.js +++ b/public/react/src/modules/tpm/TPMIndexHOC.js @@ -662,6 +662,7 @@ export function TPMIndexHOC(WrappedComponent) { console.log('failCallback') } }) + this.setState({ globalLoading: false }) } yslslowCheckresults =(tip) =>{ this._gLoadingTip = tip || '成绩计算中，请稍候...';