所属目录：{discussMessage&&discussMessage.category_name}
:""}
diff --git a/public/react/src/modules/courses/Resource/index.js b/public/react/src/modules/courses/Resource/index.js
index ce4fb8dc2..501176882 100644
--- a/public/react/src/modules/courses/Resource/index.js
+++ b/public/react/src/modules/courses/Resource/index.js
@@ -230,7 +230,8 @@ class Fileslists extends Component{
filesId:list.id,
name:list.name,
course_is_public:result.data.data.course_is_public,
- isSpin:false
+ isSpin:false,
+ page:page
})
}
}
@@ -423,7 +424,7 @@ class Fileslists extends Component{
onPressEnter = () => {
let {searchValue}=this.state;
let{pagesize,page,tagname,sort,sorttype,coursesecondcategoryid}=this.state;
- this.getfileslist(pagesize,page,tagname,searchValue,sort,sorttype,coursesecondcategoryid);
+ this.getfileslist(pagesize,1,tagname,searchValue,sort,sorttype,coursesecondcategoryid);
}
onInputSearchChange = (e) => {
@@ -850,6 +851,7 @@ class Fileslists extends Component{
searchValue={ searchValue }
// searchtype={this.props.isAdmin||this.props.isStudent ?true:false}
onInputSearchChange={this.onInputSearchChange}
+ allowClearonChange={this.onInputSearchChange}
firstRowRight={
- */}
+ {publicSearchs("请输入姓名或学号搜索",this.onSearchValue,this.onSearchValueInput,this.onSearchValueInput)}
}
@@ -843,9 +855,9 @@ class CommonWorkList extends Component{
![]({getUrl("/images/educoder/nodata.png")}/)
- 暂时还没有相关数据哦！
+{searchtypes===true?"抱歉没有您要搜索的内容，请换个词语试试看":"暂时还没有相关数据哦!"}
- */}
diff --git a/public/react/src/modules/courses/graduation/tasks/index.js b/public/react/src/modules/courses/graduation/tasks/index.js
index c316035ee..c10fdc5fc 100644
--- a/public/react/src/modules/courses/graduation/tasks/index.js
+++ b/public/react/src/modules/courses/graduation/tasks/index.js
@@ -1,7 +1,6 @@
import React,{ Component } from "react";
-import { Input, Checkbox, Menu,Pagination,Spin} from "antd";
+import { Checkbox, Menu,Pagination,Spin} from "antd";
import {Link} from 'react-router-dom';
-import CourseLayoutcomponent from '../../common/CourseLayoutComponent';
import Titlesearchsection from '../../common/titleSearch/TitleSearchSection';
import HomeworkModal from "../../coursesPublic/HomeworkModal";
import { WordsBtn } from 'educoder';
@@ -10,7 +9,6 @@ import moment from 'moment';
import GraduateTaskItem from './GraduateTaskItem';
import TaskPublishModal from "./TaskPublishModal";
import Modals from '../../../modals/Modals';
-import UseBank from "../../busyWork/UseBank";
import '../../css/members.css';
import '../style.css';
import NoneData from "../../coursesPublic/NoneData";
@@ -65,7 +63,9 @@ class GraduationTasks extends Component{
})
}
}).catch(function (error) {
- console.log(error);
+ this.setState({
+ isSpin:false
+ })
});
}
@@ -286,7 +286,7 @@ class GraduationTasks extends Component{
onInputSearchChange = (e) => {
this.setState({
- searchValue:e.target.value
+ searchValue:e.target.value,
})
if (this.timeoutHandler) {
@@ -405,7 +405,8 @@ class GraduationTasks extends Component{
let {page,order}=this.state;
this.setState({
- search:value
+ search:value,
+ isSpin:true
})
this.fetchAll(value,page,order);
@@ -662,6 +663,7 @@ class GraduationTasks extends Component{
title="毕设任务"
searchValue={searchValue}
onInputSearchChange={this.onInputSearchChange}
+ allowClearonChange={this.onInputSearchChange}
firstRowRight={
{/*{this.props.isAdmin() ? this.addDir()}>题库选用 :""}*/}
diff --git a/public/react/src/modules/courses/graduation/topics/index.js b/public/react/src/modules/courses/graduation/topics/index.js
index b4bfa6527..b77b4c096 100644
--- a/public/react/src/modules/courses/graduation/topics/index.js
+++ b/public/react/src/modules/courses/graduation/topics/index.js
@@ -1,7 +1,6 @@
import React,{ Component } from "react";
import {Checkbox, Menu, Pagination,Spin} from "antd";
-import CourseLayoutcomponent from '../../common/CourseLayoutComponent'
import Titlesearchsection from '../../common/titleSearch/TitleSearchSection'
import DownloadMessageysl from "../../../modals/DownloadMessageysl";
@@ -9,7 +8,6 @@ import { WordsBtn ,getRandomcode} from 'educoder'
import NoneData from '../../coursesPublic/NoneData'
import Modals from "../../../modals/Modals"
import axios from 'axios'
-import UseBank from '../../busyWork/UseBank'
import _ from 'lodash'
@@ -85,12 +83,15 @@ class Boards extends Component{
topicList:response.data.graduation_topic,
totalCount:response.data.graduation_topic_count,
course_public:response.data.course_public,
- isSpin:false
+ isSpin:false,
+ page:page
})
}
})
.catch(function (error) {
- console.log(error);
+ this.setState({
+ isSpin:false
+ })
});
}
componentDidMount = () => {
@@ -117,10 +118,11 @@ class Boards extends Component{
onInputSearchChange = (e) => {
this.setState({
- searchValue:e.target.value
+ searchValue:e.target.value,
})
}
+
// 全选or反选
onCheckAll = (e) => {
this.setState({
@@ -408,6 +410,7 @@ onBoardsNew=()=>{
title="毕设选题"
searchValue={ searchValue }
onInputSearchChange={this.onInputSearchChange}
+ allowClearonChange={this.onInputSearchChange}
firstRowRight=
{ isAdmin ?
(
diff --git a/public/react/src/modules/courses/members/CourseGroupList.js b/public/react/src/modules/courses/members/CourseGroupList.js
index 48bc2efcd..f489dac0a 100644
--- a/public/react/src/modules/courses/members/CourseGroupList.js
+++ b/public/react/src/modules/courses/members/CourseGroupList.js
@@ -136,6 +136,7 @@ function CourseGroupList(props) {
title={"分班列表"}
searchValue={ searchValue }
onInputSearchChange={onInputSearchChange}
+ allowClearonChange={onInputSearchChange}
showSearchInput={total_count >= 10}
searchPlaceholder={ '请输入分班名称进行搜索' }
firstRowRight={
diff --git a/public/react/src/modules/courses/poll/Poll.js b/public/react/src/modules/courses/poll/Poll.js
index 447b454e4..dd0166e29 100644
--- a/public/react/src/modules/courses/poll/Poll.js
+++ b/public/react/src/modules/courses/poll/Poll.js
@@ -1,6 +1,6 @@
import React,{ Component } from "react";
-import { Input,Checkbox,Table, Pagination, Modal,Menu, Tooltip ,Spin} from "antd";
-import {WordsBtn, on, off, trigger } from 'educoder';
+import {Checkbox, Pagination,Menu ,Spin} from "antd";
+import {WordsBtn, on, off, publicSearchs } from 'educoder';
import HomeworkModal from "../coursesPublic/HomeworkModal";
import AddcoursesNav from "../coursesPublic/AddcoursesNav";
import ImmediatelyPublish from './pollPublicBtn/ImmediatelyPublish';
@@ -15,8 +15,6 @@ import Modals from '../../modals/Modals';
import axios from 'axios';
import moment from 'moment';
-const Search = Input.Search;
-
class Poll extends Component{
constructor(props){
@@ -66,7 +64,7 @@ class Poll extends Component{
inputStudent=(e)=>{
this.setState({
- StudentList_value:e.target.value
+ StudentList_value:e.target.value,
})
}
@@ -125,7 +123,8 @@ class Poll extends Component{
course_types:result.data.course_types,
polls_counts:result.data.polls_counts,
isSpin:false,
- checkBoxValues: bank_checkValue ? bank_checkValue : []
+ checkBoxValues: bank_checkValue ? bank_checkValue : [],
+ page:page
})
}
}).catch((error)=>{
@@ -524,12 +523,13 @@ class Poll extends Component{
未发布：{polls_counts && polls_counts.polls_unpublish_counts}个
- */}
diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
index 879508ea1..0b760f7f9 100644
--- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
+++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
@@ -1,6 +1,6 @@
import React, {Component} from "react";
import CoursesListType from '../coursesPublic/CoursesListType';
-import {WordsBtn, ActionBtn, sortDirections} from 'educoder';
+import {WordsBtn, publicSearchs, sortDirections} from 'educoder';
import {
Form,
Select,
@@ -65,6 +65,7 @@ class Listofworksstudentone extends Component {
//关卡得分final_score
this.state = {
+ searchtypes:false,
jobsettingsdata: undefined,
endTime: "2018/11/10 17:10:00",
type: "day",
@@ -2588,6 +2589,7 @@ class Listofworksstudentone extends Component {
challenges_count: result.data.challenges_count,
homework_status: result.data.homework_status,
answer_open_evaluation:result.data.answer_open_evaluation,
+ page:page
});
allow_lates=result.data.allow_late;
answer_open_evaluation=result.data.answer_open_evaluation;
@@ -2959,10 +2961,9 @@ class Listofworksstudentone extends Component {
}
//搜索学生 文字输入
inputSearchValuest = (e) => {
- // console.log(e.target.value)
- if (e.target.value === "") {
+ if (e.target.value === ""||e.target.value===undefined) {
this.setState({
- searchtext: undefined
+ searchtext: undefined,
})
} else {
this.setState({
@@ -2983,8 +2984,9 @@ class Listofworksstudentone extends Component {
loadingstate: true,
page: 1,
limit: 20,
+ searchtypes:true
})
- this.Startsortingt(this.state.orders, this.state.course_groupyslstwo, this.state.checkedValuesineinfo, value, 1, 20, this.state.myorders);
+ this.Startsortingt(this.state.orders, this.state.course_groupyslstwo, this.state.checkedValuesineinfo, value, 1, 20, this.state.myorders);
// console.log(value)
@@ -3576,12 +3578,18 @@ class Listofworksstudentone extends Component {
:
homework_status && homework_status.length === 0 ?
-
:
homework_status && homework_status.length > 0 && homework_status[0] === "未发布" ?
-
:
@@ -3664,15 +3672,16 @@ class Listofworksstudentone extends Component {
{/*}*/}
{/*}*/}
- this.onSearchKeywordKeyUpt(e)}
- onInput={this.inputSearchValuest}
- onSearch={this.searchValuest}
- >
+ {/* this.onSearchKeywordKeyUpt(e)}*/}
+ {/* onInput={this.inputSearchValuest}*/}
+ {/* onSearch={this.searchValuest}*/}
+ {/*>*/}
+ {publicSearchs("请输入姓名或学号搜索",this.searchValuest,this.inputSearchValuest,this.inputSearchValuest)}
作品状态：
@@ -3760,7 +3769,7 @@ class Listofworksstudentone extends Component {
![]({getImageUrl("images/educoder/nodata.png")}/)
- 暂时还没有相关数据哦！
+{this.state.searchtypes===false?"暂时还没有相关数据哦！":"抱歉没有您要搜索的内容，请换个词语试试看"}
- {datajs === undefined ? "" :
}
+
+ {datajs === undefined ? "" :
}
+
+
-
:
homework_status && homework_status.length > 0 && homework_status && homework_status[0] === "未发布" ?
-
:
@@ -4029,7 +4047,7 @@ class Listofworksstudentone extends Component {
- 暂时还没有相关数据哦！
+{this.state.searchtypes===false?"暂时还没有相关数据哦！":"抱歉没有您要搜索的内容，请换个词语试试看"}
-
:
homework_status && homework_status.length > 0 && homework_status && homework_status[0] === "未发布" ?
-
:
@@ -4226,9 +4250,9 @@ class Listofworksstudentone extends Component {
{
@@ -4270,7 +4298,7 @@ class Listofworksstudentone extends Component {
-
diff --git a/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js b/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js
index 90e6e6a4f..3765b2932 100644
--- a/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js
+++ b/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js
@@ -370,11 +370,11 @@ class ShixunWorkReport extends Component {
{this.props.isAdmin() ?this.confirmysl(`/student_works/${homeworkid}/export_shixun_work_report.pdf`)}
- >
- {datas === undefined ? "" :
}
+ {datas === undefined ? "" :
+
+
+
+ }
- 暂时还没有相关数据哦！
+{this.state.searchtypes===false?"暂时还没有相关数据哦！":"抱歉没有您要搜索的内容，请换个词语试试看"}
-
{data&&data.username}
+{data&&data.username}
-
-
-
+
+ 通过关卡： {data&&data.complete_count}/{data&&data.challenges_count}
+ 当前完成关卡： {data&&data.complete_count}/{data&&data.challenges_count}
经验值： {data&&data.myself_experience}/{data&&data.total_experience}
- 课堂最高完成效率： {data&&data.max_efficiency===null?'--':data&&data.max_efficiency}
- 完成效率： {data&&data.efficiency===null?'--':data&&data.efficiency}
+ 完成效率： {data&&data.efficiency===null?'--':data&&data.efficiency}
+ 课堂最高完成效率： {data&&data.max_efficiency===null?'--':data&&data.max_efficiency}
通关时间： {data&&data.passed_time===null||data&&data.passed_time=== "--"?'--':moment(data&&data.passed_time).format('YYYY-MM-DD HH:mm')}
- 实战耗时： {data&&data.time_consuming===null?'--':data&&data.time_consuming}
+ {/*实战耗时： {data&&data.time_consuming===null?'--':data&&data.time_consuming}*/}
-
-
+
+
效率分(选中，则学生最终成绩包含效率分)
+ className={"font-13 color-grey-c ml15"}
+ style={{textAlign: "left"}}>(选中，则学生最终成绩包含效率分。效率分在作业截止或者补交结束后由系统自动生成)
@@ -2686,7 +2686,7 @@ class Trainingjobsetting extends Component {
-
+
@@ -1380,14 +1384,3 @@ class ShixunHomework extends Component{
}
}
export default ShixunHomework;
-// {/*
diff --git a/public/react/src/modules/courses/shixunHomework/shixunHomework.js b/public/react/src/modules/courses/shixunHomework/shixunHomework.js
index 4705e7a8f..d4a2d7b87 100644
--- a/public/react/src/modules/courses/shixunHomework/shixunHomework.js
+++ b/public/react/src/modules/courses/shixunHomework/shixunHomework.js
@@ -1,12 +1,10 @@
import React,{ Component } from "react";
-import { Input,Checkbox,Table, Pagination, Modal,Menu, Tooltip,Spin } from "antd";
-import { WordsBtn,on, off, trigger } from 'educoder';
-import {BrowserRouter as Router,Route,Switch,Link} from 'react-router-dom';
+import { Input,Checkbox, Pagination,Menu,Spin } from "antd";
+import { WordsBtn,on, trigger ,publicSearchs} from 'educoder';
+import {Link} from 'react-router-dom';
import axios from'axios';
import HomeworkModal from "../coursesPublic/HomeworkModal";
-import OneSelfOrderModal from "../coursesPublic/OneSelfOrderModal";
-import ShixunModal from "../coursesPublic/ShixunModal";
-import PathModal from "../coursesPublic/PathModal";
+
import NewShixunModel from '../coursesPublic/NewShixunModel';
import AddcoursesNav from "../coursesPublic/AddcoursesNav";
import Modals from '../../modals/Modals';
@@ -16,8 +14,6 @@ import '../css/busyWork.css'
import ShixunhomeWorkItem from "./ShixunhomeWorkItem";
import NoneData from "../coursesPublic/NoneData";
-const Search = Input.Search;
-
class ShixunHomework extends Component{
constructor(props){
super(props);
@@ -198,16 +194,20 @@ class ShixunHomework extends Component{
if(result.status===200){
this.setState({
datas:result.data,
- isSpin:false
+ isSpin:false,
+ page:page
})
}
}else{
this.setState({
- isSpin:false
+ isSpin:false,
})
}
}).catch((error)=>{
console.log(error);
+ this.setState({
+ isSpin:false
+ })
})
}
@@ -644,19 +644,21 @@ class ShixunHomework extends Component{
}
SearchCoursenames=(e)=>{
-
this.setState({
- Coursename:e.target.value
+ Coursename:e.target.value,
})
-
}
+
+
SearchCoursename=(value)=>{
+
let {page,order}=this.state;
this.setState({
- Coursename:value
+ Coursename:value,
+ isSpin:true,
})
- this.homeworkupdatalist(value,page,order);
+ this.homeworkupdatalist(value,1,order);
}
@@ -1030,7 +1032,6 @@ class ShixunHomework extends Component{
}=this.state;
let main_id=this.props.match.params.main_id;
- let category_id=this.props.match.params.category_id;
return(
- this.SearchCoursename(value)}
- >
+ {publicSearchs("请输入名称进行搜索",value => this.SearchCoursename(value),this.SearchCoursenames,(e)=>this.SearchCoursenames(e))}
+ {/* this.SearchCoursename(value)}*/}
+ {/* onChange={(e)=>this.allowClearonChange(e)}*/}
+ {/* allowClear={true}*/}
+ {/*>*/}
*/}
-// {/*
*/}
\ No newline at end of file
diff --git a/public/react/src/modules/courses/shixunHomework/shixunreport/ConclusionEvaluation.js b/public/react/src/modules/courses/shixunHomework/shixunreport/ConclusionEvaluation.js
index 8d678f335..aa2da8594 100644
--- a/public/react/src/modules/courses/shixunHomework/shixunreport/ConclusionEvaluation.js
+++ b/public/react/src/modules/courses/shixunHomework/shixunreport/ConclusionEvaluation.js
@@ -66,7 +66,7 @@ class ConclusionEvaluation extends Component {
),
},{
- title: '最终成绩',
+ title: '当前成绩',
dataIndex: 'grade',
key: 'grade',
render: (text, record) => (
@@ -81,7 +81,7 @@ class ConclusionEvaluation extends Component {
),
}, {
- title: '实战耗时',
+ title: '实战总耗时',
key: 'elapsed',
dataIndex: 'elapsed',
diff --git a/public/react/src/modules/developer/components/knowledge/index.js b/public/react/src/modules/developer/components/knowledge/index.js
new file mode 100644
index 000000000..b287a42c9
--- /dev/null
+++ b/public/react/src/modules/developer/components/knowledge/index.js
@@ -0,0 +1,127 @@
+/*
+ * @Description: 知识点
+ * @Author: tangjiang
+ * @Github:
+ * @Date: 2019-12-30 13:51:19
+ * @LastEditors : tangjiang
+ * @LastEditTime : 2020-01-03 09:32:24
+ */
+import './index.scss';
+import React, { useState, useEffect } from 'react';
+import { Select, notification } from 'antd';
+
+const { Option } = Select;
+
+function KnowLedge (props) {
+
+ const {
+ options = [], // 下拉选项
+ values = [], // 已选择的下拉项
+ onChange // 获取选择的值
+ } = props;
+
+ useEffect(() => {
+ const _options = [];
+ const _selects = [];
+ options.forEach(opt => {
+ if (!values.includes(opt.id)) {
+ _options.push(opt);
+ } else {
+ _selects.push(opt);
+ }
+ });
+ setSelectOptions(_options || []);
+ setSelectValue(_selects || []);
+ }, [props]);
+
+ // 显示的下拉项
+ const [selectOptions, setSelectOptions] = useState(options);
+ // 已选择的下拉项
+ const [selectValue, setSelectValue] = useState([]);
+ //
+ const [value] = useState([]);
+
+ // 渲染下拉选项
+ const renderOptions = (options = []) => {
+ return options.map((opt, i) => (
+
+ ));
+ }
+ // 过滤下拉列表项
+ const handleSelectChange = (value) => {
+ value = +value.join('');
+ const tempArr = [...selectValue];
+ const _result = selectOptions.filter(item => {
+ if (item.id === value && tempArr.findIndex(t => t.id === value) === -1) {
+ tempArr.push(item);
+ }
+ return item.id !== value;
+ });
+ if (tempArr.length > 50) {
+ notification.warning({
+ message: '提示',
+ description: '知识点不能超过50个'
+ });
+ return;
+ }
+ setSelectValue(tempArr);
+ setSelectOptions(_result);
+ // 将选择值返回
+ onChange && onChange(tempArr);
+ }
+
+ // 删除
+ const handleRemoveResult = (item) => {
+ // console.log('点击了删除按钮===>>>>', item);
+ // 将删除的值重新加入到列表中
+ const tempOptions = [...selectOptions];
+ const tempValue = selectValue.filter(t => t.id !== item.id);
+ // console.log(selectValue);
+ tempOptions.push(item);
+ setSelectOptions(tempOptions);
+ setSelectValue(tempValue);
+ // 将选择值返回
+ onChange && onChange(tempValue);
+ }
+
+ // 渲染下拉结果
+ const renderResult = (arrs) => {
+ return arrs.map((item) => (
+
+ {item.name}
+ handleRemoveResult(item)}
+ className="iconfont icon-roundclose knowledge-close"
+ >
+
+ ));
+ }
+ // 渲染下拉列表
+ const renderSelect = (options = []) => {
+ // console.log('+++++', options);
+ // setSelectValue(_selects);
+ return (
+
+ )
+ }
+
+ return (
+ */}
-// {/*
*/}
-// {/*
*/}
-// {/**/}
-// {/*暂时还没有相关数据哦！
+ { renderSelect(selectOptions) }
+ {/* 渲染下拉选择项 */}
+
+ );
+}
+
+export default KnowLedge;
diff --git a/public/react/src/modules/developer/components/knowledge/index.scss b/public/react/src/modules/developer/components/knowledge/index.scss
new file mode 100644
index 000000000..5bd0f5f61
--- /dev/null
+++ b/public/react/src/modules/developer/components/knowledge/index.scss
@@ -0,0 +1,42 @@
+.knowledge-select-area{
+ .ant-select-selection__rendered{
+ margin-bottom: 0 !important;
+ }
+ .ant-select-search--inline{
+ margin-left: 5px;
+ margin-top: 2px;
+ }
+
+ .knowledge-result{
+ display: flex;
+ flex-direction: row;
+ flex-wrap: wrap;
+ // margin-top: 15px;
+
+ .knowledge-item{
+ position: relative;
+ border: 1px solid #DDDDDD;
+ border-radius: 3px;
+ padding: 10px;
+ background: #fff;
+ margin-right: 10px;
+ margin-top: 10px;
+ // margin-bottom: 10px;
+
+ .knowledge-close{
+ display: none;
+ position: absolute;
+ right: -10px;
+ top: -10px;
+ background-color: rgba(250,250,250,1);
+ cursor: pointer;
+ }
+
+ &:hover{
+ .knowledge-close{
+ display: block;
+ }
+ }
+ }
+ }
+}
diff --git a/public/react/src/modules/developer/components/myMonacoEditor/index.js b/public/react/src/modules/developer/components/myMonacoEditor/index.js
index b37770328..930561e37 100644
--- a/public/react/src/modules/developer/components/myMonacoEditor/index.js
+++ b/public/react/src/modules/developer/components/myMonacoEditor/index.js
@@ -4,7 +4,7 @@
* @Github:
* @Date: 2019-11-27 15:02:52
* @LastEditors : tangjiang
- * @LastEditTime : 2019-12-27 20:49:46
+ * @LastEditTime : 2020-01-02 13:59:38
*/
import './index.scss';
import React, { useState, useRef, useEffect } from 'react';
diff --git a/public/react/src/modules/developer/newOrEditTask/index.js b/public/react/src/modules/developer/newOrEditTask/index.js
index 83200beac..eb894d1d0 100644
--- a/public/react/src/modules/developer/newOrEditTask/index.js
+++ b/public/react/src/modules/developer/newOrEditTask/index.js
@@ -35,6 +35,7 @@ const NewOrEditTask = (props) => {
getUserInfoForNew,
handleCancelPublish,
validateOjForm,
+ getQuestion
// updateTestAndValidate,
} = props;
@@ -53,6 +54,10 @@ const NewOrEditTask = (props) => {
useEffect(() => {
// 获取用户信息
getUserInfoForNew();
+ // 获取课程列表
+ getQuestion({
+ source: 'question'
+ });
// console.log('获取路由参数： ====', props.match.params);
const id = props.match.params.id;
// 保存OJForm的id号，指明是编辑还是新增
@@ -273,7 +278,8 @@ const mapDispatchToProps = (dispatch) => ({
startProgramQuestion: (id, props) => dispatch(actions.startProgramQuestion(id, props)),
// 新建时获取信息
getUserInfoForNew: () => dispatch(actions.getUserInfoForNew()),
- validateOjForm: (props, type, cb) => dispatch(actions.validateOjForm(props, type, cb))
+ validateOjForm: (props, type, cb) => dispatch(actions.validateOjForm(props, type, cb)),
+ getQuestion: (params) => dispatch(actions.getQuestion(params))
});
export default withRouter(connect(
diff --git a/public/react/src/modules/developer/newOrEditTask/leftpane/editorTab/index.js b/public/react/src/modules/developer/newOrEditTask/leftpane/editorTab/index.js
index d4fc12b9c..250437bcd 100644
--- a/public/react/src/modules/developer/newOrEditTask/leftpane/editorTab/index.js
+++ b/public/react/src/modules/developer/newOrEditTask/leftpane/editorTab/index.js
@@ -4,12 +4,12 @@
* @Github:
* @Date: 2019-11-20 10:35:40
* @LastEditors : tangjiang
- * @LastEditTime : 2019-12-27 14:30:55
+ * @LastEditTime : 2020-01-03 11:28:26
*/
import './index.scss';
// import 'katex/dist/katex.css';
import React from 'react';
-import { Form, Input, Select, InputNumber, Button } from 'antd';
+import { Form, Input, Select, InputNumber, Button, Cascader, notification } from 'antd';
import { connect } from 'react-redux';
import AddTestDemo from './AddTestDemo';
// import QuillEditor from '../../../quillEditor';
@@ -18,6 +18,7 @@ import CONST from '../../../../../constants';
import { toStore } from 'educoder'; // 保存和读取store值
// import Wrapper from '../../../../../common/reactQuill';
import QuillForEditor from '../../../../../common/quillForEditor';
+import KnowLedge from '../../../components/knowledge';
const scrollIntoView = require('scroll-into-view');
const {jcLabel} = CONST;
const FormItem = Form.Item;
@@ -59,7 +60,9 @@ class EditTab extends React.Component {
scrollHeight: 0, // 滚动元素的高度
top: 500,
bottom: 20,
- offsetTop: 0
+ offsetTop: 0,
+ // knowledges: [],
+ // coursers: [] // 选中的课程
}
}
@@ -77,9 +80,17 @@ class EditTab extends React.Component {
}, () => {
this.state.scrollEl.addEventListener('scroll', this.handleScroll, false);
});
+ // 获取题库
+ // this.props.getQuestion({
+ // source: 'question'
+ // });
}
- componentWillUnmount () {
+ // componentDidUpdate (nextProp) {
+ // console.log(nextProp);
+ // }
+
+ componentWillUnmount (nextPro) {
this.state.scrollEl.removeEventListener('scroll', this.handleScroll, false);
}
@@ -125,9 +136,26 @@ class EditTab extends React.Component {
handleTimeLimitChange = (value) => {
this.props.validateOjTimeLimit(value);
}
- // 改变分类
- handleChangeCategory = (value) => {
- this.props.validateOjCategory(value);
+ // 改变方向
+ handleChangeSubDisciplineId = (value) => {
+ // 课程下拉值变化时， 同步更新知识点
+ const { courseQuestions, saveKnowledge } = this.props;
+ saveKnowledge([]);
+ // 获取当前分类下的知识点
+ courseQuestions.forEach(item => {
+ if (value[0] && item.id === value[0]) {
+ item.sub_disciplines && item.sub_disciplines.forEach(c => {
+ if (value[1] && c.id === value[1]) {
+ saveKnowledge(c.tag_disciplines)
+ console.log(c.tag_disciplines);
+ } else if (!value[1]) {
+ saveKnowledge([]);
+ }
+ });
+ }
+ });
+ // this.props.validateOjCategory(value[1] || '');
+ this.props.validateOjSubDisciplineId(value[1] || '');
}
// 改变公开程序
handleChangeOpenOrNot = (value) => {
@@ -146,13 +174,18 @@ class EditTab extends React.Component {
addTestCase, // 添加测试用例
deleteTestCase, // 删除测试用例
testCasesValidate,
- openTestCodeIndex = []
+ openTestCodeIndex = [],
+ courseQuestions,
+ tag_discipline_id,
+ knowledges
} = this.props;
+ console.log('knowledge======>>>>>>', knowledges);
+ // const {knowledges} = this.state;
// 表单label
- const myLabel = (name, subTitle) => {
+ const myLabel = (name, subTitle, nostar) => {
if (subTitle) {
return (
-
+
{name}
({subTitle})
@@ -161,7 +194,7 @@ class EditTab extends React.Component {
)
} else {
return (
- {name}
+ {name}
)
}
};
@@ -197,7 +230,14 @@ class EditTab extends React.Component {
};
// 添加测试用例
const handleAddTest = () => {
- const {position} = this.props;
+ const {position, testCases = []} = this.props;
+ if (testCases.length >= 50) {
+ notification.warning({
+ message: '提示',
+ description: '测试用例不能超过50个'
+ });
+ return;
+ }
const obj = { // 测试用例参数
input: '',
output: '',
@@ -235,15 +275,75 @@ class EditTab extends React.Component {
}
// 编辑器配置信息
const quillConfig = [
- [{ header: [1, 2, 3, 4, 5, 6, false] }],
- ['bold', 'italic', 'underline', 'strike'], // 切换按钮
- ['blockquote', 'code-block'], // 代码块
- [{align: []}, { 'list': 'ordered' }, { 'list': 'bullet' }], // 列表
- [{ 'script': 'sub'}, { 'script': 'super' }],
- [{ 'color': [] }, { 'background': [] }], // 字体颜色与背景色
- ['image', 'formula'], // 数学公式、图片、视频
- ['clean'], // 清除格式
+ { header: 1}, {header: 2},
+ // {size: ['12px', '14px', '16px', '18px', '20px', false]},
+ 'bold', 'italic', 'underline', 'strike', // 切换按钮
+ 'blockquote', 'code-block', // 代码块
+ {align: []}, { 'list': 'ordered' }, { 'list': 'bullet' }, // 列表
+ { 'script': 'sub'}, { 'script': 'super' },
+ { 'color': [] }, { 'background': [] }, // 字体颜色与背景色
+ // {font: []},
+ 'image', 'formula', // 数学公式、图片、视频
+ 'clean', // 清除格式
];
+
+ const renderCourseQuestion = (arrs) => {
+ const tempArr = [];
+ const sub_id = this.props.ojForm.sub_discipline_id;
+ function loop (arrs, tempArr) {
+ arrs.forEach(item => {
+ const obj = {};
+ obj.value = item.id;
+ obj.label = item.name;
+ // 当item下还有子元素时，递归调用
+ if (item.sub_disciplines) {
+ arrs = item.sub_disciplines;
+ obj.children = [];
+ loop(arrs, obj.children);
+ }
+ tempArr.push(obj);
+ });
+ }
+ loop(arrs, tempArr);
+
+ // 获取选中的下拉值
+ let choid_ids = [];
+ // let tempKnowledges = [];
+ tempArr.forEach(t => {
+ // debugger;
+ if (sub_id && t.children) {
+ t.children.forEach(c => {
+ if (c.value === sub_id) {
+ choid_ids = [t.value, c.value];
+ // tempKnowledges = c.children || [];
+ }
+ });
+ }
+ });
+
+ console.log(choid_ids);
+ return (
+
+ { renderResult(selectValue) }
+
+
@@ -262,16 +362,34 @@ class EditTab extends React.Component {
{myLabel(jcLabel['category'], '合理的分类有利于快速检索')}}
- validateStatus={ojFormValidate.category.validateStatus}
- help={ojFormValidate.category.errMsg}
+ label={{myLabel(jcLabel['sub_discipline_id'], '合理的课程分类有利于快速检索')}}
+ validateStatus={ojFormValidate.sub_discipline_id.validateStatus}
+ help={ojFormValidate.sub_discipline_id.errMsg}
colon={ false }
>
- */}
+ {/*
+ {myLabel(jcLabel['knowledge'], '', 'nostar')}}
+ >
+
+
{myLabel(jcLabel['timeLimit'], '程序允许时间限制时长，单位：秒')}}
@@ -317,16 +435,13 @@ class EditTab extends React.Component {
help={ojFormValidate.description.errMsg}
colon={ false }
>
-
{/* {
testCases,
openTestCodeIndex,
testCasesValidate,
- ojFormValidate} = ojFormReducer;
+ ojFormValidate,
+ courseQuestions,
+ tag_discipline_id,
+ knowledges
+ } = ojFormReducer;
return {
ojForm,
testCases,
testCasesValidate,
ojFormValidate,
position,
- openTestCodeIndex
+ openTestCodeIndex,
+ courseQuestions,
+ tag_discipline_id,
+ knowledges
};
};
@@ -386,10 +508,15 @@ const mapDispatchToProps = (dispatch) => ({
validateOjTimeLimit: (value) => dispatch(actions.validateOjTimeLimit(value)),
validateOjCategory: (value) => dispatch(actions.validateOjCategory(value)),
validateOpenOrNot: (value) => dispatch(actions.validateOpenOrNot(value)),
+ validateOjSubDisciplineId: (value) => dispatch(actions.validateOjSubDisciplineId(value)),
+ saveTagDisciplineId: (value) => dispatch(actions.saveTagDisciplineId(value)),
// 新增测试用例
addTestCase: (value) => dispatch(actions.addTestCase(value)),
// 删除测试用例
deleteTestCase: (value) => dispatch(actions.deleteTestCase(value)),
+ saveKnowledge: (value) => dispatch(actions.saveKnowledge(value))
+ // 获取题库
+ // getQuestion: (params) => dispatch(actions.getQuestion(params))
});
export default connect(
diff --git a/public/react/src/modules/developer/newOrEditTask/leftpane/editorTab/index.scss b/public/react/src/modules/developer/newOrEditTask/leftpane/editorTab/index.scss
index 723678bb3..ff5df7090 100644
--- a/public/react/src/modules/developer/newOrEditTask/leftpane/editorTab/index.scss
+++ b/public/react/src/modules/developer/newOrEditTask/leftpane/editorTab/index.scss
@@ -18,6 +18,12 @@
line-height: 1;
content: '*';
}
+
+ &.nostar{
+ &::before {
+ content: ''
+ }
+ }
}
.input_area{
display: inline-block;
diff --git a/public/react/src/modules/developer/recordDetail/index.js b/public/react/src/modules/developer/recordDetail/index.js
index fd93b3f2a..6675f066d 100644
--- a/public/react/src/modules/developer/recordDetail/index.js
+++ b/public/react/src/modules/developer/recordDetail/index.js
@@ -4,7 +4,7 @@
* @Github:
* @Date: 2019-12-04 08:36:21
* @LastEditors : tangjiang
- * @LastEditTime : 2019-12-27 21:18:39
+ * @LastEditTime : 2020-01-02 13:48:02
*/
import './index.scss';
import React, { useState, useEffect } from 'react';
@@ -57,7 +57,9 @@ function RecordDetail (props) {
const handleReturn = (identifier) => {
if (identifier) {
saveEditorCodeForDetail('');
- props.history.push(`/myproblems/${identifier}`);
+ setTimeout(() => {
+ props.history.push(`/myproblems/${identifier}`);
+ }, 300);
}
}
diff --git a/public/react/src/modules/developer/split_pane_resizer.scss b/public/react/src/modules/developer/split_pane_resizer.scss
index 8fc8b525f..8d4ad171c 100644
--- a/public/react/src/modules/developer/split_pane_resizer.scss
+++ b/public/react/src/modules/developer/split_pane_resizer.scss
@@ -23,6 +23,8 @@
}
.header_title{
+ font-size: 16px;
+ font-weight: bold;
text-align: center;
}
@@ -82,6 +84,8 @@
bottom: 0;
top: 0;
text-align: center;
+ font-size: 16px;
+ font-weight: bold;
}
}
}
@@ -158,6 +162,22 @@
-moz-background-clip: padding;
-webkit-background-clip: padding;
background-clip: padding-box;
+
+ // &::before{
+ // position: absolute;
+ // width: 24px;
+ // height: 24px;
+ // border-radius: 50%;
+ // margin-top: -12px;
+ // top: 50%;
+ // right: -12px;
+ // font-family: 'iconfont';
+ // background: gold;
+ // content: '\e711';
+ // font-size: 18px;
+ // text-align: center;
+ // line-height: 24px;
+ // }
}
.Resizer:hover {
@@ -196,4 +216,4 @@
}
.Resizer.disabled:hover {
border-color: transparent;
-}
\ No newline at end of file
+}
diff --git a/public/react/src/modules/developer/studentStudy/leftpane/index.js b/public/react/src/modules/developer/studentStudy/leftpane/index.js
index ac8d89321..88c5ee9a0 100644
--- a/public/react/src/modules/developer/studentStudy/leftpane/index.js
+++ b/public/react/src/modules/developer/studentStudy/leftpane/index.js
@@ -4,7 +4,7 @@
* @Github:
* @Date: 2019-11-23 11:33:41
* @LastEditors : tangjiang
- * @LastEditTime : 2019-12-27 16:03:04
+ * @LastEditTime : 2020-01-02 13:51:22
// */
import './index.scss';
import React, { useState, useEffect, useMemo } from 'react';
@@ -50,8 +50,6 @@ const LeftPane = (props) => {
record: (
-
-
+
{`
/* 评测结果 */
.codeEvaluateDrawer{
- // position: absolute;
- // bottom: 84px;
+ position: absolute;
+ bottom: 84px;
+ transition: all .3s;
+ // bottom: px;
+ }
+
+ .codeEvaluateDrawer.active{
+ bottom: 50px;
+ }
+
+ .code_evaluate_stretch{
+ top: 0px;
}
+
.codeEvaluateDrawer #game_test_set_results {
height: 198px;
}
@@ -242,6 +257,14 @@ class VNCContainer extends Component {
background: rgb(5, 16, 26) !important;
}
+ .code_evaluate_stretch .ant-drawer-content-wrapper{
+ height: 100% !important;
+ }
+
+ .code_evaluate_stretch #game_test_set_results {
+ height: calc(100vh - 136px) !important;
+ }
+
.codeEvaluateFloatButton {
bottom: 180px !important;
left: unset;
@@ -348,12 +371,12 @@ class VNCContainer extends Component {
width={firstDrawerWidth}
closable={false}
onClose={this.onBottomDrawerClose}
- visible={this.state.bottomDrawer===undefined?false:this.state.bottomDrawer}
- className={'codeEvaluateDrawer'}
+ visible={isCollapse}
+ className={_drawClasses}
placement="bottom"
getContainer={false}
// style={{ position: 'absolute', bottom: '-25px', zIndex: 1 }}
- style={{ position: 'absolute', bottom: '50px', zIndex: 1 }}
+ // style={{ position: 'absolute', bottom: '50px', top: 0, zIndex: 1 }}
afterVisibleChange={(visible) => {
if (visible) {
const canvas = $('.vncDisply canvas')[0]
@@ -364,9 +387,9 @@ class VNCContainer extends Component {
>
{ this.props.codeEvaluate }
- 测试集
+ >测试集 */}
{/*
{
+ const { showOrHide, isCollapse } = state.tpiReducer;
+ return {
+ showOrHide,
+ isCollapse
+ }
+};
+
+export default connect(
+ mapStateToProps
+)(VNCContainer);
diff --git a/public/react/src/modules/page/main/CodeEvaluateView.js b/public/react/src/modules/page/main/CodeEvaluateView.js
index 760ccd1ad..e70d02008 100644
--- a/public/react/src/modules/page/main/CodeEvaluateView.js
+++ b/public/react/src/modules/page/main/CodeEvaluateView.js
@@ -4,10 +4,11 @@ import React, { Component } from 'react';
import IconButton from 'material-ui/IconButton';
import Tooltip from 'material-ui/Tooltip';
import Button from 'material-ui/Button';
-
+import { connect } from 'react-redux';
import './CodeEvaluateView.css'
import { CircularProgress } from 'material-ui/Progress';
import { on, off } from 'educoder'
+import actions from '../../../redux/actions';
const testSetsExpandedArrayInitVal = [false, false, false, false, false,
false, false, false, false, false,
false, false, false, false, false,
@@ -274,9 +275,24 @@ class CodeEvaluateView extends Component {
})
}
+ onHandleTestCase () {
+ // console.log(this);
+ const {showOrHide, showOrHideTpiTestCase} = this.props;
+ showOrHideTpiTestCase(!showOrHide);
+ }
+
+ handleShowTestCase () {
+ // console.log('111111111');
+ const {isCollapse, isCollpaseTsetCase, showOrHideTpiTestCase} = this.props;
+ isCollpaseTsetCase(!isCollapse);
+ if (isCollapse) {
+ showOrHideTpiTestCase(false);
+ }
+ }
+
render() {
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, showOrHide, isCollapse } = this.props;
if (!output_sets) {
return (
@@ -300,6 +316,8 @@ class CodeEvaluateView extends Component {
onclick="check_tab('blacktab_con','blacktab_hover',this);"
*/
+
+ const _arrowClasses = isCollapse ? 'iconfont icon-xiajiantou btn-arrow' : 'iconfont icon-shangjiantou btn-arrow';
return (