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

# Conflicts:
#	app/controllers/games_controller.rb

app/controllers/competitions/competitions_controller.rb

@@ -160,7 +160,7 @@ class Competitions::CompetitionsController < Competitions::BaseController
       @competition_head_cells = %w(序号 战队名 指导老师 队员 学校)
     end
 
-    statistic_stages = competition.competition_stages.where("rate > 0")
+    statistic_stages = competition.competition_stages.where("score_rate > 0")
     statistic_stages.each do |stage|
       @competition_head_cells += ["#{stage.name}得分", "#{stage.name}用时"]
     end

app/controllers/games_controller.rb

@@ -55,12 +55,12 @@ class GamesController < ApplicationController
 
     # 选择题和编程题公共部分
     @base_date = {st: @st, discusses_count: discusses_count, game_count: game_count, myshixun: @myshixun,
-                  challenge: game_challenge.attributes.except("answer"), game: @game.try(:attributes), shixun: @shixun.try(:attributes),
+                  challenge: game_challenge.attributes.except("answer"), game: @game.try(:attributes), shixun: @shixun.attributes.except("vnc", "vnc_evaluate"),
                   record_onsume_time: record_onsume_time, prev_game: prev_game, next_game: next_game,
                   praise_count: praise_count, user_praise: user_praise, time_limit: time_limit,
                   tomcat_url: edu_setting('cloud_tomcat_php'), is_teacher: is_teacher,
                   myshixun_manager: myshixun_manager, git_url: (@shixun.vnc ? repo_url(@myshixun.repo_path) : "")}
-    if @shixun.vnc
+    if @shixun.vnc && @st == 0
       get_vnc_link(@game)
     end
 

app/helpers/competitions_helper.rb

@@ -44,7 +44,7 @@ module CompetitionsHelper
 
     statistic_stages.each do |stage|
       if stage.max_end_time && stage.max_end_time < Time.now
-        stages << {id: stage.id, name: "#{stage.name}排行榜", rate: stage.rate, start_time: stage.min_start_time, end_time: stage.max_end_time}
+        stages << {id: stage.id, name: "#{stage.name}排行榜", rate: stage.score_rate, start_time: stage.min_start_time, end_time: stage.max_end_time}
       end
     end
 

app/views/games/show.json.jbuilder

@@ -1,7 +1,7 @@
 json.(@base_date, :st, :discusses_count, :game_count, :record_onsume_time, :prev_game, :next_game, :praise_count,
     :user_praise, :time_limit, :tomcat_url, :is_teacher, :myshixun_manager, :game, :challenge,
     :shixun, :myshixun, :git_url)
-if @shixun.vnc
+if @shixun.vnc && @st == 0
   json.vnc_url @vnc_url
   json.vnc_evaluate @vnc_evaluate
 end

public/react/src/context/TPIContextProvider.js

@@ -435,6 +435,9 @@ pop_box_new(htmlvalue, 480, 182);
   		// TODO  测试
   		// resData.power = 0;
 
+		resData.shixun.vnc = !!resData.vnc_url
+		resData.shixun.vnc_evaluate = resData.vnc_evaluate
+
 	    this.setState({
     		...resData,