m52mxtq3o
/
educoder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/dev_ec' into dev_ec

Browse Source
dev_cs
杨树明 5 years ago
parent 431db55297 a923e232a3
commit 1c358a4c6a
4 changed files with 68 additions and 97 deletions
Show Stats Download Patch File Download Diff File

4
public/react/src/modules/ecs/curriculum/Curriculum.js
Unescape View File

@ -238,10 +238,10 @@ class Curriculum extends Component {
{/*成绩等级设置*/} {/*成绩等级设置*/}
<Route extra path='/ecs/major_schools/:majorId/years/:yearId/courses/:type/3' <Route extra path='/ecs/major_schools/:majorId/years/:yearId/courses/:type/3'
render={ (props) => (<Curriculumtwo {...this.props} {...props} {...this.state} Ontitine={(i)=>this.Ontitine(i)}/>) }></Route> render={ (props) => (<Curriculumtwo {...this.props} {...props} {...this.state} Ontitine={(i)=>this.Ontitine(i)}/>) }></Route>
{/*课程目标评价方法*/} {/*4课程目标评价方法*/}
<Route extra path='/ecs/major_schools/:majorId/years/:yearId/courses/:type/4' <Route extra path='/ecs/major_schools/:majorId/years/:yearId/courses/:type/4'
render={ (props) => (<EcCourseEvaluationsbottom {...this.props} {...props} {...this.state} Ontitine={(i)=>this.Ontitine(i)}/>) }></Route> render={ (props) => (<EcCourseEvaluationsbottom {...this.props} {...props} {...this.state} Ontitine={(i)=>this.Ontitine(i)}/>) }></Route>
{/*课程达成评价结果*/} {/*5课程达成评价结果*/}
<Route extra path='/ecs/major_schools/:majorId/years/:yearId/courses/:type/5' <Route extra path='/ecs/major_schools/:majorId/years/:yearId/courses/:type/5'
render={ (props) => (<EcCompletionCalculation {...this.props} {...props} {...this.state} Ontitine={(i)=>this.Ontitine(i)}/>) }></Route> render={ (props) => (<EcCompletionCalculation {...this.props} {...props} {...this.state} Ontitine={(i)=>this.Ontitine(i)}/>) }></Route>
</Switch> </Switch>

108
public/react/src/modules/ecs/subroute/ecCompletion_calculation/EcCompletionCalculation.js
Unescape View File

@ -3,7 +3,7 @@ import classNames from 'classnames'
import axios from 'axios'; import axios from 'axios';
import { TPMIndexHOC } from '../../../tpm/TPMIndexHOC'; // import { TPMIndexHOC } from '../../../tpm/TPMIndexHOC';
import { SnackbarHOC } from 'educoder' import { SnackbarHOC } from 'educoder'
@ -431,60 +431,56 @@ class EcCompletionCalculation extends Component {
<div className="educontent mb290"> <div className="educontent mb290">
<EcTitleCourseEvaluations {/*<EcTitleCourseEvaluations*/}
{...this.props} {/* {...this.props}*/}
schooldata={schooldata} {/* schooldata={schooldata}*/}
ecComponentState={'ecCompletion'} {/* ecComponentState={'ecCompletion'}*/}
ecpath={"show"} {/* ecpath={"show"}*/}
/> {/*/>*/}
<div className="edu-back-white eacourse"> {/*<div className="edu-back-white eacourse">*/}
{/* <div className="clearfix padding20-30 bor-bottom-greyE">*/}
<div className="clearfix padding20-30 bor-bottom-greyE"> {/* <a href={schooldata.course_setting_url} className="color-grey-9 TrainingLecturer">课程体系</a> >*/}
<a href={schooldata.course_setting_url} className="color-grey-9 TrainingLecturer">课程体系</a> > {/* <a className="TrainingTheory major_name"> {schooldata.ec_course_name} 达成评价详情</a>*/}
<a className="TrainingTheory major_name"> {schooldata.ec_course_name} 达成评价详情</a> {/* /!* <a href="javascript:void(0)" className="fr white-btn edu-blueback-btn mt4">导出培养目标</a> *!/*/}
{/* <a href="javascript:void(0)" className="fr white-btn edu-blueback-btn mt4">导出培养目标</a> */} {/* <div className="color-grey-9 mr10">系统根据课程目标、课程考核方式与课程目标评价方法，一键计算评价课程目标的达成情况 <a className={"color-blue"} onClick={() => window.elasticLayer(3533)}>查看详情</a></div>*/}
<div className="color-grey-9 mr10">系统根据课程目标、课程考核方式与课程目标评价方法，一键计算评价课程目标的达成情况 <a className={"color-blue"} onClick={() => window.elasticLayer(3533)}>查看详情</a></div> {/* </div>*/}
{/* <div className="padding20-30" id="training_objective_contents"*/}
</div> {/* style={{*/}
{/* position: 'relative'*/}
<div className="padding20-30" id="training_objective_contents" {/* }}*/}
style={{ {/* >*/}
position: 'relative' {/* <a className="fl SystemParameters" style={{display:schooldata.ec_course_support_setting_url===null?"none":"block"}}*/}
}} {/* href={schooldata.ec_course_support_setting_url}>1.课程目标</a>*/}
> {/* <a className="fl SystemParameters ml40"*/}
<a className="fl SystemParameters" style={{display:schooldata.ec_course_support_setting_url===null?"none":"block"}} {/* style={{display:schooldata.ec_course_reach_setting_url===null?"none":"block"}}*/}
href={schooldata.ec_course_support_setting_url}>1.课程目标</a> {/* href={schooldata.ec_course_reach_setting_url}>2.课程考核方式与数据来源</a>*/}
<a className="fl SystemParameters ml40" {/* <a className="fl SystemParameters4CACFF ml40 color4D4D4D"*/}
style={{display:schooldata.ec_course_reach_setting_url===null?"none":"block"}} {/* href={schooldata.score_level_setting_url}*/}
href={schooldata.ec_course_reach_setting_url}>2.课程考核方式与数据来源</a> {/* >3.成绩等级设置</a>*/}
<a className="fl SystemParameters4CACFF ml40 color4D4D4D" {/* <a className="fl SystemParameters ml40"*/}
href={schooldata.score_level_setting_url} {/* style={{display:schooldata.evaluation_methods_url===null?"none":"block"}}*/}
>3.成绩等级设置</a> {/* href={schooldata.evaluation_methods_url}>4.课程目标评价方法</a>*/}
<a className="fl SystemParameters ml40" {/* <a className="fl SystemParameters ml40"*/}
style={{display:schooldata.evaluation_methods_url===null?"none":"block"}} {/* style={{display:schooldata.competition_calculation_info_url===null?"none":"block",color:'#4CACFF'}}*/}
href={schooldata.evaluation_methods_url}>4.课程目标评价方法</a> {/* href={schooldata.competition_calculation_info_url}>5.课程达成评价结果</a>*/}
<a className="fl SystemParameters ml40" {/* /!* <span className="right ml20 SystemParameters">课程体系：*/}
style={{display:schooldata.competition_calculation_info_url===null?"none":"block",color:'#4CACFF'}} {/* {*/}
href={schooldata.competition_calculation_info_url}>5.课程达成评价结果</a> {/* evaluate_result===false?<span className="Systemnum">未达成</span>:<span className="Systemnum color-green">达成</span>*/}
{/* <span className="right ml20 SystemParameters">课程体系： {/* }*/}
{ {/* </span> *!/*/}
evaluate_result===false?<span className="Systemnum">未达成</span>:<span className="Systemnum color-green">达成</span> {/* <span className={ismanager===false?"none":"right newrightcalculatebutton"} */}
} {/* style={{*/}
</span> */} {/* marginLeft: '26px',*/}
<span className={ismanager===false?"none":"right newrightcalculatebutton"} {/* position: 'absolute',*/}
style={{ {/* right: '157px'*/}
marginLeft: '26px', {/* }}*/}
position: 'absolute', {/* onClick={this.newrightcalculatebutton}>计算</span>*/}
right: '157px' {/* <span className={ismanager===false?"none":"Importclassroomdata"} style={{top: "26px"}}>*/}
}} {/* <a className="white-btn edu-blueback-btn fr mb10 mr10" target="_blank" href={"/ec_courses/"+ec_course_id+"/export_evaluation_result.xls"}>导出评价详情</a>*/}
onClick={this.newrightcalculatebutton}>计算</span> {/* </span>*/}
<span className={ismanager===false?"none":"Importclassroomdata"} style={{top: "26px"}}> {/* </div>*/}
<a className="white-btn edu-blueback-btn fr mb10 mr10" target="_blank" href={"/ec_courses/"+ec_course_id+"/export_evaluation_result.xls"}>导出评价详情</a> {/*</div>*/}
</span>
</div>
</div>
<div className="ListTableLine newSystem mb20" id="school_major_list"> <div className="ListTableLine newSystem mb20" id="school_major_list">
@ -809,5 +805,5 @@ class EcCompletionCalculation extends Component {
} }
} }
export default SnackbarHOC() ( TPMIndexHOC ( EcCompletionCalculation ) ); export default SnackbarHOC() (EcCompletionCalculation);

