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 b9f6336e9a 712ba99281
commit 69b4eccccc
6 changed files with 124 additions and 125 deletions
Show Stats Download Patch File Download Diff File

16
public/react/src/modules/courses/coursesPublic/Associationmodel.js
Unescape View File

@ -59,15 +59,18 @@ class Associationmodel extends Component{
goback=()=>{ goback=()=>{
debugger
this.setState({ this.setState({
Modalstype:false, Modalstype:false,
}) })
this.props.funlist()
this.props.Cancel() this.props.Cancel()
this.props.funlist()
} }
setSaves=()=>{ setSaves=()=>{
debugger
let {projectvalue}=this.state; let {projectvalue}=this.state;
let taskid=this.props.taskid; let taskid=this.props.taskid;
let url="/graduation_tasks/"+taskid+"/graduation_works/relate_project.json"; let url="/graduation_tasks/"+taskid+"/graduation_works/relate_project.json";
@ -76,19 +79,14 @@ class Associationmodel extends Component{
project_id: projectvalue project_id: projectvalue
}).then((result)=>{ }).then((result)=>{
if(result.status===200){ this.goback()
if(result.data.status===0){
// this.setState({ // this.setState({
// Modalstype:true, // Modalstype:true,
// Modalstopval:result.data.message, // Modalstopval:result.data.message,
// ModalSave:this.goback, // ModalSave:this.goback,
// loadtype:true // loadtype:true
// }) // })
this.goback
}
}
}).catch((error)=>{ }).catch((error)=>{
console.log(error) console.log(error)
@ -115,7 +113,7 @@ class Associationmodel extends Component{
project_id: projectvalue project_id: projectvalue
} }
}).then((result)=>{ }).then((result)=>{
if(result.status===200){
if(result.data.is_relate===false){ if(result.data.is_relate===false){
this.setSaves() this.setSaves()
}else{ }else{
@ -126,7 +124,7 @@ class Associationmodel extends Component{
loadtype:true loadtype:true
}) })
} }
}
}).catch((error)=>{ }).catch((error)=>{
console.log(error) console.log(error)
}) })

179
public/react/src/modules/courses/coursesPublic/CoursesListType.js
Unescape View File

