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 6 years ago
parent a17191b896 fc23ea5b9b
commit c04b6201b8
8 changed files with 282 additions and 245 deletions
Show Stats Download Patch File Download Diff File

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

@ -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

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

@ -229,7 +229,7 @@ class Listofworksstudentone extends Component {
efficiencyscore: this.state.teacherdata.eff_score, efficiencyscore: this.state.teacherdata.eff_score,
finalscore: this.state.teacherdata.work_score, finalscore: this.state.teacherdata.work_score,
operating: "查看", operating: "查看",
late_penalty: this.state.teacherdata.late_penalty=== null?"0":this.state.teacherdata.student_works[i].late_penalty === undefined?"0":this.state.teacherdata.student_works[i].late_penalty, late_penalty: this.state.teacherdata.late_penalty=== null?"0":this.state.teacherdata.late_penalty === undefined?"0":this.state.teacherdata.late_penalty,
ultimate_score:this.state.teacherdata.ultimate_score, ultimate_score:this.state.teacherdata.ultimate_score,
user_name: this.state.teacherdata.user_name, user_name: this.state.teacherdata.user_name,
user_login: this.state.teacherdata.user_login, user_login: this.state.teacherdata.user_login,
@ -333,7 +333,7 @@ class Listofworksstudentone extends Component {
efficiencyscore: this.state.teacherdata.eff_score, efficiencyscore: this.state.teacherdata.eff_score,
finalscore: this.state.teacherdata.work_score, finalscore: this.state.teacherdata.work_score,
operating: "查看", operating: "查看",
late_penalty: this.state.teacherdata.late_penalty=== null?"0":this.state.teacherdata.student_works[i].late_penalty === undefined?"0":this.state.teacherdata.student_works[i].late_penalty, late_penalty: this.state.teacherdata.late_penalty=== null?"0":this.state.teacherdata.late_penalty === undefined?"0":this.state.teacherdata.late_penalty,
ultimate_score:this.state.teacherdata.ultimate_score, ultimate_score:this.state.teacherdata.ultimate_score,
user_name: this.state.teacherdata.user_name, user_name: this.state.teacherdata.user_name,
user_login: this.state.teacherdata.user_login, user_login: this.state.teacherdata.user_login,
@ -355,8 +355,8 @@ class Listofworksstudentone extends Component {
var teacherlist = undefined; var teacherlist = undefined;
} }
console.log("datalistdatalist文件"); // console.log("datalistdatalist文件");
console.log(datalist); // console.log(datalist);
this.setState({ this.setState({
data: datalist, data: datalist,
teacherlist: teacherlist, teacherlist: teacherlist,

4
public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js
Unescape View File

@ -304,7 +304,7 @@ class ShixunhomeWorkItem extends Component{
} }
{ {
this.props.isNotMember?this.props.discussMessage.private_icon===false? this.props.isNotMember?this.props.discussMessage.private_icon===true?
<span className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.name}</span> <span className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.name}</span>
: :
<Link to={`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${discussMessage.homework_id}/openlist`} <Link to={`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${discussMessage.homework_id}/openlist`}
@ -313,7 +313,7 @@ class ShixunhomeWorkItem extends Component{
{ {
this.props.discussMessage.private_icon===false? this.props.discussMessage.private_icon===true?
<Tooltip title={ this.props.isNotMember?"私有属性，非课堂成员不能访问":"私有属性"} placement="bottom"> <Tooltip title={ this.props.isNotMember?"私有属性，非课堂成员不能访问":"私有属性"} placement="bottom">
<i className="iconfont icon-guansuo color-grey-c ml10 font-16 fl mt4"></i> <i className="iconfont icon-guansuo color-grey-c ml10 font-16 fl mt4"></i>
</Tooltip> </Tooltip>

25
public/react/src/modules/courses/shixunHomework/shixunreport/Shixunechart.js
Unescape View File

@ -10,6 +10,9 @@ function startechart(data){
var effChart = echarts.init(document.getElementById('shixun_skill_chart')); var effChart = echarts.init(document.getElementById('shixun_skill_chart'));
var option = { var option = {
title: {
text: '工作效率',
},
grid:{ grid:{
left: '3%', left: '3%',
right: '9%', right: '9%',
@ -42,7 +45,7 @@ function startechart(data){
xAxis: [ xAxis: [
{ {
type : 'value', type : 'value',
name: '学生序号', name: '学生排名',
scale:true, scale:true,
axisLabel : { axisLabel : {
formatter: ' ', formatter: ' ',
@ -57,11 +60,16 @@ function startechart(data){
], ],
yAxis: [ yAxis: [
{ {
type : 'value', type : "value",
name : '工作效率 = log(实训总得分/实训总耗时)', name : " 实训总得分/实训总耗时",
nameGap: 20,
nameTextStyle: {
color: '#000',
fontSize:12
},
scale:true, scale:true,
axisLabel : { axisLabel : {
formatter: '{value} ' formatter: '{value}'
}, },
splitLine: { splitLine: {
show: false show: false
@ -100,6 +108,7 @@ function startechart(data){
name: data.username, name: data.username,
xAxis:data.echart_data.myself_eff[0], xAxis:data.echart_data.myself_eff[0],
yAxis:data.echart_data.myself_eff[1], yAxis:data.echart_data.myself_eff[1],
value:data.echart_data.myself_eff[1],
} }
], ],
itemStyle: { itemStyle: {
@ -158,6 +167,9 @@ function startechart(data){
var option1 = { var option1 = {
title: {
text: '能力值',
},
backgroundColor: '#fff', backgroundColor: '#fff',
color: [ color: [
'#dd4444', '#fec42c', '#80F1BE' '#dd4444', '#fec42c', '#80F1BE'
@ -200,7 +212,7 @@ function startechart(data){
}, },
yAxis: { yAxis: {
type: 'value', type: 'value',
name: '能力值（实训获得经验值/实训评测次数）', name: " 实训获得经验值/实训评测次数",
nameLocation: 'end', nameLocation: 'end',
nameGap: 20, nameGap: 20,
nameTextStyle: { nameTextStyle: {
@ -230,7 +242,8 @@ function startechart(data){
{ {
name: data.username, name: data.username,
xAxis: data.echart_data.myself_object[0], xAxis: data.echart_data.myself_object[0],
yAxis:data.echart_data.myself_object[1] yAxis:data.echart_data.myself_object[1],
value:data.echart_data.myself_object[1]
} }
], ],
itemStyle: { itemStyle: {

256
public/react/src/modules/paths/ShixunPaths.css
Unescape View File

@ -1,129 +1,129 @@
.paragraph:hover .status_li a{ .paragraph:hover .status_li a{
display: block; display: block;
} }
.newedu-filter-btn{ .newedu-filter-btn{
display: block; display: block;
float: left; float: left;
padding: 0 9px; padding: 0 9px;
height: 28px; /*height: 28px;*/
line-height: 28px; line-height: 28px;
border-radius: 14px; border-radius: 14px;
background-color: #F5F5F5; background-color: #F5F5F5;
color: #666; color: #666;
margin-right: 10px; margin-right: 10px;
margin-bottom: 9px; margin-bottom: 9px;
} }
.edu-filter-btn29BD8B{ .edu-filter-btn29BD8B{
display: block; display: block;
float: left; float: left;
padding: 0 9px; padding: 0 9px;
height: 28px; height: 28px;
line-height: 28px; line-height: 28px;
border-radius: 14px; border-radius: 14px;
background-color: #29BD8B; background-color: #29BD8B;
color: #FFF; color: #FFF;
margin-right: 10px; margin-right: 10px;
margin-bottom: 9px; margin-bottom: 9px;
} }
.lesson-saved-list-item{ .lesson-saved-list-item{
border-bottom: none!important; border-bottom: none!important;
margin-bottom: 10px; margin-bottom: 10px;
background-color: #fff; background-color: #fff;
} }
.click_add{ .click_add{
border-top: none!important; border-top: none!important;
} }
.white-panel li{border:1px solid #fafafa!important;} .white-panel li{border:1px solid #fafafa!important;}
.white-panel li.active{border:1px solid #4CACFF!important;} .white-panel li.active{border:1px solid #4CACFF!important;}
/* 选择实训列表 */ /* 选择实训列表 */
.greybackHead{height: 40px;line-height: 40px;padding: 0px 20px;box-sizing: border-box;color: #676767;background-color: #eaeaea;} .greybackHead{height: 40px;line-height: 40px;padding: 0px 20px;box-sizing: border-box;color: #676767;background-color: #eaeaea;}
.mtf3{ .mtf3{
margin-top:-3px; margin-top:-3px;
} }
.mtf5{ .mtf5{
margin-top: -5px; margin-top: -5px;
} }
.color204{ .color204{
color:rgba(204,204,204,1); color:rgba(204,204,204,1);
} }
.lesson-saved-list-itemdrop{ .lesson-saved-list-itemdrop{
height: 93px; height: 93px;
overflow: hidden; overflow: hidden;
} }
.lesson-saved-list{ .lesson-saved-list{
position: relative; position: relative;
} }
.itempositionleft{ .itempositionleft{
position: absolute; position: absolute;
} }
.itempositionright{ .itempositionright{
position: absolute; position: absolute;
} }
.ant-input{ .ant-input{
background-color: #fafafa!important; background-color: #fafafa!important;
} }
.ant-input:focus{ .ant-input:focus{
background-color:#ffffff!important; background-color:#ffffff!important;
} }
.pathNavLine{bottom: -11px;} .pathNavLine{bottom: -11px;}
#shixun_operation:hover{ #shixun_operation:hover{
color:#fff !important; color:#fff !important;
} }
.cursor{ .cursor{
cursor: pointer; cursor: pointer;
} }
.paragraph_nameid:hover{ .paragraph_nameid:hover{
color:#4cacff !important; color:#4cacff !important;
} }
/* 学习统计 */ /* 学习统计 */
.statisticsNav{height: 100px;} .statisticsNav{height: 100px;}
.statisticsNav ul{margin-top: 35px;} .statisticsNav ul{margin-top: 35px;}
.statisticsNav ul li{float: left;font-size: 18px;color: #4D4D4D;height: 64px;line-height: 64px;margin:0px 30px;cursor: pointer;} .statisticsNav ul li{float: left;font-size: 18px;color: #4D4D4D;height: 64px;line-height: 64px;margin:0px 30px;cursor: pointer;}
.statisticsNav ul li a{color: #4D4D4D!important;} .statisticsNav ul li a{color: #4D4D4D!important;}
.statisticsNav ul li.active{color: #05101A;border-bottom: 2px solid #05101A;} .statisticsNav ul li.active{color: #05101A;border-bottom: 2px solid #05101A;}
.statisticsNav ul li.active a{color: #05101A!important; text-decoration: none !important;} .statisticsNav ul li.active a{color: #05101A!important; text-decoration: none !important;}
.next-loading{ .next-loading{
width:100%; width:100%;
} }
.paddingleft22{ .paddingleft22{
text-align: left; text-align: left;
padding-left: 22px; padding-left: 22px;
} }
.paddingl5{ .paddingl5{
padding-left: 5px; padding-left: 5px;
} }
.paddingl10{ .paddingl10{
padding-left: 10px; padding-left: 10px;
} }
.red{ .red{
color:red; color:red;
} }
.pl38{ .pl38{
padding-left: 38px; padding-left: 38px;
} }
.ml37{ .ml37{
margin-left: 37px; margin-left: 37px;
} }

44
public/react/src/modules/tpm/TPMBanner.js
Unescape View File

@ -10,7 +10,9 @@ import {Modal,Input,Radio,Pagination,message,Spin,Icon,Tooltip} from 'antd';
import 'antd/lib/pagination/style/index.css'; import 'antd/lib/pagination/style/index.css';
import axios from 'axios'; import axios from 'axios'
import Modals from '../modals/Modals';
// import { Rating,Progress } from '@icedesign/base'; // import { Rating,Progress } from '@icedesign/base';
@ -264,16 +266,29 @@ class TPMBanner extends Component {
/* /*
* 撤销发布按钮 * 撤销发布按钮
* */ * */
cancel_publish=()=>{
let id = this.props.match.params.shixunId; ModalCancel=()=>{
let url="/shixuns/" + id +"/cancel_publish.json"; this.setState({
axios.get(url).then((response) => { Modalstype:false
this.props.showSnackbar(response.data.message); })
window.location.reload() }
}).catch((error) => { ModalSave=()=>{
console.log(error) let id = this.props.match.params.shixunId;
}); let url="/shixuns/" + id +"/cancel_publish.json";
axios.get(url).then((response) => {
this.props.showSnackbar(response.data.message);
window.location.reload()
}).catch((error) => {
console.log(error)
});
}
cancel_publish=()=>{
this.setState({
Modalstype:true,
Modalstopval:"是否确认撤销发布？",
ModalCancel:this.ModalCancel,
ModalSave:this.ModalSave,
})
} }
@ -523,6 +538,15 @@ class TPMBanner extends Component {
<div> <div>
<div className="shixunDetail_top"> <div className="shixunDetail_top">
{this.state.Modalstype===true?<Modals
modalsType={this.state.Modalstype}
modalsTopval={this.state.Modalstopval}
modalCancel={this.state.ModalCancel}
modalSave={this.state.ModalSave}
modalsBottomval={this.state.ModalsBottomval}
loadtype={this.state.Loadtype}
/>:""}
<div className="educontent clearfix"> <div className="educontent clearfix">
<p className="clearfix"> <p className="clearfix">
<a href={"/shixuns/" + shixunsDetails.identifier + "/challenges"} <a href={"/shixuns/" + shixunsDetails.identifier + "/challenges"}

154
public/react/src/modules/tpm/component/TPMright.css
Unescape View File

@ -1,78 +1,78 @@
/*b新标签*/ /*b新标签*/
.newedu-filter-btn{ .newedu-filter-btn{
display: block; display: block;
float: left; float: left;
padding: 0 9px; padding: 0 9px;
height: 28px; /*height: 28px;*/
line-height: 28px; line-height: 28px;
border-radius: 14px; border-radius: 14px;
background-color: #F5F5F5; background-color: #F5F5F5;
color: #666; color: #666;
margin-right: 10px; margin-right: 10px;
margin-bottom: 9px; margin-bottom: 9px;
} }
.newedbox{ .newedbox{
/*flex-wrap: wrap;*/ /*flex-wrap: wrap;*/
/*display: -webkit-flex; !* Safari *!*/ /*display: -webkit-flex; !* Safari *!*/
/*display: flex;*/ /*display: flex;*/
width: 340px; width: 340px;
position:relative; position:relative;
overflow: hidden; overflow: hidden;
} }
.newsubscript{ .newsubscript{
position: absolute; position: absolute;
right: 23px; right: 23px;
bottom: 38px; bottom: 38px;
cursor: pointer; cursor: pointer;
} }
.newsubscript:hover{ .newsubscript:hover{
color:deepskyblue; color:deepskyblue;
} }
.edu-filter-btn29BD8B{ .edu-filter-btn29BD8B{
display: block; display: block;
float: left; float: left;
padding: 0 9px; padding: 0 9px;
height: 28px; height: 28px;
line-height: 28px; line-height: 28px;
border-radius: 14px; border-radius: 14px;
background-color: #29BD8B; background-color: #29BD8B;
color: #FFF; color: #FFF;
margin-right: 10px; margin-right: 10px;
margin-bottom: 9px; margin-bottom: 9px;
} }
.relative{ .relative{
position:relative; position:relative;
} }
.newedboxheight{ .newedboxheight{
max-height:181px; max-height:181px;
} }
.newminheight{ .newminheight{
/*max-height: 670px;*/ /*max-height: 670px;*/
max-height: 300px; max-height: 300px;
overflow: auto; overflow: auto;
} }
.delSubentry{ .delSubentry{
font-size:7px; font-size:7px;
font-family:MicrosoftYaHei; font-family:MicrosoftYaHei;
font-weight:400; font-weight:400;
color:rgba(76,172,255,1); color:rgba(76,172,255,1);
line-height:9px; line-height:9px;
cursor: pointer; cursor: pointer;
} }
.operationalter .delSubentry{ .operationalter .delSubentry{
font-size:15px !important; font-size:15px !important;
line-height: 25px; line-height: 25px;
} }
/*临时的tpi关闭按钮样式*/ /*临时的tpi关闭按钮样式*/
.headerRight a { .headerRight a {
color: #1a3f5f; color: #1a3f5f;
} }
/*实训做成弹窗a标签样式调整*/ /*实训做成弹窗a标签样式调整*/
.-task-list-title a:link, .-task-list-title a:visited {color: #bcc6cd;} .-task-list-title a:link, .-task-list-title a:visited {color: #bcc6cd;}
.-task-list-title a:hover{ .-task-list-title a:hover{
color: #459be5; color: #459be5;
} }
.headerLeft .-header-right{ .headerLeft .-header-right{
height: 32px; height: 32px;
} }

6
public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js
Unescape View File

@ -336,12 +336,12 @@ class Challenges extends Component {
{this.props.identity<4? {this.props.identity<4?
item.st === 1 ? item.st === 1 ?
<a onClick={() => this.startshixunCombat(this.props.identity, item.challenge_id, "/editquestion")} <a onClick={() => this.startshixunCombat(this.props.identity, item.challenge_id, "/editquestion")}
className="font-16 color05101a">{item.name+1}</a> className="font-16 color05101a">{item.name}</a>
: :
<a onClick={() => this.startshixunCombat(this.props.identity, item.challenge_id, "/editcheckpoint")} <a onClick={() => this.startshixunCombat(this.props.identity, item.challenge_id, "/editcheckpoint")}
className="font-16 color05101a">{item.name+2}</a>:<span className="font-16 color05101a">{item.name}</a>:<span
// onClick={() => this.startshixunCombat(this.props.identity, item.challenge_id, "/editcheckpoint")} // onClick={() => this.startshixunCombat(this.props.identity, item.challenge_id, "/editcheckpoint")}
className="font-16 color05101a">{item.name+2}</span> className="font-16 color05101a">{item.name}</span>
} }
<Modal <Modal

Write Preview
Loading…
Cancel
Save