项目管理按钮loading动画

public/web/PerfectLoad.js

@@ -27,7 +27,7 @@ jQuery.bootstrapLoading = {
             //提示颜色
             delayTime: 500,
             //页面加载完成后，加载页面渐出速度
-            zindex: 999,
+            zindex: 2000,
             //loading页面层次
             sleep: 0
             //设置挂起,等于0时则无需挂起
@@ -163,4 +163,4 @@ const SCComponent = (() => {
     })();
 
     return {InitProgressBar}
-})();
+})();

web/building_saas/pm/js/pm_gc.js

@@ -584,7 +584,6 @@ function gc_init(){
         gcTreeObj.initSelection(initSel);
         autoFlashHeight();
         gcTreeObj.workBook.refresh();
-        $.bootstrapLoading.end();
     });
 }
 
@@ -960,6 +959,7 @@ function m_project(node){
 //点击单价文件、费率文件下的恢复操作(确认)
 function e_recFiles(btn){
     btn.bind('click', function () {
+        $.bootstrapLoading.start();
         decDate = '（' + new Date().Format('MM-dd hh:mm:ss') + '恢复）';
         let recObjs = m_getFilesObjs($('[name = "fileItems"]:checked'));
         let recIds = [];
@@ -1001,6 +1001,7 @@ function e_recFiles(btn){
 //点击单价、费率文件的清除操作（确认)
 function e_delFiles(btn){
     btn.bind('click', function () {
+        $.bootstrapLoading.start();
         let selected = gcTreeObj.tree.selected;//project
         let delObjs = m_getFilesObjs($('[name = "fileItems"]:checked'));
         let type = $('[name = "fileItems"]:checked').attr('fileType');
@@ -1034,6 +1035,7 @@ function e_delFiles(btn){
 //点击项目下的恢复操作（确认）
 function e_recProj(btn){
     btn.bind('click', function () {
+        $.bootstrapLoading.start();
         let selected = gcTreeObj.tree.selected;
         //backend
         let updateObj = m_getRecDatas(selected);
@@ -1059,6 +1061,7 @@ function e_recProj(btn){
 
 function e_delProj(btn){
     btn.bind('click', function () {
+        $.bootstrapLoading.start();
         let selected  = gcTreeObj.tree.selected;
         //backend
         let delDatas = m_getDelDatas(selected);
@@ -1078,6 +1081,9 @@ function a_getGC(callback){
         if(callback){
             callback(rstData);
         }
+        $.bootstrapLoading.end();
+    }, function () {
+        $.bootstrapLoading.end();
     });
 }
 
@@ -1086,6 +1092,9 @@ function a_rec(nodes, callback){
         if(callback){
             callback();
         }
+        $.bootstrapLoading.end();
+    }, function () {
+        $.bootstrapLoading.end();
     });
 }
 
@@ -1094,7 +1103,10 @@ function a_delGC(delDatas, callback){
         if(callback){
             callback();
         }
-    })
+        $.bootstrapLoading.end();
+    }, function () {
+        $.bootstrapLoading.end();
+    });
 }
 
 //去除重名，回收站不处理重名，只保证恢复到项目管理中不出现重名
@@ -1276,4 +1288,4 @@ function getUpdateFiles(tenders, project){
     rst = rst.concat(deWeightName(rstUF));
     rst = rst.concat(deWeightName(rstFF));
     return rst;
-}
+}

web/building_saas/pm/js/pm_newMain.js

@@ -2452,6 +2452,7 @@ $(document).ready(function() {
         let updateData = null;
         let dialog = $('#del');
         if (projTreeObj.tree && projTreeObj.tree.selected) {
+            $.bootstrapLoading.start();
             updateData = GetDeleteUpdateData(projTreeObj.tree.selected);
             UpdateProjectData(updateData, function () {
                 dialog.modal('hide');
@@ -2468,11 +2469,13 @@ $(document).ready(function() {
                 if(selected.data.projType == projectType.tender||selected.data.projType == projectType.engineering){
                     projTreeObj.refreshNodeData(refreshNodes);//刷新工程造价信息
                 }
+                $.bootstrapLoading.end();
                 //快速点击时，第一个项目删除成功了，可能会删除多项目
                 setTimeout(function () {
                     STATE.deleting = false;
                 }, 500);
             }, function () {
+                $.bootstrapLoading.end();
                 setTimeout(function () {
                     STATE.deleting = false;
                 }, 500);
@@ -2913,20 +2916,24 @@ function AddProject() {
         setDangerInfo($('#taxType-info'));
         return false;
     }
+    $.bootstrapLoading.start();
     let existCallback = function () {
         setDangerInfo($('#project-name-info'), `已存在“${$("#project-name").val()}”`);
         STATE.addingProject = false;
+        $.bootstrapLoading.end();
     };
     let sucCallback = function () {
         $('#addProjOk').removeClass('disabled');
         $('#add-project-dialog').modal('hide');
         $('#project-name').val('');
         setDangerInfo($('#project-name-info'), '', false);
+        $.bootstrapLoading.end();
         setTimeout(function () {
             STATE.addingProject = false;
         }, 500);
     };
     let errCB = function () {
+        $.bootstrapLoading.end();
         setTimeout(function () {
             STATE.addingProject = false;
         }, 500);
@@ -3570,19 +3577,23 @@ function AddEngineering() {
         return false;
     }
     name = whiteSpaceCollapse(name);
+    $.bootstrapLoading.start();
     let existCallback = function () {
         setDangerInfo($('#engineering-name-info'), `已存在“${$("#engineering-name").val()}”`);
         STATE.addingEng = false;
+        $.bootstrapLoading.end();
     };
     let sucCallback = function () {
         $('#add-engineering-dialog').modal('hide');
         $('#engineering-name').val('');
         setDangerInfo($('#engineering-name-info'), '', false);
+        $.bootstrapLoading.end();
         setTimeout(function () {
             STATE.addingEng = false;
         }, 500);
     };
     let errCB = function () {
+        $.bootstrapLoading.end();
         setTimeout(function () {
             STATE.addingEng = false;
         }, 500);
@@ -3695,7 +3706,7 @@ function AddTender() {
 
 
         let calcProgramName = $('#tender-calcProgram').children("option:selected").text();
-
+        $.bootstrapLoading.start();
         let callback = function() {
                 $("#add-tender-dialog").modal("hide");
                 $('#tender-name').val('');
@@ -3706,11 +3717,13 @@ function AddTender() {
                 $("#poj-name-info").hide();
                 $("#eng-name").val('');
                 $("#eng-name-info").hide();
+                $.bootstrapLoading.end();
                 setTimeout(function () {
                     STATE.addingTender = false;
                 }, 500);
             },
             errCB = function () {
+                $.bootstrapLoading.end();
                 setTimeout(function () {
                     STATE.addingTender = false;
                 }, 500);
@@ -3750,7 +3763,7 @@ function AddTender() {
         AddTenderItems(selectedItem, projName, engName, tenderName, tenderInfo, callback, errCB);
 
     } catch (error) {
-        ('#add-tender-confirm').removeClass('disabled');
+        $('#add-tender-confirm').removeClass('disabled');
         alert(error);
     }
 }
@@ -3803,16 +3816,20 @@ function AddFolder() {
     let existCallback = function () {
         setDangerInfo($('#folder-name-info'), `已存在“${$("#folder-name").val()}”`);
         STATE.addingFolder = false;
+        $.bootstrapLoading.end();
     };
+    $.bootstrapLoading.start();
     let sucCallback = function () {
         $('#add-folder-dialog').modal('hide');
         $('#folder-name').val('');
         setDangerInfo($('#folder-name-info'), '', false);
+        $.bootstrapLoading.end();
         setTimeout(function () {
             STATE.addingFolder = false;
         }, 500);
     };
     let errCB = function () {
+        $.bootstrapLoading.end();
         setTimeout(function () {
             STATE.addingFolder = false;
         }, 500);
@@ -4652,6 +4669,10 @@ $('#shareToConfirm').click(function () {
 
 $("#confirm-import").click(function() {
     //$.bootstrapLoading.start();
+    if (STATE.importing) {
+        return;
+    }
+    STATE.importing = true;
     const self = $(this);
     try {
         let formData = new FormData();
@@ -4676,6 +4697,7 @@ $("#confirm-import").click(function() {
                 self.text('上传中...');
             },
             success: function(response){
+                STATE.importing = false;
                 self.text('确定导入');
                 $.bootstrapLoading.progressEnd();
                 if(response.error == 1){
@@ -4689,6 +4711,7 @@ $("#confirm-import").click(function() {
 
             },
             error:  function(response){
+                STATE.importing = false;
                 setTimeout(function () {
                     self.text('确定导入');
                     $.bootstrapLoading.progressEnd();
@@ -4697,6 +4720,7 @@ $("#confirm-import").click(function() {
             }
         });
     } catch(error) {
+        STATE.importing = false;
         alert(error);
         $.bootstrapLoading.end();
     }