@ -1,90 +1,91 @@
import React, { Component } from 'react'; import React, { Component } from 'react';
import {Tooltip} from 'antd'; import {Tooltip} from 'antd'
class CoursesListType extends Component { import '../css/Courses.css';
constructor(props) { class CoursesListType extends Component {
super(props); constructor(props) {
this.state={ super(props);
// typelist:[], this.state={
// typesylename:"", // typelist:[],
// tipval:"" // typesylename:"",
} // tipval:""
}
}
}
componentDidMount() {
// let{typelist,typesylename,tipval}=this.props; componentDidMount() {
// // let{typelist,typesylename,tipval}=this.props;
// this.setState({ //
// typelist:typelist, // this.setState({
// typesylename:typesylename, // typelist:typelist,
// tipval:tipval // typesylename:typesylename,
// }) // tipval:tipval
// console.log("CoursesListType") // })
// console.log(typelist) // console.log("CoursesListType")
} // console.log(typelist)
}
render() {
let {typelist,typesylename,tipval}=this.props; render() {
let {typelist,typesylename,tipval}=this.props;
return(
<span style={{display:'inline-block'}}> return(
{ <span style={{display:'inline-block'}}>
typelist===undefined?"":typelist.map((item,key)=>{ {
return( typelist===undefined?"":typelist.map((item,key)=>{
<Tooltip placement="bottom" title={tipval} getPopupContainer={()=>document.querySelector('.TabsWarp')}> return(
<span key={key}> <Tooltip placement="bottom" title={tipval} getPopupContainer={()=>document.querySelector('.TabsWarp')}>
{item==="公开"?<span className={"edu-filter-btn edu-filter-btn-028d01 ml15 fl typestyle " + typesylename} >公开</span>:""} <span key={key}>
{item==="已开启补交"?<span className={"edu-filter-btn edu-filter-btn-028d01 ml15 fl typestyle "+ typesylename} >已开启补交</span>:""} {item==="公开"?<span className={"edu-filter-btn edu-filter-btn-028d01 ml15 fl typestyle " + typesylename} >公开</span>:""}
{item==="未开启补交"?<span className={"edu-filter-btn edu-filter-btn-CC317C ml15 fl typestyle "+ typesylename} >未开启补交</span>:""} {item==="已开启补交"?<span className={"edu-filter-btn edu-filter-btn-028d01 ml15 fl typestyle "+ typesylename} >已开启补交</span>:""}
{item==="匿名作品"?<span className={"edu-filter-btn edu-filter-btn-006B75 ml15 fl typestyle "+ typesylename} >匿名作品</span>:""} {item==="未开启补交"?<span className={"edu-filter-btn edu-filter-btn-CC317C ml15 fl typestyle "+ typesylename} >未开启补交</span>:""}
{item==="已选择"?<span className={"edu-filter-btn edu-filter-btn-EDEDED ml15 fl typestyle color666666 "+ typesylename} >已选择</span>:""} {item==="匿名作品"?<span className={"edu-filter-btn edu-filter-btn-006B75 ml15 fl typestyle "+ typesylename} >匿名作品</span>:""}
{item==="已结束"?<span className={"edu-filter-btn edu-filter-btn-EDEDED ml15 fl typestyle color666666 "+ typesylename} >已结束</span>:""} {item==="已选择"?<span className={"edu-filter-btn edu-filter-btn-EDEDED ml15 fl typestyle color666666 "+ typesylename} >已选择</span>:""}
{item==="提交中"?<span className={"edu-filter-btn edu-filter-btn-4CACFF ml15 fl typestyle "+ typesylename} >提交中</span>:""} {item==="已结束"?<span className={"edu-filter-btn edu-filter-btn-EDEDED ml15 fl typestyle color666666 "+ typesylename} >已结束</span>:""}
{item==="匿评中"?<span className={"edu-filter-btn edu-filter-btn-4CACFF ml15 fl typestyle "+ typesylename} >匿评中</span>:""} {item==="提交中"?<span className={"edu-filter-btn edu-filter-btn-4CACFF ml15 fl typestyle "+ typesylename} >提交中</span>:""}
{item==="申诉中"?<span className={"edu-filter-btn edu-filter-btn-4CACFF ml15 fl typestyle "+ typesylename} >申诉中</span>:""} {item==="匿评中"?<span className={"edu-filter-btn edu-filter-btn-4CACFF ml15 fl typestyle "+ typesylename} >匿评中</span>:""}
{item==="补交中"?<span className={"edu-filter-btn edu-filter-btn-4CACFF ml15 fl typestyle "+ typesylename} >补交中</span>:""} {item==="申诉中"?<span className={"edu-filter-btn edu-filter-btn-4CACFF ml15 fl typestyle "+ typesylename} >申诉中</span>:""}
{item==="评阅中"?<span className={"edu-filter-btn edu-filter-btn-4CACFF ml15 fl typestyle "+ typesylename} >评阅中</span>:""} {item==="补交中"?<span className={"edu-filter-btn edu-filter-btn-4CACFF ml15 fl typestyle "+ typesylename} >补交中</span>:""}
{item==="待选中"?<span className={"edu-filter-btn edu-filter-btn-4CACFF ml15 fl typestyle "+ typesylename} >待选中</span>:""} {item==="评阅中"?<span className={"edu-filter-btn edu-filter-btn-4CACFF ml15 fl typestyle "+ typesylename} >评阅中</span>:""}
{item==="交叉评阅中"?<span className={"edu-filter-btn edu-filter-btn-4CACFF ml15 fl typestyle "+ typesylename} >交叉评阅中</span>:""} {item==="待选中"?<span className={"edu-filter-btn edu-filter-btn-4CACFF ml15 fl typestyle "+ typesylename} >待选中</span>:""}
{item==="已开启交叉评阅"?<span className={"edu-filter-btn edu-filter-btn-E99695 ml15 fl typestyle "+ typesylename} >已开启交叉评阅</span>:""} {item==="交叉评阅中"?<span className={"edu-filter-btn edu-filter-btn-4CACFF ml15 fl typestyle "+ typesylename} >交叉评阅中</span>:""}
{item==="待确认"?<span className={"edu-filter-btn edu-filter-btn-5E5FB9 ml15 fl typestyle "+ typesylename} >待确认</span>:""} {item==="已开启交叉评阅"?<span className={"edu-filter-btn edu-filter-btn-E99695 ml15 fl typestyle "+ typesylename} >已开启交叉评阅</span>:""}
{item==="待处理"?<span className={"edu-filter-btn edu-filter-btn-5E5FB9 ml15 fl typestyle mr10 "+ typesylename} >待处理</span>:""} {item==="待确认"?<span className={"edu-filter-btn edu-filter-btn-5E5FB9 ml15 fl typestyle "+ typesylename} >待确认</span>:""}
{item==="未发布"?<span className={"edu-filter-btn edu-filter-btn-84B6EB ml15 fl typestyle "+ typesylename} >未发布</span>:""} {item==="待处理"?<span className={"edu-filter-btn edu-filter-btn-5E5FB9 ml15 fl typestyle mr10 "+ typesylename} >待处理</span>:""}
{item==="私有"?<span className={"edu-filter-btn edu-filter-btn-84B6EB ml15 fl typestyle "+ typesylename} >私有</span>:""} {item==="未发布"?<span className={"edu-filter-btn edu-filter-btn-84B6EB ml15 fl typestyle "+ typesylename} >未发布</span>:""}
{item==="未提交"?<span className={"edu-filter-btn edu-filter-btn-84B6EB ml15 fl typestyle "+ typesylename} >未提交</span>:""} {item==="私有"?<span className={"edu-filter-btn edu-filter-btn-84B6EB ml15 fl typestyle "+ typesylename} >私有</span>:""}
{item==="已确认"?<span className={"edu-filter-btn edu-filter-btn-FC2B6A ml15 fl typestyle "+ typesylename} >已确认</span>:""} {item==="未提交"?<span className={"edu-filter-btn edu-filter-btn-84B6EB ml15 fl typestyle "+ typesylename} >未提交</span>:""}
{item==="已截止"?<span className={"edu-filter-btn edu-filter-btn-FC2B6A ml15 fl typestyle "+ typesylename} >已截止</span>:""} {item==="已确认"?<span className={"edu-filter-btn edu-filter-btn-FC2B6A ml15 fl typestyle "+ typesylename} >已确认</span>:""}
</span> {item==="已截止"?<span className={"edu-filter-btn edu-filter-btn-FC2B6A ml15 fl typestyle "+ typesylename} >已截止</span>:""}
</Tooltip> </span>
) </Tooltip>
}) )
} })
</span> }
) </span>
} )
} }
export default CoursesListType; }
export default CoursesListType;
// let typelist=["公开",
// "已开启补交", // let typelist=["公开",
// "未开启补交", // "已开启补交",
// "匿名作品", // "未开启补交",
// "已选择", // "匿名作品",
// "已结束", // "已选择",
// "提交中", // "已结束",
// "匿评中", // "提交中",
// "申诉中", // "匿评中",
// "补交中", // "申诉中",
// "评阅中", // "补交中",
// "待选中", // "评阅中",
// "交叉评阅中", // "待选中",
// "已开启交叉评阅", // "交叉评阅中",
// "待确认", // "已开启交叉评阅",
// "待处理", // "待确认",
// "未发布", // "待处理",
// "私有", // "未发布",
// "未提交", // "私有",
// "已确认", // "未提交",
// "已截止", // "已确认",
// "已截止",
// ] // ]

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

