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

---
 public/react/src/modules/tpm/TPMBanner.js     | 23 +++++++++++++------
 .../modules/tpm/TPMsettings/Configuration.js  |  2 +-
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/public/react/src/modules/tpm/TPMBanner.js b/public/react/src/modules/tpm/TPMBanner.js
index 59d5c913a..a43bacd5e 100644
--- a/public/react/src/modules/tpm/TPMBanner.js
+++ b/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}
                   >
-                    <Button type="primary" ghost id="challenge_begin" onClick={this.openpublic} className="fr kaike kkbths mr20 font-18 height39">
-                      申请公开
-                    </Button>
+                    <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 ?
-                  <Button type="primary" ghost id="challenge_begin" onClick={this.hidenpublic} className="fr kaike kkbths mr20 font-18 height39" style={{'width': '140px'}}>
-                    撤销申请公开
-                  </Button>: ""
+                  <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>
+                  </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>
+                  : ""
                 }
 
                 {
diff --git a/public/react/src/modules/tpm/TPMsettings/Configuration.js b/public/react/src/modules/tpm/TPMsettings/Configuration.js
index b47644719..129ca457c 100644
--- a/public/react/src/modules/tpm/TPMsettings/Configuration.js
+++ b/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({