- {questionslist.course_name}
+ {questionslist.course_name}
>
{questionslist.graduation_name}
>
diff --git a/public/react/src/modules/courses/new/CoursesNew.js b/public/react/src/modules/courses/new/CoursesNew.js
index 149f9bc27..c8b090b8b 100644
--- a/public/react/src/modules/courses/new/CoursesNew.js
+++ b/public/react/src/modules/courses/new/CoursesNew.js
@@ -28,6 +28,7 @@ function disabledDateTime() {
};
}
+
class CoursesNew extends Component {
constructor(props) {
@@ -46,7 +47,8 @@ class CoursesNew extends Component {
let coursesId = this.props.match.params.coursesId;
let user_school=this.props.current_user&&this.props.current_user.user_school;
-
+ this.getschool("")
+ this.Searchvalue("")
if (coursesId != undefined) {
let url = "/courses/" + coursesId + "/settings.json"
axios.get(url).then((result) => {
@@ -85,8 +87,7 @@ class CoursesNew extends Component {
})
}
- this.getschool("")
- this.Searchvalue("")
+
}
componentDidUpdate(prevProps){
@@ -152,7 +153,7 @@ class CoursesNew extends Component {
}
if(values.school===""||values.school===undefined){
- this.scrollToAnchor("isschool")
+ // this.scrollToAnchor("isschool")
return
}
@@ -191,17 +192,7 @@ class CoursesNew extends Component {
).then((response) => {
// debugger
if (response.data.status === 0) {
- // this.setState({
- // Modalstype: true,
- // Modalstopval: response.data.message,
- // ModalSave: this.cancelmodel,
- // Loadtype: true,
- // checkBoxValues: [],
- // checkAllValue: false,
- // // Realnamecertification : authentication,
- // // professional_certification: values.Professionalcertification
- // })
- window.location.href = "/courses/" + coursesId+"/students";
+ this.goback()
}
}).catch((error) => {
console.log(error)
@@ -220,7 +211,7 @@ class CoursesNew extends Component {
return
}
if(values.school===""||values.school===undefined){
- this.scrollToAnchor("isschool")
+ // this.scrollToAnchor("isschool")
return
}
@@ -244,9 +235,7 @@ class CoursesNew extends Component {
}
).then((response) => {
if (response.status === 200) {
- if (response.data.course_id != undefined) {
- window.location.href = "/courses/" + response.data.course_id+"/students";
- }
+ this.goback()
}
}).catch((error) => {
console.log(error)
@@ -262,7 +251,7 @@ class CoursesNew extends Component {
if(this.props.match.params.coursesId===undefined){
this.props.history.push("/courses");
}else{
- this.props.history.push(`/courses/${this.props.match.params.coursesId}`);
+ this.props.history.push(this.props.current_user.first_category_url);
}
// window.history.go(-1)
}
@@ -292,7 +281,8 @@ class CoursesNew extends Component {
search:value
}).then((result)=>{
// console.log(result.data)
- if (result.data.status===0) {
+ if (result.data.message===undefined) {
+
this.setState({
searchlist: result.data.course_lists,
// course:value,
@@ -357,7 +347,9 @@ class CoursesNew extends Component {
};
getschool=(value)=>{
-
+ this.props.form.setFieldsValue({
+ school: value
+ })
let url="/schools/school_list.json";
axios.get(url,{
params: {
@@ -369,9 +361,7 @@ class CoursesNew extends Component {
searchlistscholl: result.data.school_names,
school: value
})
- this.props.form.setFieldsValue({
- school: value
- })
+
}
}).catch((error)=>{
console.log(error)
@@ -389,7 +379,7 @@ class CoursesNew extends Component {
const optionschool = this.state.searchlistscholl&&this.state.searchlistscholl.map(z => );
// console.log(this.props.current_user.user_school)
// form合并了
- // console.log(optionschool)
+
return (
diff --git a/public/react/src/modules/courses/poll/PollDetailIndex.js b/public/react/src/modules/courses/poll/PollDetailIndex.js
index 0099c8615..8e3f78d5c 100644
--- a/public/react/src/modules/courses/poll/PollDetailIndex.js
+++ b/public/react/src/modules/courses/poll/PollDetailIndex.js
@@ -22,169 +22,169 @@ import axios from 'axios'
const map={1:"未发布",2:"提交中",3:"已截止",4:"已结束"}
class PollDetailIndex extends Component{
- constructor(props){
- super(props);
- this.state={
- tab:["0"],
- pollDetail:undefined,
- user_permission:undefined,
- DownloadType:false,
- DownloadMessageval:undefined,
- }
- }
-
- getPollInfo=()=>{
- console.log(this.props);
- let pollId=this.props.match.params.pollId;
- let url=`/polls/${pollId}/common_header.json`
- axios.get(url).then((result)=>{
- if(result.status==200){
- this.setState({
- pollDetail:result.data,
- user_permission:result.data.user_permission
- })
- }
- }).catch((error)=>{
- console.log(error);
- })
- }
-
- componentDidMount(){
- const query =this.props.location.search;
- if(query.indexOf("?")!=-1){
- const type = query.split('?');
- let name = type[1].split("tab=");
- name = String(name).split(",");
- name = decodeURI(name[1]);
- if(name!=undefined && name!="" && name!="undefined"){
- this.setState({
- tab:[name]
- })
- }
- }
-
- this.getPollInfo();
- }
-
- //切换tab
- changeTab=(e)=>{
- this.setState({
- tab:e.key
- })
- }
-
- /// 确认是否下载
- confirmysl(url){
- axios.get(url).then((response) => {
- if(response.data.status&&response.data.status===-1){
-
- }else if(response.data.status&&response.data.status===-2){
- if(response.data.message === "100"){
- // 已超出文件导出的上限数量（100 ），建议：
-
- this.setState({
- DownloadType:true,
- DownloadMessageval:100
- })
- }else {
- //因附件资料超过500M
- this.setState({
- DownloadType:true,
- DownloadMessageval:500
- })
- }
- }else {
- this.props.showNotification(`正在下载中`);
- window.open("/api"+url, '_blank');
- }
- }).catch((error) => {
- console.log(error)
- });
- }
-
- Downloadcal=()=>{
- this.setState({
- DownloadType:false,
- DownloadMessageval:undefined
- })
- }
- render(){
- let {tab,pollDetail,user_permission}=this.state;
-
- const isAdmin =this.props.isAdmin();
- const isStudent = this.props.isStudent();
- return(
-
-
-
-
- {this.props.coursedata.name}
- >
- 问卷
- >
- 问卷详情
-
-
- {pollDetail && pollDetail.polls_name}
-
+ constructor(props){
+ super(props);
+ this.state={
+ tab:["0"],
+ pollDetail:undefined,
+ user_permission:undefined,
+ DownloadType:false,
+ DownloadMessageval:undefined,
+ }
+ }
+
+ getPollInfo=()=>{
+ console.log(this.props);
+ let pollId=this.props.match.params.pollId;
+ let url=`/polls/${pollId}/common_header.json`
+ axios.get(url).then((result)=>{
+ if(result.status==200){
+ this.setState({
+ pollDetail:result.data,
+ user_permission:result.data.user_permission
+ })
+ }
+ }).catch((error)=>{
+ console.log(error);
+ })
+ }
+
+ componentDidMount(){
+ const query =this.props.location.search;
+ if(query.indexOf("?")!=-1){
+ const type = query.split('?');
+ let name = type[1].split("tab=");
+ name = String(name).split(",");
+ name = decodeURI(name[1]);
+ if(name!=undefined && name!="" && name!="undefined"){
+ this.setState({
+ tab:[name]
+ })
+ }
+ }
+
+ this.getPollInfo();
+ }
+
+ //切换tab
+ changeTab=(e)=>{
+ this.setState({
+ tab:e.key
+ })
+ }
+
+ /// 确认是否下载
+ confirmysl(url){
+ axios.get(url).then((response) => {
+ if(response.data.status&&response.data.status===-1){
+
+ }else if(response.data.status&&response.data.status===-2){
+ if(response.data.message === "100"){
+ // 已超出文件导出的上限数量（100 ），建议：
+
+ this.setState({
+ DownloadType:true,
+ DownloadMessageval:100
+ })
+ }else {
+ //因附件资料超过500M
+ this.setState({
+ DownloadType:true,
+ DownloadMessageval:500
+ })
+ }
+ }else {
+ this.props.showNotification(`正在下载中`);
+ window.open("/api"+url, '_blank');
+ }
+ }).catch((error) => {
+ console.log(error)
+ });
+ }
+
+ Downloadcal=()=>{
+ this.setState({
+ DownloadType:false,
+ DownloadMessageval:undefined
+ })
+ }
+ render(){
+ let {tab,pollDetail,user_permission}=this.state;
+
+ const isAdmin =this.props.isAdmin();
+ const isStudent = this.props.isStudent();
+ return(
+
+
+
+
+ {this.props.coursedata.name}
+ >
+ 问卷
+ >
+ 问卷详情
+
+
+ {pollDetail && pollDetail.polls_name}
+
- this.props.history.goBack()}>返回
-
-
-
-
-
-
- {
- isAdmin &&
-
+ this.props.history.goBack()}>返回
+
+
+
+
+
+
+ {
+ isAdmin &&
+
编辑问卷
- {/* 立即发布 */}
- {
- user_permission && user_permission.poll_unpublish_count > 0 ?
-
-
-
- :""
- }
- {/* 立即截止、撤销发布 */}
- {
- user_permission && user_permission.poll_publish_count > 0 ?
-
-
-
- :""
- }
- {/* {
+ {/* 立即发布 */}
+ {
+ user_permission && user_permission.poll_unpublish_count > 0 ?
+
+
+
+ :""
+ }
+ {/* 立即截止、撤销发布 */}
+ {
+ user_permission && user_permission.poll_publish_count > 0 ?
+
+
+
+ :""
+ }
+ {/* {
user_permission && user_permission.poll_publish_count>0 ?
:""
} */}
- this.confirmysl("/polls/"+this.props.match.params.pollId+"/commit_result.xlsx")} href="javascript:void(0);">导出统计
+ this.confirmysl("/polls/"+this.props.match.params.pollId+"/commit_result.xlsx")} href="javascript:void(0);">导出统计
- }
- {
- isStudent &&
-
+ }
+ {
+ isStudent &&
+
{
- user_permission && user_permission.current_status!=3 ?
-
- { user_permission && user_permission.current_status ==0 ? "继续答题" : user_permission.current_status == 1 ? "查看答题" : "开始答题" }
-
- :""
- }
+ user_permission && user_permission.current_status!=3 ?
+
+ { user_permission && user_permission.current_status ==0 ? "继续答题" : user_permission.current_status == 1 ? "查看答题" : "开始答题" }
+
+ :""
+ }
- }
-
-
-
- {
- // 答题列表
- parseInt(tab[0])==0 &&
- }
- {
- // 统计结果
- parseInt(tab[0])==1 &&
- }
-
- {
- //问卷预览
- parseInt(tab[0])==2 &&
- }
- {
- //设置
- parseInt(tab[0])==3 &&
- }
-
-
-
- )
- }
+ }
+
+
+
+ {
+ // 答题列表
+ parseInt(tab[0])==0 &&
+ }
+ {
+ // 统计结果
+ parseInt(tab[0])==1 &&
+ }
+
+ {
+ //问卷预览
+ parseInt(tab[0])==2 &&
+ }
+ {
+ //设置
+ parseInt(tab[0])==3 &&
+ }
+
+
+
diff --git a/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js b/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js
index d9e589bd4..e2285a7a6 100644
--- a/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js
+++ b/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js
@@ -111,7 +111,14 @@ class ShixunHomeworkPage extends Component {
bindRef = ref => { this.child = ref }
///////////////教师截止
-
+ gotohome=()=>{
+ let courseId=this.props.match.params.coursesId;
+ if(courseId===undefined){
+ this.props.history.push("/courses");
+ }else{
+ this.props.history.push(this.props.current_user.first_category_url);
+ }
+ }
render() {
let {tab, teacherdatapage, jobsettingsdatapage} = this.state;
@@ -125,12 +132,11 @@ class ShixunHomeworkPage extends Component {
- {jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.course_name}
+ this.gotohome()}>{jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.course_name}
>
- {jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.category.category_name}
+ href={`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.category.category_id === undefined ? "" : jobsettingsdatapage.data.category.category_id}`}>{jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.category.category_name}
>
作业详情
@@ -142,8 +148,7 @@ class ShixunHomeworkPage extends Component {
-
返回
+
this.gotohome()}>返回
实训详情
diff --git a/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js b/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js
index 3c2367942..91f6f3001 100644
--- a/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js
+++ b/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js
@@ -101,6 +101,14 @@ class ShixunWorkReport extends Component {
}
}
}
+ gotohome=()=>{
+ let courseId=this.props.match.params.coursesId;
+ if(courseId===undefined){
+ this.props.history.push("/courses");
+ }else{
+ this.props.history.push(this.props.current_user.first_category_url);
+ }
+ }
render() {
let{data} =this.state;
let category_id=data===undefined?"":data.category===null?"":data.category.category_id;
@@ -119,16 +127,15 @@ class ShixunWorkReport extends Component {
modalsType={this.state.DownloadType}
/>
-
-
+ this.gotohome()}>
{data&&data.course_name}
-
+
>
-
+
{data===undefined?"":data.category===null?"":data.category.category_name}
-
+
>
- 作业详情
+ 作业详情
>
{data&&data.username}
diff --git a/public/react/src/modules/courses/shixunHomework/shixunHomework.js b/public/react/src/modules/courses/shixunHomework/shixunHomework.js
index 504dd9c57..61133acd2 100644
--- a/public/react/src/modules/courses/shixunHomework/shixunHomework.js
+++ b/public/react/src/modules/courses/shixunHomework/shixunHomework.js
@@ -875,6 +875,14 @@ class ShixunHomework extends Component{
let data={id:parseInt(datas.category_id),name:name}
trigger('editshixunname', data)
}
+ gotohome=()=>{
+ let courseId=this.props.match.params.coursesId;
+ if(courseId===undefined){
+ this.props.history.push("/courses");
+ }else{
+ this.props.history.push(this.props.current_user.first_category_url);
+ }
+ }
render(){
let {
modalname,
diff --git a/public/react/src/modules/home/shixunsHome.js b/public/react/src/modules/home/shixunsHome.js
index 92f3c9f44..9c166f43f 100644
--- a/public/react/src/modules/home/shixunsHome.js
+++ b/public/react/src/modules/home/shixunsHome.js
@@ -93,7 +93,7 @@ class ShixunsHome extends Component {
const CustomNextArrow = props => {
return (
-
![]({"images/educoder/banner-right.png"})
+
![]({"/images/educoder/banner-right.png"})
);
};
@@ -101,7 +101,7 @@ class ShixunsHome extends Component {
const CustomPrevArrow = props => {
return (
-
![]({"images/educoder/banner-left.png"})
+
![]({"/images/educoder/banner-left.png"})
);
};
@@ -374,7 +374,7 @@ class ShixunsHome extends Component {
![]({getImageUrl("images/educoder/huangguan-two.png")})
- 
+ 
{item.username}
@@ -388,7 +388,7 @@ class ShixunsHome extends Component {
![]({getImageUrl("images/educoder/huangguan.png")})
-
+
{item.username}
@@ -402,7 +402,7 @@ class ShixunsHome extends Component {
![]({getImageUrl("images/educoder/huangguan-three.png")})
-
+
{item.username}
@@ -418,7 +418,7 @@ class ShixunsHome extends Component {
return (
- 
+ 
{item.username}
@@ -450,7 +450,7 @@ class ShixunsHome extends Component {
-
+
{item.username}
@@ -464,7 +464,7 @@ class ShixunsHome extends Component {
-
+
{item.username}
@@ -478,7 +478,7 @@ class ShixunsHome extends Component {
-
+
{item.username}
@@ -494,7 +494,7 @@ class ShixunsHome extends Component {
return (
-
+
{item.username}
diff --git a/public/react/src/modules/login/EducoderLogin.js b/public/react/src/modules/login/EducoderLogin.js
index 14d80181a..713593100 100644
--- a/public/react/src/modules/login/EducoderLogin.js
+++ b/public/react/src/modules/login/EducoderLogin.js
@@ -120,6 +120,9 @@ class EducoderLogin extends Component {
})
}
+ gohome=()=>{
+ window.location.href="/"
+ }
Setshowbool = (e,name,pass) => {
if (e===1) {
this.setState({
@@ -146,7 +149,7 @@ class EducoderLogin extends Component {
"width": "100%"
}}>
-
+
![]()
this.gohome()} src={educodernet}/>
diff --git a/public/react/src/modules/page/MainContent.js b/public/react/src/modules/page/MainContent.js
index c03d49351..601c002a9 100644
--- a/public/react/src/modules/page/MainContent.js
+++ b/public/react/src/modules/page/MainContent.js
@@ -114,7 +114,7 @@ class MainContent extends Component {
?
readRepoTimeout === true ?
:
diff --git a/public/react/src/modules/page/MainContentContainer.js b/public/react/src/modules/page/MainContentContainer.js
index d24a5cefb..829b84b16 100644
--- a/public/react/src/modules/page/MainContentContainer.js
+++ b/public/react/src/modules/page/MainContentContainer.js
@@ -235,7 +235,10 @@ class MainContentContainer extends Component {
}
// arg_path 点击文件目录树时，传入的点击节点对应的path
- fetchRepositoryCode( props, arg_path, type, isRetry) {
+ fetchRepositoryCode( props, arg_path, type, isRetry, retryAndRefresh) {
+ if (retryAndRefresh) {
+ this.retryAndRefresh = retryAndRefresh
+ }
const { challenge, showSnackbar, game, shixun, myshixun, hide_code } = props ? props : this.props;
if (shixun.vnc == true) {
// vnc模式下不需要加载代码
@@ -293,6 +296,11 @@ class MainContentContainer extends Component {
// that._cancel = c;
// })
}).then((fetchRepositoryCodeResponse) => {
+ // monaca 需要刷新，不然无法编辑
+ if (this.retryAndRefresh && fetchRepositoryCodeResponse.data.content) {
+ window.location.reload()
+ return;
+ }
// 空字符串还是正常切换
if (fetchRepositoryCodeResponse.data.status == 0) {
readingRepoTimes = readingRepoTimes + 1;
diff --git a/public/react/src/modules/paths/PathDetail/DetailCardsEditAndAdd.js b/public/react/src/modules/paths/PathDetail/DetailCardsEditAndAdd.js
index 5534dd415..340505655 100644
--- a/public/react/src/modules/paths/PathDetail/DetailCardsEditAndAdd.js
+++ b/public/react/src/modules/paths/PathDetail/DetailCardsEditAndAdd.js
@@ -402,7 +402,7 @@ class DetailCardsEditAndAdd extends Component{
*
必填项
diff --git a/public/react/src/modules/paths/ShixunPathCard.js b/public/react/src/modules/paths/ShixunPathCard.js
index 9260b9f46..1b0759d1f 100644
--- a/public/react/src/modules/paths/ShixunPathCard.js
+++ b/public/react/src/modules/paths/ShixunPathCard.js
@@ -38,7 +38,7 @@ class ShixunPathCard extends Component{
{/*target="_blank"*/}
-
+
![13?1543211263]({"/"+item.image_url})
diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js
index 20436f3c7..791110b0b 100644
--- a/public/react/src/modules/tpm/NewHeader.js
+++ b/public/react/src/modules/tpm/NewHeader.js
@@ -708,7 +708,7 @@ submittojoinclass=(value)=>{
onInput={()=>this.onKeywordSearchKeyDowns()}
onSearch={(value) => this.onKeywordSearchKeyDown(value)}
// onPressEnter={this.onKeywordSearchKeyDown}
- style={{ width: 300 }}
+ style={{ width: 300,height:32}}
autoFocus={true}
/>
:""}
diff --git a/public/react/src/modules/tpm/challengesnew/TPMchallengesnew.js b/public/react/src/modules/tpm/challengesnew/TPMchallengesnew.js
index 2cca8cb65..7a6f1ec4b 100644
--- a/public/react/src/modules/tpm/challengesnew/TPMchallengesnew.js
+++ b/public/react/src/modules/tpm/challengesnew/TPMchallengesnew.js
@@ -493,7 +493,7 @@ export default class TPMchallengesnew extends Component {
过关任务
+ watch={true} className="courseMessageMD" initValue={this.state.exercisememoMDRefval} height={700}>
diff --git a/public/react/src/modules/user/FindPasswordComponent.js b/public/react/src/modules/user/FindPasswordComponent.js
index 7df2d82c5..19b5a7388 100644
--- a/public/react/src/modules/user/FindPasswordComponent.js
+++ b/public/react/src/modules/user/FindPasswordComponent.js
@@ -12,6 +12,7 @@ import ReadPassword from './ReadPassword';
import axios from 'axios';
import './common.css'
+import './commontwo.css'
const TabPane = Tabs.TabPane
const loginInputsyl = {
@@ -27,7 +28,7 @@ class LoginRegisterComponent extends Component {
login: "",
password: "",
passwords: "",
- seconds: 35,
+ seconds: 60,
codes: "",
getverificationcodes: true,
Phonenumberisnotcobool: false,
@@ -126,7 +127,7 @@ class LoginRegisterComponent extends Component {
clearInterval(timer);
this.setState({
getverificationcodes: false,
- seconds: 35,
+ seconds: 60,
})
}
});
@@ -144,7 +145,7 @@ class LoginRegisterComponent extends Component {
clearInterval(timer);
this.setState({
getverificationcodes: false,
- seconds: 35,
+ seconds: 60,
})
}
@@ -600,6 +601,7 @@ class LoginRegisterComponent extends Component {
height={38} successGreenColor="#29bd8b"
style={{height: "38px", width: "100%"}}
dragOkCallback={()=>this.dragOkCallback()}
+ className="ysllw100"
>
:
""
@@ -611,6 +613,7 @@ class LoginRegisterComponent extends Component {
height={38} successGreenColor="#29bd8b"
style={{height: "38px", width: "100%"}}
dragOkCallback={()=>this.dragOkCallback()}
+ className="ysllw100"
>
:
""
diff --git a/public/react/src/modules/user/Interestpage.js b/public/react/src/modules/user/Interestpage.js
index dbca5a242..1054d620e 100644
--- a/public/react/src/modules/user/Interestpage.js
+++ b/public/react/src/modules/user/Interestpage.js
@@ -192,6 +192,8 @@ class InterestpageComponent extends Component {
ints.push(this.state.gouxuans4[i].id);
}
}
+ console.log("195195");
+ console.log(ints);
if(ints.length<1){
this.openNotification("请至少选择一个您感兴趣的内容");
return
diff --git a/public/react/src/modules/user/InterestpageMax.js b/public/react/src/modules/user/InterestpageMax.js
index e0585ed33..6dc182154 100644
--- a/public/react/src/modules/user/InterestpageMax.js
+++ b/public/react/src/modules/user/InterestpageMax.js
@@ -182,10 +182,6 @@ class InterestpageMax extends Component {
//兴趣页面点击
Interestcompletionpage(){
-
- this.setState({
- setpagecomplet:true
- })
if(this.state.gouxuans.length === 0){
this.openNotification("请选择职业");
return
@@ -197,6 +193,8 @@ class InterestpageMax extends Component {
ints.push(this.state.gouxuans4[i].id);
}
}
+ console.log("200200");
+ console.log(ints);
if(ints.length<1){
this.openNotification("请至少选择一个您感兴趣的内容");
return
@@ -302,7 +300,7 @@ class InterestpageMax extends Component {
)
})}
+
-