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

调整

Browse Source
dev_static
杨树明 5 years ago
parent 98b1053056
commit bd6bf45129
9 changed files with 101 additions and 103 deletions
Show Stats Download Patch File Download Diff File

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

@ -1,4 +1,8 @@
import React from "react";
import md5 from 'md5'; import md5 from 'md5';
import {Input} from "antd";
const { Search } = Input;
const $ = window.$; const $ = window.$;
const isDev = window.location.port == 3007; const isDev = window.location.port == 3007;
export const TEST_HOST = "https://test-newweb.educoder.net" export const TEST_HOST = "https://test-newweb.educoder.net"
@ -144,3 +148,15 @@ export function htmlEncode(str) {
s = s.replace(/\"/g, """); s = s.replace(/\"/g, """);
return s; return s;
} }
export function publicSearchs(Placeholder,onSearch,onInputs,onChanges,loadings) {
return(<Search
placeholder= { Placeholder || "请输入内容进行搜索" }
onSearch={onSearch}
// value={searchValue}
onInput={onInputs}
onChange={onChanges}
loading={loadings||false}
allowClear={true}
></Search>)
}

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

@ -2,7 +2,7 @@
// 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, getRandomcode as getRandomcode,getUrlmys as getUrlmys, getUrl2 as getUrl2, setImagesUrl as setImagesUrl export { getImageUrl as getImageUrl, getUrl as getUrl, publicSearchs as publicSearchs,getRandomcode as getRandomcode,getUrlmys as getUrlmys, getUrl2 as getUrl2, setImagesUrl as setImagesUrl
, getUploadActionUrl as getUploadActionUrl,getUploadActionUrltwo as getUploadActionUrltwo ,getUploadActionUrlthree as getUploadActionUrlthree, getUploadActionUrlOfAuth as getUploadActionUrlOfAuth , getUploadActionUrl as getUploadActionUrl,getUploadActionUrltwo as getUploadActionUrltwo ,getUploadActionUrlthree as getUploadActionUrlthree, getUploadActionUrlOfAuth as getUploadActionUrlOfAuth
, getTaskUrlById as getTaskUrlById, TEST_HOST ,htmlEncode as htmlEncode } from './UrlTool'; , getTaskUrlById as getTaskUrlById, TEST_HOST ,htmlEncode as htmlEncode } from './UrlTool';
export { default as queryString } from './UrlTool2'; export { default as queryString } from './UrlTool2';

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

