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 7645300243 0ad94943af
commit d7b39e2887
15 changed files with 1396 additions and 1355 deletions
Show Stats Download Patch File Download Diff File

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

@ -22,6 +22,7 @@ class Associationmodel extends Component{
projects:undefined, projects:undefined,
projectvalue:undefined, projectvalue:undefined,
projectvaluetype:false, projectvaluetype:false,
searchtypes:false
} }
} }
@ -38,10 +39,10 @@ class Associationmodel extends Component{
search: search search: search
} }
}).then((result)=>{ }).then((result)=>{
console.log(result)
if(result.status===200){ if(result.status===200){
this.setState({ this.setState({
projects:result.data.projects projects:result.data.projects,
searchtypes:search===undefined&&result.data.projects.length==0?true:false
}) })
} }
@ -58,13 +59,11 @@ class Associationmodel extends Component{
goback=()=>{ goback=()=>{
this.props.funlist()
this.props.Cancel()
console.log(this.props)
this.setState({ this.setState({
Modalstype:false, Modalstype:false,
}) })
this.props.funlist()
this.props.Cancel()
} }
@ -80,13 +79,13 @@ class Associationmodel extends Component{
if(result.status===200){ if(result.status===200){
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,
ModalSave:this.goback, // ModalSave:this.goback,
loadtype:true // loadtype:true
}) // })
this.props.funlist() this.goback
} }
} }
@ -96,7 +95,9 @@ class Associationmodel extends Component{
}) })
} }
Saves=()=>{ Saves=()=>{
let {projectvalue}=this.state; let {projectvalue,searchtypes}=this.state
if(searchtypes===false){
if(projectvalue===undefined||projectvalue===""){ if(projectvalue===undefined||projectvalue===""){
this.setState({ this.setState({
projectvaluetype:true, projectvaluetype:true,
@ -114,30 +115,26 @@ class Associationmodel extends Component{
project_id: projectvalue project_id: projectvalue
} }
}).then((result)=>{ }).then((result)=>{
if(result.status===200){ if(result.status===200){
if(result.data.is_relate===false){ if(result.data.is_relate===false){
this.setSaves() this.setSaves()
}else{ }else{
this.setState({ this.setState({
Modalstype:true, Modalstype:true,
Modalstopval:"该项目已被"+result.data.relate_user+"关联", Modalstopval:"该项目已被"+result.data.relate_user+"关联",
ModalSave:this.ModalSave, ModalSave:this.ModalSave,
loadtype:true loadtype:true
}) })
} }
} }
}).catch((error)=>{ }).catch((error)=>{
console.log(error) console.log(error)
}) })
} }else{
this.goback()
}
}
onChange = (e) => { onChange = (e) => {
@ -190,7 +187,7 @@ class Associationmodel extends Component{
destroyOnClose={true} destroyOnClose={true}
> >
<div className="task-popup-content"> <div className="task-popup-content">
<p className="task-popup-text-center font-16"> {this.state.searchtypes===false? <p className="task-popup-text-center font-16">
<Search <Search
placeholder="请输入项目名称进行搜索" placeholder="请输入项目名称进行搜索"
@ -201,31 +198,55 @@ class Associationmodel extends Component{
autoComplete="off" autoComplete="off"
></Search> ></Search>
</p> </p>:""}
<style>
<div className={"Association mb20"}> {
`
.project_namestyle{
width: 470px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
`
}
</style>
{this.state.searchtypes===false?<div className={"Association mb20"} style={{
paddingLeft:'0px'
}}>
<RadioGroup onChange={this.onChange} value={projectvalue}> <RadioGroup onChange={this.onChange} value={projectvalue}>
{projects&&projects.map((item,key)=>{ {projects&&projects.map((item,key)=>{
return( return(
<div key={key} style={{ <div key={key} style={{
width: '375px',
height: '30px' height: '30px'
}}> }}>
<Radio value={item.project_id} className="fl "></Radio> <Radio value={item.project_id} className="fl "></Radio>
<div className={"fl ml5"}>{item.project_name}</div> <div className={"fl ml5 project_namestyle"}>{item.project_name}</div>
</div> </div>
) )
})} })}
</RadioGroup> </RadioGroup>
</div> </div>:
<div style={{
paddingLeft:'0px'
}}>
<div style={{
margin:'0px 20%'
}}>
你当前尚未管理任何项目，请先 <span><a style={{color:'#1890ff'}} href={"/projects/new"}>创建项目</a> </span>再关联
</div>
</div>}
{projectvaluetype===true?<span className={"color-red ml20 "}>请先选择项目</span>:""} {projectvaluetype===true?<span className={"color-red ml20 "}>请先选择项目</span>:""}
<div className="clearfix mt30 edu-txt-center mb10"> <div className="clearfix mt25 edu-txt-center mb10">
<a className="task-btn color-white mr80" onClick={this.props.Cancel}>取消</a> <a className="task-btn color-white mr80" onClick={this.props.Cancel}>取消</a>
<a className="task-btn task-btn-orange" onClick={this.Saves}>确认</a> <a className="task-btn task-btn-orange" onClick={this.Saves}>确认</a>
</div> </div>

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

@ -1314,8 +1314,8 @@ a.white-btn.use_scope-btn:hover{
.Association{ .Association{
width: 100%; width: 100%;
height: 400px; height: 240px;
padding: 20px; margin-top: 14px;
overflow: auto; overflow: auto;
} }

20
public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js
Unescape View File

@ -80,7 +80,8 @@ class GraduationTasksSubmitedit extends Component{
let workId=this.props.match.params.work_Id; let workId=this.props.match.params.work_Id;
let {workslist}=this.state let {workslist}=this.state
let task_id=workslist&&workslist.task_id; let task_id=workslist&&workslist.task_id;
window.location.href="/courses/"+coursesId+"/graduation_tasks/"+task_id+"/"+workId+"/works/edit"; // window.location.href="/courses/"+coursesId+"/graduation_tasks/"+task_id+"/"+workId+"/works/edit";
window.location.href="/courses/"+coursesId+"/graduation_tasks/"+workId+"/appraise";
} }
handleSubmit=(e) => { handleSubmit=(e) => {
@ -248,7 +249,7 @@ class GraduationTasksSubmitedit extends Component{
onAttachmentRemove = (file) => { onAttachmentRemove = (file) => {
let {attachments,fileList}=this.state; let {attachments,fileList}=this.state;
const url = `/attachments/${file.uid===undefined?file.id:file.uid}.json` const url = `/attachments/${file}.json`
axios.delete(url, { axios.delete(url, {
}) })
.then((response) => { .then((response) => {
@ -592,7 +593,9 @@ class GraduationTasksSubmitedit extends Component{
{workslist&&workslist.task_type===1?"": {workslist&&workslist.task_type===1?"":
<div className="stud-class-set pd20 coursenavbox edu-back-white"> <div className="stud-class-set pd20 coursenavbox edu-back-white"
style={{borderTop:'1px solid #ccc'}}
>
<Form.Item <Form.Item
label="小组成员" label="小组成员"
@ -632,6 +635,7 @@ class GraduationTasksSubmitedit extends Component{
<div className={"members fl"} <div className={"members fl"}
style={{paddingLeft: '9px'}}
onScroll={this.contentViewScroll}> onScroll={this.contentViewScroll}>
<CheckboxGroup value={task_status} onChange={this.funtaskstatus} style={{ paddingTop: '4px'}}> <CheckboxGroup value={task_status} onChange={this.funtaskstatus} style={{ paddingTop: '4px'}}>
@ -653,9 +657,7 @@ class GraduationTasksSubmitedit extends Component{
}) })
} }
disabled={item.commit_status===true?true:false} className="fl "></Checkbox> disabled={item.commit_status===true?true:false} className="fl "></Checkbox>
<Tooltip placement="bottom" title={item.user_name}> <div className={"fl ml5 fonthidden width87"} style={{width: '70px'}} title={item.user_name}>{item.user_name}</div>
<div className={"fl ml5 fonthidden width87"} style={{width: '70px'}}>{item.user_name}</div>
</Tooltip>
<div className={"fl ml5 fonthidden width87 color-grey-9"} style={{width: '70px'}}>{item.group_name}</div> <div className={"fl ml5 fonthidden width87 color-grey-9"} style={{width: '70px'}}>{item.group_name}</div>
<div className={"fl ml5 color-grey-9 fonthidden width87"} style={{width: '70px'}}>{item.student_id}</div> <div className={"fl ml5 color-grey-9 fonthidden width87"} style={{width: '70px'}}>{item.student_id}</div>
<div className={"fl ml20"}>{item.commit_status===false?<span className={"color-orange"}>已提交</span> :""}</div> <div className={"fl ml20"}>{item.commit_status===false?<span className={"color-orange"}>已提交</span> :""}</div>
@ -680,12 +682,10 @@ class GraduationTasksSubmitedit extends Component{
height: '30px', height: '30px',
display:item.user_name===undefined?"none":"" display:item.user_name===undefined?"none":""
}}> }}>
<Tooltip placement="bottom" title={item.user_name}> <div className={"fl ml5 fonthidden width87"} style={{width: '50px'}} title={item.user_name}>{item.user_name}</div>
<div className={"fl ml5 fonthidden width87"} style={{width: '50px'}}>{item.user_name}</div>
</Tooltip>
<div className={"fl ml5 fonthidden width87 color-grey-9"}>{item.group_name}</div> <div className={"fl ml5 fonthidden width87 color-grey-9"}>{item.group_name}</div>
<div className={"fl ml5 color-grey-9 fonthidden width87"}>{item.student_id}</div> <div className={"fl ml5 color-grey-9 fonthidden width87"}>{item.student_id}</div>
{key>0?<div className={"fl ml20"}><i className={"iconfont icon-shanchudiao fl "} style={{marginTop:'-4px'}} onClick={()=>this.delecttask_status(item.user_id)}></i></div>:""} {key>0?<div className={"fr ml20"}><i className={"iconfont icon-shanchudiao fl color-grey-9"} style={{marginTop:'-4px'}} onClick={()=>this.delecttask_status(item.user_id)}></i></div>:""}
</div> </div>
) )
})} })}

15
public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js
Unescape View File

@ -550,7 +550,9 @@ render(){
{workslist&&workslist.task_type===1?"": {workslist&&workslist.task_type===1?"":
<div className="stud-class-set pd20 coursenavbox edu-back-white"> <div className="stud-class-set pd20 coursenavbox edu-back-white"
style={{borderTop:'1px solid #ccc'}}
>
<Form.Item <Form.Item
label="小组成员" label="小组成员"
@ -605,6 +607,7 @@ render(){
<div className={"ml20"} style={{width:"100%"}}> <div className={"ml20"} style={{width:"100%"}}>
<div className={"members fl"} <div className={"members fl"}
style={{paddingLeft: '9px'}}
onScroll={this.contentViewScroll}> onScroll={this.contentViewScroll}>
<CheckboxGroup value={task_status} onChange={this.funtaskstatus} style={{ paddingTop: '4px'}}> <CheckboxGroup value={task_status} onChange={this.funtaskstatus} style={{ paddingTop: '4px'}}>
{memberslist===undefined?"":memberslist.members.length===0? {memberslist===undefined?"":memberslist.members.length===0?
@ -626,9 +629,7 @@ render(){
}) })
} }
disabled={item.commit_status===true?true:false} className="fl "></Checkbox> disabled={item.commit_status===true?true:false} className="fl "></Checkbox>
<Tooltip placement="bottom" title={item.user_name}> <div className={"fl ml5 fonthidden width87"} title={item.user_name} >{item.user_name}</div>
<div className={"fl ml5 fonthidden width87"}>{item.user_name}</div>
</Tooltip>
<div className={"fl ml5 fonthidden width87 color-grey-9"} title={item.group_name}>{item.group_name}</div> <div className={"fl ml5 fonthidden width87 color-grey-9"} title={item.group_name}>{item.group_name}</div>
<div className={"fl ml5 color-grey-9 fonthidden width87"} title={item.student_id}>{item.student_id}</div> <div className={"fl ml5 color-grey-9 fonthidden width87"} title={item.student_id}>{item.student_id}</div>
<div className={"fl ml20"}>{item.commit_status===true?<span className={"color-orange"}>已提交</span> :""}</div> <div className={"fl ml20"}>{item.commit_status===true?<span className={"color-orange"}>已提交</span> :""}</div>
@ -657,12 +658,10 @@ render(){
height: '30px', height: '30px',
display:item.user_name===undefined?"none":"" display:item.user_name===undefined?"none":""
}}> }}>
<Tooltip placement="bottom" title={item.user_name}> <div className={"fl ml5 fonthidden width87"} title={item.user_name}>{item.user_name}</div>
<div className={"fl ml5 fonthidden width87"}>{item.user_name}</div>
</Tooltip>
<div className={"fl ml5 fonthidden width87 color-grey-9"}>{item.group_name}</div> <div className={"fl ml5 fonthidden width87 color-grey-9"}>{item.group_name}</div>
<div className={"fl ml5 color-grey-9 fonthidden width87"}>{item.student_id}</div> <div className={"fl ml5 color-grey-9 fonthidden width87"}>{item.student_id}</div>
{key>0?<div className={"fl ml20"}><i className={"iconfont icon-shanchudiao fl "} style={{marginTop:'-4px'}} onClick={()=>this.delecttask_status(item.user_id)}></i></div>:""} {key>0?<div className={"fr ml20"}><i className={"iconfont icon-shanchudiao fl color-grey-9 "} style={{marginTop:'-4px'}} onClick={()=>this.delecttask_status(item.user_id)}></i></div>:""}
</div> </div>
) )

