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

@@ -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 (
             <Switch {...this.props}>
-
+              {/*Generaljobbankdetails*/}
+              {/*  普通作业题库详情*/}
+              <Route path="/courses/questionbank" exact
+                     render={
+                       (props) => (<Generaljobbankdetails {...this.props} {...props} {...this.state} />)
+                     }
+              ></Route>
                 {/* 资源列表页  */}
                 <Route path="/courses/:coursesId/file/:Id" exact
                        render={

public/react/src/modules/courses/new/Goldsubject.js

@@ -635,9 +635,7 @@ class Goldsubject extends Component {
 		if(addonAfterfour){
 			addonAfteronelens4=String(addonAfterfour).length;
 		}
-		  console.log(addonAfteronelenone);
-		  console.log(addonAfteronelentwo);
-		  console.log(options);
+
 		return (
 			<React.Fragment>
 
@@ -729,88 +727,43 @@ class Goldsubject extends Component {
                                         `
 									}
 								</style>
-								<style>{
-									`
-																		.yslzxueshis .ant-input{
+
+								<div className="stud-class-set bor-bottom-greyE  padding1020 ">
+									<style>{
+										`
+																		.yslzxueshiskmc .ant-input{
 																		border-right: none !important;
 																		height: 40px !important;
 																	  width: 655px !important;
+
+																		}
+																		.yslzxueshiskmc .ant-input-group{
+																	   width: 720px !important;
 																		}
 																		
-																		.yslzxueshisy .ant-input-group-addon{
+																		.yslzxueshiskmc .ant-input-group-addon{
 																		  width: 65px !important;
 																		  background-color: #fafafa!important;
 																		 }
-																		 
-																	  .yslzxueshis .ant-select-dropdown{
-																	    width: 655px !important;
-																		  height:160px !important;
-																		}
-																		.yslzxueshis .ant-select-dropdown-menu{
-																	  width: 655px !important;
-																		}
+																		 .yslzxueshiskmc .ant-input-group-wrapper{
+																		   width: 720px !important;
+																		 }
+																		 .yslzxueshiskmcs .ant-input-group-wrapper{
+																		   width: 720px !important;
+																		 }
 																		`
-								}</style>
-								<div className="stud-class-set bor-bottom-greyE  padding1020 ">
-
-									{/*					<Form.Item label="课堂名称">*/}
-
-									{/*							{getFieldDecorator('classroom', {*/}
-									{/*							rules: [{required: true, message: "不能为空"},*/}
-									{/*						{*/}
-									{/*							max:60,*/}
-									{/*							message: '不能超过60个字符',*/}
-									{/*						}],*/}
-									{/*						})(*/}
-									{/*							<AutoComplete*/}
-									{/*								style={{	width: 720}}*/}
-									{/*								onSearch={this.handleSearch}*/}
-									{/*								onChange={this.handleChange}*/}
-									{/*								className={"fl construction yslzxueshis "}*/}
-									{/*								placeholder="例如：数据结构"*/}
-									{/*								dataSource={options}*/}
-									{/*							>*/}
-									{/*								<Input   className="yslzxueshisy"  addonAfter={String(addonAfteronelens4)+"/60"} />*/}
-									{/*							</AutoComplete>*/}
-									{/*						)}*/}
-
-									{/*</Form.Item>*/}
-
-									<Form.Item label="课程名称">
+									}</style>
+									<Form.Item label="课堂名称" className="yslzxueshiskmcs">
 										{getFieldDecorator('classroom', {
 											rules: [{required: true, message: "不能为空"},
 												{
 													max:60,
 													message: '不能超过60个字符',
 												}],
-										})(
-
-											<AutoComplete
-												style={{	width: 720}}
-												onSearch={this.handleSearch}
-												onChange={this.handleChange}
-												className={"fl construction yslzxueshis "}
-												placeholder="例如：数据结构"
-												dataSource={options}
-
-											>
-												<Input   className="yslzxueshisy"  addonAfter={String(addonAfteronelens4)+"/60"} />
-
-											</AutoComplete>
-										)}
-										{/*<span  className="newcoursestitle fl">*/}
-                    {/*                        /!*（错误示例：数据结构2017本部；数据结构2017秋季；数据结构2017电子商务1班）*!/*/}
-										{/*	<p className="ant-progress-text">*/}
-										{/*															<Icon  style={{ color: '#52c41a' }} type="check-circle" theme="filled"/>*/}
-										{/*															<span className={"color-grey-9 font-12 ml5"}>正确示例：数据结构</span>*/}
-                    {/*                            </p>*/}
-                    {/*                            <p className="ant-progress-text">*/}
-										{/*															 <Icon style={{ color: 'red' }} theme="filled" type="close-circle"/>*/}
-                    {/*                               <span className={"color-grey-9 font-12 ml5"}>错误示例：数据结构2019春</span>*/}
-                    {/*                            </p>*/}
-                    {/*                    </span>*/}
-										<div id='iscourse'></div>
+										})(<Input className="yslzxueshiskmc fl" placeholder="例如：数据结构2016秋季班级" addonAfter={String(addonAfteronelens4)+"/60"} />)}
+										<div id='isclassroom'></div>
 									</Form.Item>
+
 								</div>
 
 								<div className="stud-class-set bor-bottom-greyE padding1020 coursenavbox coursenavboxtow yslinputcourput">

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 (
+			<div className="newMain clearfix ">
+
+
+				<div className={"educontent mt10 mb20"} style={{width: "1200px"}}>
+
+					<div className="educontent mb20">
+						<p className="clearfix mb20 mt10">
+							<a className="btn colorgrey fl hovercolorblue ">题库</a>
+							<span className="color-grey-9 fl ml3 mr3">&gt;</span>
+							<a
+								className=" btn colorgrey fl hovercolorblue "
+                >详情</a>
+							<span className="color-grey-9 fl ml3 mr3">&gt;</span>
+							<WordsBtn className="fl">作业详情</WordsBtn>
+						</p>
+					</div>
+					<div className="educontent mb20">
+						<p className=" fl color-black  summaryname" style={{heigth: "33px"}}>
+							MySQL数据库编程开发实训（基础篇）
+						</p>
+						<CoursesListType
+							typelist={["公开"]}
+						/>
+					</div>
+
+					<div className="edu-back-white ">
+						<div className="stud-class-set bor-bottom-greyE ">
+							<div className=" clearfix edu-back-white poll_list">
+								<a className={parseInt(tab) === 0 ? "active" : ""} onClick={(e) => this.ChangeTab(0)}>内容详情</a>
+								<a className={parseInt(tab) === 1 ? "active" : ""} onClick={(e) => this.ChangeTab(1)}>参考答案</a>
+								<a className="fr color-blue font-16" >发送</a>
+								<a className="fr color-blue font-16" >编辑</a>
+								<a className="fr color-blue font-16" >删除</a>
+							</div>
+						</div>
+					</div>
+
+				</div>
+			</div>
+		)
+	}
+}
+
+export default Generaljobbankdetails;
+