From f1e8ef30369b3ab7be16cff1308ca84310e54cfc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Thu, 12 Dec 2019 09:39:03 +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

---
 public/react/src/modules/tpm/TPMIndex.js      |   4 +-
 .../modules/tpm/TPMsettings/Configuration.js  |   2 +-
 .../tpm/TPMsettings/LearningSettings.js       |   2 +-
 .../tpm/TPMsettings/Shixuninformation.js      | 635 +++++++++---------
 .../modules/tpm/TPMsettings/TPMsettings.js    |  19 +-
 5 files changed, 329 insertions(+), 333 deletions(-)

diff --git a/public/react/src/modules/tpm/TPMIndex.js b/public/react/src/modules/tpm/TPMIndex.js
index 2e28d800e..0fe17be2e 100644
--- a/public/react/src/modules/tpm/TPMIndex.js
+++ b/public/react/src/modules/tpm/TPMIndex.js
@@ -20,9 +20,9 @@ import TPMRepositoryComponent from './TPMRepositoryComponent';
 
 import TPMRepositoryCommits from './shixunchild/Repository/TPMRepositoryCommits';
 
-import TPMsettings from './TPMsettings/TPMsettings';
+//import TPMsettings from './TPMsettings/TPMsettings';
 
-//import TPMsettings from './TPMsettings/oldTPMsettings';
+import TPMsettings from './TPMsettings/oldTPMsettings';
 
 import TPMChallengeComponent from './TPMChallengeContainer';
 import TPMPropaedeuticsComponent from './TPMPropaedeuticsComponent';