8
public/react/src/modules/courses/graduation/tasks/GraduationTasksnew.js
Unescape View File

@ -309,12 +309,10 @@ class GraduationTasksnew extends Component {
<span className={"newcoursestitle"}>（选择确认后，无法修改）</span> <span className={"newcoursestitle"}>（选择确认后，无法修改）</span>
</Form.Item> </Form.Item>
<Form.Item label="任务标题" > <Form.Item label="任务标题" >
{getFieldDecorator('name', { {getFieldDecorator('name', {
rules: [{required: true, message: "不能为空"}], rules: [{ required: true, message: "请输入标题" }],
})(<Input placeholder="请输入任务名称，最大限制60个字符" value={title_value} onInput={this.changeTitle} })(<Input placeholder="请输入任务名称，最大限制60个字符" value={title_value} onInput={this.changeTitle} className="searchView searchViewAfter mb20" style={{"width":"100%"}} maxLength="60" addonAfter={String(title_num)}/>)}
className="searchView searchViewAfter mb20 h40" style={{"width": "100%"}} maxLength="60"
addonAfter={String(title_num)}/>)}
</Form.Item> </Form.Item>
<input type="hidden" id='nametypes'/> <input type="hidden" id='nametypes'/>
</div> </div>

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

@ -560,6 +560,7 @@ class GraduationTaskssettinglist extends Component{
AssociationItems=()=>{ AssociationItems=()=>{
this.setState({ this.setState({
visibles:true visibles:true
}) })
@ -1264,8 +1265,6 @@ class GraduationTaskssettinglist extends Component{
} }
} }
console.log(columns)
return( return(
<React.Fragment> <React.Fragment>
@ -1346,13 +1345,15 @@ class GraduationTaskssettinglist extends Component{
/>:""} />:""}
{/*关联项目*/} {/*关联项目*/}
{visibles===true?<Associationmodel {visibles===true?
<Associationmodel
modalname={"关联项目"} modalname={"关联项目"}
visible={visibles} visible={visibles}
Cancel={this.Cancel} Cancel={()=>this.Cancel()}
taskid={taskslistdata&&taskslistdata.task_id} taskid={taskslistdata&&taskslistdata.task_id}
funlist={this.searchValue()} funlist={()=>this.searchValue()}
/>:""} />
:""}
{taskslistdata&&taskslistdata? {taskslistdata&&taskslistdata?
// 教师列表 // 教师列表
@ -1572,13 +1573,13 @@ class GraduationTaskssettinglist extends Component{
<span className="mr15 color-grey9"> <span className="mr15 color-grey9">
<span className={"color-orange"}>{taskslistdata&&taskslistdata.uncommit_count} <span className={"color-orange"}>{taskslistdata&&taskslistdata.uncommit_count}
</span> 未交</span> </span> 未交</span>
<Tooltip title={taskslistdata&&taskslistdata.left_time.status} placement="bottom"> {taskslistdata&&taskslistdata.left_time.status===null?"":<Tooltip title={taskslistdata&&taskslistdata.left_time.status} placement="bottom">
<span className="mr15 color-grey9"> <span className="mr15 color-grey9">
{taskslistdata&&taskslistdata.left_time.status} : {taskslistdata&&taskslistdata.left_time.status} :
<span className={"ml10 color-orange"}> <span className={"ml10 color-orange"}>
{taskslistdata&&taskslistdata.left_time.time}</span> {taskslistdata&&taskslistdata.left_time.time}</span>
</span> </span>
</Tooltip> </Tooltip>}
</div> </div>
:""} :""}
@ -1833,13 +1834,13 @@ class GraduationTaskssettinglist extends Component{
<span className="mr15 color-grey9"> <span className="mr15 color-grey9">
<span className={"color-orange"}>{taskslistdata&&taskslistdata.uncommit_count} <span className={"color-orange"}>{taskslistdata&&taskslistdata.uncommit_count}
</span> 未交</span> </span> 未交</span>
<Tooltip title={taskslistdata&&taskslistdata.left_time.status} placement="bottom"> {taskslistdata&&taskslistdata.left_time.status===null?"":<Tooltip title={taskslistdata&&taskslistdata.left_time.status} placement="bottom">
<span className="mr15 color-grey9"> <span className="mr15 color-grey9">
{taskslistdata&&taskslistdata.left_time.status} : {taskslistdata&&taskslistdata.left_time.status} :
<span className={"ml10 color-orange"}> <span className={"ml10 color-orange"}>
{taskslistdata&&taskslistdata.left_time.time}</span> {taskslistdata&&taskslistdata.left_time.time}</span>
</span> </span>
</Tooltip> </Tooltip>}
</div> </div>
:""} :""}

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

@ -91,6 +91,7 @@ class Listofworks extends Component {
unlimited: 0, unlimited: 0,
unlimitedtwo: 1, unlimitedtwo: 1,
code_review: false, code_review: false,
boolgalist:false,
columns: [ columns: [
{ {
title: '序号', title: '序号',
@ -778,7 +779,7 @@ class Listofworks extends Component {
// console.log(JSON.stringify(result)) // console.log(JSON.stringify(result))
let datalist = []; let datalist = [];
var game_list = result.data.game_list var game_list = result.data.game_list
var boolgalist=false;
for (var i = 0; i < game_list.length; i++) { for (var i = 0; i < game_list.length; i++) {
datalist.push({ datalist.push({
@ -789,6 +790,10 @@ class Listofworks extends Component {
complete_status: game_list[i].complete_status, complete_status: game_list[i].complete_status,
}) })
if(game_list[i].complete_status === 1){
boolgalist=true;
}
} }
// console.log("viewtraining"); // console.log("viewtraining");
// console.log(datalist); // console.log(datalist);
@ -796,7 +801,8 @@ class Listofworks extends Component {
this.setState({ this.setState({
viewtrainingdata: result.data, viewtrainingdata: result.data,
visibles: true, visibles: true,
game_list: datalist game_list: datalist,
boolgalist:boolgalist,
}) })
} }
}).catch((error) => { }).catch((error) => {
@ -1001,7 +1007,7 @@ class Listofworks extends Component {
render() { render() {
// console.log("Listofworks.js000") // console.log("Listofworks.js000")
let {columns, page, limit, course_groupysls, course_groupyslstwo, unlimited, unlimitedtwo, loadingstate, viewtrainingdata, game_list, data, course_group_info, order, teacherdata, task_status, checkedValuesine, searchtext, teacherlist, visible, visibles, jobsettingsdata} = this.state; let {columns, page, boolgalist,limit, course_groupysls, course_groupyslstwo, unlimited, unlimitedtwo, loadingstate, viewtrainingdata, game_list, data, course_group_info, order, teacherdata, task_status, checkedValuesine, searchtext, teacherlist, visible, visibles, jobsettingsdata} = this.state;
// //
// console.log(teacherdata&&teacherdata.shixun_identifier) // console.log(teacherdata&&teacherdata.shixun_identifier)
// console.log(course_group_info) // console.log(course_group_info)
@ -1045,6 +1051,7 @@ class Listofworks extends Component {
viewtrainingdata={viewtrainingdata} viewtrainingdata={viewtrainingdata}
game_list={game_list} game_list={game_list}
visible={visibles} visible={visibles}
boolgalist={boolgalist}
Cancel={() => this.cancelModulationModels()} Cancel={() => this.cancelModulationModels()}
/> />
@ -1080,12 +1087,12 @@ class Listofworks extends Component {
<span className="color-grey-9 fl ml3 mr3">&gt;</span> <span className="color-grey-9 fl ml3 mr3">&gt;</span>
<ActionBtn <ActionBtn
className=" btn colorgrey fl hovercolorblue " className=" btn colorgrey fl hovercolorblue "
to={`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${jobsettingsdata === undefined ? "" : jobsettingsdata.data.category.category_id}`}>{jobsettingsdata === undefined ? "" : jobsettingsdata.data.category.category_name}</ActionBtn> to={`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${jobsettingsdata === undefined ? "" : jobsettingsdata.data.category.category_id===undefined?"":jobsettingsdata.data.category.category_id}`}>{jobsettingsdata === undefined ? "" : jobsettingsdata.data.category.category_name}</ActionBtn>
<span className="color-grey-9 fl ml3 mr3">&gt;</span> <span className="color-grey-9 fl ml3 mr3">&gt;</span>
<WordsBtn className="fl">作业详情</WordsBtn> <WordsBtn className="fl">作业详情</WordsBtn>
</p> </p>
</div> </div>
<div className="educontent mb30"> <div className="educontent mb30" style={{width:"1250px"}}>
<p className=" fl color-black summaryname"> <p className=" fl color-black summaryname">
{teacherdata === undefined ? "" : teacherdata.homework_name} {teacherdata === undefined ? "" : teacherdata.homework_name}
</p> </p>
@ -1101,7 +1108,7 @@ class Listofworks extends Component {
</div> </div>
<div className="edu-back-white"> <div className="edu-back-white" style={{width:"1250px"}}>
<div className="stud-class-set bor-bottom-greyE "> <div className="stud-class-set bor-bottom-greyE ">
<div className=" clearfix edu-back-white poll_list"> <div className=" clearfix edu-back-white poll_list">
<Link className="active" <Link className="active"
@ -1164,7 +1171,7 @@ class Listofworks extends Component {
</CheckboxGroup> </CheckboxGroup>
{/*请输入姓名或学号搜索*/} {/*请输入姓名或学号搜索*/}
<div className="fr mr5 search-new" style={{marginBottom: '1px'}}> <div className="fr mr5 search-newysl" style={{marginBottom: '1px'}}>
<Search <Search
placeholder="请输入姓名或学号搜索" placeholder="请输入姓名或学号搜索"
id="subject_search_input" id="subject_search_input"

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

@ -688,7 +688,7 @@ class Listofworksstudentone extends Component {
<WordsBtn className="fl">作业详情</WordsBtn> <WordsBtn className="fl">作业详情</WordsBtn>
</p> </p>
</div> </div>
<div className="educontent mb30"> <div className="educontent mb30" style={{width:"1250px"}}>
<p className=" fl color-black summaryname"> <p className=" fl color-black summaryname">
{teacherdata === undefined ? "" : teacherdata.homework_name} {teacherdata === undefined ? "" : teacherdata.homework_name}
</p> </p>
@ -696,11 +696,11 @@ class Listofworksstudentone extends Component {
typelist={teacherdata === undefined ? [""] : teacherdata.homework_status} typelist={teacherdata === undefined ? [""] : teacherdata.homework_status}
/> />
<a className="color-grey-9 fr font-16 summaryname ml20 mr20" <a className="color-grey-9 fr font-16 summaryname ml20 mr20"
href={`/courses/${this.state.props.match.params.coursesId}/${this.state.shixuntypes}/${jobsettingsdata === undefined ? "" :jobsettingsdata.data.category.category_id}`}>返回</a> href={`/courses/${this.state.props.match.params.coursesId}/${this.state.shixuntypes}/${jobsettingsdata === undefined ? "" :jobsettingsdata.data.category.category_id===undefined?"":jobsettingsdata.data.category.category_id}`}>返回</a>
<p className="color-grey-9 fr font-16"></p> <p className="color-grey-9 fr font-16"></p>
</div> </div>
<div className="edu-back-white"> <div className="edu-back-white" style={{width:"1250px"}}>
<div className="stud-class-set bor-bottom-greyE "> <div className="stud-class-set bor-bottom-greyE ">
<div className=" clearfix edu-back-white poll_list"> <div className=" clearfix edu-back-white poll_list">
<Link className="active" <Link className="active"

198
public/react/src/modules/courses/shixunHomework/TraineetraininginformationModal.js
Unescape View File

@ -36,10 +36,10 @@ class TraineetraininginformationModal extends Component {
props: this.props, props: this.props,
userids: this.props.userids, userids: this.props.userids,
game_list:this.props.game_list, game_list:this.props.game_list,
gline:0, boolgalist:this.props.boolgalist,
}) })
// console.log("TraineetraininginformationModal") // console.log("TraineetraininginformationModal")
// console.log(this.props) // console.log(this.props)
} }
@ -51,123 +51,133 @@ class TraineetraininginformationModal extends Component {
// this.seacthdata(); // this.seacthdata();
} }
// 设置数据 LimitNumber=(txt)=> {
// seacthdata = () => { var str = txt;
// if(str.length>25){
// console.log(datalist) str = str.substring(0,25)+"......"
// } }
return str;
}
render() { render() {
const columns = [ var columns;
if(this.props.boolgalist === true) {
columns = [
{ {
title: '关卡', title: '关卡',
dataIndex: 'number', dataIndex: 'number',
key: 'number', key: 'number',
width: 92,
align: "center", align: "center",
render: (text, record) => ( render: (text, record) => (
<span > <span>
<a style={{"color":'#07111B', "text-align": "center"}}>{record.number}</a> <a style={{"color": '#07111B', "text-align": "center"}}>{record.number}</a>
</span> </span>
), ),
}, },
{ {
title: '完成时间', title: '完成时间',
dataIndex: 'name', dataIndex: 'name',
key: 'name', key: 'name',
width: 178, width: 178,
align: "center", align: "center",
render: (text, record) => ( render: (text, record) => (
<span > <span>
<a style={{"color":'#989898', "text-align": "center"}} >{record.name==='Invalid date'?"--":record.name}</a> <a style={{
"color": '#989898',
"text-align": "center"
}}>{record.name === 'Invalid date' ? "--" : record.name}</a>
</span> </span>
), ),
}, },
{ {
title: '耗时', title: '',
dataIndex: 'stduynumber', dataIndex: 'complete_status',
key: 'stduynumber', key: 'complete_status',
align: "center", width: 100,
render: (text, record) => ( align: "center",
<span> render: (text, record) => (
<a style={{"color":'#989898', "text-align": "center"}}>{record.stduynumber}</a> <span>
{record.complete_status === 2 ? <img src={delay}/> : record.complete_status === 3 ?
<img src={invalid}/> : ""}
</span> </span>
), ),
}, },
{ {
title: '经验值', title: '耗时',
key: 'classroom', dataIndex: 'stduynumber',
dataIndex: 'classroom', key: 'stduynumber',
align: "center", width: 92,
render: (text, record) => ( align: "center",
<span> render: (text, record) => (
<a style={{"color":'#29BD8B', "text-align": "center"}}>{record.classroom}</a> <span>
<a style={{"color": '#989898', "text-align": "center"}}>{record.stduynumber}</a>
</span> </span>
), ),
} },
];
const columnss = [
{ {
title: '关卡', title: '经验值',
dataIndex: 'number', key: 'classroom',
key: 'number',
width: 92, width: 92,
dataIndex: 'classroom',
align: "center", align: "center",
render: (text, record) => ( render: (text, record) => (
<span > <span>
<a style={{"color": '#29BD8B', "text-align": "center"}}>{record.classroom}</a>
</span>
),
}
]
}
else {
columns = [
{
title: '关卡',
dataIndex: 'number',
key: 'number',
align: "center",
render: (text, record) => (
<span >
<a style={{"color":'#07111B', "text-align": "center"}}>{record.number}</a> <a style={{"color":'#07111B', "text-align": "center"}}>{record.number}</a>
</span> </span>
), ),
}, },
{ {
title: '完成时间', title: '完成时间',
dataIndex: 'name', dataIndex: 'name',
key: 'name', key: 'name',
width: 178, width: 178,
align: "center", align: "center",
render: (text, record) => ( render: (text, record) => (
<span > <span >
<a style={{"color":'#989898', "text-align": "center"}} >{record.name==='Invalid date'?"--":record.name}</a> <a style={{"color":'#989898', "text-align": "center"}} >{record.name==='Invalid date'?"--":record.name}</a>
</span> </span>
), ),
}, },
{ {
title: '', title: '耗时',
dataIndex: 'complete_status', dataIndex: 'stduynumber',
key: 'complete_status', key: 'stduynumber',
width: 100, align: "center",
align: "center", render: (text, record) => (
render: (text, record) => ( <span>
<span>
{record.complete_status===2?<img src={delay}/>:record.complete_status===3?<img src={invalid}/>:""}
</span>
),
},
{
title: '耗时',
dataIndex: 'stduynumber',
key: 'stduynumber',
width: 92,
align: "center",
render: (text, record) => (
<span>
<a style={{"color":'#989898', "text-align": "center"}}>{record.stduynumber}</a> <a style={{"color":'#989898', "text-align": "center"}}>{record.stduynumber}</a>
</span> </span>
), ),
}, },
{ {
title: '经验值', title: '经验值',
key: 'classroom', key: 'classroom',
width: 92, dataIndex: 'classroom',
dataIndex: 'classroom', align: "center",
align: "center", render: (text, record) => (
render: (text, record) => ( <span>
<span>
<a style={{"color":'#29BD8B', "text-align": "center"}}>{record.classroom}</a> <a style={{"color":'#29BD8B', "text-align": "center"}}>{record.classroom}</a>
</span> </span>
), ),
}
]
} }
];
return ( return (
<div> <div>
<Modal <Modal
@ -181,7 +191,7 @@ class TraineetraininginformationModal extends Component {
<div style={{width:"100%" }}className="login_register_content" > <div style={{width:"100%" }}className="login_register_content" >
<div style={{"width": "100%","text-align": "left","clear": "both"}}> <div style={{"width": "100%","text-align": "left","clear": "both"}}>
<div className="mt5 fl" > <div className="mt5 fl" >
<span style={{"text-align": "left"}}>{this.props.viewtrainingdata === undefined ? "" : this.props.viewtrainingdata.shixun_name}</span> <span style={{"text-align": "left"}}>{this.props.viewtrainingdata === undefined ? "" : this.LimitNumber(this.props.viewtrainingdata.shixun_name)}</span>
<span className="ml10 " style={{"text-align": "left","color":'#29BD8B'}} >经验值：<span style={{"color":'#29BD8B'}}> {this.props.viewtrainingdata === undefined ? "" : this.props.viewtrainingdata.shixun_score}</span></span> <span className="ml10 " style={{"text-align": "left","color":'#29BD8B'}} >经验值：<span style={{"color":'#29BD8B'}}> {this.props.viewtrainingdata === undefined ? "" : this.props.viewtrainingdata.shixun_score}</span></span>
</div> </div>
{/*<Button type="primary" className="ml30" >实训报告</Button>*/} {/*<Button type="primary" className="ml30" >实训报告</Button>*/}

439
public/react/src/modules/forums/Post.css
Unescape View File

@ -1,220 +1,221 @@
/*MemoDetail --------------------------------- START */ /*MemoDetail --------------------------------- START */
.educontent { .educontent {
margin-bottom: 20px; margin-bottom: 20px;
} }
/* 左侧区域最小高度*/
#forum_index_list { /* 左侧区域最小高度*/
min-height: 400px; #forum_index_list {
position: relative; min-height: 400px;
} position: relative;
.noMemosTip { }
position: absolute; .noMemosTip {
right: 10px; position: absolute;
top: 58px; right: 10px;
z-index: 999; top: 58px;
} z-index: 999;
#forum_list { }
background: #f9f9f9; #forum_list {
} background: #f9f9f9;
#forum_list .return_btn { }
line-height: 38px; #forum_list .return_btn {
/* margin-right: 15px; */ line-height: 38px;
font-size: 14px; /* margin-right: 15px; */
cursor: pointer; font-size: 14px;
} cursor: pointer;
#forum_list .return_btn.no_mr { }
margin-right: -16px; #forum_list .return_btn.no_mr {
} margin-right: -16px;
div#forum_list>div { }
background: #fff; div#forum_list>div {
} background: #fff;
.memoContent img { }
max-width: 815px; .memoContent img {
} max-width: 815px;
.memoReplies { }
position: relative; .memoReplies {
margin-top: 8px; position: relative;
} margin-top: 8px;
.memoReplies .-fit { }
position: static; .memoReplies .-fit {
} position: static;
.replies_count { }
margin-left: 12px; .replies_count {
} margin-left: 12px;
.replies_count .label { }
color: #666666; .replies_count .label {
} color: #666666;
.replies_count .count { }
color: #999999; .replies_count .count {
margin-left: 10px; color: #999999;
} margin-left: 10px;
}
.memoMore {
padding-top: 10px; .memoMore {
height: 50px; padding-top: 10px;
line-height: 50px; height: 50px;
text-align: center; line-height: 50px;
color: rgba(69,155,230,1); text-align: center;
cursor: pointer; color: rgba(69,155,230,1);
position: relative; cursor: pointer;
} position: relative;
.memoMore .writeCommentBtn{ }
position: absolute; .memoMore .writeCommentBtn{
right: 0px; position: absolute;
color: #666666; right: 0px;
top: 15px; color: #666666;
} top: 15px;
.memoMore .writeCommentBtn:hover { }
color: #4DACFF; .memoMore .writeCommentBtn:hover {
} color: #4DACFF;
/*使用md編輯器用为子回复时，宽度会变*/ }
.panel-comment_item .comment_orig_content { /*使用md編輯器用为子回复时，宽度会变*/
width: 705px; .panel-comment_item .comment_orig_content {
} width: 705px;
}
.iconfont.icon-xiazai {
font-size: 22px!important; .iconfont.icon-xiazai {
margin-right: 6px; font-size: 22px!important;
} margin-right: 6px;
/* MemoDetail --------------------------------- END */ }
/* MemoDetail --------------------------------- END */
/* PostItem --------------------------------- START */
.forum_table_item { /* PostItem --------------------------------- START */
padding-left: 20px; .forum_table_item {
} padding-left: 20px;
/* 置顶 */ }
.forum_table_item .btn-top { /* 置顶 */
border-radius: 11px; .forum_table_item .btn-top {
padding: 0px 6px; border-radius: 11px;
background: #FF4343; padding: 0px 6px;
background: #FF4343;
}
}
/* 管理员操作 */
.edu-position-hide { /* 管理员操作 */
position: absolute; .edu-position-hide {
top: 15px; position: absolute;
left: -20px; top: 15px;
box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5); left: -20px;
background: #fff; box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5);
z-index: 1001; background: #fff;
padding: 5px 0; z-index: 1001;
z-index: 999999; padding: 5px 0;
} z-index: 999999;
.edu-position-hide li a:hover { }
background: #4CACFF; .edu-position-hide li a:hover {
color: #fff; background: #4CACFF;
} color: #fff;
.edu-position-hidebox>a:link{ }
color: #4CACFF; .edu-position-hidebox>a:link{
} color: #4CACFF;
.edu-position-hidebox:hover .edu-position-hide { }
display: block; .edu-position-hidebox:hover .edu-position-hide {
} display: block;
.edu-position-hide li a { }
display: inline-block; .edu-position-hide li a {
height: 30px; display: inline-block;
width: 100px; height: 30px;
line-height: 30px; width: 100px;
text-align: center; line-height: 30px;
font-size: 12px!important; text-align: center;
} font-size: 12px!important;
/* PostItem --------------------------------- END */ }
/* PostItem --------------------------------- END */
/* MemoNew --------------------------------- START */
/* MemoNew --------------------------------- START */
#attachments_fields div.ui-progressbar {
width: 120px; #attachments_fields div.ui-progressbar {
height: 10px; width: 120px;
margin: 2px 0 -2px 8px; height: 10px;
display: inline-block; margin: 2px 0 -2px 8px;
} display: inline-block;
.ui-widget-header { }
border: 1px solid #4CACFF; .ui-widget-header {
background: #4CACFF; border: 1px solid #4CACFF;
} background: #4CACFF;
.iconfont.icon-fujian { }
color: #29BD8B .iconfont.icon-fujian {
} color: #29BD8B
}
/* rc-select样式覆写*/
.ecSelect { /* rc-select样式覆写*/
width: 300px; .ecSelect {
} width: 300px;
.ecSelect .rc-select-selection { }
height: 40px; .ecSelect .rc-select-selection {
} height: 40px;
.ecSelect .rc-select-search--inline .rc-select-search__field { }
padding-top: 6px; .ecSelect .rc-select-search--inline .rc-select-search__field {
} padding-top: 6px;
.ecSelect .rc-select-selection--single .rc-select-selection-selected-value }
, .ecSelect .rc-select-selection__placeholder { .ecSelect .rc-select-selection--single .rc-select-selection-selected-value
top: 6px; , .ecSelect .rc-select-selection__placeholder {
top: 6px;
}
.ecSelect .rc-select-arrow { }
top: 6px; .ecSelect .rc-select-arrow {
} top: 6px;
.defalutCancelbtn { }
cursor: pointer; .defalutCancelbtn {
} cursor: pointer;
.defalutSubmitbtnysl{ }
display: block;border: 1px solid #4CACFF;background-color: #4CACFF;color: #fff!important;width: 120px;text-align: center;line-height: 40px;border-radius: 2px; .defalutSubmitbtnysl{
width: 130px; display: block;border: 1px solid #4CACFF;background-color: #4CACFF;color: #fff!important;width: 120px;text-align: center;line-height: 40px;border-radius: 2px;
height: 40px; width: 130px;
background: rgba(76,172,255,1); height: 40px;
border-radius: 4px; background: rgba(76,172,255,1);
font-size: 16px; border-radius: 4px;
font-family: MicrosoftYaHei; font-size: 16px;
font-weight: 400; font-family: MicrosoftYaHei;
color: rgba(255,255,255,1); font-weight: 400;
} color: rgba(255,255,255,1);
#attachments_fields { }
margin-left: -77px; #attachments_fields {
display: flex; margin-left: -77px;
flex-direction: column; display: flex;
} flex-direction: column;
.uploadBtn { }
/* margin-left: 46px; */ .uploadBtn {
} /* margin-left: 46px; */
#memoMD.show_content_grey { }
padding: 0; #memoMD.show_content_grey {
} padding: 0;
.newForm .attachments_fields { }
/*margin-left: -39px !important*/ .newForm .attachments_fields {
} /*margin-left: -39px !important*/
#attachments_fields div.ui-progressbar { }
width: 120px; #attachments_fields div.ui-progressbar {
height: 10px; width: 120px;
margin: 2px 0 -2px 8px; height: 10px;
display: inline-block; margin: 2px 0 -2px 8px;
} display: inline-block;
.ui-progressbar-value.ui-widget-header { }
border: 1px solid #4CACFF; .ui-progressbar-value.ui-widget-header {
background: #4CACFF; border: 1px solid #4CACFF;
} background: #4CACFF;
/* MemoNew --------------------------------- END */ }
/* MemoNew --------------------------------- END */
/*RightMyPublish*/
.publishMemoSection { /*RightMyPublish*/
padding-bottom: 0px !important; .publishMemoSection {
} padding-bottom: 0px !important;
.advertisement { }
margin-top: 10px; .advertisement {
height: 155px; margin-top: 10px;
} height: 155px;
.advertisement img{ }
width: 100%; .advertisement img{
} width: 100%;
}
/* MyPublish*/
.returnBtn { /* MyPublish*/
font-size:16px; .returnBtn {
color:rgba(153,153,153,1); font-size:16px;
float: right; color:rgba(153,153,153,1);
margin-right: 50px; float: right;
position: relative; margin-right: 50px;
bottom: 12px; position: relative;
bottom: 12px;
} }

