Merge branch 'dev_aliyun' of http://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

public/react/public/css/css_min_all.css

@@ -1269,7 +1269,7 @@ input.knowledge_frame{height:28px;line-height:28px;border:none;background:#f3f5f
 .-relative { position: relative;}
 .-bg-white { background-color: #eee;}
 .split-panel.-handle .split-panel--second { padding-left: 2px;}
-.split-panel--second { overflow: hidden;}
+/* .split-panel--second { overflow: hidden;} */
 .task-answer-view { position: absolute; top: 0; right: 0; bottom: 0;left: 0; display: flex;
     flex-direction: column; border-top: 1px solid #515151;}
 .-vertical { flex-direction: column;box-flex-direction: column;-webkit-flex-direction: column;}

public/react/public/css/taskstyle.css

@@ -145,7 +145,7 @@ input.knowledge_frame{height:28px;line-height:28px;border:none;background:#f3f5f
 .-relative { position: relative;}
 .-bg-white { background-color: #eee;}
 .split-panel.-handle .split-panel--second { padding-left: 2px;}
-.split-panel--second { overflow: hidden;}
+/* .split-panel--second { overflow: hidden;} */
 .task-answer-view { position: absolute; top: 0; right: 0; bottom: 0;left: 0; display: flex;
     flex-direction: column; border-top: 1px solid #515151;}
 .-vertical { flex-direction: column;box-flex-direction: column;-webkit-flex-direction: column;}

public/react/src/modules/page/Header.js

@@ -1,3 +1,4 @@
+import './header.scss';
 import React, { Component } from 'react';
 
 import Button from 'material-ui/Button';
@@ -120,9 +121,11 @@ class Header extends Component {
 				<div className="headerRight">
 					<div className="fr">
 						{shixun ? 
-						<a href={`/shixuns/${shixun.identifier}/challenges`} className="mr20 mt8 exitBtn" >
+						// className="mr20 mt8 exitBtn"
+						<a href={`/shixuns/${shixun.identifier}/challenges`} className="mr20 mt8 exit_btn">
 				      		<i className="fa fa-power-off font-16"></i> 
-					      	<span>{'退出闯关'}</span>
+					      	{/* <span>{'退出闯关'}</span> */}
+									<span>{'退出实训'}</span>
 					    </a>
 					    : ''}
 					</div>

public/react/src/modules/page/VNCContainer.js

@@ -338,6 +338,33 @@ class VNCContainer extends Component {
 						.float_button:hover .text {
 							color: #4CACFF;
 						}
+						.resetVNC1{
+							top: -50px;
+							writing-mode: initial;
+							left: calc(100% - 230px);
+							background-image: none;
+							width: auto;
+							// background: #081516;
+							height: 30px;
+							padding: 0 6px;
+							border-radius: 4px;
+							z-index: 10;
+							font-size: 16px;
+							transition: color .3s;
+						}
+						.resetVNC1 .text {
+							top: 0px;
+							writing-mode: initial;
+							left: unset;
+						}
+						.resetVNC1 .text span {
+							vertical-align: middle;
+							margin-left: 2px;
+						}
+						.float_button:hover .text {
+							transition: color .3s;
+							color: #4CACFF;
+						}
 					`}</style>
 					<div style={{ 'padding': '16px', 'border-bottom': '1px solid #3A383A' }}>
 						<div style={{ color: '#888888' }}>网址克隆</div>
@@ -354,11 +381,15 @@ class VNCContainer extends Component {
 
 					></RepoTree>
 				</SecondDrawer>
-                <FloatButton className="resetVNC" onClick={this.onResetVNC}>
+        {/* <FloatButton className="resetVNC" onClick={this.onResetVNC}>
-					{/* <i className="iconfont icon-zhongzhi2 font-16 "></i> */}
 					{this.state.vnc_reseting ? <Icon type="loading" style={{verticalAlign: 'sub'}} />
 							: <i className="iconfont icon-zhongzhi2 font-16 "></i>}
 					<span>重置桌面系统</span>
+				</FloatButton> */}
+				<FloatButton className="resetVNC1" onClick={this.onResetVNC}>
+					{this.state.vnc_reseting ? <Icon type="loading" style={{verticalAlign: 'sub'}} />
+							: <i className="iconfont icon-zhongzhi2 font-24"></i>}
+					<span>重置实训</span>
 				</FloatButton>
 
 			  	{/* <Spin tip="加载中..." spinning={this.state.vnc_reseting}>

public/react/src/modules/page/VNCDisplay.js

@@ -166,7 +166,8 @@ class VNCDisplay extends Component {
                 `}</style>
 		        <div id="top_bar">
                     <div id="status">Loading</div>
-                    <div id="sendCtrlAltDelButton">Send CtrlAltDel</div>
+                    {/* <div id="sendCtrlAltDelButton">Send CtrlAltDel</div> */}
+                    <div id="sendCtrlAltDelButton" style={{ opacity: 0, display: 'none' }}></div>
                 </div>
                 <div id="screen" style={{ height: 'calc(100vh - 140px)' }}>
                     

public/react/src/modules/page/header.scss

@@ -0,0 +1,6 @@
+.headerRight .exit_btn{
+  color: rgba(237,237,237,1);
+  &:hover{
+    // color: #fff;
+  }
+}

public/react/src/modules/page/tpiPage.css

@@ -120,8 +120,10 @@ button.buttonHoverColor:hover a {
 
 
 #myshixun_top {
-  display: flex;
+	display: flex;
-  height: 54px;
+	position: fixed;
+	height: 54px;
+	z-index: 1 !important;
 }
 .headerLeft {
 	flex: 0 0 400px;