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

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';

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">

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>
     );

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,6 +367,7 @@ class Shixuninformation extends Component {
 
     return (
       <div>
+        <div className="educontent mb50 edu-back-white padding10-20">
           <Form>
             <Form.Item
               label="名称"
@@ -527,16 +529,21 @@ class Shixuninformation extends Component {
                 rules: [{required: true, message: '请选择评测脚本'}],
               })(
                 <div className="with15 fl pr">
-                <Select placeholder="请选择评测脚本"
+                  <Select placeholder="请选择选择脚本"
                           style={{width: 180}}
-                        onChange={this.Selectthestudent}
+                          className="fl"
-                >
+                          disabled={operateauthority?false:true}
-                  <Option value={1}>初级</Option>
+                          value={choice_standard_scripts === undefined||choice_standard_scripts === null ? undefined :choice_standard_scripts.id===undefined?choice_standard_scripts:choice_standard_scripts.id}
-                  <Option value={2}>中级</Option>
+                          onChange={operateauthority?this.SelectScput:""}>
-                  <Option value={3}>中高级</Option>
+                    {
-                  <Option value={4}>高级</Option>
+                      this.props.data === undefined ? "" : this.props.data.shixun.standard_scripts.map((item, key) => {
-                </Select>
+                        return (
+                          <Option value={parseInt(item.id)} name={item.scptname} key={key}>{item.scptname}</Option>
+                        )
 
+                      })
+                    }
+                  </Select>
                 </div>
               )}
               <span className="fl ml20 color-blue">
@@ -752,30 +759,10 @@ class Shixuninformation extends Component {
             </div>
             {/*</Form>*/}
           </Modal>
-
-        <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>
-            <div className="task-popup-OK clearfix">
-              <a className="task-btn task-btn-orange"
-                 onClick={this.yeshidemodel}>知道啦</a>
         </div>
+        <Bottomsubmit url={`/shixuns/${this.props.match.params.shixunId}/challenges`} onSubmits={ this.sendsure_apply}/>
       </div>
-        </Modal>
 
-      </div>
     );
   }
 }

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>
     );
   }
 }