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

Merge remote-tracking branch 'origin/topic_bank' into topic_bank

Browse Source
topic_bank
杨树明 6 years ago
parent 31c759e570 c47a11bd37
commit 298f7198c9
9 changed files with 27 additions and 21 deletions
Show Stats Download Patch File Download Diff File

1
app/templates/shared/main.css
Unescape View File

@ -83,6 +83,7 @@ a.edu-txt-w80,.edu-txt-w80{ width:80px; display: inline-block;text-align: center
.font-20{ font-size: 20px!important;}
.font-22{ font-size: 22px!important;}
.font-24{ font-size: 24px!important;}
.font-25{ font-size: 25px!important;}
.font-26{ font-size: 26px!important;}
.font-28{ font-size: 28px!important;}
.font-30{ font-size: 30px!important;}

1
public/react/public/css/css_min_all.css
Unescape View File

@ -103,6 +103,7 @@ a:hover.link-color-grey03{color:#3498db!important;}
.font-18{ font-size: 18px!important;}
.font-20{ font-size: 20px!important;}
.font-22{ font-size: 22px!important;}
.font-25{ font-size: 25px!important;}
.font-24{ font-size: 24px!important;}
.font-28{ font-size: 28px!important;}
.font-30{ font-size: 30px!important;}

1
public/react/public/css/edu-common.css
Unescape View File

@ -103,6 +103,7 @@ a:hover.link-color-grey03{color:#3498db!important;}
.font-18{ font-size: 18px!important;}
.font-20{ font-size: 20px!important;}
.font-22{ font-size: 22px!important;}
.font-25{ font-size: 25px!important;}
.font-24{ font-size: 24px!important;}
.font-28{ font-size: 28px!important;}
.font-30{ font-size: 30px!important;}

1
public/react/src/modules/courses/busyWork/commonWork.js
Unescape View File

@ -76,6 +76,7 @@ class commonWork extends Component{
}
componentDidUpdate(prevProps, prevState) {
if (prevProps.match.path != this.props.match.path) {
this.clearSelection()
this._getList()
}
}

8
public/react/src/modules/courses/poll/PollNew.js
Unescape View File

@ -1032,7 +1032,7 @@ class PollNew extends Component {
if(object.question.max_choices){
if(object.question.max_choices>0){
if (object.question.max_choices < object.question.min_choices) {
this.props.showNotification(`可选的最大限制不能小于最小限制`);
this.props.showNotification(`可选：最小和最大限制须同时为数值或者“--"`);
return;
}
}
@ -1252,7 +1252,7 @@ class PollNew extends Component {
if(object.question.max_choices){
if(object.question.max_choices>0){
if (object.question.max_choices < object.question.min_choices) {
this.props.showNotification(`可选的最大限制不能小于最小限制`);
this.props.showNotification(`可选：最小和最大限制须同时为数值或者“--"`);
return;
}
}
@ -1573,7 +1573,7 @@ class PollNew extends Component {
if(object.question.max_choices){
if(object.question.max_choices>0){
if (object.question.max_choices < object.question.min_choices) {
this.props.showNotification(`可选的最大限制不能小于最小限制`);
this.props.showNotification(`可选：最小和最大限制须同时为数值或者“--"`);
return;
}
}
@ -1784,7 +1784,7 @@ class PollNew extends Component {
if(object.question.max_choices){
if(object.question.max_choices>0){
if (object.question.max_choices < object.question.min_choices) {
this.props.showNotification(`可选的最大限制不能小于最小限制`);
this.props.showNotification(`可选：最小和最大限制须同时为数值或者“--"`);
return;
}
}

30
public/react/src/modules/courses/poll/PollNewQuestbank.js
Unescape View File

@ -3218,7 +3218,7 @@ class PollNewQuestbank extends Component {
onClick={() => this.Deleteentrys(arrid, indext, true)}><Tooltip
title="删除"
placement={"bottom"}><i
className="ml1 iconfont icon-htmal5icon19 font-22 color-grey-c"></i></Tooltip></a>
className="ml1 iconfont icon-htmal5icon19 font-25 color-grey-c"></i></Tooltip></a>
</span>
: ""}
</p>) : (<p className="df mb20">
@ -3256,7 +3256,7 @@ class PollNewQuestbank extends Component {
<a className="lineh-40 mr10"
onClick={() => this.Deleteentrys(arrid, indext, false)}><Tooltip
title="删除" placement={"bottom"}><i
className="iconfont icon-htmal5icon19 font-22 color-grey-c"></i></Tooltip></a>
className="iconfont icon-htmal5icon19 font-25 color-grey-c"></i></Tooltip></a>
:""
}
{
@ -3265,12 +3265,12 @@ class PollNewQuestbank extends Component {
<a className="lineh-40"
onClick={() => this.Ewoption(itemo.question.id, itemo)}><Tooltip
title="新增" placement={"bottom"}><i
className="color-green font-18 iconfont icon-roundaddfill"></i></Tooltip></a>
className="color-green font-22 iconfont icon-roundaddfill"></i></Tooltip></a>
: itemo.question.answers.length - 1 === indext ?
<a className="lineh-40"
onClick={() => this.Ewoption(itemo.question.id, itemo)}><Tooltip
title="新增" placement={"bottom"}><i
className="color-green font-18 iconfont icon-roundaddfill"></i></Tooltip></a>
className="color-green font-22 iconfont icon-roundaddfill"></i></Tooltip></a>
: <a className="lineh-40 yw18"
></a>
}
@ -3280,7 +3280,7 @@ class PollNewQuestbank extends Component {
<a className="lineh-40" id="bianjibianji1"
onClick={() => this.Ewoption(itemo.question.id, itemo)}><Tooltip
title="新增" placement={"bottom"}><i
className="color-green font-18 iconfont icon-roundaddfill"></i></Tooltip></a>
className="color-green font-22 iconfont icon-roundaddfill"></i></Tooltip></a>
:"")
// : "")
: "":""}
@ -3549,7 +3549,7 @@ class PollNewQuestbank extends Component {
onClick={() => this.Deleteentrys(arrid, indext, true)}><Tooltip
title="删除"
placement={"bottom"}><i
className="ml1 iconfont icon-htmal5icon19 font-22 color-grey-c"></i></Tooltip></a>
className="ml1 iconfont icon-htmal5icon19 font-25 color-grey-c"></i></Tooltip></a>
</span>
: ""}
</p>) : (<p className="df mb20">
@ -3583,7 +3583,7 @@ class PollNewQuestbank extends Component {
<a className="lineh-40 mr10"
onClick={() => this.Deleteentrys(arrid, indext, false)}><Tooltip
title="删除" placement={"bottom"}><i
className="iconfont icon-htmal5icon19 font-22 color-grey-c"></i></Tooltip></a>
className="iconfont icon-htmal5icon19 font-25 color-grey-c"></i></Tooltip></a>
:""
}
{
@ -3591,12 +3591,12 @@ class PollNewQuestbank extends Component {
<a className="lineh-40"
onClick={() => this.Ewoption(itemo.question.id, itemo)}><Tooltip
title="新增" placement={"bottom"}><i
className="color-green font-18 iconfont icon-roundaddfill"></i></Tooltip></a>
className="color-green font-22 iconfont icon-roundaddfill"></i></Tooltip></a>
: itemo.question.answers.length - 1 === indext ?
<a className="lineh-40"
onClick={() => this.Ewoption(itemo.question.id, itemo)}><Tooltip
title="新增" placement={"bottom"}><i
className="color-green font-18 iconfont icon-roundaddfill"></i></Tooltip></a>
className="color-green font-22 iconfont icon-roundaddfill"></i></Tooltip></a>
:
<a className="lineh-40 yw18"
></a>
@ -3607,7 +3607,7 @@ class PollNewQuestbank extends Component {
<a className="lineh-40 " id="bianjibianji2"
onClick={() => this.Ewoption(itemo.question.id, itemo)}><Tooltip
title="新增" placement={"bottom"}><i
className="color-green font-18 iconfont icon-roundaddfill"></i></Tooltip></a>
className="color-green font-22 iconfont icon-roundaddfill"></i></Tooltip></a>
:"")
// : "")
: "":""}
@ -3885,7 +3885,7 @@ class PollNewQuestbank extends Component {
onClick={() => this.Deleteentrys(arrid, indext, true)}><Tooltip
title="删除"
placement={"bottom"}><i
className="ml1 iconfont icon-htmal5icon19 font-22 color-grey-c"></i></Tooltip></a>
className="ml1 iconfont icon-htmal5icon19 font-25 color-grey-c"></i></Tooltip></a>
</span>
: ""}
</p>) : (<p className="df mb20">
@ -3927,7 +3927,7 @@ class PollNewQuestbank extends Component {
<a className="lineh-40 mr10"
onClick={() => this.Deleteentrys(arrid, indext, false)}><Tooltip
title="删除" placement={"bottom"}><i
className="iconfont icon-htmal5icon19 font-22 color-grey-c "></i></Tooltip></a>
className="iconfont icon-htmal5icon19 font-25 color-grey-c "></i></Tooltip></a>
:""
}
@ -3938,14 +3938,14 @@ class PollNewQuestbank extends Component {
onClick={() => this.Ewoption(itemo.question.id, itemo)}><Tooltip
title="新增"
placement={"bottom"}><i
className="color-green font-18 iconfont icon-roundaddfill"></i></Tooltip></a>
className="color-green font-22 iconfont icon-roundaddfill"></i></Tooltip></a>
:
itemo.question.answers.length - 1 === indext ?
<a className="lineh-40"
onClick={() => this.Ewoption(itemo.question.id, itemo)}><Tooltip
title="新增"
placement={"bottom"}><i
className="color-green font-18 iconfont icon-roundaddfill"></i></Tooltip></a>
className="color-green font-22 iconfont icon-roundaddfill"></i></Tooltip></a>
:
<a className="lineh-40 yw18"
@ -3958,7 +3958,7 @@ class PollNewQuestbank extends Component {
onClick={() => this.Ewoption(itemo.question.id, itemo)}><Tooltip
title="新增"
placement={"bottom"}><i
className="color-green font-18 iconfont icon-roundaddfill"></i></Tooltip></a>
className="color-green font-22 iconfont icon-roundaddfill"></i></Tooltip></a>
:"")
: "":""}
</p>)}

4
public/react/src/modules/paths/ShixunPathCard.js
Unescape View File

@ -1,5 +1,5 @@
import React, { Component } from 'react';
import {getImageUrl} from 'educoder';
import { getImageUrl , setImagesUrl } from 'educoder';
import { BrowserRouter as Router, Route, Link } from "react-router-dom";
import { Tooltip } from 'antd';
import axios from 'axios';
@ -44,7 +44,7 @@ class ShixunPathCard extends Component{
<Link to={"/paths/"+item.id} className="squareImg" >
{/*target="_blank"*/}
<img alt="详情图片" src={getImageUrl("/"+item.image_url)}/>
<img alt="详情图片" src={setImagesUrl(item.image_url)}/>
</Link>
<div className="mt20" style={{marginLeft:"1px"}}>
<p className="task-hide mb10">

1
public/stylesheets/css/edu-common.css
Unescape View File

@ -108,6 +108,7 @@ a:hover.link-color-grey03{color:#3498db!important;}
.font-18{ font-size: 18px!important;}
.font-20{ font-size: 20px!important;}
.font-22{ font-size: 22px!important;}
.font-25{ font-size: 25px!important;}
.font-24{ font-size: 24px!important;}
.font-28{ font-size: 28px!important;}
.font-30{ font-size: 30px!important;}

1
public/stylesheets/educoder/edu-main.css
Unescape View File

@ -82,6 +82,7 @@ a.edu-txt-w80,.edu-txt-w80{ width:80px; display: inline-block;text-align: center
.font-18{ font-size: 18px!important;}
.font-20{ font-size: 20px!important;}
.font-22{ font-size: 22px!important;}
.font-25{ font-size: 25px!important;}
.font-24{ font-size: 24px!important;}
.font-26{ font-size: 26px!important;}
.font-28{ font-size: 28px!important;}

Write Preview
Loading…
Cancel
Save