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

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;
       }
     }
   }

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;
   }
 

public/react/src/modules/tpm/jupyter/rightPane/index.js

@@ -4,7 +4,7 @@
  * @Github: 
  * @Date: 2019-12-12 15:04:20
  * @LastEditors: tangjiang
- * @LastEditTime: 2019-12-12 17:41:41
+ * @LastEditTime: 2019-12-13 11:25:22
  */
 import './index.scss';
 import React, { useEffect, useState } from 'react';
@@ -32,8 +32,9 @@ function RightPane (props) {
 
   const loadError = (
     <div className="jupyter_load_url_error">
+      <span className="iconfont icon-jiazaishibai1 icon-error"></span>
       <p className="jupyter_error_txt">
-        加载实训出错，是否
+        实训加载失败，
         <span 
           className="jupyter_reload"
           onClick={handleClickReload}

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{