dev_forum
杨树明 6 years ago
parent d0166f5980
commit 71f052328b

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

@ -263,7 +263,7 @@ class App extends Component {
<Switch> <Switch>
{/*<Route path="/login" component={LoginRegisterPage}/>*/} {/*<Route path="/login" component={LoginRegisterPage}/>*/}
{/*认证*/} {/*认证*/}
{/*<Route path="/account" component={AccountPage}/>*/} <Route path="/account" component={AccountPage}/>
{/*403*/} {/*403*/}
<Route path="/403" component={Shixunauthority}/> <Route path="/403" component={Shixunauthority}/>

@ -226,8 +226,8 @@ class CommonWorkDetailIndex extends Component{
{this.props.isAdmin()? <li className="li_line drop_down fr color-blue font-16 mr8 mt20" style={{"padding":"0 20px"}}> {this.props.isAdmin()? <li className="li_line drop_down fr color-blue font-16 mr8 mt20" style={{"padding":"0 20px"}}>
导出<i className="iconfont icon-xiajiantou font-12 ml2"></i> 导出<i className="iconfont icon-xiajiantou font-12 ml2"></i>
<ul className="drop_down_menu" style={{"right":"-34px","left":"unset","height":"auto"}}> <ul className="drop_down_menu" style={{"right":"-34px","left":"unset","height":"auto"}}>
<li><a href={exportResultUrl} calssName="color-dark">导出成绩</a></li> <li><a href={exportResultUrl} className="color-dark">导出成绩</a></li>
<li><a href={exportUrl} calssName="color-dark">导出作品附件</a></li> <li><a href={exportUrl} className="color-dark">导出作品附件</a></li>
</ul> </ul>
</li>:""} </li>:""}

@ -1,153 +1,153 @@
import React,{Component} from "React"; import React,{Component} from "React";
import { Form, Select, Input, Button,Checkbox,Icon,message,Modal, Table, Divider, Tag,DatePicker,Radio,Tooltip} from "antd"; import { Form, Select, Input, Button,Checkbox,Icon,message,Modal, Table, Divider, Tag,DatePicker,Radio,Tooltip} from "antd";
import {Link} from 'react-router-dom'; import {Link} from 'react-router-dom';
import { WordsBtn, MarkdownToHtml } from 'educoder'; import { WordsBtn, MarkdownToHtml } from 'educoder';
import axios from 'axios'; import axios from 'axios';
import PublishRightnow from '../PublishRightnow' import PublishRightnow from '../PublishRightnow'
import AccessoryModal from "../../coursesPublic/AccessoryModal"; import AccessoryModal from "../../coursesPublic/AccessoryModal";
const { Option} = Select; const { Option} = Select;
const CheckboxGroup = Checkbox.Group; const CheckboxGroup = Checkbox.Group;
const confirm = Modal.confirm; const confirm = Modal.confirm;
let GraduationTasksnewtype=true; let GraduationTasksnewtype=true;
const $ = window.$; const $ = window.$;
const Search = Input.Search; const Search = Input.Search;
const RadioGroup = Radio.Group; const RadioGroup = Radio.Group;
class TabRightComponents extends Component{ class TabRightComponents extends Component{
constructor(props){ constructor(props){
super(props) super(props)
this.publishModal = React.createRef(); this.publishModal = React.createRef();
this.endModal = React.createRef(); this.endModal = React.createRef();
this.state={ this.state={
accessoryVisible: false accessoryVisible: false
} }
} }
componentDidMount() { componentDidMount() {
} }
onToPublishClick = () => { onToPublishClick = () => {
} }
// 补交附件 // 补交附件
Cancelvisible=()=>{ Cancelvisible=()=>{
this.setState({ this.setState({
accessoryVisible:false accessoryVisible:false
}) })
} }
addAccessory=()=>{ addAccessory=()=>{
this.setState({ this.setState({
accessoryVisible:true accessoryVisible:true
}) })
} }
setupdate = () => { setupdate = () => {
} }
render(){ render(){
const dateFormat = 'YYYY-MM-DD HH:mm'; const dateFormat = 'YYYY-MM-DD HH:mm';
const { accessoryVisible } = this.state const { accessoryVisible } = this.state
let { work_statuses, publish_immediately, work_id let { work_statuses, publish_immediately, work_id
, end_immediately , end_immediately
} =this.props; } =this.props;
let courseId=this.props.match.params.coursesId; let courseId=this.props.match.params.coursesId;
let category_id=this.props.match.params.category_id; let category_id=this.props.match.params.category_id;
let workId=this.props.match.params.workId; let workId=this.props.match.params.workId;
const isGroup = this.props.isGroup() const isGroup = this.props.isGroup()
const moduleName = !isGroup? "普通作业":"分组作业"; const moduleName = !isGroup? "普通作业":"分组作业";
const moduleEngName = this.props.getModuleName() const moduleEngName = this.props.getModuleName()
const childModuleName = this.props.moduleName const childModuleName = this.props.moduleName
const isAdmin = this.props.isAdmin() const isAdmin = this.props.isAdmin()
const isSuperAdmin = this.props.isSuperAdmin() const isSuperAdmin = this.props.isSuperAdmin()
let exportUrl = `/api/homework_commons/${workId}/works_list.zip` let exportUrl = `/api/homework_commons/${workId}/works_list.zip`
const exportResultUrl = `/api/homework_commons/${workId}/works_list.xlsx` const exportResultUrl = `/api/homework_commons/${workId}/works_list.xlsx`
return( return(
<React.Fragment> <React.Fragment>
{isAdmin ? {isAdmin ?
<React.Fragment> <React.Fragment>
<div style={{display: 'inline', float: 'right'}}> <div style={{display: 'inline', float: 'right'}}>
<PublishRightnow ref={this.publishModal} showActionButton={false} {...this.props} checkBoxValues={[workId]} <PublishRightnow ref={this.publishModal} showActionButton={false} {...this.props} checkBoxValues={[workId]}
isPublish={true} doWhenSuccess={this.props.doWhenSuccess} checkBeforePost={this.props.saveWorkSetting} isPublish={true} doWhenSuccess={this.props.doWhenSuccess} checkBeforePost={this.props.saveWorkSetting}
onToPublishClick={this.onToPublishClick} onToPublishClick={this.onToPublishClick}
></PublishRightnow> ></PublishRightnow>
<PublishRightnow ref={this.endModal} showActionButton={false} {...this.props} checkBoxValues={[workId]} <PublishRightnow ref={this.endModal} showActionButton={false} {...this.props} checkBoxValues={[workId]}
isPublish={false} doWhenSuccess={this.props.doWhenSuccess}></PublishRightnow> isPublish={false} doWhenSuccess={this.props.doWhenSuccess}></PublishRightnow>
</div> </div>
<style>{` <style>{`
.drop_down_menu li a { .drop_down_menu li a {
padding: 0px; padding: 0px;
font-size: 14px; font-size: 14px;
color: #333; color: #333;
} }
.drop_down_menu { .drop_down_menu {
width: 121px; width: 121px;
} }
.drop_down_menu li { .drop_down_menu li {
overflow: visible; overflow: visible;
width: 121px; width: 121px;
} }
.drop_down_menu, .drop_down_normal { .drop_down_menu, .drop_down_normal {
padding-top: 10px; padding-top: 10px;
padding-bottom: 8px; padding-bottom: 8px;
} }
`}</style> `}</style>
{this.props.isAdmin()? <li className="li_line drop_down fr color-blue font-16 mr8 mt20" style={{"padding":"0 20px"}}> {this.props.isAdmin()? <li className="li_line drop_down fr color-blue font-16 mr8 mt20" style={{"padding":"0 20px"}}>
导出<i className="iconfont icon-xiajiantou font-12 ml2"></i> 导出<i className="iconfont icon-xiajiantou font-12 ml2"></i>
<ul className="drop_down_menu" style={{"right":"-34px","left":"unset","height":"auto"}}> <ul className="drop_down_menu" style={{"right":"-34px","left":"unset","height":"auto"}}>
<li><a href={exportResultUrl} calssName="color-dark">导出成绩</a></li> <li><a href={exportResultUrl} className="color-dark">导出成绩</a></li>
<li><a href={exportUrl} calssName="color-dark">导出作品附件</a></li> <li><a href={exportUrl} className="color-dark">导出作品附件</a></li>
</ul> </ul>
</li>:""} </li>:""}
{/* <a className={"fr color-blue font-16"} href={exportUrl}></a> {/* <a className={"fr color-blue font-16"} href={exportUrl}></a>
<a className={"fr color-blue font-16"} href={exportResultUrl}>导出成绩</a> */} <a className={"fr color-blue font-16"} href={exportResultUrl}>导出成绩</a> */}
{/*<a className={"fr color-blue font-16"}>导出</a>*/} {/*<a className={"fr color-blue font-16"}>导出</a>*/}
{end_immediately && <a className={"fr color-blue font-16"} onClick={() => { this.endModal.current.open() } }>立即截止</a>} {end_immediately && <a className={"fr color-blue font-16"} onClick={() => { this.endModal.current.open() } }>立即截止</a>}
{publish_immediately && <a className={"fr color-blue font-16"} onClick={() => { this.publishModal.current.open() } } >立即发布</a>} {publish_immediately && <a className={"fr color-blue font-16"} onClick={() => { this.publishModal.current.open() } } >立即发布</a>}
{/*<a className={"fr color-blue font-16"}>项目在线质量检测</a>*/} {/*<a className={"fr color-blue font-16"}>项目在线质量检测</a>*/}
{isAdmin && <a className={"fr color-blue font-16"} onClick={() => this.props.toEditPage(this.props.match.params, workId)}>编辑作业</a>} {isAdmin && <a className={"fr color-blue font-16"} onClick={() => this.props.toEditPage(this.props.match.params, workId)}>编辑作业</a>}
</React.Fragment> : </React.Fragment> :
<React.Fragment> <React.Fragment>
{work_statuses && work_statuses.indexOf('提交作品') != -1 && <a className={"fr color-blue font-16"} href={"javascript:void(0)"} {work_statuses && work_statuses.indexOf('提交作品') != -1 && <a className={"fr color-blue font-16"} href={"javascript:void(0)"}
onClick={() => { this.props.toWorkPostPage(this.props.match.params)}} onClick={() => { this.props.toWorkPostPage(this.props.match.params)}}
>提交作品</a>} >提交作品</a>}
{work_statuses && work_statuses.indexOf('修改作品') != -1 && <a className={"fr color-blue font-16"} href={"javascript:void(0)"} {work_statuses && work_statuses.indexOf('修改作品') != -1 && <a className={"fr color-blue font-16"} href={"javascript:void(0)"}
onClick={() => { this.props.toWorkPostPage(this.props.match.params, null, true, work_id)}} onClick={() => { this.props.toWorkPostPage(this.props.match.params, null, true, work_id)}}
>修改作品</a>} >修改作品</a>}
{work_statuses && work_statuses.indexOf('补交附件') != -1 && {work_statuses && work_statuses.indexOf('补交附件') != -1 &&
<React.Fragment> <React.Fragment>
<AccessoryModal <AccessoryModal
{...this.props} {...this.props}
modalname={"补交附件"} modalname={"补交附件"}
visible={accessoryVisible} visible={accessoryVisible}
Cancelname={"取消"} Cancelname={"取消"}
Savesname={"确认"} Savesname={"确认"}
Cancel={this.Cancelvisible} Cancel={this.Cancelvisible}
setupdate={this.setupdate} setupdate={this.setupdate}
reviseAttachmentUrl={`/student_works/${work_id}/revise_attachment.json`} reviseAttachmentUrl={`/student_works/${work_id}/revise_attachment.json`}
/> />
<a className={"fr color-blue font-16"} href={"javascript:void(0)"} <a className={"fr color-blue font-16"} href={"javascript:void(0)"}
onClick={this.addAccessory} onClick={this.addAccessory}
>补交附件</a> >补交附件</a>
</React.Fragment> </React.Fragment>
} }
</React.Fragment> } </React.Fragment> }
</React.Fragment> </React.Fragment>
) )
} }
} }
export default TabRightComponents; export default TabRightComponents;

@ -1,5 +1,5 @@
import React, {Component} from "react"; import React, {Component} from "react";
import {WordsBtn} from 'educoder'; import {WordsBtn,markdownToHTML} from 'educoder';
import { Form, Select, Input, Button,Checkbox,Upload,Icon,message,Modal, Table, Divider,InputNumber, Tag,DatePicker,Radio,Tooltip,Pagination} from "antd"; import { Form, Select, Input, Button,Checkbox,Upload,Icon,message,Modal, Table, Divider,InputNumber, Tag,DatePicker,Radio,Tooltip,Pagination} from "antd";
import {Link,Switch,Route,Redirect} from 'react-router-dom'; import {Link,Switch,Route,Redirect} from 'react-router-dom';
import axios from 'axios'; import axios from 'axios';
@ -104,7 +104,7 @@ class Exercisestatisticalresult extends Component {
</style> </style>
<div className={"educontent mb20" }> <div className={"educontent mb20" }>
{data&&data.course_groups.length===0?"":<div className="stud-class-set bor-bottom-greyE"> {data&&data.course_groups.length===0?"":<div className="stud-class-set">
<div className="clearfix edu-back-white"> <div className="clearfix edu-back-white">
<ul className="clearfix" style={{padding:'20px'}}> <ul className="clearfix" style={{padding:'20px'}}>
<li className="clearfix mt10"> <li className="clearfix mt10">
@ -180,13 +180,16 @@ class Exercisestatisticalresult extends Component {
{data&&data.commit_results.map((item,key)=>{ {data&&data.commit_results.map((item,key)=>{
return( return(
<div className="stud-class-set bor-greyE mb20" key={key}> <div className="stud-class-set mb20" key={key}>
<div className="clearfix edu-back-white poll_list" style={{padding: '20px'}}> <div className="clearfix edu-back-white poll_list" style={{padding: '20px'}}>
<div className="font-16 shixunreporttitle fl" > <div className="font-16 shixunreporttitle fl" >
<span className="CACFF">{item.ques_type===0?"单选":item.ques_type===1?"多选":item.ques_type===2?"判断":item.ques_type===3?"填空":item.ques_type===4?"主观":item.ques_type===5?"实训":""}</span> <span className="CACFF">{item.ques_position+"."}{item.ques_type===0?"单选":item.ques_type===1?"多选":item.ques_type===2?"判断":item.ques_type===3?"填空":item.ques_type===4?"主观":item.ques_type===5?"实训":""}</span>
<span>Q{item.ques_position} <div>
<span className="markdown-body" dangerouslySetInnerHTML={createMarkup(item.ques_title)}></span> {/*Q{item.ques_position}*/}
</span> <div dangerouslySetInnerHTML={{__html: markdownToHTML(item.ques_title).replace(/▁/g,"▁▁▁")}}></div>
{/*<span className="markdown-body" dangerouslySetInnerHTML={createMarkup(item.ques_title)}></span>*/}
</div>
</div> </div>
<div className="fr shixunreporttitles">正确率<span style={{color:'#FF6800'}}> {item.right_percent}%</span></div> <div className="fr shixunreporttitles">正确率<span style={{color:'#FF6800'}}> {item.right_percent}%</span></div>
</div> </div>

@ -1,181 +1,186 @@
import React, {Component} from "react"; import React, {Component} from "react";
import {WordsBtn} from 'educoder'; import {WordsBtn} from 'educoder';
import {Table} from "antd"; import {Table} from "antd";
import {Link,Switch,Route,Redirect} from 'react-router-dom'; import {Link,Switch,Route,Redirect} from 'react-router-dom';
class OfficialAcademicTranscript extends Component { class OfficialAcademicTranscript extends Component {
constructor(props) { constructor(props) {
super(props); super(props);
this.state = { this.state = {
loadingstate:true, loadingstate:true,
datas:undefined datas:undefined
} }
} }
componentDidMount() { componentDidMount() {
} }
render() { render() {
let {data}=this.props; let {data}=this.props;
let datas=[]; let datas=[];
// data&&data.exercise_counts.forEach((item,key)=>{ }) // data&&data.exercise_counts.forEach((item,key)=>{ })
datas.push({ datas.push({
commit_percent:data&&data.exercise_counts.commit_percent, commit_percent:data&&data.exercise_counts.commit_percent,
min_score:data&&data.exercise_counts.min_score, min_score:data&&data.exercise_counts.min_score,
max_score:data&&data.exercise_counts.max_score, max_score:data&&data.exercise_counts.max_score,
average_score:data&&data.exercise_counts.average_score, average_score:data&&data.exercise_counts.average_score,
fail_counts:data&&data.exercise_counts.fail_counts, fail_counts:data&&data.exercise_counts.fail_counts,
pass_counts:data&&data.exercise_counts.pass_counts, pass_counts:data&&data.exercise_counts.pass_counts,
good_counts:data&&data.exercise_counts.good_counts, good_counts:data&&data.exercise_counts.good_counts,
best_counts:data&&data.exercise_counts.best_counts, best_counts:data&&data.exercise_counts.best_counts,
}) })
let columns=[{ let columns=[{
title: '提交率', title: '提交率',
dataIndex: 'commit_percent', dataIndex: 'commit_percent',
key: 'commit_percent', key: 'commit_percent',
render: (text, record) => ( render: (text, record) => (
<span style={{color:'#333333'}}> <span style={{color:'#333333'}}>
{record.commit_percent===0?0:(record.commit_percent*100).toFixed(2)}<span className={"font-size12"}>%</span> {record.commit_percent===0?0:(record.commit_percent*100).toFixed(2)}<span className={"font-size12"}>%</span>
</span> </span>
), ),
}, { }, {
title: '最低分', title: '最低分',
dataIndex: 'min_score', dataIndex: 'min_score',
key: 'min_score', key: 'min_score',
render: (text, record) => ( render: (text, record) => (
<span> <span>
<span style={{color:'#333333'}}>{record.min_score}<span className={"font-size12"}></span></span> <span style={{color:'#333333'}}>{record.min_score}<span className={"font-size12"}></span></span>
</span> </span>
), ),
}, { }, {
title: '最高分', title: '最高分',
dataIndex: 'max_score', dataIndex: 'max_score',
key: 'max_score', key: 'max_score',
render: (text, record) => ( render: (text, record) => (
<span style={{color:'#FF6800'}}> <span style={{color:'#FF6800'}}>
{record.max_score}<span className={"font-size12"}></span> {record.max_score}<span className={"font-size12"}></span>
</span> </span>
), ),
}, { }, {
title: '平均分', title: '平均分',
key: 'average_score', key: 'average_score',
dataIndex: 'average_score', dataIndex: 'average_score',
render: (text, record) => ( render: (text, record) => (
<span style={{color:'#333333'}}> <span style={{color:'#333333'}}>
{record.average_score}<span className={"font-size12"}></span> {record.average_score}<span className={"font-size12"}></span>
</span> </span>
), ),
}, { }, {
title: '不及格(0-60)', title: '不及格(0-60)',
key: 'fail_counts', key: 'fail_counts',
dataIndex: 'fail_counts', dataIndex: 'fail_counts',
render: (text, record) => ( render: (text, record) => (
<span style={{color:'#333333'}}> <span style={{color:'#333333'}}>
{record.fail_counts}<span className={"font-size12"}></span> {record.fail_counts}<span className={"font-size12"}></span>
</span> </span>
), ),
}, { }, {
title: '及格(60-70)', title: '及格(60-70)',
key: 'pass_counts', key: 'pass_counts',
dataIndex: 'pass_counts', dataIndex: 'pass_counts',
render: (text, record) => ( render: (text, record) => (
<span style={{color:'#333333'}}> <span style={{color:'#333333'}}>
{record.pass_counts}<span className={"font-size12"}></span> {record.pass_counts}<span className={"font-size12"}></span>
</span> </span>
), ),
}, { }, {
title: '良好(70-90)', title: '良好(70-90)',
key: 'good_counts', key: 'good_counts',
dataIndex: 'good_counts', dataIndex: 'good_counts',
render: (text, record) => ( render: (text, record) => (
<span> <span>
<span style={{color:'#333333'}}>{record.good_counts}<span className={"font-size12"}></span></span> <span style={{color:'#333333'}}>{record.good_counts}<span className={"font-size12"}></span></span>
</span> </span>
), ),
}, { }, {
title: '优秀(90-100)', title: '优秀(90-100)',
key: 'best_counts', key: 'best_counts',
dataIndex: 'best_counts', dataIndex: 'best_counts',
render: (text, record) => ( render: (text, record) => (
<span> <span>
<span style={{color:'#FF6800'}}>{record.best_counts}<span className={"font-size12"}></span></span> <span style={{color:'#FF6800'}}>{record.best_counts}<span className={"font-size12"}></span></span>
</span> </span>
), ),
}]; }];
// { // {
// title: '调分', // title: '调分',
// key: 'adjustmentminute', // key: 'adjustmentminute',
// dataIndex: 'adjustmentminute', // dataIndex: 'adjustmentminute',
// //
// render: (text, record) => ( // render: (text, record) => (
// <span> // <span>
// <a>6小时 50分钟 6秒</a> // <a>6小时 50分钟 6秒</a>
// </span> // </span>
// ), // ),
// }, // },
return ( return (
<div> <div>
{/*{data===undefined?"":""}*/} {/*{data===undefined?"":""}*/}
<style>{` <style>{`
.ant-table-thead > tr > th{ .ant-table-thead > tr > th{
text-align: center; text-align: center;
} }
.tasknamebox{ .tasknamebox{
width: 50px; width: 50px;
height: 24px; height: 24px;
border: 1px solid rgba(221,23,23,1); border: 1px solid rgba(221,23,23,1);
border-radius: 12px; border-radius: 12px;
color: rgba(221,23,23,1); color: rgba(221,23,23,1);
display: inline-block; display: inline-block;
line-height: 24px; line-height: 24px;
} }
.tasknameboxs{ .tasknameboxs{
color: #666666 !important; color: #666666 !important;
background:rgba(237,237,237,1) !important; background:rgba(237,237,237,1) !important;
} }
.ant-table-tbody > tr > td{ .ant-table-tbody > tr > td{
font-size:14px; font-size:14px;
} }
.task-hide{ .task-hide{
max-width: 345px; max-width: 345px;
overflow: hidden; overflow: hidden;
white-space: nowrap; white-space: nowrap;
text-overflow: ellipsis; text-overflow: ellipsis;
} }
.ant-table-tbody > tr{ .ant-table-tbody > tr{
height:64px; height:64px;
text-align: center; text-align: center;
} }
`} .exerctabel .ant-table-tbody > tr >td{
</style> border:1px solid transparent;
{datas===undefined?"":<Table }
dataSource={datas}
columns={columns} `}
pagination={false} </style>
// loading={loadingstate} {datas===undefined?"":<Table
// onChange={this.TablePagination} className={"exerctabel"}
/>} dataSource={datas}
</div> columns={columns}
pagination={false}
) // loading={loadingstate}
} // onChange={this.TablePagination}
} />}
</div>
)
}
}
export default OfficialAcademicTranscript; export default OfficialAcademicTranscript;

@ -66,12 +66,16 @@ class Exercisetablesmubus extends Component {
width:'300px', width:'300px',
render: (text, record) => ( render: (text, record) => (
<span style={{color:'#FF6800'}}> <span style={{color:'#FF6800'}}>
{record.max_score===undefined?"":<Progress {record.max_score===undefined?"":<span>
strokeColor={{ <div style={{
'0%': '#29BD8B', float: 'left',
'100%': '#29BD8B', width: '220px'
}} }}><Progress
percent={record.max_score*100} showInfo={false} />} strokeColor={{
'0%': '#29BD8B',
'100%': '#29BD8B',
}}
percent={record.max_score*100} showInfo={false}/></div><div className={"fr"}>{record.max_score*100}%</div></span>}
</span> </span>
), ),
}]; }];
@ -125,10 +129,14 @@ class Exercisetablesmubus extends Component {
} }
.ant-table-tbody > tr > td:nth-child(1){ .ant-table-tbody > tr > td:nth-child(1){
text-align: left; text-align: left;
}
.Exermubu .ant-table-tbody > tr:nth-last-child(1) > td{
border:1px solid transparent;
} }
`} `}
</style> </style>
{datas===undefined?"":<Table {datas===undefined?"":<Table
className={"Exermubu"}
dataSource={datas} dataSource={datas}
columns={columns} columns={columns}
pagination={false} pagination={false}

@ -258,9 +258,9 @@ class Testpapersettinghomepage extends Component{
<ul className="drop_down_menu" style={{"right":"-34px","left":"unset","height":"auto"}}> <ul className="drop_down_menu" style={{"right":"-34px","left":"unset","height":"auto"}}>
<li><a <li><a
onClick={()=>this.experiment(`/api/exercises/${this.props.match.params.Id}/exercise_lists.xlsx`)} onClick={()=>this.experiment(`/api/exercises/${this.props.match.params.Id}/exercise_lists.xlsx`)}
calssName="color-dark">学生成绩</a></li> className="color-dark">学生成绩</a></li>
<li><a href={`/api/exercises/${this.props.match.params.Id}/export_exercise`} calssName="color-dark">空白试卷</a></li> <li><a href={`/api/exercises/${this.props.match.params.Id}/export_exercise`} className="color-dark">空白试卷</a></li>
<li><a calssName="color-dark" <li><a className="color-dark"
onClick={()=>this.experiment(`/api/zip/export_exercises?exercise_id=${this.props.match.params.Id}${this.state.groupyslsval}`)} onClick={()=>this.experiment(`/api/zip/export_exercises?exercise_id=${this.props.match.params.Id}${this.state.groupyslsval}`)}
>学生答题试卷</a></li> >学生答题试卷</a></li>
</ul> </ul>

@ -215,7 +215,7 @@ class GraduationTasksSubmitnew extends Component{
let {search} = this.state; let {search} = this.state;
this.searchList(search,1,10) this.searchList(search,1,20)
} }

@ -240,12 +240,12 @@ class GraduationTasksedit extends Component{
handleSubmit=(e)=>{ handleSubmit=(e)=>{
let {fileList}=this.state; let {fileList}=this.state;
if(fileList.length===0){ // if(fileList.length===0){
this.setState({ // this.setState({
shixunsreplace:true, // shixunsreplace:true,
}) // })
return // return
} // }
this.Commoninterface(fileList); this.Commoninterface(fileList);
} }

@ -214,13 +214,13 @@ class GraduationTasksnew extends Component {
// 提交按钮 // 提交按钮
handleSubmit = (e) => { handleSubmit = (e) => {
let {fileList} = this.state; let {fileList} = this.state;
if(fileList.length===0){ // if(fileList.length===0){
this.setState({ // this.setState({
shixunsreplace:true, // shixunsreplace:true,
}) // })
//
return // return
} // }
this.Commoninterface(fileList); this.Commoninterface(fileList);

@ -1056,13 +1056,16 @@ class GraduationTaskssettingapp extends Component{
padding-top: 10px; padding-top: 10px;
padding-bottom: 8px; padding-bottom: 8px;
} }
.drop_down_menu li .color-dark{
color: #666 !important;
}
`} `}
</style> </style>
{this.props.isAdmin()? <li className="li_line drop_down fr color-blue font-16 mr20 mt20" style={{"paddingLeft":"0px"}}> {this.props.isAdmin()? <li className="li_line drop_down fr color-blue font-16 mr20 mt20" style={{"paddingLeft":"0px"}}>
导出<i className="iconfont icon-xiajiantou font-12 ml2"></i> 导出<i className="iconfont icon-xiajiantou font-12 ml2"></i>
<ul className="drop_down_menu" style={{"right":"-34px","left":"unset","height":"auto"}}> <ul className="drop_down_menu" style={{"right":"-34px","left":"unset","height":"auto"}}>
<li><a href={"/api/graduation_tasks/"+task_Id+"/tasks_list.xlsx"} calssName="color-dark">导出成绩</a></li> <li><a href={"/api/graduation_tasks/"+task_Id+"/tasks_list.xlsx"} className="color-dark">导出成绩</a></li>
<li><a href={"/api/graduation_tasks/"+task_Id+"/tasks_list.zip"} calssName="color-dark">导出作品附件</a></li> <li><a href={"/api/graduation_tasks/"+task_Id+"/tasks_list.zip"} className="color-dark">导出作品附件</a></li>
</ul> </ul>
</li>:""} </li>:""}

@ -701,7 +701,7 @@ class GraduationTaskssettinglist extends Component{
render: (text, record) => ( render: (text, record) => (
<span> <span>
<a style={{color:'#989898'}}> <a style={{color:'#989898'}}>
{record.turnovertime===""?"--":moment(record.turnovertime).format('YYYY-MM-DD HH:mm:ss')} {record.turnovertime===""?"--":moment(record.turnovertime).format('YYYY-MM-DD HH:mm')}
</a> </a>
</span> </span>
), ),
@ -741,11 +741,11 @@ class GraduationTaskssettinglist extends Component{
className:'edu-txt-center', className:'edu-txt-center',
render: (text, record) => ( render: (text, record) => (
<span> <span>
<Tooltip placement="bottom" title={record.finalscore.work_score==="--"?"未评阅": <pre> <Tooltip placement="right" title={record.finalscore.work_score==="--"?"未评阅": <pre>
{record.finalscore.final_score.username}({record.finalscore.final_score.login})<br/> {record.finalscore.final_score.username}({record.finalscore.final_score.login})<br/>
{record.finalscore.ultimate_score===true?"":"教师评分:"+record.finalscore.teacher_comment_score+"分"}<br/> {record.finalscore.ultimate_score===true?"":"教师评分:"+record.finalscore.teacher_comment_score+"分"}<br/>
{record.finalscore.cross_comment_score===undefined?"":"交叉评分:"+record.finalscore.cross_comment_score+"分"+<br/>} {record.finalscore.cross_comment_score===undefined||record.finalscore.cross_comment_score==="未批阅"?"交叉评分:--":"交叉评分:"+record.finalscore.cross_comment_score+"分"}<br/>
{record.finalscore.late_penalty===undefined?"":"迟交扣分:"+record.finalscore.late_penalty+"分"+<br/>} {record.finalscore.late_penalty===undefined?"":"迟交扣分:"+record.finalscore.late_penalty+"分"}<br/>
最终成绩{record.finalscore.work_score}<br/> 最终成绩{record.finalscore.work_score}<br/>
</pre>}> </pre>}>
<a style={{color:parseInt(record.finalscore.work_score)>90?'#DD1717':parseInt(record.finalscore.work_score)>60&&parseInt(record.finalscore.work_score)<90?"#FF6800":'#747A7F'}}>{record.finalscore.work_score==="--"?"--":record.finalscore.work_score}</a> <a style={{color:parseInt(record.finalscore.work_score)>90?'#DD1717':parseInt(record.finalscore.work_score)>60&&parseInt(record.finalscore.work_score)<90?"#FF6800":'#747A7F'}}>{record.finalscore.work_score==="--"?"--":record.finalscore.work_score}</a>
@ -1010,13 +1010,16 @@ class GraduationTaskssettinglist extends Component{
padding-top: 10px; padding-top: 10px;
padding-bottom: 8px; padding-bottom: 8px;
} }
.drop_down_menu li .color-dark{
color: #666 !important;
}
`} `}
</style> </style>
{this.props.isAdmin()? <li className="li_line drop_down fr color-blue font-16 mr20 mt20" style={{"paddingLeft":"0px"}}> {this.props.isAdmin()? <li className="li_line drop_down fr color-blue font-16 mr20 mt20" style={{"paddingLeft":"0px"}}>
导出<i className="iconfont icon-xiajiantou font-12 ml2"></i> 导出<i className="iconfont icon-xiajiantou font-12 ml2"></i>
<ul className="drop_down_menu" style={{"right":"-34px","left":"unset","height":"auto"}}> <ul className="drop_down_menu" style={{"right":"-34px","left":"unset","height":"auto"}}>
<li><a href={"/api/graduation_tasks/"+task_Id+"/tasks_list.xlsx"} calssName="color-dark">导出成绩</a></li> <li><a href={"/api/graduation_tasks/"+task_Id+"/tasks_list.xlsx"} className="color-dark">导出成绩</a></li>
<li><a href={"/api/graduation_tasks/"+task_Id+"/tasks_list.zip"} calssName="color-dark">导出作品附件</a></li> <li><a href={"/api/graduation_tasks/"+task_Id+"/tasks_list.zip"} className="color-dark">导出作品附件</a></li>
</ul> </ul>
</li>:""} </li>:""}
@ -1141,17 +1144,28 @@ class GraduationTaskssettinglist extends Component{
</ul> </ul>
<div id="graduation_work_list" style={{padding:'0px 40px 10px 40px'}}> <div id="graduation_work_list" style={{padding:'0px 40px 10px 40px'}}>
<style>
{
`
.edu-menu-lists li:hover {
background: #f0f0f0 !important;
}
.edu-menu-lists li:hover a{
color: #666 !important;
}
`
}
</style>
<div className="clearfix"> <div className="clearfix">
{this.props.isAdmin()===true?<span className="fl color-grey-6 font-12"> {this.props.isAdmin()===true?<span className="fl color-grey-6 font-12">
<span className="color-orange-tip">{taskslistdata&&taskslistdata.work_count}</span> <span className="color-orange-tip">{taskslistdata&&taskslistdata.work_count}</span>
个检索结果{taskslistdata&&taskslistdata.work_count} 学生 </span>:""} 个检索结果{taskslistdata&&taskslistdata.work_count} 学生 </span>:""}
{this.props.isAdmin()===true?<div className="fr color-grey-6 edu-menu-panel"> {this.props.isAdmin()===true?<div className="fr color-grey-6 edu-menu-panel">
<p> <p>
<a data-remote="true"> <a data-remote="true" class="color-grey-6 font-12">
{order==="updated_at"?"更新时间":order==="work_score"?"最终成绩":order==="student_id"?"学生学号":""}排序</a> {order==="updated_at"?"更新时间":order==="work_score"?"最终成绩":order==="student_id"?"学生学号":""}排序</a>
<i className="iconfont icon-xiajiantou ml5 font-12 color-grey-6"></i></p> <i className="iconfont icon-xiajiantou ml5 font-12 color-grey-6"></i></p>
<ul className="edu-menu-list"> <ul className="edu-menu-list edu-menu-lists" style={{width: '87px'}}>
<li onClick={(e)=>this.funorder("updated_at")}><a data-remote="true">更新时间</a> <li onClick={(e)=>this.funorder("updated_at")}><a data-remote="true">更新时间</a>
</li> </li>
<li onClick={(e)=>this.funorder("work_score" )}><a data-remote="true">最终成绩</a> <li onClick={(e)=>this.funorder("work_score" )}><a data-remote="true">最终成绩</a>

@ -303,13 +303,16 @@ class GraduationTasksquestions extends Component{
padding-top: 10px; padding-top: 10px;
padding-bottom: 8px; padding-bottom: 8px;
} }
.drop_down_menu li .color-dark{
color: #666 !important;
}
`} `}
</style> </style>
{this.props.isAdmin()? <li className="li_line drop_down fr color-blue font-16 mr20 mt20" style={{"paddingLeft":"0px"}}> {this.props.isAdmin()? <li className="li_line drop_down fr color-blue font-16 mr20 mt20" style={{"paddingLeft":"0px"}}>
导出<i className="iconfont icon-xiajiantou font-12 ml2"></i> 导出<i className="iconfont icon-xiajiantou font-12 ml2"></i>
<ul className="drop_down_menu" style={{"right":"-34px","left":"unset","height":"auto"}}> <ul className="drop_down_menu" style={{"right":"-34px","left":"unset","height":"auto"}}>
<li><a href={"/api/graduation_tasks/"+task_Id+"/tasks_list.xlsx"} calssName="color-dark">导出成绩</a></li> <li><a href={"/api/graduation_tasks/"+task_Id+"/tasks_list.xlsx"} className="color-dark">导出成绩</a></li>
<li><a href={"/api/graduation_tasks/"+task_Id+"/tasks_list.zip"} calssName="color-dark">导出作品附件</a></li> <li><a href={"/api/graduation_tasks/"+task_Id+"/tasks_list.zip"} className="color-dark">导出作品附件</a></li>
</ul> </ul>
</li>:""} </li>:""}

@ -60,6 +60,7 @@ class Listofworks extends Component {
this.state = { this.state = {
props: props, props: props,
data: [], data: [],
b_order: "desc",
page: 1, page: 1,
limit: 20, limit: 20,
loadingstate: true, loadingstate: true,
@ -385,8 +386,8 @@ class Listofworks extends Component {
// course_group:分班情况 [232, 231] []:不限(空数组) // course_group:分班情况 [232, 231] []:不限(空数组)
var data = { var data = {
search: "", search: "",
order: "desc", order: "update_time",
b_order: "asc", b_order: "desc",
work_status: "", work_status: "",
course_group: "", course_group: "",
page:1, page:1,
@ -427,19 +428,26 @@ class Listofworks extends Component {
//order 排序时间 //order 排序时间
//debug=t 是老师的意思 //debug=t 是老师的意思
// console.log(ordervlue)7009 // console.log(ordervlue)7009
let{b_order,order}=this.state;
var homeworkid = this.props.match.params.homeworkid; var homeworkid = this.props.match.params.homeworkid;
let urll = `/homework_commons/${homeworkid}/works_list.json?`; let urll = `/homework_commons/${homeworkid}/works_list.json?`;
var order = "asc"; var b_orders
if (ordervlue === "updated_at") { // = "asc";
order = "desc"; // if (ordervlue === "updated_at") {
// b_orders = "desc";
// }
if(b_order==="asc"){
b_orders = "desc";
}else{
b_orders = "asc";
} }
var checkedValuesines = checkedValuesine; var checkedValuesines = checkedValuesine;
var checkedValuesineinfos = checkedValuesineinfo; var checkedValuesineinfos = checkedValuesineinfo;
var searchtexts = searchtext var searchtexts = searchtext
var data = { var data = {
search: searchtexts, search: searchtexts,
order: ordervlue, order: order,
b_order: order, b_order: b_orders,
work_status: checkedValuesines, work_status: checkedValuesines,
course_group: checkedValuesineinfos, course_group: checkedValuesineinfos,
page: page, page: page,
@ -1274,14 +1282,14 @@ class Listofworks extends Component {
} }
//排序 //排序
funorder = (e) => { funorder = (e) => {
if (e === "updated_at") { if (e === "update_time") {
// 时间 // 时间
// 时间排序是从小到大 // 时间排序是从小到大
this.setState({ this.setState({
order: "updated_at", order: "update_time",
loadingstate: true, loadingstate: true,
}) })
this.Startsorting("updated_at", this.state.course_groupyslstwo, this.state.checkedValuesineinfo, this.state.searchtext, this.state.page, this.state.limit); this.Startsorting("update_time", this.state.course_groupyslstwo, this.state.checkedValuesineinfo, this.state.searchtext, this.state.page, this.state.limit);
} }
if (e === "work_score") { if (e === "work_score") {
@ -1738,8 +1746,8 @@ class Listofworks extends Component {
{this.props.isAdmin()? <li className="li_line drop_down fr color-blue font-16 mr8 mt20" style={{"padding":"0 20px"}}> {this.props.isAdmin()? <li className="li_line drop_down fr color-blue font-16 mr8 mt20" style={{"padding":"0 20px"}}>
导出<i className="iconfont icon-xiajiantou font-12 ml2"></i> 导出<i className="iconfont icon-xiajiantou font-12 ml2"></i>
<ul className="drop_down_menu" style={{"right":"-34px","left":"unset","height":"auto"}}> <ul className="drop_down_menu" style={{"right":"-34px","left":"unset","height":"auto"}}>
<li><a href={`/api/student_works/${jobsettingsdata === undefined ? "" :jobsettingsdata.data.category.category_id}/export_shixun_work_report.pdf`} calssName="color-dark">实训报告</a></li> <li><a href={`/api/student_works/${jobsettingsdata === undefined ? "" :jobsettingsdata.data.category.category_id}/export_shixun_work_report.pdf`} className="color-dark">实训报告</a></li>
<li><a href={`/api/homework_commons/${jobsettingsdata === undefined ? "" :jobsettingsdata.data.category.category_id}/works_list.xlsx`} calssName="color-dark">学生成绩</a></li> <li><a href={`/api/homework_commons/${jobsettingsdata === undefined ? "" :jobsettingsdata.data.category.category_id}/works_list.xlsx`} className="color-dark">学生成绩</a></li>
</ul> </ul>
</li>:""} </li>:""}
{this.props.isAdmin() ? {this.props.isAdmin() ?
@ -1840,10 +1848,10 @@ class Listofworks extends Component {
<ul> <ul>
<li className="edu-position edu-position-hidebox"> <li className="edu-position edu-position-hidebox">
<a className="font-12 color-grey-6"> <a className="font-12 color-grey-6">
{order === "updated_at" ? "时间" : order === "work_score" ? "成绩" : order === "student_id" ? "学号" : ""}排序</a> {order === "update_time”" ? "时间" : order === "work_score" ? "成绩" : order === "student_id" ? "学号" : ""}排序</a>
<i className="iconfont icon-xiajiantou ml5 font-12 color-grey-6"></i> <i className="iconfont icon-xiajiantou ml5 font-12 color-grey-6"></i>
<ul className="edu-position-hide undis mt10"> <ul className="edu-position-hide undis mt10">
<li> <a onClick={(e) => this.funorder("updated_at")} data-remote="true" className="color-grey-6 font-12" style={{"text-align": "center "}}>更新时间</a></li> <li> <a onClick={(e) => this.funorder("update_time”")} data-remote="true" className="color-grey-6 font-12" style={{"text-align": "center "}}>更新时间</a></li>
<li> <a onClick={(e) => this.funorder("work_score")} data-remote="true" className="color-grey-6 font-12" style={{"text-align": "center "}}>最终成绩</a></li> <li> <a onClick={(e) => this.funorder("work_score")} data-remote="true" className="color-grey-6 font-12" style={{"text-align": "center "}}>最终成绩</a></li>
<li> <a onClick={(e) => this.funorder("student_id")} data-remote="true" className="color-grey-6 font-12" style={{"text-align": "center "}}>学生学号</a></li> <li> <a onClick={(e) => this.funorder("student_id")} data-remote="true" className="color-grey-6 font-12" style={{"text-align": "center "}}>学生学号</a></li>
</ul> </ul>

Loading…
Cancel
Save