diff --git a/public/react/src/modules/courses/coursesPublic/AppraiseModal.js b/public/react/src/modules/courses/coursesPublic/AppraiseModal.js index 730d9ccb5..fc9427d27 100644 --- a/public/react/src/modules/courses/coursesPublic/AppraiseModal.js +++ b/public/react/src/modules/courses/coursesPublic/AppraiseModal.js @@ -76,7 +76,7 @@ class AppraiseModal extends Component{ { // console.log("viewtraining") diff --git a/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js b/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js index c4f5d9a10..87a6b71da 100644 --- a/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js +++ b/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js @@ -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 {Link,Switch,Route,Redirect} from 'react-router-dom'; import axios from 'axios'; - +import moment from 'moment'; import ConclusionEvaluation from './shixunreport/ConclusionEvaluation'; import OfficialAcademicTranscript from './shixunreport/OfficialAcademicTranscript'; import Coursesshixundetails from './shixunreport/Coursesshixundetails'; @@ -156,7 +156,7 @@ class ShixunWorkReport extends Component { showAppraiseModal=(sum)=>{ if(sum===undefined){ this.setState({ - showAppraiseModaltype:true + showAppraiseModaltype:true, }) }else{ this.setState({ @@ -213,7 +213,8 @@ class ShixunWorkReport extends Component { let homeworkid=this.props.match.params.homeworkid; const antIcon = ; - 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) return ( @@ -341,7 +342,7 @@ class ShixunWorkReport extends Component {
@@ -360,7 +361,7 @@ class ShixunWorkReport extends Component { -
通关时间: {data&&data.passed_time===null?'--':data&&data.passed_time}
+
通关时间: {data&&data.passed_time===null?'--':moment(data&&data.passed_time).format('YYYY-MM-DD HH:mm')}
实战耗时: {data&&data.time_consuming===null?'--':data&&data.time_consuming}

@@ -442,7 +443,7 @@ class ShixunWorkReport extends Component {
- 老师评阅{showAppraiseModals===true?"":"(仅对课堂老师可见)"} + 老师评阅{work_comment_hidden===true||this.state.work_type===1?"(仅对课堂老师可见)":""} {this.props&&this.props.isAdminOrTeacher()===true?this.isdeleteModal()} diff --git a/public/react/src/modules/modals/WordNumberTextarea.css b/public/react/src/modules/modals/WordNumberTextarea.css index 9bd8c820c..b1a7ef6a4 100644 --- a/public/react/src/modules/modals/WordNumberTextarea.css +++ b/public/react/src/modules/modals/WordNumberTextarea.css @@ -36,7 +36,7 @@ .WordNumberTextarea-count { display: inline-block; float: right; - font-size: 0.28rem; + font-size: 16px; color: #adadad; padding-right: 0.25rem; }