m52mxtq3o
/
educoder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'dev_aliyun' of http://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

Browse Source
courseware
cxt 5 years ago
parent 1a13d511bd 21caa0b9c2
commit 98cbc7468e
22 changed files with 886 additions and 606 deletions
Show Stats Download Patch File Download Diff File

18
app/controllers/games_controller.rb
Unescape View File

@ -973,15 +973,15 @@ class GamesController < ApplicationController
if res && res['code'].to_i != 0
raise("实训云平台繁忙（繁忙等级：99）")
end
# @vnc_url = res['showServer']
@vnc_url =
if request.subdomain == "pre-newweb" || request.subdomain == "test-newweb"
# 无域名版本
"http://#{service_host}:#{res['port']}/vnc_lite.html?password=headless"
else
# 有域名版本
"https://#{res['port']}.#{service_host}/vnc_lite.html?password=headless"
end
@vnc_url = res['showServer']
# @vnc_url =
# if request.subdomain == "pre-newweb" || request.subdomain == "test-newweb"
# # 无域名版本
# "http://#{service_host}:#{res['port']}/vnc_lite.html?password=headless"
# else
# # 有域名版本
# "https://#{res['port']}.#{service_host}/vnc_lite.html?password=headless"
# end
@vnc_evaluate = shixun.vnc_evaluate
rescue Exception => e
Rails.logger.error(e.message)

24
public/react/src/modules/courses/ListPageIndex.js
Unescape View File

