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

Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder

Browse Source
dev_forum
hjm 6 years ago
parent 3d2213815e 9d02a4b189
commit 3328ad8465
16 changed files with 397 additions and 322 deletions
Show Stats Download Patch File Download Diff File

4
public/react/src/modules/courses/css/Courses.css
Unescape View File

@ -801,10 +801,10 @@ a.white-btn.use_scope-btn:hover{
position: absolute;
}
.ant-input{
.ant-input,.ant-input .ant-input-suffix{
background-color: #fafafa!important;
}
.ant-input:focus{
.ant-input:focus,.ant-input:focus .ant-input-suffix{
background-color:#ffffff!important;
}

3
public/react/src/modules/courses/exercise/Exercisestatisticalresulttabel.js
Unescape View File

@ -141,7 +141,8 @@ class OfficialAcademicTranscript extends Component {
border-radius: 12px;
color: rgba(221,23,23,1);
display: inline-block;
line-height: 24px;
line-height: 24px;
text-align: center;
}
.tasknameboxs{

3
public/react/src/modules/courses/exercise/Exercisetablesmubu.js
Unescape View File

@ -100,7 +100,8 @@ class Exercisetablesmubus extends Component {
border-radius: 12px;
color: rgba(221,23,23,1);
display: inline-block;
line-height: 24px;
line-height: 24px;
text-align: center;
}
.tasknameboxs{

2
public/react/src/modules/courses/shixunHomework/CommitSummary.js
Unescape View File

@ -135,7 +135,7 @@ class CommitSummary extends Component{
</div>
<div>
<p className="ml29 fl color-black mt10 summaryname" onClick={this.asdasdsad}>提交总结</p>
<p className="ml29 fl color-black mt10 summaryname" onClick={this.asdasdsad}>修改总结</p>
<a href={`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${this.props.match.params.homeworkid}/openlist?tab=0`} className="color-grey-6 fr font-16 ml30 mt10">返回</a>
</div>
{/*educontentbox*/}

31
public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
Unescape View File

@ -899,6 +899,7 @@ class Listofworksstudentone extends Component {
)
},
],
yslpros:false,
}
// console.log("902");
// console.log("902");
@ -912,15 +913,26 @@ class Listofworksstudentone extends Component {
}
componentWillReceiveProps(nextProps) {
console.log("+++++++++913");
console.log("+++++++++915");
console.log("+++++++++916");
console.log(nextProps);
console.log(this.props)
// console.log("+++++++++916");
// console.log(nextProps);
// console.log(this.props)
// console.log(this.props.isAdmin());
if (nextProps.code_review != this.props.code_review) {
if (nextProps.code_review !== undefined) {
console.log("diaoyonglwangluo1");
if(this.props.isAdmin() === true){
this.tearchar();
}else{
this.student();
}
}
}
}
componentDidMount() {
console.log("componentDidMount");
// console.log(this.props.isAdmin());
if(this.props.isAdmin() === true){
this.tearchar();
// console.log("909");
@ -1097,7 +1109,7 @@ class Listofworksstudentone extends Component {
})
} else {
console.log(teacherdata)
// console.log(teacherdata)
if (teacherdata.id !== undefined || teacherdata.id !== null || teacherdata.id !== "") {
// console.log("seacthdata设置数据1")
// console.log(this.state.teacherdata )
@ -1599,7 +1611,7 @@ class Listofworksstudentone extends Component {
let columns = this.state.columns;
var columns2=[];
if (teacherdata !== undefined) {
console.log("1588");
// console.log("1588");
for (var i = 0; i < student_works.length; i++) {
var timedata = moment(student_works[i].update_time).format('YYYY-MM-DD HH:mm');
datalist.push({
@ -2217,6 +2229,9 @@ class Listofworksstudentone extends Component {
confirmysl(url){
axios.get(url).then((response) => {
if(response === undefined){
return
}
if(response.data.status&&response.data.status===-1){
}else if(response.data.status&&response.data.status===-2){
@ -2521,7 +2536,7 @@ class Listofworksstudentone extends Component {
<div className="mh650 edu-back-white">
<div className="edu-tab-con-box clearfix edu-txt-center">
<img className="edu-nodata-img mb20" src={getImageUrl("images/educoder/nodata.png")}/>
<p className="edu-nodata-p mb30">没有数据可以显示.！</p>
<p className="edu-nodata-p mb30">没有数据可以显示！</p>
</div>
</div>

11
public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js
Unescape View File

@ -32,6 +32,7 @@ class ShixunHomeworkPage extends Component {
visible: false,
showmodel:false,
child:undefined,
yslpros:false,
}
}
@ -53,9 +54,9 @@ class ShixunHomeworkPage extends Component {
}
Getdataback = (jobsettingsdata, teacherdata) => {
console.log("56");
console.log(jobsettingsdata);
console.log(teacherdata);
// console.log("56");
// console.log(jobsettingsdata);
// console.log(teacherdata);
this.setState({
jobsettingsdata: jobsettingsdata,
@ -71,13 +72,13 @@ class ShixunHomeworkPage extends Component {
// let sum = []
// sum.push(type[1])
// console.log("componentDidMountcomponentDidMount");
console.log(type);
// console.log(type);
this.setState({
tab: type[1],
})
let querys = this.props.location.pathname;
const types = querys.split('/');
console.log(types);
// console.log(types);
this.setState({
shixuntypes: types[3]
})

18
public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js
Unescape View File

@ -81,6 +81,21 @@ class ShixunStudentWork extends Component {
this.props.triggerRef(this);
this.getTrainingjobsettings();
}
componentWillReceiveProps(nextProps) {
// console.log("+++++++++916");
// console.log(nextProps);
// console.log(this.props)
// console.log(this.props.isAdmin());
if (nextProps.code_review != this.props.code_review) {
if (nextProps.code_review !== undefined) {
console.log("diaoyonglwangluo1");
this.getTrainingjobsettings();
}
}
}
getTrainingjobsettings=()=>{
this.getupdata();
this.getTrainingjobsetting();
@ -523,6 +538,9 @@ class ShixunStudentWork extends Component {
confirmysl(url){
axios.get(url).then((response) => {
if(response === undefined){
return
}
if(response.data.status&&response.data.status===-1){
}else if(response.data.status&&response.data.status===-2){

2
public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js
Unescape View File

@ -125,7 +125,7 @@ class ShixunWorkReport extends Component {
</WordsBtn>
<span className="color-grey-9 fl ml3 mr3">&gt;</span>
<WordsBtn to={"/courses/"+this.props.match.params.coursesId+"/"+this.state.shixuntypes+"/"+category_id} style="grey" className="btn colorgrey fl hovercolorblue ">
<span className={"color-grey-9"}>{data&&data.category.category_name}</span>
<span className={"color-grey-9"}>{data===undefined?"":data.category===null?"":data.category.category_name}</span>
</WordsBtn>
<span className="color-grey-9 fl ml3 mr3">&gt;</span>
<WordsBtn to={"/courses/"+this.props.match.params.coursesId+"/"+this.state.shixuntypes+"/"+homework_common_id+"/list?tab=0"} className="fl color-grey-9">作业详情</WordsBtn>

2
public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js
Unescape View File

@ -373,7 +373,7 @@ class ShixunhomeWorkItem extends Component{
width:192px !important;
}
.homepagePostSettingbox{
width:121px !important;
width:139px !important;
}
`
}

3
public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunCustomsPass.js
Unescape View File

@ -153,7 +153,8 @@ class ShixunCustomsPass extends Component {
border-radius: 12px;
color: rgba(221,23,23,1);
display: inline-block;
line-height: 24px;
line-height: 24px;
text-align: center;
}
.ant-table-tbody > tr > td{
font-size:14px;

17
public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
Unescape View File

@ -141,6 +141,20 @@ class Trainingjobsetting extends Component {
}
componentWillReceiveProps(nextProps) {
// console.log("+++++++++916");
// console.log(nextProps);
// console.log(this.props)
// console.log(this.props.isAdmin());
if (nextProps.code_review != this.props.code_review) {
if (nextProps.code_review !== undefined) {
console.log("diaoyonglwangluo4");
this.getTrainingjobsetting()
}
}
}
// 获取数据地方
@ -1744,6 +1758,9 @@ class Trainingjobsetting extends Component {
confirmysl(url){
axios.get(url).then((response) => {
if(response === undefined){
return
}
if(response.data.status&&response.data.status===-1){
}else if(response.data.status&&response.data.status===-2){

18
public/react/src/modules/courses/shixunHomework/Workquestionandanswer.js
Unescape View File

@ -94,6 +94,21 @@ class Workquestionandanswer extends Component {
shixuntypes: type[3]
})
}
componentWillReceiveProps(nextProps) {
// console.log("+++++++++916");
// console.log(nextProps);
// console.log(this.props)
// console.log(this.props.isAdmin());
if (nextProps.code_review != this.props.code_review) {
if (nextProps.code_review !== undefined) {
console.log("diaoyonglwangluo2");
var homeworkid = this.props.match.params.homeworkid;
// console.log(homeworkid)
this.Gettitleinformation(homeworkid)
}
}
}
isupdatas = () => {
var homeworkid = this.props.match.params.homeworkid;
@ -333,6 +348,9 @@ class Workquestionandanswer extends Component {
confirmysl(url){
axios.get(url).then((response) => {
if(response === undefined){
return
}
if(response.data.status&&response.data.status===-1){
}else if(response.data.status&&response.data.status===-2){

3
public/react/src/modules/courses/shixunHomework/shixunreport/OfficialAcademicTranscript.js
Unescape View File

@ -142,7 +142,8 @@ class OfficialAcademicTranscript extends Component {
border-radius: 12px;
color: rgba(221,23,23,1);
display: inline-block;
line-height: 24px;
line-height: 24px;
text-align: center;
}
.tasknameboxs{

10
public/react/src/modules/user/account/AccountCertification.js
Unescape View File

@ -16,7 +16,7 @@ class AccountCertification extends Component {
showRealNameCertificationModal = (index) => {
this.setState({
certification:index
certification:index,
})
this.realNameCertificationModal.setVisible(true)
}
@ -25,9 +25,13 @@ class AccountCertification extends Component {
let {basicInfo} = this.props;
return (
<div>
<RealNameCertificationModal ref="realNameCertificationModal" {...this.props}
{this.state.certification===1?<RealNameCertificationModal ref="realNameCertificationModal" {...this.props}
wrappedComponentRef={(form) => this.realNameCertificationModal = form} certification={certification}
></RealNameCertificationModal>
></RealNameCertificationModal>:""}
{this.state.certification===2?<RealNameCertificationModal ref="realNameCertificationModal" {...this.props}
wrappedComponentRef={(form) => this.realNameCertificationModal = form} certification={certification}
></RealNameCertificationModal>:""}
<div className="basicForm">
<style>{`
.basicForm .title {

6
public/react/src/modules/user/modal/RealNameCertificationModal.js
Unescape View File

@ -30,7 +30,6 @@ class RealNameCertificationModal extends Component{
constructor(props){
super(props);
this.state={
fileList:[]
}
}
@ -38,7 +37,6 @@ class RealNameCertificationModal extends Component{
}
setVisible = (visible) => {
this.setState({ fileList:[] });
this.refs.modalWrapper.setVisible(visible)
}
@ -120,8 +118,6 @@ class RealNameCertificationModal extends Component{
loading: false,
}));
}
let fileList = [...info.fileList];
this.setState({ fileList });
}
render(){
@ -294,7 +290,7 @@ class RealNameCertificationModal extends Component{
<span className="idPic-uploader demoImg">
<img src={`${certification == 1 ? authImg : jobImg}`} alt="avatar" style={{ maxHeight: '110px'}}/>
</span>
<Dragger {...uploadProps2} fileList = {this.state.fileList}>
<Dragger {...uploadProps2}>
{imageUrl2 ?
// <a href={imageUrl2} target="_blank" title="点击重新上传图片"></a>
<img src={imageUrl2} alt="avatar" style={{ maxHeight: '110px'}}/>

4
public/react/src/modules/user/usersInfo/InfosCourse.js
Unescape View File

@ -103,6 +103,8 @@ class InfosCourse extends Component{
} = this.state;
let isStudent = this.props.isStudent();
let is_current=this.props.is_current;
console.log(this.props.current_user&&this.props.current_user.user_identity==="学生")
return(
<div className="educontent">
<Spin size="large" spinning={isSpin}>
@ -126,7 +128,7 @@ class InfosCourse extends Component{
<div className="square-list clearfix">
{
!isStudent && page == 1 && !category && is_current &&
<Create href={"/courses/new"} name={"新建课堂"} index="1"></Create>
this.props.current_user&&this.props.current_user.user_identity==="学生"?"":<Create href={"/courses/new"} name={"新建课堂"} index="1"></Create>
}
{
(!data || data.courses.length==0) && (isStudent || category) && <NoneData></NoneData>

Write Preview
Loading…
Cancel
Save