合并

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

@@ -1,6 +1,6 @@
 import React, {Component} from "react";
 import {Form, Input, Tooltip, Checkbox, Radio, Select, message, Modal, Button} from 'antd'
-import {WordsBtn, ActionBtn} from 'educoder'
+import {WordsBtn, ActionBtn,WordNumberTextarea} from 'educoder'
 
 import {Link} from 'react-router-dom'
 
@@ -2250,7 +2250,8 @@ class PollNewQuestbank extends Component {
 
 	//提交题目//没有就创建新的题库，新建问newz题和保存题目不一样不能同时保存 这里只是新建 和编辑 标题和须知
 	submitQuestionnaire = () => {
-		this.props.history.push(`/banks/poll/${pollid}`);
+		this.props.history.push(`/banks/poll/${this.props.match.params.workid}`);
+		this.props.initPublic(undefined);
 		// console.log("调用了submitQuestionnaire")
 		// if (this.state.Newedit === true) {
 		//
@@ -2471,8 +2472,8 @@ class PollNewQuestbank extends Component {
 	}
 	//试图
 	toWorkDetail = () => {
-		console.log(this.props);
-		console.log("toWorkDetail");
+		// console.log(this.props);
+		// console.log("toWorkDetail");
 		this.props.history.push(`/banks/poll/${this.props.match.params.workid}`);
 		this.props.initPublic(undefined);
 	}
@@ -2640,19 +2641,32 @@ class PollNewQuestbank extends Component {
 									<style>
 										{`
                    .ant-form-item-label{width:80px;}
+                   .WordNumberTextarea-count {
+												display: inline-block;
+												float: right;
+												font-size: 0.28rem;
+												padding-right: 0.25rem;
+												color: #666!important;
+										}
                   `}
 									</style>
 
 									<div style={{"color": "#212121", "font-size": "16px"}}>问卷须知</div>
 
-									<TextArea placeholder="请输入本次问卷答题的相关说明，最大限制100个字符"
-														style={{"height": "120px", "margin-top": "15px", "text-align": "left"}}
-														readOnly={readOnlys}
-														onInput={this.changeTopicNametwo}
-														value={this.state.polls_descriptiontest}
-														maxLength={100}
-														autoComplete="off" 	 addonAfter={String(addonAftertwo)}
-									></TextArea>
+									<WordNumberTextarea
+										placeholder={"请输入本次问卷答题的相关说明，最大限制100个字符"}
+										onInput={this.changeTopicNametwo}
+										value={this.state.polls_descriptiontest}
+										maxlength={100}
+									/>
+									{/*<TextArea placeholder="请输入本次问卷答题的相关说明，最大限制100个字符"*/}
+									{/*					style={{"height": "120px", "margin-top": "15px", "text-align": "left"}}*/}
+									{/*					readOnly={readOnlys}*/}
+									{/*					onInput={this.changeTopicNametwo}*/}
+									{/*					value={this.state.polls_descriptiontest}*/}
+									{/*					maxLength={100}*/}
+									{/*					autoComplete="off" 	 addonAfter={String(addonAftertwo)}*/}
+									{/*></TextArea>*/}
 									{
 										this.state.Newedit === true || this.state.mysave === true ?
 											<div>