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 5 years ago
parent 0f97d9e494 5bf570bf33
commit 3494b22615
7 changed files with 327 additions and 305 deletions
Show Stats Download Patch File Download Diff File

30
public/react/config/webpack.config.dev.js
Unescape View File

@ -113,21 +113,21 @@ module.exports = {
// First, run the linter.
// It's important to do this before Babel processes the JS.
{
test: /\.(js|jsx|mjs)$/,
enforce: 'pre',
use: [
{
options: {
formatter: eslintFormatter,
eslintPath: require.resolve('eslint'),
},
loader: require.resolve('eslint-loader'),
},
],
include: paths.appSrc,
},
// {
// test: /\.(js|jsx|mjs)$/,
// enforce: 'pre',
// use: [
// {
// options: {
// formatter: eslintFormatter,
// eslintPath: require.resolve('eslint'),
//
// },
// loader: require.resolve('eslint-loader'),
// },
// ],
// include: paths.appSrc,
// },
{
// "oneOf" will traverse all following loaders until one will
// match the requirements. When no loader matches it will fall

13
public/react/src/modules/courses/Resource/Fileslistitem.js
Unescape View File

@ -40,7 +40,7 @@ class Fileslistitem extends Component{
let link = document.createElement('a');
// link.href = window.URL.createObjectURL(new Blob([result.data.url]));
link.href = result.data.url;
link.download = encodeURI(result.data.title);
// link.download = encodeURI(result.data.title);
//兼容火狐浏览器
document.body.appendChild(link);
let evt = document.createEvent("MouseEvents");
@ -288,7 +288,16 @@ class Fileslistitem extends Component{
{ discussMessage.publish_time===null?"":discussMessage.is_publish===true?moment(discussMessage.publish_time).fromNow():moment(discussMessage.publish_time).format('YYYY-MM-DD HH:mm')}
</span>
</span>
{this.props.isAdmin ||this.props.current_user.login===discussMessage.author.login?
{this.props.isAdmin?
<span className={"fr mrf2 mr10"}>
<WordsBtn style="blue" className="colorblue font-16 mr20 fr">
<a className="btn colorblue"
onClick={()=>this.settingList()}>设置</a>
</WordsBtn>
</span>:""}
{this.props.current_user.login===discussMessage.author.login?
<span className={"fr mrf2 mr10"}>
<WordsBtn style="blue" className="colorblue font-16 mr20 fr">

29
public/react/src/modules/courses/Resource/index.js
Unescape View File

@ -41,7 +41,9 @@ class Fileslists extends Component{
}
componentDidMount=()=>{
this.setState({
isSpin:true
isSpin:true,
checkBoxValues:[],
checkAllValue:false
})
if(this.props.match.params.main_id){
this.seactall();
@ -65,17 +67,21 @@ class Fileslists extends Component{
}
componentDidUpdate = (prevProps) => {
if(prevProps.match.params.main_id != this.props.match.params.main_id){
this.setState({
isSpin:true
})
this.setState({
isSpin:true,
checkBoxValues:[],
checkAllValue:false
})
if(this.props.match.params.main_id!=undefined){
this.seactall();
}
}
if(prevProps.match.params.Id != this.props.match.params.Id){
this.setState({
isSpin:true
})
this.setState({
isSpin:true,
checkBoxValues:[],
checkAllValue:false
})
if(this.props.match.params.Id!=undefined){
this.seactall(parseInt(this.props.match.params.Id),1)
}
@ -533,7 +539,7 @@ class Fileslists extends Component{
// ModalSave:this.cancelmodel,
// Loadtype:true,
checkBoxValues:[],
// checkAllValue:false
checkAllValue:false
})
this.props.showNotification('资源移动成功')
@ -681,6 +687,9 @@ class Fileslists extends Component{
<div className="studentList_operation_ul">
{this.props.isAdmin()?<li className="li_line"><a href="javascript:void(0)" className="color-grey-9" onClick={this.onDelete}>删除</a></li>:""}
{this.props.isAdmin()?<li className="li_line"><a href="javascript:void(0)" className="color-grey-9" onClick={this.onSend}>发送</a></li>:""}
{this.props.isAdmin()?
<li className="li_line"><a href="javascript:void(0)" className="color-grey-9" onClick={this.onOpen}>立即发布</a></li>
:""}
{this.props.isAdmin()?course_is_public===true?
<li className="li_line"><a href="javascript:void(0)" className="color-grey-9" onClick={this.onOpen}>设为公开</a></li>
:"":""}
@ -785,7 +794,7 @@ class Fileslists extends Component{
isAdmin={this.props.isAdmin()}
isStudent={this.props.isStudent()}
isNotMember={this.props.isNotMember()}
checkBox={<Checkbox value={item.id}></Checkbox>}
checkBox={this.props.isAdmin()?<Checkbox value={item.id}></Checkbox>:""}
Settingtypes={(id)=>this.Settingtypes(id)}
coursesId={this.props.match.params.coursesId}
updatafiledfun={()=>this.updatafiled()}
@ -830,7 +839,7 @@ class Fileslists extends Component{
<div className="alltask edu-back-white"
style={
{
display: total_count===undefined?'block' :total_count===0? 'block' : 'none'
display: files===undefined?'block' :files.length===0? 'block' : 'none'
}
}
>

12
public/react/src/modules/courses/coursesPublic/Addcourses.js
Unescape View File

@ -153,14 +153,14 @@ class Addcourses extends Component{
this.setState({
invite_codetype:true,
invite_codevalue:"邀请码不能为空",
spinning:false
isSpin:false
})
return
}else{
this.setState({
invite_codetype:false,
invite_codevalue:" ",
spinning:false
isSpin:false
})
}
@ -217,12 +217,12 @@ class Addcourses extends Component{
}
this.setState({
spinning:false
isSpin:false
})
}).catch((error) => {
console.log(error)
this.setState({
spinning:false
isSpin:false
})
})
@ -313,7 +313,7 @@ class Addcourses extends Component{
<li className="clearfix mb10">
<label className="panel-form-label fl">课堂邀请码：</label>
<Input type="text" className="input-60-40 fl mt5" name="invite_code"
placeholder="请输入五位课堂邀请码"
placeholder="请输入5位课堂邀请码或6位分班邀请码"
style={{ height: '30px'}}
value={invite_code} onInput={this.inputjoinclassvalue}/>
</li>
@ -321,7 +321,7 @@ class Addcourses extends Component{
<p id="none_invite_code_notice"
className="color-orange none f12"
// style={{marginLeft: '90px',display:code_notice===true?'block':"none"}}
>请输入五位课堂邀请码</p>
>请输入5位课堂邀请码或6位分班邀请码</p>
<li className="clearfix ">

512
public/react/src/modules/courses/shixunHomework/ShixunWorkDetails.js
Unescape View File

@ -1,253 +1,259 @@
import React, {Component} from "react";
import {WordsBtn} from 'educoder';
import { Form, Select, Input, Button,Checkbox,Upload,Icon,message,Modal, Table, Divider,InputNumber, Tag,DatePicker,Radio,Tooltip} from "antd";
import {Link,Switch,Route,Redirect} from 'react-router-dom';
import axios from 'axios';
import ShixunCustomsPass from "./Shixunworkdetails/ShixunCustomsPass";
import '../css/members.css';
import "../common/formCommon.css";
import '../css/Courses.css';
import './style.css';
class ShixunWorkDetails extends Component {
constructor(props) {
super(props);
this.state = {
data:undefined
}
}
componentDidMount() {
let homeworkid=this.props.match.params.homeworkid;
let userid=this.props.match.params.userid;
let url = "/homework_commons/"+homeworkid+"/code_review_detail.json";
axios.get(url,{
params: {
user_id:userid,
}
}).then((result) => {
if (result.status === 200) {
this.setState({
data:result.data
})
}
}).catch((error) => {
console.log(error)
})
let query = this.props.location.pathname;
const type = query.split('/');
this.setState({
shixuntypes:type[3]
})
}
goback=()=>{
window.history.go(-1)
}
render() {
let{data}=this.state;
return (
data===undefined?"":<div className="newMain clearfix ">
<div className={"educontent mb20"}>
<div className="educontent">
<p className="clearfix mt20">
<WordsBtn className="fl color-grey-9" style="btn colorgrey hovercolorblue">
<Link to={"/courses/"+data&&data.course_id+"/students"}>
<span className={"color-grey-9"}>{data&&data.course_name}</span>
</Link>
</WordsBtn>
<span className="color-grey-9 fl ml3 mr3">&gt;</span>
<WordsBtn style="grey" className="btn colorgrey fl hovercolorblue ">
<Link to={"/courses/"+data&&data.course_id+"/"+this.state.shixuntypes+"/"+data&&data.homework_common_id}>
<span className={"color-grey-9"}>实训作业</span>
</Link>
</WordsBtn>
<span className="color-grey-9 fl ml3 mr3">&gt;</span>
<WordsBtn className="fl">{data&&data.username}</WordsBtn>
</p>
</div>
<div className="padding10-30 clearfix">
<span className="fl font-18">{data&&data.homework_common_name}</span>
<a className="fr color-grey-9 mt4" onClick={this.goback}>返回</a>
</div>
<div className="padding10-30 edu-back-white clearfix">
<span className="fl color-orange font-14">非编程类型任务，不参与查重</span>
<span className="fr mt4">
<span className={"color656565"}>被查作品：</span>
<span className={"mr20"}>{data&&data.username}</span>
<span className={"color-orange"}>{data&&data.final_score}分</span>
</span>
</div>
<div className="stud-class-set bor-bottom-greyE">
<div className="clearfix edu-back-white poll_list">
<ShixunCustomsPass
data={data}
/>
</div>
</div>
</div>
</div>
)
}
}
export default ShixunWorkDetails;
// {/*<div className="stud-class-set bor-bottom-greyE">*/}
// {/*<div className="clearfix edu-back-white poll_list">*/}
//
// {/*<div className="font-16 color-dark-21 shixunreporttitle ml20">总体评价</div>*/}
//
// {/*<ConclusionEvaluation*/}
// {/*data={data}*/}
// {/*/>*/}
//
// {/*</div>*/}
// {/*</div>*/}
//
// {/*<div className="stud-class-set">*/}
// {/*<div className="clearfix edu-back-white poll_list">*/}
//
// {/*<div className="font-16 color-dark-21 shixunreporttitle ml20">阶段成绩</div>*/}
//
// {/*<OfficialAcademicTranscript*/}
// {/*data={data}*/}
// {/*/>*/}
//
// {/*</div>*/}
// {/*</div>*/}
//
// {/*<div className="stud-class-set bor-bottom-greyE"*/}
// {/*style={{display:data&&data.work_description===null?"none":""}}*/}
// {/*>*/}
// {/*<div className="clearfix edu-back-white poll_list">*/}
// {/*<div className="font-16 color-dark-21 shixunreporttitle ml20">个人总结</div>*/}
// {/*<style>*/}
// {/*{`*/}
// {/*.personalsummary{*/}
// {/*height:115px;*/}
// {/*border:1px solid rgba(235,235,235,1);*/}
// {/*border-radius:2px;*/}
// {/*}*/}
// {/*.pad040{*/}
// {/*padding: 0px 40px 40px;*/}
// {/*}*/}
// {/*.pad40px{*/}
// {/*padding-bottom: 40px;*/}
// {/*}*/}
// {/*.codebox{*/}
// {/*height: 40px;*/}
// {/*line-height: 30px;*/}
// {/*}*/}
// {/*.codeboxright{*/}
// {/*color: #999999!important;*/}
// {/*font-size: 16px;*/}
// {/*}*/}
// {/*`}*/}
// {/*</style>*/}
// {/*<div className={"pad040"}>*/}
// {/*<div className={"personalsummary"}>*/}
// {/*{data&&data.work_description}*/}
// {/*</div>*/}
// {/*</div>*/}
// {/*</div>*/}
// {/*</div>*/}
//
// {/*<div className="stud-class-set bor-bottom-greyE">*/}
// {/*<div className="clearfix edu-back-white poll_list">*/}
// {/*<div className="font-16 color-dark-21 shixunreporttitle ml20">图形统计</div>*/}
// {/*<Shixunechart*/}
// {/*data={data}*/}
// {/*/>*/}
// {/*</div>*/}
// {/*</div>*/}
//
// {/*<div className="stud-class-set bor-bottom-greyE">*/}
// {/*<div className="clearfix edu-back-white poll_list pad40px">*/}
// {/*<div className="font-16 color-dark-21 shixunreporttitle ml20">实训详情</div>*/}
// {/*<style>*/}
// {/*{`*/}
// {/*.poll_list a{*/}
// {/*padding:0px !important;*/}
// {/*}*/}
// {/*.backgroud4CACFF{*/}
// {/*background: #4CACFF;*/}
// {/*}*/}
// {/*`}*/}
// {/*</style>*/}
// {/*{*/}
// {/*data&&data.shixun_detail.map((item,key)=>{*/}
// {/*return(*/}
// {/*<div key={key} className={"mb20"}>*/}
// {/*<div className="font-16 color-dark-21 ml20 mr20">*/}
// {/*<p className="clearfix mb20">*/}
// {/*<span className="panel-inner-icon mr15 fl mt3 backgroud4CACFF">*/}
// {/*<i className="fa fa-code font-16 color_white"></i>*/}
// {/*</span>*/}
// {/*<span className="fl mt3 font-14">*/}
// {/*<span className="font-bd mr15">第{item.position}关</span>*/}
// {/*<Link to={/tasks/+item.game_identifier}>*/}
// {/*<span className={"font-14"}>{item.subject}</span>*/}
// {/*</Link>*/}
// {/*</span>*/}
// {/*</p>*/}
// {/*<Coursesshixundetails*/}
// {/*data={item.outputs}*/}
// {/*/>*/}
// {/*</div>*/}
//
// {/*{item.st===0?<div className="font-16 color-dark-21 ml20 mr20">*/}
// {/*<div className="bor-grey-e mt15">*/}
// {/*<p className="clearfix pt5 pb5 pl15 pr15 back-f6-grey codebox">*/}
// {/*<span className="fl">最近通过的代码</span>*/}
// {/*<span className="fr codeboxright">{item.path}</span>*/}
// {/*</p>*/}
//
// {/*<div className="test-code bor-top-greyE">*/}
// {/*<li className="clearfix" xmlns="http://www.w3.org/1999/html">*/}
// {/*<CodeMirror*/}
// {/*value={item.passed_code}*/}
// {/*options={{*/}
// {/*// mode: 'xml',*/}
// {/*theme: 'default',*/}
// {/*lineNumbers: true,*/}
// {/*// extraKeys: {"Ctrl-Q": "autocomplete"}, // 快捷键*/}
// {/*indentUnit: 4, //代码缩进为一个tab的距离*/}
// {/*matchBrackets: true,*/}
// {/*autoRefresh: true,*/}
// {/*smartIndent: true,//智能换行*/}
// {/*styleActiveLine: true,*/}
// {/*lint: true,*/}
// {/*readOnly: "nocursor"*/}
// {/*}}*/}
// {/*/>*/}
// {/*</li>*/}
// {/*</div>*/}
// {/*</div>*/}
// {/*</div>:""}*/}
// {/*</div>*/}
// {/*)*/}
// {/*})*/}
// {/*}*/}
// {/*</div>*/}
// {/*</div>*/}
// {/*</div>*/}
//
import React, {Component} from "react";
import {WordsBtn} from 'educoder';
import { Form, Select, Input, Button,Checkbox,Upload,Icon,message,Modal, Table, Divider,InputNumber, Tag,DatePicker,Radio,Tooltip,Spin} from "antd";
import {Link,Switch,Route,Redirect} from 'react-router-dom';
import axios from 'axios';
import ShixunCustomsPass from "./Shixunworkdetails/ShixunCustomsPass";
import '../css/members.css';
import "../common/formCommon.css";
import '../css/Courses.css';
import './style.css';
class ShixunWorkDetails extends Component {
constructor(props) {
super(props);
this.state = {
data:undefined,
spinning:true
}
}
componentDidMount() {
this.setState({
spinning:true
})
let homeworkid=this.props.match.params.homeworkid;
let userid=this.props.match.params.userid;
let url = "/homework_commons/"+homeworkid+"/code_review_detail.json";
axios.get(url,{
params: {
user_id:userid,
}
}).then((result) => {
if (result.status === 200) {
this.setState({
data:result.data,
spinning:false
})
}
}).catch((error) => {
console.log(error)
})
let query = this.props.location.pathname;
const type = query.split('/');
this.setState({
shixuntypes:type[3]
})
}
goback=()=>{
window.history.go(-1)
}
render() {
let{data}=this.state;
console.log(data)
return (
<Spin size="large" spinning={this.state.spinning}>
{data===undefined? "":<div className="newMain clearfix ">
<div className={"educontent mb20"}>
<div className="educontent">
<p className="clearfix mt20">
<WordsBtn className="fl color-grey-9" style="btn colorgrey hovercolorblue">
<Link to={"/courses/"+data&&data.course_id+"/students"}>
<span className={"color-grey-9"}>{data&&data.course_name}</span>
</Link>
</WordsBtn>
<span className="color-grey-9 fl ml3 mr3">&gt;</span>
<WordsBtn style="grey" className="btn colorgrey fl hovercolorblue ">
<Link to={"/courses/"+data&&data.course_id+"/"+this.state.shixuntypes+"/"+data&&data.homework_common_id}>
<span className={"color-grey-9"}>实训作业</span>
</Link>
</WordsBtn>
<span className="color-grey-9 fl ml3 mr3">&gt;</span>
<WordsBtn className="fl">{data&&data.username}</WordsBtn>
</p>
</div>
<div className="padding10-30 clearfix">
<span className="fl font-18">{data&&data.homework_common_name}</span>
<a className="fr color-grey-9 mt4" onClick={this.goback}>返回</a>
</div>
<div className="padding10-30 edu-back-white clearfix">
<span className="fl color-orange font-14">非编程类型任务，不参与查重</span>
<span className="fr mt4">
<span className={"color656565"}>被查作品：</span>
<span className={"mr20"}>{data&&data.username}</span>
<span className={"color-orange"}>{data&&data.final_score}分</span>
</span>
</div>
<div className="stud-class-set bor-bottom-greyE">
<div className="clearfix edu-back-white poll_list">
<ShixunCustomsPass
data={data}
/>
</div>
</div>
</div>
</div>}
</Spin>
)
}
}
export default ShixunWorkDetails;
// {/*<div className="stud-class-set bor-bottom-greyE">*/}
// {/*<div className="clearfix edu-back-white poll_list">*/}
//
// {/*<div className="font-16 color-dark-21 shixunreporttitle ml20">总体评价</div>*/}
//
// {/*<ConclusionEvaluation*/}
// {/*data={data}*/}
// {/*/>*/}
//
// {/*</div>*/}
// {/*</div>*/}
//
// {/*<div className="stud-class-set">*/}
// {/*<div className="clearfix edu-back-white poll_list">*/}
//
// {/*<div className="font-16 color-dark-21 shixunreporttitle ml20">阶段成绩</div>*/}
//
// {/*<OfficialAcademicTranscript*/}
// {/*data={data}*/}
// {/*/>*/}
//
// {/*</div>*/}
// {/*</div>*/}
//
// {/*<div className="stud-class-set bor-bottom-greyE"*/}
// {/*style={{display:data&&data.work_description===null?"none":""}}*/}
// {/*>*/}
// {/*<div className="clearfix edu-back-white poll_list">*/}
// {/*<div className="font-16 color-dark-21 shixunreporttitle ml20">个人总结</div>*/}
// {/*<style>*/}
// {/*{`*/}
// {/*.personalsummary{*/}
// {/*height:115px;*/}
// {/*border:1px solid rgba(235,235,235,1);*/}
// {/*border-radius:2px;*/}
// {/*}*/}
// {/*.pad040{*/}
// {/*padding: 0px 40px 40px;*/}
// {/*}*/}
// {/*.pad40px{*/}
// {/*padding-bottom: 40px;*/}
// {/*}*/}
// {/*.codebox{*/}
// {/*height: 40px;*/}
// {/*line-height: 30px;*/}
// {/*}*/}
// {/*.codeboxright{*/}
// {/*color: #999999!important;*/}
// {/*font-size: 16px;*/}
// {/*}*/}
// {/*`}*/}
// {/*</style>*/}
// {/*<div className={"pad040"}>*/}
// {/*<div className={"personalsummary"}>*/}
// {/*{data&&data.work_description}*/}
// {/*</div>*/}
// {/*</div>*/}
// {/*</div>*/}
// {/*</div>*/}
//
// {/*<div className="stud-class-set bor-bottom-greyE">*/}
// {/*<div className="clearfix edu-back-white poll_list">*/}
// {/*<div className="font-16 color-dark-21 shixunreporttitle ml20">图形统计</div>*/}
// {/*<Shixunechart*/}
// {/*data={data}*/}
// {/*/>*/}
// {/*</div>*/}
// {/*</div>*/}
//
// {/*<div className="stud-class-set bor-bottom-greyE">*/}
// {/*<div className="clearfix edu-back-white poll_list pad40px">*/}
// {/*<div className="font-16 color-dark-21 shixunreporttitle ml20">实训详情</div>*/}
// {/*<style>*/}
// {/*{`*/}
// {/*.poll_list a{*/}
// {/*padding:0px !important;*/}
// {/*}*/}
// {/*.backgroud4CACFF{*/}
// {/*background: #4CACFF;*/}
// {/*}*/}
// {/*`}*/}
// {/*</style>*/}
// {/*{*/}
// {/*data&&data.shixun_detail.map((item,key)=>{*/}
// {/*return(*/}
// {/*<div key={key} className={"mb20"}>*/}
// {/*<div className="font-16 color-dark-21 ml20 mr20">*/}
// {/*<p className="clearfix mb20">*/}
// {/*<span className="panel-inner-icon mr15 fl mt3 backgroud4CACFF">*/}
// {/*<i className="fa fa-code font-16 color_white"></i>*/}
// {/*</span>*/}
// {/*<span className="fl mt3 font-14">*/}
// {/*<span className="font-bd mr15">第{item.position}关</span>*/}
// {/*<Link to={/tasks/+item.game_identifier}>*/}
// {/*<span className={"font-14"}>{item.subject}</span>*/}
// {/*</Link>*/}
// {/*</span>*/}
// {/*</p>*/}
// {/*<Coursesshixundetails*/}
// {/*data={item.outputs}*/}
// {/*/>*/}
// {/*</div>*/}
//
// {/*{item.st===0?<div className="font-16 color-dark-21 ml20 mr20">*/}
// {/*<div className="bor-grey-e mt15">*/}
// {/*<p className="clearfix pt5 pb5 pl15 pr15 back-f6-grey codebox">*/}
// {/*<span className="fl">最近通过的代码</span>*/}
// {/*<span className="fr codeboxright">{item.path}</span>*/}
// {/*</p>*/}
//
// {/*<div className="test-code bor-top-greyE">*/}
// {/*<li className="clearfix" xmlns="http://www.w3.org/1999/html">*/}
// {/*<CodeMirror*/}
// {/*value={item.passed_code}*/}
// {/*options={{*/}
// {/*// mode: 'xml',*/}
// {/*theme: 'default',*/}
// {/*lineNumbers: true,*/}
// {/*// extraKeys: {"Ctrl-Q": "autocomplete"}, // 快捷键*/}
// {/*indentUnit: 4, //代码缩进为一个tab的距离*/}
// {/*matchBrackets: true,*/}
// {/*autoRefresh: true,*/}
// {/*smartIndent: true,//智能换行*/}
// {/*styleActiveLine: true,*/}
// {/*lint: true,*/}
// {/*readOnly: "nocursor"*/}
// {/*}}*/}
// {/*/>*/}
// {/*</li>*/}
// {/*</div>*/}
// {/*</div>*/}
// {/*</div>:""}*/}
// {/*</div>*/}
// {/*)*/}
// {/*})*/}
// {/*}*/}
// {/*</div>*/}
// {/*</div>*/}
// {/*</div>*/}
//

32
public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js
Unescape View File

@ -87,7 +87,7 @@ class ShixunWorkModal extends Component{
let {page,limit,group_list}=this.state;
let newpage=page+1;
let newgroup_list=group_list;
debugger
let url="/homework_commons/"+this.props.match.params.homeworkid+"/group_list.json";
axios.get(url,{params:{
@ -97,7 +97,7 @@ class ShixunWorkModal extends Component{
}).then((response) => {
if(response!==null || response!==undefined){
if(response.data.group_list.length>0){
console.log("84");
response.data.group_list.map((item,key)=>{
newgroup_list.push(item);
this.setState({
@ -111,8 +111,7 @@ class ShixunWorkModal extends Component{
if(response.data.ungroup_list===undefined || response.data.ungroup_list === null) {
}else {
console.log("95");
console.log(response.data.ungroup_list);
newgroup_list.push(response.data.ungroup_list);
this.setState({
course_groups:response.data,
@ -244,24 +243,23 @@ class ShixunWorkModal extends Component{
.fontlefts{text-align: left;}
`}</style>
<ul className="clearfix edu-txt-center">
<li className="fl paddingleft22 fontlefts" style={{width:'150px'}}>分班名称</li>
<li className="fl edu-txt-left" style={{width:'150px'}}>有效作品数</li>
<li className="fl paddingleft22 fontlefts" style={{width:'260px'}}>分班名称</li>
<li className="fl edu-txt-left" style={{width:'117px'}}>有效作品数</li>
<li className="fl" style={{width:'100px'}}>上次查重时间</li>
</ul>
{course_groups===undefined?"":
<ul className="upload_select_box fl clearfix mt10 mb10" tyle={{"overflow-y":"auto"}}id="search_not_members_list"
onScroll={this.contentViewScroll}
>
onScroll={this.contentViewScroll}
>
<Checkbox.Group style={{ width: '100%' }} onChange={this.shixunhomeworkedit} value={group_ids}>
{
group_list===undefined?
group_list===undefined?course_groups.ungroup_list.work_count===0?"":
<div className="clearfix edu-txt-center lineh-40 bor-bottom-greyE">
<li className="fl" style={{width: '100px'}}>
<li className="fl task-hide" style={{width: '240px'}}>
<Checkbox
className="fl task-hide edu-txt-left"
name="shixun_homework[]"
@ -271,8 +269,8 @@ class ShixunWorkModal extends Component{
className="task-hide color-grey-name" title="frerere">{course_groups.ungroup_list.name}</label>
</Checkbox>
</li>
<li className="fl" style={{width: '150px'}}>
{course_groups.ungroup_list.works_count}
<li className="fl" style={{width: '100px'}}>
{course_groups.ungroup_list.work_count}
</li>
<li className="fl" style={{width: '160px'}}>
{course_groups.ungroup_list.last_review_time}
@ -282,8 +280,8 @@ class ShixunWorkModal extends Component{
:
group_list&&group_list.map((item,key)=>{
return(
<div className="clearfix edu-txt-center lineh-40 bor-bottom-greyE" key={key}>
<li className="fl" style={{width: '100px'}}>
item.work_count===0?"":<div className="clearfix edu-txt-center lineh-40 bor-bottom-greyE" key={key}>
<li className="fl task-hide" style={{width: '240px'}}>
<Checkbox
className="fl task-hide edu-txt-left"
name="shixun_homework[]"
@ -293,8 +291,8 @@ class ShixunWorkModal extends Component{
className="task-hide color-grey-name" title="frerere">{item===undefined?"":item.name}</label>
</Checkbox>
</li>
<li className="fl" style={{width: '150px'}}>
{item===undefined?"":item.works_count}
<li className="fl" style={{width: '100px'}}>
{item===undefined?"":item.works_count===undefined?item.work_count:item.works_count}
</li>
<li className="fl" style={{width: '160px'}}>
{item===undefined?"":item.last_review_time}

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

@ -817,12 +817,12 @@ submittojoinclass=(value)=>{
<li className="clearfix mb10">
<label className="panel-form-label fl">项目邀请码：</label>
<Input type="text" className="input-60-40 fl" name="invite_code"
placeholder="请输入六位课堂邀请码" value={tojoinclasstitle} onInput={this.inputjoinclassvalue}/>
placeholder="请输入5位课堂邀请码或6位分班邀请码" value={tojoinclasstitle} onInput={this.inputjoinclassvalue}/>
</li>
<p id="none_invite_code_notice"
className="color-orange none f12"
style={{marginLeft: '90px',display:code_notice===true?'block':"none"}}>请输入六位课堂邀请码</p>
style={{marginLeft: '90px',display:code_notice===true?'block':"none"}}>请输入5位课堂邀请码或6位分班邀请码</p>
<li className="clearfix ">

Write Preview
Loading…
Cancel
Save