杨树林 5 years ago
commit 46aa49919c

@ -2,7 +2,7 @@ import React from "react";
import axios from 'axios'; import axios from 'axios';
import { requestProxy } from "./indexEduplus2RequestProxy"; import { requestProxy } from "./indexEduplus2RequestProxy";
import { broadcastChannelOnmessage } from 'educoder' import { broadcastChannelOnmessage ,SetAppModel} from 'educoder';
import { notification } from 'antd'; import { notification } from 'antd';
import './index.css' import './index.css'
broadcastChannelOnmessage('refreshPage', () => { broadcastChannelOnmessage('refreshPage', () => {
@ -10,11 +10,19 @@ broadcastChannelOnmessage('refreshPage', () => {
}) })
function locationurl(list){ function locationurl(list){
if (window.location.port === "3007") { if (window.location.port === "3007") {
} else { } else {
window.location.replace(list)
} if(list===402){
SetAppModel(402)
}else if(list===407){
}else{
window.location.replace(list)
}
}
} }
// TODO 开发期多个身份切换 // TODO 开发期多个身份切换
@ -149,7 +157,7 @@ export function initAxiosInterceptors(props) {
debugger debugger
console.log(response.data.status); console.log(response.data.status);
console.log(response.data); console.log(response.data);
locationurl(response.data.message); locationurl(402);
} }

@ -1,8 +1,8 @@
import React, { Component } from 'react'; import React, { Component } from 'react';
import {getImageUrl} from 'educoder'; import {getImageUrl} from 'public/react/src/common/educoder';
import { Modal} from 'antd'; import { Modal} from 'antd';
import axios from 'axios'; import axios from 'axios';
import './common.css'; import '../../modules/user/common.css';
//完善个人资料 //完善个人资料
class Notcompleted extends Component { class Notcompleted extends Component {
@ -21,7 +21,7 @@ class Notcompleted extends Component {
render() { render() {
console.log(this.props)
return( return(
<Modal <Modal
keyboard={false} keyboard={false}

@ -0,0 +1,33 @@
import React, { Component } from 'react';
import { Modal } from 'antd';
// import Notcompleted from './Notcompleted';
export function SetAppModel(options = {}) {
return function wrap(WrappedComponent) {
return class Wrapper extends Component {
constructor(props) {
super(props);
this.state = {
}
}
componentDidMount(){
console.log(this.props)
}
render() {
const { titlemessage, Modallisttype, Modallist, singleButton } = this.state;
return (
<div>
{/*<Notcompleted*/}
{/*modalsType={this.state.Notcompleteds}*/}
{/*/>*/}
</div>
)
}
}
}
}

@ -1,53 +1,56 @@
import { from } from '_array-flatten@2.1.2@array-flatten'; import { from } from '_array-flatten@2.1.2@array-flatten';
// export { default as OrderStateUtil } from '../routes/Order/components/OrderStateUtil'; // export { default as OrderStateUtil } from '../routes/Order/components/OrderStateUtil';
export { getImageUrl as getImageUrl, getUrl as getUrl, getUrl2 as getUrl2, setImagesUrl as setImagesUrl, getUploadActionUrl as getUploadActionUrl } from './UrlTool'; export { getImageUrl as getImageUrl, getUrl as getUrl, getUrl2 as getUrl2, setImagesUrl as setImagesUrl, getUploadActionUrl as getUploadActionUrl } from './UrlTool';
export { default as queryString } from './UrlTool2'; export { default as queryString } from './UrlTool2';
export { SnackbarHOC as SnackbarHOC } from './SnackbarHOC'; export { SnackbarHOC as SnackbarHOC } from './SnackbarHOC';
export { trigger as trigger, on as on, off as off export { trigger as trigger, on as on, off as off
, broadcastChannelPostMessage, broadcastChannelOnmessage } from './EventUtil'; , broadcastChannelPostMessage, broadcastChannelOnmessage } from './EventUtil';
export { updatePageParams as updatePageParams } from './RouterUtil'; export { updatePageParams as updatePageParams } from './RouterUtil';
export { bytesToSize as bytesToSize } from './UnitUtil'; export { bytesToSize as bytesToSize } from './UnitUtil';
export { markdownToHTML, uploadNameSizeSeperator, appendFileSizeToUploadFile, appendFileSizeToUploadFileAll, isImageExtension } from './TextUtil' export { markdownToHTML, uploadNameSizeSeperator, appendFileSizeToUploadFile, appendFileSizeToUploadFileAll, isImageExtension } from './TextUtil'
export { handleDateString, getNextHalfHourOfMoment,formatDuring } from './DateUtil' export { handleDateString, getNextHalfHourOfMoment,formatDuring } from './DateUtil'
export { isDev as isDev } from './Env' export { isDev as isDev } from './Env'
export { toStore as toStore, fromStore as fromStore } from './Store' export { toStore as toStore, fromStore as fromStore } from './Store'
export { trace_collapse, trace, debug, info, warn, error, trace_c, debug_c, info_c, warn_c, error_c } from './LogUtil' export { trace_collapse, trace, debug, info, warn, error, trace_c, debug_c, info_c, warn_c, error_c } from './LogUtil'
export { EDU_ADMIN, EDU_BUSINESS, EDU_SHIXUN_MANAGER, EDU_SHIXUN_MEMBER, EDU_CERTIFICATION_TEACHER export { EDU_ADMIN, EDU_BUSINESS, EDU_SHIXUN_MANAGER, EDU_SHIXUN_MEMBER, EDU_CERTIFICATION_TEACHER
, EDU_GAME_MANAGER, EDU_TEACHER, EDU_NORMAL} from './Const' , EDU_GAME_MANAGER, EDU_TEACHER, EDU_NORMAL} from './Const'
export { themes, ThemeContext } from './context/ThemeContext' export { themes, ThemeContext } from './context/ThemeContext'
export { ModalHOC } from './components/ModalHOC' export { ModalHOC } from './components/ModalHOC'
export { default as Cropper } from './components/Cropper'
export { default as ConditionToolTip } from './components/ConditionToolTip' export { SetAppModel } from './components/SetAppModel'
export { default as DragValidator } from './components/DragValidator'
export { default as Cropper } from './components/Cropper'
export { default as PopInstruction } from './components/instruction/PopInstruction' export { default as ConditionToolTip } from './components/ConditionToolTip'
export { default as DragValidator } from './components/DragValidator'
export { default as City } from './components/form/City'
export { default as PopInstruction } from './components/instruction/PopInstruction'
// course export { default as City } from './components/form/City'
export { default as WordsBtn } from './course/WordsBtn'
export { default as ActionBtn } from './course/ActionBtn' // course
export { default as WordsBtn } from './course/WordsBtn'
export { default as MarkdownToHtml } from './components/markdown/MarkdownToHtml'
export { default as ActionBtn } from './course/ActionBtn'
export { default as DMDEditor } from './components/markdown/DMDEditor'
export { default as MarkdownToHtml } from './components/markdown/MarkdownToHtml'
export { default as DMDEditor } from './components/markdown/DMDEditor'
export { default as ImageLayerHook } from './hooks/ImageLayerHook' export { default as ImageLayerHook } from './hooks/ImageLayerHook'

@ -252,7 +252,7 @@ class UseBank extends Component{
<div style={{"height":"230px"}} className="d_middle edu-txt-center"> <div style={{"height":"230px"}} className="d_middle edu-txt-center">
<div> <div>
<p className="font-16 mb20 color-grey-3">通过职业认证的教师才能访问公共题库</p> <p className="font-16 mb20 color-grey-3">通过职业认证的教师才能访问公共题库</p>
<a className="white-btn edu-orangeback-btn" target="_blank" href="/account/professional_certification">立即认证</a> <a className="white-btn edu-orangeback-btn" target="_blank" href="/account/certification">立即认证</a>
</div> </div>
</div> </div>
: :

@ -1,383 +1,383 @@
import React, { Component } from 'react'; import React, { Component } from 'react';
import IconButton from 'material-ui/IconButton'; import IconButton from 'material-ui/IconButton';
import Tooltip from 'material-ui/Tooltip'; import Tooltip from 'material-ui/Tooltip';
import Button from 'material-ui/Button'; import Button from 'material-ui/Button';
import './CodeEvaluateView.css' import './CodeEvaluateView.css'
import { CircularProgress } from 'material-ui/Progress'; import { CircularProgress } from 'material-ui/Progress';
import { on, off } from 'educoder' import { on, off } from 'educoder'
const testSetsExpandedArrayInitVal = [false, false, false, false, false, const testSetsExpandedArrayInitVal = [false, false, false, false, false,
false, false, false, false, false, false, false, false, false, false,
false, false, false, false, false, false, false, false, false, false,
false, false, false, false, false] false, false, false, false, false]
const $ = window.$; const $ = window.$;
const TAB_INDEX_WEB_DISPLAY = 0; const TAB_INDEX_WEB_DISPLAY = 0;
const TAB_INDEX_EVALUATE_RESULT_INDEX = 1 const TAB_INDEX_EVALUATE_RESULT_INDEX = 1
class CodeEvaluateView extends Component { class CodeEvaluateView extends Component {
constructor(props) { constructor(props) {
super(props) super(props)
this.onEvaluateViewExpand = this.onEvaluateViewExpand.bind(this) this.onEvaluateViewExpand = this.onEvaluateViewExpand.bind(this)
this.state = { this.state = {
// TODO 最多20个测试集 // TODO 最多20个测试集
testSetsInitedArray: testSetsExpandedArrayInitVal.slice(0), testSetsInitedArray: testSetsExpandedArrayInitVal.slice(0),
evaluateViewExpanded: false, evaluateViewExpanded: false,
tabIndex: 1, tabIndex: 1,
} }
} }
componentDidMount() { componentDidMount() {
const { challenge } = this.props; const { challenge } = this.props;
on('showWebDisplayEvent', () => { on('showWebDisplayEvent', () => {
if (challenge.isHtml) { if (challenge.isHtml) {
this.setState({ this.setState({
tabIndex: TAB_INDEX_WEB_DISPLAY tabIndex: TAB_INDEX_WEB_DISPLAY
}) })
} }
}) })
if (challenge.isHtml === true) { if (challenge.isHtml === true) {
this.tabIndexChange(TAB_INDEX_WEB_DISPLAY) this.tabIndexChange(TAB_INDEX_WEB_DISPLAY)
} }
} }
componentWillUnmount() { componentWillUnmount() {
off('showWebDisplayEvent') off('showWebDisplayEvent')
} }
componentWillReceiveProps(newProps, newContext) { componentWillReceiveProps(newProps, newContext) {
if (this.props.game && newProps.game && (newProps.game.id !== this.props.game.id if (this.props.game && newProps.game && (newProps.game.id !== this.props.game.id
|| newProps.gameBuilding !== this.props.gameBuilding )) { // 切换game时重置state || newProps.gameBuilding !== this.props.gameBuilding )) { // 切换game时重置state
if (newProps.gameBuilding === false) { if (newProps.gameBuilding === false) {
// 清空codemirror的内容TODO最好调用codemirror的销毁方法 // 清空codemirror的内容TODO最好调用codemirror的销毁方法
$('#evaluating_contents .result_different_show').html('') $('#evaluating_contents .result_different_show').html('')
this.setState({ this.setState({
tabIndex: TAB_INDEX_EVALUATE_RESULT_INDEX tabIndex: TAB_INDEX_EVALUATE_RESULT_INDEX
}) })
} }
this.setState({ this.setState({
testSetsInitedArray: testSetsExpandedArrayInitVal.slice(0), testSetsInitedArray: testSetsExpandedArrayInitVal.slice(0),
}) })
if (newProps.game.id !== this.props.game.id) { if (newProps.game.id !== this.props.game.id) {
if (this.props.challenge.isHtml === true) { if (this.props.challenge.isHtml === true) {
this.tabIndexChange(TAB_INDEX_WEB_DISPLAY) this.tabIndexChange(TAB_INDEX_WEB_DISPLAY)
} }
} }
} }
} }
componentDidUpdate(prevProps, prevState, snapshot) { componentDidUpdate(prevProps, prevState, snapshot) {
// 通关后重置为0 // 通关后重置为0
if (!prevProps.currentGamePassed && this.props.currentGamePassed === true) { if (!prevProps.currentGamePassed && this.props.currentGamePassed === true) {
this.tabIndexChange(TAB_INDEX_WEB_DISPLAY) this.tabIndexChange(TAB_INDEX_WEB_DISPLAY)
} }
} }
tabIndexChange(index) { tabIndexChange(index) {
this.setState({tabIndex: index}); this.setState({tabIndex: index});
} }
onTestSetHeaderClick(index) { onTestSetHeaderClick(index) {
const { output_sets, power, game } = this.props; const { output_sets, power, game } = this.props;
const { test_sets_array } = output_sets; const { test_sets_array } = output_sets;
const { testSetsInitedArray } = this.state; const { testSetsInitedArray } = this.state;
// TODO 评测了以后,测试集会变化, // TODO 评测了以后,测试集会变化,
var current_test_set = test_sets_array[index]; var current_test_set = test_sets_array[index];
if (!current_test_set.output) { if (!current_test_set.output) {
current_test_set.output = '' current_test_set.output = ''
} }
// 优化,但是会增加代码复杂度 // 优化,但是会增加代码复杂度
if (( game.test_sets_view === true || power == 1 || current_test_set.is_public == 1 ) && testSetsInitedArray[index] === false ) { // 如果测试集没有初始化过(如果重新评测了,都需要重新初始化) if (( game.test_sets_view === true || power == 1 || current_test_set.is_public == 1 ) && testSetsInitedArray[index] === false ) { // 如果测试集没有初始化过(如果重新评测了,都需要重新初始化)
const id = "result_different_show_" + index; const id = "result_different_show_" + index;
var mv = window.CodeMirror.k_init(id, current_test_set.actual_output || "", current_test_set.output); var mv = window.CodeMirror.k_init(id, current_test_set.actual_output || "", current_test_set.output);
var height=0; var height=0;
// 以前的代码用不了2个pane的高度都是300 // 以前的代码用不了2个pane的高度都是300
// if($("#"+id).find(".CodeMirror-merge-pane").eq(0).height()>$("#"+id).find(".CodeMirror-merge-pane").eq(1).height()){ // if($("#"+id).find(".CodeMirror-merge-pane").eq(0).height()>$("#"+id).find(".CodeMirror-merge-pane").eq(1).height()){
// height = parseInt($("#"+id).find(".CodeMirror-merge-pane").eq(0).height()); // height = parseInt($("#"+id).find(".CodeMirror-merge-pane").eq(0).height());
// }else{ // }else{
// height = parseInt($("#"+id).find(".CodeMirror-merge-pane").eq(1).height()); // height = parseInt($("#"+id).find(".CodeMirror-merge-pane").eq(1).height());
// } // }
var lineNumber = Math.max( current_test_set.output.split('\n').length var lineNumber = Math.max( current_test_set.output.split('\n').length
, (current_test_set.actual_output ? current_test_set.actual_output.split('\n').length : 1 )) , (current_test_set.actual_output ? current_test_set.actual_output.split('\n').length : 1 ))
height = lineNumber * 19 + 25; height = lineNumber * 19 + 25;
console.log('height ', height) console.log('height ', height)
$("#"+id).find(".CodeMirror").height(height); $("#"+id).find(".CodeMirror").height(height);
$(".CodeMirror-merge-gap").find("svg").css("height", height); $(".CodeMirror-merge-gap").find("svg").css("height", height);
// 取真实高度 // 取真实高度
$(".CodeMirror-merge-gap").css("height", $('.CodeMirror-merge-pane.CodeMirror-merge-editor').height()); $(".CodeMirror-merge-gap").css("height", $('.CodeMirror-merge-pane.CodeMirror-merge-editor').height());
setTimeout(()=>{ // 解决第一次打开时高度不准的问题 setTimeout(()=>{ // 解决第一次打开时高度不准的问题
$('#game_test_set_results .CodeMirror-merge').css('display', 'flex') $('#game_test_set_results .CodeMirror-merge').css('display', 'flex')
}, 100) }, 100)
// refresh一下解决CM显示不全的问题 // refresh一下解决CM显示不全的问题
mv.edit.refresh() mv.edit.refresh()
mv.right.orig.refresh() mv.right.orig.refresh()
testSetsInitedArray[index] = true; testSetsInitedArray[index] = true;
} }
this.props.onTestSetHeaderClick(index) this.props.onTestSetHeaderClick(index)
this.setState({ this.setState({
testSetsInitedArray, testSetsInitedArray,
}) })
} }
goToCertification() { goToCertification() {
window.open('/account/professional_certification', '_blank'); window.open('/account/certification', '_blank');
} }
renderTestSets() { renderTestSets() {
const { output_sets, testSetsExpandedArray, power, allowed_unlock, testSetUnlock, showDialog, challenge, game, user } = this.props; const { output_sets, testSetsExpandedArray, power, allowed_unlock, testSetUnlock, showDialog, challenge, game, user } = this.props;
const { testSetsInitedArray } = this.state; const { testSetsInitedArray } = this.state;
const { test_sets_array, test_sets_count, had_test_count, test_sets_hidden_count, test_sets_public_count const { test_sets_array, test_sets_count, had_test_count, test_sets_hidden_count, test_sets_public_count
, had_passed_testsests_error_count, had_passed_testsests_hidden_count, had_passed_testsests_public_count } = output_sets; , had_passed_testsests_error_count, had_passed_testsests_hidden_count, had_passed_testsests_public_count } = output_sets;
const testSetsComponentArray = [] const testSetsComponentArray = []
if (!test_sets_array) { if (!test_sets_array) {
console.error('no test_sets_array error') console.error('no test_sets_array error')
return '' return ''
} }
test_sets_array.forEach( (item, index) => { test_sets_array.forEach( (item, index) => {
// function toggle_test_case(open, output, actual_output, id, power){ // function toggle_test_case(open, output, actual_output, id, power){
// onclick={toggle_test_case(1, output, actual_output, 0, true)} // onclick={toggle_test_case(1, output, actual_output, 0, true)}
const isExpanded = testSetsExpandedArray[index] const isExpanded = testSetsExpandedArray[index]
let headIconClass = ''; let headIconClass = '';
let _headLockIconClass = ''; let _headLockIconClass = '';
if (item.is_public == 0) { if (item.is_public == 0) {
if (game.test_sets_view === true || power === 1){ if (game.test_sets_view === true || power === 1){
_headLockIconClass = 'fas fa-unlock-alt' _headLockIconClass = 'fas fa-unlock-alt'
} else { } else {
_headLockIconClass = 'fa-lock' _headLockIconClass = 'fa-lock'
} }
} }
if (item.result == true) { if (item.result == true) {
headIconClass = 'fa-check-circle color-light-green font-16' headIconClass = 'fa-check-circle color-light-green font-16'
} else if (item.result == false) { } else if (item.result == false) {
headIconClass = 'fa-exclamation-circle -text-danger' headIconClass = 'fa-exclamation-circle -text-danger'
} }
testSetsComponentArray.push( testSetsComponentArray.push(
<div className="-task-ces-top clearfix" onClick={ this.onTestSetHeaderClick.bind(this, index) } <div className="-task-ces-top clearfix" onClick={ this.onTestSetHeaderClick.bind(this, index) }
style={{cursor:'pointer', 'margin-top':index == 0 ? '4px' : ''}} key={index+'-0'}> style={{cursor:'pointer', 'margin-top':index == 0 ? '4px' : ''}} key={index+'-0'}>
<p className="clearfix"> <p className="clearfix">
<i className={`fa ${ 'fa-caret-right'} mr8 font-16`} <i className={`fa ${ 'fa-caret-right'} mr8 font-16`}
style={isExpanded ? {transform: 'rotate(90deg)'} : {}}></i> style={isExpanded ? {transform: 'rotate(90deg)'} : {}}></i>
<span className="font-14">测试集 {index + 1}</span> <span className="font-14">测试集 {index + 1}</span>
{ headIconClass && <i className={`fa ${ headIconClass } fr mt2 ml5 font-16`}></i> } { headIconClass && <i className={`fa ${ headIconClass } fr mt2 ml5 font-16`}></i> }
{ _headLockIconClass && <i className={`fa ${ _headLockIconClass } fr mt2 ml5 font-16`}></i> } { _headLockIconClass && <i className={`fa ${ _headLockIconClass } fr mt2 ml5 font-16`}></i> }
{ item.ts_mem && <span className="fr description">消耗内存{item.ts_mem}MB</span> } { item.ts_mem && <span className="fr description">消耗内存{item.ts_mem}MB</span> }
{ item.ts_mem && item.ts_time && <span className="split"></span> } { item.ts_mem && item.ts_time && <span className="split"></span> }
{ item.ts_time && <span className="fr description">代码执行时长{item.ts_time}</span> } { item.ts_time && <span className="fr description">代码执行时长{item.ts_time}</span> }
</p> </p>
</div> </div>
) )
// //
let contentText = (power === 0 && user.is_teacher) ? let contentText = (power === 0 && user.is_teacher) ?
<React.Fragment> <React.Fragment>
<div>{`已经过职业认证的教师可以免金币查看隐藏测试集。`}</div> <div>{`已经过职业认证的教师可以免金币查看隐藏测试集。`}</div>
<div>{`解锁本关所有测试集需要扣除${challenge.score*5}金币,确定要解锁吗?`}</div> <div>{`解锁本关所有测试集需要扣除${challenge.score*5}金币,确定要解锁吗?`}</div>
<div onClick={()=>this.goToCertification()} style={{color: '#4CACFF', cursor: 'pointer', 'text-decoration': 'underline' <div onClick={()=>this.goToCertification()} style={{color: '#4CACFF', cursor: 'pointer', 'text-decoration': 'underline'
, 'margin-top': '12px'}}>立即认证</div> , 'margin-top': '12px'}}>立即认证</div>
</React.Fragment> : </React.Fragment> :
<React.Fragment> <React.Fragment>
<div>{`解锁本关所有测试集需要扣除${challenge.score*5}金币`}</div> <div>{`解锁本关所有测试集需要扣除${challenge.score*5}金币`}</div>
<div>{`确定要解锁吗?`}</div> <div>{`确定要解锁吗?`}</div>
</React.Fragment> </React.Fragment>
const moreButtonsRender = () => { const moreButtonsRender = () => {
return '' return ''
// ${this.props.classes.button} // ${this.props.classes.button}
// return (power === 0 && user.is_teacher) ? ( // return (power === 0 && user.is_teacher) ? (
// <Button variant="raised" style={{ marginRight: '20px'}} className={``} // <Button variant="raised" style={{ marginRight: '20px'}} className={``}
// onClick={()=>this.goToCertification()} color="primary"> // onClick={()=>this.goToCertification()} color="primary">
// { '立即认证' } // { '立即认证' }
// </Button> // </Button>
// ) : '' // ) : ''
} }
testSetsComponentArray.push( testSetsComponentArray.push(
<div className="-task-ces-box mb10 clearfix tabContent" key={index+'-1'}> <div className="-task-ces-box mb10 clearfix tabContent" key={index+'-1'}>
<div className="-task-ces-info" style={ isExpanded ? {display:'block'} : {display:'none'}} id={`test_case_${index}`}> <div className="-task-ces-info" style={ isExpanded ? {display:'block'} : {display:'none'}} id={`test_case_${index}`}>
{ {
(game.test_sets_view === true || power == 1 || item.is_public == 1) ? (game.test_sets_view === true || power == 1 || item.is_public == 1) ?
( (
<React.Fragment> <React.Fragment>
{ item.input ? { item.input ?
<div className="pl20 pb5 -task-testline"> <div className="pl20 pb5 -task-testline">
<div className="clearfix df inputTitle"> <div className="clearfix df inputTitle">
<span className="fl fb color-grey">测试输入</span> <span className="fl fb color-grey">测试输入</span>
<div className="fl color-blue" style={{flex:1}} dangerouslySetInnerHTML={{__html: item.input.replace(/\r\n/g,"</br>")}}></div> <div className="fl color-blue" style={{flex:1}} dangerouslySetInnerHTML={{__html: item.input.replace(/\r\n/g,"</br>")}}></div>
</div> </div>
</div> </div>
: "" } : "" }
<div className="clearfix" className="outputTitle"> <div className="clearfix" className="outputTitle">
<p className="fl with52">- 预期输出 -</p> <p className="fl with52">- 预期输出 -</p>
<p className="fl with48 pl5" style={{boxSizing:'border-box'}}>- 实际输出 -</p> <p className="fl with48 pl5" style={{boxSizing:'border-box'}}>- 实际输出 -</p>
</div> </div>
</React.Fragment> </React.Fragment>
) : ) :
<p className="color-orange -task-testline pl20 " style={{ 'padding-bottom': '8px' }}> <p className="color-orange -task-testline pl20 " style={{ 'padding-bottom': '8px' }}>
{ !allowed_unlock ? '隐藏测试集,暂不支持解锁和查看。' : '此为隐藏测试项。'} { !allowed_unlock ? '隐藏测试集,暂不支持解锁和查看。' : '此为隐藏测试项。'}
{ (power === 0 && allowed_unlock == true) ? <a href="javascript:void(0)" className="color_white test_set_data" { (power === 0 && allowed_unlock == true) ? <a href="javascript:void(0)" className="color_white test_set_data"
onClick={()=>showDialog({ contentText, callback: testSetUnlock , moreButtonsRender})} onClick={()=>showDialog({ contentText, callback: testSetUnlock , moreButtonsRender})}
style={{"textDecoration": "underline"}}>解锁</a> : '' } style={{"textDecoration": "underline"}}>解锁</a> : '' }
</p> </p>
} }
</div> </div>
{/*测试集已解锁||管理员||公开的测试集||TODO应该是全通过时 已通过的测试集*/} {/*测试集已解锁||管理员||公开的测试集||TODO应该是全通过时 已通过的测试集*/}
{ {
(game.test_sets_view == true || power == 1 || item.is_public == 1 || !!item.result === true) ? (game.test_sets_view == true || power == 1 || item.is_public == 1 || !!item.result === true) ?
<div className="result_different_show" id={`result_different_show_${index}`} style={ (!testSetsInitedArray[index] || isExpanded) ? {display:'block'} : {display:'none'}}></div> <div className="result_different_show" id={`result_different_show_${index}`} style={ (!testSetsInitedArray[index] || isExpanded) ? {display:'block'} : {display:'none'}}></div>
: "" : ""
} }
</div> </div>
) )
}) })
return testSetsComponentArray; return testSetsComponentArray;
} }
onEvaluateViewExpand() { onEvaluateViewExpand() {
window.valuation_extend_and_zoom(); window.valuation_extend_and_zoom();
this.setState({ this.setState({
evaluateViewExpanded: !this.state.evaluateViewExpanded evaluateViewExpanded: !this.state.evaluateViewExpanded
}) })
} }
render() { render() {
const { evaluateViewExpanded, tabIndex } = this.state; const { evaluateViewExpanded, tabIndex } = this.state;
const { output_sets, latest_output, record, challenge, gameBuilding, myshixun } = this.props; const { output_sets, latest_output, record, challenge, gameBuilding, myshixun } = this.props;
if (!output_sets) { if (!output_sets) {
return ( return (
<div>loading</div> <div>loading</div>
) )
} }
const { test_sets, test_sets_count, had_test_count, test_sets_hidden_count, test_sets_public_count const { test_sets, test_sets_count, had_test_count, test_sets_hidden_count, test_sets_public_count
, had_passed_testsests_error_count, had_passed_testsests_hidden_count, had_passed_testsests_public_count } = output_sets; , had_passed_testsests_error_count, had_passed_testsests_hidden_count, had_passed_testsests_public_count } = output_sets;
/* /*
<a href="javascript:void(0);" data-tip-left="展开" className="fr mt10 mr15" onClick={this.onEvaluateViewExpand} id="valuation_extend_and_zoom"> <a href="javascript:void(0);" data-tip-left="展开" className="fr mt10 mr15" onClick={this.onEvaluateViewExpand} id="valuation_extend_and_zoom">
<i className="fa fa-expand font-16 color-grey"></i> <i className="fa fa-expand font-16 color-grey"></i>
</a> </a>
<li className="blacktab_con" onclick="check_tab('blacktab_con','blacktab_hover',this);"> <li className="blacktab_con" onclick="check_tab('blacktab_con','blacktab_hover',this);">
<a href="javascript:void(0);" className="tab_type tab_color">评测信息</a> <a href="javascript:void(0);" className="tab_type tab_color">评测信息</a>
</li> </li>
onclick="check_tab('blacktab_con','blacktab_hover',this);" onclick="check_tab('blacktab_con','blacktab_hover',this);"
*/ */
return ( return (
<React.Fragment> <React.Fragment>
<ul id="blacktab_nav"> <ul id="blacktab_nav">
<li className="blacktab_con undis" > <li className="blacktab_con undis" >
</li> </li>
{ challenge.isHtml ? { challenge.isHtml ?
<li className={`blacktab_con ${ tabIndex === 0 ? 'tab_hover' : ''}`} onClick={() => this.tabIndexChange(0)}> <li className={`blacktab_con ${ tabIndex === 0 ? 'tab_hover' : ''}`} onClick={() => this.tabIndexChange(0)}>
<a href="javascript:void(0);" className="tab_type tab_color">效果显示</a> <a href="javascript:void(0);" className="tab_type tab_color">效果显示</a>
</li> : ''} </li> : ''}
<li className={`blacktab_con ${ tabIndex === 1 ? 'tab_hover' : ''}`} onClick={() => this.tabIndexChange(1)}> <li className={`blacktab_con ${ tabIndex === 1 ? 'tab_hover' : ''}`} onClick={() => this.tabIndexChange(1)}>
<a href="javascript:void(0);" className="tab_type tab_color">测试结果</a> <a href="javascript:void(0);" className="tab_type tab_color">测试结果</a>
</li> </li>
<Tooltip id="tooltip-icon-expand" title={ evaluateViewExpanded ? "收起" : "展开"}> <Tooltip id="tooltip-icon-expand" title={ evaluateViewExpanded ? "收起" : "展开"}>
{/*TODO 按钮大小改造css*/} {/*TODO 按钮大小改造css*/}
<a className="iconButton fr mr15" onClick={this.onEvaluateViewExpand} id="extend_and_zoom" > <a className="iconButton fr mr15" onClick={this.onEvaluateViewExpand} id="extend_and_zoom" >
<i className={ evaluateViewExpanded ? "font-18 iconfont icon-shousuo" : "iconfont icon-zhankai font-18" }></i> <i className={ evaluateViewExpanded ? "font-18 iconfont icon-shousuo" : "iconfont icon-zhankai font-18" }></i>
</a> </a>
</Tooltip> </Tooltip>
<div className="cl"></div> <div className="cl"></div>
</ul> </ul>
<CircularProgress size={40} thickness={3} <CircularProgress size={40} thickness={3}
style={{ marginLeft: 'auto', marginRight: 'auto', marginTop: '10%', display: gameBuilding ? 'block': 'none' }}/> style={{ marginLeft: 'auto', marginRight: 'auto', marginTop: '10%', display: gameBuilding ? 'block': 'none' }}/>
<div id="evaluateMiddleStatusText" style={{ <div id="evaluateMiddleStatusText" style={{
marginTop: "4px", marginTop: "4px",
textAlign: "center", textAlign: "center",
color: "#4CACFF", color: "#4CACFF",
display: gameBuilding ? 'block': 'none' display: gameBuilding ? 'block': 'none'
}} }}
></div> ></div>
<div id="game_test_set_results" className="-flex -relative blacktab-inner" <div id="game_test_set_results" className="-flex -relative blacktab-inner"
style={{ display: gameBuilding ? 'none': 'block' }}> style={{ display: gameBuilding ? 'none': 'block' }}>
<React.Fragment> <React.Fragment>
<div id="blacktab_con_1" className="htmlContainer" style={ (challenge.isHtml && tabIndex === 0) ? {display: 'block'} : {display: 'none'} }> <div id="blacktab_con_1" className="htmlContainer" style={ (challenge.isHtml && tabIndex === 0) ? {display: 'block'} : {display: 'none'} }>
<form id="html_form" method="post" target="myFrame" action={`/api/myshixuns/${myshixun.identifier}/html_content.html`}> <form id="html_form" method="post" target="myFrame" action={`/api/myshixuns/${myshixun.identifier}/html_content.html`}>
<input type="hidden" name="contents" id="data_param" value=""></input> <input type="hidden" name="contents" id="data_param" value=""></input>
<input type="hidden" name="educodercss" id="data_css_param" value=""></input> <input type="hidden" name="educodercss" id="data_css_param" value=""></input>
<input type="hidden" name="educoderscript" id="data_js_param" value=""></input> <input type="hidden" name="educoderscript" id="data_js_param" value=""></input>
</form> </form>
<iframe id="htmlIframe" frameBorder="0" name="myFrame" style={{background: '#fff', height: '100%', width: '100%'}} > <iframe id="htmlIframe" frameBorder="0" name="myFrame" style={{background: '#fff', height: '100%', width: '100%'}} >
</iframe> </iframe>
</div> </div>
<div id="blacktab_con_2" className=" " style={ tabIndex === 1 ? {display: 'block'} : {display: 'none'} }> <div id="blacktab_con_2" className=" " style={ tabIndex === 1 ? {display: 'block'} : {display: 'none'} }>
<div className="fit -scroll"> <div className="fit -scroll">
<div className="-layout-v -fit"> <div className="-layout-v -fit">
<div className="-flex -scroll task-padding16 loading-center undis" id="evaluating_ajax_loading"></div> <div className="-flex -scroll task-padding16 loading-center undis" id="evaluating_ajax_loading"></div>
<div className="-flex -scroll task-padding16" id="evaluating_contents"> <div className="-flex -scroll task-padding16" id="evaluating_contents">
{/* {/*
record ? <span className="fr mr5 tab_color">本次评测耗时{ record } </span> : "" record ? <span className="fr mr5 tab_color">本次评测耗时{ record } </span> : ""
*/} */}
{ had_test_count === 0 || test_sets_count == null ? <div></div> : { had_test_count === 0 || test_sets_count == null ? <div></div> :
had_passed_testsests_error_count === test_sets_count ? had_passed_testsests_error_count === test_sets_count ?
<p className="color-light-green mb10 evaluateResult" > <p className="color-light-green mb10 evaluateResult" >
<i className="fa fa-check-circle font-16"></i> <i className="fa fa-check-circle font-16"></i>
<span className="ml5 mr5">{test_sets_count}/{test_sets_count}</span> <span className="ml5 mr5">{test_sets_count}/{test_sets_count}</span>
</p> : </p> :
<p className="-text-danger mb10 evaluateResult"> <p className="-text-danger mb10 evaluateResult">
<i className="fa fa-exclamation-circle font-16"></i> <i className="fa fa-exclamation-circle font-16"></i>
<span className="ml5 mr5 -text-danger">{had_passed_testsests_error_count}/{test_sets_count}</span> <span className="ml5 mr5 -text-danger">{had_passed_testsests_error_count}/{test_sets_count}</span>
{/*.replace(/\\u/gi, '%u') unicode转码 */} {/*.replace(/\\u/gi, '%u') unicode转码 */}
{latest_output ? {latest_output ?
<span dangerouslySetInnerHTML={{__html: latest_output.replace(/\\r/g,'')}}></span> <span dangerouslySetInnerHTML={{__html: latest_output.replace(/\\r/g,'')}}></span>
: ""} : ""}
</p> </p>
} }
{this.renderTestSets()} {this.renderTestSets()}
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</React.Fragment> </React.Fragment>
</div> </div>
</React.Fragment> </React.Fragment>
); );
} }
} }
export default CodeEvaluateView; export default CodeEvaluateView;

@ -68,7 +68,7 @@ const styles = MUIDialogStyleUtil.getTwoButtonStyle(
class LeftView extends Component { class LeftView extends Component {
goToCertification() { goToCertification() {
window.open('/account/professional_certification', '_blank'); window.open('/account/certification', '_blank');
} }
// /shixuns/mnf6b7z3/shixun_discuss?challenge_id=88 // /shixuns/mnf6b7z3/shixun_discuss?challenge_id=88
render() { render() {

@ -7,7 +7,7 @@ export function loadSshScript(callback) {
prefix = '' prefix = ''
} else { } else {
// _url_origin = `https://testeduplus2.educoder.net/`; // _url_origin = `https://testeduplus2.educoder.net/`;
_url_origin = 'http://47.96.87.25:48080/'; _url_origin = '';
} }
const $ = window.$; const $ = window.$;
// 未加载过 // 未加载过

@ -18,7 +18,8 @@ import Trialapplication from "../login/Trialapplication";
const $ = window.$; const $ = window.$;
const versionNum = '0001'; const versionNum = '0001';
// let _url_origin = getUrl() // let _url_origin = getUrl()
let _url_origin=`http://47.96.87.25:48080`; console.log(this.props)
let _url_origin='';
// let _url_origin=`https://www.educoder.net`; // let _url_origin=`https://www.educoder.net`;
if (!window['indexHOCLoaded']) { if (!window['indexHOCLoaded']) {

@ -2,7 +2,7 @@ import React, {Component} from 'react';
import {Button,notification} from 'antd'; import {Button,notification} from 'antd';
import {broadcastChannelPostMessage} from 'educoder'; import {broadcastChannelPostMessage} from 'educoder';
import MyEduCoderModal from './MyEduCoderModal'; import MyEduCoderModal from './MyEduCoderModal';
import Notcompleted from './Notcompleted'; // import Notcompleted from '../../common/Notcompleted';
import axios from 'axios'; import axios from 'axios';
import './common.css'; import './common.css';
import mytc from './img/mytc.png'; import mytc from './img/mytc.png';
@ -31,7 +31,7 @@ class InterestpageComponent extends Component {
passmm:this.props.passmm, passmm:this.props.passmm,
homedatalist:undefined, homedatalist:undefined,
hometypepvisible: undefined, hometypepvisible: undefined,
MyEduCoderModals:false
} }
} }
openNotification = (messge) => { openNotification = (messge) => {
@ -249,9 +249,6 @@ class InterestpageComponent extends Component {
setNotcompleteds={()=>{this.setNotcompleteds()}} setNotcompleteds={()=>{this.setNotcompleteds()}}
/> />
<Notcompleted
modalsType={this.state.Notcompleteds}
/>
<div className="ysllogin_section"> <div className="ysllogin_section">
<div className="mt15"><span className="yslspans1">请选择你的职业</span></div> <div className="mt15"><span className="yslspans1">请选择你的职业</span></div>
<div className="ysldivhome1" > <div className="ysldivhome1" >

Loading…
Cancel
Save