diff --git a/public/react/src/modules/tpm/TPMsettings/Configuration.js b/public/react/src/modules/tpm/TPMsettings/Configuration.js
index 299f4eb64..2089d1939 100644
--- a/public/react/src/modules/tpm/TPMsettings/Configuration.js
+++ b/public/react/src/modules/tpm/TPMsettings/Configuration.js
@@ -80,7 +80,7 @@ export default class Shixuninformation extends Component {
       })
     }
     return (
-      <div>
+      <div className="educontent mb50 edu-back-white padding10-20">
         <div className="clearfix ml30">
           <span className="color-grey-6 mt5 fl" style={{minWidth: '95px'}}>复制:</span>
           <span className="fl mt5">
diff --git a/public/react/src/modules/tpm/TPMsettings/LearningSettings.js b/public/react/src/modules/tpm/TPMsettings/LearningSettings.js
index 393e0659c..9f99ea5a0 100644
--- a/public/react/src/modules/tpm/TPMsettings/LearningSettings.js
+++ b/public/react/src/modules/tpm/TPMsettings/LearningSettings.js
@@ -23,7 +23,7 @@ export default class Shixuninformation extends Component {
   render() {
 
     return (
-      <div>
+      <div className="educontent mb50 edu-back-white padding10-20">
         1111
       </div>
     );
diff --git a/public/react/src/modules/tpm/TPMsettings/Shixuninformation.js b/public/react/src/modules/tpm/TPMsettings/Shixuninformation.js
index b274b018f..1e6980216 100644
--- a/public/react/src/modules/tpm/TPMsettings/Shixuninformation.js
+++ b/public/react/src/modules/tpm/TPMsettings/Shixuninformation.js
@@ -62,7 +62,8 @@ class Shixuninformation extends Component {
           shixunName:this.props.data.shixun.name,
           trainee:this.props.data.shixun.trainee,
           choice_main_type:this.props.data.shixun.choice_main_type,
-          choice_small_type:this.props.data.shixun.choice_small_type
+          choice_small_type:this.props.data.shixun.choice_small_type,
+          choice_standard_scripts:this.props.data.shixun.choice_standard_scripts,
         })
 
         this.props.form.setFieldsValue({
@@ -315,7 +316,7 @@ class Shixuninformation extends Component {
     let operateauthority=this.props.identity===1?true:this.props.identity<5&&this.props.data.shixun.status==0?true:false;
      console.log(operateauthority)
     const {getFieldDecorator} = this.props.form;
-    const {newshixunlist, languagewrite, systemenvironment, testcoderunmode, fileList, postapplytitle, postapplyvisible, shixunmemoMDvalue} = this.state;
+    const {newshixunlist, languagewrite, systemenvironment, testcoderunmode, fileList, choice_standard_scripts, postapplyvisible, shixunmemoMDvalue} = this.state;
     const {shixun_service_configs}=this.props;
     const uploadProps = {
       width: 600,
@@ -366,139 +367,140 @@ class Shixuninformation extends Component {
 
     return (
       <div>
-        <Form>
-          <Form.Item
-            label="名称"
-            style={{"borderBottom": 'none'}}
-            className="mt15"
-          >
-            {getFieldDecorator('name', {
-              rules: [{
-                required: true, message: '请输入选题名称',
-              }, {
-                max: 60, message: '请输入名称，最大限制60个字符',
-              }, {
-                whitespace: true, message: '请勿输入空格'
-              }],
-            })(
-              <Input placeholder="请输入名称，最大限制60个字符"
-                     className={"input-100-45 greyInput"}
-                     onInput={this.shixunNameInput} autoComplete="off"
-                     addonAfter={`${String(!this.state.shixunName ? 0 : this.state.shixunName.length)}/${this.state.NAME_COUNT}`}
-                     className="newViewAfter"/>
-            )}
-          </Form.Item>
-
-          <Form.Item
-            label="简介"
-            style={{"borderBottom": 'none', 'marginBottom': '0px'}}
-            className="chooseDes pr"
-          >
-            <TPMMDEditor ref={this.contentMdRef} placeholder="请输入简介" mdID={'courseContentMD'}
-                         refreshTimeout={1500}
-                         className="courseMessageMD"
-              // initValue={this.state.description === null ? "" : this.state.description}
-            ></TPMMDEditor>
-          </Form.Item>
-
-
-          <Form.Item
-            label={"难易度"}
-            style={{"borderBottom": 'none'}}
-            className="chooseDes pr"
-          >
-            {getFieldDecorator('trainee', {
-              rules: [{required: true, message: '请选择难易度'}],
-            })(
-              <div className="with15 fl pr">
-                <Select placeholder="请选择难易度"
-                        style={{width: 180}}
-                        onChange={this.Selectthestudent}
-                        value={this.state.trainee}
-                >
-                  <Option value={1}>初级</Option>
-                  <Option value={2}>中级</Option>
-                  <Option value={3}>中高级</Option>
-                  <Option value={4}>高级</Option>
-                </Select>
-
-              </div>
-            )}
-            <span className="fl ml20 color-grey">（实训的难易程度）</span>
-          </Form.Item>
-
-          <Form.Item
-            label={"实验环境"}
-            style={{"borderBottom": 'none', 'width': '18%', 'float': 'left'}}
-            className="chooseDes pr"
-          >
-            <div>
-
-              {getFieldDecorator('selectleft', {
-                rules: [{required: true, message: '请选择主类别'}],
+        <div className="educontent mb50 edu-back-white padding10-20">
+          <Form>
+            <Form.Item
+              label="名称"
+              style={{"borderBottom": 'none'}}
+              className="mt15"
+            >
+              {getFieldDecorator('name', {
+                rules: [{
+                  required: true, message: '请输入选题名称',
+                }, {
+                  max: 60, message: '请输入名称，最大限制60个字符',
+                }, {
+                  whitespace: true, message: '请勿输入空格'
+                }],
+              })(
+                <Input placeholder="请输入名称，最大限制60个字符"
+                       className={"input-100-45 greyInput"}
+                       onInput={this.shixunNameInput} autoComplete="off"
+                       addonAfter={`${String(!this.state.shixunName ? 0 : this.state.shixunName.length)}/${this.state.NAME_COUNT}`}
+                       className="newViewAfter"/>
+              )}
+            </Form.Item>
+
+            <Form.Item
+              label="简介"
+              style={{"borderBottom": 'none', 'marginBottom': '0px'}}
+              className="chooseDes pr"
+            >
+              <TPMMDEditor ref={this.contentMdRef} placeholder="请输入简介" mdID={'courseContentMD'}
+                           refreshTimeout={1500}
+                           className="courseMessageMD"
+                // initValue={this.state.description === null ? "" : this.state.description}
+              ></TPMMDEditor>
+            </Form.Item>
+
+
+            <Form.Item
+              label={"难易度"}
+              style={{"borderBottom": 'none'}}
+              className="chooseDes pr"
+            >
+              {getFieldDecorator('trainee', {
+                rules: [{required: true, message: '请选择难易度'}],
               })(
-                <div className="width100 fl mr20">
-                  <Select placeholder="请选择主类别" value={this.state.choice_main_type === "" ? undefined : this.state.choice_main_type}
+                <div className="with15 fl pr">
+                  <Select placeholder="请选择难易度"
                           style={{width: 180}}
-                          onChange={operateauthority?this.bigClass:""}
-                          optionFilterProp="children"
-                          filterOption={(input, option) =>
-                            option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
-                          }
+                          onChange={this.Selectthestudent}
+                          value={this.state.trainee}
                   >
-
-                    {
-                      this.props.data === undefined ? "" : this.props.data.shixun.main_type.map((item, key) => {
-                        return (
-                          <Option value={item.id} key={key} >
-                            <Tooltip placement="right" title={item.description=== ""?"无描述":item.description} >
-                              {item.type_name}
-                            </Tooltip>
-                          </Option>
-                        )
-                      })
-                    }
+                    <Option value={1}>初级</Option>
+                    <Option value={2}>中级</Option>
+                    <Option value={3}>中高级</Option>
+                    <Option value={4}>高级</Option>
                   </Select>
 
                 </div>
               )}
-            </div>
-          </Form.Item>
-
+              <span className="fl ml20 color-grey">（实训的难易程度）</span>
+            </Form.Item>
+
+            <Form.Item
+              label={"实验环境"}
+              style={{"borderBottom": 'none', 'width': '18%', 'float': 'left'}}
+              className="chooseDes pr"
+            >
+              <div>
+
+                {getFieldDecorator('selectleft', {
+                  rules: [{required: true, message: '请选择主类别'}],
+                })(
+                  <div className="width100 fl mr20">
+                    <Select placeholder="请选择主类别" value={this.state.choice_main_type === "" ? undefined : this.state.choice_main_type}
+                            style={{width: 180}}
+                            onChange={operateauthority?this.bigClass:""}
+                            optionFilterProp="children"
+                            filterOption={(input, option) =>
+                              option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
+                            }
+                    >
+
+                      {
+                        this.props.data === undefined ? "" : this.props.data.shixun.main_type.map((item, key) => {
+                          return (
+                            <Option value={item.id} key={key} >
+                              <Tooltip placement="right" title={item.description=== ""?"无描述":item.description} >
+                                {item.type_name}
+                              </Tooltip>
+                            </Option>
+                          )
+                        })
+                      }
+                    </Select>
 
-          <Form.Item
-            style={{"borderBottom": 'none', 'width': '61%', 'float': 'left', 'marginTop': '40px'}}
-            className="chooseDes pr"
-          >
-            <div className=" fl pr mr20">
-              {getFieldDecorator('selectright', {
-                rules: [{required: true, message: '请选择小类别'}],
-              })(
-                <div className=" fl pr mr20">
-                  <Select placeholder="请选择小类别"
-                          onChange={this.selectright}
-                          value={this.state.choice_small_type.length===0||this.state.choice_small_type[0]===""||this.state.choice_small_type===[]?undefined:this.state.choice_small_type}
-                          style={{width: 180,height:30}}
-                          disabled={operateauthority?false:true}
-                          onDeselect={operateauthority?this.Deselectlittle:""}
-                          onSelect={operateauthority?this.littleClass:""}
-                          defaultOpen={false}
-                  >
-                    {
-                      this.props.data === undefined ? "" :  this.props.data.shixun.small_type.map((item, key) => {
-                        return(
-                          <Option value={item.id} key={key}>
-                            <Tooltip placement="right" title={item.description=== ""?"无描述":item.description} >
-                              {item.type_name}
-                            </Tooltip>
-                          </Option>
-                        )
-                      })
-                    }
-                  </Select>
-                </div>
-              )}
-              <span className="fl ml20 color-grey lineh-20">
+                  </div>
+                )}
+              </div>
+            </Form.Item>
+
+
+            <Form.Item
+              style={{"borderBottom": 'none', 'width': '61%', 'float': 'left', 'marginTop': '40px'}}
+              className="chooseDes pr"
+            >
+              <div className=" fl pr mr20">
+                {getFieldDecorator('selectright', {
+                  rules: [{required: true, message: '请选择小类别'}],
+                })(
+                  <div className=" fl pr mr20">
+                    <Select placeholder="请选择小类别"
+                            onChange={this.selectright}
+                            value={this.state.choice_small_type.length===0||this.state.choice_small_type[0]===""||this.state.choice_small_type===[]?undefined:this.state.choice_small_type}
+                            style={{width: 180,height:30}}
+                            disabled={operateauthority?false:true}
+                            onDeselect={operateauthority?this.Deselectlittle:""}
+                            onSelect={operateauthority?this.littleClass:""}
+                            defaultOpen={false}
+                    >
+                      {
+                        this.props.data === undefined ? "" :  this.props.data.shixun.small_type.map((item, key) => {
+                          return(
+                            <Option value={item.id} key={key}>
+                              <Tooltip placement="right" title={item.description=== ""?"无描述":item.description} >
+                                {item.type_name}
+                              </Tooltip>
+                            </Option>
+                          )
+                        })
+                      }
+                    </Select>
+                  </div>
+                )}
+                <span className="fl ml20 color-grey lineh-20">
                               <div>
                                  <div className={"font-12"}>
                                     已安装软件：hadoop3.1.0、jdk1.8；
@@ -508,44 +510,49 @@ class Shixuninformation extends Component {
                                   </div>
                               </div>
                         </span>
-            </div>
-          </Form.Item>
+              </div>
+            </Form.Item>
 
-          <div className={"both"}></div>
-          <div className=" color-grey lineh-20 mb20">
-            没有实验环境？
-            <a className="color-blue" onClick={this.post_apply}> 申请新建</a>
-          </div>
+            <div className={"both"}></div>
+            <div className=" color-grey lineh-20 mb20">
+              没有实验环境？
+              <a className="color-blue" onClick={this.post_apply}> 申请新建</a>
+            </div>
 
 
-          <Form.Item
-            label={"评测脚本"}
-            style={{"borderBottom": 'none'}}
-            className="chooseDes pr"
-          >
-            {getFieldDecorator('select123', {
-              rules: [{required: true, message: '请选择评测脚本'}],
-            })(
-              <div className="with15 fl pr">
-                <Select placeholder="请选择评测脚本"
-                        style={{width: 180}}
-                        onChange={this.Selectthestudent}
-                >
-                  <Option value={1}>初级</Option>
-                  <Option value={2}>中级</Option>
-                  <Option value={3}>中高级</Option>
-                  <Option value={4}>高级</Option>
-                </Select>
+            <Form.Item
+              label={"评测脚本"}
+              style={{"borderBottom": 'none'}}
+              className="chooseDes pr"
+            >
+              {getFieldDecorator('select123', {
+                rules: [{required: true, message: '请选择评测脚本'}],
+              })(
+                <div className="with15 fl pr">
+                  <Select placeholder="请选择选择脚本"
+                          style={{width: 180}}
+                          className="fl"
+                          disabled={operateauthority?false:true}
+                          value={choice_standard_scripts === undefined||choice_standard_scripts === null ? undefined :choice_standard_scripts.id===undefined?choice_standard_scripts:choice_standard_scripts.id}
+                          onChange={operateauthority?this.SelectScput:""}>
+                    {
+                      this.props.data === undefined ? "" : this.props.data.shixun.standard_scripts.map((item, key) => {
+                        return (
+                          <Option value={parseInt(item.id)} name={item.scptname} key={key}>{item.scptname}</Option>
+                        )
 
-              </div>
-            )}
-            <span className="fl ml20 color-blue">
+                      })
+                    }
+                  </Select>
+                </div>
+              )}
+              <span className="fl ml20 color-blue">
               使用自定义脚本
               <span className={"color-grey ml10"}  onClick={()=>this.testscripttip(0)}>
                      <Icon type="exclamation-circle"/>
               </span>
               	<div className="invite-tip clearfix none " id="test_script_tip"
-                             style={{top: '33px', left: '-15px',width: '450px',zIndex: '10',display: this.state.testscripttiptype===true?'block':"none"}}>
+                     style={{top: '33px', left: '-15px',width: '450px',zIndex: '10',display: this.state.testscripttiptype===true?'block':"none"}}>
                   <style>
                     {
                       `
@@ -583,199 +590,179 @@ class Shixuninformation extends Component {
 										</p>
 									</div>
             </span>
-          </Form.Item>
-
-          <div className="mt30 clearfix df">
-            <div
-              className={operateauthority === false ? 'nonemodel' : ""}
-            ></div>
-            <div className="flex1">
-              <div className="fl" style={{border: '1px solid #ccc'}}>
-                <MonacoEditor
-                  height="450"
-                  width="1150"
-                  language={this.state.language}
-                  value={shixunmemoMDvalue}
-                  options={{
-                    selectOnLineNumbers: true
-                  }}
-                  onChange={this.getshixunmemoMDvalue}
-                  // onChange={this.getshixunmemoMDvalue}
-                />
+            </Form.Item>
+
+            <div className="mt30 clearfix df">
+              <div
+                className={operateauthority === false ? 'nonemodel' : ""}
+              ></div>
+              <div className="flex1">
+                <div className="fl" style={{border: '1px solid #ccc'}}>
+                  <MonacoEditor
+                    height="450"
+                    width="1150"
+                    language={this.state.language}
+                    value={shixunmemoMDvalue}
+                    options={{
+                      selectOnLineNumbers: true
+                    }}
+                    onChange={this.getshixunmemoMDvalue}
+                    // onChange={this.getshixunmemoMDvalue}
+                  />
+                </div>
               </div>
             </div>
-          </div>
-        </Form>
+          </Form>
 
 
-        <span className="ant-form-text mt20" >私密版本库：
+          <span className="ant-form-text mt20" >私密版本库：
             <Checkbox>（若需要对学员隐藏部分版本库内容时，请选中；选中即启用私密版本库，请将需要对学员隐藏的文件存储在私密版本库）</Checkbox>
         </span>
 
-        {this.props.identity<3?<div className="edu-back-white padding40-20 mb20">
-          <p className="color-grey-6 font-16 mb30">服务配置</p>
-          { shixun_service_configs&&shixun_service_configs.map((item,key)=>{
+          {this.props.identity<3?<div className="edu-back-white padding40-20 mb20">
+            <p className="color-grey-6 font-16 mb30">服务配置</p>
+            { shixun_service_configs&&shixun_service_configs.map((item,key)=>{
 
-            return(
-              <div key={key}>
-                <div id="5">
-                  <div className="color-grey-6 font-16 mt30 mb20" id="shixun_scenario_type_name">
-                    <span className={"fl"}>{item.name}</span>
-                    {/*<span className={"fr mr40"} onClick={()=>this.Deselectlittle(item.mirror_repository_id)}><i className="fa fa-times-circle color-grey-c font-16 fl"></i></span>*/}
-                  </div>
-                  <div className="clearfix mb5">
-                    <label className="panel-form-label fl">CPU(核)：</label>
-                    <div className="pr fl with80 status_con">
-                      <input type="text"  value={item.cpu_limit} onInput={(e)=>this.setConfigsInputs(e,key,1)}
-                             className="panel-box-sizing task-form-100 task-height-40" placeholder="请输入类别名称" />
+              return(
+                <div key={key}>
+                  <div id="5">
+                    <div className="color-grey-6 font-16 mt30 mb20" id="shixun_scenario_type_name">
+                      <span className={"fl"}>{item.name}</span>
+                      {/*<span className={"fr mr40"} onClick={()=>this.Deselectlittle(item.mirror_repository_id)}><i className="fa fa-times-circle color-grey-c font-16 fl"></i></span>*/}
                     </div>
-                    <div className="cl"></div>
-                  </div>
-                  <div className="clearfix mb5">
-                    <label className="panel-form-label fl">最低CPU(核)：</label>
-                    <div className="pr fl with80 status_con">
-                      <input type="text" value={item.lower_cpu_limit}  onInput={(e)=>this.setConfigsInputs(e,key,2)}
-                             className="panel-box-sizing task-form-100 task-height-40" placeholder="请输入类别名称" />
+                    <div className="clearfix mb5">
+                      <label className="panel-form-label fl">CPU(核)：</label>
+                      <div className="pr fl with80 status_con">
+                        <input type="text"  value={item.cpu_limit} onInput={(e)=>this.setConfigsInputs(e,key,1)}
+                               className="panel-box-sizing task-form-100 task-height-40" placeholder="请输入类别名称" />
+                      </div>
+                      <div className="cl"></div>
                     </div>
-                    <div className="cl"></div>
-                  </div>
-                  <div className="clearfix mb5">
-                    <label className="panel-form-label fl">内存限制(M)：</label>
-                    <div className="pr fl with80 status_con">
-                      <input type="text"  value={item.memory_limit}  onInput={(e)=>this.setConfigsInputs(e,key,3)}
-                             className="panel-box-sizing task-form-100 task-height-40" placeholder="请输入类别名称" />
+                    <div className="clearfix mb5">
+                      <label className="panel-form-label fl">最低CPU(核)：</label>
+                      <div className="pr fl with80 status_con">
+                        <input type="text" value={item.lower_cpu_limit}  onInput={(e)=>this.setConfigsInputs(e,key,2)}
+                               className="panel-box-sizing task-form-100 task-height-40" placeholder="请输入类别名称" />
+                      </div>
+                      <div className="cl"></div>
                     </div>
-                    <div className="cl"></div>
-                  </div>
-                  <div className="clearfix mb5">
-                    <label className="panel-form-label fl">内存要求(M)：</label>
-                    <div className="pr fl with20 status_con">
-                      <input type="text" value={item.request_limit}   onInput={(e)=>this.setConfigsInputs(e,key,4)}
-                             className="panel-box-sizing task-form-100 task-height-40" placeholder="请输入类别名称" />
+                    <div className="clearfix mb5">
+                      <label className="panel-form-label fl">内存限制(M)：</label>
+                      <div className="pr fl with80 status_con">
+                        <input type="text"  value={item.memory_limit}  onInput={(e)=>this.setConfigsInputs(e,key,3)}
+                               className="panel-box-sizing task-form-100 task-height-40" placeholder="请输入类别名称" />
+                      </div>
+                      <div className="cl"></div>
+                    </div>
+                    <div className="clearfix mb5">
+                      <label className="panel-form-label fl">内存要求(M)：</label>
+                      <div className="pr fl with20 status_con">
+                        <input type="text" value={item.request_limit}   onInput={(e)=>this.setConfigsInputs(e,key,4)}
+                               className="panel-box-sizing task-form-100 task-height-40" placeholder="请输入类别名称" />
+                      </div>
+                      <label className="panel-form-label fl" style={{width: '48%'}}>温馨提示：纯编程类型实训建议使用默认值，对于大数据等建议使用最大内存的30%</label>
+                      <div className="cl"></div>
                     </div>
-                    <label className="panel-form-label fl" style={{width: '48%'}}>温馨提示：纯编程类型实训建议使用默认值，对于大数据等建议使用最大内存的30%</label>
-                    <div className="cl"></div>
                   </div>
                 </div>
-              </div>
-            )
+              )
 
-          })}
-        </div>	:""}
+            })}
+          </div>	:""}
 
 
-        {postapplyvisible === true ? <style>
-          {
-            `
+          {postapplyvisible === true ? <style>
+            {
+              `
            body{
             overflow: hidden !important;
             }
             `
-          }
-        </style> : ""}
-
-        <Modal
-          keyboard={false}
-          title="申请新建"
-          visible={postapplyvisible}
-          closable={false}
-          footer={null}
-          width={850}
-          heigth={720}
-        >
-          <div>
-            <li className="clearfix ml82">
-              <label className="fl mt10 "><span
-                className="color-red fl mt3">*</span>语言：&nbsp;&nbsp;</label>
-              <textarea
-                className={this.state.languagewritetype === true ? "fl task-form-80 task-height-150 bor-reds" : "fl task-form-80 task-height-150"}
-                style={{width: '89%', height: '100px'}}
-                onInput={this.setlanguagewrite}
-                value={languagewrite}
-                placeholder="请填写该镜像是基于什么语言：示例：Python"
-                id="demand_info"></textarea>
-            </li>
-            <div className={"color-red shixunspanred"}>{this.state.languagewritetype === true ? "请填写该镜像语言" : ""}</div>
-            <li className="clearfix ml1">
-              <label className="panel-form-label fl ml50"><span
-                className="color-red fl mt3">*</span>系统环境：&nbsp;&nbsp;</label>
-              <textarea
-                className={this.state.systemenvironmenttype === true ? "fl task-form-80 task-height-150 bor-reds" : "fl task-form-80 task-height-150"}
-                onInput={this.setsystemenvironment}
-                style={{height: '100px'}}
-                value={systemenvironment}
-                placeholder="请填写该镜像是基于什么linux系统环境,代码运行环境"
-                id="demand_info"></textarea>
-            </li>
-            <div
-              className={"color-red shixunspanred"}>{this.state.systemenvironmenttype === true ? "请填写该镜像语言系统环境" : ""}</div>
-            <li className="clearfix">
-              <label className="fl mt10"><span
-                className="color-red fl mt3">*</span>测试代码运行方式：&nbsp;&nbsp;</label>
-
-              <textarea
-                className={this.state.testcoderunmodetype === true ? "fl task-form-80 task-height-150 bor-reds" : "fl task-form-80 task-height-150"}
-                onInput={this.settestcoderunmode}
-                value={testcoderunmode}
-                style={{height: '100px'}}
-                placeholder="请填写该镜像中测试代码运行方式"
-                id="demand_info"></textarea>
-            </li>
-            <div
-              className={"color-red shixunspanred"}>{this.state.testcoderunmodetype === true ? "请填写该镜像测试代码运行方式" : ""}</div>
-            <li className="clearfix ml50">
-              <label className="panel-form-label fl mt-5"><span
-                className="color-red fl">*</span>测试代码：&nbsp;&nbsp;</label>
-              <div className="mt10" style={{
-                display: "inline-block"
-              }}>
-                <Upload {...uploadProps}>
-                  <Icon type="upload" className="fl mt3"> </Icon>
-                  <span className="color-blue fl cdefault">上传附件</span>
-                  <span className="color-grey-c fl ml10 ">(单个文件50M以内)</span>
-
-                </Upload>
-              </div>
-
-            </li>
-            <div className={"color-red shixunspanred"}>
-              {this.state.attachmentidstype === true ? "请上传附件" : ""}
-            </div>
-            <li className="edu-txt-center clearfix ">
-              <a className="pop_close task-btn  mr30"
-                 onClick={() => this.sendhideModaly()}
-              >取消</a>
-              <Button type="primary" onClick={() => this.sendsure_apply()}
-                      className="task-btn task-btn-orange">确定</Button>
-            </li>
-            <div className="cl"></div>
-          </div>
-          {/*</Form>*/}
-        </Modal>
+            }
+          </style> : ""}
+
+          <Modal
+            keyboard={false}
+            title="申请新建"
+            visible={postapplyvisible}
+            closable={false}
+            footer={null}
+            width={850}
+            heigth={720}
+          >
+            <div>
+              <li className="clearfix ml82">
+                <label className="fl mt10 "><span
+                  className="color-red fl mt3">*</span>语言：&nbsp;&nbsp;</label>
+                <textarea
+                  className={this.state.languagewritetype === true ? "fl task-form-80 task-height-150 bor-reds" : "fl task-form-80 task-height-150"}
+                  style={{width: '89%', height: '100px'}}
+                  onInput={this.setlanguagewrite}
+                  value={languagewrite}
+                  placeholder="请填写该镜像是基于什么语言：示例：Python"
+                  id="demand_info"></textarea>
+              </li>
+              <div className={"color-red shixunspanred"}>{this.state.languagewritetype === true ? "请填写该镜像语言" : ""}</div>
+              <li className="clearfix ml1">
+                <label className="panel-form-label fl ml50"><span
+                  className="color-red fl mt3">*</span>系统环境：&nbsp;&nbsp;</label>
+                <textarea
+                  className={this.state.systemenvironmenttype === true ? "fl task-form-80 task-height-150 bor-reds" : "fl task-form-80 task-height-150"}
+                  onInput={this.setsystemenvironment}
+                  style={{height: '100px'}}
+                  value={systemenvironment}
+                  placeholder="请填写该镜像是基于什么linux系统环境,代码运行环境"
+                  id="demand_info"></textarea>
+              </li>
+              <div
+                className={"color-red shixunspanred"}>{this.state.systemenvironmenttype === true ? "请填写该镜像语言系统环境" : ""}</div>
+              <li className="clearfix">
+                <label className="fl mt10"><span
+                  className="color-red fl mt3">*</span>测试代码运行方式：&nbsp;&nbsp;</label>
+
+                <textarea
+                  className={this.state.testcoderunmodetype === true ? "fl task-form-80 task-height-150 bor-reds" : "fl task-form-80 task-height-150"}
+                  onInput={this.settestcoderunmode}
+                  value={testcoderunmode}
+                  style={{height: '100px'}}
+                  placeholder="请填写该镜像中测试代码运行方式"
+                  id="demand_info"></textarea>
+              </li>
+              <div
+                className={"color-red shixunspanred"}>{this.state.testcoderunmodetype === true ? "请填写该镜像测试代码运行方式" : ""}</div>
+              <li className="clearfix ml50">
+                <label className="panel-form-label fl mt-5"><span
+                  className="color-red fl">*</span>测试代码：&nbsp;&nbsp;</label>
+                <div className="mt10" style={{
+                  display: "inline-block"
+                }}>
+                  <Upload {...uploadProps}>
+                    <Icon type="upload" className="fl mt3"> </Icon>
+                    <span className="color-blue fl cdefault">上传附件</span>
+                    <span className="color-grey-c fl ml10 ">(单个文件50M以内)</span>
+
+                  </Upload>
+                </div>
 
-        <Bottomsubmit url={`/shixuns/${this.props.match.params.shixunId}/challenges`} onSubmits={ this.sendsure_apply}/>
-        <Modal
-          keyboard={false}
-          title="提示"
-          visible={postapplytitle}
-          closable={false}
-          footer={null}
-        >
-          <div>
-            <div className="task-popup-content"><p
-              className="task-popup-text-center font-16"><span
-              className="font-17 mt10">新建申请已提交，请等待管理员的审核</span></p>
-              <li className="font-14 mt15 color-grey-6 edu-txt-center">我们将在1-2个工作日内与您联系
               </li>
+              <div className={"color-red shixunspanred"}>
+                {this.state.attachmentidstype === true ? "请上传附件" : ""}
+              </div>
+              <li className="edu-txt-center clearfix ">
+                <a className="pop_close task-btn  mr30"
+                   onClick={() => this.sendhideModaly()}
+                >取消</a>
+                <Button type="primary" onClick={() => this.sendsure_apply()}
+                        className="task-btn task-btn-orange">确定</Button>
+              </li>
+              <div className="cl"></div>
             </div>
-            <div className="task-popup-OK clearfix">
-              <a className="task-btn task-btn-orange"
-                 onClick={this.yeshidemodel}>知道啦</a>
-            </div>
-          </div>
-        </Modal>
-
+            {/*</Form>*/}
+          </Modal>
+        </div>
+        <Bottomsubmit url={`/shixuns/${this.props.match.params.shixunId}/challenges`} onSubmits={ this.sendsure_apply}/>
       </div>
+
     );
   }
 }
diff --git a/public/react/src/modules/tpm/TPMsettings/TPMsettings.js b/public/react/src/modules/tpm/TPMsettings/TPMsettings.js
index 224339998..c405e3e9f 100644
--- a/public/react/src/modules/tpm/TPMsettings/TPMsettings.js
+++ b/public/react/src/modules/tpm/TPMsettings/TPMsettings.js
@@ -83,9 +83,21 @@ export default class TPMsettings extends Component {
 
   render() {
     return (
-      <div>
 
-        <div className="educontent mt30 mb50 edu-back-white padding10-20">
+        <div>
+          <style>
+            {
+              `
+              .ant-tabs-bar{
+                  width: 1200px;
+                  margin: 0 auto;
+                  background: #fff;
+                  border-bottom: 0px;
+                  margin-top: 30px!important;
+              }
+              `
+            }
+          </style>
           <Tabs tabBarExtraContent={
             <div className={"mb20"}>
               <Button type="primary" ghost className={"Permanentban"}>
@@ -117,9 +129,6 @@ export default class TPMsettings extends Component {
           </Tabs>
         </div>
 
-
-
-      </div>
     );
   }
 }