5
public/react/src/modules/forums/RightSection.css
Unescape View File

@ -8,6 +8,11 @@
height: 30px; height: 30px;
margin-bottom: 30px; margin-bottom: 30px;
margin-right: 35px; margin-right: 35px;
}
.search-newysl {
width:237px!important;
height: 30px;
margin-bottom: 30px;
} }
.search-new-input { .search-new-input {
padding-left: 16px; padding-left: 16px;

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

@ -319,7 +319,7 @@ class LoginDialog extends Component {
this.setState({ this.setState({
isRender: false isRender: false
}) })
window.location.href="/"; // window.location.href="/";
} }
loginEDU=()=>{ loginEDU=()=>{

332
public/react/src/modules/login/Trialapplication.js
Unescape View File

@ -32,6 +32,7 @@ class Trialapplication extends Component {
readonlyInput: true, readonlyInput: true,
user_phone_binded: false, user_phone_binded: false,
showTrial: false, showTrial: false,
user: undefined,
} }
//user_phone_binded 判断是否手机号验证 //user_phone_binded 判断是否手机号验证
// console.log("Trialapplication"); // console.log("Trialapplication");
@ -43,15 +44,32 @@ class Trialapplication extends Component {
} }
componentWillReceiveProps(nextProps) { componentWillReceiveProps(nextProps) {
// console.log("46");
// console.log(nextProps);
// console.log(this.props);
if (nextProps.user != this.props.user) {
// console.log("50");
// console.log(nextProps.user);
if (nextProps.user !== undefined) {
// console.log("53");
// console.log(nextProps.user);
this.setState({
user_phone_binded: nextProps.user.user_phone_binded,
})
}
}
} }
//初始化数据 //初始化数据
componentDidMount() { componentDidMount() {
console.log("53"); // console.log("53");
//
console.log(this.props.isRenders); // console.log(this.props.isRenders);
if (this.props.isRenders != undefined) { if (this.props.isRenders != undefined) {
this.setState({ this.setState({
@ -77,21 +95,6 @@ class Trialapplication extends Component {
//TODO 这里如果样式变了会出现css不加载的情况 //TODO 这里如果样式变了会出现css不加载的情况
}); });
// console.log(this.props.isRenders);
// console.log("89");
// console.log(this.state.props.user_phone_binded );
try {
if (this.state.props.user_phone_binded !== undefined) {
console.log(this.state.props.user_phone_binded);
this.setState({
user_phone_binded: this.state.props.user_phone_binded,
})
}
} catch (e) {
console.log(e);
}
} }
@ -384,154 +387,151 @@ class Trialapplication extends Component {
<style> <style>
{ {
` `
// .dialogBox{ .dialogBox2{
// height: 370px; height: 420px;
// } }
.dialogBox2{ #DialogIDysl{
height: 420px; z-index: 20000;
} }
#DialogIDysl{ #DialogIDysl .dialogBox {
z-index: 20000; width: 560px;
} }
#DialogIDysl .dialogBox { .MuiPaper-elevation24-45{
width: 560px; box-shadow:none !important;
} }
.MuiPaper-elevation24-45{ .MuiPaper-root-19{
box-shadow:none !important; /* background:none !important; */
} }
.MuiPaper-root-19{ .MuiDialog-paper-9{
/* background:none !important; */ overflow-y:hidden !important;
} }
.MuiDialog-paper-9{ #log_reg_content{
overflow-y:hidden !important; top: 0px !important;
} }
#log_reg_content{ #log_reg_content{
top: 0px !important; width:400px !important;
} border-radius:40px !important;
#log_reg_content{ box-shadow:4px 8px 12px rgba(76,76,76,0.3);
width:400px !important; }
border-radius:40px !important; .log_nav li{
box-shadow:4px 8px 12px rgba(76,76,76,0.3); height:17px;
} font-size:18px;
.log_nav li{ font-family:NotoSansHans-Regular;
height:17px; color:rgba(25,0,0,1);
font-size:18px; line-height: 0px;
font-family:NotoSansHans-Regular; }
color:rgba(25,0,0,1); .vertical-line{
line-height: 0px; margin-left:10px;
} margin-right:10px;
.vertical-line{ }
margin-left:10px; #DialogIDysl div {
margin-right:10px; overflow-y:visible !important;
} box-shadow:none !important;
#DialogIDysl div { border-radius:15px !important;
overflow-y:visible !important; }
box-shadow:none !important; #wrapper{
border-radius:15px !important; position: relative;
} top: 3px;
#wrapper{ left: 0px;
position: relative; margin-bottom: 17px;
top: 3px; }
left: 0px;
margin-bottom: 17px; .slidetounlock{
} font-size: 12px;
background:-webkit-gradient(linear,left top,right top,color-stop(0,#4d4d4d),color-stop(.4,#4d4d4d),color-stop(.5,#fff),color-stop(.6,#4d4d4d),color-stop(1,#4d4d4d));
.slidetounlock{ -webkit-background-clip:text;
font-size: 12px; -webkit-text-fill-color:transparent;
background:-webkit-gradient(linear,left top,right top,color-stop(0,#4d4d4d),color-stop(.4,#4d4d4d),color-stop(.5,#fff),color-stop(.6,#4d4d4d),color-stop(1,#4d4d4d)); -webkit-animation:slidetounlock 3s infinite;
-webkit-background-clip:text; -webkit-text-size-adjust:none
-webkit-text-fill-color:transparent; }
-webkit-animation:slidetounlock 3s infinite; @-webkit-keyframes slidetounlock{0%{background-position:-200px 0} 100%{background-position:200px 0}}
-webkit-text-size-adjust:none
} .handler_bg{ background: #fff url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA3hpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNS1jMDIxIDc5LjE1NTc3MiwgMjAxNC8wMS8xMy0xOTo0NDowMCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDo0ZDhlNWY5My05NmI0LTRlNWQtOGFjYi03ZTY4OGYyMTU2ZTYiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6NTEyNTVEMURGMkVFMTFFNEI5NDBCMjQ2M0ExMDQ1OUYiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6NTEyNTVEMUNGMkVFMTFFNEI5NDBCMjQ2M0ExMDQ1OUYiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTQgKE1hY2ludG9zaCkiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDo2MTc5NzNmZS02OTQxLTQyOTYtYTIwNi02NDI2YTNkOWU5YmUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NGQ4ZTVmOTMtOTZiNC00ZTVkLThhY2ItN2U2ODhmMjE1NmU2Ii8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+YiRG4AAAALFJREFUeNpi/P//PwMlgImBQkA9A+bOnfsIiBOxKcInh+yCaCDuByoswaIOpxwjciACFegBqZ1AvBSIS5OTk/8TkmNEjwWgQiUgtQuIjwAxUF3yX3xyGIEIFLwHpKyAWB+I1xGSwxULIGf9A7mQkBwTlhBXAFLHgPgqEAcTkmNCU6AL9d8WII4HOvk3ITkWJAXWUMlOoGQHmsE45ViQ2KuBuASoYC4Wf+OUYxz6mQkgwAAN9mIrUReCXgAAAABJRU5ErkJggg==") no-repeat center;}
@-webkit-keyframes slidetounlock{0%{background-position:-200px 0} 100%{background-position:200px 0}} .handler_ok_bg{ background: #fff url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA3hpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNS1jMDIxIDc5LjE1NTc3MiwgMjAxNC8wMS8xMy0xOTo0NDowMCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDo0ZDhlNWY5My05NmI0LTRlNWQtOGFjYi03ZTY4OGYyMTU2ZTYiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6NDlBRDI3NjVGMkQ2MTFFNEI5NDBCMjQ2M0ExMDQ1OUYiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6NDlBRDI3NjRGMkQ2MTFFNEI5NDBCMjQ2M0ExMDQ1OUYiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTQgKE1hY2ludG9zaCkiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDphNWEzMWNhMC1hYmViLTQxNWEtYTEwZS04Y2U5NzRlN2Q4YTEiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NGQ4ZTVmOTMtOTZiNC00ZTVkLThhY2ItN2U2ODhmMjE1NmU2Ii8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+k+sHwwAAASZJREFUeNpi/P//PwMyKD8uZw+kUoDYEYgloMIvgHg/EM/ptHx0EFk9I8wAoEZ+IDUPiIMY8IN1QJwENOgj3ACo5gNAbMBAHLgAxA4gQ5igAnNJ0MwAVTsX7IKyY7L2UNuJAf+AmAmJ78AEDTBiwGYg5gbifCSxFCZoaBMCy4A4GOjnH0D6DpK4IxNSVIHAfSDOAeLraJrjgJp/AwPbHMhejiQnwYRmUzNQ4VQgDQqXK0ia/0I17wJiPmQNTNBEAgMlQIWiQA2vgWw7QppBekGxsAjIiEUSBNnsBDWEAY9mEFgMMgBk00E0iZtA7AHEctDQ58MRuA6wlLgGFMoMpIG1QFeGwAIxGZo8GUhIysmwQGSAZgwHaEZhICIzOaBkJkqyM0CAAQDGx279Jf50AAAAAABJRU5ErkJggg==") no-repeat center;}
.handler_bg{ background: #fff url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA3hpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNS1jMDIxIDc5LjE1NTc3MiwgMjAxNC8wMS8xMy0xOTo0NDowMCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDo0ZDhlNWY5My05NmI0LTRlNWQtOGFjYi03ZTY4OGYyMTU2ZTYiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6NTEyNTVEMURGMkVFMTFFNEI5NDBCMjQ2M0ExMDQ1OUYiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6NTEyNTVEMUNGMkVFMTFFNEI5NDBCMjQ2M0ExMDQ1OUYiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTQgKE1hY2ludG9zaCkiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDo2MTc5NzNmZS02OTQxLTQyOTYtYTIwNi02NDI2YTNkOWU5YmUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NGQ4ZTVmOTMtOTZiNC00ZTVkLThhY2ItN2U2ODhmMjE1NmU2Ii8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+YiRG4AAAALFJREFUeNpi/P//PwMlgImBQkA9A+bOnfsIiBOxKcInh+yCaCDuByoswaIOpxwjciACFegBqZ1AvBSIS5OTk/8TkmNEjwWgQiUgtQuIjwAxUF3yX3xyGIEIFLwHpKyAWB+I1xGSwxULIGf9A7mQkBwTlhBXAFLHgPgqEAcTkmNCU6AL9d8WII4HOvk3ITkWJAXWUMlOoGQHmsE45ViQ2KuBuASoYC4Wf+OUYxz6mQkgwAAN9mIrUReCXgAAAABJRU5ErkJggg==") no-repeat center;} #drag{
.handler_ok_bg{ background: #fff url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA3hpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNS1jMDIxIDc5LjE1NTc3MiwgMjAxNC8wMS8xMy0xOTo0NDowMCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDo0ZDhlNWY5My05NmI0LTRlNWQtOGFjYi03ZTY4OGYyMTU2ZTYiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6NDlBRDI3NjVGMkQ2MTFFNEI5NDBCMjQ2M0ExMDQ1OUYiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6NDlBRDI3NjRGMkQ2MTFFNEI5NDBCMjQ2M0ExMDQ1OUYiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTQgKE1hY2ludG9zaCkiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDphNWEzMWNhMC1hYmViLTQxNWEtYTEwZS04Y2U5NzRlN2Q4YTEiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NGQ4ZTVmOTMtOTZiNC00ZTVkLThhY2ItN2U2ODhmMjE1NmU2Ii8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+k+sHwwAAASZJREFUeNpi/P//PwMyKD8uZw+kUoDYEYgloMIvgHg/EM/ptHx0EFk9I8wAoEZ+IDUPiIMY8IN1QJwENOgj3ACo5gNAbMBAHLgAxA4gQ5igAnNJ0MwAVTsX7IKyY7L2UNuJAf+AmAmJ78AEDTBiwGYg5gbifCSxFCZoaBMCy4A4GOjnH0D6DpK4IxNSVIHAfSDOAeLraJrjgJp/AwPbHMhejiQnwYRmUzNQ4VQgDQqXK0ia/0I17wJiPmQNTNBEAgMlQIWiQA2vgWw7QppBekGxsAjIiEUSBNnsBDWEAY9mEFgMMgBk00E0iZtA7AHEctDQ58MRuA6wlLgGFMoMpIG1QFeGwAIxGZo8GUhIysmwQGSAZgwHaEZhICIzOaBkJkqyM0CAAQDGx279Jf50AAAAAABJRU5ErkJggg==") no-repeat center;} position: relative;
background-color: #e8e8e8;
#drag{ width: 340px;
position: relative; height: 34px;
background-color: #e8e8e8; line-height: 34px;
width: 340px; text-align: center;
height: 34px; }
line-height: 34px; #drag .handler{
text-align: center; position: absolute;
} top: 0px;
#drag .handler{ left: 0px;
position: absolute; width: 40px;
top: 0px; height: 32px;
left: 0px; /*border: 1px solid #ccc;*/
width: 40px; cursor: move;
height: 32px; }
/*border: 1px solid #ccc;*/
cursor: move; #drag .drag_bg{
} background-color: #7ac23c;
height: 34px;
#drag .drag_bg{ width: 0px;
background-color: #7ac23c; }
height: 34px; #drag .drag_text{
width: 0px; position: absolute;
} top: 0px;
#drag .drag_text{ width: 340px;
position: absolute; color:#9c9c9c;
top: 0px; -moz-user-select: none;
width: 340px; -webkit-user-select: none;
color:#9c9c9c; user-select: none;
-moz-user-select: none; -o-user-select:none;
-webkit-user-select: none; -ms-user-select:none;
user-select: none; font-size: 12px;
-o-user-select:none; }
-ms-user-select:none; #drag{
font-size: 12px; overflow: hidden !important;
} }
#drag{
overflow: hidden !important;
}
#closeIcon{
position: absolute;
top: -30px;
#closeIcon{ right: -27px;
position: absolute; z-index: 100000;
top: -30px; }
right: -27px;
z-index: 100000; .bluebutton{
} width: 100%;
text-align: center;
.bluebutton{ color: #FFFFff!important;
width: 100%; display: block;
text-align: center; background: #cbcbcb;
color: #FFFFff!important; height: 45px;
display: block; line-height: 45px;
background: #cbcbcb; border-radius: 4px;
height: 45px; letter-spacing: 2px;
line-height: 45px; cursor: pointer;
border-radius: 4px; }
letter-spacing: 2px; .ant-input {
cursor: pointer; font-family: "Monospaced Number", "Chinese Quote", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "Helvetica Neue", Helvetica, Arial, sans-serif;
} -webkit-box-sizing: border-box;
.ant-input { box-sizing: border-box;
font-family: "Monospaced Number", "Chinese Quote", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "Helvetica Neue", Helvetica, Arial, sans-serif; margin: 0;
-webkit-box-sizing: border-box; padding: 0;
box-sizing: border-box; list-style: none;
margin: 0; position: relative;
padding: 0; display: inline-block;
list-style: none; padding: 4px 11px;
position: relative; width: 100%;
display: inline-block; height: 38px;
padding: 4px 11px; font-size: 14px;
width: 100%; line-height: 1.5;
height: 38px; color: rgba(0, 0, 0, 0.65);
font-size: 14px; background-color: #fff;
line-height: 1.5; background-image: none;
color: rgba(0, 0, 0, 0.65); border: 1px solid #d9d9d9;
background-color: #fff; border-radius: 4px;
background-image: none; -webkit-transition: all .3s;
border: 1px solid #d9d9d9; -o-transition: all .3s;
border-radius: 4px; transition: all .3s;
-webkit-transition: all .3s; }
-o-transition: all .3s;
transition: all .3s;
}
` `
} }
</style> </style>

