From c0bfc28f0263866ea5ee8d224c1083e4132a3c46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Tue, 7 Jan 2020 19:26:34 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=98=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/modules/question/Question.js |  1 -
 .../question/component/ChoquesEditor.js       |  2 +-
 .../modules/question/component/Contentpart.js |  5 ++-
 .../question/component/Itembankstop.js        | 31 ++++++-------
 .../comthetestpaper/Comthetestpapers.js       | 18 +++++++-
 .../comthetestpaper/Comthetestpaperst.js      | 45 +++++++++++++------
 .../question/questioncss/questioncom.css      |  5 ++-
 7 files changed, 69 insertions(+), 38 deletions(-)

diff --git a/public/react/src/modules/question/Question.js b/public/react/src/modules/question/Question.js
index 8120b1860..171a2f2d7 100644
--- a/public/react/src/modules/question/Question.js
+++ b/public/react/src/modules/question/Question.js
@@ -882,7 +882,6 @@ class Question extends Component {
 				/>
 				{/*头部*/}
 				<Contentpart {...this.state} {...this.props}
-
 										 getitem_basketss={(id)=>this.getitem_basketss(id)}
 										 selectallquestionsonthispage={()=>this.selectallquestionsonthispage()}
 										 getitem_baskets={(e)=>this.getitem_baskets(e)}
diff --git a/public/react/src/modules/question/component/ChoquesEditor.js b/public/react/src/modules/question/component/ChoquesEditor.js
index 28ef8e8a5..99a713d7f 100644
--- a/public/react/src/modules/question/component/ChoquesEditor.js
+++ b/public/react/src/modules/question/component/ChoquesEditor.js
@@ -309,7 +309,7 @@ class ChoquesEditor extends Component{
 						{/* 点击设置答案 */}
 						{/* TODO 加了tooltip后，会丢失掉span的class */}
 						{/* <Tooltip title={standard_answers[index] ? '点击取消标准答案设置' : '点击设置为标准答案'}> */}
-						<span class={`option-item fr mr10 color-grey select-choice ${bg} `}
+						<span className={`option-item fr mr10 color-grey select-choice ${bg} `}
 									name="option_span" onClick={() => this.onOptionClick(index)} style={{flex: '0 0 38px'}}>
                       <ConditionToolTip title={standard_answers[index] ? '点击取消标准答案设置' : '点击设置为标准答案'} placement="left" condition={true}>
                         <div style={{width: '100%', height: '100%'}}>{tagArray[index]}</div>
diff --git a/public/react/src/modules/question/component/Contentpart.js b/public/react/src/modules/question/component/Contentpart.js
index ee5b49e6b..0768c86b6 100644
--- a/public/react/src/modules/question/component/Contentpart.js
+++ b/public/react/src/modules/question/component/Contentpart.js
@@ -176,7 +176,8 @@ class Contentpart extends Component {
 							 {
 								 defaultActiveKey===0||defaultActiveKey==="0"?
 									 <Search
-										 style={{ width: "347px",marginRight:"30px"}}
+										 style={{ marginRight:"30px"}}
+										 className={"xaxisreverseorder searchwidth"}
 										 placeholder="请输入题目名称、内容"
 										 enterButton
 										 size="large"
@@ -184,7 +185,7 @@ class Contentpart extends Component {
 										 onSearch={ (value)=>this.props.setdatafuns(value)} />
 									 :
 									 <Search
-										 style={{ width: "347px"}}
+										 className={"xaxisreverseorder searchwidth"}
 										 placeholder="请输入题目名称、内容"
 										 enterButton
 										 size="large"
diff --git a/public/react/src/modules/question/component/Itembankstop.js b/public/react/src/modules/question/component/Itembankstop.js
index 36dff4fc0..5192eca4e 100644
--- a/public/react/src/modules/question/component/Itembankstop.js
+++ b/public/react/src/modules/question/component/Itembankstop.js
@@ -519,31 +519,28 @@ class Itembankstop extends Component {
 				}
 
 				<Form onSubmit={this.handleSubmit}>
-
+					<div className="sortinxdirection">
 				<Form.Item
 					label="课程"
 				>
 					{getFieldDecorator("rbkc",
-						{
+						{initialValue: this.state.rbkc,
 							rules: [{required: true, message: '请选择课程'}],
 						}
 					)(
-						<div className="sortinxdirection">
-							<InputGroup >
-								<Cascader style={{width: '270px'}} value={this.state.rbkc} options={options} onChange={this.handleFormzhishidian}
+
+								<Cascader style={{width: '270px'}} options={options} onChange={this.handleFormzhishidian}
 													placeholder="请选择..."/>
-							</InputGroup>
 
-						</div>
 					)}
 				</Form.Item>
+					</div>
 					<Form.Item
 						label="知识点"
 					>
 						{getFieldDecorator("rbzsd"
 						)(
 							<div className="sortinxdirection">
-								<InputGroup >
 									<Select style={{width: '270px'}} value={undefined} onChange={this.handleFormkechen}
 													placeholder="请选择...">
 										{knowledgepoints2 && knowledgepoints2.map((object, index) => {
@@ -552,11 +549,10 @@ class Itembankstop extends Component {
 											)
 										})}
 									</Select>
-								</InputGroup>
 
 
 
-								<img className=" ml22 zjzsdian xiaoshou"  src={getImageUrl("/images/educoder/zjzsd.png")} onClick={()=>this.NewknTypedeldel(true)}/>
+								<img className=" ml22 zjzsdian xiaoshou"  src={getImageUrl("images/educoder/zjzsd.png")} onClick={()=>this.NewknTypedeldel(true)}/>
 
 
 								<div className="sortinxdirection" style={{
@@ -572,7 +568,7 @@ class Itembankstop extends Component {
 											}}>
 												<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>
 										)
@@ -590,19 +586,18 @@ class Itembankstop extends Component {
 						label="题型"
 					>
 						{getFieldDecorator("rbtx",
-							{
+							{initialValue: this.state.rbtx,
 								rules: [{required: true, message: '请选择题型'}],
 							}
 						)(
-							<InputGroup >
-								<Select style={{width: '270px'}} value={this.state.rbtx} onChange={this.handleFormtixing}
+								<Select style={{width: '270px'}}  onChange={this.handleFormtixing}
 												placeholder="请选择...">
+									<Option value="PROGRAM">编程题</Option>
 									<Option value="SINGLE">单选题</Option>
 									<Option value="MULTIPLE">多选题</Option>
 									<Option value="JUDGMENT">判断题</Option>
-									<Option value="PROGRAM">编程题</Option>
+
 								</Select>
-							</InputGroup>
 						)}
 					</Form.Item>
 
@@ -663,11 +658,11 @@ class Itembankstop extends Component {
 					<div className="rbndclass">
 						<Form.Item label="难度">
 							{getFieldDecorator('rbnd',
-								{
+								{initialValue: this.state.rbnd,
 									rules: [{required: true, message: '请选择难度'}],
 								}
 							)(
-								<Radio.Group initialValue={this.state.rbnd} onChange={this.handleFormLayoutChange}>
+								<Radio.Group  onChange={this.handleFormLayoutChange}>
 									<Radio.Button value="1">简单</Radio.Button>
 									<Radio.Button value="2">适中</Radio.Button>
 									<Radio.Button value="3">困难</Radio.Button>
diff --git a/public/react/src/modules/question/comthetestpaper/Comthetestpapers.js b/public/react/src/modules/question/comthetestpaper/Comthetestpapers.js
index 4f6099202..29f482471 100644
--- a/public/react/src/modules/question/comthetestpaper/Comthetestpapers.js
+++ b/public/react/src/modules/question/comthetestpaper/Comthetestpapers.js
@@ -393,7 +393,23 @@ class Comthetestpapers extends Component {
 					.ant-select-selection{
 					height: 33px !important;
 					}
-					.ant-input-group{
+					.kechen .ant-input-group{
+					  width:258px !important;
+					} 
+					
+						.zsdd .ant-input-group{
+					  width:258px !important;
+					} 
+					
+					.sjmc .ant-input-group{
+					  width:258px !important;
+					} 
+					
+					.kssc .ant-input-group{
+					  width:258px !important;
+					} 
+					
+						.rbndclass .ant-input-group{
 					  width:258px !important;
 					} 
 					.ant-input {
diff --git a/public/react/src/modules/question/comthetestpaper/Comthetestpaperst.js b/public/react/src/modules/question/comthetestpaper/Comthetestpaperst.js
index 8b3010ed5..88d5b9725 100644
--- a/public/react/src/modules/question/comthetestpaper/Comthetestpaperst.js
+++ b/public/react/src/modules/question/comthetestpaper/Comthetestpaperst.js
@@ -575,7 +575,23 @@ class Comthetestpaperst extends Component {
 					.ant-select-selection{
 					height: 33px !important;
 					}
-					.ant-input-group{
+					.kechen .ant-input-group{
+					  width:258px !important;
+					} 
+					
+						.zsdd .ant-input-group{
+					  width:258px !important;
+					} 
+					
+					.sjmc .ant-input-group{
+					  width:258px !important;
+					} 
+					
+					.kssc .ant-input-group{
+					  width:258px !important;
+					} 
+					
+					.rbndclass .ant-input-group{
 					  width:258px !important;
 					} 
 					.ant-input {
@@ -600,24 +616,24 @@ class Comthetestpaperst extends Component {
 				}
 
 				<Form onSubmit={this.handleSubmit}>
-
+					<div className="kechen">
+						<div className="sortinxdirection">
 					<Form.Item
 						label="课程"
 					>
-						{getFieldDecorator("rbkc",
-							{
+						{getFieldDecorator("rbkc"
+							,
+							{initialValue: this.state.rbkc,
 								rules: [{required: true, message: '请选择课程'}],
 							}
 						)(
-							<div className="sortinxdirection">
-								<InputGroup compact>
-									<Cascader style={{width: '258px'}} value={this.state.rbkc} options={options} onChange={this.handleFormzhishidian}
+									<Cascader style={{width: '258px'}}  options={options} onChange={this.handleFormzhishidian}
 														placeholder="请选择..."/>
-								</InputGroup>
-
-							</div>
 						)}
 					</Form.Item>
+						</div>
+				</div>
+					<div className="zsdd">
 					<Form.Item
 						label="知识点"
 					>
@@ -666,7 +682,7 @@ class Comthetestpaperst extends Component {
 							</div>
 						)}
 					</Form.Item>
-
+					</div>
 					<style>
 						{
 							`
@@ -791,12 +807,13 @@ class Comthetestpaperst extends Component {
 					</style>
 					<div className="rbndclass">
 						<Form.Item label="难度">
-							{getFieldDecorator('rbnd',
-								{
+							{getFieldDecorator('rbnd'
+								,
+								{initialValue: this.state.rbnd,
 									rules: [{required: true, message: '请选择难度'}],
 								}
 							)(
-								<Radio.Group initialValue={this.state.rbnd} onChange={this.handleFormLayoutChange}>
+								<Radio.Group onChange={this.handleFormLayoutChange}>
 									<Radio.Button value="1">简单</Radio.Button>
 									<Radio.Button value="2">适中</Radio.Button>
 									<Radio.Button value="3">困难</Radio.Button>
diff --git a/public/react/src/modules/question/questioncss/questioncom.css b/public/react/src/modules/question/questioncss/questioncom.css
index c117ce20a..5d37aeccd 100644
--- a/public/react/src/modules/question/questioncss/questioncom.css
+++ b/public/react/src/modules/question/questioncss/questioncom.css
@@ -928,7 +928,6 @@
     height: 100%;
     overflow-y: scroll !important;
     width: 100%;
-    margin-top: 60px !important;
     position: fixed;
     top:0px;
     bottom: 0px;
@@ -936,3 +935,7 @@
     z-index: 999999;
     right: 0px;
 }
+
+.searchwidth{
+    width: 347px !important;
+}