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

初版

Browse Source
dev_aliyun2
harry 5 years ago
parent 89c7c078cf
commit 1c5ac52b68
13 changed files with 1437 additions and 1487 deletions
Show Stats Download Patch File Download Diff File

6
public/react/src/common/Component.js
Unescape View File

@ -1,5 +1,5 @@
import md5 from 'md5';
export function setmiyah(logins){
const opens ="79e33abd4b6588941ab7622aed1e67e8";
return md5(opens+logins);
export default function setmiyah(logins) {
const opens = "79e33abd4b6588941ab7622aed1e67e8";
return md5(opens + logins);
}

88
public/react/src/common/UrlTool.js
Unescape View File

@ -1,47 +1,35 @@
import React from "react";
import md5 from 'md5';
import {Input} from "antd";
import { Input } from "antd";
const { Search } = Input;
const $ = window.$;
const isDev = window.location.port == 3007;
export const TEST_HOST = "https://test-newweb.educoder.net"
export function getImageUrl(path) {
// https://www.educoder.net
// https://testbdweb.trustie.net
// const local = 'http://localhost:3000'
const local = 'https://test-newweb.educoder.net'
const local = 'https://test-newweb.educoder.net'
if (isDev) {
return `${local}/${path}`
}
return `/${path}`;
}
export function setImagesUrl(path){
export function setImagesUrl(path) {
const local = 'https://test-newweb.educoder.net'
let firstStr=path.substr(0,1);
// console.log(firstStr);
if(firstStr=="/"){
return isDev?`${local}${path}`:`${path}`;
}else{
return isDev?`${local}/${path}`:`/${path}`;
let firstStr = path.substr(0, 1);
if (firstStr == "/") {
return isDev ? `${local}${path}` : `${path}`;
} else {
return isDev ? `${local}/${path}` : `/${path}`;
}
}
export function getUrl(path, goTest) {
// https://www.educoder.net
// https://testbdweb.trustie.net
// 如果想所有url定位到测试版，可以反注释掉下面这行
//goTest = true
// testbdweb.educoder.net testbdweb.trustie.net
// const local = goTest ? 'https://testeduplus2.educoder.net' : 'http://localhost:3000'
// const local = 'https://testeduplus2.educoder.net'
export function getUrl(path) {
const local = 'https://test-newweb.educoder.net'
if (isDev) {
return `${local}${path?path:''}`
return `${local}${path ? path : ''}`
}
return `${path ? path: ''}`;
return `${path ? path : ''}`;
}
export function getUrlmys(path, goTest) {
@ -55,9 +43,9 @@ export function getUrlmys(path, goTest) {
// const local = 'https://testeduplus2.educoder.net'
const local = 'https://test-jupyterweb.educoder.net'
if (isDev) {
return `${local}${path?path:''}`
return `${local}${path ? path : ''}`
}
return `${path ? path: ''}`;
return `${path ? path : ''}`;
}
export function getStaticUrl() {
const local = TEST_HOST;
@ -68,27 +56,29 @@ export function getStaticUrl() {
return ''
}
export function getUrl2(path, goTest) {
const local = 'http://localhost:3000'
const local = 'http://localhost:3000'
if (isDev) {
return `${local}${path?path:''}`
return `${local}${path ? path : ''}`
}
return `${path ? path: ''}`;
return `${path ? path : ''}`;
}
const newopens ="79e33abd4b6588941ab7622aed1e67e8";
const newopens = "79e33abd4b6588941ab7622aed1e67e8";
let newtimestamp;
let checkSubmitFlgs = false;
function railsgettimess(proxy) {
if(checkSubmitFlgs===false){
$.ajax({url:proxy,
async:false,success:function(data){
if(data.status===0){
newtimestamp=data.message;
if (checkSubmitFlgs === false) {
$.ajax({
url: proxy,
async: false, success: function (data) {
if (data.status === 0) {
newtimestamp = data.message;
checkSubmitFlgs = true;
}
}})
}
})
window.setTimeout(function () {
checkSubmitFlgs=false;
checkSubmitFlgs = false;
}, 2500);
}
}
@ -107,32 +97,32 @@ export function getmyUrl(geturl) {
export function getUploadActionUrl(path, goTest) {
Railsgettimes()
let anewopens=md5(newopens+newtimestamp);
let anewopens = md5(newopens + newtimestamp);
return `${getUrl()}/api/attachments.json${isDev ? `?debug=${window._debugType || 'admin'}&randomcode=${newtimestamp}&client_key=${anewopens}` : `?randomcode=${newtimestamp}&client_key=${anewopens}`}`;
}
export function getUploadActionUrltwo(id) {
Railsgettimes()
let anewopens=md5(newopens+newtimestamp);
let anewopens = md5(newopens + newtimestamp);
return `${getUrlmys()}/api/shixuns/${id}/upload_data_sets.json${isDev ? `?debug=${window._debugType || 'admin'}&randomcode=${newtimestamp}&client_key=${anewopens}` : `?randomcode=${newtimestamp}&client_key=${anewopens}`}`
}
export function getUploadActionUrlthree() {
Railsgettimes()
let anewopens=md5(newopens+newtimestamp);
let anewopens = md5(newopens + newtimestamp);
return `${getUrlmys()}/api/jupyters/import_with_tpm.json${isDev ? `?debug=${window._debugType || 'admin'}&randomcode=${newtimestamp}&client_key=${anewopens}` : `?randomcode=${newtimestamp}&client_key=${anewopens}`}`
}
export function getUploadActionUrlOfAuth(id) {
Railsgettimes()
let anewopens=md5(newopens+newtimestamp);
let anewopens = md5(newopens + newtimestamp);
return `${getUrl()}/api/users/accounts/${id}/auth_attachment.json${isDev ? `?debug=${window._debugType || 'admin'}&randomcode=${newtimestamp}&client_key=${anewopens}` : `?randomcode=${newtimestamp}&client_key=${anewopens}`}`
}
export function getRandomNumber(type) {
Railsgettimes()
let anewopens=md5(newopens+newtimestamp);
return type===true?`randomcode=${newtimestamp}&client_key=${anewopens}`:`?randomcode=${newtimestamp}&client_key=${anewopens}`
Railsgettimes()
let anewopens = md5(newopens + newtimestamp);
return type === true ? `randomcode=${newtimestamp}&client_key=${anewopens}` : `?randomcode=${newtimestamp}&client_key=${anewopens}`
}
export function test(path) {
@ -150,11 +140,11 @@ export function getTaskUrlById(id) {
export function getRandomcode(url) {
Railsgettimes()
let anewopens=md5(newopens+newtimestamp);
let anewopens = md5(newopens + newtimestamp);
if (url.indexOf('?') == -1) {
return `${url}?randomcode=${newtimestamp}&client_key=${anewopens}`
}else {
} else {
return `${url}&randomcode=${newtimestamp}&client_key=${anewopens}`
}
@ -174,14 +164,14 @@ export function htmlEncode(str) {
return s;
}
export function publicSearchs(Placeholder,onSearch,onInputs,onChanges,loadings) {
return(<Search
placeholder= { Placeholder || "请输入内容进行搜索" }
export function publicSearchs(Placeholder, onSearch, onInputs, onChanges, loadings) {
return (<Search
placeholder={Placeholder || "请输入内容进行搜索"}
onSearch={onSearch}
// value={searchValue}
onInput={onInputs}
onChange={onChanges}
loading={loadings||false}
loading={loadings || false}
allowClear={true}
></Search>)
}

14
public/react/src/common/components/SetAppModel.js
Unescape View File

@ -1,6 +1,6 @@
import React, { Component } from 'react';
import { Modal } from 'antd';
export function SetAppModel(options={}) {
export default function SetAppModel(options = {}) {
return function wrap(WrappedComponent) {
return class Wrapper extends Component {
constructor(props) {
@ -10,14 +10,14 @@ export function SetAppModel(options={}) {
}
}
modalCancel=()=>{
modalCancel = () => {
window.location.href = "/";
}
setDownload=()=>{
window.location.href ='/account/profile';
setDownload = () => {
window.location.href = '/account/profile';
}
componentDidMount(){
componentDidMount() {
console.log(this.props)
}
@ -38,8 +38,8 @@ export function SetAppModel(options={}) {
<div className={"tabeltext-alignleft mt10"}><p>您尚未完善个人资料</p></div>
<div className={"tabeltext-alignleft mt10"}><p>请在完成资料后，提交试用申请</p></div>
<div className="clearfix mt30 edu-txt-center">
<a className="task-btn mr30" onClick={()=>this.modalCancel()}>取消</a>
<a className="task-btn task-btn-orange" onClick={()=>this.setDownload()}>立即完善资料</a>
<a className="task-btn mr30" onClick={() => this.modalCancel()}>取消</a>
<a className="task-btn task-btn-orange" onClick={() => this.setDownload()}>立即完善资料</a>
</div>
</div>
</Modal>

11
public/react/src/common/educoder.js
Unescape View File

@ -4,7 +4,7 @@ export {
, getTaskUrlById as getTaskUrlById, TEST_HOST, htmlEncode as htmlEncode
} from './UrlTool';
export { setmiyah as setmiyah } from './Component';
export { default as setmiyah } from './Component';
export { default as queryString } from './UrlTool2';
export { default as SnackbarHOC } from './SnackbarHOC';
@ -44,7 +44,7 @@ export { themes, ThemeContext } from './context/ThemeContext'
export { default as ModalHOC } from './components/ModalHOC'
export { SetAppModel } from './components/SetAppModel'
export { default as SetAppModel } from './components/SetAppModel'
export { default as LinkAfterLogin } from './components/LinkAfterLogin'
export { default as Cropper } from './components/Cropper'
@ -58,19 +58,12 @@ export { default as City } from './components/form/City'
// course
export { default as WordsBtn } from './course/WordsBtn'
export { default as ActionBtn } from './course/ActionBtn'
export { default as MarkdownToHtml } from './components/markdown/MarkdownToHtml'
export { default as DMDEditor } from './components/markdown/DMDEditor'
export { default as Clappr } from './components/media/Clappr'
export { default as AliyunUploader } from './components/media/AliyunUploader'
export { default as ImageLayer2 } from './hooks/ImageLayer2'
// 外部
export { default as CBreadcrumb } from '../modules/courses/common/CBreadcrumb'
export { default as CNotificationHOC } from '../modules/courses/common/CNotificationHOC'

3
public/react/src/components/test-panel.jsx
Unescape View File

@ -1,5 +1,5 @@
import React, { Fragment } from 'react';
import { getUploadActionUrl, getUrl } from 'educoder';
import { getUploadActionUrl, getUrl, setmiyah } from 'educoder';
import TPMMDEditor from '../modules/tpm/challengesnew/TPMMDEditor';
import moment from 'moment'
@ -118,6 +118,7 @@ export default () => {
return (
<Fragment >
<p>{getUrl()}</p>
<p>{setmiyah()}</p>
<p>{getUploadActionUrl()}</p>
<TPMMDEditor />
</Fragment>

918
public/react/src/modules/projectPackages/PackageIndexNewandEdit/PackageIndexNEIBannerConcent.js
View File

File diff suppressed because it is too large Load Diff

90
public/react/src/modules/tpm/TPMUpdatepropaede/TPMUpdatepropaede.js
Unescape View File

@ -1,46 +1,40 @@
import React, {Component} from 'react';
import React, { Component } from 'react';
import {Input, Select, Radio, Checkbox, Popconfirm, message, Modal} from 'antd';
import {BrowserRouter as Router, Route, Link, Switch} from "react-router-dom";
import { Link } from "react-router-dom";
import axios from 'axios';
import TPMMDEditor from '../../tpm/challengesnew/TPMMDEditor';
import {getUrl} from 'educoder';
export default class TPMUpdatepropaede extends Component {
constructor(props) {
super(props)
this.neweditanswerRef=React.createRef();
this.neweditanswerRef = React.createRef();
this.state = {
shixunId:undefined,
shixunId: undefined,
}
}
componentDidMount() {
let id = this.props.match.params.shixunId;
let url="/shixuns/"+id+"/propaedeutics.json";
let url = "/shixuns/" + id + "/propaedeutics.json";
axios.get(url).then((response) => {
if (response.data.status === 403||response.data.status === 401||response.data.status === 500) {
if (response.data.status === 403 || response.data.status === 401 || response.data.status === 500) {
}else{
} else {
this.setState({
shixunId:id,
shixunId: id,
})
if(response.data.content[0]!=null){
this.setState({
editanswersRefval:response.data.content,
})
this.neweditanswerRef.current.setValue(response.data.content)
}else{
this.setState({
editanswersRefval:"",
})
this.neweditanswerRef.current.setValue('')
if (response.data.content[0] != null) {
this.setState({
editanswersRefval: response.data.content,
})
this.neweditanswerRef.current.setValue(response.data.content)
} else {
this.setState({
editanswersRefval: "",
})
this.neweditanswerRef.current.setValue('')
}
}
}).catch((error) => {
@ -49,21 +43,21 @@ export default class TPMUpdatepropaede extends Component {
}
updatepropaedeuticsvalue=()=>{
updatepropaedeuticsvalue = () => {
let id = this.props.match.params.shixunId;
let {shixunId} = this.state;
let url="/shixuns/"+id+"/update_propaedeutics.json";
let { shixunId } = this.state;
let url = "/shixuns/" + id + "/update_propaedeutics.json";
const update_propaedeuticsvalue = this.neweditanswerRef.current.getValue().trim();
axios.post(url,{
content:update_propaedeuticsvalue
}
).then((response) => {
if (response.data.status === 403||response.data.status === 401||response.data.status === 500) {
axios.post(url, {
content: update_propaedeuticsvalue
}
).then((response) => {
if (response.data.status === 403 || response.data.status === 401 || response.data.status === 500) {
}else{
} else {
this.props.showNotification(response.data.message);
if(response.data.status===1){
this.props.history.replace("/shixuns/"+shixunId+"/propaedeutics");
if (response.data.status === 1) {
this.props.history.replace("/shixuns/" + shixunId + "/propaedeutics");
}
}
}).catch((error) => {
@ -71,27 +65,27 @@ export default class TPMUpdatepropaede extends Component {
});
}
render() {
let {shixunId} = this.state;
let { shixunId } = this.state;
return (
<React.Fragment>
<div className="educontent">
<div className="edu-back-white mt30">
<div className="font-16 pt20 pl20 pr20 pb20 bor-bottom-greyE clearfix">
<span className="fl">背景知识</span>
<Link to={"/shixuns/"+shixunId+"/propaedeutics"}className="color-grey-9 fr">返回</Link>
</div>
<div className="edu-back-white mt30">
<div className="font-16 pt20 pl20 pr20 pb20 bor-bottom-greyE clearfix">
<span className="fl">背景知识</span>
<Link to={"/shixuns/" + shixunId + "/propaedeutics"} className="color-grey-9 fr">返回</Link>
</div>
<div className="padding40-20">
<TPMMDEditor ref={this.neweditanswerRef} placeholder="请输入选择题的题干内容" mdID={'editquestioMDid'} refreshTimeout={1500}
needRecreate={true} watch={true} className="courseMessageMD" initValue={this.neweditanswerRefval}></TPMMDEditor>
</div>
</div>
<div className="padding40-20">
<TPMMDEditor ref={this.neweditanswerRef} placeholder="请输入选择题的题干内容" mdID={'editquestioMDid'} refreshTimeout={1500}
needRecreate={true} watch={true} className="courseMessageMD" initValue={this.neweditanswerRefval}></TPMMDEditor>
</div>
</div>
<div className="clearfix mb30 mt30">
<a className="defalutSubmitbtn fl mr20"
onClick={this.updatepropaedeuticsvalue}>保存</a>
<Link to={"/shixuns/"+shixunId+"/propaedeutics"} className="defalutCancelbtn fl"
onClick={this.updatepropaedeuticsvalue}>保存</a>
<Link to={"/shixuns/" + shixunId + "/propaedeutics"} className="defalutCancelbtn fl"
>取消</Link>
</div>

5
public/react/src/modules/tpm/TPMsettings/oldTPMsettings.js
Unescape View File

@ -3,7 +3,7 @@ import React, { Component } from 'react';
import MonacoEditor from 'react-monaco-editor';
//MonacoDiffEditor 对比模式
import { Input, Select, Radio, Checkbox, Popconfirm, message, Modal, Icon, DatePicker, Breadcrumb, Upload, Button, notification, Tooltip } from 'antd';
import { Input, Select, Radio, Checkbox, Modal, Icon, DatePicker, Breadcrumb, Upload, Button, notification, Tooltip } from 'antd';
// import "antd/dist/antd.css";
@ -15,9 +15,8 @@ import axios from 'axios';
import './css/TPMsettings.css';
import { getImageUrl, toPath, getUrl, getUploadActionUrl } from 'educoder';
import { getImageUrl, getUrl, getUploadActionUrl } from 'educoder';
let origin = getUrl();
let path = getUrl("/editormd/lib/")

5
public/react/src/modules/tpm/challengesnew/TPMMDEditor.js
Unescape View File

@ -4,11 +4,8 @@ import '../../courses/css/Courses.css'
import './css/TPMchallengesnew.css';
let path = '/editormd/lib/'
path = getUrl("/editormd/lib/")
const $ = window.$;
// 保存数据
function md_add_data(k, mdu, d) {
window.sessionStorage.setItem(k + mdu, d);
@ -86,7 +83,7 @@ function create_editorMD(id, width, high, placeholder, imageUrl, callback, initV
var editorName = window.editormd(id, {
width: width,
height: high === undefined ? 400 : high,
path: path, // "/editormd/lib/"
path: getUrl("/editormd/lib/"), // "/editormd/lib/"
markdown: initValue,
dialogLockScreen: false,

1012
public/react/src/modules/tpm/challengesnew/TPMquestion.js
View File

File diff suppressed because it is too large Load Diff

432
public/react/src/modules/tpm/challengesnew/old/TPMchallengesnew.js
Unescape View File

@ -1,10 +1,8 @@
import React, {Component} from 'react';
import React, { Component } from 'react';
import {Input, Select, Radio, Checkbox, Popconfirm, message, Modal} from 'antd';
import { Input, Select, Radio, message } from 'antd';
import {BrowserRouter as Router, Route, Link, Switch} from "react-router-dom";
// import "antd/dist/antd.css";
import { Link } from "react-router-dom";
import TPMMDEditor from '../TPMMDEditor';
@ -12,19 +10,13 @@ import axios from 'axios';
import '../css/TPMchallengesnew.css';
import { getImageUrl, toPath } from 'educoder';
import {getUrl} from 'educoder';
import { getImageUrl } from 'educoder';
let origin = getUrl();
import { getUrl } from 'educoder';
let path = getUrl("/editormd/lib/")
const $ = window.$;
let timeout;
let currentValue;
const Option = Select.Option;
@ -33,7 +25,7 @@ const RadioGroup = Radio.Group;
export default class TPMchallengesnew extends Component {
constructor(props) {
super(props)
this.exercisememoMDRef=React.createRef();
this.exercisememoMDRef = React.createRef();
this.state = {
choice_url: undefined,
practice_url: undefined,
@ -41,8 +33,8 @@ export default class TPMchallengesnew extends Component {
task_pass_default: undefined,
submit_url: undefined,
shixunCreatePracticeGroup: 1,
optionsums:[100,200],
activetype:0,
optionsums: [100, 200],
activetype: 0,
setopen: false,
shixunCreatePractice: undefined,
onshixunsmarkvalue: 100,
@ -50,28 +42,28 @@ export default class TPMchallengesnew extends Component {
shixunsskillvaluelist: [],
tab2url: "",
tab3url: "",
prev_challenge:undefined,
next_challenge:undefined,
prev_challenge: undefined,
next_challenge: undefined,
power: false,
shixunCreatePracticetype: false,
shixunsskillvaluelisttype: false,
marktype:false,
editPracticesendtype:false,
CreatePracticesendtype:false,
exec_time:20,
shixunExec_timeType:false
marktype: false,
editPracticesendtype: false,
CreatePracticesendtype: false,
exec_time: 20,
shixunExec_timeType: false
}
}
componentDidMount() {
let id = this.props.match.params.shixunId;
let checkpointId=this.props.match.params.checkpointId;
let checkpointId = this.props.match.params.checkpointId;
let newchoice_url= "/shixuns/"+id+"/challenges/newquestion";
let newpractice_url= "/shixuns/"+id+"/challenges/new";
let newgo_back_url="/shixuns/"+id+"/challenges"
if(checkpointId===undefined){
let newchoice_url = "/shixuns/" + id + "/challenges/newquestion";
let newpractice_url = "/shixuns/" + id + "/challenges/new";
let newgo_back_url = "/shixuns/" + id + "/challenges"
if (checkpointId === undefined) {
//新建模式
let url = "/shixuns/" + id + "/challenges/new.json"
axios.get(url).then((response) => {
@ -82,67 +74,67 @@ export default class TPMchallengesnew extends Component {
position: response.data.position,
task_pass_default: response.data.task_pass_default,
submit_url: response.data.submit_url,
checkpointId:checkpointId,
exercisememoMDRefval:response.data.task_pass_default
checkpointId: checkpointId,
exercisememoMDRefval: response.data.task_pass_default
})
this.exercisememoMDRef.current.setValue(response.data.task_pass_default||'')
this.exercisememoMDRef.current.setValue(response.data.task_pass_default || '')
}).catch((error) => {
console.log(error)
});
}else{
} else {
//编辑模式
let url="/shixuns/"+id+"/challenges/"+checkpointId+".json?tab=0";
let url = "/shixuns/" + id + "/challenges/" + checkpointId + ".json?tab=0";
axios.get(url).then((response) => {
let optionsum;
if(response.data.difficulty===1){
optionsum=[100,200];
}else if(response.data.difficulty===2){
optionsum=[300,400,500,600];
}else if(response.data.difficulty===3){
optionsum=[700,800,900,1000]
if (response.data.difficulty === 1) {
optionsum = [100, 200];
} else if (response.data.difficulty === 2) {
optionsum = [300, 400, 500, 600];
} else if (response.data.difficulty === 3) {
optionsum = [700, 800, 900, 1000]
}
let newprev_challenge=response.data.prev_challenge;
let next_challenge=response.data.next_challenge;
let newprev_challenge = response.data.prev_challenge;
let next_challenge = response.data.next_challenge;
if (newprev_challenge != undefined) {
if(newprev_challenge.st===0){
if (newprev_challenge.st === 0) {
newprev_challenge = "/shixuns/" + id + "/challenges/" + newprev_challenge.id + "/editcheckpoint";
}else{
newprev_challenge = "/shixuns/" + id + "/challenges/" + newprev_challenge.id + "/editquestion";
} else {
newprev_challenge = "/shixuns/" + id + "/challenges/" + newprev_challenge.id + "/editquestion";
}
}
if (next_challenge != undefined) {
if(next_challenge.st===0){
next_challenge = "/shixuns/" + id + "/challenges/" + next_challenge.id+ "/editcheckpoint";
}else{
next_challenge = "/shixuns/" + id + "/challenges/" + next_challenge.id+ "/editquestion";
if (next_challenge.st === 0) {
next_challenge = "/shixuns/" + id + "/challenges/" + next_challenge.id + "/editcheckpoint";
} else {
next_challenge = "/shixuns/" + id + "/challenges/" + next_challenge.id + "/editquestion";
}
}
this.setState({
power: response.data.power,
prev_challenge:newprev_challenge,
next_challenge:next_challenge,
prev_challenge: newprev_challenge,
next_challenge: next_challenge,
choice_url: newchoice_url,
practice_url: newpractice_url,
go_back_url: newgo_back_url,
shixunCreatePractice:response.data.subject,
position:response.data.position,
shixunCreatePracticeGroup:response.data.difficulty,
optionsums:optionsum,
onshixunsmarkvalue:response.data.score,
shixunsskillvaluelist:response.data.tags,
checkpointId:checkpointId,
exec_time:response.data.exec_time,
tab2url: "/shixuns/" + id + "/challenges/"+checkpointId+"/tab=2",
tab3url: "/shixuns/" + id + "/challenges/"+checkpointId+"/tab=3",
exercisememoMDRefval:response.data.task_pass
shixunCreatePractice: response.data.subject,
position: response.data.position,
shixunCreatePracticeGroup: response.data.difficulty,
optionsums: optionsum,
onshixunsmarkvalue: response.data.score,
shixunsskillvaluelist: response.data.tags,
checkpointId: checkpointId,
exec_time: response.data.exec_time,
tab2url: "/shixuns/" + id + "/challenges/" + checkpointId + "/tab=2",
tab3url: "/shixuns/" + id + "/challenges/" + checkpointId + "/tab=3",
exercisememoMDRefval: response.data.task_pass
})
if(response.data.power===false){
if (response.data.power === false) {
this.props.showSnackbar("你没有权限修改");
}
this.exercisememoMDRef.current.setValue(response.data.task_pass||'')
this.exercisememoMDRef.current.setValue(response.data.task_pass || '')
}).catch((error) => {
console.log(error)
});
@ -154,20 +146,20 @@ export default class TPMchallengesnew extends Component {
onshixunCreatePracticeChange = (e) => {
let optionsum;
let onshixunsmark;
if(e.target.value===1){
optionsum=[100,200];
onshixunsmark=100;
}else if(e.target.value===2){
optionsum=[300,400,500,600];
onshixunsmark=300;
}else if(e.target.value===3){
optionsum=[700,800,900,1000]
onshixunsmark=700;
if (e.target.value === 1) {
optionsum = [100, 200];
onshixunsmark = 100;
} else if (e.target.value === 2) {
optionsum = [300, 400, 500, 600];
onshixunsmark = 300;
} else if (e.target.value === 3) {
optionsum = [700, 800, 900, 1000]
onshixunsmark = 700;
}
this.setState({
shixunCreatePracticeGroup: e.target.value,
optionsums:optionsum,
onshixunsmarkvalue:onshixunsmark
optionsums: optionsum,
onshixunsmarkvalue: onshixunsmark
})
}
@ -180,48 +172,48 @@ export default class TPMchallengesnew extends Component {
CreatePracticesend = () => {
this.setState({
CreatePracticesendtype:true
})
this.setState({
CreatePracticesendtype: true
})
if(this.props.status===2){
if (this.props.status === 2) {
this.props.showSnackbar("该实训已经发布不能新建")
this.setState({
CreatePracticesendtype:false
CreatePracticesendtype: false
})
return
}
let {shixunCreatePractice, shixunCreatePracticeGroup, onshixunsmarkvalue, shixunsskillvaluelist,exec_time} = this.state;
if (shixunCreatePractice === undefined||shixunCreatePractice=="") {
let { shixunCreatePractice, shixunCreatePracticeGroup, onshixunsmarkvalue, shixunsskillvaluelist, exec_time } = this.state;
if (shixunCreatePractice === undefined || shixunCreatePractice == "") {
this.setState({
shixunCreatePracticetype: true
})
this.props.showSnackbar("任务名称为空")
$('html').animate({
$('html').animate({
scrollTop: 10
}, 1000);
this.setState({
CreatePracticesendtype:false
})
this.setState({
CreatePracticesendtype: false
})
return
}
if (shixunsskillvaluelist.length === 0) {
this.setState({
shixunsskillvaluelisttype: true,
CreatePracticesendtype:false
CreatePracticesendtype: false
})
this.props.showSnackbar("技能标签为空")
return
}
if(exec_time===null||exec_time===undefined||exec_time===""){
if (exec_time === null || exec_time === undefined || exec_time === "") {
this.setState({
shixunExec_timeType:false
})
return
}
this.setState({
shixunExec_timeType: false
})
return
}
const exercise_editormdvalue = this.exercisememoMDRef.current.getValue().trim();
let id = this.props.match.params.shixunId;
@ -229,28 +221,28 @@ export default class TPMchallengesnew extends Component {
let url = "/shixuns/" + id + "/challenges.json";
axios.post(url, {
identifier:id,
identifier: id,
subject: shixunCreatePractice,
task_pass: exercise_editormdvalue,
difficulty: shixunCreatePracticeGroup,
score: onshixunsmarkvalue,
challenge_tag: shixunsskillvaluelist,
st: 0,
exec_time:exec_time
exec_time: exec_time
}).then((response) => {
if (response.data.status === 1) {
// $("html").animate({ scrollTop: 0 })
//window.location.href=`/shixuns/${id}/challenges/${response.data.challenge_id}/editcheckpoint?tab=2`;
window.location.href=`/shixuns/${id}/challenges/${response.data.challenge_id}/tab=2`;
// this.setState({
// setopen: true,
// CreatePracticesendtype:false,
// tab2url: "/shixuns/" + id + "/challenges/"+response.data.challenge_id+"/tab=2",
// tab3url: "/shixuns/" + id + "/challenges/"+response.data.challenge_id+"/tab=3",
// })
// $("html").animate({ scrollTop: 0 })
//window.location.href=`/shixuns/${id}/challenges/${response.data.challenge_id}/editcheckpoint?tab=2`;
window.location.href = `/shixuns/${id}/challenges/${response.data.challenge_id}/tab=2`;
// this.setState({
// setopen: true,
// CreatePracticesendtype:false,
// tab2url: "/shixuns/" + id + "/challenges/"+response.data.challenge_id+"/tab=2",
// tab3url: "/shixuns/" + id + "/challenges/"+response.data.challenge_id+"/tab=3",
// })
}
// this.props.showSnackbar(response.data.messages);
// this.props.showSnackbar(response.data.messages);
}).catch((error) => {
console.log(error)
});
@ -273,19 +265,19 @@ export default class TPMchallengesnew extends Component {
clickshixunsskill = () => {
let {shixunsskillvalue, shixunsskillvaluelist} = this.state;
let { shixunsskillvalue, shixunsskillvaluelist } = this.state;
if (shixunsskillvalue === "") {
return
} else if (shixunsskillvalue === undefined) {
return
}
if(shixunsskillvalue == "" || shixunsskillvalue == undefined || shixunsskillvalue == null || (shixunsskillvalue.length>0 && shixunsskillvalue.trim().length == 0)){
if (shixunsskillvalue == "" || shixunsskillvalue == undefined || shixunsskillvalue == null || (shixunsskillvalue.length > 0 && shixunsskillvalue.trim().length == 0)) {
message.error("输入为空，不能保存！");
return
}
let list = shixunsskillvaluelist;
let list = shixunsskillvaluelist;
list.push(shixunsskillvalue);
this.setState({
shixunsskillvaluelist: list,
@ -294,7 +286,7 @@ export default class TPMchallengesnew extends Component {
}
delshixunsskilllist = (key) => {
let {shixunsskillvaluelist} = this.state;
let { shixunsskillvaluelist } = this.state;
let newshixunsskillvaluelist = shixunsskillvaluelist;
newshixunsskillvaluelist.splice(key, 1);
this.setState({
@ -302,21 +294,21 @@ export default class TPMchallengesnew extends Component {
})
}
editPracticesend=()=>{
editPracticesend = () => {
this.setState({
editPracticesendtype:true
editPracticesendtype: true
})
let {shixunCreatePractice, shixunCreatePracticeGroup, onshixunsmarkvalue, shixunsskillvaluelist,checkpointId,exec_time} = this.state;
let { shixunCreatePractice, shixunCreatePracticeGroup, onshixunsmarkvalue, shixunsskillvaluelist, checkpointId, exec_time } = this.state;
const exercise_editormdvalue = this.exercisememoMDRef.current.getValue().trim();
const exercise_editormdvalue = this.exercisememoMDRef.current.getValue().trim();
let id = this.props.match.params.shixunId;
let url = "/shixuns/"+id+"/challenges/"+checkpointId+".json";
let url = "/shixuns/" + id + "/challenges/" + checkpointId + ".json";
if (shixunCreatePractice === undefined||shixunCreatePractice=="") {
if (shixunCreatePractice === undefined || shixunCreatePractice == "") {
// this.setState({
// shixunCreatePracticetype: true
// })
@ -325,7 +317,7 @@ export default class TPMchallengesnew extends Component {
scrollTop: 10
}, 1000);
this.setState({
editPracticesendtype:false
editPracticesendtype: false
})
return
}
@ -336,39 +328,39 @@ export default class TPMchallengesnew extends Component {
// })
this.props.showSnackbar("技能标签为空")
this.setState({
editPracticesendtype:false
editPracticesendtype: false
})
return
}
if(exec_time===null||exec_time===undefined||exec_time===""){
if (exec_time === null || exec_time === undefined || exec_time === "") {
this.setState({
shixunExec_timeType:false
})
return
}
this.setState({
shixunExec_timeType: false
})
return
}
axios.put(url, {
tab:0,
identifier:id,
id:checkpointId,
challenge:{
tab: 0,
identifier: id,
id: checkpointId,
challenge: {
subject: shixunCreatePractice,
task_pass: exercise_editormdvalue,
difficulty: shixunCreatePracticeGroup,
score: onshixunsmarkvalue,
exec_time:exec_time
exec_time: exec_time
},
challenge_tag:shixunsskillvaluelist
challenge_tag: shixunsskillvaluelist
}).then((response) => {
this.props.showSnackbar(response.data.messages);
if (response.data.status === 1) {
window.location.href=`/shixuns/${id}/challenges/${checkpointId}/tab=2`;
window.location.href = `/shixuns/${id}/challenges/${checkpointId}/tab=2`;
this.setState({
setopen: true,
editPracticesendtype:false,
tab2url: "/shixuns/" + id + "/challenges/"+checkpointId+"/tab=2",
tab3url: "/shixuns/" + id + "/challenges/"+checkpointId+"/tab=3",
editPracticesendtype: false,
tab2url: "/shixuns/" + id + "/challenges/" + checkpointId + "/tab=2",
tab3url: "/shixuns/" + id + "/challenges/" + checkpointId + "/tab=3",
})
// window.location.href = "/shixuns/" + id + "/challenges/"+response.data.challenge_id+"/tab=2"
}
@ -379,59 +371,59 @@ export default class TPMchallengesnew extends Component {
}
onshixunsmarks=()=> {
onshixunsmarks = () => {
this.setState({
marktype:true
marktype: true
})
}
onshixunsmarkss=()=> {
onshixunsmarkss = () => {
this.setState({
marktype:false
marktype: false
})
}
setexec_time=(e)=>{
this.setState({
exec_time:e.target.value
})
}
setexec_time = (e) => {
this.setState({
exec_time: e.target.value
})
}
render() {
let shixuntype = this.props.match.params.type;
let {marktype,
let { marktype,
shixunCreatePracticetype, shixunsskillvaluelisttype,
choice_url, practice_url, go_back_url, position, task_pass_default, submit_url, setopen,checkpointId,prev_challenge,next_challenge,power,
shixunCreatePractice, shixunCreatePracticeGroup, onshixunsmarkvalue, shixunsskillvalue, shixunsskillvaluelist, tab2url, tab3url,optionsums,
CreatePracticesendtype,editPracticesendtype
choice_url, practice_url, go_back_url, position, task_pass_default, submit_url, setopen, checkpointId, prev_challenge, next_challenge, power,
shixunCreatePractice, shixunCreatePracticeGroup, onshixunsmarkvalue, shixunsskillvalue, shixunsskillvaluelist, tab2url, tab3url, optionsums,
CreatePracticesendtype, editPracticesendtype
} = this.state;
let options;
if(optionsums!=undefined){
options = optionsums.map((d, k) => {
return (
<Option key={d} id={k}>{d}</Option>
)
})
}
if (optionsums != undefined) {
options = optionsums.map((d, k) => {
return (
<Option key={d} id={k}>{d}</Option>
)
})
}
return (
<React.Fragment>
<div className="educontent mt30 mb30">
<div className="padding10-20 mb10 edu-back-white clearfix">
<span className="fl ring-blue mr10 mt7">
<img src={getImageUrl("images/educoder/icon/code.svg")} data-tip-down="实训任务" className="fl mt2 ml2"/>
<img src={getImageUrl("images/educoder/icon/code.svg")} data-tip-down="实训任务" className="fl mt2 ml2" />
</span>
<span className="font-16 task-hide fl TPMtaskName">第{position}关</span>
<Link to={go_back_url === undefined ? "" : go_back_url}
className="color-grey-6 fr font-15 mt3">返回</Link>
{ next_challenge===undefined?"":
<a href={next_challenge}className="fr color-blue mr15 mt4">下一关</a>
}
{ prev_challenge===undefined?"":
className="color-grey-6 fr font-15 mt3">返回</Link>
{next_challenge === undefined ? "" :
<a href={next_challenge} className="fr color-blue mr15 mt4">下一关</a>
}
{prev_challenge === undefined ? "" :
<a href={prev_challenge} className="fr color-blue mr15 mt4">上一关</a>
}
@ -439,14 +431,14 @@ export default class TPMchallengesnew extends Component {
<a href={practice_url === undefined ? "" : practice_url}
className="fr color-blue mr15 mt4"
style={{display:this.props.identity>4||this.props.identity===undefined||this.props.status===2||this.props.status===1?"none":'block'}}
data-tip-down="新增代码编辑类型的任务">+&nbsp;实践类型</a>
className="fr color-blue mr15 mt4"
style={{ display: this.props.identity > 4 || this.props.identity === undefined || this.props.status === 2 || this.props.status === 1 ? "none" : 'block' }}
data-tip-down="新增代码编辑类型的任务">+&nbsp;实践类型</a>
<a href={choice_url === undefined ? "" : choice_url}
className="fr color-blue mr15 mt4"
style={{display:this.props.identity>4||this.props.identity===undefined||this.props.status===2||this.props.status===1?"none":'block'}}
data-tip-down="新增选择题类型的任务">+&nbsp;选择题类型</a>
className="fr color-blue mr15 mt4"
style={{ display: this.props.identity > 4 || this.props.identity === undefined || this.props.status === 2 || this.props.status === 1 ? "none" : 'block' }}
data-tip-down="新增选择题类型的任务">+&nbsp;选择题类型</a>
</div>
@ -473,19 +465,19 @@ export default class TPMchallengesnew extends Component {
<span className="mr30 color-orange pt10">*</span>
<div className="flex1 mr20">
<input type="text"
// className="input-100-45 greyInput"
className={shixunCreatePracticetype===true?"input-100-45 greyInpus wind100":"input-100-45 greyInput "}
maxLength="50"
name="challenge[subject]"
value={shixunCreatePractice}
onInput={this.shixunCreatePractice}
placeholder="请输入任务名称（此信息将提前展示给学员）,例：计算学生的课程成绩绩点"/>
// className="input-100-45 greyInput"
className={shixunCreatePracticetype === true ? "input-100-45 greyInpus wind100" : "input-100-45 greyInput "}
maxLength="50"
name="challenge[subject]"
value={shixunCreatePractice}
onInput={this.shixunCreatePractice}
placeholder="请输入任务名称（此信息将提前展示给学员）,例：计算学生的课程成绩绩点" />
</div>
<div style={{width: '57px'}}>
<span
className={shixunCreatePracticetype === true ? "color-orange mt8 fl block" : "color-orange mt8 fl none"}
id="new_shixun_name"><i
className="fa fa-exclamation-circle mr3"></i>必填项</span>
<div style={{ width: '57px' }}>
<span
className={shixunCreatePracticetype === true ? "color-orange mt8 fl block" : "color-orange mt8 fl none"}
id="new_shixun_name"><i
className="fa fa-exclamation-circle mr3"></i>必填项</span>
</div>
</div>
</div>
@ -496,8 +488,8 @@ export default class TPMchallengesnew extends Component {
<p className="color-grey-6 font-16 mb30">过关任务</p>
<TPMMDEditor ref={this.exercisememoMDRef} placeholder="请输入选择题的题干内容" mdID={'exercisememoMD'} refreshTimeout={1500}
watch={true} className="courseMessageMD" initValue={this.state.exercisememoMDRefval} height={700}></TPMMDEditor>
<TPMMDEditor ref={this.exercisememoMDRef} placeholder="请输入选择题的题干内容" mdID={'exercisememoMD'} refreshTimeout={1500}
watch={true} className="courseMessageMD" initValue={this.state.exercisememoMDRefval} height={700}></TPMMDEditor>
<p id="e_tip_Memochallengesnew" className="edu-txt-right color-grey-cd font-12"></p>
<p id="e_tips_Memochallengesnew" className="edu-txt-right color-grey-cd font-12"></p>
@ -509,8 +501,8 @@ export default class TPMchallengesnew extends Component {
<div className="clearfix mb40">
<RadioGroup value={shixunCreatePracticeGroup} className="fl mr40"
disabled={this.props.status===2?true:false}
onChange={this.props.status===2?"":this.onshixunCreatePracticeChange}>
disabled={this.props.status === 2 ? true : false}
onChange={this.props.status === 2 ? "" : this.onshixunCreatePracticeChange}>
<Radio value={1}>简单</Radio>
<Radio value={2}>中等</Radio>
<Radio value={3}>困难</Radio>
@ -519,24 +511,24 @@ export default class TPMchallengesnew extends Component {
</div>
<p className="color-grey-6 font-16 mb30">奖励经验值</p>
<div className="clearfix"
// onMouseLeave={this.props.status===2?"":this.onshixunsmarkss}
>
// onMouseLeave={this.props.status===2?"":this.onshixunsmarkss}
>
<span className="fl mr30 color-orange pt10">*</span>
<Select style={{width: 120}} className="winput-240-40 fl"
id="challenge_score"
onChange={this.props.status===2?"":this.onshixunsmark}
// onMouseEnter={this.props.status===2?"":this.onshixunsmarks}
disabled={this.props.status===2?true:false}
// open={marktype}
value={onshixunsmarkvalue}
getPopupContainer={triggerNode => triggerNode.parentNode}
<Select style={{ width: 120 }} className="winput-240-40 fl"
id="challenge_score"
onChange={this.props.status === 2 ? "" : this.onshixunsmark}
// onMouseEnter={this.props.status===2?"":this.onshixunsmarks}
disabled={this.props.status === 2 ? true : false}
// open={marktype}
value={onshixunsmarkvalue}
getPopupContainer={triggerNode => triggerNode.parentNode}
>
{options}
</Select>
<p className="fl color-grey-9 font-12 ml20">
如果学员答题错误，则不能得到相应的经验值<br/>
如果学员答题错误，则不能得到相应的经验值<br />
如果学员成功得到经验值，那么将同时获得等值的金币奖励，如：+10经验值、+10金币
</p>
@ -552,21 +544,21 @@ export default class TPMchallengesnew extends Component {
<span className="mr30 color-orange pt10">*</span>
<div className="flex1">
<Input type="text"
className="winput-240-40 fl mr20 winput-240-40s"
id="input_task_tag"
placeholder="添加标签"
onInput={this.shixunsskill}
value={shixunsskillvalue}
onPressEnter={this.clickshixunsskill}
onBlur={this.clickshixunsskill}
className="winput-240-40 fl mr20 winput-240-40s"
id="input_task_tag"
placeholder="添加标签"
onInput={this.shixunsskill}
value={shixunsskillvalue}
onPressEnter={this.clickshixunsskill}
onBlur={this.clickshixunsskill}
/>
{/*<a className="white-btn orange-btn fl mt1 use_scope-btn ml20 mt5 mr20"*/}
{/*onClick={this.clickshixunsskill}>+ 添加</a>*/}
{/*onClick={this.clickshixunsskill}>+ 添加</a>*/}
<div className="ml15 color-grey-9 mt5">学员答题正确将获得技能，否则不能获得技能</div>
<div className="mt20 clearfix" id="task_tag_content">
{
shixunsskillvaluelist===undefined?"":shixunsskillvaluelist.length === 0 ? "" : shixunsskillvaluelist.map((itme, key) => {
shixunsskillvaluelist === undefined ? "" : shixunsskillvaluelist.length === 0 ? "" : shixunsskillvaluelist.map((itme, key) => {
return (
<li className="task_tag_span" key={key}><span>{itme}</span>
<a onClick={() => this.delshixunsskilllist(key)}>×</a>
@ -581,32 +573,32 @@ export default class TPMchallengesnew extends Component {
<span
className={shixunsskillvaluelisttype === true ? "color-orange mt7 fl ml20 block" : " color-orange mt7 fl ml20 none"}
id="stage_name_notice">
<i className="fa fa-exclamation-circle mr3"></i>必填项</span>
<i className="fa fa-exclamation-circle mr3"></i>必填项</span>
</div>
</div>
<div className="edu-back-white padding40-20 mb20">
<p className="color-grey-6 font-16 mb30">服务配置</p>
<div className="clearfix mb5">
<span className="color-orange pt10 fl">*</span>
<label className="panel-form-label fl">评测时限(S)：</label>
<div className="pr fl with80 status_con">
<input value={this.state.exec_time} className="panel-box-sizing task-form-100 task-height-40" placeholder="请输入类别名称" onInput={this.setexec_time}/>
</div>
<span
className={this.state.shixunExec_timeType === true ? "color-orange mt8 fl block ml20" : "color-orange mt8 fl none"}
id="new_shixun_name"><i className="fa fa-exclamation-circle mr3"></i>必填项</span>
<div className="cl"></div>
</div>
</div>
<div className="edu-back-white padding40-20 mb20">
<p className="color-grey-6 font-16 mb30">服务配置</p>
<div className="clearfix mb5">
<span className="color-orange pt10 fl">*</span>
<label className="panel-form-label fl">评测时限(S)：</label>
<div className="pr fl with80 status_con">
<input value={this.state.exec_time} className="panel-box-sizing task-form-100 task-height-40" placeholder="请输入类别名称" onInput={this.setexec_time} />
</div>
<span
className={this.state.shixunExec_timeType === true ? "color-orange mt8 fl block ml20" : "color-orange mt8 fl none"}
id="new_shixun_name"><i className="fa fa-exclamation-circle mr3"></i>必填项</span>
<div className="cl"></div>
</div>
</div>
<div className="clearfix mt30"
style={{display:this.props.identity>4||this.props.identity===undefined?"none":'block'}}
style={{ display: this.props.identity > 4 || this.props.identity === undefined ? "none" : 'block' }}
>
{checkpointId===undefined?<a className="defalutSubmitbtn fl mr20" onClick={CreatePracticesendtype===true?"":this.CreatePracticesend}>提交</a>:
<a className="defalutSubmitbtn fl mr20" onClick={editPracticesendtype===true?"":this.editPracticesend}>提交</a>}
{/*<a href={go_back_url === undefined ? "" : go_back_url} className="defalutCancelbtn fl">取消</a>*/}
<Link to={go_back_url === undefined ? "" : go_back_url} className={"defalutCancelbtn fl"}>取消</Link>
{checkpointId === undefined ? <a className="defalutSubmitbtn fl mr20" onClick={CreatePracticesendtype === true ? "" : this.CreatePracticesend}>提交</a> :
<a className="defalutSubmitbtn fl mr20" onClick={editPracticesendtype === true ? "" : this.editPracticesend}>提交</a>}
{/*<a href={go_back_url === undefined ? "" : go_back_url} className="defalutCancelbtn fl">取消</a>*/}
<Link to={go_back_url === undefined ? "" : go_back_url} className={"defalutCancelbtn fl"}>取消</Link>
</div>
</div>
</React.Fragment>

144
public/react/src/modules/user/account/ChangeHeaderPicModal.js
Unescape View File

@ -1,18 +1,15 @@
import React, { Component } from "react";
import { Spin } from "antd";
import axios from 'axios'
import ModalWrapper from "../../courses/common/ModalWrapper"
import { Cropper, getUrl } from 'educoder'
const imageId = 'changeHeaderPic'
const previewId = 'changeHeader_imagePreview'
let uploadedImageType;
let uploadedImageName;
let uploadedImageURL;
class ChangeHeaderPicModal extends Component{
constructor(props){
class ChangeHeaderPicModal extends Component {
constructor(props) {
super(props);
this.state={
this.state = {
uploading: false
}
}
@ -29,7 +26,7 @@ class ChangeHeaderPicModal extends Component{
if (/^image\/\w+/.test(file.type)) {
if (file.size > 2 * 1024 * 1024) {
this.props.showNotification && this.props.showNotification("仅支持文件大小小于2M的文件")
this.props.showNotification && this.props.showNotification("仅支持文件大小小于2M的文件")
return;
}
uploadedImageType = file.type;
@ -38,28 +35,28 @@ class ChangeHeaderPicModal extends Component{
if (uploadedImageURL) {
URL.revokeObjectURL(uploadedImageURL);
}
const image = document.getElementById( imageId );
const image = document.getElementById(imageId);
// base64
var reader = new FileReader();
reader.readAsBinaryString(file);
reader.onload = () => {
let base64_content = btoa(reader.result);
console.log();
image.src = `data:${file.type};base64,${base64_content}` // uploadedImageURL = URL.createObjectURL(file);
that.fileUploaded = true;
that.refs['cropper'].renew(image)
// cropper.destroy();
// cropper = new Cropper(image, options);
inputImage.value = null;
let base64_content = btoa(reader.result);
console.log();
image.src = `data:${file.type};base64,${base64_content}` // uploadedImageURL = URL.createObjectURL(file);
that.fileUploaded = true;
that.refs['cropper'].renew(image)
// cropper.destroy();
// cropper = new Cropper(image, options);
inputImage.value = null;
};
reader.onerror = function() {
console.log('there are some problems');
reader.onerror = function () {
console.log('there are some problems');
};
} else {
this.props.showNotification && this.props.showNotification("请选择一个图片格式的文件")
// window.alert('Please choose an image file.');
@ -82,7 +79,7 @@ class ChangeHeaderPicModal extends Component{
}
onSendOk = () => {
}
onOk = () => {
@ -97,44 +94,44 @@ class ChangeHeaderPicModal extends Component{
console.log(new Date().getTime())
this._onOk()
}, 10)
})
}
_onOk = () => {
var img_lg = document.getElementById(previewId);
var img_lg = document.getElementById(previewId);
// https://github.com/niklasvh/html2canvas/issues/1908
// 截图小的显示框内的内容
window.html2canvas(img_lg).then((canvas) => {
var dataUrl = canvas.toDataURL("image/jpeg");
console.log(dataUrl)
var dataUrl = canvas.toDataURL("image/jpeg");
console.log(dataUrl)
const url = `/users/accounts/${this.props.userLogin}/avatar.json`
axios.put(url, {
axios.put(url, {
image: dataUrl
})
.then((response) => {
// {"status":0,"message":"success","avatar_url":"avatars/User/15739"}
if (response.data.status == 0) {
// this.props.getBasicInfo()
// https://www.trustie.net/issues/22461
if ( this.props.current_user.image_url.indexOf('avatars/User/b') != -1
|| this.props.current_user.image_url.indexOf('avatars/User/g') != -1 ) {
window.setTimeout(() => {
this.doAfterUpdated()
}, 1000)
} else {
this.doAfterUpdated();
.then((response) => {
// {"status":0,"message":"success","avatar_url":"avatars/User/15739"}
if (response.data.status == 0) {
// this.props.getBasicInfo()
// https://www.trustie.net/issues/22461
if (this.props.current_user.image_url.indexOf('avatars/User/b') != -1
|| this.props.current_user.image_url.indexOf('avatars/User/g') != -1) {
window.setTimeout(() => {
this.doAfterUpdated()
}, 1000)
} else {
this.doAfterUpdated();
}
this.setState({ uploading: false })
}
})
.catch(function (error) {
this.setState({ uploading: false })
}
})
.catch(function (error) {
this.setState({ uploading: false })
console.log(error);
});
});
console.log(error);
});
});
}
doAfterUpdated = () => {
this.props.fetchUser()
@ -143,15 +140,14 @@ class ChangeHeaderPicModal extends Component{
this.setVisible(false)
}
render(){
const { course_lists } = this.state
const { moduleName, current_user } = this.props
render() {
const { current_user } = this.props
const userHeaderImgUrl = current_user ? `${getUrl()}/images/${current_user.image_url}` : ''
return(
return (
<ModalWrapper
ref="modalWrapper"
title={`上传头像`}
{...this.props }
{...this.props}
onOk={this.onOk}
okText="保存"
width={552}
@ -195,31 +191,31 @@ class ChangeHeaderPicModal extends Component{
}
`}</style>
<div className="df">
<div className="cropperWrap">
<Cropper
imageSrc={''}
initPreviewUrl={userHeaderImgUrl}
ref="cropper"
imageId={imageId}
previewId="changeHeader_imagePreview"
width={320} height={320}
></Cropper>
<span className="tip">仅支持JPG、GIF、PNG，且文件小于2M</span>
<div className="cropperWrap">
<Cropper
imageSrc={''}
initPreviewUrl={userHeaderImgUrl}
ref="cropper"
imageId={imageId}
previewId="changeHeader_imagePreview"
width={320} height={320}
></Cropper>
<span className="tip">仅支持JPG、GIF、PNG，且文件小于2M</span>
</div>
<div
className="df previewWrap" style={{ flexDirection: 'column' }}
>
<div>
<div id="changeHeader_imagePreview">
{userHeaderImgUrl && <img src={userHeaderImgUrl}></img>}
</div>
<div className="tip">头像预览</div>
</div>
<div
className="df previewWrap" style ={{flexDirection: 'column'}}
>
<div>
<div id="changeHeader_imagePreview">
{userHeaderImgUrl && <img src={userHeaderImgUrl}></img>}
</div>
<div className="tip">头像预览</div>
</div>
<label id="uploadBtn" for="inputImage">
<input type="file" class="sr-only" id="inputImage" name="file" accept="image/*"></input>
点击上传
<label id="uploadBtn" for="inputImage">
<input type="file" class="sr-only" id="inputImage" name="file" accept="image/*"></input>
点击上传
</label>
</div>
</div>
</div>
</ModalWrapper>
)

196
public/react/src/modules/user/usersInfo/banks/NewGtaskForm.js
Unescape View File

@ -1,17 +1,17 @@
import React,{ Component } from "react";
import React, { Component } from "react";
import { Input, InputNumber, Form, Button, Checkbox, Upload, Icon, message, Modal } from "antd";
import axios from 'axios'
import { getUploadActionUrl, getUrl, ConditionToolTip, appendFileSizeToUploadFile, appendFileSizeToUploadFileAll } from 'educoder'
import { getUploadActionUrl, ConditionToolTip, appendFileSizeToUploadFile, appendFileSizeToUploadFileAll } from 'educoder'
import TPMMDEditor from '../../../tpm/challengesnew/TPMMDEditor';
const $ = window.$;
const MAX_TITLE_LENGTH = 60;
class NewGtaskForms extends Component{
constructor(props){
class NewGtaskForms extends Component {
constructor(props) {
super(props);
this.contentMdRef = React.createRef();
this.state={
title_num:0,
description:"",
this.state = {
title_num: 0,
description: "",
contentFileList: [],
}
}
@ -19,7 +19,7 @@ class NewGtaskForms extends Component{
initValue = (data) => {
if (data.isEdit===true) {
if (data.isEdit === true) {
const contentFileList = data.attachments.map(item => {
return {
id: item.id,
@ -32,10 +32,10 @@ class NewGtaskForms extends Component{
})
this.setState({
...data,
base_on_project: data.task_type===2?data.group_info.base_on_project:undefined,
base_on_project: data.task_type === 2 ? data.group_info.base_on_project : undefined,
title_num: parseInt(data.name.length),
min_num: data.task_type===2?data.group_info.min_number:undefined,
max_num: data.task_type===2?data.group_info.max_number:undefined,
min_num: data.task_type === 2 ? data.group_info.min_number : undefined,
max_num: data.task_type === 2 ? data.group_info.max_number : undefined,
contentFileList,
}, () => {
setTimeout(() => {
@ -55,7 +55,7 @@ class NewGtaskForms extends Component{
// 输入title
changeTitle=(e)=>{
changeTitle = (e) => {
console.log(e.target.value.length);
this.setState({
title_num: parseInt(e.target.value.length)
@ -69,7 +69,7 @@ class NewGtaskForms extends Component{
// 初次上传不能直接取uid
const url = `/attachments/${file.response ? file.response.id : file.uid}.json`
axios.delete(url, {
})
})
.then((response) => {
if (response.data) {
const { status } = response.data;
@ -93,7 +93,7 @@ class NewGtaskForms extends Component{
}
onAttachmentRemove = (file, stateName) => {
if(file.response!=undefined){
if (file.response != undefined) {
this.props.confirm({
content: '是否确认删除?',
@ -111,10 +111,10 @@ class NewGtaskForms extends Component{
handleSubmit = () => {
let {contentFileList,min_num,max_num,base_on_project}=this.state;
let {data}=this.props;
let task_type=data.task_type
let topicId=this.props.topicId
let { contentFileList, min_num, max_num, base_on_project } = this.state;
let { data } = this.props;
let task_type = data.task_type
let topicId = this.props.topicId
let attachment_ids = contentFileList.map(item => {
return item.response ? item.response.id : item.id
})
@ -125,23 +125,23 @@ class NewGtaskForms extends Component{
values.description = mdContnet;
if (!err) {
if (this.props.data.isEdit===true) {
let url="/task_banks/"+topicId+".json";
if (this.props.data.isEdit === true) {
let url = "/task_banks/" + topicId + ".json";
axios.put(url, {
gtask_bank: {
name: values.title,
description: values.description,
min_num:task_type===1?undefined:min_num,
max_num:task_type===1?undefined:max_num,
base_on_project: task_type===1?task_type:base_on_project===true?1:0
},
attachment_ids:attachment_ids
}
gtask_bank: {
name: values.title,
description: values.description,
min_num: task_type === 1 ? undefined : min_num,
max_num: task_type === 1 ? undefined : max_num,
base_on_project: task_type === 1 ? task_type : base_on_project === true ? 1 : 0
},
attachment_ids: attachment_ids
}
).then((response) => {
if(response.data.status===0){
if (response.data.status === 0) {
this.props.showNotification(response.data.message)
this.props.onCancel()
}else{
} else {
this.props.showNotification(response.data.message)
}
}).catch((error) => {
@ -176,14 +176,14 @@ class NewGtaskForms extends Component{
this.setState({ base_on_project: !this.state.base_on_project })
}
render(){
render() {
const { getFieldDecorator } = this.props.form;
let{
let {
title_value, contentFileList, answerFileList, max_num, min_num, base_on_project,
init_max_num, init_min_num,
title_num, course_name, category, has_commit, has_project,
isEdit
}=this.state
} = this.state
const uploadProps = {
width: 600,
fileList: contentFileList,
@ -205,11 +205,11 @@ class NewGtaskForms extends Component{
};
return(
<div>
<style>
{
`
return (
<div>
<style>
{
`
.newAboutInputForm.ant-form-item, .newAboutInputForm .ant-form-item{padding:20px 30px 20px 30px!important}
.margin0{margin: 0px!important}
.tasktypes{width:64px;
@ -221,33 +221,33 @@ class NewGtaskForms extends Component{
color:rgba(51,51,51,1);
opacity:1;}
`
}
</style>
<Form className="courseForm" >
<div className={"ant-row ant-form-item AboutInputForm newAboutInputForm "}>
<div className="ant-col ant-form-item-label margin0">
<label htmlFor="coursesNew_course" className="ant-form-item-required ">类型</label> <span className={"tasktypes"}>{this.props.data&&this.props.data.task_type===1?"普通作业":this.props.data&&this.props.data.task_type===2?"分组作业":""}</span>
</div>
}
</style>
<Form className="courseForm" >
<div className={"ant-row ant-form-item AboutInputForm newAboutInputForm "}>
<div className="ant-col ant-form-item-label margin0">
<label htmlFor="coursesNew_course" className="ant-form-item-required ">类型</label> <span className={"tasktypes"}>{this.props.data && this.props.data.task_type === 1 ? "普通作业" : this.props.data && this.props.data.task_type === 2 ? "分组作业" : ""}</span>
</div>
<Form.Item
label="标题"
className="AboutInputForm"
>
{getFieldDecorator('title', {
rules: [{
required: true, message: '请输入标题'
}],
})(
<Input placeholder="请输入毕设任务标题，最大限制60个字符"
onInput={this.changeTitle}
className="searchView yslnewworkinputaddonAfter searchViewAfter"
style={{"width":"100%"}}
maxLength={MAX_TITLE_LENGTH} addonAfter={`${String(title_num)}/${MAX_TITLE_LENGTH}`}
/>
)}
</Form.Item>
<style>{`
</div>
<Form.Item
label="标题"
className="AboutInputForm"
>
{getFieldDecorator('title', {
rules: [{
required: true, message: '请输入标题'
}],
})(
<Input placeholder="请输入毕设任务标题，最大限制60个字符"
onInput={this.changeTitle}
className="searchView yslnewworkinputaddonAfter searchViewAfter"
style={{ "width": "100%" }}
maxLength={MAX_TITLE_LENGTH} addonAfter={`${String(title_num)}/${MAX_TITLE_LENGTH}`}
/>
)}
</Form.Item>
<style>{`
.uploadBtn.ant-btn {
border: none;
color: #4CACFF;
@ -282,26 +282,26 @@ class NewGtaskForms extends Component{
`}</style>
{ <Form.Item
label="内容"
className="AboutInputForm workContent mdInForm"
>
{getFieldDecorator('description', {
rules: [{
required: true, message: '请输入任务内容说明'
}],
})(
<TPMMDEditor ref={this.contentMdRef} placeholder="请输入任务内容说明，最大限制5000个字符" mdID={'courseContentMD'} refreshTimeout={1500}
className="courseMessageMD" initValue={this.state.description}></TPMMDEditor>
)}
</Form.Item> }
<Upload {...uploadProps} className="upload_1 newWorkUpload">
<Button className="uploadBtn">
<Icon type="upload" /> 上传附件
{<Form.Item
label="内容"
className="AboutInputForm workContent mdInForm"
>
{getFieldDecorator('description', {
rules: [{
required: true, message: '请输入任务内容说明'
}],
})(
<TPMMDEditor ref={this.contentMdRef} placeholder="请输入任务内容说明，最大限制5000个字符" mdID={'courseContentMD'} refreshTimeout={1500}
className="courseMessageMD" initValue={this.state.description}></TPMMDEditor>
)}
</Form.Item>}
<Upload {...uploadProps} className="upload_1 newWorkUpload">
<Button className="uploadBtn">
<Icon type="upload" /> 上传附件
</Button>
(单个文件150M以内)
(单个文件150M以内)
</Upload>
{this.props.data&&this.props.data.task_type===2?
{this.props.data && this.props.data.task_type === 2 ?
<Form.Item
label="分组设置"
className="AboutInputForm"
@ -317,38 +317,38 @@ class NewGtaskForms extends Component{
<ConditionToolTip condition={has_commit} title={'已有提交作品，人数范围只能扩大'}>
{/* max={has_commit ? init_min_num : null } */}
每组最小人数：<InputNumber placeholder="请填写每组最小人数" min={1} className="winput-240-40 mr10" value={min_num}
onChange={this.min_num_change} style={{width:'180px'}} /> 人
onChange={this.min_num_change} style={{ width: '180px' }} /> 人
</ConditionToolTip>
<span className="ml15 mr15"></span>
{/* min={has_commit ? init_max_num : (min_num == undefined ? 2 : min_num + 1) } */}
<ConditionToolTip condition={has_commit} title={'已有提交作品，人数范围只能扩大'}>
每组最大人数：<InputNumber className="winput-240-40 mr10" placeholder="请填写每组最大人数" value={max_num} max={10}
onChange={this.max_num_change} style={{width:'180px'}} /> 人
onChange={this.max_num_change} style={{ width: '180px' }} /> 人
</ConditionToolTip>
<div className="color-grey-9 mt20 font-14">学生提交作品时需要关联同组成员，组内成员作品共享</div>
</p>
<p className="mt20">
<ConditionToolTip condition={has_commit || has_project} title={'已有关联项目或作品，不能修改'}>
<Checkbox checked={base_on_project} onChange={this.base_on_project_change}
disabled={has_project || has_commit}
className="color-grey-9 font-14"
disabled={has_project || has_commit}
className="color-grey-9 font-14"
>基于项目（选中，则必须在本平台创建项目，项目管理员可以提交作品；不选中，无需在平台创建项目，任意小组成员均可以提交作品）</Checkbox>
</ConditionToolTip>
</p>
</div>
)}
</Form.Item>:""
}
<Form.Item>
<div className="clearfix mt30 mb30">
{/* htmlType="submit" */}
<Button type="primary" onClick={this.handleSubmit} className="defalutSubmitbtn fl mr20">提交</Button>
<a className="defalutCancelbtn fl" onClick={() => this.props.onCancel()}>取消</ a>
</div>
</Form.Item>
</Form>
</div>
</Form.Item> : ""
}
<Form.Item>
<div className="clearfix mt30 mb30">
{/* htmlType="submit" */}
<Button type="primary" onClick={this.handleSubmit} className="defalutSubmitbtn fl mr20">提交</Button>
<a className="defalutCancelbtn fl" onClick={() => this.props.onCancel()}>取消</ a>
</div>
</Form.Item>
</Form>
</div>
)
}
}

Write Preview
Loading…
Cancel
Save