diff --git a/public/react/src/modules/courses/busyWork/CommonWorkAppraiseReviseAttachments.js b/public/react/src/modules/courses/busyWork/CommonWorkAppraiseReviseAttachments.js
index d12099d38..b487af487 100644
--- a/public/react/src/modules/courses/busyWork/CommonWorkAppraiseReviseAttachments.js
+++ b/public/react/src/modules/courses/busyWork/CommonWorkAppraiseReviseAttachments.js
@@ -33,7 +33,7 @@ function CommonWorkAppraiseReviseAttachments(props) {
{item.title}
{item.filesize}
- {item.delete===true?this.onAttachmentRemove(item.id)}>:""}
+ {item.delete===true?this.props.onAttachmentRemove(item.id)}>:""}
)
})}
diff --git a/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js b/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js
index 60065f43e..6fdde6aeb 100644
--- a/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js
+++ b/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js
@@ -22,7 +22,7 @@ import 'moment/locale/zh-cn';
import './yslexercisetable.css';
import {getImageUrl, toPath} from 'educoder';
import CheckBoxGroup from "../../page/component/CheckBoxGroup";
-
+import NoneData from '../../../modules/courses/coursesPublic/NoneData'
const Search = Input.Search;
const RadioGroup = Radio.Group;
const CheckboxGroup = Checkbox.Group;
@@ -1217,6 +1217,7 @@ class Studentshavecompletedthelist extends Component {
)
},
],
+ exercise_status:0,
}
// console.log("Studentshavecompletedthelist");
// console.log(props.current_status);
@@ -1277,6 +1278,20 @@ class Studentshavecompletedthelist extends Component {
}catch (e) {
}
+ try {
+ if(this.props.Commonheadofthetestpaper.exercise_status !== undefined){
+ this.setState({
+ exercise_status:this.props.Commonheadofthetestpaper.exercise_status,
+ })
+ }else{
+ this.setState({
+ exercise_status:0,
+ })
+ }
+ }catch (e) {
+
+ }
+
}
componentWillReceiveProps = (nextProps) => {
@@ -2065,11 +2080,11 @@ class Studentshavecompletedthelist extends Component {
this.setState({
loadingstate: false,
})
- console.log(response);
- console.log(1997);
+ // console.log(response);
+ // console.log(1997);
this.Generatenewdatasy(response.data.exercise_users, response);
}).catch((error) => {
- console.log(error)
+ // console.log(error)
this.setState({
loadingstate: false,
})
@@ -2472,7 +2487,7 @@ class Studentshavecompletedthelist extends Component {
render() {
const isAdmin = this.props.isAdmin();
- let {data, datas, page, columns, course_groupyslsthree, columnstwo, styletable, course_groupyslstwodatas, limit, course_groupysls, course_groupyslstwodata, course_groupyslstwo, teacherlists, Teacherliststudentlist, order, columnss, course_groupsdatas, course_groups, Evaluationarray, unlimited, unlimiteds, unlimitedtwo, teacherlist, searchtext, loadingstate, review, nocomment, commented, unsubmitted, submitted, columnsys, exercise_users,mylistansum} = this.state;
+ let {data, datas, page, columns, course_groupyslsthree, columnstwo, styletable,exercise_status, course_groupyslstwodatas, limit, course_groupysls, course_groupyslstwodata, course_groupyslstwo, teacherlists, Teacherliststudentlist, order, columnss, course_groupsdatas, course_groups, Evaluationarray, unlimited, unlimiteds, unlimitedtwo, teacherlist, searchtext, loadingstate, review, nocomment, commented, unsubmitted, submitted, columnsys, exercise_users,mylistansum} = this.state;
// console.log("Studentshavecompletedthelist");
// console.log(this.props.current_status);
return (
@@ -2483,202 +2498,211 @@ class Studentshavecompletedthelist extends Component {
" min-width": " 1200px",
}}>
{/*老师*/}
-
-
- : ""
}
-
+ {
+ exercise_status===0 || exercise_status===1 ?
+
-
- 作品状态：
- this.notlimiteds()}>不限
-
this.checkeboxstwo(e, course_groupyslstwodata && course_groupyslstwodata)}> - { - course_groupyslstwodata.map((item, key) => { - return ( - -{item.tu}({Teacherliststudentlist === undefined ? "0" : key === 0 ? Teacherliststudentlist.exercise_types.unanswer_users : Teacherliststudentlist.exercise_types.answer_users}) - ) - }) - } ---this.onSearchKeywordKeyUp(e)} - onInput={this.inputSearchValues} - onSearch={this.searchValues} - > -
- :
- -
- 你的评阅：
- this.notlimited()}>不限
-
-
this.checkeboxs(e, course_groupyslstwodata && course_groupyslstwodata)}> - { - course_groupyslstwodatas.map((item, key) => { - return ( - -{item.tu}({Teacherliststudentlist === undefined ? "0" : key === 0 ? Teacherliststudentlist.exercise_types.unreview_counts : Teacherliststudentlist.exercise_types.review_counts}) - ) - }) - } ---this.onSearchKeywordKeyUp(e)} - onInput={this.inputSearchValues} - onSearch={this.searchValues} - > -
- {/*作品状态*/}
- -
- 作品状态：
- this.notlimiteds()}>不限
-
this.checkeboxstwo(e, course_groupyslstwodata && course_groupyslstwodata)}> - { - course_groupyslstwodata.map((item, key) => { - return ( - -{item.tu}({Teacherliststudentlist === undefined ? "0" : key === 0 ? Teacherliststudentlist.exercise_types.unanswer_users : Teacherliststudentlist.exercise_types.answer_users}) - ) - }) - } -
- -
+ 作品状态：
+ this.notlimiteds()}>不限
+
this.checkeboxstwo(e, course_groupyslstwodata && course_groupyslstwodata)}> + { + course_groupyslstwodata.map((item, key) => { + return ( + +{item.tu}({Teacherliststudentlist === undefined ? "0" : key === 0 ? Teacherliststudentlist.exercise_types.unanswer_users : Teacherliststudentlist.exercise_types.answer_users}) + ) + }) + } +++this.onSearchKeywordKeyUp(e)} + onInput={this.inputSearchValues} + onSearch={this.searchValues} + > +
+ :
+ -
+ 你的评阅：
+ this.notlimited()}>不限
+
+
this.checkeboxs(e, course_groupyslstwodata && course_groupyslstwodata)}> + { + course_groupyslstwodatas.map((item, key) => { + return ( + +{item.tu}({Teacherliststudentlist === undefined ? "0" : key === 0 ? Teacherliststudentlist.exercise_types.unreview_counts : Teacherliststudentlist.exercise_types.review_counts}) + ) + }) + } +++this.onSearchKeywordKeyUp(e)} + onInput={this.inputSearchValues} + onSearch={this.searchValues} + > +
+ {/*作品状态*/}
+ -
+ 作品状态：
+ this.notlimiteds()}>不限
+
this.checkeboxstwo(e, course_groupyslstwodata && course_groupyslstwodata)}> + { + course_groupyslstwodata.map((item, key) => { + return ( + +{item.tu}({Teacherliststudentlist === undefined ? "0" : key === 0 ? Teacherliststudentlist.exercise_types.unanswer_users : Teacherliststudentlist.exercise_types.answer_users}) + ) + }) + } +
+ -
-
- -分班情况： -this.funtaskstatustwos()}>不限 - -- +this.funtaskstatustwo(e, course_groups && course_groups)} - style={{paddingTop: '4px', display: "inline"}}> - { - course_groups.map((item, key) => { - return ( - + } + {/*分班情况*/} + {course_groups === undefined ? "" : course_groups === null ? "" : course_groups.length < 2 ? "" : JSON.stringify(course_groups) === "[]" ? "" : +{item.exercise_group_name}({item.exercise_group_students}) - ) - }) - } -- +
+ +分班情况： +this.funtaskstatustwos()}>不限 + ++ -this.funtaskstatustwo(e, course_groups && course_groups)} + style={{paddingTop: '4px', display: "inline"}}> + { + course_groups.map((item, key) => { + return ( + -{item.exercise_group_name}({item.exercise_group_students}) + ) + }) + } +
- }
+
+ }
- - +
-
-
- {order === "end_at" ? "时间" : order === "score" ? "成绩" : order === "student_id" ? "学号" : ""}排序
-
-
-
-
- this.funordersy("end_at")} data-remote="true" - className=" font-12" style={{textAlign: "center "}}>提交时间 -
- this.funordersy("score")} data-remote="true" - className=" font-12" style={{textAlign: "center "}}>最终成绩 -
- this.funordersy("student_id")} data-remote="true" - className=" font-12" style={{textAlign: "center "}}>学生学号 -
- -
+
+ {order === "end_at" ? "时间" : order === "score" ? "成绩" : order === "student_id" ? "学号" : ""}排序
+
+
-
+
- this.funordersy("end_at")} data-remote="true" + className=" font-12" style={{textAlign: "center "}}>提交时间 +
- this.funordersy("score")} data-remote="true" + className=" font-12" style={{textAlign: "center "}}>最终成绩 +
- this.funordersy("student_id")} data-remote="true" + className=" font-12" style={{textAlign: "center "}}>学生学号 +
+
+
+ :
+
+
- {
- Teacherliststudentlist && Teacherliststudentlist.exercise_types.total_users && Teacherliststudentlist.exercise_types.total_users > limit ?
-
+
- :
- -
- {/*你的评阅：*/}
- {
- Teacherliststudentlist === undefined || Teacherliststudentlist.exercise_types.subjective === 0 ?
-
-
+ {/*你的评阅：*/}
+ {
+ Teacherliststudentlist === undefined || Teacherliststudentlist.exercise_types.subjective === 0 ?
+
+
- }
- {/*分班情况*/}
- {course_groups === undefined ? "" : course_groups === null ? "" : course_groups.length < 2 ? "" : JSON.stringify(course_groups) === "[]" ? "" :
-
-
- {JSON.stringify(data) !== "[]" ?
-
+
+
+
+
{Teacherliststudentlist === undefined ? "0" : Teacherliststudentlist.exercise_types.total_users}个检索结果（{Teacherliststudentlist === undefined ? "0" : Teacherliststudentlist.exercise_types.exercise_all_users}学生）
-
-
-
+ -
-
+
- -
+
-
-
+
- {data === undefined ? "" :
}
-
-
+ {data === undefined ? "" :
}
+
+
-
+ }
-
-
+ :
+
- ![]({getImageUrl("images/educoder/nodata.png")}/)
-
-
- 暂时还没有相关数据哦！
-
+
- }
+
+
-
+
+
+
+ 暂时还没有相关数据哦！
+
-
+ {
+ Teacherliststudentlist && Teacherliststudentlist.exercise_types.total_users && Teacherliststudentlist.exercise_types.total_users > limit ?
+
+
+ : ""
+ }
-
+ {
+ exercise_status === 0 || exercise_status === 1 ?
+
+ }
+
+ :
+
-
+
+
- {JSON.stringify(datas) === "[]" ?
-
-
+
+
-
{Teacherliststudentlist === undefined ? "0" : Teacherliststudentlist.exercise_types.answer_users}}
-
+
-
+ }
-
-
+ {JSON.stringify(datas) === "[]" ?
+
-
-
-
- 暂时还没有相关数据哦！
-
+
- :
-
+
-
+
+
+
+ 暂时还没有相关数据哦！
+
-
-
- }
-
+
- {datas === undefined ? "" :
}
-
-
+ {datas === undefined ? "" :
}
+
+
-
-
+ }
+
- {
- mylistansum && mylistansum > limit ?
-
- {data === undefined ? "" :
}
-
- {JSON.stringify(datas) === "[]" ?
-
-
-
- }
-
-
- :
-
-
-
+ {JSON.stringify(datas) === "[]" ?
-
- 暂时还没有相关数据哦！
+ } + +
+ {data === undefined ? "" :
}
-
- < div id="graduation_work_list" style={{
- padding: '0px 30px 10px 30px',
- "margin-top": "20px",
- "margin-bottom": "10px"
- }}>
+
+
+
-
+
-
+
+
+
+ 暂时还没有相关数据哦！
+
+
+ :
+
+ < div id="graduation_work_list" style={{
+ padding: '0px 30px 10px 30px',
+ "margin-top": "20px",
+ "margin-bottom": "10px"
+ }}>
+
+
-
{Teacherliststudentlist === undefined ? "0" : Teacherliststudentlist.exercise_types.answer_users} {Teacherliststudentlist === undefined ? "0" : Teacherliststudentlist.exercise_types.exercise_end_time}}
-
-
-
-
- -
-
-
-
- {order === "end_at" ? "时间" : order === "score" ? "成绩" : order === "student_id" ? "学号" : ""}排序
-
-
-
-
- this.funorder("end_at")} data-remote="true" - className=" font-12" style={{textAlign: "center "}}>提交时间 - -
- this.funorder("score")} data-remote="true" - className=" font-12" style={{textAlign: "center "}}>最终成绩 - -
- this.funorder("student_id")} data-remote="true" - className=" font-12" style={{textAlign: "center "}}>学生学号 - -
-
-
-
+
- {datas === undefined ? "" :
}
-
+ {datas === undefined ? "" :
}
+
-
- : ""
}
diff --git a/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js b/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js
index 5775bd240..ba3cee3d3 100644
--- a/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js
+++ b/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js
@@ -436,7 +436,7 @@ class Testpapersettinghomepage extends Component{
/>
{
// 教师列表
- parseInt(tab[0])==0 &&
+
+ : ""
+ }
- {visible === true ? this.saveModulationModal(value, num)}
- /> : ""}
-
- {this.state.showmodel === true ? this.hideshowmodel()}
- updatas={() => this.isupdatas()}
- /> : ""}
-
- this.getcourse_groupslist(id)}
- starttimes={this.state.starttimes}
- typs={this.state.typs}
- />
-
+ {
+ teacherdata && teacherdata.work_count && teacherdata.work_count > limit ?
+
-
- this.cancelModulationModels()}
- />
-
-
- : ""
- }
-
- {/*立即发布*/}
-
-
-
- this.getcourse_groupslist(id)}
+ starttimes={this.state.starttimes}
+ typs={this.state.typs}
+ />
+ {
+ homework_status.length===0?
+
+ }
+
+
+
-
-
-
+ this.cancelModulationModels()}
+ />
+
+
+ : ""
+ }
+
+ {/*立即发布*/}
+
+
+ :
+ homework_status.length>0 && homework_status[0]==="未发布"?
+
+
+ :
+
+
+
+
- )
+
+
+
+
- {computeTimetype===false?
-
-
+
+ {computeTimetype===false?
+
+
正在执行成绩计算，完成后将为您自动刷新结果。温馨提示：执行时间因作品数量而异
- :""}
+ :""}
- {/*作品状态GraduationTaskssettinglist*/}
-
-
- -
-
-
- 计算成绩时间：{teacherdata&&teacherdata.calculation_time==null?"--": moment(teacherdata&&teacherdata.calculation_time).format('YYYY-MM-DD HH:mm')}
+ {/*作品状态GraduationTaskssettinglist*/}
+
-
+
-
+ 计算成绩时间：{teacherdata&&teacherdata.calculation_time==null?"--": moment(teacherdata&&teacherdata.calculation_time).format('YYYY-MM-DD HH:mm')}
- - {course_is_end===true?"": +++ {course_is_end===true?"": {teacherdata&&teacherdata.publish_immediately===false&&computeTimetype===true? (this.props.isNotMember()===false?- - -查看最新成绩 @@ -3223,7 +3241,7 @@ class Listofworksstudentone extends Component {:"") } } - +
- - - - 作品状态： - this.notlimiteds()}>不限 -
this.funtaskstatust(e, task_status && task_status)} - style={{paddingTop: '4px'}}> - - {task_status === undefined ? "" : task_status.map((item, key) => { - return ( - +
+
+ - - - 作品状态： - this.notlimiteds()}>不限 -
-
+
+ 作品状态：
+ this.notlimiteds()}>不限
+
this.funtaskstatust(e, task_status && task_status)} + style={{paddingTop: '4px'}}> + + {task_status === undefined ? "" : task_status.map((item, key) => { + return ( + - {/*请输入姓名或学号搜索*/} - - -{item.name} @@ -3257,96 +3275,96 @@ class Listofworksstudentone extends Component { - ) - })} -
-
-
- {/*分班情况*/}
-
- -
- {JSON.stringify(course_group_info) === "[]" ? "" : course_group_info === undefined ? "" : course_group_info.length < 2 ? "" :
- - 分班情况： - this.notlimitedst()}>不限 -} +
this.funtaskstatustwot(e, course_group_info && course_group_info)} - style={{paddingTop: '4px',width:'1017px'}}> - {course_group_info === undefined ? "" : - course_group_info.map((item, key) => { - return ( - + ) + })} + + {/*请输入姓名或学号搜索*/} + + + + + + {/*分班情况*/} + +- + {JSON.stringify(course_group_info) === "[]" ? "" : course_group_info === undefined ? "" : course_group_info.length < 2 ? "" : +
+ ) + }) + } + ++ 分班情况： + this.notlimitedst()}>不限 +} -this.funtaskstatustwot(e, course_group_info && course_group_info)} + style={{paddingTop: '4px',width:'1017px'}}> + {course_group_info === undefined ? "" : + course_group_info.map((item, key) => { + return ( + -{item.group_group_name} ({item.count}) - ) - }) - } -
- - + {JSON.stringify(course_group_info) === "[]" ? "" : course_group_info === undefined ? "" : course_group_info.length < 2 ? "" : +
-
+ 计算成绩时间：{teacherdata&&teacherdata.calculation_time==null?"--": moment(teacherdata&&teacherdata.calculation_time).format('YYYY-MM-DD HH:mm')}
-
+
- {
- teacherdata && teacherdata.work_count && teacherdata.work_count > limit ?
-
-
+ {
+ JSON.stringify(datajs) === "[]" ?
+
+
+
- {
- JSON.stringify(datajs) === "[]" ?
-
-
{teacherdata === undefined ? "" : teacherdata.all_member_count}个检索结果（{teacherdata === undefined ? "" : teacherdata.all_member_count}学生）
-
-
-
-
-
-
-
- -
-
-
-
- {orders === "work_score" ? "成绩" : orders === "student_id" ? "学号" : ""}排序
-
-
-
- {/*
- this.funordert("update_time")} data-remote="true" className=" font-12" style={{textAlign: "center"}}>更新时间 */} -
- this.funordert("work_score")} data-remote="true" className=" font-12" style={{textAlign: "center"}}>最终成绩 -
- this.funordert("student_id")} data-remote="true" className=" font-12" style={{textAlign: "center"}}>学生学号 -
-
-
- :
-
-
-
-
-
-
-
-
- 暂时还没有相关数据哦！
-
-
+
+
+
+
+
+
+ -
+
-
+
+ {orders === "work_score" ? "成绩" : orders === "student_id" ? "学号" : ""}排序
+
+
-
+ {/*
- this.funordert("update_time")} data-remote="true" className=" font-12" style={{textAlign: "center"}}>更新时间 */} +
- this.funordert("work_score")} data-remote="true" className=" font-12" style={{textAlign: "center"}}>最终成绩 +
- this.funordert("student_id")} data-remote="true" className=" font-12" style={{textAlign: "center"}}>学生学号 +
+
+
+ :
+
+
+
+
+
+
+
+
+ 暂时还没有相关数据哦！
+
+
-
- }
-
-
-
- {datajs === undefined ? "" :
}
-
-
-
- : ""
- }
-
+ {datajs === undefined ? "" :
}
+
+
+
+ : ""
+ }
+
+ }
+
:
- (
-
- {
- teacherdata === undefined || teacherdata.student_works === undefined || teacherdata.student_works === null || JSON.stringify(teacherdata.student_works) === "[]" ?
- // 学生不能查看别人的
-
+ :
+ // 学生能查看别人的
+
-
- {visibles === true ?
-
+ }
+
- this.cancelModulationModels()}
+ />
+
+ : ""
+ }
+
+ {
+ homework_status.length===0?
+
+ this.cancelModulationModels()}
- />
-
- : ""
- }
+ }
+
+
+
+ :
+ homework_status.length>0 && homework_status[0]==="未发布"?
+
+
+ :
-
-
+
-
- {computeTimetype===false?
-
-
+
+ {computeTimetype===false?
+
+
正在执行成绩计算，完成后将为您自动刷新结果。温馨提示：执行时间因作品数量而异
- :""}
+ :""}
- {JSON.stringify(data) !== "[]" ?
-
-
-
+
+ {JSON.stringify(data) !== "[]" ?
+
- :
-
+
+
-
+
+
-
-
-
+
+
- 计算成绩时间：{teacherdata&&teacherdata.calculation_time==null?"--": moment(teacherdata&&teacherdata.calculation_time).format('YYYY-MM-DD HH:mm')}
- { course_is_end===true?"":teacherdata&&teacherdata.task_operation[0]==="开启挑战"?"":
+ 计算成绩时间：{teacherdata&&teacherdata.calculation_time==null?"--": moment(teacherdata&&teacherdata.calculation_time).format('YYYY-MM-DD HH:mm')}
+ { course_is_end===true?"":teacherdata&&teacherdata.task_operation[0]==="开启挑战"?"":
{computeTimetype===true?
(this.props.isNotMember()===false?
-
@@ -3539,14 +3569,14 @@ class Listofworksstudentone extends Component {
}
}
-
+
-
-
-
- {data === undefined ? "" :
}
-
-
+ {data === undefined ? "" :
}
+
+
-
+ }
-
-
+ :
+
-
-
-
- 暂时还没有相关数据哦！
-
+
- }
+
+
-
+
+
+
+ 暂时还没有相关数据哦！
+
+ {/*双层*/}
+ this.cancelModulationModels()}
+ /> : ""
+ }
-
- :
- // 学生能查看别人的
-
- {/*双层*/}
- this.cancelModulationModels()}
- /> : ""
- }
-
+ {
+ homework_status.length===0?
+ {
+ if(keys===key){
+
+ if(item.course_supports.length>0){
+ this.setState({
+ editcourse:item.course_supports,
+ Editkey:key,
+ index:subindex,
+ })
+ }else if(item.course_supports.length===0){
+ this.setState({
+ editcourse:[{weights: 0,top_relation: false,ec_course_name:'',ec_course_id:''}],
+ Editkey:key,
+ index:subindex,
+ })
+ }
+
+ }
+ })
+
+ // $("#school_ListTableLine").show();
+ // let offsettop=$("#school_ListTableLine").position().top||$("#school_ListTableLine").scrollTop || $("#school_ListTableLine").pageYOffset;
+ // window.scrollTo(0, offsettop)
+ }
+
+ Addcourse=(e)=>{
+ let {editcourse} =this.state;
+ let neweditcourse=editcourse;
+ let newadd = {weights: 0,top_relation: false,ec_course_name:'',ec_course_id:''};
+ neweditcourse.push(newadd);
+ this.setState({
+ editcourse:neweditcourse
+ })
+ }
+ editcourse=(neweditcourse)=>{
+ this.setState({
+ editcourse:neweditcourse
+ })
+
+ }
+
+ Deletcourse=(e)=>{
+ // 删除
+ // let id =e.target.getAttribute("index");
+ let {editcourse} = this.state;
+ let neweditcourse=editcourse;
+ neweditcourse.splice(e,1);
+ let newnum=0;
+ for(var j=0;j{
+ let {editcourse} = this.state;
+ let neweditcourse=editcourse;
+ var id=e.target.id;
+ var value=parseFloat(e.target.value);
+ if(isNaN(value)){
+ value=""
+ }
+ var x = String(value).indexOf('.') + 1;
+ var y = String(value).length - x;
+ if(y > 2){
+ this.setState({
+ // Supportstype:true,
+ Supportslist:'请精确到2位数',
+ Supportssum:true
+ })
+ return
+ }
+
+
+ const person = new Object ();
+ person.weights=value;
+ person.ec_course_id= neweditcourse[id].ec_course_id;
+ person.ec_course_name=neweditcourse[id].ec_course_name;
+ person.top_relation=neweditcourse[id].top_relation;
+
+
+ neweditcourse[id]=person;
+
+ let newnum=0;
+ for(var j=0;j1){
+ this.setState({
+ // Supportstype:true,
+ Supportslist:'权重之和不能大于1',
+ Supportssum:true
+ })
+ }
+
+ }
+ handleChange=(e)=> {
+
+ let {editcourse} = this.state;
+ let value=`${e[0]}`;
+ value=parseInt(value)
+ let neweditcourse=editcourse;
+ let num=`${e[1]}`;
+ num=parseInt(num)
+
+ for(var z=0;z{
+
+ let {editcourse} = this.state;
+ let neweditcourse=editcourse;
+ let id =e.target.getAttribute("itindex");
+ for(var i=0;i<1;i++){
+ neweditcourse[id].top_relation=false;
+ }
+
+ this.editcourse(neweditcourse);
+ }
+
+ relevancebottom=(e)=>{
+
+ let {editcourse} = this.state;
+ let neweditcourse=editcourse;
+ let id =e.target.getAttribute("itindex");
+ for(var i=0;i<1;i++){
+ neweditcourse[id].top_relation=true;
+ }
+
+ this.editcourse(neweditcourse);
+ }
+ focus() {
+ this.inputNumberRef.focus();
+ }
+
+ blur() {
+ this.inputNumberRef.blur();
+ }
+ CancelSupports=()=>{
+ this.setState({
+ Editkey:null,
+ Supportssum:false,
+ Supportsclass:false,
+ })
+ }
+ SubmitClassData=()=>{
+ let {editcourse,editnum,ec_graduation_subitem_id,ec_year_id} = this.state;
+ if(editcourse.length===0){
+ this.setState({
+ // Supportstype:true,
+ Supportslist:'保存失败,至少保留一个课程',
+ Supportssum:true
+ })
+ return
+ }
+ if(editnum>1||editnum===0){
+ this.setState({
+ // Supportstype:true,
+ Supportslist:'保存失败,权重大于1或为空',
+ Supportssum:true
+ })
+ return
+ }
+
+ // for(var p=0; p{
+ if(item.weights===""){
+ item.weights=0;
+ }
+ if(item.ec_course_id===""){
+ this.setState({
+ // Supportstype:true,
+ Supportslist:'保存失败,课程不能为空',
+ Supportsclass:true,
+ Supportsclasskey:key
+ })
+ return
+ }
+ })
+
+ var Url = '/ec_course_supports';
+ axios.post(Url, {
+ ec_year_id: ec_year_id,
+ ec_graduation_subitem_id:ec_graduation_subitem_id,
+ course: editcourse
+ },
+ {
+ withCredentials: true
+ }
+ ).then((response) => {
+
+ if(response.data.status===0){
+ this.setState({
+ Editkey:null,
+ Supportslist:response.data.messsage,
+ Supportstype:true,
+ Supportssum:false,
+ Supportsclass:false,
+ Supportsclasskey:undefined,
+ })
+ this.UpdateClassData();
+ }else if(response.data.status===-1){
+ this.setState({
+ Supportslist:"参数错误",
+ Supportstype:true,
+ Supportssum:false,
+ Supportsclass:false,
+ Supportsclasskey:undefined,
+ })
+ }
+ }).catch((error) => {
+ console.log(error)
+ })
+ }
+ Deletcourses=(key)=>{
+ this.setState({
+ supportid:key,
+ Supportslist:"您确定要删除吗?",
+ Supportstype:true
+ })
+ }
+ hideSupports=()=>{
+ this.setState({
+ Supportstype:false,
+ supportid:null,
+ Supportslist:"",
+ })
+ }
+ render() {
+ const Option = Select.Option;
+ let {data,ec_courses_list,editcourse,editnum,index,ec_year_id,Supportsclasskey,ecComponentState,hidesupport,supportid,Editkey,titlemessage,Supportstype,Supportslist,Supportssum,Supportsclass,major_school_id} = this.state;
+ var list = (length) => {
+ var res = [];
+ for(var i = 0; i < length; i++) {
+ res.push(
+ 10){
+ newmorelisttype=true
+
+ }
+
+ let course_total_scoreaverage;
+ let newlist=response.data.course_total_score[response.data.course_total_score.length-1].total_rate;
+ for(var i=0; i{
+ this.setState({
+ Spintype:true
+ })
+ let {ec_course_id}=this.state;
+ const Orl =`/ec_courses/`+ec_course_id+`/sync_data`;
+ axios.get(Orl, {
+ withCredentials:true,
+ })
+ .then((response) => {
+ if(response.data.status===1){
+ this.setState({
+ calculatetype:true,
+ completiontype:true,
+ completionlist:'计算成功',
+ calculatesetype:true,
+ Spintype:false
+ })
+ this.UpdateClassData(true);
+ }
+ })
+ .catch(function (error) {
+ console.log(error)
+ });
+ }
+ hidecompletion=()=>{
+ this.setState({
+ completiontype:false,
+ completionlist:"",
+ calculatesetype:false
+ })
+ }
+ render() {
+ let {Spintype,calculatesetype,ec_course_id,course_total_scoreaverage,ec_course_targets_count,schooldata,ecComponentState,course_total_score,total_rate_data,ec_course_targets,graduation_list,target_list,target_score,evaluate_result,morelisttype,titlemessage,completiontype,completionlist,ismanager} = this.state;
+
+ let TargetresList = (length) => {
+ let target_listres = [];
+ for(let i = 0; i < length; i++) {
+ // target_listres.push(目标{length-i})
+ // target_listres.push(目标{i+1})
+ target_listres.push(目标{length-i})
+ }
+ return target_listres
+ }
+
+ let TargetresLists = (length) => {
+ let target_listress = [];
+ for(let i = 0; i < length; i++) {
+ // target_listres.push(目标{length-i})
+ target_listress.push(目标{i+1})
+ // target_listres.push(目标{length-i})
+ }
+ return target_listress
+ }
+
+ let TargetresContentList = (length,value) => {
+ let target_listres = [];
+ if(value!=undefined){
+ for(let i = 0; i < length; i++) {
+
+ if(value[i]===1){
+ target_listres.push()
+ }else{
+ target_listres.push()
+ }
+
+ }
+ target_listres.reverse()
+ return target_listres
+ }
+ }
+
+
+
+ let Total_rate_dataList = (value) => {
+
+ let target_listres = [];
+ if(value!=undefined){
+ for(let i = 0; i < value.length; i++) {
+
+ if(i===value.length-1){
+ target_listres.push(
+ {/*
+ {
+
+ let {evaluation_subitems_list,totalevaluations_list,achievement_methods} = this.state;
+ let newachievement_methods=achievement_methods;
+ let newlist=new Object ();
+ let location=keythis.key;
+ let list=totalevaluations_list.evaluations_list;
+ // 点击切换清空
+ for(var z=0; z0){
+ if(newachievement_methods[location]===undefined){
+ newachievement_methods.push(newlist)
+ }
+ for(var i=0; i{
+ let{totalevaluations_list,achievement_methods}=this.state;
+ let newachievement_methods=[];
+ let id;
+ if(value.length>0){
+
+ newachievement_methods=achievement_methods
+ for(var j=0; j{
+ let id=parseInt(keynum.key);
+ let{achievement_methods}=this.state;
+ let newachievement_methods=achievement_methods;
+ for(var i=0; i{
+ let {achievement_methods} = this.state;
+ let newachievement_methods=achievement_methods;
+ let id=e.target.id;
+ var value=parseFloat(e.target.value);
+ for(var i=0; i{
+ let {achievement_methods} = this.state;
+ let newachievement_methods=achievement_methods;
+ let id=e.target.id;
+ let value=parseFloat(e.target.value);
+
+ if(value>100){
+ // message.warning('占比请输入0~100的数');
+ this.setState({
+ Modallists:'占比请输入0~100的数',
+ meweacoursetype:true,
+ newshowredvalue:true
+ })
+ value=100
+ }
+
+ if(value<0){
+ // message.warning('占比请输入0~100的数');
+ this.setState({
+ Modallists:'占比不能小于0',
+ meweacoursetype:true,
+ newshowredvalue:true
+ })
+ value=0
+ }
+
+ if(value===""||value===null||value===undefined){
+ // message.warning('占比请输入0~100的数');
+ this.setState({
+ Modallists:'占比不能为空',
+ meweacoursetype:true,
+ newshowredvalue:true
+ })
+ value=0
+ }
+
+ for(var i=0; i{
+ let {achievement_methods} = this.state;
+ let newachievement_methods=achievement_methods;
+ let newlist=new Object ();
+ newachievement_methods.push(newlist);
+ this.setState({
+ achievement_methods:newachievement_methods
+ });
+ }
+ Delethandevaluation=(e)=>{
+ let {achievement_methods} = this.state;
+ let id =e.target.getAttribute("index");
+ let newachievement_methods=achievement_methods;
+ newachievement_methods.splice(id,1);
+ this.setState({
+ achievement_methods:newachievement_methods
+ });
+ }
+
+
+ EvaluationsSaveonloadgetdata=(id)=>{
+ const url = `/ec_course_achievement_methods?ec_course_id=`+id
+ axios.get(url, {
+ withCredentials: true,
+ })
+ .then((response)=>{
+ this.setState({
+ achievement_list:response.data.achievement_list,
+ spinningstate:false,
+ ismanager:response.data.is_manager
+ })
+
+ }).catch(function (error) {
+ console.log(error);
+ this.setState({
+ spinningstate:false
+ })
+ });
+
+
+ }
+ ecrestoration=()=>{
+ this.setState({
+ buttomSaveCourseEvaluationsbottom:this.SaveCourseEvaluationsbottom
+ })
+ }
+
+ SaveCourseEvaluationsbottom=()=>{
+ let ec_course_id=this.props.match.params.ec_course_id;
+ this.setState({
+ buttomSaveCourseEvaluationsbottom:'',
+ percentagetype:true
+ })
+ let {newec_course_target_id,achievement_methods} = this.state;
+
+
+ for(var j=0; j100){
+ // message.error('提交失败！支撑占比不能超过总和100%');
+ this.setState({
+ Modallists:'提交失败,支撑占比不能超过总和100%',
+ meweacoursetype:true,
+ newshowredvalue:true,
+ percentagetype:true
+ })
+ this.setState({
+ buttomSaveCourseEvaluationsbottom:this.SaveCourseEvaluationsbottom
+ })
+ return
+ }
+ if(percentagenum<100){
+ // message.error('提交失败！支撑占比不能超过总和100%');
+ this.setState({
+ Modallists:'提交失败,支撑占比总和要等于100%',
+ meweacoursetype:true,
+ newshowredvalue:true,
+ percentagetype:true
+ })
+ this.setState({
+ buttomSaveCourseEvaluationsbottom:this.SaveCourseEvaluationsbottom
+ })
+ return
+ }
+ for(var i=0;i {
+ if(response.data.status===0){
+ this.setState({
+ target_id:null,
+ newec_course_idbottom:response.data.ec_course_id,
+ buttomSaveCourseEvaluationsbottom:this.SaveCourseEvaluationsbottom,
+ // Modallists:response.data.message,
+ // eacoursetype:true,
+ Modallists:' ',
+ meweacoursetype:false,
+ achievement_methods:undefined,
+ eacoursesavetypes:false,
+ newshowredvalue:false,
+ ismanager:response.data.is_manager
+ })
+ // $("#ecCourseEvaluationsbottomsubmit").hide();
+ // $("#SystemParametersbottom").hide();
+ this.EvaluationsSaveonloadgetdata(response.data.ec_course_id);
+ this.getNavigationData(ec_course_id);
+
+ }else if(response.data.status===-1){
+ this.setState({
+ buttomSaveCourseEvaluationsbottom:this.SaveCourseEvaluationsbottom,
+ Modallists:response.data.message,
+ eacoursetype:true,
+ })
+ }
+ }).catch((error) => {
+ console.log(error)
+ })
+ }
+ CancelecCourseEvaluationsbottom=()=>{
+ this.setState({
+ achievement_methods:undefined,
+ target_id:null,
+ methodologytype:false,
+ Modallists:' ',
+ meweacoursetype:false,
+ eacoursesavetypes:false,
+ newshowredvalue:false,
+ percentagetype:false
+ })
+ // $("#ecCourseEvaluationsbottomsubmit").hide();
+ // $("#SystemParametersbottom").hide();
+ this.getec_course_achievement_methods();
+ }
+
+ selectsonFocuslist=(e,key)=>{
+ let value =e.course_select_value;
+ let {evaluation_subitems_list,totalevaluations_list,achievement_methods} = this.state;
+ let newachievement_methods=achievement_methods;
+ let newlist=new Object ();
+ let location=key;
+ let list=totalevaluations_list.evaluations_list;
+ this.setState({
+ evaluations_lists: evaluation_subitems_list[value],
+ evaluation_subitems_lists: evaluation_subitems_list[value][0]
+ });
+
+ if(newachievement_methods.length===0){
+ for(var i=0; i0){
+ if(newachievement_methods[location]===undefined){
+ newachievement_methods.push(newlist)
+ }
+ for(var i=0; i{
+ this.setState({
+ eacoursetype:false
+ })
+ }
+ render() {
+ const Option = Select.Option;
+ let {schooldata,achievement_list,spinningstate,evaluations_list,evaluations_lists,newec_course_target_id,achievement_methods,ec_course_target_name,buttomSaveCourseEvaluationsbottom,sequenceid,target_id,
+ titlemessages,
+ Modallists,
+ eacoursetype,
+ eacoursesavetypes,
+ methodologytype,
+ newec_course_idbottom,
+ meweacoursetype,
+ percentagetype,
+ ismanager
+ } = this.state;
+ return (
+
+
+ :
+ homework_status.length>0 && homework_status[0]==="未发布"?
+
+
+ :
+
-
- )
+
)
}
diff --git a/public/react/src/modules/ecs/EcSetting/CourseSupports/ecCourseSupports.css b/public/react/src/modules/ecs/EcSetting/CourseSupports/ecCourseSupports.css
new file mode 100644
index 000000000..7f497b28e
--- /dev/null
+++ b/public/react/src/modules/ecs/EcSetting/CourseSupports/ecCourseSupports.css
@@ -0,0 +1,358 @@
+.eaSystemp a{
+ color:#05101a;
+}
+.eaSystemp span{
+ color: #05101a !important;
+}
+.eacourse p{
+ height:84px;
+ margin-bottom:0px !important;
+}
+.eacourse #training_objective_contents{
+ height:81px;
+}
+.courseSystem{
+font-size:18px;
+font-family:MicrosoftYaHei;
+font-weight:400;
+line-height:45px;
+color:rgba(5,16,26,1);
+}
+.SystemParameters{
+ font-size:14px;
+ font-family:MicrosoftYaHei;
+ font-weight:400;
+ line-height:45px;
+ color:rgba(50,50,50,1);
+}
+.Systemnum{
+ font-size:14px;
+ font-family:MicrosoftYaHei;
+ font-weight:400;
+ color:#FF6800;
+}
+.newSystem{
+ width:1200px;
+ overflow:auto;
+ background: #FFF;
+}
+.newSystem .clearfix .column-1{
+ width: 113px !important;
+ text-align: center;
+}
+.operationColumn{
+ margin: 0px 10%;
+ width:100%;
+ height:100%;
+}
+.operationalter{
+ margin: 20px 16px;
+}
+.SystemModifythelist .column-1{
+ width: 120px !important;
+ text-align: center;
+}
+
+.SystemModifythelist .column-3{
+ padding-left: 96px;
+ margin-right: 23px;
+}
+.operationright{
+ float:right !important;
+}
+
+.newSystem p{
+ /*padding: 10px 33px !important;*/
+ margin-bottom: 0em;
+}
+.newSystem li{
+ margin:0 !important;
+}
+.SystemModifythelist{
+ background:#FFF !important;
+}
+
+.SystemModifythelist .column-1:nth-child(1){
+ margin-left: 7px;
+}
+
+.Systempoint{
+ font-size:12px;
+ font-family:MicrosoftYaHei;
+ font-weight:400;
+ color:rgba(152,152,152,1);
+}
+.editorModify{
+ background:#FFF !important;
+}
+.newSystem .editorModify .column-1{
+ width: 194px !important;
+ text-align: left;
+ margin-left: 30px;
+}
+.newSystem .editorModify .column-1:nth-child(1){
+ margin-right: 510px;
+}
+.editorModify .ant-select{
+ width: 556px !important;
+ margin-left: 36px;
+}
+.editorModify .ant-select .ant-select-selection{
+ height: 30px !important;
+}
+.editorModify .ant-select .ant-select-selection .ant-select-selection__rendered{
+ height: 30px !important;
+}
+.editorModify .ant-select .ant-select-selection .ant-select-selection__rendered .ant-select-selection-selected-value{
+ line-height: 30px !important;
+}
+.inputWeight{
+ width: 20%;
+ font-size:14px;
+ height:30px;
+ margin-left: 20px;
+ background-color: #F5F5F5;
+}
+.SetTheAssociated{
+ width: 314px;
+ height: 30px;
+ float: right;
+ margin-right: -3.5%;
+}
+.SetTheAssociatedchild{
+ width: 120px;
+ height: 30px;
+ background: rgba(255,255,255,1);
+ border: 1px solid rgba(234,234,234,1);
+ border-radius: 4px;
+ float: left;
+ margin-right: 10px;
+ text-align: center;
+ line-height: 30px;
+ /*margin-left: 34px;*/
+}
+.operatebutton{
+ margin-left: 20px;
+ /* margin-top: 16px; */
+}
+.editbulebutton{
+ width:120px;
+ height:30px;
+ background:rgba(76,172,255,1);
+ border-radius:2px;
+ color:#FFF;
+ text-align: center;
+ line-height: 30px;
+}
+.editglybutton{
+ width:120px;
+ height:30px;
+ border:1px solid rgba(205,205,205,1);
+ border-radius:2px;
+ color:#999;
+ text-align: center;
+ line-height: 30px;
+}
+
+.editglybuttonbox{
+ width: 275px;
+ margin-bottom: 30px;
+ margin-right: 20px;
+ margin-right:7%;
+}
+.editglybuttonboxs{
+ width: 275px;
+ margin-bottom: 30px;
+ margin-right: 20px;
+ margin-right:3%;
+}
+.defalutCancelbtn:hover {
+ border: 1px solid #B2B2B2;
+ color: #B2B2B2!important;
+}
+
+.gouxuanbule{
+ color:#4CACFF;
+}
+.gouxuanwhite{
+ color:#FFF;
+}
+.icon-gouxuan{
+ cursor: pointer;
+}
+/* 谷歌 */
+input::-webkit-outer-spin-button,
+input::-webkit-inner-spin-button {
+ -webkit-appearance: none;
+ appearance: none;
+ margin: 0;
+}
+/* 火狐 */
+input{
+ -moz-appearance:textfield;
+}
+.inputWeight{
+ text-indent:0.625rem;
+}
+
+.columnlocation{
+ height: 40px;
+ line-height: 40px;
+}
+.paddingLF{
+ padding:0 33px;
+}
+.width20{
+ width: 20px;
+ height: 20px;
+ text-align: center;
+}
+.defalutSubmitbtn,.defalutCancelbtn{
+ cursor: pointer;
+}
+.mb290{
+ margin-bottom:290px;
+}
+.Spinlarge{
+ text-align: center;
+ width: 100%;
+ margin-top: 25px;
+ margin-bottom: 25px;
+}
+.DDred{
+ color:#DD1717;
+}
+.color-666{
+ color:#666666 !important;
+}
+.color-05101A{
+ color:#05101A !important;
+}
+.ec_graduation_name{
+ margin-right:20px !important;
+}
+.column-width575{
+ color: transparent !important;
+}
+.column-width130{
+ width: 130px !important;
+ height: 40px;
+}
+
+
+.ListTableLine li>span {
+ max-width: 550px !important;
+}
+
+.graduateRequirement .clearfix .column-1 {
+ width: 76px!important;
+}
+
+.newrightcalculatebutton{
+ width: 50px;
+ height: 25px;
+ border: 1px solid rgba(76,172,255,1);
+ border-radius: 1px;
+ line-height: 25px;
+ text-align: center;
+ margin-top: 7px;
+ cursor: pointer;
+ color: rgba(76,172,255,1);
+}
+.columnbox{
+ height: 53px;
+ overflow: hidden;
+}
+
+.ant-modal-mask {
+ background-color: rgba(5,16,26,0.4);
+}
+.ecmodeldelet{
+ top:300px;
+}
+.ecmodeldelet .ant-modal-header{
+ padding: 0px 24px;
+}
+.ecmodeldelet .ant-modal-title{
+ padding: 0px 15px;
+ text-align: center;
+ box-sizing: border-box;
+ line-height: 70px;
+ height: 70px;
+ border-radius: 10px 10px 0px 0px;
+ font-size: 16px;
+ font-weight: bold;
+}
+.bor-red {
+ border: 1px solid #db0505 !important;
+}
+
+.ml93{
+ margin-left:93px;
+}
+.ml26{
+ margin-left: 26px;
+}
+.finishtarget{
+ width: 69px;
+ /* height: 48px; */
+ line-height: 20px;
+ text-align: center;
+ margin-right: 48px;
+}
+
+.bordereaeaea{
+ border-bottom: 1px solid transparent !important;
+}
+
+.heightimportant{
+ height: 30px !important;
+ background-color: #F5F5F5;
+}
+.heightimportant:focus {
+ background-color: #fff;
+}
+.inputWeight:focus {
+ background-color: #fff;
+ }
+.heightlineimportant{
+ line-height: 30px !important;
+}
+
+.ant-select-selection:hover{
+ border-color: #d9d9d9 !important;
+}
+.ant-input:focus {
+ outline: 0;
+ -webkit-box-shadow: 0 0 0 2px transparent !important;
+ box-shadow: 0 0 0 2px transparent !important;
+ }
+ .ant-input{
+ border-color: #d9d9d9 !important;
+ }
+ .ant-select-selection:focus{
+ -webkit-box-shadow: 0 0 0 2px transparent !important;
+ box-shadow: 0 0 0 2px transparent !important;
+ }
+ .ant-select-selection:active{
+ -webkit-box-shadow: 0 0 0 2px transparent !important;
+ box-shadow: 0 0 0 2px transparent !important;
+ }
+
+ .ant-select-selection:focus{
+ border-color: #d9d9d9 !important;
+ }
+ .ant-select-selection{
+ -webkit-box-shadow: 0 0 0 2px transparent !important;
+ box-shadow: 0 0 0 2px transparent !important;
+ }
+
+.mt60{
+ margin-top:60px;
+}
+
+
+.editlybuttonbox{
+ margin-bottom: 30px;
+ margin-right: 3%;
+}
\ No newline at end of file
diff --git a/public/react/src/modules/ecs/EcSetting/CourseSupports/index.js b/public/react/src/modules/ecs/EcSetting/CourseSupports/index.js
new file mode 100644
index 000000000..2164669f3
--- /dev/null
+++ b/public/react/src/modules/ecs/EcSetting/CourseSupports/index.js
@@ -0,0 +1,658 @@
+import React, { Component } from 'react';
+
+import { BrowserRouter as Router, Route, Link, Switch } from "react-router-dom";
+
+import axios from 'axios';
+
+import { Select,message,Modal,Input,Spin,Icon,Tooltip } from 'antd';
+
+import './ecCourseSupports.css';
+
+const $ = window.$;
+class CourseSupports extends Component {
+ constructor(props) {
+ super(props)
+ this.state={
+ data:'',
+ ec_courses_list:[],
+ editcourse:[{"weights": 0,
+ "ec_course_name":'',
+ "top_relation": false,
+ "ec_course_id":''
+ }],
+ editnum:0,
+ index:0,
+ ec_graduation_subitem_id:0,
+ ec_year_id:0,
+ schooldata:{},
+ spinning:true,
+ ecComponentState:'ecCourseSupports',
+ supportid:null,
+ Editkey:null,
+ titlemessage:"提示",
+ Supportstype:false,
+ Supportslist:'',
+ Supportssum:false,
+ Supportsclass:false,
+ Supportsclasskey:undefined
+ }
+ }
+
+ componentWillMount(){
+ this.setState({
+ ec_year_id:this.props.match.params.ec_year_id,
+ major_school_id:this.props.match.params.major_school_id
+ })
+ window.document.title = '课程体系 vs 毕业要求';
+ }
+
+ UpdateClassData=()=>{
+
+ let ec_year_id=this.props.match.params.ec_year_id;
+
+ this.setState({
+ ec_year_id:ec_year_id
+ })
+
+ const url = `/ec_years/${ec_year_id}/graduation_course_supports.json`;
+ axios.get(url)
+ .then((response) => {
+ if(response.status===200){
+ this.setState({
+ data:response.data
+ })
+ console.log(response.data.graduation_subitems.length)
+ if(response.data.graduation_subitems.length===0){
+ this.setState({
+ Supportstype:true,
+ Supportslist:'数据为空，请去毕业要求——>毕业要求指标点分解列表配置数据'
+ })
+ }
+ }
+
+ })
+ .catch(function (error) {
+ console.log(error);
+ });
+
+ const zrl = `/ec_years/${ec_year_id}/ec_courses/search.json`;
+ axios.get(zrl,{params:{
+ per_page:10000,
+ }
+ })
+ .then((response) => {
+
+ if(response.status===200){
+ this.setState({
+ ec_courses_list:response.data.ec_courses
+ })
+ }
+
+ })
+ .catch(function (error) {
+ console.log(error);
+ });
+
+ }
+ componentDidMount(){
+ this.setState({
+ ec_year_id:this.props.match.params.ec_year_id,
+ major_school_id:this.props.match.params.major_school_id
+ })
+ this.UpdateClassData();
+
+ }
+ EditSupportCourse=(keys,e)=>{
+ $('#school_major_list').scrollLeft(0);
+ let id=e.target.id;
+ id=parseInt(id);
+
+ let subindex =e.target.getAttribute("subindex");
+
+ // const url = `/ec_course_supports/edit_require_vs_course?subitem_id=`+id
+ // axios.get(url)
+ // .then((response) => {
+ //
+ // if(response.status===200){
+
+ //
+ // this.setState({
+ // ec_courses_list:response.data.ec_courses_list,
+ // editcourse:support_data,
+ // index:subindex,
+ // ec_graduation_subitem_id:id,
+ // Supportssum:false,
+ // Supportsclass:false,
+ // })
+ //
+ // let {editcourse} =this.state;
+ // let neweditcourse=editcourse;
+ // let newnum=0;
+ // for(var j=0;j
-
+
- {computeTimetype===false?
-
-
+ {computeTimetype===false?
+
+
正在执行成绩计算，完成后将为您自动刷新结果。温馨提示：执行时间因作品数量而异
- :""}
+ :""}
-
-
+
}
- {data === undefined ? "" :
}
-
- {JSON.stringify(datas) !== "[]" ?
-
-
-
-
-
+ }
+
+
- :
-
+ {data === undefined ? "" :
}
+
+ {JSON.stringify(datas) !== "[]" ?
+
+
- {
- teacherdata && teacherdata.work_count && teacherdata.work_count > limit ?
-
+
{teacherdata === undefined ? "0" : teacherdata.commit_count === undefined ? "0" : teacherdata.commit_count}
@@ -3692,8 +3734,8 @@ class Listofworksstudentone extends Component {
style={{color: '#FF6800'}}>{teacherdata.left_time.time}}
-
-
-
+
+
-
- 计算成绩时间：{teacherdata&&teacherdata.calculation_time==null?"--": moment(teacherdata&&teacherdata.calculation_time).format('YYYY-MM-DD HH:mm')}
- { course_is_end===true?"":teacherdata&&teacherdata.task_operation&&teacherdata.task_operation[0]==="开启挑战"?"":
+ 计算成绩时间：{teacherdata&&teacherdata.calculation_time==null?"--": moment(teacherdata&&teacherdata.calculation_time).format('YYYY-MM-DD HH:mm')}
+ { course_is_end===true?"":teacherdata&&teacherdata.task_operation&&teacherdata.task_operation[0]==="开启挑战"?"":
{computeTimetype===true?
(this.props.isNotMember()===false?
-
查看最新成绩
@@ -3750,12 +3792,12 @@ class Listofworksstudentone extends Component {
:"")
}
}
-
-
-
+ :
+
- {datas === undefined ? "" :
}
+
+ {
+ teacherdata && teacherdata.work_count && teacherdata.work_count > limit ?
+
+ {datas === undefined ? "" :
}
+
+
+
+ : ""
+ }
+
+
+ }
+
+
+
+
+
+ 暂时还没有相关数据哦！
+
-
- : ""
}
-
- }
-
-
-
-
-
-
- 暂时还没有相关数据哦！
-支撑课程
+
（权值） +
+ )
+ }
+ return res
+ }
+
+ return (
+ （权值） +
+
+
+
+
+
+ );
+ }
+}
+
+export default CourseSupports ;
+
diff --git a/public/react/src/modules/ecs/EcSetting/GraduationRequirement/index.js b/public/react/src/modules/ecs/EcSetting/GraduationRequirement/index.js
new file mode 100644
index 000000000..4ee387a73
--- /dev/null
+++ b/public/react/src/modules/ecs/EcSetting/GraduationRequirement/index.js
@@ -0,0 +1,384 @@
+import React from 'react';
+import PropTypes from "prop-types";
+import { Link } from 'react-router-dom';
+import { Spin, Button, Input, Divider, Icon, Tooltip, Form, message, Modal } from 'antd';
+import axios from 'axios';
+import _ from 'lodash'
+
+import './index.scss';
+
+const { confirm } = Modal;
+
+class GraduationRequirement extends React.Component {
+ constructor (props) {
+ super(props);
+
+ this.state = {
+ loading: true,
+ editIndex: null,
+ addState: false,
+ submitState: false,
+ validateState: false,
+
+ currentEditReq: {},
+ newRequirement: {},
+ graduationRequirements: []
+ }
+ }
+
+ componentDidMount() {
+ this.getData();
+ }
+
+ getData = () => {
+ let { yearId } = this.props;
+
+ this.setState({ loading: true });
+ axios.get(`/ec_years/${yearId}/ec_graduation_requirements.json`).then(res => {
+ if(res.status === 200){
+ this.setState({
+ graduationRequirements: res.data.graduation_requirements,
+ loading: false
+ })
+ }
+ }).catch(e => console.log(e))
+ }
+
+ showDeleteConfirm = (id) => {
+ if(this.state.editIndex !== null || this.state.addState){
+ message.error('请先保存其它内容');
+ return
+ }
+ confirm({
+ title: '确认删除该毕业要求?',
+ okText: '确认',
+ cancelText: '取消',
+ onOk: () => {
+ this.deleteRequirement(id);
+ },
+ onCancel() {},
+ });
+ }
+
+ deleteRequirement = (id) => {
+ let { yearId } = this.props;
+ let url = `/ec_years/${yearId}/ec_graduation_requirements/${id}.json`;
+ axios.delete(url).then(res => {
+ if(res){
+ message.success('操作成功');
+ this.getData();
+ }
+ }).catch(e => console.log(e))
+ }
+
+ showEditContent = (index) => {
+ let { editIndex, graduationRequirements } = this.state;
+ if(editIndex !== null){
+ message.error('请先保存其它内容');
+ return
+ }
+
+ this.setState({ editIndex: index, currentEditReq: _.cloneDeep(graduationRequirements[index])})
+ }
+
+ onEditContentChange = (e) => {
+ let { currentEditReq } = this.state;
+ currentEditReq.content = e.target.value;
+ this.setState({ currentEditReq });
+ }
+
+ onEditItemContentChange = (e, index) => {
+ let { currentEditReq } = this.state;
+ currentEditReq.ec_graduation_subitems[index].content = e.target.value;
+ this.setState({ currentEditReq });
+ }
+
+ addEditItem = () => {
+ let { currentEditReq } = this.state;
+ currentEditReq.ec_graduation_subitems.push({id: null, content: ''})
+ this.setState({ currentEditReq });
+ }
+
+ removeEditItem = (index) => {
+ let { currentEditReq } = this.state;
+ currentEditReq.ec_graduation_subitems.splice(index, 1);
+ this.setState({ currentEditReq });
+ }
+
+ saveContentEdit = () => {
+ let { currentEditReq } = this.state;
+
+ let contentExist = currentEditReq.content && currentEditReq.content.length !== 0;
+ let errorItem = currentEditReq.ec_graduation_subitems.find(item => !item.content || item.content.length === 0);
+ this.setState({ validateState: !!errorItem || !contentExist });
+
+ if(errorItem || !contentExist){ return }
+
+ this.setState({ submitState: true }, this.updateRequirement);
+ }
+
+ cancelContentEdit = () => {
+ this.setState({ currentEditReq: {}, editIndex: null, validateState: false });
+ }
+
+ updateRequirement = () => {
+ let { yearId } = this.props;
+ let { currentEditReq } = this.state;
+
+ let url = `/ec_years/${yearId}/ec_graduation_requirements/${currentEditReq.id}.json`;
+
+ axios.put(url, { content: currentEditReq.content, position: currentEditReq.position, graduation_subitems: currentEditReq.ec_graduation_subitems }).then(res => {
+ if(res){
+ message.success('操作成功');
+ this.setState({ submitState: false, editIndex: null });
+ this.getData();
+ }
+ }).catch(e => {
+ console.log(e);
+ this.setState({ submitState: false });
+ })
+ }
+
+ showNewReqContent = () => {
+ let { editIndex, graduationRequirements } = this.state;
+ if(editIndex !== null){
+ message.error('请先保存其它内容');
+ return
+ }
+
+ this.setState({
+ editIndex: -1, addState: true,
+ newRequirement: {
+ content: '', position: graduationRequirements.length + 1,
+ graduation_subitems: [
+ { id: null, content: '' },
+ { id: null, content: '' },
+ { id: null, content: '' },
+ ]
+ }
+ })
+ }
+
+ onNewReqContentChange = (e) => {
+ let { newRequirement } = this.state;
+ newRequirement.content = e.target.value;
+ this.setState({ newRequirement });
+ }
+
+ onNewReqItemContentChange = (e, index) => {
+ let { newRequirement } = this.state;
+ newRequirement.graduation_subitems[index].content = e.target.value;
+ this.setState({ newRequirement });
+ }
+
+ addNewReqItem = () => {
+ let { newRequirement } = this.state;
+ newRequirement.graduation_subitems.push({id: null, content: ''})
+ this.setState({ newRequirement });
+ }
+
+ removeNewReqItem = (index) => {
+ let { newRequirement } = this.state;
+ newRequirement.graduation_subitems.splice(index, 1);
+ this.setState({ newRequirement });
+ }
+
+ saveNewReq = () => {
+ let { newRequirement } = this.state;
+
+ let contentExist = newRequirement.content && newRequirement.content.length !== 0;
+ let errorItem = newRequirement.graduation_subitems.find(item => !item.content || item.content.length === 0);
+ this.setState({ validateState: !!errorItem || !contentExist });
+
+ if(errorItem || !contentExist){ return }
+
+ this.setState({ submitState: true }, this.createRequirement);
+ }
+
+ cancelNewReq = () => {
+ this.setState({ newRequirement: {}, addState: false, editIndex: null, validateState: false });
+ }
+
+ createRequirement = () => {
+ let { yearId } = this.props;
+ let { newRequirement } = this.state;
+
+ let url = `/ec_years/${yearId}/ec_graduation_requirements.json`;
+
+ axios.post(url, newRequirement).then(res => {
+ if(res){
+ message.success('操作成功');
+ this.setState({ submitState: false, editIndex: null, addState: false });
+ this.getData();
+ }
+ }).catch(e => {
+ console.log(e);
+ this.setState({ submitState: false });
+ })
+ }
+
+ render() {
+ let { can_manager } = this.props.year;
+ let { loading, editIndex, addState, submitState, validateState, currentEditReq, graduationRequirements, newRequirement } = this.state;
+
+ return (
+
+
+
+ {Supportslist}
+
+
+
+
+
+
+
+
+
+
+ 课程体系对毕业要求的支撑
+ {/* 导出培养目标 */}
+
+ 导出课程体系支撑矩阵
+
+
+ 用矩阵图的形式说明本专业课程体系对毕业要求的支撑关系 window.elasticLayer(3534)} >查看详情
+
+
+ 毕业要求指标点（{data.count}）
+ 课程体系（{data.course_count}）
+
+
+
+
+
+
+ 1200? 140*data.max_support_count : 1200+"px"}}> + 毕业要求指标点 + {list(data.max_support_count<5||data.max_support_count===undefined?5:data.max_support_count)} + 合计 +
+
+ {
+ data.graduation_subitems===undefined? 1134 ? 136*data.max_support_count : 1134+"px",margin: '0px 0px'}}>
+
+ {item.graduation_requirement_position+"-"+item.position}
+
+
+
+ {
+ item.course_supports.map((t,kes)=>{
+
+ return(
+
+
+ )
+ })
+ }
+
+ {t.ec_course_name.length>12?t.ec_course_name.substring(0, 10)+"...":t.ec_course_name}
+ （{t.weights}）
+
+ )
+
+ })
+ }
+
+
+
+
+
+
+
+
+
+ {item.course_supports.length}
+ {Math.round(item.weights_total*100)/100===0?0:(Math.round(item.weights_total*100)/100)}
+
+ {data.is_manager===false?"":
+
+ }
+
+ + +
+ 指标点 {index} + 支撑课程 + + 权重(∑=1) + （精确到两位小数） + + 关联度最高 +
+ +
+ {Supportsclass===true?:""}
+ {
+ editcourse.map((it,key)=>{
+
+ return(
+
+ {Supportslist}
+
+
+
+
+
+
+ )
+ })
+ }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 合计: {editcourse.length}
+ 合计: {editnum}
+
+
+
+
+
+
+
+
+ 保存
+ 取消
+
+
+
+
+ )
+ }
+}
+GraduationRequirement.propTypes = {
+ schoolId: PropTypes.string,
+ majorId: PropTypes.string,
+ yearId: PropTypes.string,
+}
+
+export default GraduationRequirement
\ No newline at end of file
diff --git a/public/react/src/modules/ecs/EcSetting/GraduationRequirement/index.scss b/public/react/src/modules/ecs/EcSetting/GraduationRequirement/index.scss
new file mode 100644
index 000000000..9d740a970
--- /dev/null
+++ b/public/react/src/modules/ecs/EcSetting/GraduationRequirement/index.scss
@@ -0,0 +1,94 @@
+.ec-graduation-requirement-page {
+ background: #fff;
+
+ .graduation-requirement {
+ &-body {
+ margin-top: -24px;
+ }
+
+ &-items {
+ &-head {
+ padding: 15px 30px;
+ display: flex;
+ background: #F5F5F5;
+ }
+
+ &-body {
+ margin: 0 30px;
+
+ &-item {
+ padding: 10px 0px;
+ border-bottom: 1px solid #eaeaea;
+
+ &.active {
+ .item-row {
+ margin-bottom: 10px;
+ align-items: center;
+ }
+
+ .item-column-operation {
+ width: 40px;
+ }
+ }
+
+ &:last-child {
+ border-bottom: unset;
+ }
+
+ .item-head {
+ margin-bottom: 10px;
+ font-weight: bold;
+ }
+
+ .item-row {
+ display: flex;
+ }
+ }
+ }
+
+
+ .no-column {
+ width: 60px;
+ text-align: center;
+ }
+
+ .item-content-column {
+ flex: 1;
+ padding-left: 10px;
+ display: flex;
+
+ .ant-form-item {
+ flex: 1;
+ margin-bottom: 0;
+ }
+ }
+
+ .item-column-operation {
+ display: flex;
+ justify-content: flex-end;
+ width: 80px;
+
+ & > i {
+ margin: 0 5px;
+ font-size: 16px;
+ cursor: pointer;
+ }
+ }
+ }
+ }
+
+ .edit-form {
+ margin-top: 10px;
+ text-align: right;
+
+ button {
+ margin-left: 10px;
+ }
+ }
+
+ i.edit-action {
+ color: #29BD8B;
+ cursor: pointer;
+ font-size: 16px;
+ }
+}
\ No newline at end of file
diff --git a/public/react/src/modules/ecs/EcSetting/TrainingObjective/index.js b/public/react/src/modules/ecs/EcSetting/TrainingObjective/index.js
new file mode 100644
index 000000000..e48cf2c84
--- /dev/null
+++ b/public/react/src/modules/ecs/EcSetting/TrainingObjective/index.js
@@ -0,0 +1,264 @@
+import React from 'react';
+import PropTypes from "prop-types";
+import { Link } from 'react-router-dom';
+import { Spin, Button, Input, Divider, Icon, Tooltip, Form, message } from 'antd';
+import axios from 'axios';
+
+import './index.scss';
+
+class TrainingObjective extends React.Component {
+ constructor (props) {
+ super(props);
+
+ this.state = {
+ loading: true,
+ contentEditState: false,
+ itemsEditState: false,
+ submitState: false,
+ validateState: false,
+ itemSubmitState: false,
+ itemValidateState: false,
+
+ objective: {},
+ editContent: '',
+ trainingSubitems: []
+ }
+ }
+
+ componentDidMount() {
+ this.getData();
+ }
+
+ getData = () => {
+ let { yearId } = this.props;
+
+ axios.get(`/ec_years/${yearId}/ec_training_objectives.json`).then(res => {
+ if(res.status === 200){
+ this.setState({
+ objective: res.data,
+ editContent: res.data.content,
+ trainingSubitems: res.data.ec_training_items,
+ loading: false
+ })
+ }
+ }).catch(e => console.log(e))
+ }
+
+ saveContentEdit = () => {
+ let { editContent } = this.state;
+ this.setState({ validateState: editContent.length === 0 });
+ if(editContent.length === 0){ return; }
+
+ this.setState(
+ { submitState: true },
+ () => {
+ this.updateTrainingObjective(
+ { content: editContent },
+ () => {
+ this.setState({ submitState: false, contentEditState: false });
+ this.getData();
+ },
+ _e => {
+ this.setState({ submitState: false })
+ }
+ )
+ }
+ );
+ }
+
+ cancelContentEdit = () => {
+ this.setState({ editContent: this.state.objective.content, contentEditState: false });
+ }
+
+ editItemsContent = () => {
+ let { trainingSubitems } = this.state;
+ if(!trainingSubitems || trainingSubitems.length === 0){
+ trainingSubitems = [{ id: null, content: null }]
+ }
+ this.setState({ trainingSubitems: trainingSubitems, itemsEditState: true });
+ }
+
+ addItemColumn = (index) => {
+ let { trainingSubitems } = this.state;
+ trainingSubitems.splice(index, 0, { id: null, content: null });
+ this.setState({ trainingSubitems })
+ }
+
+ removeItemColumn = (index) => {
+ let { trainingSubitems } = this.state;
+ trainingSubitems.splice(index, 1);
+ this.setState({ trainingSubitems })
+ }
+
+ onItemContentChange = (e, index) => {
+ let { trainingSubitems } = this.state;
+ trainingSubitems[index].content = e.target.value;
+
+ this.setState({ trainingSubitems: trainingSubitems });
+ }
+
+ saveItemsContentEdit = () => {
+ let { objective, trainingSubitems } = this.state;
+
+ let errorItem = trainingSubitems.find(item => !item.content || item.content.length === 0);
+ this.setState({ itemValidateState: !!errorItem });
+
+ if(errorItem){ return }
+
+ this.setState(
+ { itemSubmitState: true },
+ () => {
+ this.updateTrainingObjective(
+ { content: objective.content, training_subitems: trainingSubitems },
+ () => {
+ this.setState({ itemSubmitState: false, itemsEditState: false });
+ this.getData();
+ },
+ _e => {
+ this.setState({ itemSubmitState: false })
+ }
+ )
+ }
+ );
+ }
+
+ cancelItemsContentEdit = () => {
+ this.setState({ trainingSubitems: this.state.objective.ec_training_items, itemsEditState: false, itemValidateState: false });
+ }
+
+ updateTrainingObjective = (data, success, fail) => {
+ let { yearId } = this.props;
+ let url = `/ec_years/${yearId}/ec_training_objectives.json`;
+
+ axios.post(url, data).then(res => {
+ if(res){
+ message.success('操作成功');
+ success();
+ }
+ }).catch(e => {
+ console.log(e);
+ fail(e);
+ })
+ }
+
+ render() {
+ let { can_manager } = this.props.year;
+ let { loading, contentEditState, itemsEditState, objective, editContent, trainingSubitems, validateState, itemValidateState, itemSubmitState, submitState } = this.state;
+
+ return (
+
+
+
+
+
+
+
+ 导出毕业要求
+ 毕业要求(及其指标点)
+
+ 请结合本专业特色修改毕业要求文字描述及指标点，需完全覆盖12项通用标准
+ 查看详情
+
+
+
+
+
+
+
+ 指标点
+ 内容
+
+ {
+ can_manager && !addState && (
+
+
+ )
+ }
+
+
+ {
+ graduationRequirements && graduationRequirements.map((item, index) => {
+ return can_manager && index === editIndex ? (
+
+
+
+ ) : (
+
+
+ {
+ currentEditReq.ec_graduation_subitems.map((subitem, i) => {
+ return (
+ { index + 1 }
+
+
+
+
+
+
+
+
+ )
+ })
+ }
+
+ { index + 1 }-{ i + 1 }
+
+
+ this.onEditItemContentChange(e, i)} />
+
+
+
+ this.removeEditItem(i)}/>
+
+
+
+
+
+
+ )
+ })
+ }
+
+ {
+ can_manager && addState && (
+
+
+ {
+ item.ec_graduation_subitems.map((subitem, i) => {
+ return (
+ { index + 1 }
+ { item.content }
+ {
+ can_manager && (
+
+ this.showDeleteConfirm(item.id)} /> this.showEditContent(index)}/>
+ )
+ }
+
+
+
+ )
+ })
+ }
+ { index + 1 }-{ i + 1 }
+ { subitem.content }
+
+
+ )
+ }
+
+
+ {
+ newRequirement.graduation_subitems.map((subitem, i) => {
+ return (
+ { graduationRequirements.length + 1 }
+
+
+
+
+
+
+
+
+ )
+ })
+ }
+
+ { graduationRequirements.length + 1 }-{ i + 1 }
+
+
+ this.onNewReqItemContentChange(e, i)} />
+
+
+
+ this.removeNewReqItem(i)}/>
+
+
+
+
+
+
+
+
+ )
+ }
+}
+TrainingObjective.propTypes = {
+ schoolId: PropTypes.string,
+ majorId: PropTypes.string,
+ yearId: PropTypes.string,
+}
+
+export default TrainingObjective
\ No newline at end of file
diff --git a/public/react/src/modules/ecs/EcSetting/TrainingObjective/index.scss b/public/react/src/modules/ecs/EcSetting/TrainingObjective/index.scss
new file mode 100644
index 000000000..50b801459
--- /dev/null
+++ b/public/react/src/modules/ecs/EcSetting/TrainingObjective/index.scss
@@ -0,0 +1,99 @@
+.ec-training-objective-page {
+ background: #ffffff;
+
+ .training-objective {
+ &-body {
+ margin-top: -24px;
+ min-height: 600px;
+ }
+
+ &-content {
+ display: flex;
+ padding: 20px 30px;
+ line-height: 2.0;
+
+ &.block {
+ display: block;
+ }
+
+ &-text {
+ flex: 1;
+ }
+
+ &-edit {
+ margin-left: 20px;
+
+ & > i {
+ color: #29BD8B;
+ cursor: pointer;
+ font-size: 18px;
+ }
+ }
+
+ &-form {
+ margin-top: 10px;
+ text-align: right;
+
+ button {
+ margin-left: 10px;
+ }
+ }
+ }
+
+ &-items {
+ &-head {
+ padding: 15px 30px;
+ display: flex;
+ background: #F5F5F5;
+ }
+
+ &-body {
+ margin: 0 30px;
+
+ &-item {
+ display: flex;
+ min-height: 48px;
+ padding: 10px 0px;
+ border-bottom: 1px solid #eaeaea;
+
+ &:last-child {
+ border-bottom: unset;
+ }
+ }
+ }
+
+ .no-column {
+ width: 40px;
+ text-align: center;
+ }
+
+ .item-content-column {
+ flex: 1;
+ padding-left: 10px;
+ display: flex;
+
+ .ant-form-item {
+ flex: 1;
+ margin-bottom: 0;
+ }
+
+ .item-column-operation {
+ display: flex;
+ justify-content: flex-end;
+ width: 80px;
+
+ & > i {
+ margin: 15px 10px;
+ font-size: 18px;
+ }
+ }
+ }
+ }
+ }
+
+ i.edit-action {
+ color: #29BD8B;
+ cursor: pointer;
+ font-size: 18px;
+ }
+}
\ No newline at end of file
diff --git a/public/react/src/modules/ecs/EcSetting/index.js b/public/react/src/modules/ecs/EcSetting/index.js
new file mode 100644
index 000000000..d85d10aec
--- /dev/null
+++ b/public/react/src/modules/ecs/EcSetting/index.js
@@ -0,0 +1,148 @@
+import React from 'react';
+import { Switch, Route, Link } from 'react-router-dom';
+import { Steps, Breadcrumb } from 'antd';
+import axios from 'axios';
+
+import './index.scss';
+
+import CustomLoadable from "../../../CustomLoadable";
+import Loadable from 'react-loadable';
+import Loading from "../../../Loading";
+const { Step } = Steps;
+const steps = ["培养目标", "毕业要求", "培养目标VS毕业要求", "毕业要求VS通用标准", "学生", "课程体系", "课程体系VS毕业要求", "达成度评价结果"];
+const stepTypes = ["training_objectives", "graduation_requirement", "requirement_vs_objective", "requirement_vs_standard", "students", "courses", "requirement_vs_courses", "reach_calculation_info"];
+const EcStudentList=Loadable({
+ loader: () => import('../subroute/ecStudentList/EcStudentList'),
+ loading: Loading,
+});
+const Curriculum=Loadable({
+ loader: () => import('../../../modules/ecs/curriculum/Curriculum'),
+ loading: Loading,
+});
+const TrainingObjective=Loadable({
+ loader: () => import('./TrainingObjective/index'),
+ loading: Loading,
+});
+const GraduationRequirement=Loadable({
+ loader: () => import('./GraduationRequirement/index'),
+ loading: Loading,
+});
+const CourseSupports=Loadable({
+ loader: () => import('./CourseSupports/index'),
+ loading: Loading,
+});
+
+class EcSetting extends React.Component {
+ constructor (props) {
+ super(props);
+
+ this.state = {
+ schoolId: null,
+ majorId: props.match.params.majorId,
+ yearId: props.match.params.yearId,
+ year: null,
+
+ stepIndex: 0,
+ }
+ }
+
+ componentDidMount() {
+ this.setupStep();
+ this.getYearDetail();
+ }
+
+ getYearDetail = () => {
+ let { majorId, yearId } = this.state;
+ axios.get(`/ec_major_schools/${majorId}/ec_years/${yearId}.json`).then(res => {
+ if(res){
+ this.setState({ year: res.data, schoolId: res.data.school_id })
+ }
+ }).catch(e => console.log(e))
+ }
+
+ onStepChange = (stepIndex) => {
+ let { majorId, yearId } = this.state;
+ let type = stepTypes[stepIndex];
+
+ this.setState({ stepIndex: stepIndex });
+ if(type==="courses"){
+ this.props.history.push(`/ecs/major_schools/${majorId}/years/${yearId}/${type}/ec_course_support_setting/1`);
+ }else {
+ this.props.history.push(`/ecs/major_schools/${majorId}/years/${yearId}/${type}`);
+ }
+ }
+
+ setupStep = () => {
+ let type = this.props.match.params.type;
+
+ let stepIndex = stepTypes.indexOf(type);
+ this.setState({ stepIndex: stepIndex });
+ }
+
+ render() {
+ let { year, schoolId, majorId, yearId } = this.state;
+ let { stepIndex } = this.state;
+
+ return (
+
+
+
+
+
+
+
+ 导出培养目标
+ 培养目标
+
+ 请结合本专业特色修改培养目标文字描述及目标分解查看详情
+ 查看详情
+
+
+ {
+ can_manager && contentEditState ? (
+
+
+
+ ) : (
+
+
+ this.setState({ editContent: e.target.value })} />
+
+
+
+
+
+
+
+
+ )
+ }
+
+ { objective.content }
+ {
+ can_manager && (
+
+
+ this.setState({ contentEditState: true })} />
+
+
+ )
+ }
+
+
+
+
+ 分项
+ 目标分解详情
+
+ {
+ !can_manager || itemsEditState || (
+
+
+ )
+ }
+
+
+ {
+ can_manager && itemsEditState ? (
+
+
+ {
+ trainingSubitems && trainingSubitems.map((item, index) => {
+ return (
+
+ ) : (
+ objective.ec_training_items && objective.ec_training_items.map((item, index) => {
+ return (
+
+
+ )
+ })
+ }
+
+ {index + 1}
+
+
+ this.onItemContentChange(e, index)} />
+
+
+
+ { index !== 0 && this.removeItemColumn(index)} /> }
+
+ this.addItemColumn(index + 1)} style={{ color: '#29BD8B' }} />
+
+
+
+
+
+
+
+ )
+ })
+ )
+ }
+ { index + 1 }
+ { item.content }
+
+
+ )
+ }
+}
+
+export default EcSetting
\ No newline at end of file
diff --git a/public/react/src/modules/ecs/EcSetting/index.scss b/public/react/src/modules/ecs/EcSetting/index.scss
new file mode 100644
index 000000000..7fcd80880
--- /dev/null
+++ b/public/react/src/modules/ecs/EcSetting/index.scss
@@ -0,0 +1,62 @@
+.ec-page {
+ margin-bottom: 50px;
+
+ .ec-breadcrumb {
+ margin-top: 10px;
+ margin-bottom: 10px;
+ }
+
+ .ec-steps {
+ &-box {
+ margin-bottom: 10px;
+ padding-left: 20px;
+ padding-right: 20px;
+ justify-content: space-between;
+ background: #fff;
+
+ .ant-steps-item {
+ flex: unset !important;
+
+ &-container {
+ margin-left: 0;
+ }
+
+ &.ant-steps-item-active {
+ .ant-steps-item-subtitle {
+ color: #1890ff;
+ }
+ }
+
+ &-subtitle {
+ margin-left: 0;
+ margin-right: 8px;
+ }
+ }
+ }
+ }
+
+ .ec-head {
+ margin-bottom: -24px;
+ padding: 20px 30px;
+ display: flex;
+ align-items: flex-end;
+ justify-content: space-between;
+
+ &-left {
+ flex: 1;
+ }
+
+ &-label {
+ font-size: 18px;
+ }
+
+ &-tip {
+ font-size: 14px;
+ color: #999999;
+ }
+ }
+
+ .link {
+ color: #007bff;
+ }
+}
\ No newline at end of file
diff --git a/public/react/src/modules/ecs/EcYear/AddYearModal.js b/public/react/src/modules/ecs/EcYear/AddYearModal.js
new file mode 100644
index 000000000..e54ba6b73
--- /dev/null
+++ b/public/react/src/modules/ecs/EcYear/AddYearModal.js
@@ -0,0 +1,108 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { Modal, Select, message } from 'antd';
+import axios from 'axios';
+
+import './AddYearModal.scss';
+
+const { Option } = Select;
+
+class AddYearModal extends React.Component {
+ constructor(props) {
+ super(props);
+
+ this.state = {
+ confirmLoading: false,
+ error: '',
+
+ year: '',
+ currentYear: new Date().getFullYear()
+ }
+ }
+
+ handleOk = () => {
+ let { year } = this.state;
+
+ if(!year || year.length === 0){
+ this.setState({ error: '请选择届别' });
+ return;
+ }
+
+ this.submitYear();
+ }
+
+ handleCancel = () => {
+ this.props.onHide(false);
+ }
+
+ onAfterModalClose = () => {
+ this.setState({ year: '' });
+ }
+
+ submitYear = () => {
+ let { schoolId, majorId } = this.props;
+ let { year } = this.state;
+
+ this.setState({ confirmLoading: true });
+ axios.post(`/ec_major_schools/${majorId}/ec_years.json`, { school_id: schoolId, year: year }).then(res => {
+ if(res.status === 200){
+ message.success('操作成功');
+ this.setState({ confirmLoading: false });
+ this.props.onHide(true);
+ }
+ }).catch(e => {
+ console.log(e);
+ this.setState({ confirmLoading: false });
+ })
+ }
+
+ render() {
+ let { confirmLoading, year, currentYear } = this.state;
+
+ return (
+
+
+ (
+ (
+
+
+ {/*学生*/}
+ (
+ {/*课程体系*/}
+ (
+ {/*课程体系VS毕业要求*/}
+ (
+
+
+
+
+ )
+ }
+
+
+
+
+ { year && year.school_name }
+
+
+ { year && year.major_name }
+
+ {year && year.year}届
+
+
+
+
+
+
+ {
+ steps.map((title, index) => {
+ return (
+
+ )
+ })
+ }
+
+
+
+ {
+ year && (
+
+
+
+
+
+ )
+ }
+}
+
+AddYearModal.propTypes = {
+ schoolId: PropTypes.number,
+ majorId: PropTypes.number,
+ visible: PropTypes.bool,
+ onHide: PropTypes.func
+}
+
+export default AddYearModal
\ No newline at end of file
diff --git a/public/react/src/modules/ecs/EcYear/AddYearModal.scss b/public/react/src/modules/ecs/EcYear/AddYearModal.scss
new file mode 100644
index 000000000..75218677d
--- /dev/null
+++ b/public/react/src/modules/ecs/EcYear/AddYearModal.scss
@@ -0,0 +1,34 @@
+.add-year-modal {
+ .add-year {
+ &-container {
+ padding: 0 40px;
+ }
+
+ &-tip {
+ margin-bottom: 20px;
+ color: #666666;
+ line-height: 30px;
+ text-align: center;
+ }
+
+ &-content {
+ padding: 0 50px;
+ display: flex;
+ align-items: center;
+
+ &-label {
+
+ }
+
+ &-select {
+ flex: 1;
+ }
+ }
+ }
+
+ .ant-modal-footer {
+ padding-bottom: 20px;
+ text-align: center;
+ border-top: unset;
+ }
+}
\ No newline at end of file
diff --git a/public/react/src/modules/ecs/EcYear/index.js b/public/react/src/modules/ecs/EcYear/index.js
new file mode 100644
index 000000000..e9d3a0296
--- /dev/null
+++ b/public/react/src/modules/ecs/EcYear/index.js
@@ -0,0 +1,218 @@
+import React from 'react';
+import { Link } from 'react-router-dom';
+import axios from 'axios';
+import { Spin, Button, Table, Input, Divider, Modal, message, Breadcrumb } from 'antd';
+
+import './index.scss';
+import AddYearModal from "./AddYearModal";
+
+const { Search } = Input;
+const { confirm } = Modal;
+
+const defaultPagination = { current: 1, pageSize: 20, total: 0 };
+
+
+class EcYear extends React.Component {
+ constructor (props) {
+ super(props);
+
+ this.state = {
+ majorId: props.match.params.majorId,
+
+ spin: true,
+ loading: true,
+ keyword: '',
+ pagination: {...defaultPagination},
+
+ major: {},
+ yearData: [],
+
+ // add year modal vars
+ addYearModalVisible: false
+ }
+ }
+
+ componentDidMount() {
+ this.getMajor();
+ }
+
+ getMajor = () => {
+ axios.get(`/ec_major_schools/${this.state.majorId}.json`).then(res => {
+ if(res.status === 200){
+ window.document.title = res.data.name;
+ this.setState({ spin: false, major: res.data });
+ this.getYearData();
+ }
+ }).catch(e => console.log(e));
+ }
+
+ onSearch = () => {
+ this.setState({ pagination: {...defaultPagination} }, () => {
+ this.getYearData();
+ })
+ }
+
+ getYearData = () => {
+ let { majorId, keyword, pagination } = this.state;
+ axios.get(`/ec_major_schools/${majorId}/ec_years.json`, {
+ params: {
+ search: keyword,
+ page: pagination.current,
+ per_page: pagination.pageSize
+ }
+ }).then(res => {
+ if(res.status === 200){
+ let pagination = { ...this.state.pagination };
+ pagination.total = res.data.count;
+
+ this.setState({
+ loading: false,
+ yearData: res.data.ec_years,
+ pagination
+ })
+ }
+ }).catch((e) => {
+ console.log(e);
+ this.setState({ loading: false });
+ })
+ }
+
+ onPaginationChange = (page, pageSize) => {
+ this.setState({ pagination: { current: page, pageSize: pageSize } }, () => {
+ this.getYearData()
+ });
+ }
+
+ showDeleteYearConfirm = (yearId) => {
+ confirm({
+ title: '确认删除该届别?',
+ okText: '确认',
+ cancelText: '取消',
+ onOk: () => {
+ this.deleteYear(yearId);
+ },
+ onCancel() {},
+ });
+ }
+
+ deleteYear = (yearId) => {
+ let { majorId } = this.state;
+ axios.delete(`/ec_major_schools/${majorId}/ec_years/${yearId}.json`).then(res => {
+ if(res.status === 200){
+ message.success('操作成功');
+ this.getYearData();
+ }
+ }).catch(e => console.log(e))
+ }
+
+ HideAddYearModal = (added) => {
+ this.setState({ AddYearModalVisible: false });
+ if(added){
+ this.setState({ keyword: '', pagination: { ...defaultPagination } }, this.getYearData);
+ }
+ }
+
+ render() {
+ let { majorId, spin, keyword, loading, pagination, major, yearData } = this.state;
+
+ const linkRender = (num, url) => {
+ return { num === 0 ? "立即配置" : num };
+ }
+ const contrastRender = (num, other) => {
+ let color = other !== 0 && num === other ? 'color-green' : 'color-orange';
+
+ return other === 0 ? (
+
+
+
+ 基础数据：除学生列表与成绩录入以外的所有基础数据
+ 将自动复制上届别的数据；数据均可再编辑 +
+
+ + 将自动复制上届别的数据；数据均可再编辑 +
+
+ 选择届别：
+
+
+
+ -- / --
+ ) : (
+ {num} / {other}
+ )
+ }
+ const statusRender = (text, record) => {
+ let zero = record.graduation_subitem_count === 0;
+
+ return zero ? (
+ --
+ ) : (
+
+ { text === 'achieved' ? '已达成' : '未达成' }
+
+ )
+ }
+ const operationRender = (_, record) => {
+ return (
+
+ 立即配置
+ this.showDeleteYearConfirm(record.id)}>删除
+
+ )
+ }
+ const tableColumns = [
+ { title: '届别', dataIndex: 'year', render: text => `${text}届` },
+ { title: '培养目标', dataIndex: 'training_subitem_count', render: (text, record) => linkRender(text, `/ecs/major_schools/${this.state.majorId}/years/${record.id}/training_objectives`), },
+ { title: '毕业要求', dataIndex: 'graduation_requirement_count', render: (text, record) => linkRender(text, `/ecs/major_schools/${this.state.majorId}/years/${record.id}/graduation_requirement`), },
+ { title: '课程体系', dataIndex: 'course_count', render: (text, record) => linkRender(text, `/ecs/major_schools/${this.state.majorId}/years/${record.id}/ec_course_setting`), },
+ { title: '课程目标（达成情况）', key: 'courseTarget', render: (_, record) => { return contrastRender(record.achieved_graduation_course_count, record.course_target_count) } },
+ { title: '毕业要求指标点（达成情况）', key: 'graduation', render: (_, record) => { return contrastRender(record.achieved_graduation_objective_count, record.graduation_subitem_count) } },
+ { title: '评价结果', dataIndex: 'status', render: statusRender },
+ { title: '操作', key: 'operation', render: operationRender }
+ ];
+
+ return (
+
+
+
+
+
+ )
+ }
+}
+
+export default EcYear;
\ No newline at end of file
diff --git a/public/react/src/modules/ecs/EcYear/index.scss b/public/react/src/modules/ecs/EcYear/index.scss
new file mode 100644
index 000000000..66f49e304
--- /dev/null
+++ b/public/react/src/modules/ecs/EcYear/index.scss
@@ -0,0 +1,62 @@
+.ec-year-list-page {
+ .ec-breadcrumb {
+ margin-top: 10px;
+ margin-bottom: 10px;
+ }
+
+ .ec-year-list-container {
+ background: #fff;
+ }
+
+ .year-list {
+ &-head {
+ margin-bottom: -24px;
+ padding: 20px 30px;
+ display: flex;
+ align-items: flex-end;
+ justify-content: space-between;
+
+ &-left {
+ flex: 1;
+ }
+
+ &-label {
+ font-size: 18px;
+ }
+
+ &-tip {
+ font-size: 14px;
+ color: #999999;
+ }
+ }
+
+
+ &-body {
+ margin-top: -24px;
+ }
+
+ &-search {
+ padding: 20px 30px;
+ display: flex;
+ flex-direction: row-reverse;
+ }
+
+ &-table {
+ min-height: 400px;
+
+ th, td {
+ text-align: center;
+ }
+ }
+ }
+
+ .link {
+ color: #007bff;
+ }
+
+ .operation-box {
+ .link {
+ margin: 0 5px;
+ }
+ }
+}
\ No newline at end of file
diff --git a/public/react/src/modules/ecs/Ecs.js b/public/react/src/modules/ecs/Ecs.js
new file mode 100644
index 000000000..dab84e8d5
--- /dev/null
+++ b/public/react/src/modules/ecs/Ecs.js
@@ -0,0 +1,27 @@
+import React from 'react';
+import { Switch, Route } from 'react-router-dom';
+import { SnackbarHOC } from 'educoder';
+
+import CustomLoadable from "../../CustomLoadable";
+import {TPMIndexHOC} from "../tpm/TPMIndexHOC";
+
+const Home = CustomLoadable(() => import('./Home/index'));
+const EcYear = CustomLoadable(() => import('./EcYear/index'));
+const EcSetting = CustomLoadable(() => import('./EcSetting/index'));
+
+class Ecs extends React.Component {
+
+ render() {
+ return (
+
+
+
+
+
+
+ { major && major.school_name }
+
+ { major && major.name }
+
+
+
+
+
+
+
+
+
+
+
+ { major.name }
+
+ 请选择添加参与认证的学生界别，多个界别分次添加
+ 查看详情
+
+
+
+
+ this.setState({keyword: e.target.value})}
+ onSearch={this.onSearch}
+ value={keyword}
+ style={{ width: 200 }}/>
+
+
+
+
+
+
+
+
+
+ )
+ }
+}
+
+export default SnackbarHOC() (TPMIndexHOC ( Ecs ));
\ No newline at end of file
diff --git a/public/react/src/modules/ecs/Home/AddMajorModal.js b/public/react/src/modules/ecs/Home/AddMajorModal.js
new file mode 100644
index 000000000..9b58ed7e4
--- /dev/null
+++ b/public/react/src/modules/ecs/Home/AddMajorModal.js
@@ -0,0 +1,179 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { Modal, Input, Table, message } from 'antd';
+import axios from 'axios';
+
+import './AddMajorModal.scss';
+
+const { Search } = Input;
+const tableColumns = [
+ { title: '专业代码', dataIndex: 'code', key: 'code', width: 100, },
+ { title: '专业名称', dataIndex: 'name', key: 'name', },
+ { title: '', dataIndex: 'selected', key: 'selected', width: 80, render: selected => selected && 已选择 },
+];
+const defaultPagination = { current: 1, pageSize: 10, total: 0 };
+
+class AddMajorModal extends React.Component {
+ constructor(props) {
+ super(props);
+
+ this.state = {
+ loading: false,
+ confirmLoading: false,
+ error: '',
+ keyword: '',
+ pagination: {...defaultPagination},
+
+ schoolId: props.schoolId,
+ majorData: [],
+ selectedData: []
+ }
+
+ this.getMajors = this.getMajors.bind(this);
+ this.selectMajor = this.selectMajor.bind(this);
+ this.onAfterModalClose = this.onAfterModalClose.bind(this);
+ this.handleOk = this.handleOk.bind(this);
+ this.handleCancel = this.handleCancel.bind(this);
+ this.onPaginationChange = this.onPaginationChange.bind(this);
+ }
+
+ componentDidUpdate(prevProps) {
+ if(!prevProps.visible && this.props.visible){
+ this.getMajors();
+ }
+ }
+
+ onSearch = () => {
+ this.setState({ pagination: {...defaultPagination} }, () => {
+ this.getMajors();
+ })
+ }
+
+ getMajors(){
+ let { schoolId, keyword, pagination } = this.state;
+
+ this.setState({ loading: true });
+ axios.get(`/schools/${schoolId}/ec_majors.json`, {
+ params: {
+ search: keyword,
+ page: pagination.current,
+ per_page: pagination.pageSize
+ }
+ }).then(res => {
+ if(res.status === 200){
+ let pagination = { ...this.state.pagination };
+ pagination.total = res.data.count;
+
+ this.setState({
+ majorData: res.data.ec_majors,
+ loading: false,
+ pagination,
+ })
+ }
+ }).catch(e => {
+ console.log(e);
+ this.setState({ loading: false })
+ })
+ }
+
+ getCheckboxProps(record){
+ return { ...record, disabled: record.selected }
+ }
+
+ selectMajor(selectedRowKeys){
+ this.setState({ selectedData: selectedRowKeys });
+ }
+
+ onPaginationChange(page, pageSize){
+ this.setState({ pagination: { current: page, pageSize: pageSize } }, () => {
+ this.getMajors()
+ });
+ }
+
+ handleOk(){
+ let { selectedData } = this.state;
+
+ if(selectedData.length === 0){
+ this.setState({ error: '请选择专业' });
+ return;
+ }
+
+ this.submitMajor(selectedData);
+ }
+
+ handleCancel(){
+ this.props.onHide(false);
+ }
+
+ onAfterModalClose(){
+ this.setState({
+ error: '',
+ keyword: '',
+ pagination: {...defaultPagination},
+ majorData: [],
+ selectedData: [],
+ });
+ }
+
+ submitMajor(ids) {
+ let { schoolId } = this.state;
+
+ this.setState({ confirmLoading: true });
+ axios.post(`/schools/${schoolId}/ec_major_schools.json`, { major_ids: ids }).then(res => {
+ if(res.status === 200){
+ message.success('操作成功');
+ this.setState({ confirmLoading: false });
+ this.props.onHide(true);
+ }
+ }).catch(e => {
+ console.log(e);
+ this.setState({ confirmLoading: false });
+ })
+ }
+
+ render() {
+ let { loading, keyword, majorData, selectedData, pagination } = this.state;
+
+ return (
+
+
+
+
+
+ )
+ }
+}
+
+AddMajorModal.propTypes = {
+ schoolId: PropTypes.number,
+ visible: PropTypes.bool,
+ onHide: PropTypes.func
+}
+
+export default AddMajorModal
\ No newline at end of file
diff --git a/public/react/src/modules/ecs/Home/AddMajorModal.scss b/public/react/src/modules/ecs/Home/AddMajorModal.scss
new file mode 100644
index 000000000..bde678bcd
--- /dev/null
+++ b/public/react/src/modules/ecs/Home/AddMajorModal.scss
@@ -0,0 +1,29 @@
+.add-major-modal {
+ .add-major-search {
+ margin-bottom: 20px;
+ }
+ .ant-modal-body {
+ padding-bottom: 0;
+
+ .major-row {
+ padding: 10px;
+ }
+ .ant-table-thead {
+ background: #fafafa;
+ }
+ .ant-table-scroll {
+ min-height: 250px;
+ }
+
+ .error {
+ height: 20px;
+ margin-top: -20px;
+ color: red;
+ }
+ }
+ .ant-modal-footer {
+ padding-bottom: 20px;
+ text-align: center;
+ border-top: unset;
+ }
+}
\ No newline at end of file
diff --git a/public/react/src/modules/ecs/Home/AddManagerModal.js b/public/react/src/modules/ecs/Home/AddManagerModal.js
new file mode 100644
index 000000000..7e341ea11
--- /dev/null
+++ b/public/react/src/modules/ecs/Home/AddManagerModal.js
@@ -0,0 +1,226 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { Modal, Input, Table, message, Select, Form, Row, Col, Button } from 'antd';
+import axios from 'axios';
+
+import './AddManagerModal.scss';
+
+const { Option } = Select;
+
+const columnRender = (text) =>
+ this.setState({keyword: e.target.value})}
+ onSearch={this.onSearch}
+ value={keyword}/>
+
+
+
+
+
+ { this.state.error }
+ {text}
+const tableColumns = [
+ { title: '姓名', dataIndex: 'name', key: 'name', width: 60, render: columnRender },
+ { title: '职称', dataIndex: 'identity', key: 'identity', width: 60, },
+ { title: '单位', dataIndex: 'school_name', key: 'school_name', render: (_, record) => columnRender(`${record.school_name} ${record.department_name}`) },
+ { title: '手机号', dataIndex: 'phone', key: 'phone', width: 80, },
+];
+const defaultPagination = { current: 1, pageSize: 20, total: 0 };
+
+class AddManagerModal extends React.Component {
+ constructor(props) {
+ super(props);
+
+ this.state = {
+ loading: false,
+ confirmLoading: false,
+ nameValidateStatus: '',
+ error: '',
+ name: '',
+ school: props.schoolName,
+ identity: '',
+ pagination: {...defaultPagination},
+
+ schoolId: props.schoolId,
+ userData: [],
+ selectedData: []
+ }
+
+ this.getUsers = this.getUsers.bind(this);
+ this.selectUser = this.selectUser.bind(this);
+ this.onAfterModalClose = this.onAfterModalClose.bind(this);
+ this.handleOk = this.handleOk.bind(this);
+ this.handleCancel = this.handleCancel.bind(this);
+ this.onPaginationChange = this.onPaginationChange.bind(this);
+ }
+
+ onSearch = () => {
+ this.setState({ pagination: {...defaultPagination} }, () => {
+ this.getUsers();
+ })
+ }
+
+ getUsers(){
+ let { majorId } = this.props;
+ let { name, school, identity, pagination } = this.state;
+
+ if(name.length === 0){
+ this.setState({ nameValidateStatus: 'error' });
+ return;
+ }
+
+ this.setState({ loading: true });
+ axios.get(`/ec_major_schools/${majorId}/users.json`, {
+ params: {
+ name, school, identity,
+ page: pagination.current,
+ per_page: pagination.pageSize
+ }
+ }).then(res => {
+ if(res.status === 200){
+ let pagination = { ...this.state.pagination };
+ pagination.total = res.data.count;
+
+ this.setState({
+ userData: res.data.users,
+ loading: false,
+ pagination,
+ })
+ }
+ }).catch(e => {
+ console.log(e);
+ this.setState({ loading: false })
+ })
+ }
+
+ getCheckboxProps(record){
+ return { ...record, disabled: record.manager }
+ }
+
+ selectUser(selectedRowKeys){
+ this.setState({ selectedData: selectedRowKeys });
+ }
+
+ onPaginationChange(page, pageSize){
+ this.setState({ pagination: { current: page, pageSize: pageSize } }, () => {
+ this.getUsers()
+ });
+ }
+
+ onNameChange = (e) => {
+ let name = e.target.value;
+ let nameValidateStatus = '';
+
+ if(name.length === 0){
+ nameValidateStatus = 'error'
+ }
+
+ this.setState({ nameValidateStatus, name });
+ }
+
+ handleOk(){
+ this.setState({ error: '' });
+ let { selectedData } = this.state;
+
+ if(selectedData.length === 0){
+ this.setState({ error: '请选择至少一个用户' });
+ return;
+ }
+
+ this.submitUsers(selectedData);
+ }
+
+ handleCancel(){
+ this.props.onHide(false);
+ }
+
+ onAfterModalClose(){
+ this.setState({
+ error: '',
+ nameValidateStatus: '',
+ name: '',
+ school: this.props.schoolName,
+ identity: '',
+ pagination: {...defaultPagination},
+ userData: [],
+ selectedData: [],
+ });
+ }
+
+ submitUsers(ids) {
+ let { majorId } = this.props;
+
+ this.setState({ confirmLoading: true });
+ axios.post(`/ec_major_schools/${majorId}/major_managers.json`, { user_ids: ids }).then(res => {
+ if(res.status !== 200){ return }
+
+ message.success('操作成功');
+ this.setState({ confirmLoading: false });
+ this.props.onHide(true);
+ }).catch(e => {
+ console.log(e);
+ this.setState({ confirmLoading: false });
+ })
+ }
+
+ render() {
+ let { loading, name, school, identity, userData, selectedData, pagination, nameValidateStatus } = this.state;
+
+ return (
+
+
+
+
+
+ )
+ }
+}
+
+AddManagerModal.propTypes = {
+ schoolId: PropTypes.string,
+ schoolName: PropTypes.string,
+ majorId: PropTypes.number,
+ visible: PropTypes.bool,
+ onHide: PropTypes.func
+}
+
+export default AddManagerModal
\ No newline at end of file
diff --git a/public/react/src/modules/ecs/Home/AddManagerModal.scss b/public/react/src/modules/ecs/Home/AddManagerModal.scss
new file mode 100644
index 000000000..2b30690fc
--- /dev/null
+++ b/public/react/src/modules/ecs/Home/AddManagerModal.scss
@@ -0,0 +1,35 @@
+.add-ec-manager-modal {
+ .ant-modal-body {
+ padding-bottom: 0;
+
+ .ant-table-thead {
+ background: #fafafa;
+ }
+ .ant-table-scroll {
+ min-height: 250px;
+ }
+
+ .add-ec-manager-search {
+ margin-bottom: 20px;
+
+ .ant-form-item {
+ margin-bottom: 0;
+
+ &-label > label {
+ font-size: 14px !important;
+ }
+ }
+ }
+
+ .error {
+ height: 20px;
+ margin-top: -20px;
+ color: red;
+ }
+ }
+ .ant-modal-footer {
+ padding-bottom: 20px;
+ text-align: center;
+ border-top: unset;
+ }
+}
\ No newline at end of file
diff --git a/public/react/src/modules/ecs/Home/MajorManager.js b/public/react/src/modules/ecs/Home/MajorManager.js
new file mode 100644
index 000000000..37b9d6e49
--- /dev/null
+++ b/public/react/src/modules/ecs/Home/MajorManager.js
@@ -0,0 +1,60 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { Tag, message } from 'antd';
+import axios from 'axios';
+
+class MajorManager extends React.Component {
+ constructor(props) {
+ super(props);
+
+ this.state = {
+ schoolId: props.schoolId,
+ majorId: props.majorId,
+ canManage: props.canManage,
+ managers: props.managers
+ }
+
+ this.deleteManager = this.deleteManager.bind(this);
+ }
+
+ componentDidUpdate(prevProps) {
+ if(this.props.managers.length !== prevProps.managers.length){
+ this.setState({ managers: this.props.managers });
+ }
+ }
+
+ deleteManager(managerId){
+ axios.delete(`/ec_major_schools/${this.state.majorId}/major_managers/${managerId}.json`).then(result => {
+ if(result.status === 200){
+ message.success('操作成功');
+ }
+ }).catch(e => { console.log(e) })
+ }
+
+ render() {
+ let { canManage, managers } = this.state;
+
+ return (
+
+
+
+
+
+
+
+ { this.state.error }
+
+ {
+ managers && managers.map(manager => {
+ return (
+ { this.deleteManager(manager.id) }} color="blue">
+ { manager.name }
+
+ )
+ })
+ }
+
+ )
+ }
+}
+
+MajorManager.propTypes = {
+ schoolId: PropTypes.string,
+ majorId: PropTypes.number,
+ canManage: PropTypes.bool,
+ managers: PropTypes.array
+}
+
+export default MajorManager
\ No newline at end of file
diff --git a/public/react/src/modules/ecs/Home/index.js b/public/react/src/modules/ecs/Home/index.js
new file mode 100644
index 000000000..8f66b6572
--- /dev/null
+++ b/public/react/src/modules/ecs/Home/index.js
@@ -0,0 +1,265 @@
+import React from 'react';
+import { Link } from 'react-router-dom';
+import { Spin, Avatar, Tooltip, Button, Divider, Input, Row, Col, Icon, Modal } from "antd";
+import { getImageUrl } from 'educoder';
+import axios from 'axios';
+
+import './index.scss';
+import bgImage from '../../../images/ecs/bg.jpg';
+
+import MajorManager from "./MajorManager";
+import AddMajorModal from "./AddMajorModal";
+import AddManagerModal from "./AddManagerModal";
+
+const { Search } = Input;
+const { confirm } = Modal;
+
+class Home extends React.Component {
+ constructor (props) {
+ super(props);
+
+ const searchParams = new URLSearchParams(props.location.search.substring(1));
+ let schoolId = searchParams.get('school_id');
+
+ if(!schoolId){
+ this.props.history.push(`/nopage`);
+ return;
+ }
+
+ this.state = {
+ loading: true,
+ majorLoading: true,
+ AddMajorVisible: false,
+ AddManagerVisible: false,
+ searchKeyword: '',
+
+ schoolId: schoolId,
+ currentMajorId: null,
+ school: null,
+ currentUser: null,
+ managers: null,
+ templateMajor: null,
+ majors: null,
+ majorCount: 0
+ }
+
+ this.getSchoolMajors = this.getSchoolMajors.bind(this);
+ this.HideAddMajorModal = this.HideAddMajorModal.bind(this);
+ this.showDeleteMajorConfirm = this.showDeleteMajorConfirm.bind(this);
+ this.showAddManagerModal = this.showAddManagerModal.bind(this);
+ this.HideAddManagerModal = this.HideAddManagerModal.bind(this);
+ }
+
+ componentDidMount() {
+ this.getSchoolDetail();
+ }
+
+ getSchoolDetail() {
+ axios.get(`/schools/${this.state.schoolId}/detail.json`).then(result => {
+ if(result.status === 200){
+ window.document.title = result.data.school.name;
+ this.setState({
+ school: result.data.school,
+ currentUser: result.data.current_user,
+ managers: result.data.school_managers,
+ loading: false
+ });
+ this.getSchoolMajors();
+ }
+ }).catch(e => {
+ console.log(e);
+ this.setState({ loading: false });
+ });
+ }
+
+ getSchoolMajors(){
+ let that = this;
+ let keyword = this.state.searchKeyword;
+ this.setState({ majorLoading: true });
+
+ axios.get(`/schools/${this.state.schoolId}/ec_major_schools.json?search=${keyword}&per_page=50`).then(result => {
+ if(result.status === 200){
+ that.setState({
+ majorCount: result.data.count,
+ templateMajor: result.data.template_ec_major_school,
+ majors: result.data.ec_major_schools,
+ majorLoading: false
+ });
+ }
+ }).catch(e => {
+ console.log(e);
+ that.setState({ majorLoading: false });
+ });
+ }
+
+ showAddManagerModal(majorId){
+ this.setState({ currentMajorId: majorId, AddManagerVisible: true });
+ }
+
+ HideAddMajorModal(added){
+ this.setState({ AddMajorVisible: false });
+ if(added){
+ this.setState({ searchKeyword: '' }, this.getSchoolMajors)
+ }
+ }
+ HideAddManagerModal(added){
+ this.setState({ AddManagerVisible: false });
+ if(added){
+ this.setState({ searchKeyword: '' }, this.getSchoolMajors)
+ }
+ }
+
+ showDeleteMajorConfirm(majorId){
+ confirm({
+ title: '确认删除该认证专业?',
+ okText: '确认',
+ cancelText: '取消',
+ onOk: () => {
+ this.deleteMajor(majorId);
+ },
+ onCancel() {},
+ });
+ }
+
+ deleteMajor(majorId){
+ let { schoolId, majorCount, majors } = this.state;
+ axios.delete(`/schools/${schoolId}/ec_major_schools/${majorId}.json`).then(res => {
+ if(res.status === 200){
+ this.setState({
+ majorCount: majorCount - 1,
+ majors: majors.filter(major => major.id !== majorId)
+ });
+ }
+ }).catch(e => console.log(e))
+ }
+
+ render() {
+ let { currentUser, school, managers, templateMajor, majors, majorCount } = this.state;
+
+ const manageSchool = !!currentUser && (currentUser.manager || currentUser.admin);
+ const manageMajor = !!currentUser && (manageSchool || currentUser.major_manager);
+
+ const configBtnText = manageMajor ? '配置' : '查看';
+
+ return (
+
+
+
+ { this.state.school && }
+
+
+ )
+ }
+}
+
+export default Home;
\ No newline at end of file
diff --git a/public/react/src/modules/ecs/Home/index.scss b/public/react/src/modules/ecs/Home/index.scss
new file mode 100644
index 000000000..93a5d3f35
--- /dev/null
+++ b/public/react/src/modules/ecs/Home/index.scss
@@ -0,0 +1,127 @@
+.ec-home {
+ .head-image {
+ width: 100%;
+ height: 240px;
+ background-size: 100% 100%;
+ justify-content: center;
+ align-items: center;
+ display: -webkit-flex;
+ }
+
+ .ec-home-item {
+ background: #fff;
+
+ &-head {
+ display: flex;
+ align-items: baseline;
+ margin-bottom: 20px;
+ }
+
+ &-label {
+ margin-right: 20px;
+ font-size: 18px;
+ }
+
+ &-tip {
+ color: #999;
+ font-size: 12px;
+ }
+
+ &.major-list-item {
+ .ec-home-item {
+ &-head {
+ margin-bottom: -24px;
+ padding: 20px 30px;
+ justify-content: space-between;
+ align-items: center;
+ }
+
+ &-tip {
+ font-size: 14px;
+ }
+ }
+ }
+ }
+
+ .school-manager-item {
+ padding: 20px 30px;
+ }
+
+ .ec-school-manager {
+ display: flex;
+ flex-wrap: wrap;
+
+ &-item {
+ margin-right: 20px;
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ }
+
+ &-name {
+ display: block;
+ text-align: center;
+ max-width: 48px;
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ color: #666;
+ }
+ }
+
+ .major-list-item {
+ .major-list {
+ &-container {
+
+ }
+
+ &-head {
+ margin-top: -24px;
+ padding: 20px 30px;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+
+ .total { font-size: 12px; }
+ }
+
+ &-body {
+ padding-bottom: 30px;
+ }
+
+ &-row {
+ padding: 10px 15px;
+ border-bottom: 1px solid #eee;
+
+ &:last-child { border-bottom: unset; }
+
+ &.head {
+ background: #F5F5F5;
+ }
+ .ant-btn-link {
+ text-align: center;
+ }
+ }
+ }
+ }
+ .operate-box {
+ .link {
+ margin: 0 5px;
+ }
+ }
+ .manager-box {
+ display: flex;
+ align-items: center;
+
+ &-content {
+ flex: 1;
+ display: flex;
+ flex-wrap: wrap;
+ align-items: center;
+ }
+ }
+
+ .link {
+ color: #007bff;
+ }
+}
\ No newline at end of file
diff --git a/public/react/src/modules/ecs/css/ec.css b/public/react/src/modules/ecs/css/ec.css
new file mode 100644
index 000000000..3c62678c9
--- /dev/null
+++ b/public/react/src/modules/ecs/css/ec.css
@@ -0,0 +1,27 @@
+.newedu-class-container{
+ width:1240px;
+ height:84px;
+}
+.ecnewbutton{
+ width:68px;
+ height:30px;
+ background:rgba(76,172,255,1);
+ border-radius:2px;
+ float:right;
+}
+.newedu-title-bottom{
+ width:1240px;
+ height:65px;
+}
+.edu-con-bottom {
+ padding: 10px 0;
+ background: #fff;
+ font-size: 16px;
+}
+
+.TabledataSource .ant-table-wrapper{
+ width: 1240px;
+}
+.ant-table-thead{
+ background:rgba(245,245,245,1);
+}
\ No newline at end of file
diff --git a/public/react/src/modules/ecs/css/ecCourseEvaluations.css b/public/react/src/modules/ecs/css/ecCourseEvaluations.css
new file mode 100644
index 000000000..f27ad7313
--- /dev/null
+++ b/public/react/src/modules/ecs/css/ecCourseEvaluations.css
@@ -0,0 +1,576 @@
+.TrainingLecturer{
+ font-size:18px;
+ font-family:MicrosoftYaHei;
+ font-weight:400;
+ color:#656565;
+}
+.TrainingTheory{
+ font-size:18px;
+ font-family:MicrosoftYaHei;
+ font-weight:400;
+ color:#05101A !important;
+}
+#SystemParameters{
+ height: 81px;
+ line-height: 40px;
+}
+#SystemParameters .SystemParameters:nth-child(1){
+ font-size:14px;
+ font-family:MicrosoftYaHei;
+ font-weight:400;
+ /* color:#989898 !important; */
+}
+#SystemParameters .SystemParameters:nth-child(2){
+ font-size:14px;
+ font-family:MicrosoftYaHei;
+ font-weight:400;
+ color:#989898 !important;
+}
+.operationright{
+ float:right !important;
+}
+.ml75{
+ margin-left:75px;
+}
+.mlim30{
+ margin-left:30px !important;
+}
+.RadioGroupbox{
+ display: inline-block;
+ width: 100px;
+ height: 25px;
+ position: relative;
+}
+.RadioGroupboxab{
+ position: absolute;
+ top: -5px;
+ left: 30px;
+}
+.buttoninline{
+ display: inline-block;
+ margin-left: 29px;
+ position: relative;
+ /* width: 100px; */
+ margin-top: 0px;
+ height: 25px;
+}
+.placeholder::-moz-placeholder{font-size:12px;}
+.placeholder::-webkit-input-placeholder{font-size:12px;}
+.placeholder:-ms-input-placeholder{font-size:12px;}
+.mr16{
+ margin-right:16px;
+}
+.defalutSubmitbtn{
+ cursor: pointer;
+}
+.defalutCancelbtn{
+ cursor: pointer;
+}
+.newSystem{
+ background: #fff;
+}
+/* #EvaluationsList{
+ padding:20px 0px;
+} */
+.mt55{
+ margin-top:55px !important;
+}
+.mb100{
+ margin-bottom:100px !important;
+}
+.mt26{
+ margin-top:26px !important;
+}
+.mb80{
+ margin-bottom:80px !important;
+}
+.color99{
+ color:#999999;
+}
+.ant-select-selection__placeholder{
+ width: 100%;
+ font-size:14px;
+ height:58px;
+}
+.mt70{
+ margin-top:70px;
+}
+.mb50{
+ margin-bottom:50px;
+}
+/* 谷歌 */
+input::-webkit-outer-spin-button,
+input::-webkit-inner-spin-button {
+ -webkit-appearance: none;
+ appearance: none;
+ margin: 0;
+ font-size:14px;
+}
+/* 火狐 */
+input{
+ -moz-appearance:textfield;
+ font-size:14px;
+}
+.ColorF68{
+ color:#FF6800;
+}
+.eaSystemp a{
+ color:#05101a;
+}
+.eaSystemp span{
+ color: #05101a !important;
+}
+.editorModify div .ant-input-lg{
+ font-size: 14px;
+}
+#Coursemultiple div div ul .ant-select-selection__choice{
+ margin-left: 0px;
+ height: 20px !important;
+ min-height: 29px;
+ font-size: 14px;
+ line-height: 27px;
+ margin-top: 4px;
+ margin-bottom: 3px;
+}
+
+#Coursemultiple .ant-select-selection--multiple{
+ min-height: 40px !important;
+ line-height: 38px !important;
+}
+#Coursemultiple div div ul .ant-select-search.ant-select-search--inline{
+ margin-left: 0px;
+ height: 20px !important;
+ min-height: 29px;
+ font-size: 14px;
+ line-height: 27px;
+ margin-top: 4px;
+ margin-bottom: 3px;
+}
+.neweditSubentry{
+ position: relative;
+ top: -4px;
+ left: 7px;
+}
+.nulleditSubentry{
+ position: relative;
+ top: -4px;
+ left: 3px;
+}
+.percentage{
+ margin-left: 8px;
+ padding-left: 25px !important;
+}
+.Coursetitle{
+ margin-bottom:0px !important;
+}
+.textaligncenter{
+ padding-left: 30px !important;
+ width: 70px !important;
+}
+.ml72{
+ margin-left:72px;
+}
+
+.bordereaeaea{
+ border-bottom: 1px solid transparent !important;
+}
+.ecnowrap{
+ max-width: 170px;
+ display: inline-block;
+ overflow: hidden;
+ -o-text-overflow: ellipsis;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ color: #40a9ff !important;
+ margin-right: 108px;
+}
+.ecblock{
+ display: inline-block;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+}
+.Spinlarge{
+ text-align: center;
+ width: 100%;
+ margin-top: 25px;
+ margin-bottom: 25px;
+}
+/* .ant-select-search{
+ display:none;
+}
+.ant-select-search--inline{
+ display:none;
+} */
+.boxinline-block{
+ display: inline-block;
+}
+.boxinline{
+ margin-right: 20px;
+}
+.evaluationdataClass{
+ margin-left: 217px !important;
+ width: 589px !important;
+ display: inline-block;
+}
+.absolute{
+ position:absolute;
+}
+.ml115{
+ margin-left: 115px;
+}
+.ml100{
+ margin-left: 100px;
+}
+.Importclassroomdata{
+ position: absolute;
+ right: 18px;
+ top: 26px;
+}
+.Importclassroomdatas{
+ position: absolute;
+ right: 375px!important;
+ top: 122px !important;
+}
+.Importclassroomdatass {
+ position: absolute;
+ right: 375px !important;
+ top: 248px !important;
+}
+
+#SystemParameters{
+ position: relative;
+}
+
+.newSystem .newtarget_scoreclass{
+ padding: 10px 0px !important;
+ margin: 0px 20px !important;
+}
+
+.newSystem .newtarget_target{
+ padding: 10px 0px !important;
+ margin: 0px 30px !important;
+ border-bottom:1px solid transparent !important;
+}
+
+.nowrap329{
+ max-width: 329px !important;
+ text-align: left;
+ overflow:hidden;
+ text-overflow:ellipsis;
+ white-space:nowrap;
+ color:transparent !important;
+ min-width: 329px !important;
+}
+.ListTableLine li>.column-500{
+ max-width: 360px !important;
+ text-align: left;
+ min-width: 360px !important;
+}
+.color-666{
+ color:#666666 !important;
+}
+.color-05101A{
+ color:#05101A !important;
+}
+#SystemParametersP{
+ position:relative;
+ margin-bottom:0px !important;
+}
+.major_name{
+ cursor:inherit;
+}
+.padding1030{
+ padding: 10px 30px;
+ height: 60px !important;
+}
+.color-red{
+ color:#DD1717;
+}
+.color-redFF{
+ color:#FF6666;
+}
+.margin-left63{
+ margin-left: 63px !important;
+}
+.colorTransparent{
+ color:transparent !important;
+}
+.color999{
+ color: #999999 !important;
+}
+.operationrightbotton{
+ margin-top: 2px!important;
+ margin-right: -25px;
+}
+.mr2{
+ margin-right:2px;
+}
+.colorFF6800{
+ color: #FF6800 !important;
+}
+.lineheight60{
+ line-height: 52px !important;
+}
+.mr13{
+ margin-right: 13px;
+}
+.mr14{
+ margin-right: 14px;
+}
+
+.ecmorelist{
+ margin: 0 auto;
+ width: 100px;
+ /* height: 100px; */
+ display: block;
+}
+
+.padding10im{
+ padding: 10px 0px !important;
+}
+
+.lipadding10im{
+ margin: 0 0px!important;
+}
+
+.lipadding20im{
+ padding: 10px 20px!important;
+}
+
+.marlr19{
+ margin: 0 19px!important;
+}
+.mrj15{
+ margin-right: -15px;
+}
+.margin64px{
+ margin: 0 64px!important;
+}
+.marginright84{
+ margin-right: 84px!important;
+}
+
+.marginright162{
+ margin-right: 162px;
+}
+.width86{
+ width: 86px!important;
+}
+
+.ant-modal-mask {
+ background-color: rgba(5,16,26,0.4);
+}
+.ecmodeldelet{
+ /* 考虑有各种尺寸的屏幕，用比例 */
+ top:36%;
+}
+.ecmodeldelet .ant-modal-header{
+ padding: 0px 24px;
+}
+.ecmodeldelet .ant-modal-title{
+ padding: 0px 15px;
+ text-align: center;
+ box-sizing: border-box;
+ line-height: 70px;
+ height: 70px;
+ border-radius: 10px 10px 0px 0px;
+ font-size: 16px;
+ font-weight: bold;
+}
+a.TrainingLecturer:hover{
+ color:#4CACFF !important;
+}
+
+.newSystem .lipadding10im{
+ margin: 0 0px!important;
+}
+
+.operationleft{
+ float:left !important;
+}
+.color4D4D4D{
+ color:#4D4D4D !important;
+}
+
+/* #SystemParameters .SystemParameters:nth-child(1){
+ color:#4D4D4D !important;
+} */
+
+.color4CACFF{
+ color:#4CACFF !important;
+}
+
+.SystemParameters4CACFF{
+ font-size:14px;
+ font-family:MicrosoftYaHei;
+ font-weight:400;
+ line-height: 45px;
+}
+
+.detaillist{
+ text-align: center !important;
+ width: 133px !important;
+ height: 24px ;
+}
+
+.associatedclass{
+ margin-right: 128px !important;
+}
+
+.associatedclasslist{
+ width: 234px;
+ height: 20px;
+ font-size: 14px;
+ font-family: MicrosoftYaHei;
+ font-weight: 400;
+ color: rgba(101,101,101,1);
+ line-height: 22px;
+ margin: 6px auto;
+}
+
+.associatedclasslists{
+ width: 323px;
+ height: 35px;
+ font-size: 14px;
+ font-family: MicrosoftYaHei;
+ font-weight: 400;
+ color: rgba(101,101,101,1);
+ line-height: 22px;
+ margin: 6px auto;
+ margin-bottom: 15px;
+}
+.newecmodeldelet{
+ width:600px !important;
+ top:100px;
+}
+
+.assclasslistsearch{
+ width:454px;
+ height:36px;
+ background:rgba(244,244,244,1);
+ border:1px solid rgba(234,234,234,1);
+ border-radius:4px;
+ position: relative;
+}
+
+.assclassposition{
+ position: absolute;
+ top: 3px;
+ left: 9px;
+}
+
+.assclasslistsearchbtn{
+ width: 64px;
+ height: 35px !important;
+ font-weight: 300 !important;
+ line-height: 35px !important;
+}
+.btnweight{
+ font-weight: 300 !important;
+ color: #fff !important;
+}
+
+.CBCBCB{
+ background:#CBCBCB!important;
+}
+.clear{
+ clear: both;
+}
+.ml120{
+ margin-left: 120px;
+}
+.ml88{
+ margin-left: 88px;
+}
+.assclasslistmid{
+ width: 540px;
+ height: 282px;
+ background: rgba(244,250,255,1);
+ border-radius: 4px;
+ margin-left: 10px;
+ overflow: auto;
+ padding-top: 10px;
+}
+
+.assclasslistsubmit{
+ margin-top: 26px !important;
+ margin-bottom: 8px !important;
+}
+.ant-modal-header{
+ border-top-left-radius:10px;
+ border-top-right-radius:10px;
+}
+.ant-modal-content{
+ border-radius: 10px;
+}
+.assclasslistmidname{
+ width: 160px;
+ overflow: hidden;
+ /* height: 24px; */
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+}
+
+.bordereaeaeas{
+ border-bottom: 1px solid #eaeaea !important;
+}
+.isreloadsbtn{
+ width: 80px !important;
+ font-weight: 400 !important;
+ padding: 0px !important;
+ padding-left: 10px !important;
+}
+
+.f5f5f5{
+ color:rgb(245, 245, 245) !important;
+}
+
+.ant-select-selection{
+ border-radius: 0px !important;
+ background-color: #F5F5F5;
+}
+
+.ant-select-selection:focus{
+ border-radius: 0px !important;
+ background-color: #fff;
+ border-color: #d9d9d9 !important;
+}
+
+.listchildbox{
+ overflow: hidden;
+}
+
+.listchildboxs{
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+}
+
+.ant-input:focus, .ant-input:hover{
+ border-color: transparent;
+}
+.inputWeight{
+ background-color: #F5F5F5;
+}
+.inputWeight:focus {
+ background-color: #fff;
+ }
+ .ant-input:focus {
+ outline: 0;
+ -webkit-box-shadow: 0 0 0 2px transparent !important;
+ box-shadow: 0 0 0 2px transparent !important;
+ }
+
+ .ant-input{
+ border-color: #d9d9d9 !important;
+ }
+
+.mt60{
+ margin-top:60px;
+}
+
+.SystemParameters{
+ height:auto;
+}
\ No newline at end of file
diff --git a/public/react/src/modules/ecs/css/ecCourseSupports.css b/public/react/src/modules/ecs/css/ecCourseSupports.css
new file mode 100644
index 000000000..10b6ebd91
--- /dev/null
+++ b/public/react/src/modules/ecs/css/ecCourseSupports.css
@@ -0,0 +1,368 @@
+.eaSystemp a{
+ color:#05101a;
+}
+.eaSystemp span{
+ color: #05101a !important;
+}
+.eacourse p{
+ height:84px;
+ margin-bottom:0px !important;
+}
+.eacourse #training_objective_contents{
+ height:81px;
+}
+.courseSystem{
+font-size:18px;
+font-family:MicrosoftYaHei;
+font-weight:400;
+line-height:45px;
+color:rgba(5,16,26,1);
+}
+.SystemParameters{
+ font-size:14px;
+ font-family:MicrosoftYaHei;
+ font-weight:400;
+ line-height:45px;
+ color:rgba(50,50,50,1);
+}
+.SystemParametersysls{
+ font-size:14px;
+ font-family:MicrosoftYaHei;
+ font-weight:400;
+ color:rgba(50,50,50,1);
+}
+.Systemnum{
+ font-size:14px;
+ font-family:MicrosoftYaHei;
+ font-weight:400;
+ color:#FF6800;
+}
+.newSystem{
+ width:1200px;
+ overflow:auto;
+ background: #FFF;
+}
+.newSystem .clearfix .column-1{
+ width: 113px !important;
+ text-align: center;
+}
+.operationColumn{
+ margin: 0px 10%;
+ width:100%;
+ height:100%;
+}
+.operationalter{
+ margin: 20px 16px;
+}
+.SystemModifythelist .column-1{
+ width: 120px !important;
+ text-align: center;
+}
+
+.SystemModifythelist .column-3{
+ padding-left: 96px;
+ margin-right: 23px;
+}
+.operationright{
+ float:right !important;
+}
+
+.newSystem p{
+ /*padding: 10px 33px !important;*/
+ margin-bottom: 0em;
+}
+.newSystem li{
+ margin:0 !important;
+}
+.SystemModifythelist{
+ background:#FFF !important;
+}
+
+.SystemModifythelist .column-1:nth-child(1){
+ margin-left: 7px;
+}
+
+.Systempoint{
+ font-size:12px;
+ font-family:MicrosoftYaHei;
+ font-weight:400;
+ color:rgba(152,152,152,1);
+}
+.editorModify{
+ background:#FFF !important;
+}
+.newSystem .editorModify .column-1{
+ width: 194px !important;
+ text-align: left;
+ margin-left: 30px;
+}
+.newSystem .editorModify .column-1:nth-child(1){
+ margin-right: 510px;
+}
+.editorModify .ant-select{
+ width: 556px !important;
+ margin-left: 36px;
+}
+.editorModify .ant-select .ant-select-selection{
+ height: 30px !important;
+}
+.editorModify .ant-select .ant-select-selection .ant-select-selection__rendered{
+ height: 30px !important;
+}
+.editorModify .ant-select .ant-select-selection .ant-select-selection__rendered .ant-select-selection-selected-value{
+ line-height: 30px !important;
+}
+.inputWeight{
+ width: 20%;
+ font-size:14px;
+ height:30px;
+ margin-left: 20px;
+ background-color: #F5F5F5;
+}
+.SetTheAssociated{
+ width: 314px;
+ height: 30px;
+ float: right;
+ margin-right: -3.5%;
+}
+.SetTheAssociatedchild{
+ width: 120px;
+ height: 30px;
+ background: rgba(255,255,255,1);
+ border: 1px solid rgba(234,234,234,1);
+ border-radius: 4px;
+ float: left;
+ margin-right: 10px;
+ text-align: center;
+ line-height: 30px;
+ /*margin-left: 34px;*/
+}
+.operatebutton{
+ margin-left: 20px;
+ /* margin-top: 16px; */
+}
+.editbulebutton{
+ width:120px;
+ height:30px;
+ background:rgba(76,172,255,1);
+ border-radius:2px;
+ color:#FFF;
+ text-align: center;
+ line-height: 30px;
+}
+.editglybutton{
+ width:120px;
+ height:30px;
+ border:1px solid rgba(205,205,205,1);
+ border-radius:2px;
+ color:#999;
+ text-align: center;
+ line-height: 30px;
+}
+
+.editglybuttonbox{
+ width: 275px;
+ margin-bottom: 30px;
+ margin-right: 20px;
+ margin-right:7%;
+}
+.editglybuttonboxs{
+ width: 275px;
+ margin-bottom: 30px;
+ margin-right: 20px;
+ margin-right:3%;
+}
+.defalutCancelbtn:hover {
+ border: 1px solid #B2B2B2;
+ color: #B2B2B2!important;
+}
+
+.gouxuanbule{
+ color:#4CACFF;
+}
+.gouxuanwhite{
+ color:#FFF;
+}
+.icon-gouxuan{
+ cursor: pointer;
+}
+/* 谷歌 */
+input::-webkit-outer-spin-button,
+input::-webkit-inner-spin-button {
+ -webkit-appearance: none;
+ appearance: none;
+ margin: 0;
+}
+/* 火狐 */
+input{
+ -moz-appearance:textfield;
+}
+.inputWeight{
+ text-indent:0.625rem;
+}
+
+.columnlocation{
+ height: 40px;
+ line-height: 40px;
+}
+.paddingLF{
+ padding:0 33px;
+}
+.width20{
+ width: 20px;
+ height: 20px;
+ text-align: center;
+}
+.defalutSubmitbtn,.defalutCancelbtn{
+ cursor: pointer;
+}
+.mb290{
+ margin-bottom:290px;
+}
+.Spinlarge{
+ text-align: center;
+ width: 100%;
+ margin-top: 25px;
+ margin-bottom: 25px;
+}
+.DDred{
+ color:#DD1717;
+}
+.color-666{
+ color:#666666 !important;
+}
+.color-05101A{
+ color:#05101A !important;
+}
+.ec_graduation_name{
+ margin-right:20px !important;
+}
+.column-width575{
+ color: transparent !important;
+}
+.column-width130{
+ width: 130px !important;
+ height: 40px;
+}
+
+
+.ListTableLine li>span {
+ max-width: 550px !important;
+}
+
+.graduateRequirement .clearfix .column-1 {
+ width: 76px!important;
+}
+.newrightcalculatebutton{
+ width: 50px;
+ height: 25px;
+ border: 1px solid rgba(76,172,255,1);
+ border-radius: 1px;
+ line-height: 25px;
+ text-align: center;
+ margin-top: 7px;
+ cursor: pointer;
+ color: rgba(76,172,255,1);
+}
+.newrightcalculatebuttons{
+ width: 50px;
+ height: 25px;
+ border: 1px solid rgba(76,172,255,1);
+ border-radius: 1px;
+ line-height: 25px;
+ text-align: center;
+ margin-top:9px;
+ cursor: pointer;
+ color: rgba(76,172,255,1);
+ }
+.columnbox{
+ height: 53px;
+ overflow: hidden;
+}
+
+.ant-modal-mask {
+ background-color: rgba(5,16,26,0.4);
+}
+.ecmodeldelet{
+ top:300px;
+}
+.ecmodeldelet .ant-modal-header{
+ padding: 0px 24px;
+}
+.ecmodeldelet .ant-modal-title{
+ padding: 0px 15px;
+ text-align: center;
+ box-sizing: border-box;
+ line-height: 70px;
+ height: 70px;
+ border-radius: 10px 10px 0px 0px;
+ font-size: 16px;
+ font-weight: bold;
+}
+.bor-red {
+ border: 1px solid #db0505 !important;
+}
+
+.ml93{
+ margin-left:93px;
+}
+.ml26{
+ margin-left: 26px;
+}
+.finishtarget{
+ width: 69px;
+ /* height: 48px; */
+ line-height: 20px;
+ text-align: center;
+ margin-right: 48px;
+}
+
+.bordereaeaea{
+ border-bottom: 1px solid transparent !important;
+}
+
+.heightimportant{
+ height: 30px !important;
+ background-color: #F5F5F5;
+}
+.heightimportant:focus {
+ background-color: #fff;
+}
+.inputWeight:focus {
+ background-color: #fff;
+ }
+.heightlineimportant{
+ line-height: 30px !important;
+}
+
+.ant-select-selection:hover{
+ border-color: #d9d9d9 !important;
+}
+.ant-input:focus {
+ outline: 0;
+ -webkit-box-shadow: 0 0 0 2px transparent !important;
+ box-shadow: 0 0 0 2px transparent !important;
+ }
+ .ant-input{
+ border-color: #d9d9d9 !important;
+ }
+ .ant-select-selection:focus{
+ -webkit-box-shadow: 0 0 0 2px transparent !important;
+ box-shadow: 0 0 0 2px transparent !important;
+ }
+ .ant-select-selection:active{
+ -webkit-box-shadow: 0 0 0 2px transparent !important;
+ box-shadow: 0 0 0 2px transparent !important;
+ }
+
+ .ant-select-selection:focus{
+ border-color: #d9d9d9 !important;
+ }
+ .ant-select-selection{
+ -webkit-box-shadow: 0 0 0 2px transparent !important;
+ box-shadow: 0 0 0 2px transparent !important;
+ }
+
+.mt60{
+ margin-top:60px;
+}
\ No newline at end of file
diff --git a/public/react/src/modules/ecs/css/search.svg b/public/react/src/modules/ecs/css/search.svg
new file mode 100644
index 000000000..cf0e16c0c
--- /dev/null
+++ b/public/react/src/modules/ecs/css/search.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/react/src/modules/ecs/curriculum/Curriculum.js b/public/react/src/modules/ecs/curriculum/Curriculum.js
new file mode 100644
index 000000000..3dae260de
--- /dev/null
+++ b/public/react/src/modules/ecs/curriculum/Curriculum.js
@@ -0,0 +1,255 @@
+import React, { Component } from 'react';
+import classNames from 'classnames'
+
+import axios from 'axios';
+
+import { TPMIndexHOC } from '../../tpm/TPMIndexHOC';
+
+import { SnackbarHOC } from 'educoder'
+
+import { message,Modal,Spin,Icon} from 'antd';
+
+import 'antd/dist/antd.css';
+
+import EcTitleCourseEvaluations from '../ecTitle/ecTitle'
+
+import '../css/ecCourseSupports.css';
+
+import '../css/ecCourseEvaluations.css';
+import {
+ BrowserRouter as Router,
+ Route,
+ Switch
+} from 'react-router-dom';
+import Loadable from 'react-loadable';
+import Loading from "../../../Loading";
+const $ = window.$;
+const Curriculumtwo = Loadable({
+ loader: () => import('./Curriculumtwo'),
+ loading: Loading,
+})
+const EcCourseEvaluationsbottom =Loadable({
+ loader: () => import('../subroute/ecCourseEvaluations/EcCourseEvaluationsbottom'),
+ loading: Loading,
+});
+const EcCompletionCalculation =Loadable({
+ loader: () => import('../subroute/ecCompletion_calculation/EcCompletionCalculation'),
+ loading: Loading,
+});
+
+
+class Curriculum extends Component {
+ //课程体系
+ constructor(props) {
+ super(props)
+ this.state= {
+ classcalue:5,
+ newec_course_idbottom:"",
+ course_name:undefined,
+ course_url:"a",
+ ecmanager:true,
+ titine:1,
+ }
+ }
+
+ componentWillMount(){
+ // window.document.title = '课程达成评价结果';
+ }
+ componentDidMount(){
+ console.log(this.props);
+ }
+ sync_course_data=()=>{
+ // this.setState({listSpin:true})
+ // let ec_course_id=this.props.match.params.ec_course_id;
+ // let Url ='/ec_course_achievement_methods/sync_course_data';
+ // axios.post(Url, {
+ // ec_course_id:ec_course_id
+ // },
+ // {
+ // withCredentials: true
+ // }
+ // ).then((response) => {
+ // if(response.data.status===0){
+ // this.setState({
+ // // titlemessage: response.data.message+"(支撑关系变更)",
+ // Modallist: response.data.message,
+ // Modallisttype:true,
+ // listSpin:false
+ // })
+ // this.UpdateEvaluations();
+ // }else if(response.data.status===-1){
+ // this.setState({
+ // // titlemessage: response.data.message+"(支撑关系变更)",
+ // Modallist: response.data.message,
+ // Modallisttype:true,
+ // listSpin:false
+ // })
+ //
+ // }
+ // }).catch((error) => {
+ // console.log(error)
+ // })
+
+ }
+
+ onAclick=(i)=>{
+ console.log("onAclick");
+ console.log(i);
+ if(i===1){
+ this.props.history.push(this.props.match.url+"/ec_course_support_setting/1");
+ }else if(i===2){
+ this.props.history.push(this.props.match.url+"/ec_course_reach_setting/2");
+ }else if(i===3){
+ this.props.history.push(this.props.match.url+"/score_level/3");
+ }else if(i===4){
+ this.props.history.push(this.props.match.url+"/evaluation_methods/4");
+ }else{
+ this.props.history.push(this.props.match.url+"/competition_calculation_info/5");
+ }
+ this.setState({
+ titine:i,
+ })
+
+ };
+ Ontitine=(s)=>{
+ if(s==="ec_course_support_setting"){
+ this.setState({
+ titine:1,
+ })
+ }else if(s==="ec_course_reach_setting"){
+ this.setState({
+ titine:2,
+ })
+ }else if(s==="score_level"){
+ this.setState({
+ titine:3,
+ })
+ }else if(s==="evaluation_methods"){
+ this.setState({
+ titine:4,
+ })
+ }else if(s==="competition_calculation_info"){
+ this.setState({
+ titine:5,
+ })
+ }
+
+ };
+ associatedclass=()=>{
+
+ };
+ deleteassociatedclass=()=>{
+
+ }
+ render() {
+ let {newec_course_idbottom,titine,classcalue,course_name,course_url,ecmanager,Spintype,calculatesetype,ec_course_id,course_total_scoreaverage,ec_course_targets_count,schooldata,ecComponentState,course_total_score,total_rate_data,ec_course_targets,graduation_list,target_list,target_score,evaluate_result,morelisttype,titlemessage,completiontype,completionlist,ismanager} = this.state;
+ // console.log("Curriculum");
+ // console.log(this.props);
+ // console.log(titine);
+ return (
+
+
+
+
+
+
+
+ { school && school.name }
+
+
+
+
+
+
+ 学校管理员
+ 温馨提醒：学校管理员有添加专业及设置专业管理员等权限
+
+ {
+ managers && managers.map((manager) => {
+ return (
+
+
+ { manager.name }
+
+
+ )
+ })
+ }
+
+
+
+
+
+
+
+
+
+ 专业列表
+
+ 请添加参与认证的专业名称
+ 查看详情
+
+
+
+
+ this.setState({searchKeyword: e.target.value})}
+ onSearch={this.getSchoolMajors}
+ value={this.state.searchKeyword}
+ style={{ width: 200 }}
+ />
+
+ {majorCount || 0} 个检索结果（{majorCount || 0} 专业）
+
+
+
+
+ {
+ templateMajor && (
+
+
+ )
+ }
+ {
+ majors && majors.map((major, index) => {
+ return (
+
+
+ )
+ })
+ }
+
+
+
+ { manageMajor && this.showAddManagerModal(major.id)}>
+
+
+
+ )
+ }
+
+
+}
+export default Curriculum;
\ No newline at end of file
diff --git a/public/react/src/modules/ecs/curriculum/Curriculumtwo.js b/public/react/src/modules/ecs/curriculum/Curriculumtwo.js
new file mode 100644
index 000000000..221b2afb5
--- /dev/null
+++ b/public/react/src/modules/ecs/curriculum/Curriculumtwo.js
@@ -0,0 +1,32 @@
+import React, { Component } from 'react';
+
+class Curriculumtwo extends Component {
+ //测试用
+ constructor(props) {
+ super(props)
+ // console.log(props);
+ }
+
+ componentWillMount(){
+ }
+ componentDidMount(){
+ // console.log(this.props);
+ console.log("Curriculumtwo");
+ console.log(this.props.match.params.type);
+ this.props.Ontitine(this.props.match.params.type);
+ }
+
+
+ render() {
+ // console.log("Curriculumtwo");
+ // console.log(this.props);
+ return (
+
+
+ {/*Curriculumtwo 测试用*/}
+ {/*课程目标*/}
+ (this.Ontitine(i)} />) }>
+ {/*课程考核方式与数据来源*/}
+ (this.Ontitine(i)}/>) }>
+ {/*成绩等级设置*/}
+ (this.Ontitine(i)}/>) }>
+ {/*4课程目标评价方法*/}
+ (this.Ontitine(i)}/>) }>
+ {/*5课程达成评价结果*/}
+ (this.Ontitine(i)}/>) }>
+
+
+
+
+
+
+ 课程体系 >
+ {schooldata&&schooldata.ec_course_name} 达成评价详情
+ {/* 导出培养目标 */}
+
+
+ 系统根据课程目标、课程考核方式与课程目标评价方法，一键计算评价课程目标的达成情况 window.elasticLayer(3533)}>查看详情
+ {
+ titine === 4 ?
+
+ 导出评价方法
+
+ :titine === 1 ?
+
+ 导出课程目标
+
+ :titine===2?
+
+ :""
+ }
+
+ this.onAclick(1)}>1.课程目标
+ this.onAclick(2)}>2.课程考核方式与数据来源
+ this.onAclick(3)}>3.成绩等级设置
+ this.onAclick(4)}
+ >4.课程目标评价方法
+ this.onAclick(5)}
+ >5.课程达成评价结果
+ {
+ titine===5?
+
+
+ 导出评价详情
+
+ 计算
+
+ :titine===4?
+ （各环节平均得分*占比）之和/（各环节总分*占比）之和
+ :titine===3?
+ （将学生的成绩转换成对应的等级）
+ :titine===2?
+
+ （请在完成配置后，使用各项成绩导入模板，将本学年所有参与的学生成绩数据导入系统）
+ 导入课堂数据
+
+ :""
+ }
+
+
+ 测试
+
+ )
+ }
+
+
+}
+export default Curriculumtwo;
\ No newline at end of file
diff --git a/public/react/src/modules/ecs/ecTitle/ecTitle.css b/public/react/src/modules/ecs/ecTitle/ecTitle.css
new file mode 100644
index 000000000..3f6796cdd
--- /dev/null
+++ b/public/react/src/modules/ecs/ecTitle/ecTitle.css
@@ -0,0 +1,104 @@
+#traningNav {
+ display: flex
+}
+ #traningNav>li {
+ float: none !important;
+}
+ /* 最后一个item 占满剩余空间 */
+#traningNav>li:last-child{
+ flex: 1;
+}
+
+#traningNav>li>.ecTitle {
+ width: 24px;
+ height: 24px;
+ border: 1px solid rgba(65, 140, 205, 1);
+ border-radius: 50%;
+ text-align: center;
+ line-height: 22px;
+ display: inline-block;
+ color: rgba(65, 140, 205, 1) !important;
+ margin-right: 10px;
+}
+#traningNav>li>.ecTitles {
+ line-height: 16px !important;
+ height: 18px!important;
+ width: 18px!important;
+}
+
+#traningNav>li>.ecTitlefont:hover{
+ color: rgba(65, 140, 205, 1) !important;
+}
+
+.ecimgs3{
+ background: url("./img/3.png");
+ background-repeat: no-repeat;
+ background-size: 100% 100%;
+ -moz-background-size: 100% 100%;
+ height: 90px;
+ line-height: 90px;
+ width: 235px;
+}
+.ecimgs2{
+ background: url("./img/4.png");
+ background-repeat: no-repeat;
+ background-size: 100% 100%;
+ -moz-background-size: 100% 100%;
+ height: 90px;
+ line-height: 90px;
+ width: 190px;
+}
+.ecimgs11{
+ background: url("./img/3.png");
+ background-repeat: no-repeat;
+ background-size: 100% 100%;
+ -moz-background-size: 100% 100%;
+ height: 90px;
+ line-height: 90px;
+ width: 146px;
+}
+.ml18{
+ margin-left: 18px;
+}
+.ecimgs{
+ height: 90px;
+ line-height: 90px;
+}
+.ecmarginleft{
+ margin-left: 23px;
+}
+
+#traningNav>li>.ecTitlefontFFF{
+ color:#fff !important;
+}
+
+#traningNav>li>.ecTitleFFF {
+ width: 24px;
+ height: 24px;
+ border: 1px solid #fff;
+ border-radius: 50%;
+ text-align: center;
+ line-height: 22px;
+ display: inline-block;
+ color: #fff !important;
+ margin-right: 10px;
+}
+.traningNavs{
+ padding: 0px 0px 0px 0px !important;
+}
+.traningNavs>li{
+ padding: 0px 10px 30px 10px !important;
+}
+
+.mb0{
+ margin-bottom: 0px !important;
+}
+
+.info2{
+ width:232px;
+ text-align: center;
+}
+.info1{
+ width: 206px;
+ text-align: center;
+}
\ No newline at end of file
diff --git a/public/react/src/modules/ecs/ecTitle/ecTitle.js b/public/react/src/modules/ecs/ecTitle/ecTitle.js
new file mode 100644
index 000000000..f24409018
--- /dev/null
+++ b/public/react/src/modules/ecs/ecTitle/ecTitle.js
@@ -0,0 +1,100 @@
+import React, { Component } from 'react';
+import './ecTitle.css';
+
+class EcTitleCourseEvaluations extends Component {
+ constructor(props) {
+ super(props)
+ this.state = {
+ schooldata:{},
+ ecComponentState:"",
+ ecpaths:""
+ }
+ }
+ componentWillReceiveProps(nextProps){
+ const {schooldata,ecComponentState,ecpath}=nextProps;
+ this.setState({
+ schooldata:schooldata,
+ ecComponentState:ecComponentState,
+ ecpaths:ecpath
+ })
+ }
+
+ render() {
+ let{schooldata,ecComponentState,ecpaths}=this.state;
+
+ return (
+
+
+ )}
+}
+
+export default EcTitleCourseEvaluations;
\ No newline at end of file
diff --git a/public/react/src/modules/ecs/ecTitle/img/1.png b/public/react/src/modules/ecs/ecTitle/img/1.png
new file mode 100644
index 000000000..28325a3ea
Binary files /dev/null and b/public/react/src/modules/ecs/ecTitle/img/1.png differ
diff --git a/public/react/src/modules/ecs/ecTitle/img/2.png b/public/react/src/modules/ecs/ecTitle/img/2.png
new file mode 100644
index 000000000..4a558df21
Binary files /dev/null and b/public/react/src/modules/ecs/ecTitle/img/2.png differ
diff --git a/public/react/src/modules/ecs/ecTitle/img/3.png b/public/react/src/modules/ecs/ecTitle/img/3.png
new file mode 100644
index 000000000..da3d47779
Binary files /dev/null and b/public/react/src/modules/ecs/ecTitle/img/3.png differ
diff --git a/public/react/src/modules/ecs/ecTitle/img/4.png b/public/react/src/modules/ecs/ecTitle/img/4.png
new file mode 100644
index 000000000..37dab8ea0
Binary files /dev/null and b/public/react/src/modules/ecs/ecTitle/img/4.png differ
diff --git a/public/react/src/modules/ecs/subroute/ecCompletion_calculation/EcCompletionCalculation.js b/public/react/src/modules/ecs/subroute/ecCompletion_calculation/EcCompletionCalculation.js
new file mode 100644
index 000000000..4be7c11d3
--- /dev/null
+++ b/public/react/src/modules/ecs/subroute/ecCompletion_calculation/EcCompletionCalculation.js
@@ -0,0 +1,809 @@
+import React, { Component } from 'react';
+import classNames from 'classnames'
+
+import axios from 'axios';
+
+// import { TPMIndexHOC } from '../../../tpm/TPMIndexHOC';
+
+import { SnackbarHOC } from 'educoder'
+
+import { message,Modal,Spin,Icon} from 'antd';
+
+import 'antd/dist/antd.css';
+
+import EcTitleCourseEvaluations from '../../ecTitle/ecTitle'
+
+import '../../css/ecCourseSupports.css';
+
+import '../../css/ecCourseEvaluations.css';
+
+const $ = window.$;
+class EcCompletionCalculation extends Component {
+ constructor(props) {
+ super(props)
+ this.state={
+ schooldata:{},
+ ecComponentState:"ecCompletion",
+ course_total_score:[],
+ ec_course_targets:0,
+ graduation_list:[],
+ target_list:[],
+ target_score:[],
+ evaluate_result:"",
+ ec_course_targets_count:0,
+ new_target_ec_year_id:0,
+ total_rate_data:undefined,
+ calculatetype:false,
+ ec_course_id:0,
+ morelisttype:false,
+ titlemessage:"提示",
+ completiontype:false,
+ completionlist:"",
+ course_total_scoreaverage:0,
+ calculatesetype:false,
+ Spintype:false,
+ ismanager:false
+ }
+ }
+
+ componentWillMount(){
+ window.document.title = '课程达成评价结果';
+ }
+
+ componentDidMount(){
+ let ec_course_id =this.props.match.params.ec_course_id;
+ this.UpdateClassData(true);
+ const Url =`/ec_major_schools/get_navigation_data?ec_course_id=`+ec_course_id;
+ axios.get(Url, {
+ withCredentials: true,
+ })
+ .then((response) => {
+ if(response.status===200){
+ // if(response.data.allow_visit===false){
+ // window.location.href="/403"
+ // }
+ this.setState({
+ schooldata:response.data,
+ ec_course_id:ec_course_id
+ })
+ }
+ })
+ .catch(function (error) {
+ console.log(error);
+ });
+ }
+
+ targetsget_navigation_data=(ec_year_id,ec_course_id)=>{
+ const Url =`/ec_major_schools/get_navigation_data?ec_year_id=`+ec_year_id+"&ec_course_id="+ec_course_id;
+ axios.get(Url, {
+ withCredentials: true,
+ })
+ .then((response) => {
+ if(response.status===200){
+ // if(response.data.allow_visit===false){
+ // window.location.href="/403"
+ // }
+ this.setState({
+ schooldata:response.data,
+ ec_course_id:ec_course_id
+ })
+ }
+ })
+ .catch(function (error) {
+ console.log(error);
+ });
+ }
+ showmorelist=()=>{
+ this.setState({
+ morelisttype:false
+ })
+ this.UpdateClassData(false)
+ }
+ UpdateClassData=(key)=>{
+ let {calculatetype} =this.state;
+ let ec_course_id =this.props.match.params.ec_course_id;
+ this.setState({
+ ec_course_id:ec_course_id
+ })
+ const Arl =`/ec_courses/`+ec_course_id+`/calculation_info_data`;
+ axios.get(Arl, {
+ withCredentials: true,
+ })
+ .then((response) => {
+
+ if(response.status===200){
+ // var list=[];
+ // if(key===true){
+ // for(var i=0; i
+
+ {schooldata.user_name===undefined?"":schooldata.user_name+" > "}
+ {schooldata.school_name===undefined?"":schooldata.school_name+"认证"}
+ {schooldata.school_name===undefined?"":" > "+schooldata.major_name+" > "}
+ {schooldata.school_name===undefined?"":schooldata.year+"届"}
+
+
+
+
+ {value[i].total_score}
*/}
+ 100%
+ )
+ }else{
+ target_listres.push(
+ {/*{value[i].score}
*/}
+ {/*占比{(value[i].rate*100).toFixed(2)}%
*/}
+
+ {(value[i].rate*100).toFixed(2)}%
+
+ )
+ }
+
+ }
+ return target_listres
+ }else{
+ target_listres.push(
+ {/*{value[i].total_score}
*/}
+ --
+ )
+ return target_listres
+ }
+ }
+
+ let newTotal_rate_dataList = (length,value) => {
+
+ let target_listres = [];
+ if(value!=undefined){
+ for(let i = 0; i < value.length; i++) {
+
+ // if(i===0){
+ // target_listres.push(
+ // {value[i].score.toFixed(2)}
+ // )
+ // }else{
+ // target_listres.push(
+ // {value[i].score.toFixed(2)}
+ // )
+ // }
+
+ if(i{value[i].score.toFixed(2)}
+ )
+ }
+
+ }
+ return target_listres
+ }
+ }
+ return (
+
+
+
+
+
+ );
+ }
+}
+
+export default SnackbarHOC() (EcCompletionCalculation);
+
diff --git a/public/react/src/modules/ecs/subroute/ecCourseEvaluations/EcCourseEvaluationsbottom.js b/public/react/src/modules/ecs/subroute/ecCourseEvaluations/EcCourseEvaluationsbottom.js
new file mode 100644
index 000000000..6e27711b2
--- /dev/null
+++ b/public/react/src/modules/ecs/subroute/ecCourseEvaluations/EcCourseEvaluationsbottom.js
@@ -0,0 +1,1039 @@
+import React, { Component } from 'react';
+
+import { BrowserRouter as Router, Route, Link, Switch } from "react-router-dom";
+
+import classNames from 'classnames'
+
+import axios from 'axios';
+
+// import { TPMIndexHOC } from '../../../tpm/TPMIndexHOC';
+
+import { SnackbarHOC } from 'educoder'
+
+import { Select,InputNumber,message,Modal,Input,Radio,Spin,Icon,Tooltip } from 'antd';
+
+import 'antd/dist/antd.css';
+
+import '../../css/ecCourseEvaluations.css';
+import EcTitleCourseEvaluations from "../../ecTitle/ecTitle";
+
+const $ = window.$;
+
+// 课程目标评价方法
+class EcCourseEvaluationsbottom extends Component {
+ constructor(props) {
+ super(props)
+ this.state={
+ totalevaluations_list:[],
+ ec_course_target_id:0,
+ achievement_list:[],
+ evaluations_listSelec:[],
+ evaluations_lists: [],
+ evaluation_subitems_lists: [],
+ evaluations_list:[],
+ evaluation_subitems_list:{},
+ achievement_methods:[],
+ ec_course_target_name:"",
+ buttomSaveCourseEvaluationsbottom:this.SaveCourseEvaluationsbottom,
+ spinningstate:true,
+ schooldata:{},
+ sequenceid:0,
+ target_id:null,
+ titlemessages:"提示",
+ Modallists:"",
+ eacoursetype:false,
+ eacoursesavetypes:false,
+ newec_course_idbottom:undefined,
+ methodologytype:false,
+ meweacoursetype:false,
+ newshowredvalue:false,
+ percentagetype:false,
+ ismanager:false
+ }
+ }
+ getec_course_achievement_methods=()=>{
+ const {newec_course_idbottom}=this.state;
+ if(newec_course_idbottom!=undefined){
+ const url = `/ec_course_achievement_methods?ec_course_id=`+newec_course_idbottom;
+ axios.get(url, {
+ withCredentials: true,
+ })
+ .then((response)=>{
+ this.setState({
+ achievement_list:response.data.achievement_list,
+ spinningstate:false,
+ ismanager:response.data.is_manager
+ })
+ }).catch(function (error) {
+ console.log(error);
+ });
+ }
+ // this.setState({
+ // achievement_list:[
+ // {target_evaluate_data: [
+ // {
+ // evaluate_id: 24,
+ // evaluate_name: "期末考试",
+ // evaluation_relates_data: [
+ // {evaluation_relates_id: 31, evaluation_relates_name: "期末考试1目标1考题"},
+ // {evaluation_relates_id: 32, evaluation_relates_name: "期末考试1目标2考题"}
+ // ],
+ // percentage: 100,
+ // score: 15
+ // }
+ // ],
+ // target_id: 5
+ // },
+ // ],
+ // spinningstate:false
+ // })
+
+
+ }
+
+ getNavigationData=(ec_course_id)=>{
+ // const jol =`/ec_major_schools/get_navigation_data?ec_year_id=`+ec_year_id+"&ec_course_id="+ec_course_id;
+ const jol =`/ec_major_schools/get_navigation_data?ec_course_id=`+ec_course_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);
+ });
+ }
+ componentDidMount(){
+ let ec_course_id=this.props.match.params.ec_course_id;
+ const url = `/ec_course_achievement_methods?ec_course_id=`+ec_course_id;
+ axios.get(url, {
+ withCredentials: true,
+ })
+ .then((response)=>{
+ this.setState({
+ achievement_list:response.data.achievement_list,
+ spinningstate:false,
+ ismanager:response.data.is_manager
+ })
+ }).catch(function (error) {
+ console.log(error);
+ });
+
+ this.getNavigationData(ec_course_id);
+ this.setState({
+ newec_course_idbottom:ec_course_id
+ })
+ }
+ editecCourseEvaluationslist=(e)=>{
+ let id =e.target.getAttribute("target_id");
+ let newid =e.target.name;
+
+ this.setState({
+ buttomSaveCourseEvaluationsbottom:this.SaveCourseEvaluationsbottom,
+ target_id:id,
+ percentagetype:false
+ })
+ // $("#ecCourseEvaluationsbottomsubmit").show();
+ // $("#SystemParametersbottom").show();
+ // let offsettop=$("#ecCourseEvaluationsbottomsubmit").position().top||$("#ecCourseEvaluationsbottomsubmit").scrollTop || $("#ecCourseEvaluationsbottomsubmit").pageYOffset;
+ // window.scrollTo(0, offsettop)
+
+ let {evaluations_list,evaluation_subitems_list,achievement_methods} = this.state;
+ this.setState({
+ achievement_methods:undefined,
+ selectevaluation_phase:[],
+ course_select_value:'',
+ evaluations_lists:[],
+ sequenceid:newid,
+ methodologytype:false,
+ Modallists:' ',
+ meweacoursetype:false,
+ eacoursesavetypes:false,
+ newshowredvalue:false
+ })
+
+ let newevaluations_list=[];
+ let newevaluation_subitems_list=new Object ();
+ let newachievement_methods=[];
+ const url = `/ec_course_achievement_methods/edit_course_target?ec_course_target_id=`+id;
+ axios.get(url, {
+ withCredentials: true,
+ })
+ .then((response)=>{
+ if(response.status===200){
+ if(response.data.evaluation_phase_list.length===0){
+ this.setState({
+ achievement_methods:undefined
+ })
+ let newObject=new Object ();
+ newachievement_methods.push(newObject)
+ }
+
+ if(response.data.evaluation_phase_list.length>0){
+ let evaluation_phase_list=response.data.evaluation_phase_list;
+ let evaluations_list=response.data.evaluations_list;
+ for(var i=0; i
+
+ {
+ calculatesetype===true?
+ {completionlist}
+
+ 知道啦
+
+ :
+
+ }
+
+
+
+
+
+ {/*
+ */}
+ {/*
*/}
+
+ */}
+ {/* 课程体系 >*/}
+ {/* {schooldata.ec_course_name} 达成评价详情*/}
+ {/* /!* 导出培养目标 *!/*/}
+ {/*
*/}
+ {/* 系统根据课程目标、课程考核方式与课程目标评价方法，一键计算评价课程目标的达成情况 window.elasticLayer(3533)}>查看详情
*/}
+ {/* */}
+ {/* 1.课程目标*/}
+ {/* 2.课程考核方式与数据来源*/}
+ {/* 3.成绩等级设置*/}
+ {/* 4.课程目标评价方法*/}
+ {/* 5.课程达成评价结果*/}
+ {/* /!* 课程体系：*/}
+ {/* {*/}
+ {/* evaluate_result===false?未达成:达成*/}
+ {/* }*/}
+ {/* *!/*/}
+ {/* 计算*/}
+ {/* */}
+ {/* 导出评价详情*/}
+ {/* */}
+ {/*
*/}
+ {/*
+
+
+ --
+ --
+ --
+ --
+ --
+ --
+ :""}
+
+
+ {Spintype===false?target_list.map((item,key)=>{
+
+ return(
+
+ {key+1}
+ {item.content}
+ {item.result}
+ {item.standard_grade}
+ {item.real_grade}
+ {item.weigths}
+
+ )
+
+ }):""
+ }
+
+
+
+
+ + 课程目标 + 达成结果 + 达成标准(分) + 实际达成 + 权重 +
+ + { Spintype===true?
+
+
+
+
+ 毕业要求指标点达成评价结果
+ 注： 代表支持指标点；代表不支持指标点
+
+
+
+
+ {
+ graduation_list.length===0?
+
+ {/* {item.ec_graduation_name} */}
+ {1}
+ {"--"}
+ {"--"}
+ {"--"}
+ {"--"}
+ 立即配置
+ {TargetresContentList(5,[2,2,2,2,2])}
+
+ :""
+ }
+ {
+ Spintype===false?graduation_list.map((item,key)=>{
+
+ if(key===0){
+ return(
+ 5 ? (76*(ec_course_targets_count+4)+380):1200+"px"}}>
+ {/* {item.ec_graduation_name} */}
+ {key+1}
+ {item.ec_subitem_content}
+ {item.result}
+ {item.reach_target===null?0:item.reach_target}
+ {item.reach_real_target===null?0:item.reach_real_target}
+ {item.weight===null||item.weight===0?立即配置:{item.weight}}
+ {TargetresContentList(ec_course_targets_count,item.target_position)}
+
+ )
+
+ }):""
+ }
+
+
+ + 毕业要求 + {5} + 达成结果 + 达成目标值 + 达成实际值 + 课程权重 + {TargetresList(5)} +
+ :"" + } + + { Spintype===true?5 ? (76*(ec_course_targets_count+4)+380+15):1200+"px"}}> + 毕业要求 + {item.ec_subitem_content} + 达成结果 + 达成目标值 + 达成实际值 + 课程权重 + {TargetresList(ec_course_targets_count)} +
+ ) + } + + }):"" + } + + + { + Spintype===false?graduation_list.map((item,key)=>{ + + return( +
+
+
+
+
+ 课程总评成绩表
+
+
+
+
+ 1200?(113*(total_rate_data+4.5))+63:1200+"px"}}>
+ // 占比
+ // {/*colorTransparent*/}
+ // {/* 平均数 */}
+ // {/* 平均数 */}
+ // {/* {Total_rate_dataList(total_rate_data-1,i.total_rate)}
+ //
+ // )
+
+ // }
+
+ // }) */}
+ }
+ { Spintype===true? 5 ? (180 * total_rate_data+226+16) : 1200 + "px"}}>
+ 占比
+ {/*colorTransparent*/}
+ {/* 平均数 */}
+ {/* 平均数 */}
+ {Total_rate_dataList(course_total_score)}
+ {
+ course_total_score.length===0? --:""
+ }
+ :""
+ }
+ {/*style={{width: 113*(total_rate_data+4)>1136?113*(total_rate_data+4):1136+"px"}}*/}
+ {
+ // course_total_score.map((i,k)=>{
+
+ // if(k!=course_total_score.length-1){
+
+ // return(
+ // 1200?(113*(total_rate_data+4.5))+63:1200+"px"}}>
+ // {/*{k+1}*/}
+ // 平均分
+ // {/*{i.student_scores.name}*/}
+ // {/*{i.student_scores.student_number}*/}
+ // {newTotal_rate_dataList(total_rate_data-1,i.student_scores.target_info)}
+ // {i.student_scores.total_score.toFixed(2)}
+ //
+ // )
+
+ // }
+
+ // })
+ }
+ {
+ Spintype===false?1200?(113*(total_rate_data+4.5))+63:1200+"px"}}>
+ {/*{k+1}*/}
+ 平均分
+ {/*{i.student_scores.name}*/}
+ {/*{i.student_scores.student_number}*/}
+ {newTotal_rate_dataList(course_total_score-1,course_total_score)}
+ {/* {course_total_score.length===0?"":course_total_score[course_total_score-1].total_score} */}
+ {
+ course_total_score.length===0? --:{course_total_scoreaverage}
+ }
+ :""
+ }
+
+
+ 1136?113*(total_rate_data+4):1136+"px",display:morelisttype===true?"block":"none"}}>
+ this.showmorelist()}>加载更多
+
+
+
+
+
+ 5 ? (180 * total_rate_data+226+16) : 1200+"px"}}> + {/*序号*/} + 课程目标 + {/*姓名*/} + {/*学号*/} + {TargetresLists(total_rate_data-1)} + 总评成绩 +
+ {/*style={{width: 113*(total_rate_data+4)>1136?113*(total_rate_data+4.5):1136+"px"}}*/} + { + // course_total_score.map((i,k)=>{ + + // if(k===course_total_score.length-1){ + + // return( + //
+
+
+
+
+
+ 课程目标成绩分析
+
+
+
+
+
+ {k+1}
+ {i.average_score}
+ {i.top_score}
+ {i.low_score}
+
+
+ )
+
+ }):""
+ }
+
+ { Spintype===true?
+ --
+ --
+ --
+ --
+
+ :""}
+
+
+
+ + 课程目标 + 平均分 + 最高分数 + 最低分数 + 90分以上 + 80-89分 + 70-79分 + 60-69分 + 50-59分 + 低于50分 +
+ + { + Spintype===false?target_score.map((i,k)=>{ + + return( +{i.from90[0]}人
+ {(i.from90[1]).toFixed(2)}%
+
+
+ {i.from80[0]}人
+ {(i.from80[1]).toFixed(2)}%
+
+
+ {i.from70[0]}人
+ {(i.from70[1]).toFixed(2)}%
+
+
+ {i.from60[0]}人
+ {(i.from60[1]).toFixed(2)}%
+
+
+ {i.from50[0]}人
+ {(i.from50[1]).toFixed(2)}%
+
+
+ {i.from_down[0]}人
+ {(i.from_down[1]).toFixed(2)}%
+
+ --人
+ --%
+
+
+ --人
+ --%
+
+
+ --人
+ --%
+
+
+ --人
+ --%
+
+
+ --人
+ --%
+
+
+ --人
+ --%
+
+
+ {
+ let {majorschoollist,studentall}=this.state;
+ let mewmajorschoollist=majorschoollist;
+ let newstudentall=studentall;
+ if(e.target.checked===false){
+ newstudentall=false
+ }
+ for(var i=0; i{
+ let {majorschoollist,studentall} =this.state;
+ let studentalltype=0
+ for(var i=0; i{
+ let {majorschoollist,studentall} =this.state;
+ let major_id=this.props.match.params.major_id;
+ let year_id=this.props.match.params.year_id;
+ let newstudent_id=[];
+ if(studentall===false){
+ for(var i=0; i {
+ if(response.data.status===1){
+ this.setState({
+ // Modallist: "删除成功！",
+ // Modallisttype:true,
+ Modallisttypes:1,
+ Modallisttypess:0
+ })
+ this.hidemodeldelete();
+ }
+ }).catch((error) => {
+ console.log(error)
+ })
+ }
+
+ render() {
+ let {
+ majorschoollist,
+ Modallisttype,
+ titlemessage,
+ Modallist,
+ studentall,
+ student_id,
+ Modallisttypess,
+ ismanager
+ }=this.state;
+ // ec_students: []
+ // import_url: "/ec_major_schools/:1/academic_years/:1/import_students"
+ // template_url: "javascript:void(0);"
+ // total_page: 0
+ const uploadProps = {
+ name: 'file',
+
+ onPreview(file) {
+ // dispatch({ type: `${nameSpace}/updateState`, payload: { uploadPreviewVisible: true, uploadPreviewImage: file.url || file.thumbUrl } });
+ },
+ onChange(file) {
+ // dispatch({ type: `${nameSpace}/updateState`, payload: { fileList: fileList } });
+ },
+ onRemove(option) {
+ },
+ customRequest: file => {
+ this.uploadfile(file)
+ }
+ }
+ return (
+
+
+
+
+ {/*导航*/}
+ {/*
+ );
+ }
+}
+
+export default SnackbarHOC() (EcCourseEvaluationsbottom);
\ No newline at end of file
diff --git a/public/react/src/modules/ecs/subroute/ecStudentList/EcStudentList.js b/public/react/src/modules/ecs/subroute/ecStudentList/EcStudentList.js
new file mode 100644
index 000000000..ead6e4c29
--- /dev/null
+++ b/public/react/src/modules/ecs/subroute/ecStudentList/EcStudentList.js
@@ -0,0 +1,405 @@
+import React, { Component } from 'react';
+
+import axios from 'axios';
+import { Spin } from 'antd';
+
+import { TPMIndexHOC } from '../../../tpm/TPMIndexHOC';
+
+import { SnackbarHOC,getImageUrl } from 'educoder'
+
+import { Pagination,Upload,Modal,Checkbox } from 'antd';
+
+import EcTitleCourseEvaluations from '../../ecTitle/ecTitle'
+
+import 'antd/dist/antd.css';
+
+import './ecStudentList.css';
+
+const $ = window.$;
+
+class EcStudentList extends Component {
+ constructor(props) {
+ super(props)
+ this.state={
+ majorschoollist:undefined,
+ titlemessage:"提示",
+ // ecComponentState:"ecStudentList",
+ visible:false,
+ Modallist:'',
+ Modallisttypes:0,
+ studentall:false,
+ student_id:undefined,
+ Modallisttypess:0,
+ ismanager:false,
+ isSpin:false
+ }
+ }
+ componentDidMount(){
+ window.document.title = '学生列表';
+ let major_id=this.props.match.params.major_id;
+ let year_id=this.props.match.params.year_id;
+
+ // const url ='/ec_major_schools/'+major_id+'/academic_years/'+year_id+'/student_lists_data';
+ // axios.get(url, {
+ // withCredentials: true,
+ // }).then((response) => {
+ // if(response.status===200){
+ // this.setState({
+ // majorschoollist:response.data,
+ // ismanager:response.data.ismanager,
+ // })
+ // }
+ // })
+ // .catch(function (error) {
+ // console.log(error);
+ // });
+ // let majorschoollist={
+ // ec_students: [{index: 1, student_name: "同意", student_id: "s20111458"},
+ // {index: 1, student_name: "同意", student_id: "s20111458"},
+ // {index: 2, student_name: "涛哥", student_id: "2011554f4"},
+ // {index: 3, student_name: "例如", student_id: "20154787b"},
+ // {index: 4, student_name: "问问", student_id: "201548580014"},
+ // {index: 5, student_name: "嗯嗯", student_id: "2015748912321234"},
+ // {index: 6, student_name: "让人", student_id: "20157456"},
+ // {index: 7, student_name: "方法", student_id: "20159658"},
+ // {index: 8, student_name: "全球", student_id: "20159632"},
+ // {index: 9, student_name: "是说", student_id: "20154512"},
+ // {index: 10, student_name: "谷歌", student_id: "20157932"},
+ // {index: 11, student_name: "版本", student_id: "20159635"},
+ // {index: 12, student_name: "捏捏", student_id: "20153451"},
+ // ],
+ // import_url: "/ec_major_schools/3/academic_years/10/import_students",
+ // show_name: true,
+ // template_url: "/attachments/download/227528/01_学生列表导入模板.xls",
+ // total_page: 1
+ // }
+ // this.setState({
+ // majorschoollist:majorschoollist
+ // })
+ }
+ uploadcomponentDidMount(){
+ let major_id=this.props.match.params.major_id;
+ let year_id=this.props.match.params.year_id;
+ const url ='/ec_major_schools/'+major_id+'/academic_years/'+year_id+'/student_lists_data';
+ axios.get(url, {
+ withCredentials: true,
+ }).then((response) => {
+ if(response.status===200){
+ this.setState({
+ majorschoollist:response.data,
+ ismanager:response.data.ismanager,
+ })
+ }
+ })
+ .catch(function (error) {
+ console.log(error);
+ });
+ }
+
+
+ windowsgoblack=()=>{
+ window.history.go(-1)
+ }
+
+
+ uploadfile=(file)=>{
+ this.setState({isSpin:true})
+ let {majorschoollist}=this.state;
+ let Url =majorschoollist.import_url;
+ const form = new FormData();
+ form.append('file', file.file);
+ axios.post(Url,form
+ ).then((response) => {
+ if(response.data.status===1){
+ // message.success('已成功导入'+response.data.count+"条数据！");
+ this.setState({
+ // titlemessage: response.data.message+"(支撑关系变更)",
+ Modallist: '已成功导入'+response.data.count+"条数据！",
+ Modallisttype:true,
+ Modallisttypes:1,
+ isSpin:false
+ })
+ }else if(response.data.status===0){
+ // message.warning(response.data.message);
+ this.setState({
+ // titlemessage: response.data.message+"(支撑关系变更)",
+ Modallist:response.data.message,
+ Modallisttype:true,
+ Modallisttypes:0,
+ isSpin:false
+ })
+ }
+ }).catch((error) => {
+ console.log(error)
+ })
+ }
+ hidemodeldelete=()=>{
+ let {Modallisttypes}=this.state;
+ this.setState({
+ Modallisttype:false,
+ Modallist:'',
+ Modallisttypess:0
+ })
+ if(Modallisttypes===1){
+ // window.location.reload();
+ this.uploadcomponentDidMount();
+ }
+ }
+
+ showecStudentList=(page)=>{
+ let major_id=this.props.match.params.major_id;
+ let year_id=this.props.match.params.year_id;
+ const url ='/ec_major_schools/'+major_id+'/academic_years/'+year_id+'/student_lists_data?page='+page;
+ axios.get(url, {
+ withCredentials: true,
+ }).then((response) => {
+ if(response.status===200){
+ this.setState({
+ majorschoollist:response.data,
+ ismanager:response.data.ismanager,
+ })
+ }
+ }).catch(function (error) {
+ console.log(error);
+ });
+ }
+
+ onChangestudentall=(e)=>{
+ let {majorschoollist}=this.state;
+ let mewmajorschoollist=majorschoollist
+ for(var i=0; i
+
+
+ {Modallists}
+ */}
+
+ {/*
*/}
+ {/**/} + {/*课程列表 > */} + {/* {schooldata.ec_course_name} 课程考核方式与数据来源*/} + {/*/!* *!/*/} + {/*/!* 导出培养目标 *!/*/} + {/*导出策略*/} + {/*
*/} + + {/**/}
+ {/*课程考核标准*/}
+ {/*（请在完成配置后，使用各项成绩导入模板，将本学年所有参与的学生成绩数据导入系统）*/}
+ {/*在线课堂:{course_name}*/}
+ {/*导入课堂数据*/}
+ {/*
*/}
+
+ {/**/}
+
+ {/*
*/}
+
+ */} + {/* 课程体系 >*/} + {/* {schooldata.ec_course_name} */} + {/*
请结合本课程的教学情况，修改说明每个课程目标的评价环节和评估方式 window.elasticLayer(3533)}>查看详情
*/}
+
+ {/* /!*课程考核方式与数据来源*!/*/}
+ {/* /!* *!/*/}
+ {/* /!* 导出培养目标 *!/*/}
+ {/* */}
+ {/* 导出评价方法*/}
+ {/* */}
+ {/* */}
+
+ {/* */}
+ {/* /!*课程目标达成方法*!/*/}
+ {/* 1.课程目标*/}
+ {/* 2.课程考核方式与数据来源*/}
+ {/* 3.成绩等级设置*/}
+ {/* 4.课程目标评价方法*/}
+ {/* 5.课程达成评价结果*/}
+ {/* （各环节平均得分*占比）之和/（各环节总分*占比）之和*/}
+ {/*
*/}
+
+ {/*
+
+
+ + 课程目标 + 评价环节 + 数据内容 + + 操作 + + 评价占比 + 支撑总分值 +
+ + { + achievement_list.length===0?
+ {
+ item.target_evaluate_data.length===0?
+
+
+
+ {/* 修改start*/}
+
+
+
+
+
+
+ )
+
+ })
+ }
+
+ )
+ })
+ }
+
+ {/*
+ {/* 修改end*/}
+
+
+
+
+ :item.target_evaluate_data.map((i,k)=>{
+ return(
+ */}
+
+
+
+ {
+ achievement_methods===undefined?" ":achievement_methods.map((item,itemkey)=>{
+ return(
+
+ {/* 课程目标{sequenceid}：{ec_course_target_name} */}
+ 课程目标{key+1}：{ec_course_target_name}
+
+
+
+
+ )
+ })
+ }
+ {Modallists}
+
+ 评价环节
+
+
+
+
+
+
+
+
+ 分
+ 100&&eacoursesavetypes===true||percentagetype===true?"bor-red": ""}
+ onInput={this.handevaluation_CoursePercentag.bind(this)} id={itemkey} style={{ width: '11%' }} placeholder="请输入占比"/>
+ %
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+ 保存
+ 取消
+
+ {key-k===key?key+1:""}
+
+
+ {i.evaluate_name}
+
+
+ {
+ i.evaluation_relates_data.map((y,e)=>{
+ return(
+
+ {/* 修改start*/}
+ {y.evaluation_relates_name+" "}
+ )
+ })
+ }
+
+ {
+ key-k===key?
+
+ :
+
+
+
+ }
+
+
+
+ {i.percentage+"%"}
+
+
+
+ {i.score}
+
+
+
+
+
+ {/* 修改end*/}
+
+
+
+
+
+ {
+ achievement_methods===undefined?" ":achievement_methods.map((item,itemkey)=>{
+
+ return(
+
+ {/* 课程目标{sequenceid}：{ec_course_target_name} */}
+ 课程目标{key+1}：{ec_course_target_name}
+
+
+
+
+ )
+ })
+ }
+ {Modallists}
+
+ 评价环节
+
+
+
+
+
+
+
+
+ 分
+ 100&&eacoursesavetypes===true||percentagetype===true?"bor-red": ""}
+ onInput={this.handevaluation_CoursePercentag.bind(this)}
+ id={itemkey} style={{ width: '11%' }}
+ placeholder="请输入占比"/>
+ %
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+ 保存
+ 取消
+
+
+
+
+
+ )
+
+ }
+}
+
+export default SnackbarHOC() (EcStudentList);
\ No newline at end of file
diff --git a/public/react/src/modules/ecs/subroute/ecStudentList/ecStudentList.css b/public/react/src/modules/ecs/subroute/ecStudentList/ecStudentList.css
new file mode 100644
index 000000000..0dfc22b99
--- /dev/null
+++ b/public/react/src/modules/ecs/subroute/ecStudentList/ecStudentList.css
@@ -0,0 +1,44 @@
+.pagelistStudentList{
+ position: absolute;
+ padding-left: 40%;
+}
+
+.relative{
+ position: relative;
+}
+.changestudent{
+ position: absolute;
+ top: 13px;
+ left: 50px;
+}
+.changestudents{
+ position: absolute;
+ top: -1px;
+ left: 50px;
+}
+.padbottom{
+ padding-bottom: 0px;
+}
+
+.deletelist{
+ margin-top: 10px;
+ margin-bottom: 10px;
+}
+
+.deletelist:hover{
+ color:#afafaf !important;
+}
+
+.deletebth{
+ width:64px;
+ height:24px;
+ border:1px solid #afafaf;
+ border-radius:2px;
+ color:#afafaf;
+ background:#fff;
+ line-height:24px;
+}
+
+.mt60{
+ margin-top:60px;
+}
\ No newline at end of file
diff --git a/public/react/src/modules/ecs/subroute/ecStudentList/nodata.png b/public/react/src/modules/ecs/subroute/ecStudentList/nodata.png
new file mode 100644
index 000000000..15a9e522f
Binary files /dev/null and b/public/react/src/modules/ecs/subroute/ecStudentList/nodata.png differ
diff --git a/public/react/src/modules/help/Help.js b/public/react/src/modules/help/Help.js
index f04079bcc..f148dd373 100644
--- a/public/react/src/modules/help/Help.js
+++ b/public/react/src/modules/help/Help.js
@@ -26,7 +26,6 @@ class Help extends React.Component {
}
componentDidUpdate(prevProps) {
- console.log('update', prevProps, this.props);
if(prevProps.match.params.type !== this.props.match.params.type){
this.setState({ type: this.props.match.params.type });
}
diff --git a/public/react/src/modules/page/component/monaco/TPIMonaco.js b/public/react/src/modules/page/component/monaco/TPIMonaco.js
index a9820ad27..0d5eb2d34 100644
--- a/public/react/src/modules/page/component/monaco/TPIMonaco.js
+++ b/public/react/src/modules/page/component/monaco/TPIMonaco.js
@@ -290,6 +290,7 @@ class TPIMonaco extends Component {
// theme: "vs-dark",
theme: "myCoolTheme",
+ insertSpaces: false,
fontSize: this.state.cmFontSize
});
diff --git a/public/react/src/modules/paths/PathDetail/PathDetailIndex.js b/public/react/src/modules/paths/PathDetail/PathDetailIndex.js
index c04c74e87..883ed6875 100644
--- a/public/react/src/modules/paths/PathDetail/PathDetailIndex.js
+++ b/public/react/src/modules/paths/PathDetail/PathDetailIndex.js
@@ -83,7 +83,8 @@ class PathDetailIndex extends Component{
loadtype:false,
courses:undefined,
items: getItems(10),
- pathtopskey:1
+ pathtopskey:1,
+ dataquerys:{},
}
this.onDragEnd = this.onDragEnd.bind(this);
@@ -146,6 +147,7 @@ class PathDetailIndex extends Component{
}
componentDidMount(){
+
const query = this.props.location.search;
// const type = query.split('?chinaoocTimestamp=');
// console.log("Eduinforms12345");
@@ -158,18 +160,19 @@ class PathDetailIndex extends Component{
this.setState({
dataquerys:{},
});
- return
+ }else{
+ this.setState({
+ dataquerys:foqus,
+ });
+ dataqueryss=foqus;
}
- this.setState({
- dataquerys:foqus,
- });
- dataqueryss=foqus;
}catch (e) {
this.setState({
dataquerys:{},
})
}
- this.getdatasindexs(undefined,dataqueryss)
+
+ this.getdatasindexs(undefined,dataqueryss);
}
//截取url 数据的
foo=(url)=> {
@@ -252,11 +255,13 @@ class PathDetailIndex extends Component{
})
};
- getdatasindex=(key,yslwebobject)=>{
+ getdatasindex=(key)=>{
// yslwebobject 后端需要的接口
let pathid=this.props.match.params.pathId;
let url="/paths/"+pathid+".json";
- axios.get(url).then((result)=>{
+ axios.get(url,
+ {params:this.state.dataquerys}
+ ).then((result)=>{
if (result.data.status === 407 || result.data.status === 401) {
debugger
return;
diff --git a/public/react/src/modules/paths/SchoolStatistics/SecondTab.js b/public/react/src/modules/paths/SchoolStatistics/SecondTab.js
index 5fefef219..8716a14d5 100644
--- a/public/react/src/modules/paths/SchoolStatistics/SecondTab.js
+++ b/public/react/src/modules/paths/SchoolStatistics/SecondTab.js
@@ -237,7 +237,7 @@ class SecondTab extends Component{
+
+
+ {Modallist}
+
+
+
+
+ 学生列表
+ 返回
+
+
+
+
+
+
+
+ 学生列表（
+ {majorschoollist===undefined?"":majorschoollist.total_student}
+ ）
+
+
+ 提供模板支持导入学生信息(请先下载模板) window.elasticLayer(3533)}>查看详情
+
+ {ismanager===false?"":
+ 请使用导入模板（点击下载），将本学年所有参与的学生导入系统，以便录入教学活动相关数据
+ }
+
+ {ismanager===false?"":
+ 导入
+ }
+
+
+
+
+ {ismanager===false?"":
+
+ 删除
+
}
+
+
+
+
+
-
+ {
+ majorschoollist===undefined?
+
-
+
+
+ {item.index} + + {item.student_name} + {item.student_id} +
+ )
+ })
+ }
+
+
+
+ :majorschoollist.ec_students.length===0?
+ ![]({getImageUrl("images/educoder/nodata.png")})
学生数据为空，请导入数据
+
+
:majorschoollist.ec_students.map((item,key)=>{
+ // console.log(item)
+ return(
+
学生数据为空，请导入数据
+
+ {
+ majorschoollist===undefined?"":majorschoollist.total_page===0||majorschoollist.total_student<51?"":
+
-
@@ -268,7 +268,17 @@ class SecondTab extends Component{
实训使用详情
+实训使用详情