Merge branches 'dev_aliyun' and 'develop' of https://bdgit.educoder.net/Hjqreturn/educoder into develop

public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js

@@ -2660,7 +2660,7 @@ class Listofworksstudentone extends Component {
 												</div>:"")
 										}
 						  	    </span>}
-										<span className="search-newyslw">
+										<span className="search-newyslw fr ml20">
 										<Search
 											placeholder="请输入姓名或学号搜索"
 											id="subject_search_input"

public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js

@@ -1,5 +1,5 @@
 import React, {Component} from "react";
-import {WordsBtn,markdownToHTML,ActionBtn,queryString,downloadFile} from 'educoder';
+import {WordsBtn,markdownToHTML,ActionBtn,queryString,downloadFile,getImageUrl} from 'educoder';
 import { Form, Select, Input, Button,Checkbox,Upload,Icon,message,Modal, Table, Divider,InputNumber, Tag,DatePicker,Radio,Tooltip,Spin} from "antd";
 import {Link,Switch,Route,Redirect} from 'react-router-dom';
 import axios from 'axios';
@@ -374,7 +374,7 @@ class ShixunWorkReport extends Component {
 
 									<div className="fl edu-back-white ml10 ">
 										<img alt="头像" className="radius" height="91" id="nh_user_logo" name="avatar_image"
-												 src={'/images/'+data&&data.image_url}
+												 src={ getImageUrl(`images/${data&&data.image_url}`)}
 												 width="91"/>
 									</div>
 
@@ -393,7 +393,7 @@ class ShixunWorkReport extends Component {
 												 </span>
 
 												 <span className={"passbox"}>
-												   	<div><span className={"color999"}>通关时间：</span>  <span className={data&&data.passed_time===null?"color999":"color333"}>{data&&data.passed_time===null?'--':moment(data&&data.passed_time).format('YYYY-MM-DD HH:mm')}</span></div>
+												   	<div><span className={"color999"}>通关时间：</span>  <span className={data&&data.passed_time===null?"color999":"color333"}>{data&&data.passed_time===null||data&&data.passed_time=== "--"?'--':moment(data&&data.passed_time).format('YYYY-MM-DD HH:mm')}</span></div>
 												    <div><span className={"color999"}>实战耗时：</span> <span className={data&&data.efficiency===null?"color999":"color333"}>{data&&data.time_consuming===null?'--':data&&data.time_consuming}</span></div>
 												 </span>
 									   	 </p>

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

@@ -131,19 +131,19 @@ class VNCDisplay extends Component {
 
   		
 	    return (
-	      	<div className="" style={{height: '100%'}}>
+	      	<div className="vncDisply" style={{height: '100%'}}>
                 <style>{`
-                    #top_bar {
+                    .vncDisply #top_bar {
                         background-color: #6e84a3;
                         color: white;
                         font: bold 12px Helvetica;
                         padding: 6px 5px 4px 5px;
                         border-bottom: 1px outset;
                     }
-                    #status {
+                    .vncDisply #status {
                         text-align: center;
                     }
-                    #sendCtrlAltDelButton {
+                    .vncDisply #sendCtrlAltDelButton {
                         position: fixed;
                         top: 0px;
                         right: 0px;
@@ -151,10 +151,14 @@ class VNCDisplay extends Component {
                         padding: 5px 5px 4px 5px;
                         cursor: pointer;
                     }
-                    #screen {
+                    .vncDisply #screen {
                         height: 100%;
                         flex: 1; /* fill remaining space */
                         overflow: hidden;
+                        background: #666;
+                    }
+                    .vncDisply #screen > div {
+                        background: #666;
                     }
                 `}</style>
 		        <div id="top_bar">