Merge branch 'dev_aliyun' of http://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

public/react/src/modules/courses/poll/PollDetailIndex.js

@@ -19,11 +19,13 @@ import '../css/members.css'
 import '../css/busyWork.css'
 
 import axios from 'axios'
+import Itembankstop from "../../question/component/Itembankstop";
 
 const map={1:"未发布",2:"提交中",3:"已截止",4:"已结束"}
 class PollDetailIndex extends Component{
 	constructor(props){
 		super(props);
+		this.pollssubcomRef = React.createRef();
 		this.state={
 			tab:["0"],
 			pollDetail:undefined,
@@ -33,7 +35,9 @@ class PollDetailIndex extends Component{
 			polls_status:3,
 		}
 	}
-
+	getpollssubcomRef = (Ref) => {
+		this.pollssubcomRef = Ref;
+	}
 	getPollInfo=()=>{
 		// console.log(this.props);
 		let pollId=this.props.match.params.pollId;
@@ -67,7 +71,17 @@ class PollDetailIndex extends Component{
 		}catch (e) {
 
 		}
+		this.gettables();
 	}
+
+	gettables=()=>{
+		try {
+			this.pollssubcomRef.searchInfo();
+		}catch (e) {
+
+		}
+	}
+
 	newgetPollInfo=()=>{
 		// console.log(this.props);
 		let pollId=this.props.match.params.pollId;
@@ -263,7 +277,11 @@ class PollDetailIndex extends Component{
 
 						{
 							// 答题列表
-							parseInt(tab[0])==0 && <PollTabFirst {...this.props} {...this.state}></PollTabFirst>
+							parseInt(tab[0])==0 && <PollTabFirst
+								{...this.props}
+								{...this.state}
+								getpollssubcomRef={(ref) => this.getpollssubcomRef(ref)}
+							></PollTabFirst>
 						}
 						{
 							// 统计结果

public/react/src/modules/courses/poll/PollDetailTabFirst.js

@@ -132,6 +132,11 @@ class PollDetailTabFirst extends Component{
   componentDidMount(){
 		let {order, search, commit_status, poll_group_id, page, order_type} = this.state;
 		this.getTableList(order, search, commit_status, poll_group_id, page, order_type);
+		try {
+			this.props.getpollssubcomRef(this);
+		} catch (e) {
+
+		}
   }
 
   // 翻页

public/react/src/modules/courses/poll/PollNew.js

@@ -3007,9 +3007,9 @@ class PollNew extends Component {
 						{/*自动生成修改好的获取到的*/}
 						{/**************************************************************************/}
 						{this.state.poll_questions === undefined ? "" : this.state.poll_questions.map((item, index) => {
-							console.log('打印this.state.poll_questions');
+							// console.log('打印this.state.poll_questions');
-							console.log(this.state.poll_questions);
+							// console.log(this.state.poll_questions);
-							console.log(this.state.adddom);
+							// console.log(this.state.adddom);
 							let resultDom;
 							resultDom = <div >
 								<p className="clearfix font-16">
@@ -3061,7 +3061,7 @@ class PollNew extends Component {
 										{item.question.answers === undefined ? "" : item.question.answers.map((items, i) => {
 											return (
 												<div className="h20 pt20" style={{"clear": "both"}}>
-													<Radio value={i} className={"fl"} style={{textAlign: "left",marginTop:"3px"}}></Radio>
+													<Radio value={i} className={"fl"} style={{textAlign: "left"}}></Radio>
 													<span className={" flex1 "} style={{textAlign: "left","white-space":"pre-wrap","word-break": "break-all","word-wrap": "break-word","float": "left","width":"1116px"}} >{items.answer_text}</span>
 
 												</div>

public/react/src/modules/courses/poll/pollPublicBtn/ImmediatelyPublish.js

@@ -35,7 +35,8 @@ class Immediatelypublish extends Component{
       modalsType:false,
       modalsTopval:"",
       loadtype:false,
-      chooseId:undefined
+      chooseId:undefined,
+			immediatelyopen:false
     }
   }
   //立即发布
@@ -73,6 +74,7 @@ class Immediatelypublish extends Component{
 							 Saves:this.homeworkstartend,
 							 course_groups:response.data.course_groups,
 							 starttimesend:response.data.end_time===undefined||response.data.end_time===null||response.data.end_time===""?undefined:response.data.end_time,
+							 immediatelyopen:response.data.course_groups===null||response.data.course_groups.length===0?false:true,
 						 })
 
 					 }
@@ -100,6 +102,7 @@ class Immediatelypublish extends Component{
 							 Saves:this.homeworkstartend,
 							 course_groups:response.data.course_groups,
 							 starttimesend:response.data.end_time===undefined||response.data.end_time===null||response.data.end_time===""?undefined:response.data.end_time,
+							 immediatelyopen:response.data.course_groups===null||response.data.course_groups.length===0?false:true,
 						 })
 					 }
 				 }).catch((error) => {
@@ -386,6 +389,7 @@ class Immediatelypublish extends Component{
 					starttimes={this.state.starttimes}
 					starttimesend={this.state.starttimesend}
 					typs={this.state.typs}
+					immediatelyopen={this.state.immediatelyopen}
 				/>:""}
 
         {/* 公用的提示弹框 */}