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

app/helpers/export_helper.rb

@@ -113,7 +113,7 @@ module ExportHelper
       end
     else   #实训题
       shixun = homework.shixuns.first
-      shixun_head_cells = %w(完成情况 通关时间 总耗时 总评测次数 获得经验值 关卡得分)
+      shixun_head_cells = %w(完成情况 通关时间 学员在EduCoder做实训花费的时间 总评测次数 获得经验值 关卡得分)
       eff_boolean = homework.work_efficiency
       if eff_boolean
         eff_score_cell = ["效率分"]
@@ -123,7 +123,7 @@ module ExportHelper
       if allow_late_boolean  #允许迟交
         eff_score_cell.push("迟交扣分")
       end
-      shixun_time_cells = %w(最终成绩 更新时间 提交耗时 评语)
+      shixun_time_cells = %w(最终成绩 更新时间 作业发布到学员完成作业所耗的时间 评语)
       @work_head_cells = (head_cells_format + shixun_head_cells + eff_score_cell + shixun_time_cells).reject(&:blank?)
       works.includes(:student_works_scores, user: :user_extension, myshixun: :games).each_with_index do |w, index|
         myshixun = w.try(:myshixun)
@@ -163,7 +163,8 @@ module ExportHelper
         end
         w_15 = w.work_score.nil? ? "--" : w.work_score.round(1)
         w_16 = w.update_time ? format_time(w.update_time) : "--"  "更新时间"
-        w_17 = w.cost_time ? (game_spend_time w.cost_time) : "--"
+        myshixun_complete = myshixun && myshixun.status == 1
+        w_17 = myshixun_complete && w.cost_time ? (game_spend_time w.cost_time) : "未完成"
         teacher_comments = w.student_works_scores
         if teacher_comments.present?
           w_18 = ""

app/services/users/update_account_service.rb

@@ -53,7 +53,7 @@ class Users::UpdateAccountService < ApplicationService
       RewardGradeService.call(user, container_id: user.id, container_type: 'Account', score: 500)
       if user.user_extension.teacher?
         join_course(user.id,1309, 2)
-        sms_notify_admin(user.lastname)
+        # sms_notify_admin(user.lastname)
       end
     end
 

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>
 

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

@@ -158,7 +158,7 @@ class VNCDisplay extends Component {
                         background: #666;
                     }
                     .vncDisply #screen > div {
-                        background: #666;
+                        background: #666 !important;
                     }
                 `}</style>
 		        <div id="top_bar">