From 25a3481d9a0cd48d01ca7e823c75eef6b6b10bf3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Fri, 13 Dec 2019 11:06:02 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tpm/shixunchild/Challenges/Challengesjupyter.js | 8 ++++---- .../modules/tpm/shixunchild/shixunchildCss/Challenges.css | 6 ++++++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js b/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js index f3b2d8029..0206d1f83 100644 --- a/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js +++ b/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js @@ -79,7 +79,7 @@ class Challengesjupyter extends Component { setTimeout(() => { this.setState({ - jupyter_url:response.data.url, + jupyter_url:response.data.url, jupyter_port:response.data.port, booljupyterurls:true, }) @@ -212,9 +212,9 @@ class Challengesjupyter extends Component { booljupyterurls===true? ( this.state.jupyter_url === null? -
- -

加载实训出错，是否

this.updatamakedowns()}>重新加载

+
+ {/**/} +

加载实训出错，是否

this.updatamakedowns()}>重新加载

diff --git a/public/react/src/modules/tpm/shixunchild/shixunchildCss/Challenges.css b/public/react/src/modules/tpm/shixunchild/shixunchildCss/Challenges.css index 316639348..4b6badc28 100644 --- a/public/react/src/modules/tpm/shixunchild/shixunchildCss/Challenges.css +++ b/public/react/src/modules/tpm/shixunchild/shixunchildCss/Challenges.css @@ -79,3 +79,9 @@ font-size:14px; color:#888888; } +.intermediatecenter{ + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; +} From 0482e7c7f56aa8c3a155e310019e916d5fd4ae15 Mon Sep 17 00:00:00 2001 From: tangjiang <465264938@qq.com> Date: Fri, 13 Dec 2019 11:10:22 +0800 Subject: [PATCH 2/5] update style --- public/react/src/modules/tpm/jupyter/index.scss | 6 +++++- .../react/src/modules/tpm/jupyter/leftPane/index.scss | 10 ++++++---- .../react/src/modules/tpm/jupyter/rightPane/index.js | 7 ++++--- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/public/react/src/modules/tpm/jupyter/index.scss b/public/react/src/modules/tpm/jupyter/index.scss index a174c5be5..430bb1c6e 100644 --- a/public/react/src/modules/tpm/jupyter/index.scss +++ b/public/react/src/modules/tpm/jupyter/index.scss @@ -78,9 +78,13 @@ right: 10px; top: 14px; + .btn_common{ + color: #888; + } .btn_common:hover{ // background-color: #29BD8B; - color: #29BD8B; + // color: #29BD8B; + color: #1890ff; } } } diff --git a/public/react/src/modules/tpm/jupyter/leftPane/index.scss b/public/react/src/modules/tpm/jupyter/leftPane/index.scss index dfd9f121d..c53b46362 100644 --- a/public/react/src/modules/tpm/jupyter/leftPane/index.scss +++ b/public/react/src/modules/tpm/jupyter/leftPane/index.scss @@ -1,22 +1,24 @@ .jupyter_data_sets_area{ height: 100%; .jupyter_h2_title{ - height: 50px; - line-height: 50px; + height: 44px; + line-height: 44px; background-color: #EEEEEE; padding: 0 30px; .jupyter_data_icon{ - color: #7286ff; + // color: #7286ff; + color: #1890ff; font-size: 24px; position: relative; top: 2px; transform: scale(1.5); + margin-right: 5px; } } .jupyter_data_list, .jupyter_empty{ - height: calc(100vh - 110px); + height: calc(100vh - 104px); overflow-y: auto; } diff --git a/public/react/src/modules/tpm/jupyter/rightPane/index.js b/public/react/src/modules/tpm/jupyter/rightPane/index.js index 1282732f4..ebdee3f63 100644 --- a/public/react/src/modules/tpm/jupyter/rightPane/index.js +++ b/public/react/src/modules/tpm/jupyter/rightPane/index.js @@ -4,11 +4,11 @@ * @Github: * @Date: 2019-12-12 15:04:20 * @LastEditors: tangjiang - * @LastEditTime: 2019-12-12 17:41:41 + * @LastEditTime: 2019-12-13 11:09:27 */ import './index.scss'; import React, { useEffect, useState } from 'react'; -import { Spin, Button } from 'antd'; +import { Spin, Button, Icon } from 'antd'; function RightPane (props) { const { status, @@ -32,6 +32,7 @@ function RightPane (props) { const loadError = (
+

加载实训出错，是否 { if (status === -1) { setRenderCtx(() => loadInit); - } else if (status === 0 && url) { + } else if (status === 2 && url) { setRenderCtx(() => (

From 1423a8c901c0161801cd727176e7135db9ddd1ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Fri, 13 Dec 2019 11:25:07 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Challenges/Challengesjupyter.js | 8 ++++---- .../shixunchild/shixunchildCss/Challenges.css | 18 ++++++++++++++++++ 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js b/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js index 0206d1f83..73d6328c1 100644 --- a/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js +++ b/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js @@ -79,7 +79,7 @@ class Challengesjupyter extends Component { setTimeout(() => { this.setState({ - jupyter_url:response.data.url, + // jupyter_url:response.data.url, jupyter_port:response.data.port, booljupyterurls:true, }) @@ -212,9 +212,9 @@ class Challengesjupyter extends Component { booljupyterurls===true? ( this.state.jupyter_url === null? -
- {/**/} -

加载实训出错，是否

this.updatamakedowns()}>重新加载

+
+ +

加载实训出错，是否

this.updatamakedowns()}>重新加载

diff --git a/public/react/src/modules/tpm/shixunchild/shixunchildCss/Challenges.css b/public/react/src/modules/tpm/shixunchild/shixunchildCss/Challenges.css index 4b6badc28..10d48c120 100644 --- a/public/react/src/modules/tpm/shixunchild/shixunchildCss/Challenges.css +++ b/public/react/src/modules/tpm/shixunchild/shixunchildCss/Challenges.css @@ -69,6 +69,7 @@ color: #1E8FFD; font-size: 12px; cursor:pointer; + margin-right: 18px; } .colorbluetest{ color: #06101A; @@ -85,3 +86,20 @@ align-items: center; justify-content: center; } +.iconfontysl{ + vertical-align:middle; + font-family:"iconfont" !important; + font-style:normal; + -webkit-font-smoothing: antialiased; + -webkit-text-stroke-width: 0.2px; + font-size: 100px; + color: #F5F5F5; +} +.juplbool{ + position: relative; +} + +.juplboolp{ + position: absolute; + bottom: 21px; +} From 3ce6ff2e760f7e744db08717b5dffb155ab3de13 Mon Sep 17 00:00:00 2001 From: tangjiang <465264938@qq.com> Date: Fri, 13 Dec 2019 11:26:05 +0800 Subject: [PATCH 4/5] update tip info --- .../react/src/modules/tpm/jupyter/rightPane/index.js | 10 +++++----- .../src/modules/tpm/jupyter/rightPane/index.scss | 12 ++++++++++++ 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/public/react/src/modules/tpm/jupyter/rightPane/index.js b/public/react/src/modules/tpm/jupyter/rightPane/index.js index ebdee3f63..020639abc 100644 --- a/public/react/src/modules/tpm/jupyter/rightPane/index.js +++ b/public/react/src/modules/tpm/jupyter/rightPane/index.js @@ -4,11 +4,11 @@ * @Github: * @Date: 2019-12-12 15:04:20 * @LastEditors: tangjiang - * @LastEditTime: 2019-12-13 11:09:27 + * @LastEditTime: 2019-12-13 11:25:22 */ import './index.scss'; import React, { useEffect, useState } from 'react'; -import { Spin, Button, Icon } from 'antd'; +import { Spin, Button } from 'antd'; function RightPane (props) { const { status, @@ -32,9 +32,9 @@ function RightPane (props) { const loadError = (
- +

- 加载实训出错，是否 + 实训加载失败， { if (status === -1) { setRenderCtx(() => loadInit); - } else if (status === 2 && url) { + } else if (status === 0 && url) { setRenderCtx(() => (

diff --git a/public/react/src/modules/tpm/jupyter/rightPane/index.scss b/public/react/src/modules/tpm/jupyter/rightPane/index.scss index edf305623..4facded6b 100644 --- a/public/react/src/modules/tpm/jupyter/rightPane/index.scss +++ b/public/react/src/modules/tpm/jupyter/rightPane/index.scss @@ -28,17 +28,29 @@ } .jupyter_load_url_error{ + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; // &::before{ // background-color: rgba(0,0,0,.2); // } .jupyter_error_txt{ position: relative; z-index: 1; + font-size: 12px; .jupyter_reload{ cursor: pointer; color: #1890ff; } } + + .icon-error{ + position: relative; + color: #DCE0E6; + transform: scale(5); + top: -35px; + } } .jupyter_result{ From e340eaf886ccd30d99dbe65eab3bf9c2256a0ee1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Fri, 13 Dec 2019 11:26:30 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js b/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js index 73d6328c1..5a7bcb579 100644 --- a/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js +++ b/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js @@ -79,7 +79,7 @@ class Challengesjupyter extends Component { setTimeout(() => { this.setState({ - // jupyter_url:response.data.url, + jupyter_url:response.data.url, jupyter_port:response.data.port, booljupyterurls:true, })