diff --git a/app/controllers/challenges_controller.rb b/app/controllers/challenges_controller.rb
index 962508f26..0036f4838 100644
--- a/app/controllers/challenges_controller.rb
+++ b/app/controllers/challenges_controller.rb
@@ -116,7 +116,7 @@ class ChallengesController < ApplicationController
           end
           # 向jenkins端发送请求，构建pipeline片段，实时返回结果
           jenkins_shixuns = Redmine::Configuration['jenkins_shixuns']
-          params = {:challengeStage => "#{@challenge.position}", :challengeType => "#{@challenge.evaluation_way.to_i}", :challengeProgramName => "#{@challenge.path}", :trainingID => "#{@shixun.id}"}
+          params = {:challengeStage => "#{@challenge.position}", :challengeType => "#{@challenge.evaluation_way.to_i}", :challengeProgramName => "#{@challenge.exec_path}", :trainingID => "#{@shixun.id}"}
           uri = URI("#{jenkins_shixuns}/jenkins-exec/game/generatePipelineScriptForChallenge")
           res = uri_exec uri, {challengeInfo: params.to_json}
           if res['code'] == 0
diff --git a/app/views/games/_file_edit_form.html.erb b/app/views/games/_file_edit_form.html.erb
index 86e257180..cbd3dab09 100644
--- a/app/views/games/_file_edit_form.html.erb
+++ b/app/views/games/_file_edit_form.html.erb
@@ -65,7 +65,7 @@
         editor_CodeMirror.setSize("auto","auto");
         editor_CodeMirror.refresh();
         var h = $("#games_repository_contents").height() - $("#top_repository").height() - 10;
-        $(".CodeMirror-scroll").css("min-height", h);
-        $(".CodeMirror-scroll").css("max-height", h);
+        $("#file_entry_content").find(".CodeMirror-scroll").css("min-height", h);
+        $("#file_entry_content").find(".CodeMirror-scroll").css("max-height", h);
     });
 </script>
\ No newline at end of file
diff --git a/app/views/games/_game_show.html.erb b/app/views/games/_game_show.html.erb
index 5f0f5dfe0..0eb1ec83f 100644
--- a/app/views/games/_game_show.html.erb
+++ b/app/views/games/_game_show.html.erb
@@ -46,7 +46,7 @@
         <div id="tab_con_3" class="undis tab-info" >
           <div class="fit -scroll">
             <div class="-layout-v -fit">
-              <div class="-flex -scroll task-padding16" id="game_answer_show"></div>
+              <div class="-flex -scroll task-padding-new" id="game_answer_show"></div>
               <div class="undis" id="hidden_game_answer"><%= @game_challenge.answer %></div>
             </div>
           </div>
@@ -113,7 +113,8 @@
             flowChart       : true,  // 默认不解析
             sequenceDiagram : true // 默认不解析
         });
-        myCodeMirror.setSize('auto','auto');//设置版本库codemirror的高度
+        myCodeMirror.setSize("auto", "auto");//设置版本库codemirror的高度
+        $("#game_answer_show").find(".CodeMirror-scroll").css("margin-bottom", 0);
         $("#game_answer_show" ).children(".CodeMirror").css("line-height", 1.2);
         $("#game_answer_show").children().css("border", 0);
         // 设置图片最大宽度不能超出边框
diff --git a/app/views/games/show.html.erb b/app/views/games/show.html.erb
index 64d3d695a..e5df62bbf 100644
--- a/app/views/games/show.html.erb
+++ b/app/views/games/show.html.erb
@@ -37,8 +37,8 @@
           control = 0;
       }
       var h = $("#games_repository_contents").height() - $("#top_repository").height() - 10;
-      $(".CodeMirror-scroll").css("min-height", h);
-      $(".CodeMirror-scroll").css("max-height", h);
+      $("#file_entry_content").find(".CodeMirror-scroll").css("min-height", h);
+      $("#file_entry_content").find(".CodeMirror-scroll").css("max-height", h);
   }
  // 测评的扩大与缩小
   function valuation_extend_and_zoom(){
diff --git a/app/views/shixuns/_monitor_tip.html.erb b/app/views/shixuns/_monitor_tip.html.erb
index 11473f249..7a8c99547 100644
--- a/app/views/shixuns/_monitor_tip.html.erb
+++ b/app/views/shixuns/_monitor_tip.html.erb
@@ -4,7 +4,7 @@
     <a href="javascript:void(0);" onclick="hideModal()"><i class="fa fa-times-circle font-18 link-color-grey fr"></i></a>
     <div class="cl"></div>
   </div>
-  <div class="sy_popup_con" style="width:380px;">
+  <div class="sy_popup_con" style="width:360px;">
     <ul class="sy_popup_add" >
       <li class="center mb30" style="line-height:20px">
         <% if result %>
diff --git a/public/stylesheets/css/taskstyle.css b/public/stylesheets/css/taskstyle.css
index 7792ff8a8..dde542c21 100644
--- a/public/stylesheets/css/taskstyle.css
+++ b/public/stylesheets/css/taskstyle.css
@@ -185,6 +185,7 @@ input.knowledge_frame{height:30px;line-height:30px;border:none;background:#f3f5f
 .greytab-inner{ background:#fff; }
 .blacktab-inner{ background:#333;}
 .task-padding16{ padding:16px;}
+.task-padding-new{ padding-top: 16px}
 /* TPM统计 20170321byLB */
 .panel-warp-3{ width: 30%; background:#23b181; color:#fff; margin:2.5%; margin-right:0; position: relative; }
 .panel-warp-3-over{ background:#fff;opacity:0.8; color:#29bd8b; width: 100%; height:135px; position: absolute; top:0; left:0;  text-align: center; padding-top:130px;}