diff --git a/app/models/poll.rb b/app/models/poll.rb
index 5c1a9a64c..0ea76a8a3 100644
--- a/app/models/poll.rb
+++ b/app/models/poll.rb
@@ -103,7 +103,7 @@ class Poll < ApplicationRecord
     if course.is_end
       status = 4
     else
-      if user.present? && user.student_of_course?(course)
+      if user.present? && user.course_identity(course) == Course::STUDENT
         ex_time = get_poll_times(user.id,false)
         pb_time = ex_time[:publish_time]
         ed_time = ex_time[:end_time]
diff --git a/public/react/src/modules/question/Question.js b/public/react/src/modules/question/Question.js
index b96751d85..2da5f0d0e 100644
--- a/public/react/src/modules/question/Question.js
+++ b/public/react/src/modules/question/Question.js
@@ -60,6 +60,7 @@ class Question extends Component {
 			booljupyterurls:false,
 			disciplinesdatakc:0,
 			disciplinesdatazsd:0,
+			selectallquestionsonthispages:false,
 		}
 
 	}
@@ -168,6 +169,7 @@ class Question extends Component {
 	callback = (key) => {
 		this.setState({
 			defaultActiveKey: key,
+			selectallquestionsonthispages:false,
 		})
 		var data = {
 			discipline_id:this.state.discipline_id,
@@ -176,7 +178,7 @@ class Question extends Component {
 			public: key,
 			item_type: this.state.item_type,
 			difficulty: this.state.difficulty,
-			page: this.state.page,
+			page: 1,
 			per_page:10,
 		};
 		this.getdata(data);
@@ -579,8 +581,13 @@ class Question extends Component {
 			item_ids:item_idsdata
 		}
 		this.getitem_baskets(data);
+		this.setState({
+			selectallquestionsonthispages:true,
+		})
 	}
 
+	//全选的状态
+
   //删除大题型
 	Deletebigquestiontype =(item_type)=>{
 		const  url=`/item_baskets/delete_item_type.json`;
@@ -748,55 +755,55 @@ class Question extends Component {
 							{
 								single_questions_count === 0 ?
 									""
-									: <div className="sortinxdirection" onClick={()=>this.showQuestionModals("SINGLE")} >
+									: <div className="sortinxdirection"  >
 										<p
 											className="w50s intermediatecenterysls sortinxdirection font-14">单选题{'('}{single_questions_count}{')'}</p>
 										<p className="w50s intermediatecenterysls xaxisreverseorder"><i
-											className="iconfont icon-shanchu1 font-14 lg  lh30 icondrawercolor "></i></p>
+											className="iconfont icon-shanchu1 font-14 lg  lh30 icondrawercolor " onClick={()=>this.showQuestionModals("SINGLE")}></i></p>
 									</div>
 							}
 							{
 								multiple_questions_count === 0 ?
 									""
 									:
-									<div className="sortinxdirection" onClick={()=>this.showQuestionModals("MULTIPLE")}>
+									<div className="sortinxdirection" >
 										<p
 											className="w50s intermediatecenterysls sortinxdirection font-14">多选题{'('}{multiple_questions_count}{')'}</p>
 										<p className="w50s intermediatecenterysls xaxisreverseorder"><i
-											className="iconfont icon-shanchu1 font-14 lg  lh30 icondrawercolor "></i></p>
+											className="iconfont icon-shanchu1 font-14 lg  lh30 icondrawercolor " onClick={()=>this.showQuestionModals("MULTIPLE")}></i></p>
 									</div>
 							}
 							{
 								judgement_questions_count === 0 ?
 									""
 									:
-									<div className="sortinxdirection" onClick={()=>this.showQuestionModals("JUDGMENT")}>
+									<div className="sortinxdirection" >
 										<p
 											className="w50s intermediatecenterysls sortinxdirection font-14">判断题{'('}{judgement_questions_count}{')'}</p>
 										<p className="w50s intermediatecenterysls xaxisreverseorder"><i
-											className="iconfont icon-shanchu1 font-14 lg  lh30 icondrawercolor "></i></p>
+											className="iconfont icon-shanchu1 font-14 lg  lh30 icondrawercolor " onClick={()=>this.showQuestionModals("JUDGMENT")}></i></p>
 									</div>
 							}
 							{
 								completion_questions_count === 0 ?
 									""
 									:
-									<div className="sortinxdirection" onClick={()=>this.showQuestionModals("COMPLETION")}>
+									<div className="sortinxdirection" >
 										<p
 											className="w50s intermediatecenterysls sortinxdirection font-14">填空题{'('}{completion_questions_count}{')'}</p>
 										<p className="w50s intermediatecenterysls xaxisreverseorder"><i
-											className="iconfont icon-shanchu1 font-14 lg  lh30 icondrawercolor "></i></p>
+											className="iconfont icon-shanchu1 font-14 lg  lh30 icondrawercolor " onClick={()=>this.showQuestionModals("COMPLETION")}></i></p>
 									</div>
 							}
 							{
 								subjective_questions_count === 0 ?
 									""
 									:
-									<div className="sortinxdirection" onClick={()=>this.showQuestionModals("SUBJECTIVE")}>
+									<div className="sortinxdirection" >
 										<p
 											className="w50s intermediatecenterysls sortinxdirection font-14">简答题{'('}{subjective_questions_count}{')'}</p>
 										<p className="w50s intermediatecenterysls xaxisreverseorder"><i
-											className="iconfont icon-shanchu1 font-14 lg  lh30 icondrawercolor "></i></p>
+											className="iconfont icon-shanchu1 font-14 lg  lh30 icondrawercolor " onClick={()=>this.showQuestionModals("SUBJECTIVE")}></i></p>
 									</div>
 							}
 							{
@@ -814,11 +821,11 @@ class Question extends Component {
 								program_questions_count === 0 ?
 									""
 									:
-									<div className="sortinxdirection" onClick={()=>this.showQuestionModals("PROGRAM")}>
+									<div className="sortinxdirection" >
 										<p
 											className="w50s intermediatecenterysls sortinxdirection font-14">编程题{'('}{program_questions_count}{')'}</p>
 										<p className="w50s intermediatecenterysls xaxisreverseorder"><i
-											className="iconfont icon-shanchu1 font-14 lg  lh30 icondrawercolor "></i></p>
+											className="iconfont icon-shanchu1 font-14 lg  lh30 icondrawercolor " onClick={()=>this.showQuestionModals("PROGRAM")}></i></p>
 									</div>
 							}
 
diff --git a/public/react/src/modules/question/component/Contentpart.js b/public/react/src/modules/question/component/Contentpart.js
index cb3235bd9..50fce4742 100644
--- a/public/react/src/modules/question/component/Contentpart.js
+++ b/public/react/src/modules/question/component/Contentpart.js
@@ -174,7 +174,7 @@ class Contentpart extends Component {
 							<div className=" w100s mb10">
 								{
 									defaultActiveKey===1||defaultActiveKey==="1"?
-										<Contentquestionbank {...this.props} {...this.state}  selectallquestionsonthispage={()=>this.props.selectallquestionsonthispage()}></Contentquestionbank>
+										<Contentquestionbank {...this.props} {...this.state}  selectallquestionsonthispage={()=>this.props.selectallquestionsonthispage()} ></Contentquestionbank>
 										:""
 								}
 								{
diff --git a/public/react/src/modules/question/component/Contentquestionbank.js b/public/react/src/modules/question/component/Contentquestionbank.js
index 00776eedd..31b3d14fc 100644
--- a/public/react/src/modules/question/component/Contentquestionbank.js
+++ b/public/react/src/modules/question/component/Contentquestionbank.js
@@ -47,7 +47,7 @@ class Contentquestionbank extends Component {
 				<div className="educontent mt10  w100s">
 					<div className="sortinxdirection w100s" >
 						<div className="sortinxdirection w50s">
-							<Checkbox  onChange={()=>this.props.selectallquestionsonthispage()}></Checkbox>
+							<Checkbox checked={this.props.selectallquestionsonthispages} onChange={()=>this.props.selectallquestionsonthispage()}></Checkbox>
 							<p className="setequesbank ml20">选用本页全部试题</p>
 						</div>
 						<div className="xaxisreverseorder testpaper w50s">