@ -1,28 +1,22 @@
import React,{ Component } from "react"; import React,{ Component } from "react";
import { Input,Checkbox,Menu,Pagination,Spin} from "antd"; import { Input,Checkbox,Menu,Pagination,Spin} from "antd";
import CourseLayoutcomponent from '../common/CourseLayoutComponent';
import UseBank from './UseBank' import UseBank from './UseBank'
import '../css/members.css' import '../css/members.css'
import '../css/busyWork.css' import '../css/busyWork.css'
import CoursesListType from '../coursesPublic/CoursesListType'
import CommonWorkItem from './CommonWorkItem' import CommonWorkItem from './CommonWorkItem'
import PublishRightnow from './PublishRightnow' import PublishRightnow from './PublishRightnow'
import ConnectProject from './ConnectProject' import ConnectProject from './ConnectProject'
import { WordsBtn, on, off } from 'educoder' import { WordsBtn, on, off } from 'educoder'
import Modals from '../../modals/Modals' import Modals from '../../modals/Modals'
import NoneData from "../coursesPublic/NoneData" import NoneData from "../coursesPublic/NoneData"
import Titlesearchsection from '../common/titleSearch/TitleSearchSection'; import Titlesearchsection from '../common/titleSearch/TitleSearchSection';
import { RouteHOC } from './common' import { RouteHOC } from './common'
import axios from 'axios'; import axios from 'axios';
import _ from 'lodash' import _ from 'lodash'
const Search = Input.Search; // const Search = Input.Search;
const map={1:"普通作业",2:"",3:"分组作业"} // const map={1:"普通作业",2:"",3:"分组作业"}
const COMMON_WORK = 1 // const COMMON_WORK = 1
// const COMMON_WORK = 2 // const COMMON_WORK = 2
class commonWork extends Component{ class commonWork extends Component{
constructor(props){ constructor(props){
@ -47,13 +41,12 @@ class commonWork extends Component{
inputStudent=(e)=>{ inputStudent=(e)=>{
this.setState({ this.setState({
search:e.target.value, search:e.target.value,
page:1
}) })
} }
//搜索查询 //搜索查询
searchStudent=()=>{ searchStudent=()=>{
let {page,search,order}=this.state; let {page,search,order}=this.state;
this.getList(page,search,order); this.getList(1,search,order);
} }
openConnectionProject = (work) => { openConnectionProject = (work) => {
this.refs['connectProject'].openConnectionProject(work) this.refs['connectProject'].openConnectionProject(work)
@ -134,11 +127,14 @@ class commonWork extends Component{
mainList:result.data, mainList:result.data,
totalCount:result.data.task_count, totalCount:result.data.task_count,
isSpin:false, isSpin:false,
page:page,
...result.data ...result.data
}) })
} }
}).catch((error)=>{ }).catch((error)=>{
console.log(error); this.setState({
isSpin:false
})
}) })
} }
//筛选条件 //筛选条件
@ -325,7 +321,7 @@ class commonWork extends Component{
console.log(error) console.log(error)
}) })
} }
render(){ render(){
let { let {
@ -396,7 +392,7 @@ class commonWork extends Component{
// searchtype={this.props.isAdmin||this.props.isStudent ?true:false} // searchtype={this.props.isAdmin||this.props.isStudent ?true:false}
onInputSearchChange={this.inputStudent} onInputSearchChange={this.inputStudent}
onPressEnter={this.searchStudent} onPressEnter={this.searchStudent}
allowClearonChange={this.inputStudent}
firstRowRight={ firstRowRight={
<React.Fragment> <React.Fragment>
{ isAdmin && <WordsBtn style="blue" className="fr" onClick={()=>this.createCommonWork(1)}>新建</WordsBtn>} { isAdmin && <WordsBtn style="blue" className="fr" onClick={()=>this.createCommonWork(1)}>新建</WordsBtn>}

22
public/react/src/modules/courses/common/titleSearch/TitleSearchSection.js
Unescape View File

@ -1,8 +1,5 @@
import React,{ Component } from "react"; import React,{ Component } from "react";
import { Input } from "antd"; import {publicSearchs} from 'educoder';
const Search = Input.Search;
class Titlesearchsection extends Component{ class Titlesearchsection extends Component{
constructor(props){ constructor(props){
super(props); super(props);
@ -14,7 +11,7 @@ class Titlesearchsection extends Component{
render(){ render(){
let { addGroup } = this.state; let { addGroup } = this.state;
const { firstRowRight, secondRowLeft,firstRowMid, secondRowBotton,thirdRow, title, onInputSearchChange const { firstRowRight, secondRowLeft,firstRowMid, secondRowBotton,thirdRow, title, onInputSearchChange
, searchValue, onPressEnter, searchPlaceholder, showSearchInput } = this.props; , searchValue, onPressEnter, searchPlaceholder, allowClearonChange } = this.props;
return( return(
<React.Fragment> <React.Fragment>
<style>{` <style>{`
@ -79,12 +76,15 @@ class Titlesearchsection extends Component{
{/* (searchValue || showSearchInput) && */} {/* (searchValue || showSearchInput) && */}
{ <div className="fr mt16 mb16 searchView" > { <div className="fr mt16 mb16 searchView" >
<Search {publicSearchs(searchPlaceholder || "请输入姓名进行搜索",onPressEnter,onInputSearchChange,allowClearonChange)}
onSearch={onPressEnter} {/*<Search */}
value={searchValue} {/* onSearch={onPressEnter}*/}
placeholder= { searchPlaceholder || "请输入姓名进行搜索" } {/* // value={searchValue}*/}
onInput={onInputSearchChange} {/* placeholder= { searchPlaceholder || "请输入姓名进行搜索" }*/}
></Search> {/* onInput={onInputSearchChange}*/}
{/* onChange={allowClearonChange}*/}
{/* allowClear={true}*/}
{/*></Search>*/}
</div> } </div> }
{secondRowBotton} {secondRowBotton}

29
public/react/src/modules/courses/exercise/Exercise.js
Unescape View File

@ -1,11 +1,10 @@
import React,{ Component } from "react"; import React,{ Component } from "react";
import { Input,Checkbox,Table, Pagination, Modal,Menu, Tooltip,Spin } from "antd"; import {Checkbox, Pagination,Menu,Spin } from "antd";
import CourseLayoutcomponent from '../common/CourseLayoutComponent';
import ExerciseListItem from './ExerciseListItem' import ExerciseListItem from './ExerciseListItem'
import axios from 'axios'; import axios from 'axios';
import Modals from '../../modals/Modals'; import Modals from '../../modals/Modals';
import '../css/members.css' import '../css/members.css'
import { WordsBtn,on, off, trigger } from 'educoder' import { WordsBtn,on, publicSearchs } from 'educoder'
import '../css/busyWork.css' import '../css/busyWork.css'
import _ from 'lodash'; import _ from 'lodash';
import moment from 'moment' import moment from 'moment'
@ -14,8 +13,6 @@ import ImmediatelyPublish from "../poll/pollPublicBtn/ImmediatelyPublish";
import ImmediatelyEnd from "../poll/pollPublicBtn/ImmediatelyEnd"; import ImmediatelyEnd from "../poll/pollPublicBtn/ImmediatelyEnd";
import NoneData from "../coursesPublic/NoneData"; import NoneData from "../coursesPublic/NoneData";
import HomeworkModal from "../coursesPublic/HomeworkModal"; import HomeworkModal from "../coursesPublic/HomeworkModal";
const Search = Input.Search;
class Exercise extends Component{ class Exercise extends Component{
constructor(props){ constructor(props){
@ -93,17 +90,20 @@ class Exercise extends Component{
exercises:result.data.exercises, exercises:result.data.exercises,
checkAllValue:false, checkAllValue:false,
checkBoxValues:[], checkBoxValues:[],
isSpin:false isSpin:false,
page:page
}) })
}).catch((error)=>{ }).catch((error)=>{
console.log(error); this.setState({
isSpin:false,
})
}) })
} }
inputStudent=(e)=>{ inputStudent=(e)=>{
this.setState({ this.setState({
StudentList_value:e.target.value StudentList_value:e.target.value,
}) })
} }
// 搜索 // 搜索
@ -505,12 +505,13 @@ class Exercise extends Component{
<span>未发布：{exercises_counts && exercises_counts.exercises_unpublish_counts}个</span> <span>未发布：{exercises_counts && exercises_counts.exercises_unpublish_counts}个</span>
</p> </p>
<div className="fr mt16 mb16 searchView"> <div className="fr mt16 mb16 searchView">
<Search {publicSearchs("请输入名称进行搜索",this.searchInfo,this.inputStudent,this.inputStudent)}
value={StudentList_value} {/*<Search*/}
placeholder="请输入名称进行搜索" {/* value={StudentList_value}*/}
onInput={this.inputStudent} {/* placeholder="请输入名称进行搜索"*/}
onSearch={this.searchInfo} {/* onInput={this.inputStudent}*/}
></Search> {/* onSearch={this.searchInfo}*/}
{/*></Search>*/}
</div> </div>
</div> </div>
<div className="task_menu_ul pl30 pr30"> <div className="task_menu_ul pl30 pr30">

14
public/react/src/modules/courses/graduation/tasks/index.js
Unescape View File

@ -1,7 +1,6 @@
import React,{ Component } from "react"; 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 {Link} from 'react-router-dom';
import CourseLayoutcomponent from '../../common/CourseLayoutComponent';
import Titlesearchsection from '../../common/titleSearch/TitleSearchSection'; import Titlesearchsection from '../../common/titleSearch/TitleSearchSection';
import HomeworkModal from "../../coursesPublic/HomeworkModal"; import HomeworkModal from "../../coursesPublic/HomeworkModal";
import { WordsBtn } from 'educoder'; import { WordsBtn } from 'educoder';
@ -10,7 +9,6 @@ import moment from 'moment';
import GraduateTaskItem from './GraduateTaskItem'; import GraduateTaskItem from './GraduateTaskItem';
import TaskPublishModal from "./TaskPublishModal"; import TaskPublishModal from "./TaskPublishModal";
import Modals from '../../../modals/Modals'; import Modals from '../../../modals/Modals';
import UseBank from "../../busyWork/UseBank";
import '../../css/members.css'; import '../../css/members.css';
import '../style.css'; import '../style.css';
import NoneData from "../../coursesPublic/NoneData"; import NoneData from "../../coursesPublic/NoneData";
@ -65,7 +63,9 @@ class GraduationTasks extends Component{
}) })
} }
}).catch(function (error) { }).catch(function (error) {
console.log(error); this.setState({
isSpin:false
})
}); });
} }
@ -286,7 +286,7 @@ class GraduationTasks extends Component{
onInputSearchChange = (e) => { onInputSearchChange = (e) => {
this.setState({ this.setState({
searchValue:e.target.value searchValue:e.target.value,
}) })
if (this.timeoutHandler) { if (this.timeoutHandler) {
@ -405,7 +405,8 @@ class GraduationTasks extends Component{
let {page,order}=this.state; let {page,order}=this.state;
this.setState({ this.setState({
search:value search:value,
isSpin:true
}) })
this.fetchAll(value,page,order); this.fetchAll(value,page,order);
@ -662,6 +663,7 @@ class GraduationTasks extends Component{
title="毕设任务" title="毕设任务"
searchValue={searchValue} searchValue={searchValue}
onInputSearchChange={this.onInputSearchChange} onInputSearchChange={this.onInputSearchChange}
allowClearonChange={this.onInputSearchChange}
firstRowRight={ firstRowRight={
<React.Fragment> <React.Fragment>
{/*{this.props.isAdmin() ?<WordsBtn style="blue" className="mr30" onClick={() => this.addDir()}>题库选用</WordsBtn>:""}*/} {/*{this.props.isAdmin() ?<WordsBtn style="blue" className="mr30" onClick={() => this.addDir()}>题库选用</WordsBtn>:""}*/}

13
public/react/src/modules/courses/graduation/topics/index.js
Unescape View File

@ -1,7 +1,6 @@
import React,{ Component } from "react"; import React,{ Component } from "react";
import {Checkbox, Menu, Pagination,Spin} from "antd"; import {Checkbox, Menu, Pagination,Spin} from "antd";
import CourseLayoutcomponent from '../../common/CourseLayoutComponent'
import Titlesearchsection from '../../common/titleSearch/TitleSearchSection' import Titlesearchsection from '../../common/titleSearch/TitleSearchSection'
import DownloadMessageysl from "../../../modals/DownloadMessageysl"; import DownloadMessageysl from "../../../modals/DownloadMessageysl";
@ -9,7 +8,6 @@ import { WordsBtn } from 'educoder'
import NoneData from '../../coursesPublic/NoneData' import NoneData from '../../coursesPublic/NoneData'
import Modals from "../../../modals/Modals" import Modals from "../../../modals/Modals"
import axios from 'axios' import axios from 'axios'
import UseBank from '../../busyWork/UseBank'
import _ from 'lodash' import _ from 'lodash'
@ -85,12 +83,15 @@ class Boards extends Component{
topicList:response.data.graduation_topic, topicList:response.data.graduation_topic,
totalCount:response.data.graduation_topic_count, totalCount:response.data.graduation_topic_count,
course_public:response.data.course_public, course_public:response.data.course_public,
isSpin:false isSpin:false,
page:page
}) })
} }
}) })
.catch(function (error) { .catch(function (error) {
console.log(error); this.setState({
isSpin:false
})
}); });
} }
componentDidMount = () => { componentDidMount = () => {
@ -117,10 +118,11 @@ class Boards extends Component{
onInputSearchChange = (e) => { onInputSearchChange = (e) => {
this.setState({ this.setState({
searchValue:e.target.value searchValue:e.target.value,
}) })
} }
// 全选or反选 // 全选or反选
onCheckAll = (e) => { onCheckAll = (e) => {
this.setState({ this.setState({
@ -408,6 +410,7 @@ onBoardsNew=()=>{
title="毕设选题" title="毕设选题"
searchValue={ searchValue } searchValue={ searchValue }
onInputSearchChange={this.onInputSearchChange} onInputSearchChange={this.onInputSearchChange}
allowClearonChange={this.onInputSearchChange}
firstRowRight= firstRowRight=
{ isAdmin ? { isAdmin ?
(<React.Fragment> (<React.Fragment>

24
public/react/src/modules/courses/poll/Poll.js
Unescape View File

@ -1,6 +1,6 @@
import React,{ Component } from "react"; import React,{ Component } from "react";
import { Input,Checkbox,Table, Pagination, Modal,Menu, Tooltip ,Spin} from "antd"; import {Checkbox, Pagination,Menu ,Spin} from "antd";
import {WordsBtn, on, off, trigger } from 'educoder'; import {WordsBtn, on, off, publicSearchs } from 'educoder';
import HomeworkModal from "../coursesPublic/HomeworkModal"; import HomeworkModal from "../coursesPublic/HomeworkModal";
import AddcoursesNav from "../coursesPublic/AddcoursesNav"; import AddcoursesNav from "../coursesPublic/AddcoursesNav";
import ImmediatelyPublish from './pollPublicBtn/ImmediatelyPublish'; import ImmediatelyPublish from './pollPublicBtn/ImmediatelyPublish';
@ -15,8 +15,6 @@ import Modals from '../../modals/Modals';
import axios from 'axios'; import axios from 'axios';
import moment from 'moment'; import moment from 'moment';
const Search = Input.Search;
class Poll extends Component{ class Poll extends Component{
constructor(props){ constructor(props){
@ -66,7 +64,7 @@ class Poll extends Component{
inputStudent=(e)=>{ inputStudent=(e)=>{
this.setState({ 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, course_types:result.data.course_types,
polls_counts:result.data.polls_counts, polls_counts:result.data.polls_counts,
isSpin:false, isSpin:false,
checkBoxValues: bank_checkValue ? bank_checkValue : [] checkBoxValues: bank_checkValue ? bank_checkValue : [],
page:page
}) })
} }
}).catch((error)=>{ }).catch((error)=>{
@ -524,12 +523,13 @@ class Poll extends Component{
<span>未发布：{polls_counts && polls_counts.polls_unpublish_counts}个</span> <span>未发布：{polls_counts && polls_counts.polls_unpublish_counts}个</span>
</p> </p>
<div className="fr mt16 mb16 searchView"> <div className="fr mt16 mb16 searchView">
<Search {publicSearchs("请输入名称进行搜索",this.searchInfo,this.inputStudent,this.inputStudent)}
value={StudentList_value} {/*<Search*/}
placeholder="请输入名称进行搜索" {/* value={StudentList_value}*/}
onInput={this.inputStudent} {/* placeholder="请输入名称进行搜索"*/}
onSearch={this.searchInfo} {/* onInput={this.inputStudent}*/}
></Search> {/* onSearch={this.searchInfo}*/}
{/*></Search>*/}
</div> </div>
</div> </div>
<div className="task_menu_ul pl30 pr30"> <div className="task_menu_ul pl30 pr30">

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

@ -1,6 +1,6 @@
import React,{ Component } from "react"; import React,{ Component } from "react";
import { Input,Checkbox, Pagination,Menu, AutoComplete,Spin,Icon } from "antd"; import { Input,Checkbox, Pagination,Menu,Spin } from "antd";
import { WordsBtn,on, trigger } from 'educoder'; import { WordsBtn,on, trigger ,publicSearchs} from 'educoder';
import {Link} from 'react-router-dom'; import {Link} from 'react-router-dom';
import axios from'axios'; import axios from'axios';
import HomeworkModal from "../coursesPublic/HomeworkModal"; import HomeworkModal from "../coursesPublic/HomeworkModal";
@ -14,8 +14,6 @@ import '../css/busyWork.css'
import ShixunhomeWorkItem from "./ShixunhomeWorkItem"; import ShixunhomeWorkItem from "./ShixunhomeWorkItem";
import NoneData from "../coursesPublic/NoneData"; import NoneData from "../coursesPublic/NoneData";
class ShixunHomework extends Component{ class ShixunHomework extends Component{
constructor(props){ constructor(props){
super(props); super(props);
@ -196,16 +194,20 @@ class ShixunHomework extends Component{
if(result.status===200){ if(result.status===200){
this.setState({ this.setState({
datas:result.data, datas:result.data,
isSpin:false isSpin:false,
page:page
}) })
} }
}else{ }else{
this.setState({ this.setState({
isSpin:false isSpin:false,
}) })
} }
}).catch((error)=>{ }).catch((error)=>{
console.log(error); console.log(error);
this.setState({
isSpin:false
})
}) })
} }
@ -642,19 +644,21 @@ class ShixunHomework extends Component{
} }
SearchCoursenames=(e)=>{ SearchCoursenames=(e)=>{
this.setState({ this.setState({
Coursename:e.target.value Coursename:e.target.value,
}) })
} }
SearchCoursename=(value)=>{ SearchCoursename=(value)=>{
let {page,order}=this.state; let {page,order}=this.state;
this.setState({ this.setState({
Coursename:value Coursename:value,
isSpin:true,
}) })
this.homeworkupdatalist(value,page,order); this.homeworkupdatalist(value,1,order);
} }
@ -1028,8 +1032,7 @@ class ShixunHomework extends Component{
}=this.state; }=this.state;
let main_id=this.props.match.params.main_id; let main_id=this.props.match.params.main_id;
let category_id=this.props.match.params.category_id;
const dataSource = ['12345', '23456', '34567'];
return( return(
<React.Fragment > <React.Fragment >
<div> <div>
@ -1210,27 +1213,15 @@ class ShixunHomework extends Component{
</Menu> </Menu>
</div> </div>
<div className="fr mt16 mb16 searchView"> <div className="fr mt16 mb16 searchView">
{publicSearchs("请输入名称进行搜索",value => this.SearchCoursename(value),this.SearchCoursenames,(e)=>this.SearchCoursenames(e))}
{/*<Search*/} {/*<Search*/}
{/* value={Coursename}*/} {/* // value={Coursename}*/}
{/* placeholder="请输入名称进行搜索"*/} {/* placeholder="请输入名称进行搜索"*/}
{/* onInput={this.SearchCoursenames}*/} {/* onInput={this.SearchCoursenames}*/}
{/* onSearch={value => this.SearchCoursename(value)}*/} {/* onSearch={value => this.SearchCoursename(value)}*/}
{/* allowClear*/} {/* onChange={(e)=>this.allowClearonChange(e)}*/}
{/* allowClear={true}*/}
{/*></Search>*/} {/*></Search>*/}
<AutoComplete
allowClear
className="certain-category-search"
dropdownClassName="certain-category-search-dropdown"
dropdownMatchSelectWidth={false}
dropdownStyle={{ width: 300 }}
size="large"
style={{ width: '100%' }}
dataSource={dataSource}
placeholder="input here"
optionLabelProp="value"
>
<Input suffix={<Icon type="search" className="certain-category-icon" />} />
</AutoComplete>
</div> </div>
</div> </div>
</div> </div>
@ -1393,14 +1384,3 @@ class ShixunHomework extends Component{
} }
} }
export default ShixunHomework; export default ShixunHomework;
// {/*<div className="alltask "*/}
// {/*style={*/}
// {/*{*/}
// {/*display: datas===undefined?'none' :datas.task_count===0? 'block' : 'none'*/}
// {/*}*/}
// {/*}*/}
// {/*>*/}
// {/*<div className="edu-tab-con-box clearfix edu-txt-center">*/}
// {/*<img className="edu-nodata-img mb20" src="/images/educoder/nodata.png" />*/}
// {/*<p className="edu-nodata-p mb20">暂时还没有相关数据哦！</p></div>*/}
// {/*</div>*/}
Write Preview
Loading…
Cancel
Save