From f0046937e4a764719b93a31b540704d6e7275d17 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, 18 Apr 2019 14:44:13 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BF=9D=E5=AD=98=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/exercise/_new_shixun.html.erb  | 27 ++++++++++++++++--------
 public/stylesheets/educoder/edu-main.css | 19 +++++++++++------
 2 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/app/views/exercise/_new_shixun.html.erb b/app/views/exercise/_new_shixun.html.erb
index 49f8c03f..0f1cdd6c 100644
--- a/app/views/exercise/_new_shixun.html.erb
+++ b/app/views/exercise/_new_shixun.html.erb
@@ -92,7 +92,7 @@
         <div style="clear: both;"></div>
         <div class="fl mb10 shixunsboxs">
             <div class="newshixunbox" onclick="add_shixun();">
-                 <div class="newshixunboxfont" >新增实训题</div>
+                新增实训题
             </div>
         </div>
         <div style="clear: both;"></div>
@@ -123,7 +123,7 @@
     function add_shixun_question(){
         var result = true;
         var Uarry=$("#shixun_question_ul li:visible");//获取ul中所有的li元素
-
+        let resulttype=[]
         for(var i = 1; i <= Uarry.length; i++){
 
             var first = parseInt($("#minute"+i).val());
@@ -136,42 +136,51 @@
             if(first<0){
                 $("#scorezero"+i).show();
                 $("#minute"+i).addClass("borderFF8121");
-                result = false;
+                resulttype.push(false)
             }else if(isNaN(first)){
                 $("#scorenull"+i).show();
                 $("#minute"+i).addClass("borderFF8121");
-                result = false;
+                resulttype.push(false)
             }else if(first>100){
                 $("#scoreone"+i).show();
                 $("#minute"+i).addClass("borderFF8121");
-                result = false;
+                resulttype.push(false)
             } else {
                 $("#scorezero"+i).hide();
                 $("#scorenull"+i).hide();
                 $("#scoreone"+i).hide();
                 $("#minute"+i).removeClass("borderFF8121");
+                resulttype.push(true)
             }
 
             if(last<0){
                 $("#topicnull"+i).show();
                 $("#topic"+i).addClass("borderFF8121");
-                result = false;
+                resulttype.push(false)
             }else if(isNaN(last)){
                 $("#topicinteger"+i).show();
                 $("#topic"+i).addClass("borderFF8121");
-                result = false;
+                resulttype.push(false)
             }else if(last>available){
                 $("#topicreater"+i).show();
                 $("#topic"+i).addClass("borderFF8121");
-                result = false;
+                resulttype.push(false)
             } else {
                 $("#topicnull"+i).hide();
                 $("#topicinteger"+i).hide();
                 $("#topicreater"+i).hide();
                 $("#topic"+i).removeClass("borderFF8121");
+                resulttype.push(true)
+            }
+        }
+
+        for(var i=0; i<resulttype.length; i++){
+            if(resulttype[i]===false){
+                result=false
+                return
             }
         }
-        console.log(result);
+        
         if(result){
             $("#new_shixun_question").submit();
         } else{
diff --git a/public/stylesheets/educoder/edu-main.css b/public/stylesheets/educoder/edu-main.css
index 3ef4660d..9a52a082 100644
--- a/public/stylesheets/educoder/edu-main.css
+++ b/public/stylesheets/educoder/edu-main.css
@@ -1009,18 +1009,23 @@ html>body #ajax-indicator { position: fixed; }
     line-height: 40px;
     margin: 0 auto;
     margin-top: 20px;
-}
-
-.newshixunboxfont{
-    width:71px;
-    height:12px;
+    text-align: center;
+    color:rgba(255,104,0,1);
     font-size:4px;
     font-family:MicrosoftYaHei;
     font-weight:400;
-    color:rgba(255,104,0,1);
-    margin: 0 auto;
 }
 
+/*.newshixunboxfont{*/
+    /*width:71px;*/
+    /*height:12px;*/
+    /*font-size:4px;*/
+    /*font-family:MicrosoftYaHei;*/
+    /*font-weight:400;*/
+    /*color:rgba(255,104,0,1);*/
+    /*margin: 0 auto;*/
+/*}*/
+
 .width200{
     width:200px;
 }