diff --git a/public/react/public/css/css_min_all.css b/public/react/public/css/css_min_all.css
index 431a4da8e..93b1c7f96 100755
--- a/public/react/public/css/css_min_all.css
+++ b/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;}
diff --git a/public/react/public/css/taskstyle.css b/public/react/public/css/taskstyle.css
index 29358d6e0..85960fa8b 100755
--- a/public/react/public/css/taskstyle.css
+++ b/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;}
diff --git a/public/react/src/modules/page/Header.js b/public/react/src/modules/page/Header.js
index 1c24b6a52..283ec9953 100644
--- a/public/react/src/modules/page/Header.js
+++ b/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 {
diff --git a/public/react/src/modules/page/VNCContainer.js b/public/react/src/modules/page/VNCContainer.js
index 55a991ae8..7bd393525 100644
--- a/public/react/src/modules/page/VNCContainer.js
+++ b/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;
+ }
`}
网址克隆
@@ -354,11 +381,15 @@ class VNCContainer extends Component {
>
-
- {/* */}
+ {/*
{this.state.vnc_reseting ?
: }
重置桌面系统
+ */}
+
+ {this.state.vnc_reseting ?
+ : }
+ 重置实训
{/*
diff --git a/public/react/src/modules/page/VNCDisplay.js b/public/react/src/modules/page/VNCDisplay.js
index b9ec77988..17dbff309 100644
--- a/public/react/src/modules/page/VNCDisplay.js
+++ b/public/react/src/modules/page/VNCDisplay.js
@@ -166,7 +166,8 @@ class VNCDisplay extends Component {
`}
Loading
-
Send CtrlAltDel
+ {/*
Send CtrlAltDel
*/}
+
diff --git a/public/react/src/modules/page/header.scss b/public/react/src/modules/page/header.scss
new file mode 100644
index 000000000..b8320638f
--- /dev/null
+++ b/public/react/src/modules/page/header.scss
@@ -0,0 +1,6 @@
+.headerRight .exit_btn{
+ color: rgba(237,237,237,1);
+ &:hover{
+ // color: #fff;
+ }
+}
\ No newline at end of file
diff --git a/public/react/src/modules/page/tpiPage.css b/public/react/src/modules/page/tpiPage.css
index 0c4faee83..015a66b98 100644
--- a/public/react/src/modules/page/tpiPage.css
+++ b/public/react/src/modules/page/tpiPage.css
@@ -120,8 +120,10 @@ button.buttonHoverColor:hover a {
#myshixun_top {
- display: flex;
- height: 54px;
+ display: flex;
+ position: fixed;
+ height: 54px;
+ z-index: 1 !important;
}
.headerLeft {
flex: 0 0 400px;