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

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

@@ -1009,8 +1009,10 @@ class TPMBanner extends Component {
                     placement="bottom"
                     visible={this.state.openknow}
                   >
+                    <Tooltip placement="bottom" title={"发布后，可以使用到自己的课堂和课程"}>
                     <a onClick={this.applyrelease} className="fr kaike kkbths mr20 font-18 height39"
                        id="challenge_begin">发布</a>
+                    </Tooltip>
                   </Popover>: ""
                 }
 
@@ -1087,21 +1089,28 @@ class TPMBanner extends Component {
                   placement="bottom"
                   visible={this.state.openshowpublictype}
                   >
+                    <Tooltip placement="bottom" title={"审核通过后，平台用户可以查看实训"}>
                       <Button type="primary" ghost id="challenge_begin" onClick={this.openpublic} className="fr kaike kkbths mr20 font-18 height39">
                         申请公开
                       </Button>
+                    </Tooltip>
                   </Popover>: ""
                 }
 
                 {shixunsDetails.shixun_status === 2 && shixunsDetails.public===1 && this.props.identity < 5 ?
+                  <Tooltip placement="bottom" title={"撤销后，仅可以使用到自己的课堂和课程"}>
                     <Button type="primary" ghost id="challenge_begin" onClick={this.hidenpublic} className="fr kaike kkbths mr20 font-18 height39" style={{'width': '140px'}}>
                       撤销申请公开
-                  </Button>: ""
+                    </Button>
+                  </Tooltip>: ""
                 }
 
                 {shixunsDetails.shixun_status === 2 && shixunsDetails.public===0 && this.props.identity < 5 ?
+                  <Tooltip placement="bottom" title={"撤销发布后，学员将无法进行练习"}>
                   <a onClick={this.cancel_publish} className="fr kaike kkbths mr20 font-18 height39"
-                     id="challenge_begin">撤销发布</a> : ""
+                     id="challenge_begin">撤销发布</a>
+                  </Tooltip>
+                  : ""
                 }
 
                 {

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

@@ -123,7 +123,7 @@ export default class Shixuninformation extends Component {
     this.setState({
       loading: true
     })
-    let {can_copy, use_scope, scope_partment, opening_time} = this.state;
+    let {can_copy, use_scope, scope_partment, opening_time,oldscope_partment} = this.state;
     if(this.state.opentime===true){
       if(opening_time===null){
         this.setState({