Просмотр исходного кода

修改出勤页面加载慢的问题

minitiger 8 лет назад
Родитель
Сommit
49cc6ef9d1

+ 14 - 9
VisualInspection/js/statistics/change_attendance.js

@@ -8,15 +8,16 @@ $(function(){
     if(roleContains("ROAD_MANAGER")){
         road_manager = getCurrentUser().organid;     
     }
-	setRoadManagerSelect("#center_manage",road_manager,true);
+	setRoadManagerSelect("#center_manage",road_manager);
     // 初始化部门下的收费站
-     getFsStationList(GV("#center_manage"),function(obj){
+    getFsStationList(GV("#center_manage"),function(obj){
         $("#fs_station").html(obj);
-        var dept;
+         //默认选中第一个
+        $("#fs_station option:first").attr("selected", 'selected'); 
         if(roleContains("STATION")){
-            dept = getCurrentUser().organid;     
+            var dept = getCurrentUser().organid;     
+            $("#fs_station").val(dept);
         }
-        $("#fs_station").val(dept);
         var userId;
         if (hasRole("ROLE_STATION")) {
             userId = getCurrentUser().id;
@@ -67,11 +68,12 @@ $(function(){
         }else{
             getFsStationList(center_manage_id,function(obj){
                 $("#fs_station").html(obj);
-                var dept;
+                //默认选中第一个
+                $("#fs_station option:first").attr("selected", 'selected'); 
                 if(roleContains("STATION")){
-                    dept = getCurrentUser().organid;     
+                    var dept = getCurrentUser().organid;     
+                    $("#fs_station").val(dept);
                 }
-                $("#fs_station").val(dept);
             });
         }
     })
@@ -102,8 +104,10 @@ function getFsWorkInfo(flag){
     }else if(GV("#center_manage") != ''){
             param[ 'parent_dept_id' ] = GV("#center_manage");
     }
-
+    //加载层
+    var index = layer.load(2, {shade: false}); //0代表加载的风格,支持0-2
     post_common_service("statistics/fs/unregular/work/info",param,function(data){
+        layer.close(index);
         if(flag == 0 && $("#ca-a-table").children().length > 0 ){
             return ;
         }
@@ -118,6 +122,7 @@ function getFsWorkInfo(flag){
             }
         }
     },function(error){
+        layer.close(index);
     });
 }
 

+ 16 - 11
VisualInspection/js/statistics/common_attendance.js

@@ -8,7 +8,7 @@ $(function(){
     if(roleContains("ROAD_MANAGER")){
         road_manager = getCurrentUser().organid;     
     }
-	setRoadManagerSelect("#center_manage",road_manager,true);
+	setRoadManagerSelect("#center_manage",road_manager,false);
 
     $.jeDate("#sel_month",{
 		isinitVal:true,
@@ -17,11 +17,12 @@ $(function(){
     // 初始化部门下的收费站
      getFsStationList(GV("#center_manage"),function(obj){
         $("#fs_station").html(obj);
-        var dept;
+        //默认选中第一个
+        $("#fs_station option:first").attr("selected", 'selected'); 
         if(roleContains("STATION")){
-        dept = getCurrentUser().organid;     
+            var dept = getCurrentUser().organid;     
+            $("#fs_station").val(dept);
         }
-        $("#fs_station").val(dept);
         var userId;
         if (hasRole("ROLE_STATION")) {
             userId = getCurrentUser().id;
@@ -68,12 +69,13 @@ $(function(){
             $("#fs_station,#fs_employee").html('');
         }else{
             getFsStationList(center_manage_id,function(obj){
-                 $("#fs_station").html(obj);
-                 var dept;
-                 if(roleContains("STATION")){
-                    dept = getCurrentUser().organid;     
-                 }
-                 $("#fs_station").val(dept);
+                $("#fs_station").html(obj);
+                //默认选中第一个
+                $("#fs_station option:first").attr("selected", 'selected'); 
+                if(roleContains("STATION")){
+                    var dept = getCurrentUser().organid;     
+                    $("#fs_station").val(dept);
+                }
             });
         }
     })
@@ -103,8 +105,10 @@ $(function(){
         }else if(GV("#center_manage") != ''){
                 param[ 'parent_dept_id' ] = GV("#center_manage");
         }
-
+        //加载层
+        var index = layer.load(2, {shade: false}); //0代表加载的风格,支持0-2
         post_common_service("statistics/fs/work/info",param,function(data){
+            layer.close(index);
             if(flag == 0 && $("#c-a-tbody").children().length > 0 ){
                 return ;
             }
@@ -120,6 +124,7 @@ $(function(){
                 }
             }
         },function(error){
+            layer.close(index);
         });
     }
 

+ 3 - 2
VisualInspection/js/statistics/common_statistic.js

@@ -76,14 +76,15 @@ function getFsEmployee(fs_station_id , func, selectId){
  * param: center_manage_id , func 异步回调方法
  * return: String select 下 List<Option>
  */
-function getFsStationList(center_manage_id,func){ 
+function getFsStationList(center_manage_id,func,hasAll){ 
     var param = {
             "parentid":center_manage_id
     }
     post_common_service("dept/getDeptInfosByDeptId",param,function(data){
         var str = '';
         if(data.length > 0){
-            str = "<option value=''>全部</option>";  
+            str = "<option value=''>全部</option>";
+            if(!hasAll) str="";
             for(var i=0;i<data.length;i++){
                 str += "<option value="+data[i].id+">"+data[i].organname+"</option>";  
             }

+ 3 - 1
VisualInspection/js/util/util.js

@@ -14,7 +14,9 @@ function doajax(method, dataurl, data, sucessCallBack, errorCallBack) {
             dataType: "json",
             async: true,
             data: JSON.stringify(data),
-            success: sucessCallBack,
+            success: function(data){
+                sucessCallBack(data);
+            },
             error: function(error) {
                 if (HandleError(error)) return;
                 errorCallBack(error);