*/}
@@ -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/Poll.js b/public/react/src/modules/courses/poll/Poll.js
index a01c142a4..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,15 +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);
+ this.InitList(type,StudentList_value,page,value);
- this.setState({
- checkBoxValues:[]
- })
let coursesId=this.props.match.params.coursesId;
let url=`/courses/${coursesId}/polls/publish_modal.json`;
axios.get(url,{
@@ -351,10 +343,6 @@ class Poll extends Component{
})
}
}
- this.setState({
- course_groups:list,
- checkBoxValues:value
- })
this.setState({
modalname:"立即发布",
modaltype:response.data.un_publish > 0 ? 1 : 2,
@@ -369,6 +357,8 @@ class Poll extends Component{
Savesname:"立即发布",
Cancel:this.homeworkhide,
Saves:this.homeworkstartend,
+ course_groups:list,
+ checkBoxValues:value
})
}
}).catch((error) => {
@@ -425,7 +415,7 @@ class Poll extends Component{
addname:undefined,
addnametype:false,
addnametab:undefined,
- checkBoxValues:[]
+ // checkBoxValues:[]
})
}
diff --git a/public/react/src/modules/courses/poll/PollListItem.js b/public/react/src/modules/courses/poll/PollListItem.js
index 6f081b952..eda994a9a 100644
--- a/public/react/src/modules/courses/poll/PollListItem.js
+++ b/public/react/src/modules/courses/poll/PollListItem.js
@@ -54,6 +54,7 @@ class PollListItem extends Component{
}
+ { item.author && {item.author} }
{
item.polls_status !=1 &&
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;
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..3bfc6cd36
--- /dev/null
+++ b/public/react/src/modules/courses/questionbank/Generaljobanswer.js
@@ -0,0 +1,79 @@
+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 './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
new file mode 100644
index 000000000..29453a7b5
--- /dev/null
+++ b/public/react/src/modules/courses/questionbank/Generaljobbankdetails.js
@@ -0,0 +1,173 @@
+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
+} 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';
+import '../css/busyWork.css';
+import '../poll/pollStyle.css';
+
+class Generaljobbankdetails extends Component {
+ //普通作业内容详情
+ constructor(props) {
+ super(props);
+ // this.answerMdRef = React.createRef();
+ this.state = {
+ tab: ["0"],
+ workid:1,
+ isSpin:false,
+ datas:[],
+ }
+
+ }
+
+ //切换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],
+ });
+
+
+ console.log("Generaljobbankdetails");
+ console.log(this.props);
+ 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,
+ })
+ });
+ }
+
+
+ bindRef = ref => { this.child = ref }
+///////////////教师截止
+
+ render() {
+ let {tab} = this.state;
+
+ const isAdmin = this.props.isAdmin();
+ // console.log(119)
+
+
+ return (
+
+
+
+
+
+
+
+
+ MySQL数据库编程开发实训（基础篇）
+
+
+
+
+
+
+ {parseInt(tab) === 0 ? :""}
+ {parseInt(tab) === 1 ? :""}
+
+
+
{/* {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 未评*/}