Merge branch 'dev_item_bank' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_new_shixunsrepository

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

@@ -403,8 +403,8 @@ class Itembankstop extends Component {
 		  const _result =[];
 			this.state.knowledgepoints.filter(item => {
 			if (this.state.Knowpoints.findIndex(t => t.id === item.id) === -1) {
-				console.log("guonue");
+				// console.log("guonue");
-				console.log(item);
+				// console.log(item);
 				_result.push(item);
 			}
 		});
@@ -718,13 +718,13 @@ class Itembankstop extends Component {
 							</div>
 						)}
 					</Form.Item>
-
+					{
+						this.state.Knowpoints===undefined||this.state.Knowpoints===null?"":
+							this.state.Knowpoints.length>0?
 								<div className="sortinxdirection huanhan w100s mt15" style={{
 									minHeight: "33px",
 									lineHeight: "28px",
-
 								}}>
-
 									{this.state.Knowpoints === undefined ? "" : this.state.Knowpoints.map((object, index) => {
 										return (
 											<div key={index} className={index===0?"mytags mb20":"mytags"} style={{
@@ -737,11 +737,11 @@ class Itembankstop extends Component {
 											</div>
 										)
 									})}
-
-
-
-
 								</div>
+								:
+								""
+					}
+
 
 					<Form.Item
 						label="题型"

public/react/src/modules/question/comthetestpaper/Comthetestpaperst.js

@@ -699,29 +699,29 @@ class Comthetestpaperst extends Component {
 						)}
 					</Form.Item>
 					</div>
+					{
+						this.state.Knowpoints===undefined||this.state.Knowpoints===null?"":
+							this.state.Knowpoints.length>0?
 								<div className="sortinxdirection huanhan w100s mt15" style={{
-						height: "33px",
+									minHeight: "33px",
 									lineHeight: "28px",
-
 								}}>
-
 									{this.state.Knowpoints === undefined ? "" : this.state.Knowpoints.map((object, index) => {
 										return (
-								<div key={index} className="mytags" style={{
+											<div key={index} className={index===0?"mytags mb20":"mytags"} style={{
 												position: "relative",
 											}}>
 												<p className="w100s  stestcen lh32">{object.name}</p>
 
-									<img className=" ml7 zjzsdian xiaoshou icondowncolorssy"  onClick={() => this.deletesobject(object, index)} src={getImageUrl("/images/educoder/bzucha.png")}/>
+												<img className=" ml7 zjzsdian xiaoshou icondowncolorssy"  onClick={() => this.deletesobject(object, index)} src={getImageUrl("images/educoder/bzucha.png")}/>
 
 											</div>
 										)
 									})}
-
-
-
-
 								</div>
+								:
+								""
+					}
 					<style>
 						{
 							`