@ -102,7 +102,8 @@ class ListPageIndex extends Component{
this.state={
yslGuideone:undefined,
yslElearning:false,
isexcellent:false
isexcellent:false,
homedirectory:false,
}
}
comyslElearning(bool){
@ -183,6 +184,21 @@ class ListPageIndex extends Component{
updatabanners=()=>{
this.refs.CoursesBanner.updatabanner()
}
//是否点击了目录
Callhomedirectoryornot=(bool)=>{
this.setState({
homedirectory:bool
})
if(bool===true){
setTimeout(() => {
this.setState({
homedirectory:false,
})
}, 1000);
}
}
render() {
let {yslGuideone} =this.state;
// console.log("98");
@ -218,7 +234,7 @@ class ListPageIndex extends Component{
{/*left_nav*/}
<div className={"with22 fl setleft"} style={{width:'264px',minHeight:'500px'}}>
<Coursesleftnav {...this.props} {...this.state} comyslElearning={(i)=>this.comyslElearning(i)}/>
<Coursesleftnav {...this.props} {...this.state} comyslElearning={(i)=>this.comyslElearning(i)} myinex={true} Callhomedirectoryornot={(b)=>this.Callhomedirectoryornot(b)}/>
</div>
{/*right_concent*/}
@ -263,12 +279,12 @@ class ListPageIndex extends Component{
{/*视频列表*/}
<Route path="/classrooms/:coursesId/course_video/:videoId"
render={
(props) => (<CourseVideo {...this.props} {...props} {...this.state} />)
(props) => (<CourseVideo {...this.props} {...props} {...this.state} homedirectory={this.state.homedirectory}/>)
}
></Route>
<Route path="/classrooms/:coursesId/course_videos"
render={
(props) => (<CourseVideo {...this.props} {...props} {...this.state} />)
(props) => (<CourseVideo {...this.props} {...props} {...this.state} homedirectory={this.state.homedirectory}/>)
}
></Route>
{/* 教师列表*/}

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

@ -191,15 +191,21 @@ class Video extends Component {
const CourseId = this.props.match.params.coursesId;
const VID = this.props.match.params.videoId;
const login = this.props.user && this.props.user.login;
let login = this.props && this.props.user&&this.props.user.login;;
const _inputValue = videoId && this.getCopyText(videoId.file_url, videoId.cover_url);
const { admin, is_teacher, business, user_id } = this.props.user;
// const { admin, is_teacher, business, user_id } = this.props && this.props.user;
let admin = this.props && this.props.user&&this.props.user.admin;;
let business = this.props && this.props.user&&this.props.user.business;;
let user_id = this.props && this.props.user&&this.props.user.user_id;;
const { videos, upload, uploadVideo, videoData, changePage, pageSize, page } = this.props;
const operation = admin || business;
const { course_identity } = this.props.coursedata;
const { course_identity } = this.props && this.props.coursedata;
const flagMove = parseInt(course_identity) < 5;
return (

64
public/react/src/modules/courses/Video/VideoIndex.js
Unescape View File

@ -12,6 +12,7 @@ import Videostatistics from '../videostatistics/Videostatistics';
import './video.css';
import '../css/Courses.css';
import '../publicNav/nav.css';
const PAGE_SIZE = 15;
const LIVE_PAGE_SIZE = 10;
const $ = window.$;
@ -20,6 +21,7 @@ function getRight(){
var right = parseInt($(".-task-sidebar").css("right"));
return right === 0 ? 0 : right;
}
class VideoIndex extends Component {
constructor(props) {
super(props);
@ -39,7 +41,6 @@ class VideoIndex extends Component{
liveVisible: false,
statistics: false,
}
}
@ -73,13 +74,27 @@ class VideoIndex extends Component{
}
}
componentDidUpdate = (prevProps) => {
try {
if (this.props.homedirectory !== prevProps.homedirectory) {
if(this.props.homedirectory ===true){
this.setState({
statistics:false,
})
}
}
}catch (e) {
}
if (this.props.match.params.videoId !== prevProps.match.params.videoId) {
this.setState({
upload:false
upload: false,
})
const {page} = this.state;
this.checkType("video", page);
}
}
// 获取直播列表
getLiveList = (page) => {
@ -237,19 +252,25 @@ class VideoIndex extends Component{
}
//统计
statisticsy = (bool) => {
this.setState({
statistics:bool
statistics: bool,
})
}
render() {
const {videos, upload, videoData, type, liveData, lives, page, liveVisible, isSpining, liveId, otherLinkVisible, statistics} = this.state;
const { is_teacher } = this.props.user;
const {coursesId, videoId} = this.props.match.params;
const {course_identity} = this.props.coursedata;
let {course_identity} = this.props && this.props.coursedata;
let is_teacher = this.props && this.props.user && this.props.user.is_teacher;
const flag = parseInt(course_identity) < 5;
const newOperation = flag;
const new_upload = flag && (is_teacher && this.props.checkIfProfessionalCertification());
const isAdmin = this.props&& this.props.isAdmin();
return (
<React.Fragment>
<VideoLink
@ -305,19 +326,31 @@ class VideoIndex extends Component{
{
type === "video" ?
<React.Fragment>
{
newOperation ?
<span>
{
videoId ?
""
:
<WordsBtn style="blue" className="ml30 font-16 tongjis"
onClick={() => this.statisticsy(true)}
><i className="iconfont icon-tongji1 mr5"></i>统计</WordsBtn>
}
</span>
{
newOperation ?
<span>
{
videoId ?
<WordsBtn style="blue" onClick={()=>this.editDir(videoData && videoData.category_name,videoId)} className={"ml30 font-16"}>目录重命名</WordsBtn>
<WordsBtn style="blue"
onClick={() => this.editDir(videoData && videoData.category_name, videoId)}
className={"ml30 font-16"}>目录重命名</WordsBtn>
:
<WordsBtn style="blue" className="ml30 font-16" onClick={this.addDir}>新建目录</WordsBtn>
}
<WordsBtn style="blue" className="ml30 font-16" onClick={()=>this.setLinkeVisible(true)}>增加外链</WordsBtn>
<WordsBtn style="blue" className="ml30 font-16"
onClick={() => this.setLinkeVisible(true)}>增加外链</WordsBtn>
</span> : ""
}
{
@ -325,12 +358,18 @@ class VideoIndex extends Component{
<span>
{
upload ?
<WordsBtn style="grey" className="font-16 ml30" onClick={()=>this.uploadVideo(false)}>取消</WordsBtn>
<WordsBtn style="grey" className="font-16 ml30"
onClick={() => this.uploadVideo(false)}>取消</WordsBtn>
:
<WordsBtn style="blue" className="font-16 ml30" onClick={this.toUpload}>上传视频</WordsBtn>
}
</span>:""
</span>
: ""
}
</React.Fragment>
:
<WordsBtn style="blue" className="font-16 ml30" onClick={this.liveSetting}>添加直播</WordsBtn>
@ -379,4 +418,5 @@ class VideoIndex extends Component{
)
}
}
export default VideoIndex;

2
public/react/src/modules/courses/busyWork/CommonWorkAppraiseReviseAttachments.js
Unescape View File

@ -14,7 +14,7 @@ function CommonWorkAppraiseReviseAttachments(props) {
}
`}</style>
<div className={"color-grey-6 mb10 font-16"}>
补交附件
补交内容
</div>
{/* {age} */}

14
public/react/src/modules/courses/busyWork/PublishRightnow.js
Unescape View File

@ -24,7 +24,10 @@ class PublishRightnow extends Component{
Savesname:undefined,
Cancel:undefined,
Saves:undefined,
Topvalright:undefined
Topvalright:undefined,
modallate_time:undefined,
immediatelyopen:false,
starttimeslate_time:undefined
}
}
open = (usingCheckBeforePost) => {
@ -70,6 +73,8 @@ class PublishRightnow extends Component{
Cancel:this.homeworkhide,
Saves:this.homeworkstartend,
typs:showdatatypes ? "start" : "end",
immediatelyopen:true,
modallate_time:showdatatypes?this.state.starttimeslate_time:undefined,
})
}
homeworkhide=()=>{
@ -91,7 +96,9 @@ class PublishRightnow extends Component{
StudentList_value:undefined,
addname:undefined,
addnametype:false,
addnametab:undefined
addnametab:undefined,
modallate_time:undefined,
immediatelyopen:false
})
}
@ -187,6 +194,7 @@ class PublishRightnow extends Component{
this.setState({
course_groups: response.data.course_groups,
starttimesend:response.data.end_time===undefined||response.data.end_time===null||response.data.end_time===""?undefined:response.data.end_time,
starttimeslate_time:response.data.late_time===undefined||response.data.late_time===null||response.data.late_time===""?undefined:response.data.late_time,
})
})
.catch(function (error) {
@ -260,6 +268,8 @@ class PublishRightnow extends Component{
starttimes={this.state.starttimes}
starttimesend={this.state.starttimesend}
typs={this.state.typs}
immediatelyopen={this.state.immediatelyopen}
modallate_time={this.state.starttimeslate_time}
/>:""}
{ showActionButton && <a href="javascript:void(0)" className="color-grey-9" onClick={this.homeworkstart}>{ showdatatypes ? "立即发布" : "立即截止" }</a> }
</div>

2
public/react/src/modules/courses/common/CourseLayoutComponent.js
Unescape View File

@ -53,7 +53,7 @@ class CourseLayoutcomponent extends Component{
{/*left_nav*/}
<div className={"with22 fl setleft"} style={{width:'264px',minHeight:'500px'}}>
<Coursesleftnav {...this.props} {...this.state}/>
<Coursesleftnav myinex={false} {...this.props} {...this.state}/>
</div>
{/*right_concent*/}

1
public/react/src/modules/courses/coursesDetail/CoursesDetail.js
Unescape View File

@ -64,6 +64,7 @@ class CoursesDetail extends Component{
<div className={"with22 fl setleft"} style={{width:'264px',minHeight:'500px'}}>
<Coursesleftnav
{...this.props}
myinex={false}
getleftNavid={this.getleftNavid}
/>
</div>

24
public/react/src/modules/courses/coursesDetail/CoursesLeftNav.js
Unescape View File

@ -347,6 +347,15 @@ class Coursesleftnav extends Component{
indexs:index
})
// this.props.history.replace(urls);
try {
if(this.props.myinex===true){
this.props.Callhomedirectoryornot(true);
}
}catch (e) {
}
e.stopPropagation();//阻止冒泡
}
@ -359,6 +368,14 @@ class Coursesleftnav extends Component{
})
this.props.updataleftNavfun();
this.props.history.replace(urls);
try {
if(this.props.myinex===true){
this.props.Callhomedirectoryornot(true);
}
}catch (e) {
}
e.stopPropagation();//阻止冒泡
}
@ -885,6 +902,13 @@ class Coursesleftnav extends Component{
url:urls,
indexs:index
})
try {
if(this.props.myinex===true){
this.props.Callhomedirectoryornot(true);
}
}catch (e) {
}
this.props.history.replace(urls);
e.stopPropagation();//阻止冒泡
}

33
public/react/src/modules/courses/coursesPublic/OneSelfOrderModal.js
Unescape View File

@ -35,7 +35,10 @@ class OneSelfOrderModal extends Component{
group_ids:[],
endtime:"",
course_groups:undefined,
Checkboxtype:true
Checkboxtype:true,
endtimetypevalue:undefined,
endtimetypeid:undefined,
endtimetypename:undefined
}
}
componentDidMount() {
@ -202,12 +205,16 @@ class OneSelfOrderModal extends Component{
}
propsSaves=(ds,endtime)=>{
this.setState({
endtimetype:false
})
let {course_groups}=this.state;
if(this.props.typs=="end"){
this.props.Saves()
}else{
if(!this.props.immediatelyopen){
if(this.props.typs!="end"){
if(!endtime){
this.setState({
@ -224,6 +231,8 @@ class OneSelfOrderModal extends Component{
return
}
}
}
let type=false
if(course_groups===undefined||course_groups.length===0){
@ -238,6 +247,7 @@ class OneSelfOrderModal extends Component{
this.setState({
endtimetype:true,
endtimetypeid:items.id,
endtimetypename:items.name,
endtimetypevalue:"截止时间不能为空"
})
return
@ -245,12 +255,29 @@ class OneSelfOrderModal extends Component{
// arr.push(moment(moment(handleDateString(this.props.staytime)).add(1, 'week')).format("YYYY-MM-DD HH:mm"))
}else{
if(moment(items.end_time,"YYYY-MM-DD HH:mm") <= moment(this.props.starttime,"YYYY-MM-DD HH:mm")){
type=true
this.setState({
endtimetype:true,
endtimetypevalue:"必须晚于当前时间"
endtimetypeid:items.id,
endtimetypename:items.name,
endtimetypevalue:"截止时间必须晚于当前时间"
})
return
}
if(this.props.modallate_time){
if(moment(items.end_time,"YYYY-MM-DD HH:mm") >= moment(this.props.modallate_time,"YYYY-MM-DD HH:mm")){
type=true
this.setState({
endtimetype:true,
endtimetypeid:items.id,
endtimetypename:items.name,
endtimetypevalue:"截止时间必须晚于补交结束时间"
})
return
}
}
arr.push(handleDateString(items.end_time))
}
}

96
public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js
Unescape View File

@ -295,10 +295,10 @@ class Studentshavecompletedthelist extends Component {
)
},
{
title:<span>最终成绩<Tooltip placement="top" visible={true} title={<pre>
title:<span>最终成绩<Tooltip placement="top" title={<pre>
鼠标停留具体分值上可查<br/>
看得分明细<br/>
</pre>}></Tooltip></span>,
</pre>}><img src={getImageUrl("images/educoder/problem.png")} className={"ml2"}/></Tooltip></span>,
dataIndex: 'efficiencyscore',
key: 'efficiencyscore',
align: 'center',
@ -340,6 +340,22 @@ class Studentshavecompletedthelist extends Component {
}}>{record.efficiencyscore}</span>
</Tooltip>
:
<Tooltip placement="right" title={<div>
<div>{record.objective_score===undefined?"":record.objective_score === "--" ? <span>客观题得分：0分</span> :
<span>客观题得分：{record.objective_score}分</span>}
</div>
<div>{record.subjective_score===undefined?"":record.subjective_score === "--" ? <span>主观题得分：0分</span> :
<span>主观题得分：{record.subjective_score}分</span>}
</div>
<div>{record.efficiencyscore === "--" ? <span>最终成绩：0分</span> :
<span>最终成绩：{record.efficiencyscore}分</span>}
</div>
</div>
}>
<span style={parseInt(record.efficiencyscore) > 90 ? {
color: '#DD1717',
textAlign: "center"
@ -353,6 +369,7 @@ class Studentshavecompletedthelist extends Component {
color: '#747A7F',
textAlign: "center"
}}>{record.efficiencyscore}</span>
</Tooltip>
}
</span>
)
@ -590,10 +607,10 @@ class Studentshavecompletedthelist extends Component {
)
},
{
title:<span>最终成绩<Tooltip placement="top" visible={true} title={<pre>
title:<span>最终成绩<Tooltip placement="top" title={<pre>
鼠标停留具体分值上可查<br/>
看得分明细<br/>
</pre>}></Tooltip></span>,
</pre>}><img src={getImageUrl("images/educoder/problem.png")} className={"ml2"}/></Tooltip></span>,
dataIndex: 'efficiencyscore',
key: 'efficiencyscore',
align: 'center',
@ -637,6 +654,22 @@ class Studentshavecompletedthelist extends Component {
}}>{record.efficiencyscore}</span>
</Tooltip>
:
<Tooltip placement="right" title={<div>
<div>{record.objective_score===undefined?"":record.objective_score === "--" ? <span>客观题得分：0分</span> :
<span>客观题得分：{record.objective_score}分</span>}
</div>
<div>{record.subjective_score===undefined?"":record.subjective_score === "--" ? <span>主观题得分：0分</span> :
<span>主观题得分：{record.subjective_score}分</span>}
</div>
<div>{record.efficiencyscore === "--" ? <span>最终成绩：0分</span> :
<span>最终成绩：{record.efficiencyscore}分</span>}
</div>
</div>
}>
<span style={parseInt(record.efficiencyscore) > 90 ? {
color: '#DD1717',
textAlign: "center",
@ -654,6 +687,7 @@ class Studentshavecompletedthelist extends Component {
textAlign: "center",
width:"199px"
}}>{record.efficiencyscore}</span>
</Tooltip>
}
</span>
@ -877,10 +911,10 @@ class Studentshavecompletedthelist extends Component {
)
},
{
title: <span>最终成绩<Tooltip placement="top" visible={true} title={<pre>
title: <span>最终成绩<Tooltip placement="top" title={<pre>
鼠标停留具体分值上可查<br/>
看得分明细<br/>
</pre>}></Tooltip></span>,
</pre>}><img src={getImageUrl("images/educoder/problem.png")} className={"ml2"}/></Tooltip></span>,
dataIndex: 'efficiencyscore',
key: 'efficiencyscore',
align: 'center',
@ -918,6 +952,22 @@ class Studentshavecompletedthelist extends Component {
}}>{record.efficiencyscore}</span>
</Tooltip>
:
<Tooltip placement="right" title={<div>
<div>{record.objective_score===undefined?"":record.objective_score === "--" ? <span>客观题得分：0分</span> :
<span>客观题得分：{record.objective_score}分</span>}
</div>
<div>{record.subjective_score===undefined?"":record.subjective_score === "--" ? <span>主观题得分：0分</span> :
<span>主观题得分：{record.subjective_score}分</span>}
</div>
<div>{record.efficiencyscore === "--" ? <span>最终成绩：0分</span> :
<span>最终成绩：{record.efficiencyscore}分</span>}
</div>
</div>
}>
<span style={parseInt(record.efficiencyscore) > 90 ? {
color: '#DD1717',
textAlign: "center",
@ -931,6 +981,7 @@ class Studentshavecompletedthelist extends Component {
color: '#747A7F',
textAlign: "center",
}}>{record.efficiencyscore}</span>
</Tooltip>
}
</span>
)
@ -1104,10 +1155,10 @@ class Studentshavecompletedthelist extends Component {
)
},
{
title: <span>最终成绩<Tooltip placement="top" visible={true} title={<pre>
title: <span>最终成绩<Tooltip placement="top" title={<pre>
鼠标停留具体分值上可查<br/>
看得分明细<br/>
</pre>}></Tooltip></span>,
</pre>}><img src={getImageUrl("images/educoder/problem.png")} className={"ml2"}/></Tooltip></span>,
dataIndex: 'efficiencyscore',
key: 'efficiencyscore',
align: 'center',
@ -1144,6 +1195,22 @@ class Studentshavecompletedthelist extends Component {
}}>{record.efficiencyscore}</span>
</Tooltip>
:
<Tooltip placement="right" title={<div>
<div>{record.objective_score===undefined?"":record.objective_score === "--" ? <span>客观题得分：0分</span> :
<span>客观题得分：{record.objective_score}分</span>}
</div>
<div>{record.subjective_score===undefined?"":record.subjective_score === "--" ? <span>主观题得分：0分</span> :
<span>主观题得分：{record.subjective_score}分</span>}
</div>
<div>{record.efficiencyscore === "--" ? <span>最终成绩：0分</span> :
<span>最终成绩：{record.efficiencyscore}分</span>}
</div>
</div>
}>
<span style={parseInt(record.efficiencyscore) > 90 ? {
color: '#DD1717',
textAlign: "center",
@ -1157,6 +1224,7 @@ class Studentshavecompletedthelist extends Component {
color: '#747A7F',
textAlign: "center",
}}>{record.efficiencyscore}</span>
</Tooltip>
}
</span>
)
@ -1511,6 +1579,8 @@ class Studentshavecompletedthelist extends Component {
completion: exercise_users[i].objective_score === undefined ? "--" : exercise_users[i].objective_score === null ? "--" : exercise_users[i].objective_score === "" ? "--" : exercise_users[i].objective_score,
levelscore: exercise_users[i].subjective_score === undefined ? "--" : exercise_users[i].subjective_score === null ? "--" : exercise_users[i].subjective_score === "" ? "--" : exercise_users[i].subjective_score,
efficiencyscore: exercise_users[i].score === null ? "--" : exercise_users[i].score === "" ? "--" : exercise_users[i].score,
objective_score: exercise_users[i].objective_score === null ? "--" : exercise_users[i].objective_score === "" ? "--" : exercise_users[i].objective_score,
subjective_score:exercise_users[i].subjective_score === null ? "--" : exercise_users[i].subjective_score === "" ? "--" : exercise_users[i].subjective_score,
operating: "评阅",
commit_method:exercise_users[i].commit_method,
})
@ -1527,6 +1597,8 @@ class Studentshavecompletedthelist extends Component {
completion: exercise_users[i].objective_score === undefined ? "--" : exercise_users[i].objective_score === null ? "--" : exercise_users[i].objective_score === "" ? "--" : exercise_users[i].objective_score,
levelscore: exercise_users[i].subjective_score === undefined ? "--" : exercise_users[i].subjective_score === null ? "--" : exercise_users[i].subjective_score === "" ? "--" : exercise_users[i].subjective_score,
efficiencyscore: exercise_users[i].score === null ? "--" : exercise_users[i].score === "" ? "--" : exercise_users[i].score,
objective_score: exercise_users[i].objective_score === null ? "--" : exercise_users[i].objective_score === "" ? "--" : exercise_users[i].objective_score,
subjective_score:exercise_users[i].subjective_score === null ? "--" : exercise_users[i].subjective_score === "" ? "--" : exercise_users[i].subjective_score,
operating: "--",
commit_method:exercise_users[i].commit_method
})
@ -1552,6 +1624,8 @@ class Studentshavecompletedthelist extends Component {
submitstate: current_answer_user.commit_status === 1 ? "已提交" : "未提交",
updatetime: moment(current_answer_user.end_at).format('YYYY-MM-DD HH:mm') === "Invalid date" ? "--" : moment(current_answer_user.end_at).format('YYYY-MM-DD HH:mm'),
efficiencyscore: current_answer_user.score === undefined ? "--" : current_answer_user.score === null ? "--" : current_answer_user.score === "" ? "--" : current_answer_user.score,
objective_score: exercise_users[i].objective_score === null ? "--" : exercise_users[i].objective_score === "" ? "--" : exercise_users[i].objective_score,
subjective_score:exercise_users[i].subjective_score === null ? "--" : exercise_users[i].subjective_score === "" ? "--" : exercise_users[i].subjective_score,
review_status: current_answer_user.review_status,
completion: current_answer_user.objective_score === undefined ? "--" : current_answer_user.objective_score === null ? "--" : current_answer_user.objective_score === "" ? "--" : current_answer_user.objective_score,
levelscore: current_answer_user.subjective_score === undefined ? "--" : current_answer_user.subjective_score === null ? "--" : current_answer_user.subjective_score === "" ? "--" : current_answer_user.subjective_score,
@ -1594,6 +1668,8 @@ class Studentshavecompletedthelist extends Component {
completion: exercise_users[i].objective_score === undefined ? "--" : exercise_users[i].objective_score === null ? "--" : exercise_users[i].objective_score === "" ? "--" : exercise_users[i].objective_score,
levelscore: exercise_users[i].subjective_score === undefined ? "--" : exercise_users[i].subjective_score === null ? "--" : exercise_users[i].subjective_score === "" ? "--" : exercise_users[i].subjective_score,
efficiencyscore: exercise_users[i].score === null ? "--" : exercise_users[i].score === "" ? "--" : exercise_users[i].score,
objective_score: exercise_users[i].objective_score === null ? "--" : exercise_users[i].objective_score === "" ? "--" : exercise_users[i].objective_score,
subjective_score:exercise_users[i].subjective_score === null ? "--" : exercise_users[i].subjective_score === "" ? "--" : exercise_users[i].subjective_score,
operating: "查看",
commit_method:exercise_users[i].commit_method,
})
@ -1739,6 +1815,8 @@ class Studentshavecompletedthelist extends Component {
completion: exercise_users[i].objective_score === undefined ? "--" : exercise_users[i].objective_score === null ? "--" : exercise_users[i].objective_score === "" ? "--" : exercise_users[i].objective_score,
levelscore: exercise_users[i].subjective_score === undefined ? "--" : exercise_users[i].subjective_score === null ? "--" : exercise_users[i].subjective_score === "" ? "--" : exercise_users[i].subjective_score,
efficiencyscore: exercise_users[i].score === undefined ? "--" : exercise_users[i].score === null ? "--" : exercise_users[i].score === "" ? "--" : exercise_users[i].score,
objective_score: exercise_users[i].objective_score === null ? "--" : exercise_users[i].objective_score === "" ? "--" : exercise_users[i].objective_score,
subjective_score:exercise_users[i].subjective_score === null ? "--" : exercise_users[i].subjective_score === "" ? "--" : exercise_users[i].subjective_score,
finalscore: "评阅",
user_id: exercise_users[i].user_id,
commit_method:exercise_users[i].commit_method
@ -1756,6 +1834,8 @@ class Studentshavecompletedthelist extends Component {
completion: exercise_users[i].objective_score === undefined ? "--" : exercise_users[i].objective_score === null ? "--" : exercise_users[i].objective_score === "" ? "--" : exercise_users[i].objective_score,
levelscore: exercise_users[i].subjective_score === undefined ? "--" : exercise_users[i].subjective_score === null ? "--" : exercise_users[i].subjective_score === "" ? "--" : exercise_users[i].subjective_score,
efficiencyscore: exercise_users[i].score === undefined ? "--" : exercise_users[i].score === null ? "--" : exercise_users[i].score === "" ? "--" : exercise_users[i].score,
objective_score: exercise_users[i].objective_score === null ? "--" : exercise_users[i].objective_score === "" ? "--" : exercise_users[i].objective_score,
subjective_score:exercise_users[i].subjective_score === null ? "--" : exercise_users[i].subjective_score === "" ? "--" : exercise_users[i].subjective_score,
finalscore: "--",
user_id: exercise_users[i].user_id,
commit_method:exercise_users[i].commit_method

2
public/react/src/modules/courses/poll/PollDetailTabForthRules.js
Unescape View File

@ -353,7 +353,7 @@ class PollDetailTabForthRules extends Component{
render(){
let {rules,course_group,flagPageEdit}=this.state
let isAdmin=this.props.isAdmin();
console.log(flagPageEdit)
// console.log(flagPageEdit)
return(
<div className="bor-top-greyE pt20">
<p className="clearfix mb10">

8
public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
Unescape View File

@ -1204,10 +1204,10 @@ class Listofworksstudentone extends Component {
)
},
{
title: <span>当前成绩<Tooltip placement="top" visible={true} title={<pre>
title: <span>当前成绩<Tooltip placement="top"title={<pre>
鼠标停留具体分值上可查<br/>
看得分明细<br/>
</pre>}></Tooltip></span>,
</pre>}><img src={getImageUrl("images/educoder/problem.png")} className={"ml2"}/></Tooltip></span>,
dataIndex: 'work_score',
key: 'work_score',
align: 'center',
@ -1572,10 +1572,10 @@ class Listofworksstudentone extends Component {
)
},
{
title: <span>当前成绩<Tooltip placement="top" visible={true} title={<pre>
title: <span>当前成绩<Tooltip placement="top" title={<pre>
鼠标停留具体分值上可查<br/>
看得分明细<br/>
</pre>}></Tooltip></span>,
</pre>}><img src={getImageUrl("images/educoder/problem.png")} className={"ml2"}/></Tooltip></span>,
dataIndex: 'work_score',
key: 'work_score',
align: 'center',

9
public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
Unescape View File

@ -135,6 +135,8 @@ class Trainingjobsetting extends Component {
borredszfls:'',
total_scoretwo:0,
total_score:0,
immediatelyopen:false,
modallate_time:undefined
}
// console.log("获取到的值")
// console.log("Trainingjobsetting")
@ -1758,6 +1760,8 @@ class Trainingjobsetting extends Component {
Cancel: this.homeworkhide,
Saves: this.homeworkstartend,
course_groups:response.data.course_groups,
immediatelyopen:true,
modallate_time:response.data.late_time,
})
}
}).catch((error) => {
@ -1799,6 +1803,7 @@ class Trainingjobsetting extends Component {
}
// 立即发布
homeworkstartend = (ds, endtime) => {
debugger
var homeworkid = this.props.match.params.homeworkid;
let data = {}
@ -1914,6 +1919,8 @@ class Trainingjobsetting extends Component {
typs: undefined,
starttimes: undefined,
starttimesend: undefined,
immediatelyopen:false,
modallate_time:undefined,
})
}
cancelBox = () => {
@ -2401,6 +2408,8 @@ class Trainingjobsetting extends Component {
starttimes={this.state.starttimes}
starttimesend={this.state.starttimesend}
typs={this.state.typs}
immediatelyopen={this.state.immediatelyopen}
modallate_time={this.state.modallate_time}
/> : ""}
<Modals

17
public/react/src/modules/courses/signin/css/signincdi.css
Unescape View File

@ -188,6 +188,15 @@
padding-top: 20px;
padding-bottom: 20px;
}
.pdinstop0{
padding-top: 0px !important;
}
.teacherentrydivss{
padding-left: 20px;
padding-right: 20px;
padding-top: 20px;
padding-bottom: 20px;
}
.teachedivp{
font-size:16px;
font-family:Microsoft YaHei;
@ -408,6 +417,14 @@
white-space:nowrap;
cursor: default;
}
.maxnamewidth200yss{
text-align: center;
max-width:200px;
overflow:hidden;
text-overflow:ellipsis;
white-space:nowrap;
cursor: default;
}
.maxnamewidth100s{
width: 100px;
max-width: 100px;

12
public/react/src/modules/courses/signin/teacher/Teachers_signin.js
Unescape View File

@ -49,6 +49,7 @@ class Students_signin extends Component{
page:1,
limit:5
}
this.gogetdatas(data);
// const query = this.props.location.search;
@ -58,8 +59,17 @@ class Students_signin extends Component{
}
componentDidUpdate = (prevProps) => {
try {
if (this.props.homedirectory !== prevProps.homedirectory) {
if(this.props.homedirectory ===true){
this.setState({
switchs:false,
})
}
}
}catch (e) {
}
}
callback=(key)=> {

2
public/react/src/modules/courses/videostatistics/component/Videostatisticscom.js
Unescape View File

@ -33,7 +33,7 @@ class Videostatisticscom extends Component {
<div className="ws100s edu-back-white sortinxdirection" style={{
position: "relative"
}}>
<div className="ws100s teacherentrydivs ">
<div className="ws100s teacherentrydivss ">
<div className="ws100s sortinxdirection">
<div className="ws50s sptits">视频统计总览</div>
<div className="ws50s sptitss xaxisreverseorder">播放数据从{this.props.watch_staticsdata&&this.props.watch_staticsdata.begin_at?this.props.watch_staticsdata.begin_at:0}开始统计</div>

57
public/react/src/modules/courses/videostatistics/component/Videostatisticscomtwo.js
Unescape View File

@ -1,7 +1,7 @@
import React, {Component} from "react";
import '../../signin/css/signincdi.css';
import {Pagination, Table, Menu, Dropdown} from 'antd';
import {getImageUrl, sortDirections} from 'educoder';
import {Pagination, Table, Menu, Dropdown,Spin} from 'antd';
import {getImageUrl, sortDirections,formatSeconds} from 'educoder';
import axios from 'axios';
import LoadingSpin from "../../../../common/LoadingSpin";
import NoneDatas from "../../signin/component/NoneDatas";
@ -16,7 +16,7 @@ class Videostatisticscomtwo extends Component {
this.state = {
data: [],
page: 1,
limit: 10,
limit: 20,
members_count: 0,
columnsstu: [
{
@ -38,7 +38,12 @@ class Videostatisticscomtwo extends Component {
className: 'font-14 maxnamewidth100s',
width: '100px',
render: (text, record) => (
<span style={{width: '100px'}} className="maxnamewidth100s">{record.user_name}</span>
<span style={{width: '100px'}} className="maxnamewidth100s">
<a className="maxnamewidth100s" style={{
color:"#333333"
}} title={record.user_name}>{record.user_name}</a>
</span>
),
},
{
@ -63,7 +68,9 @@ class Videostatisticscomtwo extends Component {
sorter: true,
sortDirections: sortDirections,
render: (text, record) => (
<span style={{width: '150px'}} className="maxnamewidth150s">{record.total_duration}</span>
<span style={{width: '150px'}} className="maxnamewidth150s"><a className="maxnamewidth150s" style={{
color:"#333333"
}} title={record.total_duration}>{record.total_duration}</a></span>
),
},
{
@ -76,7 +83,11 @@ class Videostatisticscomtwo extends Component {
sorter: true,
sortDirections: sortDirections,
render: (text, record) => (
<span style={{width: '100px'}} className="maxnamewidth100s">{record.feq}</span>
<span style={{width: '100px'}} className="maxnamewidth100s">
<a className="maxnamewidth100s" style={{
color:"#333333"
}} title={record.feq}>{record.feq}</a>
</span>
),
},
{
@ -87,7 +98,11 @@ class Videostatisticscomtwo extends Component {
className: 'font-14 maxnamewidth100s',
width: '100px',
render: (text, record) => (
<span style={{width: '100px', color: '#5091FF'}} className="xiaoshou">{record.start_at}</span>
<span style={{width: '100px'}} >
<a className="maxnamewidth100s" style={{
color:"#333333"
}} title= {record.start_at}> {record.start_at}</a>
</span>
),
},
{
@ -98,7 +113,11 @@ class Videostatisticscomtwo extends Component {
className: 'font-14 maxnamewidth100s',
width: '100px',
render: (text, record) => (
<span style={{width: '100px', color: '#5091FF'}} className="xiaoshou">{record.end_at}</span>
<span style={{width: '100px'}} >
<a className="maxnamewidth100s" style={{
color:"#333333"
}} title= {record.end_at}>{record.end_at}</a>
</span>
),
}
],
@ -183,7 +202,7 @@ class Videostatisticscomtwo extends Component {
number: (parseInt(this.state.page) - 1) * parseInt(this.state.limit) + (i + 1),
user_name: response.data.data[i].user_name,
is_finished: response.data.data[i].is_finished,
total_duration: response.data.data[i].total_duration,
total_duration: response.data.data[i].total_duration?formatSeconds(response.data.data[i].total_duration):0,
feq: response.data.data[i].feq,
start_at: response.data.data[i].start_at,
end_at: response.data.data[i].end_at,
@ -385,7 +404,7 @@ class Videostatisticscomtwo extends Component {
<Menu>
<Menu.Item>
<a onClick={() => this.setcourse_groups(null)}>
<p className="maxnamewidth200s">全部</p>
<p className="maxnamewidth200yss">全部</p>
</a>
</Menu.Item>
{
@ -395,7 +414,7 @@ class Videostatisticscomtwo extends Component {
return (
<Menu.Item>
<a onClick={() => this.setcourse_groups(item.id)} key={key}>
<p className="maxnamewidth200s">{item.name}</p>
<p className="maxnamewidth200yss">{item.name}</p>
</a>
</Menu.Item>
)
@ -409,7 +428,7 @@ class Videostatisticscomtwo extends Component {
return (
<React.Fragment>
<div className="ws100s">
<div className="ws100s teacherentrydivs edu-back-white ">
<div className="ws100s teacherentrydivss edu-back-white ">
<div className="ws100s sortinxdirection">
<div className="ws50s sptits">视频名称视频名称…</div>
<div className="ws50s sptitss xaxisreverseorder font-14" style={{
@ -452,15 +471,8 @@ class Videostatisticscomtwo extends Component {
`
}
</style>
{
loading === true ?
<div style={{
minHeight: "400px",
}} className="ws100s">
<LoadingSpin></LoadingSpin>
</div>
:
<div className="ws100s ysltableo teacherentrydivs">
<div className="ws100s ysltableo mt10">
{
data.length === 0 ?
<div style={{
@ -469,17 +481,18 @@ class Videostatisticscomtwo extends Component {
<NoneDatas></NoneDatas>
</div>
:
<Spin spinning={loading}>
<Table
columns={columnsstu}
dataSource={data}
pagination={false}
onChange={this.table1handleChange}
/>
</Spin>
}
</div>
}
</div>

55
public/react/src/modules/courses/videostatistics/component/Videostatisticslist.js
Unescape View File

@ -1,7 +1,7 @@
import React, {Component} from "react";
import '../../signin/css/signincdi.css';
import {Pagination,Table} from 'antd';
import {getImageUrl,sortDirections} from 'educoder';
import {Pagination,Table,Spin} from 'antd';
import {getImageUrl,sortDirections,formatSeconds} from 'educoder';
import axios from 'axios';
import LoadingSpin from "../../../../common/LoadingSpin";
import NoneDatas from "../../signin/component/NoneDatas";
@ -34,7 +34,12 @@ class Videostatisticslist extends Component {
className: 'font-14 maxnamewidth150s',
width: '150px',
render: (text, record) => (
<span style={{width: '150px'}} className="maxnamewidth150s">{record.title}</span>
<span style={{width: '150px'}} className="maxnamewidth150s">
<a className="maxnamewidth150s" style={{
color:"#333333"
}} title={record.title}>{record.title}</a>
</span>
),
},
{
@ -55,12 +60,17 @@ class Videostatisticslist extends Component {
dataIndex: 'total_time',
key: 'total_time',
align: "center",
className: 'font-14 maxnamewidth150s',
width: '150px',
className: 'font-14 maxnamewidth100s',
width: '100px',
sorter: true,
sortDirections: sortDirections,
render: (text, record) => (
<span style={{width: '150px'}} className="maxnamewidth150s">{record.total_time}</span>
<span style={{width: '100px'}} className="maxnamewidth100s">
<a className="maxnamewidth100s" style={{
color:"#333333"
}} title={record.total_time}>{record.total_time}</a>
</span>
),
},
{
@ -71,7 +81,12 @@ class Videostatisticslist extends Component {
className: 'font-14 maxnamewidth100s',
width: '100px',
render: (text, record) => (
<span style={{width: '100px'}} className="maxnamewidth100s">{record.user_name}</span>
<span style={{width: '100px'}} className="maxnamewidth100s">
<a className="maxnamewidth100s" style={{
color:"#333333"
}} title={record.user_name}>{record.user_name}</a>
</span>
),
},
{
@ -80,16 +95,16 @@ class Videostatisticslist extends Component {
key: 'id',
align: "center",
className: 'font-14',
width: '90px',
width: '50px',
render: (text, record) => (
<span style={{width: '90px',color:'#5091FF'}} className="xiaoshou" onClick={()=>this.props.tisticsbools(true,record.id)}>详情</span>
<span style={{width: '50px',color:'#5091FF'}} className="xiaoshou" onClick={()=>this.props.tisticsbools(true,record.id)}>详情</span>
),
}
],
loading:false,
data:[],
page:1,
limit:10,
limit:20,
members_count:0,
order:undefined,
}
@ -134,10 +149,10 @@ class Videostatisticslist extends Component {
let datalists = [];
for (var i = 0; i < response.data.videos.length; i++) {
datalists.push({
number: (parseInt(this.state.spage) - 1) * parseInt(this.state.limit) + (i + 1),
number: (parseInt(this.state.page) - 1) * parseInt(this.state.limit) + (i + 1),
title: response.data.videos[i].title,
people_num: response.data.videos[i].people_num,
total_time: response.data.videos[i].total_time,
total_time: response.data.videos[i].total_time?formatSeconds(response.data.videos[i].total_time):0,
user_name: response.data.videos[i].user_name,
id: response.data.videos[i].id,
})
@ -235,7 +250,7 @@ class Videostatisticslist extends Component {
<React.Fragment>
<div className="ws100s mt20">
<div className="ws100s edu-back-white">
<div className="ws100s teacherentrydivs ">
<div className="ws100s teacherentrydivss ">
<div className="ws100s sortinxdirection">
<div className="ws100s sptits">统计详情</div>
</div>
@ -250,15 +265,8 @@ class Videostatisticslist extends Component {
`
}
</style>
{
loading===true?
<div style={{
minHeight: "400px",
}} className="ws100s">
<LoadingSpin></LoadingSpin>
</div>
:
<div className="ws100s ysltableo teacherentrydivs">
<div className="ws100s ysltableo teacherentrydivs pdinstop0">
{
data.length===0?
<div style={{
@ -267,6 +275,7 @@ class Videostatisticslist extends Component {
<NoneDatas></NoneDatas>
</div>
:
<Spin spinning={loading}>
<Table
columns={columnsstu}
dataSource={data}
@ -274,11 +283,11 @@ class Videostatisticslist extends Component {
onChange={this.table1handleChange}
/>
</Spin>
}
</div>
}
</div>

27
public/react/src/modules/user/account/AccountImg.js
Unescape View File

@ -13,6 +13,7 @@ class AccountImg extends Component {
<ChangeHeaderPicModal
{...this.props} ref="picModal" imageSrc={picUrl} userLogin={this.props.current_user ? this.props.current_user.login : '' }></ChangeHeaderPicModal>
<style>{`
/*
.headphoto {
text-align: center;
@ -26,11 +27,13 @@ class AccountImg extends Component {
margin-top: 19px;
box-sizing: border-box;
}
.headphoto img {
width: 109px;
border-radius: 50%;
height: 109px;
}
.headphoto-black {
display: none;
cursor: pointer;
@ -45,23 +48,37 @@ class AccountImg extends Component {
background-color: rgba(0,0,0,0.3);
color: #fff;
} */
.headphoto:hover .headphoto-black {
display: block;
}
.newheadphotoblack{
position: absolute;
top: 49px;
left: 4px;
top: 45px;
left: 0px;
text-align: center;
color: #fff;
width: 107px;
width: 110px;
height: 23px;
line-height: 23px;
background: rgba(76,172,255,0.7);
}
.relativeRadiusbox{
overflow: hidden;
position: relative;
width: 109px;
border-radius: 50%;
height: 109px;
}
`}</style>
<img alt="头像" id="user_avatar_show" nhname="avatar_image" src={`${picUrl}`}></img>
<p className="newheadphotoblack" onClick={this.editImg} >修改头像</p>
<div className={"relativeRadiusbox"}>
<img alt="头像" id="user_avatar_show" nhname="avatar_image" className={"xiaoshou"} src={`${picUrl}`} onClick={this.editImg} ></img>
<div className="newheadphotoblack xiaoshou" onClick={this.editImg} >修改头像</div>
</div>
</div>
);
}

5
public/react/src/modules/user/usersInfo/video/VideoInReviewItem.js
Unescape View File

@ -74,7 +74,8 @@ function VideoInReviewItem (props) {
<div className="df buttonRow mb10">
{/* <div className={"play_duration"}>累计学习时长：{play_duration} h</div> */}
{/* <span className="time">{moment(published_at || created_at).format('YYYY-MM-DD HH:mm:ss')}{people_num}</span> */}
{link ?<span className="time"> </span>:<span className="time">累计学习时长：{
{link||total_time===undefined?<span className="time"> </span>:<span className="time">累计学习时长：{
formatSeconds(total_time)}
{/* total_time<60?total_time+' s':total_time/60<60?(total_time/60).toFixed(0)+' min':(total_time/3600).toFixed(1)+ ' h' */}
</span>}
@ -82,7 +83,7 @@ function VideoInReviewItem (props) {
<div className="df buttonRow">
{/* 2019-09-01 10:00:22 */}
<span className={"dianjilianicon"}>
{!people_num || (people_num && people_num)===0 ? "" : <Tooltip title="观看人数" placement="bottom">
{total_time===undefined?'':!people_num || (people_num && people_num)===0 ? "" : <Tooltip title="观看人数" placement="bottom">
<i className={`icon-dianjiliang iconfont dianjilianicon font-12`}> {!people_num || (people_num && people_num)===0?"":people_num}</i>
</Tooltip> }
</span>

Write Preview
Loading…
Cancel
Save