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

调整

Browse Source
dev_forum
杨树明 5 years ago
parent b9e6fd8e48
commit 01ea852926
10 changed files with 139 additions and 125 deletions
Show Stats Download Patch File Download Diff File

2
public/react/src/App.js
Unescape View File

@ -258,7 +258,7 @@ class App extends Component {
<MuiThemeProvider theme={theme}>
<LoginDialog></LoginDialog>
<LoginDialog {...this.props} {...this.state}></LoginDialog>
{/*{*/}
{/* isRender === true?*/}
{/* <LoginDialog></LoginDialog> : ""*/}

2
public/react/src/AppConfig.js
Unescape View File

@ -18,7 +18,7 @@ function locationurl(list){
}
// TODO 开发期多个身份切换
const debugType = window.location.search.indexOf('debug=t') != -1 ? 'teacher' :
const debugType =window.location.search.indexOf('debug=t') != -1 ? 'teacher' :
window.location.search.indexOf('debug=s') != -1 ? 'student' : 'admin'
window._debugType = debugType;
export function initAxiosInterceptors(props) {

92
public/react/src/index.js
Unescape View File

@ -1,46 +1,46 @@
import React from 'react';
import ReactDOM from 'react-dom';
import './index.css';
import './indexPlus.css';
import App from './App';
// 加之前main.js 18.1MB
// import { message } from 'antd';
import message from 'antd/lib/message';
import 'antd/lib/message/style/css';
import { AppContainer } from 'react-hot-loader';
import registerServiceWorker from './registerServiceWorker';
import { configureUrlQuery } from 'react-url-query';
import history from './history';
// link the history used in our app to url-query so it can update the URL with it.
configureUrlQuery({ history });
// ----------------------------------------------------------------------------------- 请求配置
window.__useKindEditor = false;
const render = (Component) => {
ReactDOM.render(
<AppContainer>
<Component />
</AppContainer>,
document.getElementById('root')
);
}
// ReactDOM.render(
// ,
// document.getElementById('root'));
// registerServiceWorker();
render(App);
if (module.hot) {
module.hot.accept('./App', () => { render(App) });
}
import React from 'react';
import ReactDOM from 'react-dom';
import './index.css';
import './indexPlus.css';
import App from './App';
// 加之前main.js 18.1MB
// import { message } from 'antd';
import message from 'antd/lib/message';
import 'antd/lib/message/style/css';
import { AppContainer } from 'react-hot-loader';
import registerServiceWorker from './registerServiceWorker';
import { configureUrlQuery } from 'react-url-query';
import history from './history';
// link the history used in our app to url-query so it can update the URL with it.
configureUrlQuery({ history });
// ----------------------------------------------------------------------------------- 请求配置
window.__useKindEditor = false;
const render = (Component) => {
ReactDOM.render(
<AppContainer {...this.props} {...this.state}>
<Component {...this.props} {...this.state}/>
</AppContainer>,
document.getElementById('root')
);
}
// ReactDOM.render(
// ,
// document.getElementById('root'));
// registerServiceWorker();
render(App);
if (module.hot) {
module.hot.accept('./App', () => { render(App) });
}

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

@ -825,6 +825,7 @@ a.white-btn.use_scope-btn:hover{
.summaryname{
/*height: 23px;*/
font-size: 22px;
height: 25px;
font-family: MicrosoftYaHei;
font-weight: 400;
color: rgba(51,51,51,1);

103
public/react/src/modules/courses/shixunHomework/Listofworks.js
Unescape View File

@ -633,6 +633,7 @@ class Listofworks extends Component {
// 获取作品列表
Getalistofworks = (homeworkid) => {
// console.log("获取作品列表");7009
let urll = `/homework_commons/${homeworkid}/works_list.json`;
// console.log(homeworkid);
@ -651,6 +652,8 @@ class Listofworks extends Component {
limit:20,
}
axios.post(urll, data).then((result) => {
if(this.props.isNotMember()===false){
if (result !== undefined) {
// console.log(url)
// console.log("作品列表6789077")
@ -669,7 +672,7 @@ class Listofworks extends Component {
challenges_count:result.data.challenges_count,
})
this.seacthdata(result.data,result.data.student_works,result.data.work_efficiency,result.data.course_group_info,1);
}
} }
}).catch((error) => {
console.log(error)
this.setState({
@ -687,55 +690,57 @@ class Listofworks extends Component {
//debug=t 是老师的意思
// console.log(ordervlue)7009
var homeworkid = this.props.match.params.homeworkid;
let urll = `/homework_commons/${homeworkid}/works_list.json?`;
var order = "asc";
if (ordervlue === "update_time") {
order = "desc";
}
var checkedValuesines = checkedValuesine;
var checkedValuesineinfos = checkedValuesineinfo;
var searchtexts = searchtext
var data = {
search: searchtexts,
order: ordervlue,
b_order: order,
work_status: checkedValuesines,
course_group: checkedValuesineinfos,
page: page,
limit: limit,
}
// console.log("Startsorting");
// console.log(data);
axios.post(urll, data).then((result) => {
// if (result.status === 200) {/]
// console.log(url)
// console.log("作品列表______________________")
// console.log(JSON.stringify(result))
if (result !== undefined) {
var homeworkid = this.props.match.params.homeworkid;
let urll = `/homework_commons/${homeworkid}/works_list.json?`;
var order = "asc";
if (ordervlue === "update_time") {
order = "desc";
}
var checkedValuesines = checkedValuesine;
var checkedValuesineinfos = checkedValuesineinfo;
var searchtexts = searchtext
var data = {
search: searchtexts,
order: ordervlue,
b_order: order,
work_status: checkedValuesines,
course_group: checkedValuesineinfos,
page: page,
limit: limit,
}
// console.log("Startsorting");
// console.log(data);
axios.post(urll, data).then((result) => {
// if (result.status === 200) {/]
// console.log(url)
// console.log("作品列表______________________")
// console.log(JSON.stringify(result))
if(this.props.isNotMember()===false){
if (result !== undefined) {
this.setState({
teacherdata: result.data,
task_status: result.data.task_status,
course_group_info: result.data.course_group_info,
loadingstate: false,
jobsettingsdata: result,
allow_late:result.data.allow_late,
publish_immediately: result.data.publish_immediately,
work_efficiency: result.data.work_efficiency,
end_immediately: result.data.end_immediately,
code_review: result.data.code_review,
challenges_count:result.data.challenges_count,
})
this.seacthdata(result.data,result.data.student_works,result.data.work_efficiency,result.data.course_group_info,page);
}
}
// }
}).catch((error) => {
console.log(error)
this.setState({
teacherdata: result.data,
task_status: result.data.task_status,
course_group_info: result.data.course_group_info,
loadingstate: false,
jobsettingsdata: result,
allow_late:result.data.allow_late,
publish_immediately: result.data.publish_immediately,
work_efficiency: result.data.work_efficiency,
end_immediately: result.data.end_immediately,
code_review: result.data.code_review,
challenges_count:result.data.challenges_count,
loadingstate: false
})
this.seacthdata(result.data,result.data.student_works,result.data.work_efficiency,result.data.course_group_info,page);
}
// }
}).catch((error) => {
console.log(error)
this.setState({
loadingstate: false
})
})
}
@ -1455,7 +1460,7 @@ class Listofworks extends Component {
typs={this.state.typs}
/>
<div className={"educontent mb20"}>
<div className="educontent mb30">
<div className="educontent mb20">
<p className="clearfix mb20 mt10">
<ActionBtn className=" btn colorgrey fl hovercolorblue "
to={`/courses/${this.props.match.params.coursesId}/students`}>{jobsettingsdata === undefined ? "" : jobsettingsdata.data.course_name}</ActionBtn>
@ -1467,7 +1472,7 @@ class Listofworks extends Component {
<WordsBtn className="fl">作业详情</WordsBtn>
</p>
</div>
<div className="educontent mb30">
<div className="educontent mb20">
<p className=" fl color-black summaryname" style={{heigth:"33px"}}>
{teacherdata === undefined ? "" : teacherdata.homework_name}
</p>

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

@ -294,28 +294,32 @@ class Listofworksstudentone extends Component {
course_group: "",
}
axios.post(urll, data).then((result) => {
if (result.status === 200) {
this.setState({
teacherdata: result.data,
task_status: result.data.task_status,
course_group_info: result.data.course_group_info,
student_works: result.data.student_works,
jobsettingsdata: result,
publish_immediately: result.data.publish_immediately,
end_immediately: result.data.end_immediately,
id: result.data.id,
work_efficiency: result.data.work_efficiency,
code_review: result.data.code_review,
challenges_count:result.data.challenges_count,
view_report:result.data.view_report,
})
if (result.data.student_works === undefined || result.data.student_works === null || JSON.stringify(result.data.student_works) === "[]") {
this.seacthdata(result.data);
} else {
this.seacthdatas(result.data,result.data.student_works);
}
if (result.status === 200) {
if(this.props.isNotMember()===false) {
this.setState({
teacherdata: result.data,
task_status: result.data.task_status,
course_group_info: result.data.course_group_info,
student_works: result.data.student_works,
jobsettingsdata: result,
publish_immediately: result.data.publish_immediately,
end_immediately: result.data.end_immediately,
id: result.data.id,
work_efficiency: result.data.work_efficiency,
code_review: result.data.code_review,
challenges_count: result.data.challenges_count,
view_report: result.data.view_report,
})
if (result.data.student_works === undefined || result.data.student_works === null || JSON.stringify(result.data.student_works) === "[]") {
this.seacthdata(result.data);
} else {
this.seacthdatas(result.data, result.data.student_works);
}
}
}
}).catch((error) => {
console.log(error)
})
@ -703,6 +707,7 @@ class Listofworksstudentone extends Component {
if (result !== undefined) {
// console.log("学生公开的作品列表")
// console.log(JSON.stringify(result))
if(this.props.isNotMember()===false) {
this.setState({
teacherdata: result.data,
task_status: result.data.task_status,
@ -719,6 +724,7 @@ class Listofworksstudentone extends Component {
})
this.seacthdata(result.data);
}
}
}).catch((error) => {
console.log(error)
this.setState({

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

@ -609,8 +609,8 @@ class ShixunStudentWork extends Component {
typs={this.state.typs}
/>
<div className={"educontent mb20"}>
<div className="educontent mb25">
<p className="clearfix mb25 mt5">
<div className="educontent mb20">
<p className="clearfix mb20 mt5">
<ActionBtn className=" btn colorgrey fl hovercolorblue mt5"
to={`/courses/${this.props.match.params.coursesId}/students`}>{jobsettingsdata === undefined ? "" : jobsettingsdata.data.course_name}</ActionBtn>
{/*<ActionBtn className="btn colorgrey fl hovercolorblue" href={"/courses/"+data.course_id+"/students"}>{data.course_name}</ActionBtn>*/}
@ -624,7 +624,7 @@ class ShixunStudentWork extends Component {
<ActionBtn className="fl">作业详情</ActionBtn>
</p>
</div>
<div className="educontent mb30">
<div className="educontent mb20">
<p className=" fl color-black summaryname" style={{heigth:"33px"}}>
{jobsettingsdata === undefined ? "" : jobsettingsdata.data.homework_name}
</p>

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

@ -1711,7 +1711,7 @@ class Trainingjobsetting extends Component {
modalSave={modalSave}
></Modals>
<div className={"educontent mb20"}>
<div className="educontent mb30">
<div className="educontent mb20">
<p className="clearfix mb20 mt10">
<ActionBtn className=" btn colorgrey fl hovercolorblue "
to={`/courses/${this.props.match.params.coursesId}/students`}>{jobsettingsdata === undefined ? "" : jobsettingsdata.data.course_name}</ActionBtn>
@ -1724,7 +1724,7 @@ class Trainingjobsetting extends Component {
</p>
</div>
<div className="educontent mb30">
<div className="educontent mb20">
<p className=" fl color-black summaryname mt5" style={{heigth:"33px"}}>
{jobsettingsdata === undefined ? "" : jobsettingsdata.data.homework_name}

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

@ -400,7 +400,7 @@ class Workquestionandanswer extends Component {
typs={this.state.typs}
/>
<div className={"educontent mb20"}>
<div className="educontent mb30">
<div className="educontent mb20">
<p className="clearfix mb20 mt10">
<ActionBtn className=" btn colorgrey fl hovercolorblue "
to={"/courses/" + this.props.match.params.coursesId + "/students"}>{jobsettingsdata === undefined ? "" : jobsettingsdata.data.course_name}</ActionBtn>
@ -412,7 +412,7 @@ class Workquestionandanswer extends Component {
<WordsBtn className="fl">作业详情</WordsBtn>
</p>
</div>
<div className="educontent mb30">
<div className="educontent mb20">
<p className=" fl color-black summaryname" style={{heigth:"33px"}}>
{jobsettingsdata === undefined ? "" : jobsettingsdata.data.homework_name}
</p>

4
public/react/src/modules/login/LoginDialog.js
Unescape View File

@ -317,7 +317,9 @@ class LoginDialog extends Component {
});
}
handleDialogClose = () => {
if(this.props.match.path==="/"){
if(this.props.match===undefined){
window.location.href="/";
}else if(this.props.match.path==="/"){
this.setState({
isRender: false
})

Write Preview
Loading…
Cancel
Save