From 16eb9fff0073132d4f12b829b7ba17f12a8fb692 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Wed, 18 Mar 2020 12:13:20 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E3=80=81=E5=AE=9E=E8=AE=AD=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/courses/shixunHomework/Listofworksstudentone.js | 2 +- .../src/modules/courses/shixunHomework/ShixunHomeworkPage.js | 2 +- public/react/src/modules/courses/statistics/Statistics.js | 4 +++- public/react/src/modules/tpm/TPMIndexHOC.js | 1 + 4 files changed, 6 insertions(+), 3 deletions(-) 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 || '成绩计算中，请稍候...'; From 5ba0261f4da6e33d8f867d81d33c6a52d29846f3 Mon Sep 17 00:00:00 2001 From: dinglink <837816638@qq.com> Date: Wed, 18 Mar 2020 12:40:44 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E8=B5=84=E6=BA=90=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=8Abug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/modules/courses/Resource/index.js | 19 +++++++++++-------- .../courses/coursesDetail/CoursesLeftNav.js | 7 +++---- .../courses/coursesDetail/MainLeftNav.css | 6 ------ 3 files changed, 14 insertions(+), 18 deletions(-) diff --git a/public/react/src/modules/courses/Resource/index.js b/public/react/src/modules/courses/Resource/index.js index 1719a3eb2..5a5a5ec9b 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(tt.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..1eb41779e 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..c892aa102 100644 --- a/public/react/src/modules/courses/coursesDetail/MainLeftNav.css +++ b/public/react/src/modules/courses/coursesDetail/MainLeftNav.css @@ -36,12 +36,6 @@ display:inline-block; max-width:200px; } -.ant-select-tree-title{ - overflow:hidden; - text-overflow:ellipsis; - white-space:nowrap; - max-width:200px; -} /*鼠标悬浮在滚动条上的主干部分*/ /*.droppableul::-webkit-scrollbar-track:hover {*/ From 8ac13a99af2bce47a85c6c6971a43ba47f0a0f78 Mon Sep 17 00:00:00 2001 From: dinglink <837816638@qq.com> Date: Wed, 18 Mar 2020 13:01:32 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../react/src/modules/courses/coursesDetail/CoursesLeftNav.js | 4 ++-- .../react/src/modules/courses/coursesDetail/MainLeftNav.css | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/public/react/src/modules/courses/coursesDetail/CoursesLeftNav.js b/public/react/src/modules/courses/coursesDetail/CoursesLeftNav.js index 1eb41779e..b14b30a96 100644 --- a/public/react/src/modules/courses/coursesDetail/CoursesLeftNav.js +++ b/public/react/src/modules/courses/coursesDetail/CoursesLeftNav.js @@ -1200,12 +1200,12 @@ class Coursesleftnav extends Component{ >
    {this.state.Navmodalziyname==="资源"?
    -
    上级目录：
    +
    上级目录：
    document.getElementById('ddd')} + getPopupContainer={() => document.getElementById('ddd')} dropdownClassName={{display:this.state.dropdownStyleshow}} treeData={this.state.treeData} placeholder={this.state.treeDataname} diff --git a/public/react/src/modules/courses/coursesDetail/MainLeftNav.css b/public/react/src/modules/courses/coursesDetail/MainLeftNav.css index c892aa102..955d1d3d1 100644 --- a/public/react/src/modules/courses/coursesDetail/MainLeftNav.css +++ b/public/react/src/modules/courses/coursesDetail/MainLeftNav.css @@ -36,6 +36,9 @@ display:inline-block; max-width:200px; } +.ant-select-tree{ + max-height:300px; +} /*鼠标悬浮在滚动条上的主干部分*/ /*.droppableul::-webkit-scrollbar-track:hover {*/ From 4c4bc3ebb505e5b66fcd6cc494910d12ee164b0f Mon Sep 17 00:00:00 2001 From: dinglink <837816638@qq.com> Date: Wed, 18 Mar 2020 13:13:11 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E4=BA=8C=E7=BA=A7?= =?UTF-8?q?=E7=9B=AE=E5=BD=95=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/modules/courses/Resource/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/react/src/modules/courses/Resource/index.js b/public/react/src/modules/courses/Resource/index.js index 5a5a5ec9b..1248f6138 100644 --- a/public/react/src/modules/courses/Resource/index.js +++ b/public/react/src/modules/courses/Resource/index.js @@ -1049,7 +1049,7 @@ class Fileslists extends Component{ return(
    -
  • this.moveTos(tt.value)} 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">}