Ver código fonte

等待遮罩调整

MaiXinRong 5 anos atrás
pai
commit
6c72264d11

+ 2 - 2
app/public/js/global.js

@@ -294,7 +294,7 @@ function showWaitingView() {
     //背景遮罩层div
     var bgObj = document.createElement("div");
     bgObj.setAttribute('id', 'bgDiv');
-    bgObj.style.zIndex = '998';
+    bgObj.style.zIndex = '9998';
     bgObj.style.position = "absolute";
     bgObj.style.top = "0px";
     bgObj.style.background = "#888";
@@ -307,7 +307,7 @@ function showWaitingView() {
 
     //信息提示层div
     var msgObj = document.createElement("div");
-    msgObj.style.zIndex = '999';
+    msgObj.style.zIndex = '9999';
     msgObj.setAttribute("id", "msgDiv");
     msgObj.setAttribute("align", "center");
     msgObj.style.position = "absolute";

+ 3 - 0
app/public/js/ledger.js

@@ -1628,6 +1628,7 @@ $(document).ready(function() {
             return;
         }$('#upload-ledger-sheets').hide();
         try {
+            $('#select-excel-loading').show();
             xlsxUtils.import(this.files[0], (excelData) => {
                 if (excelData.SheetNames.length > 0) {
                     const html = [];
@@ -1653,8 +1654,10 @@ $(document).ready(function() {
                     toast('选择的Excel无有效数据,请重新选择', 'hint');
                     $('#upload-ledger-sheets').hide();
                 }
+                $('#select-excel-loading').hide();
             });
         } catch(err) {
+            $('#select-excel-loading').hide();
             toast('加载excel异常,请刷新当前页面', 'error');
             $('#upload-ledger-sheets').hide();
         }

+ 1 - 1
app/public/js/measure_compare.js

@@ -207,7 +207,7 @@ $(document).ready(() => {
                 }
                 refreshView();
                 $('#select-qi').modal('hide');
-            });
+            }, null, true);
         } else {
             refreshView();
             $('#select-qi').modal('hide');

+ 1 - 1
app/public/js/stage_compare.js

@@ -200,7 +200,7 @@ $(document).ready(function () {
                 }
                 refreshView();
                 $('#select-qi').modal('hide');
-            });
+            }, null, true);
         } else {
             refreshView();
             $('#select-qi').modal('hide');

+ 3 - 1
app/view/ledger/explode_modal.ejs

@@ -8,7 +8,9 @@
             <div class="modal-body">
                 <p>请上传符合格式的 <b>0号台帐</b> 格式的 .xls和.xlsx 文件,<a id="downloadLedgerTemplate" href="/tender/<%- ctx.tender.id %>/ledger/download/template">下载示例</a>。</p>
                 <div class="form-group">
-                    <label for="exampleFormControlFile1">选择文件</label>
+                    <div>
+                        <label for="exampleFormControlFile1">选择文件</label><i class="fa fa-spinner fa-pulse fa-lg fa-fw text-primary" id="select-excel-loading" style="display: none;"></i>
+                    </div>
                     <input type="file" class="form-control-file" id="upload-ledger-file" accept="*.xls">
                 </div>
                 <div id="upload-ledger-sheets" style="display: none;">