调整

public/react/src/modules/tpm/TPMBanner.js

@@ -366,7 +366,7 @@ class TPMBanner extends Component {
       Modalstype: true,
       Modalstopval: "是否确认撤销发布？",
       modalsMidval:"撤销发布后，学员将无法进行练习，若您新增关",
-      ModalsBottomval:"卡，学员需要重新体验课程",
+      ModalsBottomval:"卡，学员需要重新体验实训",
       ModalCancel: this.ModalCancel,
       ModalSave: this.ModalSave,
       modalstyles:"848282"
@@ -1223,7 +1223,7 @@ class TPMBanner extends Component {
                 }
 
 
-                {this.props.identity < 5 && shixunsDetails.shixun_status != -1 && shixunsDetails.shixun_status != 0?
+                {this.props.identity < 6 && shixunsDetails.shixun_status != -1 && shixunsDetails.shixun_status != 0?
                   <div className="fr kaike kkbth mr20"
                        style={{display: shixunsDetails.can_copy === false || shixunsDetails.can_copy === null ? "none" : "flex"}}>
                     <Tooltip placement="bottom" title={"基于这个实训修改形成新的实训"}>

public/react/src/modules/tpm/TPMsettings/Configuration.js

@@ -72,11 +72,18 @@ export default class Shixuninformation extends Component {
   componentDidMount() {
     if (this.props.data) {
       if (this.props.data.shixun) {
+        let time =this.props.data && this.props.data.shixun.opening_time;
+        let timetype=false;
+        if(!time){
+          timetype=false;
+        }else{
+          timetype=true;
+        }
         this.setState({
           can_copy: this.props.data && this.props.data.shixun.can_copy === undefined ? false : this.props.data && this.props.data.shixun.can_copy,
           use_scope: this.props.data && this.props.data.shixun.use_scope,
           opening_time: this.props.data && this.props.data.shixun.opening_time,
-          opentime: !this.props.data && this.props.data.shixun.opening_time ? false : true,
+          opentime: timetype,
           oldscope_partment: this.props.data && this.props.data.shixun.scope_partment,
         })
       }
@@ -100,11 +107,18 @@ export default class Shixuninformation extends Component {
     if (prevProps.data != this.props.data) {
       if (this.props.data) {
         if (this.props.data.shixun) {
+          let time =this.props.data && this.props.data.shixun.opening_time;
+          let timetype=false;
+          if(!time){
+            timetype=false;
+          }else{
+            timetype=true;
+          }
           this.setState({
             can_copy: this.props.data && this.props.data.shixun.can_copy === undefined ? false : this.props.data && this.props.data.shixun.can_copy,
             use_scope: this.props.data && this.props.data.shixun.use_scope,
             opening_time: this.props.data && this.props.data.shixun.opening_time,
-            opentime: !this.props.data && this.props.data.shixun.opening_time ? false : true,
+            opentime: timetype,
             oldscope_partment: this.props.data && this.props.data.shixun.scope_partment,
           })
         }

public/react/src/modules/tpm/TPMsettings/TPMsettings.js

@@ -57,14 +57,14 @@ export default class TPMsettings extends Component {
     });
 
     if(key==="3"&&this.props.shixunsDetails&&this.props.shixunsDetails.is_jupyter === true){
-      this.props.history.replace(`/shixuns/${this.props.match.params.shixunId}/challenges`);
+      window.location.href =`/shixuns/${this.props.match.params.shixunId}/challenges`;
     }else{
       if(key){
         this.setState({
           activeKeys:key
         })
       }else{
-        this.props.history.replace(`/shixuns/${this.props.match.params.shixunId}/challenges`);
+        window.location.href =`/shixuns/${this.props.match.params.shixunId}/challenges`;
       }
 
     }

public/react/src/modules/tpm/newshixuns/Newshixuns.js

@@ -458,7 +458,7 @@ class Newshixuns extends Component {
                 <Form>
                   {this.props.user&&this.props.user.admin===true||this.props.user&&this.props.user.business===true?<Form.Item label="实训类型">
                     {getFieldDecorator('is_jupyter')(
-                      <Radio.Group onChange={this.RadiovalueonChange}>
+                      <Radio.Group onChange={this.RadiovalueonChange} value={this.state.Radiovalue}>
                         <Radio value="1">普通实训</Radio>
                         <Radio value="2">Jupyter实训</Radio>
                       </Radio.Group>,