28
public/react/src/modules/tpm/NewHeader.js
Unescape View File

@ -170,7 +170,6 @@ class NewHeader extends Component {
submitapplications:false, submitapplications:false,
isRender:false, isRender:false,
isRenders:false, isRenders:false,
user_phone_binded:false,
showTrial:false, showTrial:false,
} }
// console.log("176") // console.log("176")
@ -209,18 +208,18 @@ class NewHeader extends Component {
} }
componentDidUpdate = (prevProps) => { componentDidUpdate = (prevProps) => {
if(prevProps.user!=this.props.user){ // if(prevProps.user!=this.props.user){
// console.log("216") // // console.log("216")
// console.log(prevProps.user); // // console.log(prevProps.user);
// console.log(this.props.user); // // console.log(this.props.user);
if(this.props.user !== undefined){ // if(this.props.user !== undefined){
this.setState({ // this.setState({
user_phone_binded :this.props.user.user_phone_binded, // user_phone_binded :this.props.user.user_phone_binded,
}) // })
} // }
//
//
} // }
} }
componentWillReceiveProps(newProps, oldProps) { componentWillReceiveProps(newProps, oldProps) {
this.setState({ this.setState({
@ -581,7 +580,6 @@ submittojoinclass=(value)=>{
user, user,
isRender, isRender,
isRenders, isRenders,
user_phone_binded,
}=this.state; }=this.state;
/* /*
用户名称 用户头像url 用户名称 用户头像url
@ -627,7 +625,7 @@ submittojoinclass=(value)=>{
{/* />*/} {/* />*/}
{/* :""*/} {/* :""*/}
{/*}*/} {/*}*/}
<Trialapplication {...this.state} user_phone_binded={user_phone_binded} ></Trialapplication> <Trialapplication {...this.state} ></Trialapplication>
<div className="educontent clearfix"> <div className="educontent clearfix">
{/*<%= link_to image_tag("/images/educoder/logo.png", alt:"高校智能化教学与实训平台", className:"logoimg"), home_path %>*/} {/*<%= link_to image_tag("/images/educoder/logo.png", alt:"高校智能化教学与实训平台", className:"logoimg"), home_path %>*/}
<a href="/"> <a href="/">

1569
public/stylesheets/educoder/edu-main.css
View File

File diff suppressed because it is too large Load Diff
Write Preview
Loading…
Cancel
Save