@ -849,31 +849,31 @@ a.white-btn.use_scope-btn:hover{
.edu-filter-btn-028d01{ .edu-filter-btn-028d01{
/*border: 1px solid #ff6800;*/ /*border: 1px solid #ff6800;*/
/*color: #ff6800!important;*/ /*color: #ff6800!important;*/
background: #028d01; background: #028d01 !important;
} }
.edu-filter-btn-CC317C{ .edu-filter-btn-CC317C{
background:#CC317C; background:#CC317C !important;
} }
.edu-filter-btn-006B75{ .edu-filter-btn-006B75{
background:#006B75; background:#006B75 !important;
} }
.edu-filter-btn-E99695{ .edu-filter-btn-E99695{
background:#E99695; background:#E99695 !important;
} }
.edu-filter-btn-EDEDED{ .edu-filter-btn-EDEDED{
background:#EDEDED; background:#EDEDED !important;
} }
.edu-filter-btn-4CACFF{ .edu-filter-btn-4CACFF{
background:#4CACFF; background:#4CACFF !important;
} }
.edu-filter-btn-84B6EB{ .edu-filter-btn-84B6EB{
background:#84B6EB; background:#84B6EB !important;
} }
.edu-filter-btn-5E5FB9{ .edu-filter-btn-5E5FB9{
background:#5E5FB9; background:#5E5FB9 !important;
} }
.edu-filter-btn-FC2B6A{ .edu-filter-btn-FC2B6A{
background:#FC2B6A; background:#FC2B6A !important;
} }
.color666666{ .color666666{
color:#666666 !important; color:#666666 !important;

12
public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js
Unescape View File

@ -59,12 +59,12 @@ class GraduateTaskItem extends Component{
axios.get(url).then((result)=>{ axios.get(url).then((result)=>{
if(result.data.status===0){ if(result.data.status===0){
this.setState({ // this.setState({
Modalstype:true, // Modalstype:true,
Modalstopval:result.data.message, // Modalstopval:result.data.message,
cardsModalsavetype:this.cannerassocition, // cardsModalsavetype:this.cannerassocition,
loadtype:true // loadtype:true
}) // })
this.props.funlist() this.props.funlist()
} }

12
public/react/src/modules/courses/graduation/tasks/GraduationTasksappraise.js
Unescape View File

@ -135,7 +135,7 @@ class GraduationTasksappraise extends Component{
let category_id=this.props.match.params.category_id; let category_id=this.props.match.params.category_id;
let graduation_id=datalist===undefined?"":datalist.graduation_id; let graduation_id=datalist===undefined?"":datalist.graduation_id;
let task_id=datalist===undefined?"":datalist.task_id; let task_id=datalist===undefined?"":datalist.task_id;
console.log(datalist); // console.log(datalist);
return( return(
<React.Fragment> <React.Fragment>
@ -197,7 +197,7 @@ class GraduationTasksappraise extends Component{
<div className="edu-back-white"> <div className="edu-back-white">
<div className={"stud-class-set edu-back-white padding20-30"}> <div className={"stud-class-set edu-back-white padding20-30 bor-bottom-greyE"}>
<div className={"color-grey-6 h20 mb20"}> <div className={"color-grey-6 h20 mb20"}>
内容 内容
@ -249,8 +249,8 @@ class GraduationTasksappraise extends Component{
</div> </div>
{firelistdata===undefined?"":firelistdata.length===0?"":firelistdata.revise_attachments.length===0?"": {firelistdata===undefined?"":firelistdata.length===0?"":firelistdata.revise_attachments.length===0?"":
<div className={"stud-class-set bor-top-greyE padding20-30 edu-back-white"}> <div className={"stud-class-set bor-bottom-greyE padding20-30 edu-back-white"}>
<div className={"color-grey-6 mb10 bor-top-greyE"}> <div className={"color-grey-6 mb10 "}>
补交附件 补交附件
</div> </div>
<div className={"ml20"}> <div className={"ml20"}>
@ -291,7 +291,7 @@ class GraduationTasksappraise extends Component{
</div>} </div>}
{datalist&&datalist.project_info===undefined?"": {datalist&&datalist.project_info===undefined?"":
<div className={"stud-class-set edu-back-white padding20-30 bor-top-greyE"}> <div className={"stud-class-set edu-back-white padding20-30 bor-bottom-greyE"}>
<div className={"color-grey-6 mb10"}> <div className={"color-grey-6 mb10"}>
关联项目 关联项目
</div> </div>
@ -301,7 +301,7 @@ class GraduationTasksappraise extends Component{
</div>} </div>}
{/*{*/} {/*{*/}
{ datalist === undefined?"": datalist && datalist.task_type===undefined ?"" : datalist.task_type===1? "": datalist && datalist.work_members && datalist.work_members.length == 0 ?"": { datalist === undefined?"": datalist && datalist.task_type===undefined ?"" : datalist.task_type===1? "": datalist && datalist.work_members && datalist.work_members.length == 0 ?"":
<div className={"stud-class-set edu-back-white padding20-30 bor-top-greyE"} style={{height:"100%"}}> <div className={"stud-class-set edu-back-white padding20-30 bor-bottom-greyE"} style={{height:"100%"}}>
<div className={"color-grey-6 mb10"}> <div className={"color-grey-6 mb10"}>
其他组员 其他组员
</div> </div>

12
public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
Unescape View File

@ -544,12 +544,12 @@ class GraduationTaskssettinglist extends Component{
if(result.data.status===0){ if(result.data.status===0){
this.searchValue() this.searchValue()
this.setState({ // this.setState({
Modalstype:true, // Modalstype:true,
Modalstopval:result.data.message, // Modalstopval:result.data.message,
ModalSave:this.cannerassocition, // ModalSave:this.cannerassocition,
loadtype:true // loadtype:true
}) // })
} }
}).catch((error)=>{ }).catch((error)=>{

Write Preview
Loading…
Cancel
Save