调整

public/react/src/modules/question/NewMyShixunModel.js

@@ -13,6 +13,7 @@ import QuestionModalys from "./component/QuestionModalys";
 
 //exam_id 试卷的id
 var 	Undoclickable=true;
+var   myGrandtotal=false;
 class NewMyShixunModel extends Component {
 	constructor(props) {
 		super(props);
@@ -57,8 +58,9 @@ class NewMyShixunModel extends Component {
 			selectallquestionsonthispages: false,
 			oj_status: null,
 			isVisible: false,
-			selectionbools: false,
-			chakanjiexiboolindex: "无",
+			selectionbools:false,
+			chakanjiexiboolindex:"无",
+
 		}
 
 	}
@@ -357,18 +359,22 @@ class NewMyShixunModel extends Component {
 	}
 
 	//计算
-	getdataslen = (arr) => {
-		var contes = 0;
-		for (let data of arr) {
-			if (data.item_type === "PROGRAM") {
+	getdataslen=(arr)=>{
+		myGrandtotal=false;
+		let contes=0;
+		let Grandtotal=0;
+		for(let data of arr) {
+			if(data.item_type==="PROGRAM"){
 				//编程题
 				if (data.choosed === true) {
 
 				} else {
 					//未选用
-					if (data.program_attr.status === 1) {
-						//已发布
-						contes = contes + 1;
+					if(data.program_attr.status===1){
+						//已发布1  未发布0
+						contes=contes+1;
+					}else {
+						Grandtotal=Grandtotal+1;
 					}
 
 				}
@@ -390,11 +396,28 @@ class NewMyShixunModel extends Component {
 				selectionbools: false,
 				selectallquestionsonthispages: false,
 			})
-		} else {
-			this.setState({
-				selectionbools: true,
-				selectallquestionsonthispages: true,
-			})
+		}
+		else {
+			try {
+				if(arr.length===Grandtotal){
+					myGrandtotal=true;
+					this.setState({
+						selectionbools:false,
+						selectallquestionsonthispages:false,
+					})
+				}else{
+					this.setState({
+						selectionbools:true,
+						selectallquestionsonthispages:true,
+					})
+				}
+			}catch (e) {
+				this.setState({
+					selectionbools:true,
+					selectallquestionsonthispages:true,
+				})
+			}
+
 		}
 	}
 
@@ -861,6 +884,10 @@ class NewMyShixunModel extends Component {
 	}
 	//全选试题库
 	selectallquestionsonthispage=(bool)=>{
+		if(myGrandtotal===true){
+			this.props.showNotification(`本页全部试题未发布,不能选择`);
+			return
+		}
 		var item_idsdata=[];
 
 		var arr = this.state.Contentdata.items;

public/react/src/modules/question/Question.js

@@ -14,6 +14,7 @@ import QuestionModalys from "./component/QuestionModalys";
 import Certifiedprofessional from "../modals/Certifiedprofessional";
 
 var 	Undoclickable=true;
+var   myGrandtotal=false;
 class Question extends Component {
 	constructor(props) {
 		super(props);
@@ -294,18 +295,22 @@ class Question extends Component {
 	}
 
 	//计算
-	getdataslen = (arr) => {
-		var contes = 0;
-		for (let data of arr) {
-			if (data.item_type === "PROGRAM") {
+	getdataslen=(arr)=>{
+		myGrandtotal=false;
+		let contes=0;
+		let Grandtotal=0;
+		for(let data of arr) {
+			if(data.item_type==="PROGRAM"){
 				//编程题
 				if (data.choosed === true) {
 
 				} else {
 					//未选用
-					if (data.program_attr.status === 1) {
-						//已发布
-						contes = contes + 1;
+					if(data.program_attr.status===1){
+						//已发布1  未发布0
+						contes=contes+1;
+					}else{
+						Grandtotal=Grandtotal+1;
 					}
 
 				}
@@ -328,10 +333,26 @@ class Question extends Component {
 				selectallquestionsonthispages: false,
 			})
 		} else {
-			this.setState({
-				selectionbools: true,
-				selectallquestionsonthispages: true,
-			})
+			try {
+				if(arr.length===Grandtotal){
+					myGrandtotal=true;
+					this.setState({
+						selectionbools:false,
+						selectallquestionsonthispages:false,
+					})
+				}else{
+					this.setState({
+						selectionbools:true,
+						selectallquestionsonthispages:true,
+					})
+				}
+			}catch (e) {
+				this.setState({
+					selectionbools:true,
+					selectallquestionsonthispages:true,
+				})
+			}
+
 		}
 	}
 
@@ -761,6 +782,12 @@ class Question extends Component {
 	}
 	//全选试题库
 	selectallquestionsonthispage=(bool)=>{
+		if(myGrandtotal===true){
+			this.props.showNotification(`本页全部试题未发布,不能选择`);
+			return
+		}
+
+
 		var item_idsdata=[];
 
 		var arr = this.state.Contentdata.items;

public/react/src/modules/question/component/Contentpart.js

@@ -441,12 +441,12 @@ class Contentpart extends Component {
 							<div className=" w100s mb10">
 								{
 							defaultActiveKey===1||defaultActiveKey==="1"?
-										<Contentquestionbank {...this.props} {...this.state}  selectallquestionsonthispage={(bool)=>this.props.selectallquestionsonthispage(bool)} ></Contentquestionbank>
+										<Contentquestionbank {...this.props} {...this.state} selectallquestionsonthispages={this.props.selectallquestionsonthispages} selectallquestionsonthispage={(bool)=>this.props.selectallquestionsonthispage(bool)} ></Contentquestionbank>
 										:""
 								}
 								{
 									defaultActiveKey===0||defaultActiveKey==="0"?
-										<Contentquestionbank {...this.props} {...this.state} selectallquestionsonthispage={(bool)=>this.props.selectallquestionsonthispage(bool)}></Contentquestionbank>
+										<Contentquestionbank {...this.props} {...this.state} selectallquestionsonthispages={this.props.selectallquestionsonthispages}  selectallquestionsonthispage={(bool)=>this.props.selectallquestionsonthispage(bool)}></Contentquestionbank>
 										:""
 								}
 							</div>