From d5a04929149385cfa0c0f0b3b3ea0d60bc040d8a Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Fri, 11 Aug 2017 17:21:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8A=A0=E8=BD=BD=E7=AD=89?=
 =?UTF-8?q?=E5=BE=85=E7=9A=84=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/shixuns/_shixun_top.html.erb  |   7 ++++++-
 public/images/bigdata/shenglue-ring.gif | Bin 0 -> 1191 bytes
 public/javascripts/application.js       |   4 ++++
 public/javascripts/edu/shixun.js        |   4 ++++
 public/stylesheets/css/taskstyle.css    |   8 ++++++++
 5 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 public/images/bigdata/shenglue-ring.gif

diff --git a/app/views/shixuns/_shixun_top.html.erb b/app/views/shixuns/_shixun_top.html.erb
index 8f56ebd11..b248dfc1d 100644
--- a/app/views/shixuns/_shixun_top.html.erb
+++ b/app/views/shixuns/_shixun_top.html.erb
@@ -46,7 +46,12 @@
     <% end %>
   </div>
 </div>
-
+<div class="loading_all">
+  <div class="load">
+    <div class="loading_main"><img src="/images/../images/bigdata/bigdata-logo.png?1502328187" /><span>EDUCODER</span></div>
+    <p class="loading_seconde">LOADING<img src="/images/../images/bigdata/shenglue-ring.gif" /></p>
+  </div>
+</div>
 <script>
   function apply_publish_shixun(url){
       if($("#apply_publish_shixun").attr("data-option") == '1'){
diff --git a/public/images/bigdata/shenglue-ring.gif b/public/images/bigdata/shenglue-ring.gif
new file mode 100644
index 0000000000000000000000000000000000000000..fc11ec43e83609ff04d40924b536fab56d706af9
GIT binary patch
literal 1191
zcmZ?wbhEHb)L;-{XkcXcU&`?R|9{2*+<vYh!Oo5Wu10zW%!~{S3_zg>-v9-d#F9iH
zZDU_ikeHmETB4AYnx2_wtMq>NekFy>6kDZmQ(pt$0_W6>OpmIf)Zi+=kmRcDWXlvK
zdpiZ23ag6Tg51=SM1_jnoV;SI3R|Vbl>DSrD<B&rtgoa1R#K8}tK<lhPypHKoL`ix
zV5(=Pn`~fau3&DdXJ~3}Zep&ZU}Ruus&8PdZ)~7zWNc+(U}a*Y00l}w+lo@stb$zJ
zpmqUywn`Z#B?VUc`sL;2dgaD?`9<mahL)C=`UXb&Mn<|o6}rWhc_oPzx_QOQFcVx-
zi<65o3raHc^AtcPCMM;Vme?u*T?+9+ZUNlbykb4Dcl46;bM-3{3-k^33_xCjDfIQl
zuQWFouDZA+C>7yetOgf{R2HP_2c;J0mlh?b0+lO+tSYc_E=o--$uA1Y&(DE{Vn9ZI
zNq%ugeu09sGdR=~G{Q6UQu51-HNkp(eXTt6ic1pnl2bihY?Xkf=w)W6SXmeXL&w~}
z(%jX|+0f9{+{xI?#m&jo#m(5w(%i_!7^c@HKe;qFHLnDwHwB^B5vN{Ia>y+J+U$~A
zlv$RV;#QQOs{r=4RVHq?nBz1Lsy79<TP$$u)dxC89~8Mrkqr|9rXUa#o^*j6c;ZjZ
z1E%;QVA5v%|L^ag-@ktT`2Owdm(QO*et7@x?VH!HUcPw#?CF!oj~+g_fA8*{+qZ7s
zxPI;GmCKhdUO0d5?3vT2PM$b^?C6ohhYlXtzi;oJ-Me<~*uHJ+md%?sZdku=?V8oA
zR<2mSZ0VB4ixw`JKX2}w*|TQOm_BXll*yAOPU!FJ?dk67>}YRmZE0?5Y^blRt*Nf6
ztSB!lEh#Q4EXdEx&B@Nn%t%j5O-W8lOo)$*jfswmj0g`44G9hk4Dk2!_3`%d^l*1`
zb#Zobbg;LxwXwFcv@ka_H8D0aG|<=6)zQ|{)KFJbRZ&(_RFIdGm64W`ln@sa6%iH^
z6yWFM<>BVy<X~rGWnpFl77&U*Sy&ku7#VbcWd#GMFkxVl?de~6`Yr$BIa_XZZ@#zZ
sH-FnBk7>_3m&q`!coPB9VFS`3%pk<T1cVGsOf7+6gHk}k3Mj(X00EwwIRF3v

literal 0
HcmV?d00001

diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index de92bd57f..9b553048f 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -676,6 +676,10 @@ function setupAjaxIndicator() {
     if(settings && settings.url && settings.url.match(/account\/heartbeat$/)){
       return;
     }
+      //模拟实训时，加载效果不显示
+      if (settings && settings.url && settings.url.match(/operation/)){
+          return;
+      }
     if ($('.ajax-loading').length === 0 && settings.contentType != 'application/octet-stream') {
       $('#ajax-indicator').show();
     }
diff --git a/public/javascripts/edu/shixun.js b/public/javascripts/edu/shixun.js
index c440b21d3..51908a9dc 100644
--- a/public/javascripts/edu/shixun.js
+++ b/public/javascripts/edu/shixun.js
@@ -2,6 +2,10 @@ $(function() {
     $("#search_not_collaborators").live('input', function (e) {
         throttle(search_not_teacher_f, window, e);
     });
+    //模拟实训，显示加载等待效果
+    $("#shixun_operation").live("click",function(){
+        $(".loading_all").show();
+    })
 });
 
 var lastteSearchCondition = '';
diff --git a/public/stylesheets/css/taskstyle.css b/public/stylesheets/css/taskstyle.css
index 5e558988e..71cdf2a4f 100644
--- a/public/stylesheets/css/taskstyle.css
+++ b/public/stylesheets/css/taskstyle.css
@@ -362,6 +362,14 @@ a.shixun-task-ban-btn{background-color: #c2c4c6;display: inline-block;font-weigh
 .markdown code {padding:0;line-height: 23px;margin: 0;font-family: "微软雅黑","宋体";}
 
 
+/*模拟实战---加载等待*/
+.loading_all{background:#ffffff;z-index: 100000;width: 100%;height: 100%;position: fixed;left: 0px;top:0px;text-align: center;display: none;}
+.loading_main img{border-radius: 4px;}
+.loading_main span{font-size: 44px;font-weight: bold;color: #ff7500;letter-spacing: 5px;margin-left: 5px;}
+.load{width: auto;top:50%;margin-top:-50px;position: relative;}
+.loading_seconde{color: #ff7500;letter-spacing: 3px;font-size: 16px;}
+
+