@@ -383,6 +417,7 @@ class CoursesBanner extends Component {
modalSave={this.ModalAction}
antIcon={antIcon}
>
+ this.ysljoinmodalCancel()} ysljoinmodalCanceltwo={()=>this.ysljoinmodalCanceltwo()}>
+ {
+ `
+ .tag-orange .tag-name{
+ display: block;
+ width: auto;
+ background-color: #FF6800;
+ background-size: 100% 100%;
+ padding: 0px 4px;
+ color: #fff;
+ float: left;
+ height: 28px;
+ line-height: 28px;
+ font-size: 14px;
+ border-radius: 4px;
+ }
+ `
+ }
+
+ {excellent===true?
+ 国家精品
+ :""}
-
+ {excellent===false?
this.ActionPoll(1)}>删除
:"":""}
+ :
+
{coursedata.switch_to_student === true ?
退出课堂 :""}
+ :
+
+
+ {/*coursedata.course_identity === 6 是非课堂成员*/}
+ {coursedata.course_identity === 6&&coursedata.educoder_teacher===false?
+ this.myyslgradin()}>加入课堂: ""}
+
+ {coursedata.course_identity === 6&&coursedata.educoder_teacher===true?
+ this.myyslgradin()}>加入课堂: ""}
+
+ {/*{this.props.isStudent()? this.exitclass()}*/}
+ {/*> 退出课堂 :""}*/}
+
+
+ }
-
+
设置
+ {coursedata.is_admin===true?coursedata.course_identity <3? this.ActionPoll(1)}>删除
+ :"":""}
+
+ {/*公告栏*/}
{/*作业*/}
{item.type==="shixun_homework"?
this.Navmodalnames(e,1,"shixun_homework",item.id)}>添加目录
:""}
{/*资源*/}
@@ -792,8 +792,12 @@ class Coursesleftnav extends Component{
// // console.log(item.category_url)
// console.log(this.props.location.pathname)
+ console.log("778");
+ console.log("CoursesLeftNav");
+ console.log(this.props);
+ console.log(course_modules);
- return(
+ return(
-
@@ -879,6 +883,8 @@ class Coursesleftnav extends Component{
- this.showsandians(e,key,item.category_url,1)} className={this.props.mainurl===item.category_url&&key===this.props.indexs?"liactive":"clearfix active"} onMouseLeave={(e)=>this.hidesandian(e,key)} onMouseEnter={(e)=>this.showsandian(e,key)}>
this.showsandians(e,key,item.category_url,1)} className={ item.second_category===undefined?"fl ml20 pd0":item.second_category.length===0?"fl ml20 pd0":this.state.sandiantypes===key?"fl ml20 pd0 ebebeb":"fl ml20 pd0"}>
{
+ item.type==="announcement"?:
+ item.type==="online_learning"?:
item.type==="shixun_homework"?:
item.type==="common_homework"?:
item.type==="group_homework"?:
@@ -994,6 +1000,8 @@ class Coursesleftnav extends Component{
>
{
+ item.type==="announcement"?:
+ item.type==="online_learning"?:
item.type==="shixun_homework"?:
item.type==="common_homework"?:
item.type==="group_homework"?:
diff --git a/public/react/src/modules/courses/coursesPublic/CoursesListType.js b/public/react/src/modules/courses/coursesPublic/CoursesListType.js
index 67d39a649..c0a799706 100644
--- a/public/react/src/modules/courses/coursesPublic/CoursesListType.js
+++ b/public/react/src/modules/courses/coursesPublic/CoursesListType.js
@@ -32,7 +32,7 @@ class CoursesListType extends Component {
{
typelist===undefined?"":typelist.map((item,key)=>{
return(
-
document.querySelector('.TabsWarp')}> + document.querySelector('.TabsWarp')} key={key}> {item==="公开"?公开:""} {item==="已开启补交"?已开启补交:""} diff --git a/public/react/src/modules/courses/elearning/Elearning.js b/public/react/src/modules/courses/elearning/Elearning.js new file mode 100644 index 000000000..4923535af --- /dev/null +++ b/public/react/src/modules/courses/elearning/Elearning.js @@ -0,0 +1,322 @@ +import React,{ Component } from "react"; +import { Input,Checkbox,Table, Pagination, Modal,Menu, Tooltip,Spin,Button,Form,Icon,message,Progress} from "antd"; +import { WordsBtn,on, off, trigger,markdownToHTML,getImageUrl} from 'educoder'; +import './myelearning.css' +import axios from 'axios'; +import YslDetailCards from "./YslDetailCards.js"; +import Jointheclass from '../../modals/Jointheclass' +//在线学习 +class Elearning extends Component{ + constructor(props){ + super(props); + + this.state={ + description:"", //简介 + isSpin:true, + start_learning:undefined, //是否要开始学习 没开始学习 点击第一个是开始学习 就是学习下面的从第一个开始 + learned:0, //学习进度 + last_shixun:"", //上次学习的实训 + stages:[], //实践课程的章节 + yslJointhe:false, + shixunsreplace:false, + hidestartshixunsreplacevalue:"", + shixunsmessage:"", + startshixunCombattype:false, + isSpins:false, + + } + } + + componentDidMount() { + // 记得删除退出课堂 + console.log("获取到数据"); + console.log(this.props); + let url = `/courses/${this.props.match.params.coursesId}/online_learning.json`; + // // + axios.get(url).then((response) => { + if(response){ + if(response.data){ + console.log("获取到到数据"); + console.log(response); + this.setState({ + description: response.data.description, + start_learning:response.data.start_learning, + learned:response.data.learned, + last_shixun:response.data.last_shixun, + stages:response.data.stages, + + }); + } + } + this.setState({ + isSpin:false, + }) + }).catch((error) => { + console.log(error); + this.setState({ + isSpin:false, + }) + }); + + } + + + componentDidUpdate = (prevProps) => { + + + + }; + //开始学习 + Startlearning=()=>{ + if(this.props.isNotMember()===true){ + this.setState({ + yslJointhe:true + }) + }else { + let {stages}=this.state; + if(stages.length>0){ + for(var i=0;i ; + return( + + + ) + } +} +const Elearningss = Form.create({ name: 'elearning' })(Elearning); +export default Elearningss; diff --git a/public/react/src/modules/courses/elearning/YslDetailCards.js b/public/react/src/modules/courses/elearning/YslDetailCards.js new file mode 100644 index 000000000..1d5c77284 --- /dev/null +++ b/public/react/src/modules/courses/elearning/YslDetailCards.js @@ -0,0 +1,226 @@ +import React, { Component } from 'react'; +import {getImageUrl} from 'educoder'; +import { Tooltip,Modal,Icon,Spin,message} from 'antd'; +import '../../paths/ShixunPaths.css'; +import axios from 'axios'; +import { BrowserRouter as Router, Route, Link } from "react-router-dom"; + +class YslDetailCards extends Component{ + constructor(props){ + super(props) + this.state={ + showparagraph:false, + showparagraphkey:"", + showparagraphindex:"", + shixunsreplace:false, + hidestartshixunsreplacevalue:"", + shixunsmessage:"", + startshixunCombattype:false, + isSpin:false, + } + } + + showparagraph =(key,index)=>{ + this.setState({ + showparagraph:true, + showparagraphkey:key, + showparagraphindex:index + }) + }; + hideparagraph=()=>{ + this.setState({ + showparagraph:false + }) + }; + startgameid=(id)=>{ + if(this.props.isNotMember()===true){ + //这个是外部传过来的 + this.props.Startlearningtwo(); + return + } + let url = "/shixuns/" + id + "/shixun_exec.json"; + axios.get(url).then((response) => { + + if (response.data.status === -2) { + this.setState({ + + shixunsreplace:true, + hidestartshixunsreplacevalue:response.data.message+".json" + }) + } else if (response.data.status === -1) { + console.log(response) + }else if(response.data.status===-3){ + this.setState({ + shixunsmessage:response.data.message, + startshixunCombattype:true, + }) + } else { + console.log("开始学习了"); + window.open("/tasks/" + response.data.game_identifier,'_blank'); + //这个是传过来 调用刷新 + this.props.Myreload(); + // window.location.href = path + // let path="/tasks/"+response.data.game_identifier; + // this.props.history.push(path); + } + }).catch((error) => { + + }); + + }; + + componentDidMount(){ + } + + + hidestartshixunsreplace=(url)=>{ + this.setState({ + isSpin:true, + }) + axios.get(url).then((response) => { + // debugger + if(response.status===200){ + // let path="/shixuns/"+response.data.shixun_identifier+"/challenges"; + // this.props.history.push(path); + message.success('重置成功，正在进入实训！'); + this.startgameid(response.data.shixun_identifier); + this.setState({ + shixunsreplace:false, + isSpin:false, + startbtn:false, + }) + + // message.success('重置成功，正在进入实训！'); + // this.startshixunCombat(); + }} + ).catch((error) => { + this.setState({ + isSpin:false, + shixunsreplace:false, + }) + }); + + } + hidestartshixunCombattype=()=>{ + this.setState({ + startshixunCombattype:false + }) + } + + render(){ + let{showparagraph,showparagraphkey,showparagraphindex,hidestartshixunsreplacevalue} =this.state; + let { stages }=this.props; + const antIcon =++this.ysljoinmodalCancel()} ysljoinmodalCanceltwo={()=>this.ysljoinmodalCanceltwo()}> ++ +++ + {/*本实训的开启时间：{this.state.shixunsmessages}
+
开启时间之前不能挑战*/} + {/*知道了*/} + {/*
*/} ++ ++ +++ +实训已经更新了，正在为您重置!
++ { + this.props.isAdmin()===true?"": ++ + ++ { + start_learning===undefined?"":start_learning===false? ++ } + + {/*简介*/} + +++ : ++ 还未开始学习 + + ++ +++ } ++ 已学{learned}% +++ +++ 上次学至{last_shixun} ++ + +++ ++ 简介 ++++ ++
++ + + ++++ {/*开始学习*/} ++ +this.Startlearningtwo()} Myreload={()=>this.Myreload()} > +; + return( + ++ ) + } +} +export default YslDetailCards; \ No newline at end of file diff --git a/public/react/src/modules/courses/elearning/myelearning.css b/public/react/src/modules/courses/elearning/myelearning.css new file mode 100644 index 000000000..e69de29bb diff --git a/public/react/src/modules/courses/gradinforms/Eduinforms.js b/public/react/src/modules/courses/gradinforms/Eduinforms.js new file mode 100644 index 000000000..aef54ab13 --- /dev/null +++ b/public/react/src/modules/courses/gradinforms/Eduinforms.js @@ -0,0 +1,259 @@ +import React,{ Component } from "react"; +import { Input,Checkbox,Table, Pagination, Modal,Menu, Tooltip,Spin,Button,Form } from "antd"; +import { WordsBtn,on, off, trigger,markdownToHTML,getImageUrl} from 'educoder'; +import './myysleduinforms.css' +import axios from 'axios'; +import TPMMDEditor from "../../tpm/challengesnew/TPMMDEditor"; + // 公告栏 +class Eduinforms extends Component{ + constructor(props){ + super(props); + this.messageRef = React.createRef(); + + this.state={ + description:null, + isSpin:true, + whethertoedit:false, + + } + } + + componentDidMount() { + console.log("获取到数据"); + console.log(this.props); + let url = `/courses/${this.props.match.params.coursesId}/informs.json`; + // + axios.get(url).then((response) => { + if(response){ + if(response.data){ + this.setState({ + description:response.data.description, + isSpin:false, + }) + }else { + this.setState({ + description:null, + isSpin:false, + + }) + + } + }else { + this.setState({ + description:null, + isSpin:false, + }) + + } + }).catch((error) => { + console.log(error) + this.setState({ + description:null, + isSpin:false, + }) + }); + + } + + + componentDidUpdate = (prevProps) => { + + + + } + bianji = (bians)=>{ + this.setState({ + whethertoedit:bians, + }) + + }; + + handleSubmit=(e) => { + e.preventDefault(); + this.props.form.validateFields((err, values) => { + if (!err) { + console.log(values.description); + if(values.description === undefined|| values.description === "" || values.description ===null){ + this.props.showNotification(`请输入提交内容`); + return + + } + var id=this.props.match.params.coursesId + + var url = `/courses/${id}/update_informs.json`; + axios.post(url,{ + description:values.description, + }).then((result) => { + if(result){ + if(result.data){ + if(result.data.status === 0){ + this.setState({ + description:values.description, + whethertoedit:false, + }) + this.props.showNotification(result.data.message); + }else { + this.props.showNotification(result.data.message); + + } + } + + } + }).catch((error) => { + console.log(error) + }) + }else{ + console.log(err); + } + + }); + } + + + render(){ + let{description,whethertoedit} =this.state; + const {getFieldDecorator} = this.props.form; + + return( ++ +++ + {/*本实训的开启时间：{this.state.shixunsmessage}
+
开启时间之前不能挑战*/} + {/*知道了*/} + {/*
*/} ++ + + { + stages && stages.map((item,key)=>{ + + return( ++ +++ +实训已经更新了，正在为您重置!
+++ ) + }) + } ++ + +
+![]({getImageUrl("images/educoder/icon/charpter-white.svg")})
+
+ {item.stage_name}
+
+ ++{item.stage_description}
+ ++ + { + item.shixuns_list && item.shixuns_list.map((line,index)=>{ + return( ++this.showparagraph(key,index)} onMouseLeave={this.hideparagraph}> + +) + }) + } +- + + + { + line.complete_status === 1 ? + : + } + + + {key+1}-{index+1} {line.shixun_name} + + +
+ { + this.props.current_user&&this.props.current_user.admin===false&&line.shixun_status==="暂未公开"? +- 暂未公开
+ : +- + { + showparagraphkey===key&&showparagraphindex===index?
+ } ++ 查看详情 + {line.shixun_status==="暂未公开"?"":this.startgameid(line.identifier)} className="btn_auto user_bluebg_btn fl" id="shixun_operation" >开始学习} +:"" + } + ++ + ) + } +} +const Eduinformss = Form.create({ name: 'eduinforms' })(Eduinforms); +export default Eduinformss; diff --git a/public/react/src/modules/courses/gradinforms/myysleduinforms.css b/public/react/src/modules/courses/gradinforms/myysleduinforms.css new file mode 100644 index 000000000..f3fa2fb1a --- /dev/null +++ b/public/react/src/modules/courses/gradinforms/myysleduinforms.css @@ -0,0 +1,13 @@ +.yslmt16px{ + padding-top: 25px !important; + padding-left: 25px !important; + padding-right: 25px !important; + padding-bottom: 1px !important; +} + +.yslmtopcg +{ + padding: 25px !important; + + +} \ No newline at end of file diff --git a/public/react/src/modules/courses/new/Goldsubject.js b/public/react/src/modules/courses/new/Goldsubject.js new file mode 100644 index 000000000..c61d045bd --- /dev/null +++ b/public/react/src/modules/courses/new/Goldsubject.js @@ -0,0 +1,918 @@ +import React, {Component} from "React"; +import {Form, Select, Input, Button, Checkbox, DatePicker,Spin,Icon,AutoComplete,InputNumber} from "antd"; +import ApplyForAddOrgModal from '../../user/modal/ApplyForAddOrgModal'; +import axios from 'axios'; +import "../css/Courses.css"; +import locale from 'antd/lib/date-picker/locale/zh_CN'; +import moment from 'moment'; +import Modals from '../../modals/Modals'; + + + +const { Option } = Select; + + +const dateFormat = 'YYYY-MM-DD'; + +function range(start, end) { + const result = []; + for (let i = start; i < end; i++) { + result.push(i); + } + return result; +} + +function disabledDateTime() { + return { + disabledMinutes: () => range(1, 30).concat(range(31, 60)), + }; +} + +function disabledDate(current) { + console.log(current); + return current && current < moment().endOf('day').subtract(1, 'days'); +} +function disabledDateysl(current) { + console.log(current); + return current && current < moment().endOf('day').add(1, 'days'); +} + +class Goldsubject extends Component { + + constructor(props) { + super(props) + this.state = { + coursedata: undefined, + searchlist: [], + searchlistscholl:[], + listvalue: undefined, + fetching:false, + subject_id:"", + start_date:"", + } + } + // disabledEndDate= endValue => { + // const { datatimetwo } = this.state; + // var startValue =datatimetwo + // if (!endValue || !startValue) { + // return false; + // } + // return endValue.valueOf() < startValue.valueOf(); + // }; + + isabledStartDate = (startValue) => { + + const { datatime } = this.state; + var datatimes=""; + if(datatime!==undefined){ + datatimes=datatime; + datatimes=moment(datatimes, dateFormat).subtract(0, 'days');; + }else { + datatimes=datatime; + } + if (!startValue || !datatimes) { + return false; + } + return startValue.valueOf() > datatimes.valueOf(); + }; + + disabledEndDate = (endValue) => { + // console.log("---------------------------------") + // console.log(moment(new Date(), dateFormat).add(1, 'days')); + // console.log(moment(new Date(), dateFormat).add(2, 'days')); + const { datatimetwo } = this.state; + var startvalue=""; + if(datatimetwo!==undefined){ + startvalue=datatimetwo; + startvalue=moment(startvalue, dateFormat).add(1, 'days'); + }else { + startvalue=datatimetwo; + } + // console.log("结束时间"); + // console.log(endValue); + // console.log(startvalue); + // console.log(datatimetwo); + if (!endValue || !startvalue) { + return false; + } + return endValue.valueOf() < startvalue.valueOf(); + }; + + componentDidMount() { + console.log("新建金品课堂的数据"); + console.log(this.props); + + 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) => { + + let data = result.data; + this.props.form.setFieldsValue({ + course: data.course_list_name, + classroom: data.name, + period: data.class_period, + credit: data.credit, + checkboxgroup: data.course_module_types, + Realnamecertification: data.authentication, + Professionalcertification:data.professional_certification, + starttime: data.start_date === undefined ? "" : moment(data.start_date, dateFormat), + endtime: data.end_date === undefined ? "" : moment(data.end_date, dateFormat), + school:data.school + + }); + // starttime + this.setState({ + datatimetwo: data.start_date === undefined ? "" : moment(data.start_date, dateFormat), + datatime: data.end_date === undefined ? "" : moment(data.end_date, dateFormat), + is_public: this.props.match.params.id, + Realnamecertification: data.authentication, + Professionalcertification:data.professional_certification, + name: data.name, + class_period: data.class_period, + credit: parseFloat(data.credit), + course_module_types: data.course_module_types, + school:data.school, + }); + this.handleSearchschool(data.school); + }).catch((error) => { + console.log(error); + }) + }else{ + let url = "/courses/new.json" + axios.get(url).then((result) => { + console.log(result) + }).catch((error) => { + console.log(error); + }) + // console.log(user_school); + this.props.form.setFieldsValue({ + school:user_school, + }); + this.setState({ + school:user_school, + }); + + this.handleSearchschool(user_school); + + + } + + + } + componentDidUpdate(prevProps) { + if(prevProps.current_user !== this.props.current_user){ + let user_school=this.props.current_user&&this.props.current_user.user_school; + this.props.form.setFieldsValue({ + school:user_school, + }); + this.setState({ + school:user_school, + }); + + this.handleSearchschool(user_school); + } + } + onChangeTimepublishs = (date, dateString) => { + console.log("结束时间11111111111"); + console.log(dateString); + + if(dateString===""){ + this.setState({ + datatime: undefined, + }) + console.log("结束时间111111111116"); + + this.props.form.setFieldsValue({ + endtime:undefined, + }); + }else{ + console.log("结束时间111111111117"); + + this.setState({ + datatime: dateString, + }); + this.props.form.setFieldsValue({ + endtime: moment(dateString, dateFormat), + }); + } + + }; + onChangeTimepublishstwo = (date, dateString) => { + console.log("结束时间22222222222"); + console.log(dateString); + if(dateString===""){ + console.log("结束时间222222222223"); + this.setState({ + datatimetwo: undefined, + }) + this.props.form.setFieldsValue({ + starttime: undefined, + }); + }else{ + console.log("结束时间222222222224"); + + this.setState({ + datatimetwo: dateString, + }) + this.props.form.setFieldsValue({ + starttime: moment(dateString, dateFormat), + }); + } + + }; + cancelmodel = () => { + + this.setState({ + Modalstype: false, + Loadtype: false, + Modalstopval: "", + ModalCancel: "", + ModalSave: "", + }) + + } + + scrollToAnchor = (anchorName) => { + if (anchorName) { + // 找到锚点 + let anchorElement = document.getElementById(anchorName); + // 如果对应id的锚点存在，就跳转到锚点 + window.scrollTo(0, anchorElement.offsetTop - window.innerHeight / 2); + } + } + + //提交数据的地方 + handleSubmit = (e) => { + + e.preventDefault(); + + let first_category_url=this.props.current_user.first_category_url; + let coursesId = this.props.match.params.coursesId; + var is_public =this.props.match.params.id; + let {datatime,datatimetwo} = this.state + // console.log(is_public) + if (coursesId != undefined) { + // 编辑 + + this.props.form.validateFields((err, values) => { + if (err) { + return; + } + // if(values.course===""||values.course===undefined){ + // this.scrollToAnchor("iscourse") + // return + // + // } + // if(values.classroom===""||values.classroom===undefined){ + // this.scrollToAnchor("isclassroom") + // return + // } + // + // if(values.school===""||values.school===undefined){ + // // this.scrollToAnchor("isschool") + // return + // + // } + + if(values.checkboxgroup.length===0){ + this.setState({ + Modalstype:true, + Modalstopval:"请您至少添加一个课堂模块，", + ModalsBottomval:"否则您将无法新建课堂。", + Loadtype:true, + ModalSave:()=>this.cancelmodel(), + }) + return + } + + + if (!err) { + + + + // console.log('Received values of form: ', values); + + let url = "/courses/" + coursesId + ".json"; + axios.put(url, { + // subject_id:128, //这是带过来的值 编辑就不要传值了 + name: values.classroom, + class_period: values.period, + credit: parseFloat(values.credit), + start_date:values.starttime, + end_date: values.endtime, + is_public: is_public, //这是也是带过来的值 + course_module_types: values.checkboxgroup, + school:values.school + } + ).then((response) => { + // debugger + if (response.data.status === 0) { + // this.goback() + + window.location.href=first_category_url; + var yslGuideone = window.localStorage.getItem('yslGuideone'); + try { + if(yslGuideone=== null){ + window.localStorage.setItem('yslGuideone', "true"); + return + } + if(yslGuideone=== undefined){ + window.localStorage.setItem('yslGuideone', "true"); + return + } + }catch (e) { + + } + + } + }).catch((error) => { + console.log(error) + }) + } + + console.log("错误信息信息信息1"); + console.log(err); + console.log(values.starttime); + console.log(values.endtime); + + }); + } else { + this.props.form.validateFields((err, values) => { + console.log("错误信息信息信息2"); + console.log(err); + if (err) { + return; + } + // if(values.course===""||values.course===undefined){ + // this.scrollToAnchor("iscourse") + // return + // } + // if(values.classroom===""||values.classroom===undefined){ + // this.scrollToAnchor("isclassroom") + // return + // } + // if(values.school===""||values.school===undefined){ + // // this.scrollToAnchor("isschool") + // return + // + // } + if (!err) { + // debugger + //新建 + // console.log('Received values of form: ', values); + + let url = "/courses.json"; + axios.post(url, { + subject_id:128, //这是带过来的值 + name: values.classroom, + class_period: values.period, + credit: parseFloat(values.credit), + start_date:values.starttime, + end_date: values.endtime, + is_public: is_public, //这是也是带过来的值 + course_module_types: values.checkboxgroup, + school:values.school + } + ).then((response) => { + if (response.status === 200) { + // this.goback + window.location.href=response.data.first_category_url; + var yslGuideone = window.localStorage.getItem('yslGuideone'); + try { + if(yslGuideone=== null){ + window.localStorage.setItem('yslGuideone', "true"); + return + } + if(yslGuideone=== undefined){ + window.localStorage.setItem('yslGuideone', "true"); + return + } + }catch (e) { + + } + } + }).catch((error) => { + console.log(error) + }) + } + }); + } + + } + + goback = () => { + + // if(this.props.match.params.coursesId===undefined){ + // this.props.history.push("/courses"); + // }else{ + // this.props.history.push(this.props.current_user.first_category_url); + // } + // window.history.go(-1) + this.props.history.goBack() + } + + onCheckAllChange = (e) => { + // console.log(e.target.checked) + this.setState({ + is_public: e.target.checked == true ? 1 : 0, + }); + } + onchanges =(e)=>{ + this.setState({ + Realnamecertification:e.target.checked, + }) + // console.log(e.target.checked); + } + onchangess=(e)=>{ + this.setState({ + Professionalcertification:e.target.checked, + }) + // console.log(e.target.checked); + } + Searchvalue=(value)=>{ + + let url="/courses/search_course_list.json"; + axios.post(url,{ + search:value + }).then((result)=>{ + // console.log(result.data) + if (result.data.message===undefined) { + + this.setState({ + searchlist: result.data.course_lists, + // course:value, + + }) + } + // this.props.form.setFieldsValue({ + // course:value + // }) + }).catch((error)=>{ + console.log(error) + }) + } + handleSearch=(value)=>{ + + + if(value!=""){ + this.props.form.setFieldsValue({ + classroom:value, + // course:value + }); + this.Searchvalue(value) + } + + }; + + handleChange=(value)=>{ + + this.props.form.setFieldsValue({ + // course:value, + classroom:value + }) + }; + + handleSearchschool=(value)=>{ + + if(value!="") { + // this.props.form.setFieldsValue({ + // // school: value, + // fetching: true, + // }); + this.setState({ + fetching: true, + school: value + }) + this.getschool(value) + } + }; + + handleChangeschools=(value)=>{ + + // this.props.form.setFieldsValue({ + // // school: value, + // fetching: true, + // }); + // this.setState({ + // fetching: true + // }) + } + + handleChangeschool=(value)=>{ + + this.setState({ + school:value + }); + this.props.form.setFieldsValue({ + school:value, + }) + }; + + getschool=(value)=>{ + // this.props.form.setFieldsValue({ + // school: value + // }) + let url="/schools/school_list.json"; + axios.get(url,{ + params: { + search: value + } + }).then((result)=>{ + if(result){ + if (result.data.status===0) { + this.setState({ + searchlistscholl: result.data.school_names, + + }) + if(result.data.school_names.length!=0){ + this.setState({ + fetching: false + }) + } + } + } + }).catch((error)=>{ + console.log(error) + }) + } + showApplyForAddOrgModal = () => { + this.applyForAddOrgForm.setVisible(true) + } + render() { + let {datatime,datatimetwo,school,searchlistscholl} = this.state; + const {getFieldDecorator} = this.props.form; + const propsWithoutForm = Object.assign({}, this.props) + delete propsWithoutForm.form + const options = this.state.searchlist && this.state.searchlist.map(d => ); + const optionschool = this.state.searchlistscholl===undefined?"":this.state.searchlistscholl===null?"":this.state.searchlistscholl==="[]"?"":this.state.searchlistscholl.map(z => ); + // console.log(this.props.current_user.user_school) + // form合并了 + // console.log("获取到的数据"); + // console.log(this.state); + // console.log(this.props); + // console.log(this.props.current_user); + return ( ++++++
+ 公告栏 + { + this.props.isAdmin()===true? +
- this.bianji(true)}> + 编辑 +
+ :"" + } + + + + ++ + + ++ { + whethertoedit === false? ++ + + + ++ { + description === null || description=== undefined ||description === "" ? ++ : +++ : ++![]({getImageUrl("images/educoder/nodata.png")})
+ 暂时还没有相关数据哦！
++ } ++ + +++ ++ } + + ++ + + + ) + } +} +const WrappedCoursesNewAppGoldclass = Form.create({name: 'goldsubject'})(Goldsubject); + +export default WrappedCoursesNewAppGoldclass; + + diff --git a/public/react/src/modules/courses/shixunHomework/CommitSummary.js b/public/react/src/modules/courses/shixunHomework/CommitSummary.js index fcd8ef1e9..129e020e9 100644 --- a/public/react/src/modules/courses/shixunHomework/CommitSummary.js +++ b/public/react/src/modules/courses/shixunHomework/CommitSummary.js @@ -191,7 +191,7 @@ class CommitSummary extends Component{ font-feature-settings: 'tnum'; /* margin-bottom: 24px; */ vertical-align: top; - } + } ` } diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js index 8ba9b8ac2..a37e58a92 100644 --- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js +++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js @@ -2412,7 +2412,7 @@ class Listofworksstudentone extends Component { console.log(error) }); - } + }; // // setComputeTime=()=>{ // this.setState({ diff --git a/public/react/src/modules/courses/shixunHomework/guide.css b/public/react/src/modules/courses/shixunHomework/guide.css index cd7ec9b0b..cc6fd8ee8 100755 --- a/public/react/src/modules/courses/shixunHomework/guide.css +++ b/public/react/src/modules/courses/shixunHomework/guide.css @@ -511,7 +511,7 @@ height: 53%; } .ysldiv71024{ - margin-top: 31%; + margin-top: 31% ; margin-left: 27%; margin-right: 0; height: 40%; diff --git a/public/react/src/modules/home/shixunsHome.js b/public/react/src/modules/home/shixunsHome.js index 6abc71747..0a18492cd 100644 --- a/public/react/src/modules/home/shixunsHome.js +++ b/public/react/src/modules/home/shixunsHome.js @@ -230,7 +230,7 @@ class ShixunsHome extends Component {+ ++ +this.applyForAddOrgForm = form} schoolName={school} + {...propsWithoutForm}> + {/*提示*/} ++ ++++++ + + +{this.props.match.params.coursesId === undefined ? "新建课堂" : "编辑课堂"}
+ 返回 +{item.tag_name} -}/)
+ {/**/}
@@ -301,7 +301,7 @@ class ShixunsHome extends Component {{item.tag_name} -
+ {/**/}
diff --git a/public/react/src/modules/modals/Jointheclass.js b/public/react/src/modules/modals/Jointheclass.js new file mode 100644 index 000000000..f61b1cbbe --- /dev/null +++ b/public/react/src/modules/modals/Jointheclass.js @@ -0,0 +1,70 @@ +import React, { Component } from 'react'; +import { Modal} from 'antd'; +import axios from 'axios'; +//加入金品课堂 +class Jointheclass extends Component { + + constructor(props) { + super(props); + } + + componentDidMount() { + // console.log("加入金品课堂"); + // console.log(this.props); + + } + + modalCancel=()=>{ + this.props.ysljoinmodalCancel(); + }; + + setDownload=()=>{ + var id=this.props.match.params.coursesId + + var url = `/courses/${id}/join_excellent_course.json`; + axios.post(url).then((result) => { + if(result){ + if(result.data){ + if(result.data.status === 0){ + this.props.showNotification(result.data.message); + this.props.ysljoinmodalCanceltwo(); + }else { + this.props.showNotification(result.data.message); + } + } + + } + }).catch((error) => { + console.log(error) + }) + + } + + + render() { + // console.log("加入金品课堂2"); + // console.log(this.props); + return( ++ + ) + } +} + +export default Jointheclass; \ No newline at end of file diff --git a/public/react/src/modules/paths/PathDetail/DetailTop.css b/public/react/src/modules/paths/PathDetail/DetailTop.css index 76b35177a..17ff8507f 100644 --- a/public/react/src/modules/paths/PathDetail/DetailTop.css +++ b/public/react/src/modules/paths/PathDetail/DetailTop.css @@ -1,3 +1,46 @@ -.userbluebgfont{ - color:#fff !important; +.userbluebgfont{ + color:#fff !important; +} + +.kaike{ + border-radius: 4px; + border: 1px solid rgba(255,255,255); + padding: 0px 10px; + cursor: pointer; + font-size: 14px; + display: block; + width: 120px; + text-align: center; + height: 40px; + line-height: 40px!important; + border-radius: 4px; + box-sizing: border-box; +} +.userNavs{ + line-height: 96px; + background: #fff; + height:96px; + background:rgba(255,255,255,1); + box-shadow:3px 5px 11px 1px rgba(230,230,230,0.5); + border-radius:4px; +} + +.userNavs li { + display: inline-block; + padding: 0 30px; + -webkit-box-sizing: border-box; + box-sizing: border-box; +} + +.newbianji1{ + font-size: 16px !important; + margin-right: 10px; + color: #4CACFF; + margin-bottom: 3px; + display: inline-block; +} + +.solidright{ + border-right: 1px solid #000; + height: 42px; } \ No newline at end of file diff --git a/public/react/src/modules/paths/PathDetail/DetailTop.js b/public/react/src/modules/paths/PathDetail/DetailTop.js index 701a2a3da..902a6d8bf 100644 --- a/public/react/src/modules/paths/PathDetail/DetailTop.js +++ b/public/react/src/modules/paths/PathDetail/DetailTop.js @@ -1,5 +1,5 @@ import React,{ Component } from "react"; -import { Modal,Radio,Input,Tooltip } from "antd"; +import { Modal,Radio,Input,Tooltip, Menu, Dropdown, Icon,Breadcrumb } from "antd"; import { BrowserRouter as Router, Route, Link } from "react-router-dom"; import SendPanel from "./sendPanel.js"; import { getImageUrl } from 'educoder'; @@ -20,10 +20,25 @@ class DetailTop extends Component{ Modalsbottomval:'', loadtype:false, deletepathtype:false, - cardsModalsavetype:false + cardsModalsavetype:false, + MenuItemskey:1, + courseslist:[] } } - + componentDidMount(){ + let courseslist=[] + this.props.courses.map((item,key)=>{ + if(1===key+1){ + return( + courseslist.push(item) + ) + } + }) + this.setState({ + courseslist:courseslist + }) + console.log(courseslist) + } allow_deletepath=()=>{ this.setState({ Modalstype:true, @@ -141,6 +156,29 @@ class DetailTop extends Component{ }) } + onVisibleChanges=(type)=>{ + this.setState({ + onVisibleChangestype:type + }) + } + + MenuItems=(keys)=>{ + let courseslist=[] + this.props.courses.map((item,key)=>{ + if(keys===key+1){ + return( + courseslist.push(item) + ) + } + }) + + console.log(courseslist) + + this.setState({ + MenuItemskey:keys, + courseslist:courseslist + }) + } render(){ let{detailInfoList}=this.props; let{Modalstype,Modalstopval,cardsModalcancel,cardsModalsave,Modalsbottomval,cardsModalsavetype,loadtype}=this.state; @@ -150,8 +188,28 @@ class DetailTop extends Component{ lineHeight: '30px', }; - return( -+++ +是否确认该加入课堂?
+ + //+ + let menu = ( + + ); + + + + return( + +- {detailInfoList === undefined ? "" : detailInfoList.tags === null ? "": + {tags === undefined ? "" :tags === null ? "":@@ -178,15 +259,15 @@ class DetailTop extends Component{ :"" } - {detailInfoList===undefined?"":detailInfoList.allow_statistics===true? + {detailInfoList===undefined?"":detailInfoList.allow_statistics===true?this.props.courses===undefined? 学习统计 - :"" + :"":"" } - { detailInfoList.allow_send === true && - + { detailInfoList.allow_send === true?this.props.courses===undefined? + :"":"" } - 学习人数{detailInfoList.member_count}
: ""} } -+ {this.props.courses===undefined? +:""} + + + {this.props.courses===undefined?"":detailInfoList.is_creator===true?+ 开课 + + 学习统计 + +:""} +*/} + {this.props.courses===undefined?"":} + + ++ +} +- + +
+ ++ + 第{this.state.MenuItemskey}次开课 ++ + - + {this.state.courseslist.map((item,key)=>{ + // course_id: 1309 + // course_identity: 5 + // course_status: {status: 1, time: "进行至第5周，共1642周"} + // first_category_url: "/courses/1309/informs" + return( +
++ ++ ) + }) + } + +++ + + + ++ 开课时间： +++ {item.start_date} ++++ + + + ++ 结课时间： +++ {item.end_date} ++++ ++ 报名人数： +++ {item.student_count}人 ++- + + {this.state.courseslist.map((item,key)=>{ + + return( +
++ {item.course_status.status===0?即将开课:""} + {item.course_status.status===1?{item.course_status.time}:""} + {item.course_status.status===2? + detailInfoList.is_creator===true?已结束:item.course_identity<6? + 已结束:"":""} + + + {item.course_status.status===0? + detailInfoList.is_creator===true? + 进入课堂 + :item.course_identity<6?+ )})} + + +报名成功+ :立即报名:""} + + + {item.course_status.status===1? + detailInfoList.is_creator===true? + 进入课堂 + :item.course_identity<6? + 立即学习 + :立即加入:""} + + {item.course_status.status===2? + detailInfoList.is_creator===true? + 进入课堂 + :item.course_identity<6? + 进入课堂 + :已结束:""} + +-技能标签 {detailInfoList.tags.length}
+技能标签 {tags.length}
{ - detailInfoList.tags && detailInfoList.tags.map((item,key)=>{ + tags && tags.map((item,key)=>{ return( {item.tag_name} ) @@ -420,7 +482,7 @@ class PathDetailIndex extends Component{- 15&&clickdetailInfoListtype===false?"newsubscript mb9 color-grey-9 fr":"newsubscript mb9 color-grey-9 none"} +} { - this.props.checkIfLogin()===false?"":detailInfoList === undefined ? "" : detailInfoList.progress === null ? "" : + this.props.checkIfLogin()===false?"123213":progress === undefined ? "" : progress === null ? "" :15&&clickdetailInfoListtype===false?"newsubscript mb9 color-grey-9 fr":"newsubscript mb9 color-grey-9 none"} onClick={()=>this.clickNewsubscript(0)} >...@@ -435,29 +497,29 @@ class PathDetailIndex extends Component{} { - detailInfoList ===undefined ?"":detailInfoList.members === null ?"": + members ===undefined ?"":members === null ?"":我的进展
- {detailInfoList.progress.my_score} / {detailInfoList.progress.all_score} + {progress.my_score} / {progress.all_score} - 已学 {detailInfoList.progress.learned}% - 学习耗时{this.timeStamp(detailInfoList.progress.time)} + 已学 {progress.learned}% + 学习耗时{this.timeStamp(progress.time)}
-+教学团队
- { detailInfoList===undefined? - detailInfoList.members && detailInfoList.members.map((item,key)=>{ + { members===undefined? + members && members.map((item,key)=>{ return( ) }) - :detailInfoList.allow_add_member===true? - detailInfoList.members && detailInfoList.members.map((item,key)=>{ + :detailInfoList===undefined?"":detailInfoList.allow_add_member===true? + members && members.map((item,key)=>{ return( ) }) - : detailInfoList.members && detailInfoList.members.map((item,key)=>{ + : members && members.map((item,key)=>{ return(diff --git a/public/react/src/modules/paths/ShixunPathCard.js b/public/react/src/modules/paths/ShixunPathCard.js index 1b0759d1f..79b9c1e13 100644 --- a/public/react/src/modules/paths/ShixunPathCard.js +++ b/public/react/src/modules/paths/ShixunPathCard.js @@ -13,6 +13,33 @@ class ShixunPathCard extends Component{ let {pathList}=this.props; return(+ + + { pathList && pathList.length > 0 ? ( @@ -22,23 +49,31 @@ class ShixunPathCard extends Component{ return(+ { item.tag_name === null ? "" :{item.tag_name} -} - -}/)
+ {/**/}
+ + { + item.excellent === false ? "" : ++ 开放课程 ++ } + +{/*target="_blank"*/} -![]({getImageUrl("images/educoder/icon/lockclose.svg")})
非试用内容，需要授权
+
@@ -77,4 +112,5 @@ class ShixunPathCard extends Component{ ) } } -export default ShixunPathCard; \ No newline at end of file +export default ShixunPathCard; + diff --git a/public/react/src/modules/tpm/TPMFork/TPMForklist.js b/public/react/src/modules/tpm/TPMFork/TPMForklist.js index b76683837..704cfad99 100644 --- a/public/react/src/modules/tpm/TPMFork/TPMForklist.js +++ b/public/react/src/modules/tpm/TPMFork/TPMForklist.js @@ -107,7 +107,7 @@ export default class TPMFork_listComponent extends Component {
{item.tag_name} -}/)
+ {/**/}
diff --git a/public/react/src/modules/tpm/shixuns/ShixunCard.js b/public/react/src/modules/tpm/shixuns/ShixunCard.js index ae6aa696d..2bb6a670a 100644 --- a/public/react/src/modules/tpm/shixuns/ShixunCard.js +++ b/public/react/src/modules/tpm/shixuns/ShixunCard.js @@ -88,7 +88,7 @@ class ShixunCard extends Component { item.tag_name === null ? "":{item.tag_name} -}
+ {/**/}
diff --git a/public/react/src/modules/user/usersInfo/InfosPath.js b/public/react/src/modules/user/usersInfo/InfosPath.js index d2ed2900c..cb02ed604 100644 --- a/public/react/src/modules/user/usersInfo/InfosPath.js +++ b/public/react/src/modules/user/usersInfo/InfosPath.js @@ -159,7 +159,9 @@ class InfosPath extends Component{ return(this.turnToCourses(`/paths/${item.id}`)}> { - item.tag &&{item.tag}+ item.tag &&![]({setImagesUrl("images/educoder/tag2.png")})
{item.tag} + {/*}*/}
+ diff --git a/public/react/src/modules/user/usersInfo/InfosShixun.js b/public/react/src/modules/user/usersInfo/InfosShixun.js index b86e69983..94ef3c29b 100644 --- a/public/react/src/modules/user/usersInfo/InfosShixun.js +++ b/public/react/src/modules/user/usersInfo/InfosShixun.js @@ -1,203 +1,205 @@ -import React, { Component } from 'react'; -import { SnackbarHOC } from 'educoder'; -import {BrowserRouter as Router,Route,Switch} from 'react-router-dom'; -import {Tooltip,Menu,Pagination,Spin} from 'antd'; -import Loadable from 'react-loadable'; -import Loading from '../../../Loading'; -import NoneData from '../../courses/coursesPublic/NoneData' -import axios from 'axios'; -import {getImageUrl,setImagesUrl} from 'educoder'; -import { TPMIndexHOC } from '../../tpm/TPMIndexHOC'; -import { CNotificationHOC } from '../../courses/common/CNotificationHOC' -import "./usersInfo.css" - -import Create from './publicCreatNew' - -class InfosShixun extends Component{ - constructor(props){ - super(props); - this.state={ - category:undefined, - page:1, - sort_by:'time', - status:undefined, - per_page:16, - isSpin:false, - - totalCount:undefined, - data:undefined - } - } - - componentDidMount=()=>{ - this.setState({ - isSpin:true - }) - let{category,status,sort_by,page}=this.state; - this.getCourses(category,status,sort_by,page); - } - - getCourses=(category,status,sort_by,page)=>{ - let url=`/users/${this.props.match.params.username}/shixuns.json`; - axios.get((url),{params:{ - category, - status, - sort_by, - page, - per_page:this.props.is_current && category && page ==1?17:16 - }}).then((result)=>{ - if(result){ - this.setState({ - totalCount:result.data.count, - data:result.data, - isSpin:false - }) - } - }).catch((error)=>{ - console.log(error); - }) - } - - //切换种类 - changeCategory=(cate)=>{ - this.setState({ - category:cate, - status:undefined, - page:1, - isSpin:true - }) - let{sort_by}=this.state; - this.getCourses(cate,undefined,sort_by,1); - } - // 切换状态 - changeStatus=(status)=>{ - this.setState({ - status, - page:1, - isSpin:true - }) - let{category,sort_by}=this.state; - this.getCourses(category,status,sort_by,1); - } - //切换页数 - changePage=(page)=>{ - this.setState({ - page, - isSpin:true - }) - let{category,sort_by,status}=this.state; - this.getCourses(category,status,sort_by,page); - } - - // 进入课堂 - turnToCourses=(url)=>{ - this.props.history.push(url); - } - - - // 切换排序方式 - changeOrder= (sort)=>{ - this.setState({ - sort_by:sort, - isSpin:true - }) - let{category,status,page}=this.state; - this.getCourses(category,status,sort,page); - } - - render(){ - let{ - category, - status, - sort_by, - page, - data, - totalCount, - isSpin - } = this.state; - let isStudent = this.props.isStudent(); - let is_current=this.props.is_current; - return( --- ) - } -} +import React, { Component } from 'react'; +import { SnackbarHOC } from 'educoder'; +import {BrowserRouter as Router,Route,Switch} from 'react-router-dom'; +import {Tooltip,Menu,Pagination,Spin} from 'antd'; +import Loadable from 'react-loadable'; +import Loading from '../../../Loading'; +import NoneData from '../../courses/coursesPublic/NoneData' +import axios from 'axios'; +import {getImageUrl,setImagesUrl} from 'educoder'; +import { TPMIndexHOC } from '../../tpm/TPMIndexHOC'; +import { CNotificationHOC } from '../../courses/common/CNotificationHOC' +import "./usersInfo.css" + +import Create from './publicCreatNew' + +class InfosShixun extends Component{ + constructor(props){ + super(props); + this.state={ + category:undefined, + page:1, + sort_by:'time', + status:undefined, + per_page:16, + isSpin:false, + + totalCount:undefined, + data:undefined + } + } + + componentDidMount=()=>{ + this.setState({ + isSpin:true + }) + let{category,status,sort_by,page}=this.state; + this.getCourses(category,status,sort_by,page); + } + + getCourses=(category,status,sort_by,page)=>{ + let url=`/users/${this.props.match.params.username}/shixuns.json`; + axios.get((url),{params:{ + category, + status, + sort_by, + page, + per_page:this.props.is_current && category && page ==1?17:16 + }}).then((result)=>{ + if(result){ + this.setState({ + totalCount:result.data.count, + data:result.data, + isSpin:false + }) + } + }).catch((error)=>{ + console.log(error); + }) + } + + //切换种类 + changeCategory=(cate)=>{ + this.setState({ + category:cate, + status:undefined, + page:1, + isSpin:true + }) + let{sort_by}=this.state; + this.getCourses(cate,undefined,sort_by,1); + } + // 切换状态 + changeStatus=(status)=>{ + this.setState({ + status, + page:1, + isSpin:true + }) + let{category,sort_by}=this.state; + this.getCourses(category,status,sort_by,1); + } + //切换页数 + changePage=(page)=>{ + this.setState({ + page, + isSpin:true + }) + let{category,sort_by,status}=this.state; + this.getCourses(category,status,sort_by,page); + } + + // 进入课堂 + turnToCourses=(url)=>{ + this.props.history.push(url); + } + + + // 切换排序方式 + changeOrder= (sort)=>{ + this.setState({ + sort_by:sort, + isSpin:true + }) + let{category,status,page}=this.state; + this.getCourses(category,status,sort,page); + } + + render(){ + let{ + category, + status, + sort_by, + page, + data, + totalCount, + isSpin + } = this.state; + let isStudent = this.props.isStudent(); + let is_current=this.props.is_current; + return( +- --- { - category && category == "manage" && is_current && -- this.changeCategory()}>全部
-- this.changeCategory("manage")}>{is_current ? "我":"TA"}管理的
-- this.changeCategory("study")}>{is_current ? "我":"TA"}学习的
--- } - { - category && category == "study" && is_current && -- this.changeStatus()}>全部
-- this.changeStatus("editing")}>编辑中
-- this.changeStatus("applying")}>待审核
-- this.changeStatus("published")}>已发布
-- this.changeStatus("closed")}>已关闭
--- } -- this.changeStatus()}>全部
-- this.changeStatus("processing")}>未通关
-- this.changeStatus("passed")}>已通关
-- 共参与{totalCount}个{category?category=="manage"?"发布":"学习":"实训"} ----- - {sort_by=="time"?"时间最新":"语言类别"} -
--
-
- this.changeOrder("time")}>时间最新 -
- this.changeOrder("language")}>语言类别 -
- { - page == 1 && is_current && !category && this.props.current_user && this.props.current_user.user_identity != "学生" ? -- { - totalCount > 15 && -:"" - } - { - (!data || data.shixuns.length==0) && (!is_current || (this.props.current_user && this.props.current_user.user_identity === "学生" )) && - } - { - data && data.shixuns && data.shixuns.map((item,key)=>{ - return( - this.turnToCourses(`/shixuns/${item.identifier}/challenges`)}> - { - item.tag &&- ) - }) - } -{item.tag}- } - -![]({setImagesUrl("images/educoder/tag2.png")}/)
- - -
-- } -- ++ ) + } +} export default InfosShixun; \ No newline at end of file diff --git a/public/stylesheets/educoder/edu-all.css b/public/stylesheets/educoder/edu-all.css index 6b156558f..a07102d67 100644 --- a/public/stylesheets/educoder/edu-all.css +++ b/public/stylesheets/educoder/edu-all.css @@ -114,8 +114,25 @@ em.vertical-line{display: inline-block;width: 2px;background: #999;height: 10px} .smallSquare:nth-child(3n+0){margin-right: 0px;} .partimg{height: 180px;width: 100%;border-radius: 6px 6px 0px 0px;} /*块状列表上面的绿色标签*/ -.tag-green{position: absolute;left: 0px;top:20px;} -.tag-green .tag-name{display: block;width: auto;background-image: url("/images/educoder/tag1.png");background-size: 100% 100%;padding: 0px 8px;color: #fff;float: left;} +.tag-green{ + position: absolute; + left: 15px; + bottom: 95px;} +.tag-green .tag-name{display: block;width: auto; + /*background-image: url("/images/educoder/tag1.png");*/ + background: #000000; + border: 1px solid #fff; + border-radius: 3px; + font-size: 14px; + background-size: 100% 100%;padding: 0px 8px;color: #fff;float: left;} +.tag-orange{position: absolute;right: 0px;top:20px;} +.tag-orange .tag-name{display: block;width: auto;background-color:#FF6800; + background-size: 100% 100%;padding: 0px 8px;color: #fff;float: left; + height: 28px; + line-height: 28px; + border-top-left-radius: 4px; + border-bottom-left-radius: 4px; +} /*发送至弹框里的下拉框*/ .downSelectOption{position: relative;height: 35px;} .downSelectOption .showOption{background-color: #F4F4F4;border: 1px solid #EAEAEA;width: 100%;padding: 5px 40px 5px 5px;outline: none;height: 100%;box-sizing: border-box;} diff --git a/public/stylesheets/educoder/edu-main.css b/public/stylesheets/educoder/edu-main.css index c23c3d350..4aa426192 100644 --- a/public/stylesheets/educoder/edu-main.css +++ b/public/stylesheets/educoder/edu-main.css @@ -551,7 +551,7 @@ a:hover.task-btn-orange{background: #459BE6;} a.user_bluebg_btn{background-color:#4CACFF;color: #fff;} a.user_orangebg_btn{background-color:#FF6800;color: #fff;} a.user_greybg_btn{background-color:#747A7F;color: #fff;} - +/*.user_white_btn{border: 1px solid #ffffff;color: #ffffff!important;}*/ .pointer{cursor: pointer} .cdefault{cursor: default}+ +++ { + category && category == "manage" && is_current && +- this.changeCategory()}>全部
+- this.changeCategory("manage")}>{is_current ? "我":"TA"}管理的
+- this.changeCategory("study")}>{is_current ? "我":"TA"}学习的
+++ } + { + category && category == "study" && is_current && +- this.changeStatus()}>全部
+- this.changeStatus("editing")}>编辑中
+- this.changeStatus("applying")}>待审核
+- this.changeStatus("published")}>已发布
+- this.changeStatus("closed")}>已关闭
+++ } +- this.changeStatus()}>全部
+- this.changeStatus("processing")}>未通关
+- this.changeStatus("passed")}>已通关
++ 共参与{totalCount}个{category?category=="manage"?"发布":"学习":"实训"} ++++- + {sort_by=="time"?"时间最新":"语言类别"} +
+-
+
- this.changeOrder("time")}>时间最新 +
- this.changeOrder("language")}>语言类别 +
+ { + page == 1 && is_current && !category && this.props.current_user && this.props.current_user.user_identity != "学生" ? ++ { + totalCount > 15 && +:"" + } + { + (!data || data.shixuns.length==0) && (!is_current || (this.props.current_user && this.props.current_user.user_identity === "学生" )) && + } + { + data && data.shixuns && data.shixuns.map((item,key)=>{ + return( + this.turnToCourses(`/shixuns/${item.identifier}/challenges`)}> + { + item.tag &&+ ) + }) + } +{item.tag} + {/*+ } + +*/}
+ ++ } ++