16
public/react/src/modules/ecs/subroute/ecCourseEvaluations/EcCourseEvaluationsbottom.js
Unescape View File

@ -6,7 +6,7 @@ import classNames from 'classnames'
import axios from 'axios'; import axios from 'axios';
import { TPMIndexHOC } from '../../../tpm/TPMIndexHOC'; // import { TPMIndexHOC } from '../../../tpm/TPMIndexHOC';
import { SnackbarHOC } from 'educoder' import { SnackbarHOC } from 'educoder'
@ -664,7 +664,7 @@ class EcCourseEvaluationsbottom extends Component {
} = this.state; } = this.state;
return ( return (
<div className="newMain clearfix"> <div className="newMain clearfix">
<div className="educontent mb50 mt60"> <div className="educontent mb50">
<Modal <Modal
title={titlemessages} title={titlemessages}
// visible={modeldelet===true&&listid===list.id?true:false} // visible={modeldelet===true&&listid===list.id?true:false}
@ -703,11 +703,11 @@ class EcCourseEvaluationsbottom extends Component {
{/*</div>*/} {/*</div>*/}
{/*</div>*/} {/*</div>*/}
<EcTitleCourseEvaluations {/*<EcTitleCourseEvaluations*/}
{...this.props} {/* {...this.props}*/}
schooldata={schooldata} {/* schooldata={schooldata}*/}
ecpath={"show"} {/* ecpath={"show"}*/}
/> {/*/>*/}
{/*<div className="edu-back-white eacourse">*/} {/*<div className="edu-back-white eacourse">*/}
@ -1036,4 +1036,4 @@ class EcCourseEvaluationsbottom extends Component {
} }
} }
export default SnackbarHOC() ( TPMIndexHOC ( EcCourseEvaluationsbottom ) ); export default SnackbarHOC() (EcCourseEvaluationsbottom);

