From df9eb560a130f395cd2f729e9f898103bf230e4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Tue, 10 Dec 2019 15:56:51 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/modules/tpm/newshixuns/Newshixuns.js  | 26 +++++++------------
 .../modules/tpm/newshixuns/css/Newshixuns.css |  4 +++
 2 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/public/react/src/modules/tpm/newshixuns/Newshixuns.js b/public/react/src/modules/tpm/newshixuns/Newshixuns.js
index 098d2b78a..7dcb1fa51 100644
--- a/public/react/src/modules/tpm/newshixuns/Newshixuns.js
+++ b/public/react/src/modules/tpm/newshixuns/Newshixuns.js
@@ -419,9 +419,9 @@ class Newshixuns extends Component {
 
 
 
-                  {this.state.Radiovalue === "2" ? "" : <Form.Item
+               <Form.Item
                     label={"实验环境"}
-                    style={{"borderBottom": 'none'}}
+                    style={{"borderBottom": 'none','width': '18%','float': 'left'}}
                     className="chooseDes pr"
                   >
                     <div>
@@ -429,7 +429,7 @@ class Newshixuns extends Component {
                       {getFieldDecorator('selectleft', {
                         rules: [{required: true, message: '请选择主类别'}],
                       })(
-                        <div className="width30 fl mr20">
+                        <div className="width100 fl mr20">
 
                           <Select placeholder="请选择主类别"
                                   style={{width: 180}}
@@ -449,17 +449,17 @@ class Newshixuns extends Component {
                               })
                             }
                           </Select>
-                          <span className="fl ml20 color-grey lineh-20">
+                          <span className="fl color-grey lineh-20">
                                 没有实验环境？
                                 <a className="color-blue" onClick={this.post_apply}> 申请新建</a>
                           </span>
                         </div>
                       )}
                     </div>
-                      </Form.Item>}
+                      </Form.Item>
 
-                  {this.state.Radiovalue === "2" ? "" : <Form.Item
-                    style={{"borderBottom": 'none'}}
+                  <Form.Item
+                    style={{"borderBottom": 'none','width': '61%','float': 'left','margin-top': '40px'}}
                     className="chooseDes pr"
                     >
                       <div className=" fl pr mr20">
@@ -499,17 +499,9 @@ class Newshixuns extends Component {
                               </div>
                         </span>
                     </div>
-                  </Form.Item>}
+                  </Form.Item>
 
-                  {/*<Form.Item>*/}
-                  {/*  <div className="clearfix mt10">*/}
-                  {/*    <Button className="defalutSubmitbtn fl mr20" type="primary" htmlType="submit">*/}
-                  {/*      提交*/}
-                  {/*    </Button>*/}
-                  {/*    <a href="/shixuns" className="defalutCancelbtn fl">取消</a>*/}
-                  {/*  </div>*/}
 
-                  {/*</Form.Item>*/}
 
                 </Form>
 
@@ -629,7 +621,7 @@ class Newshixuns extends Component {
 
         <div className="clearfix bor-bottom-greyE edu-back-white orderingbox newshixunbottombtn">
           <div className=" edu-txt-center padding13-30">
-            <button type="button" className="ant-btn mr20 newshixunmode"><span>取 消</span></button>
+            <button type="button" className="ant-btn mr20 newshixunmode `backgroundFFF`" ><span>取 消</span></button>
             <button type="button" className="ant-btn newshixunmode mr40 ant-btn-primary" type="primary" htmlType="submit" onClick={this.handleSubmit}><span>确 定</span></button>
           </div>
         </div>
diff --git a/public/react/src/modules/tpm/newshixuns/css/Newshixuns.css b/public/react/src/modules/tpm/newshixuns/css/Newshixuns.css
index 5a5fffdf9..5dadbfa6d 100644
--- a/public/react/src/modules/tpm/newshixuns/css/Newshixuns.css
+++ b/public/react/src/modules/tpm/newshixuns/css/Newshixuns.css
@@ -819,3 +819,7 @@ a.white-btn.use_scope-btn:hover{
 .newshixunmodels{
     margin: 0 auto;
 }
+
+.backgroundFFF{
+    background: #FFF !important;
+}
\ No newline at end of file