From 5a4907eee2facb8a1f15e0c1381bb371a3d8fbae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Thu, 27 Jun 2019 15:56:37 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/shixuns/_settings_edit.html.erb | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/app/views/shixuns/_settings_edit.html.erb b/app/views/shixuns/_settings_edit.html.erb
index 3f119725..21ffacfb 100644
--- a/app/views/shixuns/_settings_edit.html.erb
+++ b/app/views/shixuns/_settings_edit.html.erb
@@ -344,8 +344,9 @@
 <!--            <div class="cl"></div>-->
 <!--          </div>-->
         <% end %>
+        <div id='result'></div>
       </div>
-      <div id='result'></div>
+
     <% end %>
       <div class="clearfix mt30">
         <a href="javascript:void(0)" class="defalutSubmitbtn fl mr20" onclick="submit_edit_shixun(<%= @shixun.id %>);">保存</a>
@@ -358,10 +359,9 @@
 
 <script id="t:edit-setting-list" type="text/html">
 
-  <!if(list.length>1) { !>
+  <!if(list.length>0) { !>
     <!for(var i=0;i<list.length;i++){!>
-      <div class="edu-back-white padding40-20 mb20">
-        <p class="color-grey-6 font-16 mb30">服务配置</p>
+
         <p class="color-grey-6 font-16 mt30" id="shixun_scenario_type_name">
           <!=listname[i]!>
         </p>
@@ -369,7 +369,7 @@
         <div class="clearfix mb5">
           <label class="panel-form-label fl">CPU(核)：</label>
           <div class="pr fl with80 status_con">
-            <input type="text" name="cpu_limit[]" value="<%= config.cpu_limit %>" class="panel-box-sizing task-form-100 task-height-40"
+            <input type="text" name="cpu_limit[]" value="1" class="panel-box-sizing task-form-100 task-height-40"
                    placeholder="请输入类别名称"/>
           </div>
           <div class="cl"></div>
@@ -377,7 +377,7 @@
         <div class="clearfix mb5">
           <label class="panel-form-label fl">最低CPU(核)：</label>
           <div class="pr fl with80 status_con">
-            <input type="text" name="lower_cpu_limit[]" value="<%= config.lower_cpu_limit %>" class="panel-box-sizing task-form-100 task-height-40"
+            <input type="text" name="lower_cpu_limit[]" value="0.1" class="panel-box-sizing task-form-100 task-height-40"
                    placeholder="请输入类别名称"/>
           </div>
           <div class="cl"></div>
@@ -385,7 +385,7 @@
         <div class="clearfix mb5">
           <label class="panel-form-label fl">内存限制(M)：</label>
           <div class="pr fl with80 status_con">
-            <input type="text" name="memory_limit[]" value="<%= config.memory_limit %>"class="panel-box-sizing task-form-100 task-height-40"
+            <input type="text" name="memory_limit[]" value="1024" class="panel-box-sizing task-form-100 task-height-40"
                    placeholder="请输入类别名称"/>
           </div>
           <div class="cl"></div>
@@ -393,13 +393,13 @@
         <div class="clearfix mb5">
           <label class="panel-form-label fl">内存要求(M)：</label>
           <div class="pr fl with20 status_con">
-            <input type="text" name="request_limit[]" value="<%= config.request_limit %>" class="panel-box-sizing task-form-100 task-height-40"
+            <input type="text" name="request_limit[]" value="10" class="panel-box-sizing task-form-100 task-height-40"
                    placeholder="请输入类别名称"/>
           </div>
           <label class="panel-form-label fl" style="width: 48%">温馨提示：纯编程类型实训建议使用默认值，对于大数据等建议使用最大内存的30%</label>
           <div class="cl"></div>
         </div>
-      </div>
+
       <!}!>
       <!}else{!><!}!>
 
@@ -511,6 +511,7 @@
           $(this).find(".down-select").hide();
       });
       $("[select-more] .down-select p input").bind("click", function (){
+
           var bt=baidu.template;
           bt.LEFT_DELIMITER='<!';
           bt.RIGHT_DELIMITER='!>';
@@ -530,6 +531,7 @@
               "listname":arrs,
               "list":idarr
           };
+          debugger
           var htmlidarr=bt('t:edit-setting-list',data);
           document.getElementById('result').innerHTML=htmlidarr;
           $("input[name='small_type']").val(idarr);