37
public/react/src/modules/ecs/subroute/ecStudentList/EcStudentList.js
Unescape View File

@ -5,7 +5,7 @@ import { Spin } from 'antd';
import { TPMIndexHOC } from '../../../tpm/TPMIndexHOC'; import { TPMIndexHOC } from '../../../tpm/TPMIndexHOC';
import { SnackbarHOC } from 'educoder' import { SnackbarHOC,getImageUrl } from 'educoder'
import { Pagination,Upload,Modal,Checkbox } from 'antd'; import { Pagination,Upload,Modal,Checkbox } from 'antd';
@ -21,10 +21,9 @@ class EcStudentList extends Component {
constructor(props) { constructor(props) {
super(props) super(props)
this.state={ this.state={
schooldata:{},
majorschoollist:undefined, majorschoollist:undefined,
titlemessage:"提示", titlemessage:"提示",
ecComponentState:"ecStudentList", // ecComponentState:"ecStudentList",
visible:false, visible:false,
Modallist:'', Modallist:'',
Modallisttypes:0, Modallisttypes:0,
@ -40,24 +39,6 @@ class EcStudentList extends Component {
let major_id=this.props.match.params.major_id; let major_id=this.props.match.params.major_id;
let year_id=this.props.match.params.year_id; let year_id=this.props.match.params.year_id;
const jol =`/ec_major_schools/get_navigation_data?ec_year_id=`+year_id;
axios.get(jol, {
withCredentials: true,
}).then((response) => {
if(response.status===200){
// if(response.data.allow_visit===false){
// window.location.href="/403"
// }
this.setState({
schooldata:response.data
})
}
})
.catch(function (error) {
console.log(error);
});
const url ='/ec_major_schools/'+major_id+'/academic_years/'+year_id+'/student_lists_data'; const url ='/ec_major_schools/'+major_id+'/academic_years/'+year_id+'/student_lists_data';
axios.get(url, { axios.get(url, {
withCredentials: true, withCredentials: true,
@ -267,7 +248,7 @@ class EcStudentList extends Component {
} }
render() { render() {
let {schooldata, let {
majorschoollist, majorschoollist,
Modallisttype, Modallisttype,
titlemessage, titlemessage,
@ -322,12 +303,6 @@ class EcStudentList extends Component {
</div> </div>
</Modal> </Modal>
<div className="educontent mb290"> <div className="educontent mb290">
<EcTitleCourseEvaluations
{...this.props}
schooldata={schooldata}
ecpath={this.state.ecComponentState}
/>
<div className="clearfix padding20-30 bor-bottom-greyE mb10 edu-back-white"> <div className="clearfix padding20-30 bor-bottom-greyE mb10 edu-back-white">
<span className="fl font-18 courseSystem ">学生列表</span> <span className="fl font-18 courseSystem ">学生列表</span>
<a className="fr font-15 courseSystem" onClick={this.windowsgoblack}>返回</a> <a className="fr font-15 courseSystem" onClick={this.windowsgoblack}>返回</a>
@ -381,12 +356,12 @@ class EcStudentList extends Component {
{ {
majorschoollist===undefined? majorschoollist===undefined?
<div className="edu-txt-center color-grey-9 pt50"> <div className="edu-txt-center color-grey-9 pt50">
<p className="mb20"><img className="edu-nodata-img mb20" src={require('./nodata.png')} /></p> <p className="mb20"><img className="edu-nodata-img mb20" src={getImageUrl("images/educoder/nodata.png")} /></p>
<p>学生数据为空，请导入数据</p> <p>学生数据为空，请导入数据</p>
</div> </div>
:majorschoollist.ec_students.length===0? :majorschoollist.ec_students.length===0?
<div className="edu-txt-center color-grey-9 pt50"> <div className="edu-txt-center color-grey-9 pt50">
<p className="mb20"><img className="edu-nodata-img mb20" src={require('./nodata.png')}/></p> <p className="mb20"><img className="edu-nodata-img mb20" src={getImageUrl("images/educoder/nodata.png")}/></p>
<p>学生数据为空，请导入数据</p> <p>学生数据为空，请导入数据</p>
</div>:majorschoollist.ec_students.map((item,key)=>{ </div>:majorschoollist.ec_students.map((item,key)=>{
// console.log(item) // console.log(item)
@ -427,4 +402,4 @@ class EcStudentList extends Component {
} }
} }
export default SnackbarHOC() ( TPMIndexHOC ( EcStudentList ) ); export default SnackbarHOC() (EcStudentList);
Write Preview
Loading…
Cancel
Save