dev_hss
杨树明 6 years ago
parent d0d0cb066c
commit bed5b709d5

@ -76,7 +76,7 @@ class AppraiseModal extends Component{
<Modal <Modal
keyboard={false} keyboard={false}
className={"HomeworkModal"} className={"HomeworkModal"}
title={"编辑评阅"} title={this.props.work_comment===null||this.props.work_comment===undefined?"评阅":"编辑评阅"}
visible={this.props.visible} visible={this.props.visible}
closable={false} closable={false}
footer={null} footer={null}

@ -1449,7 +1449,9 @@ class Listofworksstudentone extends Component {
this.setState({ this.setState({
userids: e.myid, userids: e.myid,
}) })
this.viewtraining(e.myid);
window.open(`/courses/${this.state.props.match.params.coursesId}/shixun_homeworks/${e.myid}/shixun_work_report`, '_blank');
// this.viewtraining(e.myid);
} }
viewtraining = (userids) => { viewtraining = (userids) => {
// console.log("viewtraining") // console.log("viewtraining")

@ -3,7 +3,7 @@ import {WordsBtn,markdownToHTML,ActionBtn,queryString,downloadFile} from 'educod
import { Form, Select, Input, Button,Checkbox,Upload,Icon,message,Modal, Table, Divider,InputNumber, Tag,DatePicker,Radio,Tooltip,Spin} from "antd"; 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 {Link,Switch,Route,Redirect} from 'react-router-dom';
import axios from 'axios'; import axios from 'axios';
import moment from 'moment';
import ConclusionEvaluation from './shixunreport/ConclusionEvaluation'; import ConclusionEvaluation from './shixunreport/ConclusionEvaluation';
import OfficialAcademicTranscript from './shixunreport/OfficialAcademicTranscript'; import OfficialAcademicTranscript from './shixunreport/OfficialAcademicTranscript';
import Coursesshixundetails from './shixunreport/Coursesshixundetails'; import Coursesshixundetails from './shixunreport/Coursesshixundetails';
@ -156,7 +156,7 @@ class ShixunWorkReport extends Component {
showAppraiseModal=(sum)=>{ showAppraiseModal=(sum)=>{
if(sum===undefined){ if(sum===undefined){
this.setState({ this.setState({
showAppraiseModaltype:true showAppraiseModaltype:true,
}) })
}else{ }else{
this.setState({ this.setState({
@ -213,7 +213,8 @@ class ShixunWorkReport extends Component {
let homeworkid=this.props.match.params.homeworkid; let homeworkid=this.props.match.params.homeworkid;
const antIcon = <Icon type="loading" style={{ fontSize: 24 }} spin />; const antIcon = <Icon type="loading" style={{ fontSize: 24 }} spin />;
let showAppraiseModals=this.props&&this.props.isAdminOrTeacher()===true?work_comment===null||work_comment===undefined?false:true:work_comment===null||work_comment===undefined?false:true; // let showAppraiseModals=this.props&&this.props.isAdminOrTeacher()===true?work_comment===null||work_comment===undefined?false:true:work_comment===null||work_comment===undefined?false:true;
let showAppraiseModals=work_comment===null||work_comment===undefined?false:true;
console.log(showAppraiseModals) console.log(showAppraiseModals)
return ( return (
@ -341,7 +342,7 @@ class ShixunWorkReport extends Component {
<div className="fl edu-back-white ml10 "> <div className="fl edu-back-white ml10 ">
<img alt="头像" className="radius" height="91" id="nh_user_logo" name="avatar_image" <img alt="头像" className="radius" height="91" id="nh_user_logo" name="avatar_image"
src={data&&data.image_url} src={'/images/'+data&&data.image_url}
width="91"/> width="91"/>
</div> </div>
@ -360,7 +361,7 @@ class ShixunWorkReport extends Component {
</span> </span>
<span className={"passbox"}> <span className={"passbox"}>
<div><span className={"color999"}>通关时间</span> <span className={data&&data.passed_time===null?"color999":"color333"}>{data&&data.passed_time===null?'--':data&&data.passed_time}</span></div> <div><span className={"color999"}>通关时间</span> <span className={data&&data.passed_time===null?"color999":"color333"}>{data&&data.passed_time===null?'--':moment(data&&data.passed_time).format('YYYY-MM-DD HH:mm')}</span></div>
<div><span className={"color999"}>实战耗时</span> <span className={data&&data.efficiency===null?"color999":"color333"}>{data&&data.time_consuming===null?'--':data&&data.time_consuming}</span></div> <div><span className={"color999"}>实战耗时</span> <span className={data&&data.efficiency===null?"color999":"color333"}>{data&&data.time_consuming===null?'--':data&&data.time_consuming}</span></div>
</span> </span>
</p> </p>
@ -442,7 +443,7 @@ class ShixunWorkReport extends Component {
<div className="clearfix edu-back-white poll_list"> <div className="clearfix edu-back-white poll_list">
<div className="font-16 color-dark-21 shixunreporttitleboxtop pd20 color333"> <div className="font-16 color-dark-21 shixunreporttitleboxtop pd20 color333">
老师评阅<span>{showAppraiseModals===true?"":"(仅对课堂老师可见)"}</span> 老师评阅<span>{work_comment_hidden===true||this.state.work_type===1?"(仅对课堂老师可见)":""}</span>
{this.props&&this.props.isAdminOrTeacher()===true?<a className="color-blue font-14 fr ml20" {this.props&&this.props.isAdminOrTeacher()===true?<a className="color-blue font-14 fr ml20"
onClick={()=>this.isdeleteModal()} onClick={()=>this.isdeleteModal()}

@ -36,7 +36,7 @@
.WordNumberTextarea-count { .WordNumberTextarea-count {
display: inline-block; display: inline-block;
float: right; float: right;
font-size: 0.28rem; font-size: 16px;
color: #adadad; color: #adadad;
padding-right: 0.25rem; padding-right: 0.25rem;
} }

Loading…
Cancel
Save