diff --git a/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js b/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js
index 942c06800..9a9f9bd29 100644
--- a/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js
+++ b/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js
@@ -333,7 +333,7 @@ class ShixunhomeWorkItem extends Component{
{/* {discussMessage.author.name} */}
-
+ { discussMessage.author && {discussMessage.author} }
{discussMessage.commit_count===undefined?"":{discussMessage.commit_count} 已交}
{discussMessage.uncommit_count===undefined?"":{discussMessage.uncommit_count} 未交}
{/*{discussMessage.replies_count} 3 未评*/}
From 17e1f44146ce7521f467d7eecba35cb435f34aa8 Mon Sep 17 00:00:00 2001
From: caicai8 <1149225589@qq.com>
Date: Tue, 27 Aug 2019 14:13:30 +0800
Subject: [PATCH 04/25] =?UTF-8?q?=E9=97=AE=E5=8D=B7-=E9=A2=98=E5=BA=93?=
=?UTF-8?q?=E9=80=89=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/react/src/modules/courses/poll/Poll.js | 18 ++++++------------
1 file changed, 6 insertions(+), 12 deletions(-)
diff --git a/public/react/src/modules/courses/poll/Poll.js b/public/react/src/modules/courses/poll/Poll.js
index 16a488fce..aae09b41c 100644
--- a/public/react/src/modules/courses/poll/Poll.js
+++ b/public/react/src/modules/courses/poll/Poll.js
@@ -103,11 +103,11 @@ class Poll extends Component{
this.InitList(e.key,StudentList_value,page);
}
// 获取列表数据
- InitList=(type,search,page)=>{
+ InitList=(type,search,page,bank_checkValue)=>{
this.setState({
isSpin:true
})
- let {pageSize}=this.state
+ let { pageSize,checkBoxValues }=this.state
let coursesId=this.props.match.params.coursesId;
let url='/courses/'+coursesId+'/polls.json?limit='+pageSize+'&page='+page
if(type!="0"){
@@ -123,7 +123,7 @@ class Poll extends Component{
course_types:result.data.course_types,
polls_counts:result.data.polls_counts,
isSpin:false,
- checkBoxValues:[]
+ checkBoxValues: bank_checkValue ? bank_checkValue : []
})
}
}).catch((error)=>{
@@ -209,12 +209,6 @@ class Poll extends Component{
//判断是否有选中数据
if(this.state.checkBoxValues.length==0){
this.props.showNotification("请先在列表中选择数据");
- // this.setState({
- // modalsType:true,
- // modalsTopval:"请先在列表中选择数据",
- // modalsBottomval:'',
- // loadtype:true
- // })
}else{
if(value != "bank"){
this.setState({
@@ -325,13 +319,13 @@ class Poll extends Component{
}
// 题库选用成功后,立即发布，刷新页面
useBankSuccess=(checkValue,value)=>{
+ debugger;
this.setState({
isSpin:true
})
let{type,StudentList_value,page}=this.state
- this.InitList(type,StudentList_value,page);
- console.log(checkValue);
- console.log(value);
+ this.InitList(type,StudentList_value,page,value);
+
let coursesId=this.props.match.params.coursesId;
let url=`/courses/${coursesId}/polls/publish_modal.json`;
axios.get(url,{
From 447ee0b8dc91f04b10e4fc4019dae447c26ad465 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Tue, 27 Aug 2019 14:27:25 +0800
Subject: [PATCH 05/25] b
---
public/react/src/modules/courses/new/Goldsubject.js | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/public/react/src/modules/courses/new/Goldsubject.js b/public/react/src/modules/courses/new/Goldsubject.js
index 5149d3e5a..c9b8b324b 100644
--- a/public/react/src/modules/courses/new/Goldsubject.js
+++ b/public/react/src/modules/courses/new/Goldsubject.js
@@ -626,6 +626,7 @@ class Goldsubject extends Component {
}
console.log(addonAfteronelenone);
console.log(addonAfteronelentwo);
+ console.log(options);
return (
@@ -764,8 +765,8 @@ class Goldsubject extends Component {
onChange={this.handleChange}
className={"fl construction "}
placeholder="例如：数据结构"
+ dataSource={options}
>
- {options}
)}
{/**/}
From 16307a59382ac1e1a1ed5b7ca5a45acf38a824b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Tue, 27 Aug 2019 16:41:44 +0800
Subject: [PATCH 06/25] Merge branch 'dev_aliyun' of
https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysl
# Conflicts:
# public/react/src/modules/courses/new/CoursesNew.js
# public/react/src/modules/courses/new/Goldsubject.js
---
.../react/src/modules/courses/css/Courses.css | 2 +-
.../src/modules/courses/new/CoursesNew.js | 121 +++++++++++---
.../src/modules/courses/new/Goldsubject.js | 153 ++++++++++--------
3 files changed, 187 insertions(+), 89 deletions(-)
diff --git a/public/react/src/modules/courses/css/Courses.css b/public/react/src/modules/courses/css/Courses.css
index dbdd42398..78b6783a0 100644
--- a/public/react/src/modules/courses/css/Courses.css
+++ b/public/react/src/modules/courses/css/Courses.css
@@ -1061,7 +1061,7 @@ samp {
.newcoursestitle{
font-size: 12px;
color: #989898;
- margin-left: 10px;
+ margin-left: 40px;
}
.coursenavbox .ant-form-item-label{
diff --git a/public/react/src/modules/courses/new/CoursesNew.js b/public/react/src/modules/courses/new/CoursesNew.js
index cbcb33fc2..71092ebdb 100644
--- a/public/react/src/modules/courses/new/CoursesNew.js
+++ b/public/react/src/modules/courses/new/CoursesNew.js
@@ -47,6 +47,7 @@ class CoursesNew extends Component {
checkboxgroup:undefined,
addonAfteronelenone:0,
addonAfteronelentwo:0,
+ classroomyslstiring:"",
checkbofrup:[{module_type:"shixun_homework",module_name:"实训作业"},{module_type:"common_homework",module_name:"普通作业"},{module_type:"group_homework",module_name:"分组作业"}
,{module_type:"exercise",module_name:"试卷"},{module_type:"poll",module_name:"问卷"},{module_type:"graduation",module_name:"毕业设计"}
,{module_type:"board",module_name:"讨论"},{module_type:"attachment",module_name:"资源"},{module_type:"course_group",module_name:"分班"}],
@@ -364,14 +365,16 @@ class CoursesNew extends Component {
search:value
}).then((result)=>{
// console.log(result.data)
- if (result.data.message===undefined) {
+ if(result){
+ if (result.data.message===undefined) {
- this.setState({
- searchlist: result.data.course_lists,
- // course:value,
+ this.setState({
+ searchlist: result.data.course_lists,
+ // course:value,
- })
- }
+ })
+ }
+ }
// this.props.form.setFieldsValue({
// course:value
// })
@@ -393,11 +396,16 @@ class CoursesNew extends Component {
};
handleChange=(value)=>{
+ if(value){
+ this.props.form.setFieldsValue({
+ course:value+"",
+ classroom:value+"",
+ });
+ this.setState({
+ classroomyslstiring:value
+ })
+ }
- this.props.form.setFieldsValue({
- // course:value,
- classroom:value
- })
};
handleSearchschool=(value)=>{
@@ -489,6 +497,16 @@ class CoursesNew extends Component {
if(addonAftertwo){
addonAfteronelens=String(addonAftertwo).length;
}
+ var addonAfterthree=this.props.form&&this.props.form.getFieldValue('course');
+ var addonAfteronelens3=0;
+ if(addonAfterthree){
+ addonAfteronelens3=String(addonAfterthree).length;
+ }
+ var addonAfterfour=this.props.form&&this.props.form.getFieldValue('classroom');
+ var addonAfteronelens4=0;
+ if(addonAfterfour){
+ addonAfteronelens4=String(addonAfterfour).length;
+ }
return (
@@ -550,20 +568,16 @@ class CoursesNew extends Component {
.ant-select-dropdown{
// top: 221px !important;
// left: 115px !important;
- width: 280px !important;
height: 160px;
}
.ant-select-dropdown-menu{
- width: 280px !important;
height: 160px;
}
.construction .ant-input{
- width: 280px !important;
margin-left: 0px !important;
}
.construction {
- width: 280px;
- margin-left: 10px;
+ margin-left: 11px;
}
.construction .ant-select-selection__placeholder, .ant-select-search__field__placeholder {
@@ -575,21 +589,51 @@ class CoursesNew extends Component {
+
{getFieldDecorator('course', {
- rules: [{required: true, message: "不能为空"}],
+ rules: [{required: true, message: "不能为空"},
+ {
+ max:60,
+ message: '不能超过60个字符',
+ }],
})(
-
- {options}
-
+
+
+
)}
-
+
{/*（错误示例：数据结构2017本部；数据结构2017秋季；数据结构2017电子商务1班）*/}
@@ -616,11 +660,38 @@ class CoursesNew extends Component {
}
+
+
{getFieldDecorator('classroom', {
- rules: [{required: true, message: "不能为空"}],
- })()}
+ rules: [{required: true, message: "不能为空"},
+ {
+ max:60,
+ message: '不能超过60个字符',
+ }],
+ })()}
{/*（如果本学期包含多个班级，只需创建一个课堂然后在课堂内部建立不同的分班）*/}
@@ -698,7 +769,7 @@ class CoursesNew extends Component {
}
]}
)(
-
+
)}
{
- this.props.form.setFieldsValue({
- // course:value,
- classroom:value
- })
+ if(value){
+ setTimeout(()=>{
+ this.props.form.setFieldsValue({
+ course:value+"",
+ classroom:value+"",
+ });
+ },100)
+
+ }
};
handleSearchschool=(value)=>{
@@ -624,6 +629,12 @@ class Goldsubject extends Component {
if(addonAftertwo){
addonAfteronelens=String(addonAftertwo).length;
}
+
+ var addonAfterfour=this.props.form&&this.props.form.getFieldValue('classroom');
+ var addonAfteronelens4=0;
+ if(addonAfterfour){
+ addonAfteronelens4=String(addonAfterfour).length;
+ }
console.log(addonAfteronelenone);
console.log(addonAfteronelentwo);
console.log(options);
@@ -688,20 +699,16 @@ class Goldsubject extends Component {
.ant-select-dropdown{
// top: 221px !important;
// left: 115px !important;
- width: 280px !important;
height: 160px;
}
.ant-select-dropdown-menu{
- width: 280px !important;
height: 160px;
}
.construction .ant-input{
- width: 280px !important;
margin-left: 0px !important;
}
.construction {
- width: 280px;
- margin-left: 10px;
+ margin-left: 11px;
}
.construction .ant-select-selection__placeholder, .ant-select-search__field__placeholder {
@@ -711,38 +718,7 @@ class Goldsubject extends Component {
`}
- {/**/}
- {/*
*/}
- {/*
*/}
- {/* {getFieldDecorator('course', {*/}
- {/* rules: [{required: true, message: "不能为空"}],*/}
- {/* })(*/}
-
- {/* */}
- {/* {options}*/}
- {/* */}
- {/* )}*/}
- {/* */}
- {/* /!*（错误示例：数据结构2017本部；数据结构2017秋季；数据结构2017电子商务1班）*!/*/}
- {/* */}
- {/* */}
- {/* 正确示例：数据结构*/}
- {/*
*/}
- {/* */}
- {/* */}
- {/* 错误示例：数据结构2019春*/}
- {/*
*/}
- {/* */}
- {/* */}
- {/* */}
- {/*
*/}
- {/*
-
- {getFieldDecorator('classroom', {
- rules: [{required: true, message: "不能为空"}],
- })(
-
-
-
- )}
- {/**/}
- {/* /!*（如果本学期包含多个班级，只需创建一个课堂然后在课堂内部建立不同的分班）*!/*/}
+ {/* */}
+
+ {/* {getFieldDecorator('classroom', {*/}
+ {/* rules: [{required: true, message: "不能为空"},*/}
+ {/* {*/}
+ {/* max:60,*/}
+ {/* message: '不能超过60个字符',*/}
+ {/* }],*/}
+ {/* })(*/}
+ {/* */}
+ {/* */}
+ {/* */}
+ {/* )}*/}
+
+ {/**/}
+
+
+ {getFieldDecorator('classroom', {
+ rules: [{required: true, message: "不能为空"},
+ {
+ max:60,
+ message: '不能超过60个字符',
+ }],
+ })(
+
+
+
+
+
+ )}
+ {/**/}
+ {/* /!*（错误示例：数据结构2017本部；数据结构2017秋季；数据结构2017电子商务1班）*!/*/}
{/* */}
- {/* */}
- {/* 正确示例：数据结构2019春季班级*/}
+ {/* */}
+ {/* 正确示例：数据结构*/}
{/*
*/}
{/* */}
- {/* */}
- {/* 错误示例：2019春季班级数据结构*/}
+ {/* */}
+ {/* 错误示例：数据结构2019春*/}
{/*
*/}
{/* */}
-
+
-
-
From 72e0b60796b2cf4c1cf7a687b270a0b2f063a98d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Tue, 27 Aug 2019 22:20:16 +0800
Subject: [PATCH 07/25] Merge branch 'dev_aliyun' of
https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysl
# Conflicts:
# public/react/src/modules/courses/new/CoursesNew.js
# public/react/src/modules/courses/new/Goldsubject.js
---
public/react/src/modules/courses/Index.js | 14 +-
.../src/modules/courses/new/Goldsubject.js | 91 +++--------
.../questionbank/Generaljobbankdetails.js | 143 ++++++++++++++++++
3 files changed, 176 insertions(+), 72 deletions(-)
create mode 100644 public/react/src/modules/courses/questionbank/Generaljobbankdetails.js
diff --git a/public/react/src/modules/courses/Index.js b/public/react/src/modules/courses/Index.js
index 01117b4f8..3c6c0b717 100644
--- a/public/react/src/modules/courses/Index.js
+++ b/public/react/src/modules/courses/Index.js
@@ -7,7 +7,6 @@ import axios from 'axios';
import { TPMIndexHOC } from '../tpm/TPMIndexHOC';
import { CNotificationHOC } from './common/CNotificationHOC'
import {ImageLayerOfCommentHOC} from '../page/layers/ImageLayerOfCommentHOC'
-
import "./css/Courses.css"
//引入对应跳转的组件
@@ -265,7 +264,10 @@ const GraduationTasksSubmiteditApp=Loadable({
loading: Loading,
})
-
+const Generaljobbankdetails =Loadable({
+ loader: () => import('../../modules/courses/questionbank/Generaljobbankdetails'),
+ loading: Loading,
+})
class CoursesIndex extends Component{
constructor(props) {
@@ -445,7 +447,13 @@ class CoursesIndex extends Component{
// console.log(commons)
return (
-
+ {/*Generaljobbankdetails*/}
+ {/* 普通作业题库详情*/}
+ ()
+ }
+ >
{/* 资源列表页 */}
@@ -729,88 +727,43 @@ class Goldsubject extends Component {
`
}
-
-
-
- {/*
*/}
-
- {/* {getFieldDecorator('classroom', {*/}
- {/* rules: [{required: true, message: "不能为空"},*/}
- {/* {*/}
- {/* max:60,*/}
- {/* message: '不能超过60个字符',*/}
- {/* }],*/}
- {/* })(*/}
- {/* */}
- {/* */}
- {/* */}
- {/* )}*/}
-
- {/**/}
-
-
+ }
+
{getFieldDecorator('classroom', {
rules: [{required: true, message: "不能为空"},
{
max:60,
message: '不能超过60个字符',
}],
- })(
-
-
-
-
-
- )}
- {/**/}
- {/* /!*（错误示例：数据结构2017本部；数据结构2017秋季；数据结构2017电子商务1班）*!/*/}
- {/* */}
- {/* */}
- {/* 正确示例：数据结构*/}
- {/*
*/}
- {/* */}
- {/* */}
- {/* 错误示例：数据结构2019春*/}
- {/*
*/}
- {/* */}
-
+ })()}
+
+
diff --git a/public/react/src/modules/courses/questionbank/Generaljobbankdetails.js b/public/react/src/modules/courses/questionbank/Generaljobbankdetails.js
new file mode 100644
index 000000000..9eda477f8
--- /dev/null
+++ b/public/react/src/modules/courses/questionbank/Generaljobbankdetails.js
@@ -0,0 +1,143 @@
+import React, {Component} from "react";
+import {Link, NavLink} from 'react-router-dom';
+import {WordsBtn, ActionBtn} from 'educoder';
+import axios from 'axios';
+import {
+ notification
+} from "antd";
+import CoursesListType from '../coursesPublic/CoursesListType';
+
+import '../css/members.css';
+import "../common/formCommon.css";
+import '../css/Courses.css';
+import '../css/busyWork.css';
+import '../poll/pollStyle.css';
+
+class Generaljobbankdetails extends Component {
+ constructor(props) {
+ super(props);
+ // this.answerMdRef = React.createRef();
+ this.state = {
+ tab: ["0"],
+ }
+
+ }
+
+ //切换tab
+ ChangeTab = (e) => {
+ // console.log(e);
+ this.setState({
+ tab: e
+ })
+ try {
+ var currenturl = window.location.href;
+ var newUrl = (currenturl.split("?"))[0];
+ window.history.pushState('','',newUrl+'?tab='+e);
+ }catch (e) {
+ console.log(e);
+ console.log("44");
+ }
+
+ }
+
+
+ componentDidMount() {
+ // console.log("父组件加载框");
+ const query = this.props.location.search;
+ const type = query.split('?tab=');
+ // let sum = []
+ // sum.push(type[1])
+ // console.log("componentDidMountcomponentDidMount");
+ // console.log(type);
+ this.setState({
+ tab: type[1],
+ })
+ let querys = this.props.location.pathname;
+ const types = querys.split('/');
+ // console.log(types);
+ this.setState({
+ shixuntypes: types[3]
+ })
+ }
+
+
+ confirmysl(child,i) {
+ if(i===1){
+ child.daochushixunbaogao();
+ }
+ if(i===2){
+ child.daochuzuoye();
+ }
+ }
+
+ homeworkendss(child){
+ // child.homeworkends();
+ }
+
+ homeworkstarts(child){
+ // child.homeworkstart();
+
+ }
+ workshowmodels(child){
+ // child.workshowmodel();
+ }
+ /// 确认是否下载
+
+
+ bindRef = ref => { this.child = ref }
+///////////////教师截止
+
+ render() {
+ let {tab, teacherdatapage, jobsettingsdatapage} = this.state;
+
+ const isAdmin = this.props.isAdmin();
+ // console.log(119)
+ console.log(jobsettingsdatapage);
+
+
+ return (
+
+
+
+
+
+
+
+ 题库
+ >
+ 详情
+ >
+ 作业详情
+
+
+
+
+ MySQL数据库编程开发实训（基础篇）
+
+
+
+
+
+
+
+
+ )
+ }
+}
+
+export default Generaljobbankdetails;
+
From 7d615a20b3da1f299037775825696a8f7c1e8fa7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Tue, 27 Aug 2019 22:57:55 +0800
Subject: [PATCH 08/25] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/modules/courses/new/Goldsubject.js | 46 ++++++++++++++-----
1 file changed, 35 insertions(+), 11 deletions(-)
diff --git a/public/react/src/modules/courses/new/Goldsubject.js b/public/react/src/modules/courses/new/Goldsubject.js
index 998050409..9695f60ff 100644
--- a/public/react/src/modules/courses/new/Goldsubject.js
+++ b/public/react/src/modules/courses/new/Goldsubject.js
@@ -54,6 +54,7 @@ class Goldsubject extends Component {
addonAfteronelenone:"",
addonAfteronelentwo:"",
Whethertocreateanewclassroom:true,
+ bordebool:false,
checkbofrup:[
{module_type:"announcement",module_name:"公告栏"},{module_type:"online_learning",module_name:"在线学习"}
,{module_type:"shixun_homework",module_name:"实训作业"},{module_type:"common_homework",module_name:"普通作业"}
@@ -528,17 +529,26 @@ class Goldsubject extends Component {
};
handleChange=(value)=>{
-
if(value){
- setTimeout(()=>{
- this.props.form.setFieldsValue({
- course:value+"",
- classroom:value+"",
- });
- },100)
+ if(value.length>60){
+ this.setState({
+ bordebool:true,
+ })
+ }else if(value.length===0){
+ this.setState({
+ bordebool:true,
+ })
+ }else{
+ this.setState({
+ bordebool:false,
+ })
+ }
+ }else{
+ this.setState({
+ bordebool:true
+ })
- }
- };
+ } };
handleSearchschool=(value)=>{
@@ -607,7 +617,7 @@ class Goldsubject extends Component {
this.applyForAddOrgForm.setVisible(true)
}
render() {
- let {datatime,datatimetwo,school,searchlistscholl,Whethertocreateanewclassroom,addonAfteronelenone,addonAfteronelentwo} = this.state;
+ let {datatime,datatimetwo,school,searchlistscholl,Whethertocreateanewclassroom,bordebool,addonAfteronelenone,addonAfteronelentwo} = this.state;
const {getFieldDecorator} = this.props.form;
const propsWithoutForm = Object.assign({}, this.props)
delete propsWithoutForm.form
@@ -753,6 +763,20 @@ class Goldsubject extends Component {
}
`
}
+
{getFieldDecorator('classroom', {
rules: [{required: true, message: "不能为空"},
@@ -760,7 +784,7 @@ class Goldsubject extends Component {
max:60,
message: '不能超过60个字符',
}],
- })()}
+ })()}
From 5a0d629642257dfae25984677e276f94c4a8538a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Wed, 28 Aug 2019 09:54:19 +0800
Subject: [PATCH 09/25] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/modules/courses/new/CoursesNew.js | 107 +++----------
.../src/modules/courses/new/Goldsubject.js | 146 +++++++++---------
2 files changed, 91 insertions(+), 162 deletions(-)
diff --git a/public/react/src/modules/courses/new/CoursesNew.js b/public/react/src/modules/courses/new/CoursesNew.js
index 71092ebdb..6073eee97 100644
--- a/public/react/src/modules/courses/new/CoursesNew.js
+++ b/public/react/src/modules/courses/new/CoursesNew.js
@@ -47,7 +47,6 @@ class CoursesNew extends Component {
checkboxgroup:undefined,
addonAfteronelenone:0,
addonAfteronelentwo:0,
- classroomyslstiring:"",
checkbofrup:[{module_type:"shixun_homework",module_name:"实训作业"},{module_type:"common_homework",module_name:"普通作业"},{module_type:"group_homework",module_name:"分组作业"}
,{module_type:"exercise",module_name:"试卷"},{module_type:"poll",module_name:"问卷"},{module_type:"graduation",module_name:"毕业设计"}
,{module_type:"board",module_name:"讨论"},{module_type:"attachment",module_name:"资源"},{module_type:"course_group",module_name:"分班"}],
@@ -396,16 +395,11 @@ class CoursesNew extends Component {
};
handleChange=(value)=>{
- if(value){
- this.props.form.setFieldsValue({
- course:value+"",
- classroom:value+"",
- });
- this.setState({
- classroomyslstiring:value
- })
- }
+ this.props.form.setFieldsValue({
+ // course:value,
+ classroom:value
+ })
};
handleSearchschool=(value)=>{
@@ -497,16 +491,7 @@ class CoursesNew extends Component {
if(addonAftertwo){
addonAfteronelens=String(addonAftertwo).length;
}
- var addonAfterthree=this.props.form&&this.props.form.getFieldValue('course');
- var addonAfteronelens3=0;
- if(addonAfterthree){
- addonAfteronelens3=String(addonAfterthree).length;
- }
- var addonAfterfour=this.props.form&&this.props.form.getFieldValue('classroom');
- var addonAfteronelens4=0;
- if(addonAfterfour){
- addonAfteronelens4=String(addonAfterfour).length;
- }
+ console.log(options);
return (
@@ -568,16 +553,20 @@ class CoursesNew extends Component {
.ant-select-dropdown{
// top: 221px !important;
// left: 115px !important;
+ width: 280px !important;
height: 160px;
}
.ant-select-dropdown-menu{
+ width: 280px !important;
height: 160px;
}
.construction .ant-input{
+ width: 280px !important;
margin-left: 0px !important;
}
.construction {
- margin-left: 11px;
+ width: 280px;
+ margin-left: 10px;
}
.construction .ant-select-selection__placeholder, .ant-select-search__field__placeholder {
@@ -589,51 +578,22 @@ class CoursesNew extends Component {
-
{getFieldDecorator('course', {
- rules: [{required: true, message: "不能为空"},
- {
- max:60,
- message: '不能超过60个字符',
- }],
+ rules: [{required: true, message: "不能为空"}],
})(
-
-
-
-
+
+
)}
-
+
{/*（错误示例：数据结构2017本部；数据结构2017秋季；数据结构2017电子商务1班）*/}
@@ -660,38 +620,11 @@ class CoursesNew extends Component {
}
-
-
+
{getFieldDecorator('classroom', {
- rules: [{required: true, message: "不能为空"},
- {
- max:60,
- message: '不能超过60个字符',
- }],
- })()}
+ rules: [{required: true, message: "不能为空"}],
+ })()}
{/*（如果本学期包含多个班级，只需创建一个课堂然后在课堂内部建立不同的分班）*/}
diff --git a/public/react/src/modules/courses/new/Goldsubject.js b/public/react/src/modules/courses/new/Goldsubject.js
index 9695f60ff..696a81969 100644
--- a/public/react/src/modules/courses/new/Goldsubject.js
+++ b/public/react/src/modules/courses/new/Goldsubject.js
@@ -54,7 +54,6 @@ class Goldsubject extends Component {
addonAfteronelenone:"",
addonAfteronelentwo:"",
Whethertocreateanewclassroom:true,
- bordebool:false,
checkbofrup:[
{module_type:"announcement",module_name:"公告栏"},{module_type:"online_learning",module_name:"在线学习"}
,{module_type:"shixun_homework",module_name:"实训作业"},{module_type:"common_homework",module_name:"普通作业"}
@@ -529,26 +528,12 @@ class Goldsubject extends Component {
};
handleChange=(value)=>{
- if(value){
- if(value.length>60){
- this.setState({
- bordebool:true,
- })
- }else if(value.length===0){
- this.setState({
- bordebool:true,
- })
- }else{
- this.setState({
- bordebool:false,
- })
- }
- }else{
- this.setState({
- bordebool:true
- })
- } };
+ this.props.form.setFieldsValue({
+ // course:value,
+ classroom:value
+ })
+ };
handleSearchschool=(value)=>{
@@ -617,7 +602,7 @@ class Goldsubject extends Component {
this.applyForAddOrgForm.setVisible(true)
}
render() {
- let {datatime,datatimetwo,school,searchlistscholl,Whethertocreateanewclassroom,bordebool,addonAfteronelenone,addonAfteronelentwo} = this.state;
+ let {datatime,datatimetwo,school,searchlistscholl,Whethertocreateanewclassroom,addonAfteronelenone,addonAfteronelentwo} = this.state;
const {getFieldDecorator} = this.props.form;
const propsWithoutForm = Object.assign({}, this.props)
delete propsWithoutForm.form
@@ -639,13 +624,9 @@ class Goldsubject extends Component {
if(addonAftertwo){
addonAfteronelens=String(addonAftertwo).length;
}
-
- var addonAfterfour=this.props.form&&this.props.form.getFieldValue('classroom');
- var addonAfteronelens4=0;
- if(addonAfterfour){
- addonAfteronelens4=String(addonAfterfour).length;
- }
-
+ console.log(addonAfteronelenone);
+ console.log(addonAfteronelentwo);
+ console.log(options);
return (
@@ -707,16 +688,20 @@ class Goldsubject extends Component {
.ant-select-dropdown{
// top: 221px !important;
// left: 115px !important;
+ width: 280px !important;
height: 160px;
}
.ant-select-dropdown-menu{
+ width: 280px !important;
height: 160px;
}
.construction .ant-input{
+ width: 280px !important;
margin-left: 0px !important;
}
.construction {
- margin-left: 11px;
+ width: 280px;
+ margin-left: 10px;
}
.construction .ant-select-selection__placeholder, .ant-select-search__field__placeholder {
@@ -726,7 +711,38 @@ class Goldsubject extends Component {
`}
+ {/**/}
+ {/*
*/}
+ {/*
*/}
+ {/* {getFieldDecorator('course', {*/}
+ {/* rules: [{required: true, message: "不能为空"}],*/}
+ {/* })(*/}
+
+ {/* */}
+ {/* {options}*/}
+ {/* */}
+ {/* )}*/}
+ {/* */}
+ {/* /!*（错误示例：数据结构2017本部；数据结构2017秋季；数据结构2017电子商务1班）*!/*/}
+ {/* */}
+ {/* */}
+ {/* 正确示例：数据结构*/}
+ {/*
*/}
+ {/* */}
+ {/* */}
+ {/* 错误示例：数据结构2019春*/}
+ {/*
*/}
+ {/* */}
+ {/* */}
+ {/* */}
+ {/*
*/}
+ {/*
-
-
-
- {getFieldDecorator('classroom', {
- rules: [{required: true, message: "不能为空"},
- {
- max:60,
- message: '不能超过60个字符',
- }],
- })()}
+
+ {getFieldDecorator('classroom', {
+ rules: [{required: true, message: "不能为空"}],
+ })(
+
+
+ {options}
+
+ )}
+ {/**/}
+ {/* /!*（如果本学期包含多个班级，只需创建一个课堂然后在课堂内部建立不同的分班）*!/*/}
+ {/* */}
+ {/* */}
+ {/* 正确示例：数据结构2019春季班级*/}
+ {/*
*/}
+ {/* */}
+ {/* */}
+ {/* 错误示例：2019春季班级数据结构*/}
+ {/*
*/}
+ {/* */}
+
From 1ed82c08223a436a2fd2eba389d90861d65a732a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Wed, 28 Aug 2019 10:03:37 +0800
Subject: [PATCH 10/25] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/react/src/modules/courses/new/CoursesNew.js | 1 -
public/react/src/modules/courses/new/Goldsubject.js | 1 -
2 files changed, 2 deletions(-)
diff --git a/public/react/src/modules/courses/new/CoursesNew.js b/public/react/src/modules/courses/new/CoursesNew.js
index 6073eee97..6e9c3c166 100644
--- a/public/react/src/modules/courses/new/CoursesNew.js
+++ b/public/react/src/modules/courses/new/CoursesNew.js
@@ -491,7 +491,6 @@ class CoursesNew extends Component {
if(addonAftertwo){
addonAfteronelens=String(addonAftertwo).length;
}
- console.log(options);
return (
diff --git a/public/react/src/modules/courses/new/Goldsubject.js b/public/react/src/modules/courses/new/Goldsubject.js
index 696a81969..5149d3e5a 100644
--- a/public/react/src/modules/courses/new/Goldsubject.js
+++ b/public/react/src/modules/courses/new/Goldsubject.js
@@ -626,7 +626,6 @@ class Goldsubject extends Component {
}
console.log(addonAfteronelenone);
console.log(addonAfteronelentwo);
- console.log(options);
return (
From 406ce0f988b589e8ab15a5466492063ccc3c40d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Wed, 28 Aug 2019 11:00:31 +0800
Subject: [PATCH 11/25] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/react/public/css/edu-all.css | 2 +-
public/react/src/modules/courses/Index.js | 2 +-
.../courses/questionbank/Generaljobanswer.js | 88 ++++++++++++++++++
.../questionbank/Generaljobbankdetails.js | 6 +-
.../courses/questionbank/Generaljobdetails.js | 90 +++++++++++++++++++
.../courses/questionbank/questionbank.css | 22 +++++
6 files changed, 207 insertions(+), 3 deletions(-)
create mode 100644 public/react/src/modules/courses/questionbank/Generaljobanswer.js
create mode 100644 public/react/src/modules/courses/questionbank/Generaljobdetails.js
create mode 100644 public/react/src/modules/courses/questionbank/questionbank.css
diff --git a/public/react/public/css/edu-all.css b/public/react/public/css/edu-all.css
index 1daa2d5b1..425255048 100644
--- a/public/react/public/css/edu-all.css
+++ b/public/react/public/css/edu-all.css
@@ -3453,4 +3453,4 @@ a.singlepublishtwo{
/*.ant-notification{*/
/*width: auto !important;*/
/*max-width: 600px !important;*/
-/*}*/
\ No newline at end of file
+/*}*/
diff --git a/public/react/src/modules/courses/Index.js b/public/react/src/modules/courses/Index.js
index 3c6c0b717..48f07cc8c 100644
--- a/public/react/src/modules/courses/Index.js
+++ b/public/react/src/modules/courses/Index.js
@@ -449,7 +449,7 @@ class CoursesIndex extends Component{
{/*Generaljobbankdetails*/}
{/* 普通作业题库详情*/}
- ()
}
diff --git a/public/react/src/modules/courses/questionbank/Generaljobanswer.js b/public/react/src/modules/courses/questionbank/Generaljobanswer.js
new file mode 100644
index 000000000..2f2816662
--- /dev/null
+++ b/public/react/src/modules/courses/questionbank/Generaljobanswer.js
@@ -0,0 +1,88 @@
+import React, {Component} from "react";
+import { WordsBtn,on, off, trigger,markdownToHTML,getImageUrl} from 'educoder';
+import {
+ Button,
+ Checkbox,
+ message,
+ InputNumber,
+ DatePicker,
+ Radio,
+ Tooltip,
+ notification,
+} from "antd";
+import './questionbank.css';
+
+class Generaljobanswer extends Component {
+
+ constructor(props) {
+ super(props);
+
+ this.state = {
+
+ }
+ }
+
+ componentDidMount() {
+ console.log("Generaljobanswer");
+ console.log("componentDidMount");
+ // let query = this.props.location.pathname;
+ // const type = query.split('/');
+ // this.setState({
+ // shixuntypes:type[3]
+ // })
+ // this.props.triggerRef(this);
+
+
+
+
+ }
+ // 获取数据地方
+ getTrainingjobsetting = () => {
+ var homeworkid = this.props.match.params.homeworkid;
+ }
+
+ //跳转道描点的地方
+ scrollToAnchor = (anchorName) => {
+ if (anchorName) {
+ // 找到锚点
+ let anchorElement = document.getElementById(anchorName);
+ // 如果对应id的锚点存在，就跳转到锚点
+ if(anchorElement) { anchorElement.scrollIntoView(); }
+ }
+ };
+
+
+
+ render() {
+
+ return (
+
+
+ )
+ }
+}
+
+export default Generaljobanswer;
\ No newline at end of file
diff --git a/public/react/src/modules/courses/questionbank/Generaljobbankdetails.js b/public/react/src/modules/courses/questionbank/Generaljobbankdetails.js
index 9eda477f8..74deb7a60 100644
--- a/public/react/src/modules/courses/questionbank/Generaljobbankdetails.js
+++ b/public/react/src/modules/courses/questionbank/Generaljobbankdetails.js
@@ -6,7 +6,8 @@ import {
notification
} from "antd";
import CoursesListType from '../coursesPublic/CoursesListType';
-
+import Generaljobdetails from './Generaljobdetails';
+import Generaljobanswer from './Generaljobanswer';
import '../css/members.css';
import "../common/formCommon.css";
import '../css/Courses.css';
@@ -133,6 +134,9 @@ class Generaljobbankdetails extends Component {
)
diff --git a/public/react/src/modules/courses/questionbank/Generaljobdetails.js b/public/react/src/modules/courses/questionbank/Generaljobdetails.js
new file mode 100644
index 000000000..d33792c43
--- /dev/null
+++ b/public/react/src/modules/courses/questionbank/Generaljobdetails.js
@@ -0,0 +1,90 @@
+import React, {Component} from "react";
+import { WordsBtn,on, off, trigger,markdownToHTML,getImageUrl} from 'educoder';
+import {
+ Button,
+ Checkbox,
+ message,
+ InputNumber,
+ DatePicker,
+ Radio,
+ Tooltip,
+ notification,
+} from "antd";
+import './questionbank.css';
+
+
+class Generaljobdetails extends Component {
+
+ constructor(props) {
+ super(props);
+
+ this.state = {
+
+ }
+ }
+
+ componentDidMount() {
+ console.log("Generaljobdetails");
+ console.log("componentDidMount");
+ // let query = this.props.location.pathname;
+ // const type = query.split('/');
+ // this.setState({
+ // shixuntypes:type[3]
+ // })
+ // this.props.triggerRef(this);
+
+
+
+
+ }
+ // 获取数据地方
+ getTrainingjobsetting = () => {
+ var homeworkid = this.props.match.params.homeworkid;
+ }
+
+ //跳转道描点的地方
+ scrollToAnchor = (anchorName) => {
+ if (anchorName) {
+ // 找到锚点
+ let anchorElement = document.getElementById(anchorName);
+ // 如果对应id的锚点存在，就跳转到锚点
+ if(anchorElement) { anchorElement.scrollIntoView(); }
+ }
+ };
+
+
+
+ render() {
+
+ return (
+
+
+
+ )
+ }
+}
+
+export default Generaljobdetails;
\ No newline at end of file
diff --git a/public/react/src/modules/courses/questionbank/questionbank.css b/public/react/src/modules/courses/questionbank/questionbank.css
new file mode 100644
index 000000000..9c9405347
--- /dev/null
+++ b/public/react/src/modules/courses/questionbank/questionbank.css
@@ -0,0 +1,22 @@
+.yslquestionbank1{
+ padding-top: 30px !important;
+ padding-right: 30px !important;
+ padding-left: 30px !important;
+}
+.yslquesHeigth{
+ min-height: 500px !important;
+
+}
+.yslquesmarkdowntext{
+ font-size: 16px;
+ color: #707070;
+
+}
+.yslquesmat26{
+ margin-top: 26px;
+ padding-bottom: 44px !important;
+}
+.ysltextcolor9999{
+ color: #999999;
+ font-size: 14px;
+}
\ No newline at end of file
From ab5cec64704369a5e0306497bfb6b463f306cb17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Wed, 28 Aug 2019 13:56:34 +0800
Subject: [PATCH 12/25] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/react/src/modules/courses/Index.js | 16 +-
.../comtopicdetails/CompletetopicdePage.js | 0
.../comtopicdetails/Completetopicdeswer.js | 0
.../comtopicdetails/Completetopicdetails.js | 0
.../comtopicdetails/completetopicde.css | 0
.../courses/groupjobbank/GroupPackage.js | 74 +++++++++
.../courses/groupjobbank/GroupPackage2.js | 73 +++++++++
.../groupjobbank/Groupjobbandetails.js | 84 ++++++++++
.../courses/groupjobbank/GroupjobbankPage.js | 146 ++++++++++++++++++
.../groupjobbank/Groupjobquesanswer.js | 82 ++++++++++
.../courses/groupjobbank/questionbanks.css | 38 +++++
.../courses/questionbank/Generaljobanswer.js | 13 +-
.../questionbank/Generaljobbankdetails.js | 9 +-
.../courses/questionbank/Generaljobdetails.js | 13 +-
.../courses/questionbank/questionbank.css | 4 +
15 files changed, 523 insertions(+), 29 deletions(-)
create mode 100644 public/react/src/modules/courses/comtopicdetails/CompletetopicdePage.js
create mode 100644 public/react/src/modules/courses/comtopicdetails/Completetopicdeswer.js
create mode 100644 public/react/src/modules/courses/comtopicdetails/Completetopicdetails.js
create mode 100644 public/react/src/modules/courses/comtopicdetails/completetopicde.css
create mode 100644 public/react/src/modules/courses/groupjobbank/GroupPackage.js
create mode 100644 public/react/src/modules/courses/groupjobbank/GroupPackage2.js
create mode 100644 public/react/src/modules/courses/groupjobbank/Groupjobbandetails.js
create mode 100644 public/react/src/modules/courses/groupjobbank/GroupjobbankPage.js
create mode 100644 public/react/src/modules/courses/groupjobbank/Groupjobquesanswer.js
create mode 100644 public/react/src/modules/courses/groupjobbank/questionbanks.css
diff --git a/public/react/src/modules/courses/Index.js b/public/react/src/modules/courses/Index.js
index 48f07cc8c..9fd0c0ae4 100644
--- a/public/react/src/modules/courses/Index.js
+++ b/public/react/src/modules/courses/Index.js
@@ -263,11 +263,16 @@ const GraduationTasksSubmiteditApp=Loadable({
loader: () => import('./graduation/tasks/GraduationTasksSubmitedit'),
loading: Loading,
})
-
+//普通作业题库详情
const Generaljobbankdetails =Loadable({
loader: () => import('../../modules/courses/questionbank/Generaljobbankdetails'),
loading: Loading,
-})
+});
+//分组作业题库详情
+const GroupjobbankPage =Loadable({
+ loader: () => import('../../modules/courses/groupjobbank/GroupjobbankPage'),
+ loading: Loading,
+});
class CoursesIndex extends Component{
constructor(props) {
@@ -447,6 +452,13 @@ class CoursesIndex extends Component{
// console.log(commons)
return (
+ {/*GroupjobbankPage*/}
+ {/*分组作业题库详情*/}
+ ()
+ }
+ >
{/*Generaljobbankdetails*/}
{/* 普通作业题库详情*/}
{
+ var homeworkid = this.props.match.params.homeworkid;
+ }
+
+ //跳转道描点的地方
+ scrollToAnchor = (anchorName) => {
+ if (anchorName) {
+ // 找到锚点
+ let anchorElement = document.getElementById(anchorName);
+ // 如果对应id的锚点存在，就跳转到锚点
+ if(anchorElement) { anchorElement.scrollIntoView(); }
+ }
+ };
+
+
+
+ render() {
+
+ return (
+
+ )
+ }
+}
+
+export default GroupPackage;
\ No newline at end of file
diff --git a/public/react/src/modules/courses/groupjobbank/GroupPackage2.js b/public/react/src/modules/courses/groupjobbank/GroupPackage2.js
new file mode 100644
index 000000000..6a48a51c8
--- /dev/null
+++ b/public/react/src/modules/courses/groupjobbank/GroupPackage2.js
@@ -0,0 +1,73 @@
+import React, {Component} from "react";
+import { WordsBtn,on, off, trigger,markdownToHTML,getImageUrl} from 'educoder';
+import {
+ Button,
+ Checkbox,
+ message,
+ InputNumber,
+ DatePicker,
+ Radio,
+ Tooltip,
+ notification,
+} from "antd";
+import './questionbanks.css';
+
+class GroupPackage extends Component {
+
+ constructor(props) {
+ super(props);
+
+ this.state = {
+
+ }
+ }
+
+ componentDidMount() {
+ console.log("Groupjobquesanswer");
+ console.log("componentDidMount");
+ // let query = this.props.location.pathname;
+ // const type = query.split('/');
+ // this.setState({
+ // shixuntypes:type[3]
+ // })
+ // this.props.triggerRef(this);
+
+
+
+
+ }
+ // 获取数据地方
+ getTrainingjobsetting = () => {
+ var homeworkid = this.props.match.params.homeworkid;
+ }
+
+ //跳转道描点的地方
+ scrollToAnchor = (anchorName) => {
+ if (anchorName) {
+ // 找到锚点
+ let anchorElement = document.getElementById(anchorName);
+ // 如果对应id的锚点存在，就跳转到锚点
+ if(anchorElement) { anchorElement.scrollIntoView(); }
+ }
+ };
+
+
+
+ render() {
+
+ return (
+
+
+ 分组要求：
+ 2~ 5（学生提交作品时需要关联同组成员，组内成员作品共享）
+
+
+ 基于项目实施
+ （学生必须在本平台创建项目，项目管理员可以提交作品）
+
+
+
+
+
+
+
+
+
+ MySQL数据库编程开发实训（基础篇）
+
+
+
+
+
+
+ {parseInt(tab) === 0 ?
:""}
+ {parseInt(tab) === 1 ?
:""}
+
+
+
@@ -127,9 +126,9 @@ class Generaljobbankdetails extends Component {
diff --git a/public/react/src/modules/courses/questionbank/questionbank.css b/public/react/src/modules/courses/questionbank/questionbank.css
index 9c9405347..43dcfa9c6 100644
--- a/public/react/src/modules/courses/questionbank/questionbank.css
+++ b/public/react/src/modules/courses/questionbank/questionbank.css
@@ -19,4 +19,8 @@
.ysltextcolor9999{
color: #999999;
font-size: 14px;
+}
+.ysltextcolor99999{
+ color: #999999;
+ font-size: 16px;
}
\ No newline at end of file
From 8197503908597e7b6fdd3059c2bca7a2e3865387 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Wed, 28 Aug 2019 14:11:40 +0800
Subject: [PATCH 13/25] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/react/src/modules/courses/Index.js | 16 ++-
.../comtopicdetails/CompletetopicdePage.js | 102 ++++++++++++++++++
.../comtopicdetails/Completetopicdeswer.js | 81 ++++++++++++++
.../comtopicdetails/Completetopicdetails.js | 81 ++++++++++++++
.../comtopicdetails/completetopicde.css | 38 +++++++
5 files changed, 315 insertions(+), 3 deletions(-)
diff --git a/public/react/src/modules/courses/Index.js b/public/react/src/modules/courses/Index.js
index 9fd0c0ae4..3b88ead8e 100644
--- a/public/react/src/modules/courses/Index.js
+++ b/public/react/src/modules/courses/Index.js
@@ -273,7 +273,11 @@ const GroupjobbankPage =Loadable({
loader: () => import('../../modules/courses/groupjobbank/GroupjobbankPage'),
loading: Loading,
});
-
+//毕设选题详情
+const CompletetopicdePage =Loadable({
+ loader: () => import('../../modules/courses/comtopicdetails/CompletetopicdePage'),
+ loading: Loading,
+});
class CoursesIndex extends Component{
constructor(props) {
super(props)
@@ -452,16 +456,22 @@ class CoursesIndex extends Component{
// console.log(commons)
return (
+ {/*CompletetopicdePage*/}
+ ()
+ }
+ >
{/*GroupjobbankPage*/}
{/*分组作业题库详情*/}
- ()
}
>
{/*Generaljobbankdetails*/}
{/* 普通作业题库详情*/}
- ()
}
diff --git a/public/react/src/modules/courses/comtopicdetails/CompletetopicdePage.js b/public/react/src/modules/courses/comtopicdetails/CompletetopicdePage.js
index e69de29bb..5c3532982 100644
--- a/public/react/src/modules/courses/comtopicdetails/CompletetopicdePage.js
+++ b/public/react/src/modules/courses/comtopicdetails/CompletetopicdePage.js
@@ -0,0 +1,102 @@
+import React, {Component} from "react";
+import {Link, NavLink} from 'react-router-dom';
+import {WordsBtn, ActionBtn} from 'educoder';
+import axios from 'axios';
+import {
+ notification
+} from "antd";
+import CoursesListType from '../coursesPublic/CoursesListType';
+import Completetopicdetails from './Completetopicdetails';
+import '../css/members.css';
+import "../common/formCommon.css";
+import '../css/Courses.css';
+import '../css/busyWork.css';
+import '../poll/pollStyle.css';
+
+class CompletetopicdePage extends Component {
+ //普通作业的题库详情
+ constructor(props) {
+ super(props);
+ // this.answerMdRef = React.createRef();
+
+ }
+
+
+
+
+ componentDidMount() {
+ // console.log("父组件加载框");
+ }
+
+
+
+ homeworkendss(child){
+ // child.homeworkends();
+ }
+
+ homeworkstarts(child){
+ // child.homeworkstart();
+
+ }
+ workshowmodels(child){
+ // child.workshowmodel();
+ }
+ /// 确认是否下载
+
+
+ bindRef = ref => { this.child = ref }
+///////////////教师截止
+
+ render() {
+ let {tab} = this.state;
+
+ const isAdmin = this.props.isAdmin();
+ // console.log(119)
+
+
+ return (
+
+
+
+
+
+
+
+
+ MySQL数据库编程开发实训（基础篇）
+
+
+
+
+
+
+
+ {/*{parseInt(tab) === 1 ?
:""}*/}
+
+
+
-
this.ChangeTab(0)}>内容详情
+
内容详情
发送
编辑
删除
diff --git a/public/react/src/modules/courses/comtopicdetails/Completetopicdetails.js b/public/react/src/modules/courses/comtopicdetails/Completetopicdetails.js
index 9d197375d..0d882f19c 100644
--- a/public/react/src/modules/courses/comtopicdetails/Completetopicdetails.js
+++ b/public/react/src/modules/courses/comtopicdetails/Completetopicdetails.js
@@ -11,7 +11,7 @@ import {
notification,
} from "antd";
import GroupPackage from '../groupjobbank/GroupPackage'
-import './questionbank.css';
+import './completetopicde.css';
class Completetopicdetails extends Component {
From c944c8b5911dee44e2545f9af8c34d302d8551e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Wed, 28 Aug 2019 15:09:38 +0800
Subject: [PATCH 15/25] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../comtopicdetails/CompletetopicdePage.js | 2 +-
.../comtopicdetails/Completetopicdeswer.js | 81 -------------------
.../comtopicdetails/Completetopicdetails.js | 40 ++++++++-
.../comtopicdetails/completetopicde.css | 20 +++++
.../courses/groupjobbank/GroupPackage.js | 2 +-
.../courses/groupjobbank/GroupjobbankPage.js | 6 +-
.../questionbank/Generaljobbankdetails.js | 6 +-
7 files changed, 65 insertions(+), 92 deletions(-)
delete mode 100644 public/react/src/modules/courses/comtopicdetails/Completetopicdeswer.js
diff --git a/public/react/src/modules/courses/comtopicdetails/CompletetopicdePage.js b/public/react/src/modules/courses/comtopicdetails/CompletetopicdePage.js
index 202dc9a8d..db285f584 100644
--- a/public/react/src/modules/courses/comtopicdetails/CompletetopicdePage.js
+++ b/public/react/src/modules/courses/comtopicdetails/CompletetopicdePage.js
@@ -80,7 +80,7 @@ class CompletetopicdePage extends Component {
-
内容详情
+
内容详情
发送
编辑
删除
diff --git a/public/react/src/modules/courses/comtopicdetails/Completetopicdeswer.js b/public/react/src/modules/courses/comtopicdetails/Completetopicdeswer.js
deleted file mode 100644
index b5e141f91..000000000
--- a/public/react/src/modules/courses/comtopicdetails/Completetopicdeswer.js
+++ /dev/null
@@ -1,81 +0,0 @@
-import React, {Component} from "react";
-import { WordsBtn,on, off, trigger,markdownToHTML,getImageUrl} from 'educoder';
-import {
- Button,
- Checkbox,
- message,
- InputNumber,
- DatePicker,
- Radio,
- Tooltip,
- notification,
-} from "antd";
-import GroupPackage from '../groupjobbank/GroupPackage'
-import './completetopicde.css';
-
-
-class Completetopicdeswer extends Component {
-
- constructor(props) {
- super(props);
-
- this.state = {
-
- }
- }
-
- componentDidMount() {
- console.log("Generaljobdetails");
- console.log("componentDidMount");
- // let query = this.props.location.pathname;
- // const type = query.split('/');
- // this.setState({
- // shixuntypes:type[3]
- // })
- // this.props.triggerRef(this);
-
-
-
-
- }
- // 获取数据地方
- getTrainingjobsetting = () => {
- var homeworkid = this.props.match.params.homeworkid;
- }
-
- //跳转道描点的地方
- scrollToAnchor = (anchorName) => {
- if (anchorName) {
- // 找到锚点
- let anchorElement = document.getElementById(anchorName);
- // 如果对应id的锚点存在，就跳转到锚点
- if(anchorElement) { anchorElement.scrollIntoView(); }
- }
- };
-
-
-
- render() {
-
- return (
-
-
-
- )
- }
-}
-
-export default Completetopicdeswer;
\ No newline at end of file
diff --git a/public/react/src/modules/courses/comtopicdetails/Completetopicdetails.js b/public/react/src/modules/courses/comtopicdetails/Completetopicdetails.js
index 0d882f19c..15b4c24cf 100644
--- a/public/react/src/modules/courses/comtopicdetails/Completetopicdetails.js
+++ b/public/react/src/modules/courses/comtopicdetails/Completetopicdetails.js
@@ -58,7 +58,8 @@ class Completetopicdetails extends Component {
render() {
return (
-
+
+
+
+
+
+ 课题类型：
+ 设计
+
+
+ 课题来源：
+ 生产/社会实践
+
+
+ 课题性质1：
+ 设计
+
+
+ 课题性质2：
+ 设计
+
+
+
+
+ 课题重复情况：
+ 新需求
+
+
+ 调研或实习地点：
+ 长沙
+
+
+ 课题单位来源：
+ 湖南省据C++创始人Stroustrup有限公司
+
+
+
diff --git a/public/react/src/modules/courses/comtopicdetails/completetopicde.css b/public/react/src/modules/courses/comtopicdetails/completetopicde.css
index f7dbe6331..fd566ffdc 100644
--- a/public/react/src/modules/courses/comtopicdetails/completetopicde.css
+++ b/public/react/src/modules/courses/comtopicdetails/completetopicde.css
@@ -35,4 +35,24 @@
.ysltextcolor99999{
color: #999999;
font-size: 16px;
+}
+.yslboomdivs{
+
+ display: flex;
+ justify-content:flex-start;
+}
+.yslboomdivs p{
+ width: 282px;
+}
+.yslboomdivs p span {
+ text-align: left;
+}
+.yslboomdivsy{
+ color: #999999;
+ font-size: 14px;
+
+}
+.yslboomdivsys{
+ color: #666666;
+ font-size: 14px;
}
\ No newline at end of file
diff --git a/public/react/src/modules/courses/groupjobbank/GroupPackage.js b/public/react/src/modules/courses/groupjobbank/GroupPackage.js
index 22329c8ad..47dc4e3ee 100644
--- a/public/react/src/modules/courses/groupjobbank/GroupPackage.js
+++ b/public/react/src/modules/courses/groupjobbank/GroupPackage.js
@@ -61,7 +61,7 @@ class GroupPackage extends Component {
+ className="mr12 overflowHidden1" length="58" style={{maxWidth:'480px',color:"#999999",fontSize:"16px",}}>
清除浏览器缓存或换个浏览器操作指南更新版本.zip
{2}
diff --git a/public/react/src/modules/courses/groupjobbank/GroupjobbankPage.js b/public/react/src/modules/courses/groupjobbank/GroupjobbankPage.js
index 837e06a80..bf9373274 100644
--- a/public/react/src/modules/courses/groupjobbank/GroupjobbankPage.js
+++ b/public/react/src/modules/courses/groupjobbank/GroupjobbankPage.js
@@ -15,7 +15,7 @@ import '../css/busyWork.css';
import '../poll/pollStyle.css';
class GroupjobbankPage extends Component {
- //分组作业的题库详情
+ //分组作业内容详情
constructor(props) {
super(props);
// this.answerMdRef = React.createRef();
@@ -124,8 +124,8 @@ class GroupjobbankPage extends Component {
-
this.ChangeTab(0)}>内容详情
-
this.ChangeTab(1)}>参考答案
+
this.ChangeTab(0)}>内容详情
+
this.ChangeTab(1)}>参考答案
发送
编辑
删除
diff --git a/public/react/src/modules/courses/questionbank/Generaljobbankdetails.js b/public/react/src/modules/courses/questionbank/Generaljobbankdetails.js
index 39adf8246..49e2a5173 100644
--- a/public/react/src/modules/courses/questionbank/Generaljobbankdetails.js
+++ b/public/react/src/modules/courses/questionbank/Generaljobbankdetails.js
@@ -15,7 +15,7 @@ import '../css/busyWork.css';
import '../poll/pollStyle.css';
class Generaljobbankdetails extends Component {
- //普通作业的题库详情
+ //普通作业内容详情
constructor(props) {
super(props);
// this.answerMdRef = React.createRef();
@@ -124,8 +124,8 @@ class Generaljobbankdetails extends Component {
-
this.ChangeTab(0)}>内容详情
-
this.ChangeTab(1)}>参考答案
+
this.ChangeTab(0)}>内容详情
+
this.ChangeTab(1)}>参考答案
发送
编辑
删除
From 8c168c5839a9807a45958ea6ea90a9c3ac0772d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Wed, 28 Aug 2019 15:17:31 +0800
Subject: [PATCH 16/25] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Completetaskdetails.js | 84 ++++++++++++++++++
.../completetaskdetails/Completetaskpage.js | 88 +++++++++++++++++++
.../completetaskdetails.css | 0
3 files changed, 172 insertions(+)
create mode 100644 public/react/src/modules/courses/completetaskdetails/Completetaskdetails.js
create mode 100644 public/react/src/modules/courses/completetaskdetails/Completetaskpage.js
create mode 100644 public/react/src/modules/courses/completetaskdetails/completetaskdetails.css
diff --git a/public/react/src/modules/courses/completetaskdetails/Completetaskdetails.js b/public/react/src/modules/courses/completetaskdetails/Completetaskdetails.js
new file mode 100644
index 000000000..7cb9ffb86
--- /dev/null
+++ b/public/react/src/modules/courses/completetaskdetails/Completetaskdetails.js
@@ -0,0 +1,84 @@
+import React, {Component} from "react";
+import { WordsBtn,on, off, trigger,markdownToHTML,getImageUrl} from 'educoder';
+import {
+ Button,
+ Checkbox,
+ message,
+ InputNumber,
+ DatePicker,
+ Radio,
+ Tooltip,
+ notification,
+} from "antd";
+import './questionbanks.css';
+import GroupPackage from "../groupjobbank/GroupPackage";
+import GroupPackage2 from "../groupjobbank/GroupPackage2";
+
+
+class Groupjobbandetails extends Component {
+
+ constructor(props) {
+ super(props);
+
+ this.state = {
+
+ }
+ }
+
+ componentDidMount() {
+ console.log("Groupjobbandetails");
+ console.log("componentDidMount");
+ // let query = this.props.location.pathname;
+ // const type = query.split('/');
+ // this.setState({
+ // shixuntypes:type[3]
+ // })
+ // this.props.triggerRef(this);
+
+
+
+
+ }
+ // 获取数据地方
+ getTrainingjobsetting = () => {
+ var homeworkid = this.props.match.params.homeworkid;
+ }
+
+ //跳转道描点的地方
+ scrollToAnchor = (anchorName) => {
+ if (anchorName) {
+ // 找到锚点
+ let anchorElement = document.getElementById(anchorName);
+ // 如果对应id的锚点存在，就跳转到锚点
+ if(anchorElement) { anchorElement.scrollIntoView(); }
+ }
+ };
+
+
+
+ render() {
+
+ return (
+
+
+
+ )
+ }
+}
+
+export default Groupjobbandetails;
\ No newline at end of file
diff --git a/public/react/src/modules/courses/completetaskdetails/Completetaskpage.js b/public/react/src/modules/courses/completetaskdetails/Completetaskpage.js
new file mode 100644
index 000000000..ddd34a424
--- /dev/null
+++ b/public/react/src/modules/courses/completetaskdetails/Completetaskpage.js
@@ -0,0 +1,88 @@
+import React, {Component} from "react";
+import {Link, NavLink} from 'react-router-dom';
+import {WordsBtn, ActionBtn} from 'educoder';
+import axios from 'axios';
+import {
+ notification
+} from "antd";
+import CoursesListType from '../coursesPublic/CoursesListType';
+import Completetaskdetails from './Completetaskdetails';
+import '../css/members.css';
+import "../common/formCommon.css";
+import '../css/Courses.css';
+import '../css/busyWork.css';
+import '../poll/pollStyle.css';
+
+class Completetaskpage extends Component {
+ //分组作业内容详情
+ constructor(props) {
+ super(props);
+ // this.answerMdRef = React.createRef();
+
+
+ }
+
+
+
+ componentDidMount() {
+ // console.log("父组件加载框");
+
+ }
+
+
+
+
+ bindRef = ref => { this.child = ref }
+///////////////教师截止
+
+ render() {
+
+ const isAdmin = this.props.isAdmin();
+ // console.log(119)
+
+
+ return (
+
+
+
+
+
+
+
+
+ MySQL数据库编程开发实训（基础篇）
+
+
+
+
+
+
+
+
+
+
+ )
+ }
+}
+
+export default Completetaskpage;
+
diff --git a/public/react/src/modules/courses/completetaskdetails/completetaskdetails.css b/public/react/src/modules/courses/completetaskdetails/completetaskdetails.css
new file mode 100644
index 000000000..e69de29bb
From 17efffcaa3a70b1c13cb47dec60fb7fd3d37df13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Wed, 28 Aug 2019 15:56:28 +0800
Subject: [PATCH 17/25] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/react/src/modules/courses/Index.js | 19 ++++--
.../Completetaskdetails.js | 2 +-
.../completetaskdetails.css | 58 +++++++++++++++++++
.../courses/groupjobbank/GroupPackage.js | 17 +++++-
.../courses/groupjobbank/questionbanks.css | 3 +
5 files changed, 92 insertions(+), 7 deletions(-)
diff --git a/public/react/src/modules/courses/Index.js b/public/react/src/modules/courses/Index.js
index 3b88ead8e..9f278e807 100644
--- a/public/react/src/modules/courses/Index.js
+++ b/public/react/src/modules/courses/Index.js
@@ -278,6 +278,11 @@ const CompletetopicdePage =Loadable({
loader: () => import('../../modules/courses/comtopicdetails/CompletetopicdePage'),
loading: Loading,
});
+//毕设任务详情
+const Completetaskpage =Loadable({
+ loader: () => import('../../modules/courses/completetaskdetails/Completetaskpage'),
+ loading: Loading,
+});
class CoursesIndex extends Component{
constructor(props) {
super(props)
@@ -456,22 +461,28 @@ class CoursesIndex extends Component{
// console.log(commons)
return (
- {/*CompletetopicdePage*/}
- ()
+ }
+ >
+ {/*毕设内容题库详情*/}
+ ()
}
>
{/*GroupjobbankPage*/}
{/*分组作业题库详情*/}
- ()
}
>
{/*Generaljobbankdetails*/}
{/* 普通作业题库详情*/}
- ()
}
diff --git a/public/react/src/modules/courses/completetaskdetails/Completetaskdetails.js b/public/react/src/modules/courses/completetaskdetails/Completetaskdetails.js
index 7cb9ffb86..850ed2b89 100644
--- a/public/react/src/modules/courses/completetaskdetails/Completetaskdetails.js
+++ b/public/react/src/modules/courses/completetaskdetails/Completetaskdetails.js
@@ -10,7 +10,7 @@ import {
Tooltip,
notification,
} from "antd";
-import './questionbanks.css';
+import './completetaskdetails.css';
import GroupPackage from "../groupjobbank/GroupPackage";
import GroupPackage2 from "../groupjobbank/GroupPackage2";
diff --git a/public/react/src/modules/courses/completetaskdetails/completetaskdetails.css b/public/react/src/modules/courses/completetaskdetails/completetaskdetails.css
index e69de29bb..fd1b10f51 100644
--- a/public/react/src/modules/courses/completetaskdetails/completetaskdetails.css
+++ b/public/react/src/modules/courses/completetaskdetails/completetaskdetails.css
@@ -0,0 +1,58 @@
+.yslquestionbank1{
+ padding-top: 30px !important;
+ padding-right: 30px !important;
+ padding-left: 30px !important;
+}
+.yslquesHeigth{
+ min-height: 500px !important;
+
+}
+.yslquesmarkdowntext{
+ font-size: 16px;
+ color: #707070;
+
+}
+.yslquesmat26{
+ margin-top: 26px;
+ padding-bottom: 33px !important;
+}
+.ysltextcolor9999{
+ color: #999999;
+ font-size: 14px;
+}
+.ysltextcolor66{
+ color: #666666;
+ font-size: 14px;
+}
+.ysltextcolor05{
+ color: #05101A;
+ font-size: 14px;
+}
+.ml47text{
+ margin-left: 17px;
+ padding-bottom: 37px;
+}
+.ysltextcolor99999{
+ color: #999999;
+ font-size: 16px;
+}
+.yslboomdivs{
+
+ display: flex;
+ justify-content:flex-start;
+}
+.yslboomdivs p{
+ width: 282px;
+}
+.yslboomdivs p span {
+ text-align: left;
+}
+.yslboomdivsy{
+ color: #999999;
+ font-size: 14px;
+
+}
+.yslboomdivsys{
+ color: #666666;
+ font-size: 14px;
+}
\ No newline at end of file
diff --git a/public/react/src/modules/courses/groupjobbank/GroupPackage.js b/public/react/src/modules/courses/groupjobbank/GroupPackage.js
index 47dc4e3ee..8014585d1 100644
--- a/public/react/src/modules/courses/groupjobbank/GroupPackage.js
+++ b/public/react/src/modules/courses/groupjobbank/GroupPackage.js
@@ -60,9 +60,22 @@ class GroupPackage extends Component {
+
- 清除浏览器缓存或换个浏览器操作指南更新版本.zip
+ className="mr12 yslahover overflowHidden1" length="58" style={{maxWidth:'480px',fontSize:"16px",}}>
+ 清除浏览器缓存或换个浏览器操作指南更新版本.zip
{2}
diff --git a/public/react/src/modules/courses/groupjobbank/questionbanks.css b/public/react/src/modules/courses/groupjobbank/questionbanks.css
index f7dbe6331..aae0c979f 100644
--- a/public/react/src/modules/courses/groupjobbank/questionbanks.css
+++ b/public/react/src/modules/courses/groupjobbank/questionbanks.css
@@ -35,4 +35,7 @@
.ysltextcolor99999{
color: #999999;
font-size: 16px;
+}
+.yslahover {
+ color: #999999 ;
}
\ No newline at end of file
From b63e0a9d68b33b827b0d5c20539fba7bf68442c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Wed, 28 Aug 2019 16:30:16 +0800
Subject: [PATCH 18/25] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../completetaskdetails/Completetaskpage.js | 58 +++++++++++-
.../comtopicdetails/CompletetopicdePage.js | 68 +++++++++++---
.../courses/groupjobbank/GroupjobbankPage.js | 77 +++++++++++-----
.../questionbank/Generaljobbankdetails.js | 89 ++++++++++++-------
4 files changed, 219 insertions(+), 73 deletions(-)
diff --git a/public/react/src/modules/courses/completetaskdetails/Completetaskpage.js b/public/react/src/modules/courses/completetaskdetails/Completetaskpage.js
index ddd34a424..d7cd7a62c 100644
--- a/public/react/src/modules/courses/completetaskdetails/Completetaskpage.js
+++ b/public/react/src/modules/courses/completetaskdetails/Completetaskpage.js
@@ -18,17 +18,67 @@ class Completetaskpage extends Component {
constructor(props) {
super(props);
// this.answerMdRef = React.createRef();
-
-
+ this.setState({
+ workid:1,
+ isSpin:false,
+ datas:[],
+ })
}
componentDidMount() {
// console.log("父组件加载框");
-
+ if( this.props.match.params.workid){
+ this.setState({
+ workid: this.props.match.params.workid,
+ })
+ }
+ this.getdata(this.props.match.params.workid);
+ }
+ // 获取数据的地方
+ getdata=(workid)=>{
+ var workids= workid;
+ if(workids){
+
+ }else{
+ workids=this.state.workid;
+ }
+ this.setState({
+ isSpin:true,
+ })
+ let url = `/homework_banks/${workids}.json`;
+ //
+ axios.get(url).then((response) => {
+ if(response){
+ if(response.data){
+ this.setState({
+ datas:response.data.informs,
+ })
+ }else {
+ this.setState({
+ datas:[],
+
+ })
+
+ }
+ }else {
+ this.setState({
+ datas:[],
+ })
+
+ }
+ this.setState({
+ isSpin:false,
+ })
+ }).catch((error) => {
+ console.log(error)
+ this.setState({
+ datas:[],
+ isSpin:false,
+ })
+ });
}
-
diff --git a/public/react/src/modules/courses/comtopicdetails/CompletetopicdePage.js b/public/react/src/modules/courses/comtopicdetails/CompletetopicdePage.js
index db285f584..cde4f5f5e 100644
--- a/public/react/src/modules/courses/comtopicdetails/CompletetopicdePage.js
+++ b/public/react/src/modules/courses/comtopicdetails/CompletetopicdePage.js
@@ -1,6 +1,7 @@
import React, {Component} from "react";
import {Link, NavLink} from 'react-router-dom';
import {WordsBtn, ActionBtn} from 'educoder';
+import { Input,Checkbox,Table, Pagination, Modal,Menu, Tooltip,Spin,Button,Form } from "antd";
import axios from 'axios';
import {
notification
@@ -18,29 +19,68 @@ class CompletetopicdePage extends Component {
constructor(props) {
super(props);
// this.answerMdRef = React.createRef();
-
+ this.setState({
+ workid:1,
+ isSpin:false,
+ datas:[],
+ })
}
componentDidMount() {
- // console.log("父组件加载框");
+ if( this.props.match.params.workid){
+ this.setState({
+ workid: this.props.match.params.workid,
+ })
+ }
+ this.getdata(this.props.match.params.workid);
}
-
-
-
- homeworkendss(child){
- // child.homeworkends();
+ //获取数据的地方
+ getdata=(workid)=>{
+ var workids= workid;
+ if(workids){
+
+ }else{
+ workids=this.state.workid;
+ }
+ this.setState({
+ isSpin:true,
+ })
+ let url = `/homework_banks/${workids}.json`;
+ //
+ axios.get(url).then((response) => {
+ if(response){
+ if(response.data){
+ this.setState({
+ datas:response.data.informs,
+ })
+ }else {
+ this.setState({
+ datas:[],
+
+ })
+
+ }
+ }else {
+ this.setState({
+ datas:[],
+ })
+
+ }
+ this.setState({
+ isSpin:false,
+ })
+ }).catch((error) => {
+ console.log(error)
+ this.setState({
+ datas:[],
+ isSpin:false,
+ })
+ });
}
- homeworkstarts(child){
- // child.homeworkstart();
-
- }
- workshowmodels(child){
- // child.workshowmodel();
- }
/// 确认是否下载
diff --git a/public/react/src/modules/courses/groupjobbank/GroupjobbankPage.js b/public/react/src/modules/courses/groupjobbank/GroupjobbankPage.js
index bf9373274..27827eb28 100644
--- a/public/react/src/modules/courses/groupjobbank/GroupjobbankPage.js
+++ b/public/react/src/modules/courses/groupjobbank/GroupjobbankPage.js
@@ -1,6 +1,7 @@
import React, {Component} from "react";
import {Link, NavLink} from 'react-router-dom';
import {WordsBtn, ActionBtn} from 'educoder';
+import { Input,Checkbox,Table, Pagination, Modal,Menu, Tooltip,Spin,Button,Form } from "antd";
import axios from 'axios';
import {
notification
@@ -21,6 +22,9 @@ class GroupjobbankPage extends Component {
// this.answerMdRef = React.createRef();
this.state = {
tab: ["0"],
+ workid:1,
+ isSpin:false,
+ datas:[],
}
}
@@ -60,41 +64,66 @@ class GroupjobbankPage extends Component {
this.setState({
shixuntypes: types[3]
})
- }
-
-
- confirmysl(child,i) {
- if(i===1){
- child.daochushixunbaogao();
- }
- if(i===2){
- child.daochuzuoye();
+ if( this.props.match.params.workid){
+ this.setState({
+ workid: this.props.match.params.workid,
+ })
}
+ this.getdata(this.props.match.params.workid);
}
+ ///获取数据的地方
+ getdata=(workid)=>{
+ var workids= workid;
+ if(workids){
- homeworkendss(child){
- // child.homeworkends();
- }
-
- homeworkstarts(child){
- // child.homeworkstart();
-
- }
- workshowmodels(child){
- // child.workshowmodel();
+ }else{
+ workids=this.state.workid;
+ }
+ this.setState({
+ isSpin:true,
+ })
+ let url = `/homework_banks/${workids}.json`;
+ //
+ axios.get(url).then((response) => {
+ if(response){
+ if(response.data){
+ this.setState({
+ datas:response.data.informs,
+ })
+ }else {
+ this.setState({
+ datas:[],
+
+ })
+
+ }
+ }else {
+ this.setState({
+ datas:[],
+ })
+
+ }
+ this.setState({
+ isSpin:false,
+ })
+ }).catch((error) => {
+ console.log(error)
+ this.setState({
+ datas:[],
+ isSpin:false,
+ })
+ });
}
- /// 确认是否下载
bindRef = ref => { this.child = ref }
///////////////教师截止
render() {
- let {tab, teacherdatapage, jobsettingsdatapage} = this.state;
+ let {tab} = this.state;
const isAdmin = this.props.isAdmin();
// console.log(119)
- console.log(jobsettingsdatapage);
return (
@@ -132,10 +161,10 @@ class GroupjobbankPage extends Component {
-
+
{parseInt(tab) === 0 ? :""}
{parseInt(tab) === 1 ? :""}
-
+
)
diff --git a/public/react/src/modules/courses/questionbank/Generaljobbankdetails.js b/public/react/src/modules/courses/questionbank/Generaljobbankdetails.js
index 49e2a5173..29453a7b5 100644
--- a/public/react/src/modules/courses/questionbank/Generaljobbankdetails.js
+++ b/public/react/src/modules/courses/questionbank/Generaljobbankdetails.js
@@ -1,6 +1,7 @@
import React, {Component} from "react";
import {Link, NavLink} from 'react-router-dom';
import {WordsBtn, ActionBtn} from 'educoder';
+import { Input,Checkbox,Table, Pagination, Modal,Menu, Tooltip,Spin,Button,Form } from "antd";
import axios from 'axios';
import {
notification
@@ -21,6 +22,9 @@ class Generaljobbankdetails extends Component {
// this.answerMdRef = React.createRef();
this.state = {
tab: ["0"],
+ workid:1,
+ isSpin:false,
+ datas:[],
}
}
@@ -53,48 +57,71 @@ class Generaljobbankdetails extends Component {
// console.log(type);
this.setState({
tab: type[1],
- })
- let querys = this.props.location.pathname;
- const types = querys.split('/');
- // console.log(types);
- this.setState({
- shixuntypes: types[3]
- })
- }
+ });
- confirmysl(child,i) {
- if(i===1){
- child.daochushixunbaogao();
+ console.log("Generaljobbankdetails");
+ console.log(this.props);
+ if( this.props.match.params.workid){
+ this.setState({
+ workid: this.props.match.params.workid,
+ })
}
- if(i===2){
- child.daochuzuoye();
- }
- }
-
- homeworkendss(child){
- // child.homeworkends();
+ this.getdata(this.props.match.params.workid);
}
+ //获取数据的地方
+ getdata=(workid)=>{
+ var workids= workid;
+ if(workids){
- homeworkstarts(child){
- // child.homeworkstart();
-
- }
- workshowmodels(child){
- // child.workshowmodel();
+ }else{
+ workids=this.state.workid;
+ }
+ this.setState({
+ isSpin:true,
+ })
+ let url = `/homework_banks/${workids}.json`;
+ //
+ axios.get(url).then((response) => {
+ if(response){
+ if(response.data){
+ this.setState({
+ datas:response.data.informs,
+ })
+ }else {
+ this.setState({
+ datas:[],
+
+ })
+
+ }
+ }else {
+ this.setState({
+ datas:[],
+ })
+
+ }
+ this.setState({
+ isSpin:false,
+ })
+ }).catch((error) => {
+ console.log(error)
+ this.setState({
+ datas:[],
+ isSpin:false,
+ })
+ });
}
- /// 确认是否下载
bindRef = ref => { this.child = ref }
///////////////教师截止
render() {
- let {tab, teacherdatapage, jobsettingsdatapage} = this.state;
+ let {tab} = this.state;
const isAdmin = this.props.isAdmin();
// console.log(119)
- console.log(jobsettingsdatapage);
return (
@@ -132,10 +159,10 @@ class Generaljobbankdetails extends Component {
-
- {parseInt(tab) === 0 ?
:""}
- {parseInt(tab) === 1 ?
:""}
-
+
+ {parseInt(tab) === 0 ? :""}
+ {parseInt(tab) === 1 ? :""}
+
)
From 4691df45f86222926d9e264855026303d2059b83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Thu, 29 Aug 2019 09:04:35 +0800
Subject: [PATCH 19/25] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../react/src/modules/courses/css/Courses.css | 6 +
.../courses/gradinforms/Bullsubdirectory.js | 2 +-
.../modules/courses/gradinforms/Eduinforms.js | 2 +-
.../src/modules/courses/new/CoursesNew.js | 177 +++++++++++++-----
.../src/modules/courses/new/Goldsubject.js | 172 +++++++++++------
.../react/src/modules/courses/poll/PollNew.js | 2 +-
6 files changed, 258 insertions(+), 103 deletions(-)
diff --git a/public/react/src/modules/courses/css/Courses.css b/public/react/src/modules/courses/css/Courses.css
index 78b6783a0..57f567c9e 100644
--- a/public/react/src/modules/courses/css/Courses.css
+++ b/public/react/src/modules/courses/css/Courses.css
@@ -1063,6 +1063,12 @@ samp {
color: #989898;
margin-left: 40px;
}
+.newcoursestitleysl{
+ font-size: 12px;
+ color: #989898;
+ margin-left: 51px;
+}
+
.coursenavbox .ant-form-item-label{
margin-left:10px;
diff --git a/public/react/src/modules/courses/gradinforms/Bullsubdirectory.js b/public/react/src/modules/courses/gradinforms/Bullsubdirectory.js
index b9ec4b75c..16a99aa8f 100644
--- a/public/react/src/modules/courses/gradinforms/Bullsubdirectory.js
+++ b/public/react/src/modules/courses/gradinforms/Bullsubdirectory.js
@@ -59,7 +59,7 @@ class Bullsubdirectory extends Component{
}
};
changeTopicName = (e) => {
- console.log("调用了changeTopicName");
+ // console.log("调用了changeTopicName");
let num = e.target.value.length;
if(num>60){
diff --git a/public/react/src/modules/courses/gradinforms/Eduinforms.js b/public/react/src/modules/courses/gradinforms/Eduinforms.js
index 10beb4507..b23c33fbb 100644
--- a/public/react/src/modules/courses/gradinforms/Eduinforms.js
+++ b/public/react/src/modules/courses/gradinforms/Eduinforms.js
@@ -107,7 +107,7 @@ class Eduinforms extends Component{
}
};
changeTopicName = (e) => {
- console.log("调用了changeTopicName");
+ // console.log("调用了changeTopicName");
let num = e.target.value.length;
if(num>60){
return;
diff --git a/public/react/src/modules/courses/new/CoursesNew.js b/public/react/src/modules/courses/new/CoursesNew.js
index 6e9c3c166..7ff0a9e4c 100644
--- a/public/react/src/modules/courses/new/CoursesNew.js
+++ b/public/react/src/modules/courses/new/CoursesNew.js
@@ -47,9 +47,7 @@ class CoursesNew extends Component {
checkboxgroup:undefined,
addonAfteronelenone:0,
addonAfteronelentwo:0,
- checkbofrup:[{module_type:"shixun_homework",module_name:"实训作业"},{module_type:"common_homework",module_name:"普通作业"},{module_type:"group_homework",module_name:"分组作业"}
- ,{module_type:"exercise",module_name:"试卷"},{module_type:"poll",module_name:"问卷"},{module_type:"graduation",module_name:"毕业设计"}
- ,{module_type:"board",module_name:"讨论"},{module_type:"attachment",module_name:"资源"},{module_type:"course_group",module_name:"分班"}],
+ bordebool:false,
}
}
componentDidMount() {
@@ -382,8 +380,8 @@ class CoursesNew extends Component {
})
}
handleSearch=(value)=>{
-
-
+ console.log("handleSearchhandleSearch");
+ console.log(value);
if(value!=""){
this.props.form.setFieldsValue({
classroom:value,
@@ -393,13 +391,40 @@ class CoursesNew extends Component {
}
};
+ handleSearchsysl=(value)=>{
+ if(value){
+ this.props.form.setFieldsValue({
+ classroom:value,
+ // course:value
+ });
+ }
+ }
- handleChange=(value)=>{
-
+ handleChange=(e)=>{
this.props.form.setFieldsValue({
- // course:value,
- classroom:value
+ // course:value,
+ classroom:e.target.value,
})
+ if(e.target.value){
+ if(e.target.value.length>60){
+ this.setState({
+ bordebool:true,
+ })
+ }else if(e.target.value.length===0){
+ this.setState({
+ bordebool:true,
+ })
+ }else{
+ this.setState({
+ bordebool:false,
+ })
+ }
+ }else{
+ this.setState({
+ bordebool:true
+ })
+
+ }
};
handleSearchschool=(value)=>{
@@ -469,7 +494,7 @@ class CoursesNew extends Component {
this.applyForAddOrgForm.setVisible(true)
}
render() {
- let {datatime,school,searchlistscholl} = this.state;
+ let {datatime,school,searchlistscholl,bordebool} = this.state;
const {getFieldDecorator} = this.props.form;
const propsWithoutForm = Object.assign({}, this.props)
delete propsWithoutForm.form
@@ -491,6 +516,16 @@ class CoursesNew extends Component {
if(addonAftertwo){
addonAfteronelens=String(addonAftertwo).length;
}
+ var addonAfterthree=this.props.form&&this.props.form.getFieldValue('course');
+ var addonAfteronelens3=0;
+ if(addonAfterthree){
+ addonAfteronelens3=String(addonAfterthree).length;
+ }
+ var addonAfterfour=this.props.form&&this.props.form.getFieldValue('classroom');
+ var addonAfteronelens4=0;
+ if(addonAfterfour){
+ addonAfteronelens4=String(addonAfterfour).length;
+ }
return (
@@ -545,27 +580,23 @@ class CoursesNew extends Component {
`}
-
@@ -619,14 +683,41 @@ class CoursesNew extends Component {
}
+
+
{getFieldDecorator('classroom', {
rules: [{required: true, message: "不能为空"}],
- })()}
-
+ })()}
+
{/*（如果本学期包含多个班级，只需创建一个课堂然后在课堂内部建立不同的分班）*/}
-
+
正确示例：数据结构2019春季班级
@@ -675,11 +766,7 @@ class CoursesNew extends Component {
rules:[{
pattern: new RegExp(/^[0-9]+([.]{1}[0-9]+){0,1}$/, "g"),
message: '必须是数值'
- },
- {
- max:5,
- message: '不能超过5个字符',
- }]}
+ }]}
)(
)}
@@ -694,11 +781,7 @@ class CoursesNew extends Component {
rules:[{
pattern: new RegExp(/^[0-9]+([.]{1}[0-9]+){0,1}$/, "g"),
message: '必须是数值'
- },
- {
- max:5,
- message: '不能超过5个字符',
- }
+ }
]}
)(
diff --git a/public/react/src/modules/courses/new/Goldsubject.js b/public/react/src/modules/courses/new/Goldsubject.js
index 5149d3e5a..c9642f458 100644
--- a/public/react/src/modules/courses/new/Goldsubject.js
+++ b/public/react/src/modules/courses/new/Goldsubject.js
@@ -54,12 +54,7 @@ class Goldsubject extends Component {
addonAfteronelenone:"",
addonAfteronelentwo:"",
Whethertocreateanewclassroom:true,
- checkbofrup:[
- {module_type:"announcement",module_name:"公告栏"},{module_type:"online_learning",module_name:"在线学习"}
- ,{module_type:"shixun_homework",module_name:"实训作业"},{module_type:"common_homework",module_name:"普通作业"}
- ,{module_type:"exercise",module_name:"试卷"},{module_type:"poll",module_name:"问卷"}
- ,{module_type:"attachment",module_name:"资源"},{module_type:"board",module_name:"讨论"},{module_type:"course_group",module_name:"分班"},],
-
+ bordebool:false,
}
}
// disabledEndDate= endValue => {
@@ -110,8 +105,8 @@ class Goldsubject extends Component {
};
componentDidMount() {
- console.log("新建精品课堂的数据");
- console.log(this.props);
+ // console.log("新建精品课堂的数据");
+ // console.log(this.props);
let coursesId = this.props.match.params.coursesId;
let user_school=this.props.current_user&&this.props.current_user.user_school;
@@ -164,8 +159,8 @@ class Goldsubject extends Component {
if (response) {
// this.goback
if(response.data){
- console.log("获取Goldsubject.js");
- console.log(response.data);
+ // console.log("获取Goldsubject.js");
+ // console.log(response.data);
if(response.data.status===0){
this.props.form.setFieldsValue({
classroom: response.data.course_name,
@@ -206,20 +201,20 @@ class Goldsubject extends Component {
}
}
onChangeTimepublishs = (date, dateString) => {
- console.log("结束时间11111111111");
- console.log(dateString);
+ // console.log("结束时间11111111111");
+ // console.log(dateString);
if(dateString===""){
this.setState({
datatime: undefined,
})
- console.log("结束时间111111111116");
+ // console.log("结束时间111111111116");
this.props.form.setFieldsValue({
endtime:undefined,
});
}else{
- console.log("结束时间111111111117");
+ // console.log("结束时间111111111117");
this.setState({
datatime: dateString,
@@ -231,10 +226,10 @@ class Goldsubject extends Component {
};
onChangeTimepublishstwo = (date, dateString) => {
- console.log("结束时间22222222222");
- console.log(dateString);
+ // console.log("结束时间22222222222");
+ // console.log(dateString);
if(dateString===""){
- console.log("结束时间222222222223");
+ // console.log("结束时间222222222223");
this.setState({
datatimetwo: undefined,
})
@@ -242,7 +237,7 @@ class Goldsubject extends Component {
starttime: undefined,
});
}else{
- console.log("结束时间222222222224");
+ // console.log("结束时间222222222224");
this.setState({
datatimetwo: dateString,
@@ -320,13 +315,23 @@ class Goldsubject extends Component {
if (!err) {
+ var classroomysl=values.classroom+"";
+
+ try {
+ if(classroomysl){
+ if(classroomysl.length>60){
+ classroomysl=classroomysl.substring(0,60);
+ }
+ }
+ }catch (e) {
+ }
// console.log('Received values of form: ', values);
var datasysl={
// subject_id:128, //这是带过来的值 编辑就不要传值了
- name: values.classroom,
+ name: classroomysl,
class_period: values.period,
credit: parseFloat(values.credit),
start_date:moment(values.starttime).format("YYYY-MM-DD"),
@@ -336,12 +341,12 @@ class Goldsubject extends Component {
school:values.school
};
try {
- console.log("327");
- console.log(datasysl);
+ // console.log("327");
+ // console.log(datasysl);
// console.log(JSON.stringify(datasysl));
- console.log("88887777");
- console.log(moment(values.starttime).format("YYYY-MM-DD"));
- console.log(moment(values.endtime).format("YYYY-MM-DD"));
+ // console.log("88887777");
+ // console.log(moment(values.starttime).format("YYYY-MM-DD"));
+ // console.log(moment(values.endtime).format("YYYY-MM-DD"));
}catch (e) {
}
@@ -375,15 +380,15 @@ class Goldsubject extends Component {
})
}
- console.log("错误信息信息信息1");
- console.log(err);
- console.log(values.starttime);
- console.log(values.endtime);
+ // console.log("错误信息信息信息1");
+ // console.log(err);
+ // console.log(values.starttime);
+ // console.log(values.endtime);
});
} else {
this.props.form.validateFields((err, values) => {
- console.log("错误信息信息信息2");
+ // console.log("错误信息信息信息2");
console.log(err);
if (err) {
return;
@@ -419,11 +424,11 @@ class Goldsubject extends Component {
school:values.school
};
try {
- console.log("提交的ysldatas数据");
- console.log(ysldatas);
+ // console.log("提交的ysldatas数据");
+ // console.log(ysldatas);
// console.log(JSON.stringify(ysldatas));
- console.log(moment(values.starttime).format("YYYY-MM-DD"));
- console.log(moment(values.endtime).format("YYYY-MM-DD"));
+ // console.log(moment(values.starttime).format("YYYY-MM-DD"));
+ // console.log(moment(values.endtime).format("YYYY-MM-DD"));
}catch (e) {
}
@@ -527,12 +532,33 @@ class Goldsubject extends Component {
};
- handleChange=(value)=>{
-
+ handleChange=(e)=>{
+ console.log(e);
this.props.form.setFieldsValue({
// course:value,
- classroom:value
+ classroom:e.target.value,
})
+ if(e.target.value){
+ if(e.target.value.length>60){
+ this.setState({
+ bordebool:true,
+ })
+ }else if(e.target.value.length===0){
+ this.setState({
+ bordebool:true,
+ })
+ }else{
+ this.setState({
+ bordebool:false,
+ })
+ }
+ }else{
+ this.setState({
+ bordebool:true
+ })
+
+ }
+
};
handleSearchschool=(value)=>{
@@ -602,7 +628,7 @@ class Goldsubject extends Component {
this.applyForAddOrgForm.setVisible(true)
}
render() {
- let {datatime,datatimetwo,school,searchlistscholl,Whethertocreateanewclassroom,addonAfteronelenone,addonAfteronelentwo} = this.state;
+ let {datatime,datatimetwo,school,bordebool,searchlistscholl,Whethertocreateanewclassroom,addonAfteronelenone,addonAfteronelentwo} = this.state;
const {getFieldDecorator} = this.props.form;
const propsWithoutForm = Object.assign({}, this.props)
delete propsWithoutForm.form
@@ -624,8 +650,12 @@ class Goldsubject extends Component {
if(addonAftertwo){
addonAfteronelens=String(addonAftertwo).length;
}
- console.log(addonAfteronelenone);
- console.log(addonAfteronelentwo);
+ var addonAfterthree=this.props.form&&this.props.form.getFieldValue('classroom');
+ var addonAfteronelens3=0;
+ if(addonAfterthree){
+ addonAfteronelens3=String(addonAfterthree).length;
+ }
+
return (
@@ -687,20 +717,16 @@ class Goldsubject extends Component {
.ant-select-dropdown{
// top: 221px !important;
// left: 115px !important;
- width: 280px !important;
height: 160px;
}
.ant-select-dropdown-menu{
- width: 280px !important;
height: 160px;
}
.construction .ant-input{
- width: 280px !important;
margin-left: 0px !important;
}
.construction {
- width: 280px;
- margin-left: 10px;
+ margin-left: 11px;
}
.construction .ant-select-selection__placeholder, .ant-select-search__field__placeholder {
@@ -753,19 +779,61 @@ class Goldsubject extends Component {
}
-
+
+
{getFieldDecorator('classroom', {
- rules: [{required: true, message: "不能为空"}],
+ rules: [{required: true, message: "不能为空"}],
})(
-
- {options}
+
)}
{/**/}
@@ -863,7 +931,6 @@ class Goldsubject extends Component {
width={"210px"}
value={datatimetwo === undefined ? "" :datatimetwo === null ? "" : moment(datatimetwo, dateFormat)}
disabledTime={disabledDateTime}
- disabledDate={this.isabledStartDate}
dropdownClassName="hideDisable"
onChange={this.onChangeTimepublishstwo}
/>
@@ -887,7 +954,6 @@ class Goldsubject extends Component {
width={"210px"}
value={datatime === undefined ? "" :datatime === null ? "" : moment(datatime, dateFormat)}
disabledTime={disabledDateTime}
- disabledDate={this.disabledEndDate}
dropdownClassName="hideDisable"
onChange={this.onChangeTimepublishs}
/>
diff --git a/public/react/src/modules/courses/poll/PollNew.js b/public/react/src/modules/courses/poll/PollNew.js
index 27194e5e0..ea84586d8 100644
--- a/public/react/src/modules/courses/poll/PollNew.js
+++ b/public/react/src/modules/courses/poll/PollNew.js
@@ -77,7 +77,7 @@ class PollNew extends Component {
}
changeTopicName = (e) => {
- console.log("调用了changeTopicName");
+ // console.log("调用了changeTopicName");
let num = parseInt(e.target.value.length);
if(num>60){
return;
From bcf097ecbdd18f0e7eec53d2cda725441bd75f1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Thu, 29 Aug 2019 09:53:19 +0800
Subject: [PATCH 20/25] b
---
public/react/config/webpack.config.dev.js | 2 +-
public/react/config/webpack.config.prod.js | 3 +
.../modules/courses/members/studentsList.js | 99 ++++++++-----------
3 files changed, 46 insertions(+), 58 deletions(-)
diff --git a/public/react/config/webpack.config.dev.js b/public/react/config/webpack.config.dev.js
index f126bc363..9b9d16406 100644
--- a/public/react/config/webpack.config.dev.js
+++ b/public/react/config/webpack.config.dev.js
@@ -31,7 +31,7 @@ module.exports = {
// See the discussion in https://github.com/facebookincubator/create-react-app/issues/343.s
// devtool: "cheap-module-eval-source-map",
// 开启调试
- devtool: "source-map", // 开启调试
+ // devtool: "source-map", // 开启调试
// These are the "entry points" to our application.
// This means they will be the "root" imports that are included in JS bundle.
// The first two entry points enable "hot" CSS and auto-refreshes for JS.
diff --git a/public/react/config/webpack.config.prod.js b/public/react/config/webpack.config.prod.js
index 7b9795e80..e1da1d12a 100644
--- a/public/react/config/webpack.config.prod.js
+++ b/public/react/config/webpack.config.prod.js
@@ -54,6 +54,9 @@ const extractTextPluginOptions = shouldUseRelativeAssetPaths
// console.log('publicPath ', publicPath)
module.exports = {
+ externals: {
+ 'react': 'window.React'
+ },
// Don't attempt to continue if there are any errors.
bail: true,
// We generate sourcemaps in production. This is slow but gives good results.
diff --git a/public/react/src/modules/courses/members/studentsList.js b/public/react/src/modules/courses/members/studentsList.js
index 3462438f8..da95278a6 100644
--- a/public/react/src/modules/courses/members/studentsList.js
+++ b/public/react/src/modules/courses/members/studentsList.js
@@ -129,7 +129,7 @@ class studentsList extends Component{
}
/// 确认是否下载
confirmysl(url){
- axios.get(url + '&export=true').then((response) => {
+ axios.get(url).then((response) => {
if(response === undefined){
return
}
@@ -506,7 +506,10 @@ class studentsList extends Component{
const { course_group_name, invite_code } = this.state;
const courseId = this.props.match.params.coursesId
- let exportUrl = `/courses/${courseId}/export_member_scores_excel.xlsx?`
+ let exportUrl = `/courses/${courseId}/export_member_scores_excel.xlsx?`; //总成绩
+ let exportUrltwo = `/courses/${courseId}/export_couser_info.xlsx?`; //课堂信息
+ let exportUrlthree = `/courses/${courseId}/export_couser_info.xlsx?`; //活跃度
+
const params = {}
if (course_group_id) {
params.group_id = course_group_id
@@ -522,6 +525,8 @@ class studentsList extends Component{
paramsString += `${key}=${params[key]}&`
}
exportUrl += paramsString;
+ exportUrltwo+=paramsString;
+ exportUrlthree+=paramsString;
return(
this.addDir()}>添加分班 }
{ isAdmin && !isParent && course_group_id != 0 && this.deleteDir()}>删除分班 }
{ isAdmin && !isParent && course_group_id != 0 && this.renameDir()}>分班重命名 }
- { isAdmin && this.confirmysl(exportUrl)} >导出成绩 }
+
+ { isAdmin &&
+
+ 导出
+
+
+ }
+ {/*this.confirmysl(exportUrl)} >导出成绩*/}
{/* */}
}
@@ -576,60 +615,6 @@ class studentsList extends Component{
}
onPressEnter={this.onPressEnter}
>
- {/* */}
-
-
-
{
total_count > 0 || this.state.isSpin == true ?
From 5926f74e3a76544e3314ae97aa4f9daf43018503 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Thu, 29 Aug 2019 10:20:16 +0800
Subject: [PATCH 21/25] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/react/config/webpack.config.prod.js | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/public/react/config/webpack.config.prod.js b/public/react/config/webpack.config.prod.js
index e1da1d12a..f6960d77c 100644
--- a/public/react/config/webpack.config.prod.js
+++ b/public/react/config/webpack.config.prod.js
@@ -54,9 +54,9 @@ const extractTextPluginOptions = shouldUseRelativeAssetPaths
// console.log('publicPath ', publicPath)
module.exports = {
- externals: {
- 'react': 'window.React'
- },
+ // externals: {
+ // 'react': 'window.React'
+ // },
// Don't attempt to continue if there are any errors.
bail: true,
// We generate sourcemaps in production. This is slow but gives good results.
From 1ff58b6c57e31816e68bb6a6c815bb734719dfd6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Thu, 29 Aug 2019 10:24:40 +0800
Subject: [PATCH 22/25] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/react/config/webpack.config.dev.js | 1 +
public/react/config/webpack.config.prod.js | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/public/react/config/webpack.config.dev.js b/public/react/config/webpack.config.dev.js
index 9b9d16406..1adf3aef9 100644
--- a/public/react/config/webpack.config.dev.js
+++ b/public/react/config/webpack.config.dev.js
@@ -26,6 +26,7 @@ const env = getClientEnvironment(publicUrl);
// This is the development configuration.
// It is focused on developer experience and fast rebuilds.
// The production configuration is different and lives in a separate file.
+// 测试用的
module.exports = {
// You may want 'eval' instead if you prefer to see the compiled output in DevTools.
// See the discussion in https://github.com/facebookincubator/create-react-app/issues/343.s
diff --git a/public/react/config/webpack.config.prod.js b/public/react/config/webpack.config.prod.js
index f6960d77c..8cab0465f 100644
--- a/public/react/config/webpack.config.prod.js
+++ b/public/react/config/webpack.config.prod.js
@@ -51,7 +51,7 @@ const extractTextPluginOptions = shouldUseRelativeAssetPaths
// This is the production configuration.
// It compiles slowly and is focused on producing a fast and minimal bundle.
// The development configuration is different and lives in a separate file.
-
+// 上线用的
// console.log('publicPath ', publicPath)
module.exports = {
// externals: {
From 8ac26007b80a1a24740642bfe75a197895337f35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Thu, 29 Aug 2019 10:45:51 +0800
Subject: [PATCH 23/25] b
---
public/react/src/modules/courses/members/studentsList.js | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/public/react/src/modules/courses/members/studentsList.js b/public/react/src/modules/courses/members/studentsList.js
index da95278a6..3c03c0e72 100644
--- a/public/react/src/modules/courses/members/studentsList.js
+++ b/public/react/src/modules/courses/members/studentsList.js
@@ -511,8 +511,8 @@ class studentsList extends Component{
let exportUrlthree = `/courses/${courseId}/export_couser_info.xlsx?`; //活跃度
const params = {}
- if (course_group_id) {
- params.group_id = course_group_id
+ if (checkBoxValues) {
+ params.group_id = checkBoxValues
}
if (searchValue) {
searchValue = searchValue.trim()
@@ -527,6 +527,9 @@ class studentsList extends Component{
exportUrl += paramsString;
exportUrltwo+=paramsString;
exportUrlthree+=paramsString;
+ // console.log(paramsString);
+ // console.log(checkBoxValues);
+ // console.log(searchValue);
return(
Date: Thu, 29 Aug 2019 10:59:38 +0800
Subject: [PATCH 24/25] b
---
public/react/src/modules/courses/members/studentsList.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/public/react/src/modules/courses/members/studentsList.js b/public/react/src/modules/courses/members/studentsList.js
index 3c03c0e72..b6a926694 100644
--- a/public/react/src/modules/courses/members/studentsList.js
+++ b/public/react/src/modules/courses/members/studentsList.js
@@ -508,7 +508,7 @@ class studentsList extends Component{
const courseId = this.props.match.params.coursesId
let exportUrl = `/courses/${courseId}/export_member_scores_excel.xlsx?`; //总成绩
let exportUrltwo = `/courses/${courseId}/export_couser_info.xlsx?`; //课堂信息
- let exportUrlthree = `/courses/${courseId}/export_couser_info.xlsx?`; //活跃度
+ let exportUrlthree = `/courses/${courseId}/export_member_act_score.xlsx?`; //活跃度
const params = {}
if (checkBoxValues) {
From 65527409b311b3a69130f2e8fcb4e93aca1f1570 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Thu, 29 Aug 2019 11:17:36 +0800
Subject: [PATCH 25/25] b
---
public/react/src/modules/courses/members/studentsList.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/public/react/src/modules/courses/members/studentsList.js b/public/react/src/modules/courses/members/studentsList.js
index b6a926694..371d4e74e 100644
--- a/public/react/src/modules/courses/members/studentsList.js
+++ b/public/react/src/modules/courses/members/studentsList.js
@@ -512,7 +512,7 @@ class studentsList extends Component{
const params = {}
if (checkBoxValues) {
- params.group_id = checkBoxValues
+ params.group_id = course_group_id
}
if (searchValue) {
searchValue = searchValue.trim()