From 52149e1cb74462619d38ac87d4bfb7225e38fb1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Wed, 25 Dec 2019 15:37:22 +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/javascripts/jupyter.js                                 | 4 ++--
 public/react/src/modules/tpm/TPMsettings/Configuration.js     | 4 ++--
 public/react/src/modules/tpm/jupyter/index.js                 | 2 +-
 .../modules/tpm/shixunchild/Challenges/Challengesjupyter.js   | 3 +--
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/public/javascripts/jupyter.js b/public/javascripts/jupyter.js
index 5ffd34dd4..192b15fe8 100644
--- a/public/javascripts/jupyter.js
+++ b/public/javascripts/jupyter.js
@@ -37,9 +37,9 @@ document.addEventListener('keydown', (e) => {
 				if(e.data==="stopParent"){
 					//重置停止
 					timebool=false;
-					console.log("父窗口调用停止");
+					// console.log("父窗口调用停止");
 				}else if(e.data==="clonsParent"){
-					console.log("父窗口调用启动");
+					// console.log("父窗口调用启动");
 					//取消启动
 					timebool=true;
 					// runEvery10Sec();
diff --git a/public/react/src/modules/tpm/TPMsettings/Configuration.js b/public/react/src/modules/tpm/TPMsettings/Configuration.js
index daeb456a0..bd93fa4e5 100644
--- a/public/react/src/modules/tpm/TPMsettings/Configuration.js
+++ b/public/react/src/modules/tpm/TPMsettings/Configuration.js
@@ -81,7 +81,7 @@ export default class Shixuninformation extends Component {
           timetype=true;
         }
         this.setState({
-          use_scope_type:this.props&&this.props.status>1&&this.state.use_scope===0&&this.props&&this.props.identity>2||this.props&&this.props.public===2&&this.state.use_scope===0&&this.props&&this.props.identity>2?true:false,
+          use_scope_type:this.props&&this.props.status>1&& this.props.data && this.props.data.shixun.use_scope===0&&this.props&&this.props.identity>2||this.props&&this.props.public===2&& this.props.data && this.props.data.shixun.use_scope===0&&this.props&&this.props.identity>2?true:false,
           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,
@@ -117,7 +117,7 @@ export default class Shixuninformation extends Component {
             timetype=true;
           }
           this.setState({
-            use_scope_type:this.props&&this.props.status>1&&this.state.use_scope===0&&this.props&&this.props.identity>2||this.props&&this.props.public===2&&this.state.use_scope===0&&this.props&&this.props.identity>2?true:false,
+            use_scope_type:this.props&&this.props.status>1&& this.props.data && this.props.data.shixun.use_scope===0&&this.props&&this.props.identity>2||this.props&&this.props.public===2&& this.props.data && this.props.data.shixun.use_scope===0&&this.props&&this.props.identity>2?true:false,
             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,
diff --git a/public/react/src/modules/tpm/jupyter/index.js b/public/react/src/modules/tpm/jupyter/index.js
index 96f2fd6d2..8c20ac4ac 100644
--- a/public/react/src/modules/tpm/jupyter/index.js
+++ b/public/react/src/modules/tpm/jupyter/index.js
@@ -91,7 +91,7 @@ function JupyterTPI (props) {
   // 保存代码
   const addEventListeners = () => {
     window.addEventListener('message', (e) => {
-      console.log("触发了jupytermessage");
+      // console.log("触发了jupytermessage");
       if(e){
         if(e.data){
           if(e.data==="jupytermessage"){
diff --git a/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js b/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js
index 371468f09..bf0a5affb 100644
--- a/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js
+++ b/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js
@@ -149,12 +149,11 @@ class Challengesjupyter extends Component {
 
 
 		window.addEventListener('message', (e) => {
-
-			console.log(e);
 			if(e){
 				if(e.data){
 					if(e.data==="jupytermessage"){
 						that.modifyjupyter();
+
 					}
 				}