minitiger 8 yıl önce
ebeveyn
işleme
915fafa699

+ 2 - 2
VisualInspection/js/lib/mytable.js

@@ -252,9 +252,9 @@
                     return new mytable(this, options, true);
             }
         } else {
-            // return this.each(function () {
+            return this.each(function () {
                 new mytable(this, options);
-            // });
+            });
         }
     };
 

+ 4 - 4
VisualInspection/js/statistics/assess_ranking.js

@@ -282,13 +282,13 @@ function addTask(userid, username, start_date, end_date) {
                     var teamid = tasktemp.class_id +"_"+ ( typeof(tasktemp.unregular_id)=="undefined"?"":tasktemp.unregular_id)
                     
                     if(tasktemp.class_type==1){
-                         html1+="<div class='row'><button class=\"btn "+classname+" classbtn\" id="+teamid+" data="+workday+" onclick='selectTeamClass(this)'  type=\"button\">"+name+"</button></div>"
 
+                        html2+="<div class='row'><button class=\"btn "+classname+" classbtn\" id="+teamid+"  data="+workday+" onclick='selectTeamClass(this)'  type=\"button\">"+name+"</button></div>"
                         //  html1 +='<div class="row"><label class="btn '+classname+'"><input type="radio" name="options" id="option2">'+name+'</label></div>'
                          continue;
                     }
                     if(tasktemp.class_type==2){
-                        html2+="<div class='row'><button class=\"btn "+classname+" classbtn\" id="+teamid+"  data="+workday+" onclick='selectTeamClass(this)'  type=\"button\">"+name+"</button></div>"
+                         html1+="<div class='row'><button class=\"btn "+classname+" classbtn\" id="+teamid+" data="+workday+" onclick='selectTeamClass(this)'  type=\"button\">"+name+"</button></div>"
                         continue;
                     }
                     if(tasktemp.class_type==3){
@@ -335,11 +335,11 @@ function addTask(userid, username, start_date, end_date) {
 
                     
                     if(usercounttemp.class_type==1){
-                         html1+="<div class='row'><button class=\"btn "+classname+" classbtn\"  type=\"button\">"+name+"</button></div>"
+                        html2+="<div class='row'><button class=\"btn "+classname+" classbtn\" type=\"button\">"+name+"</button></div>"
                          continue;
                     }
                     if(usercounttemp.class_type==2){
-                        html2+="<div class='row'><button class=\"btn "+classname+" classbtn\" type=\"button\">"+name+"</button></div>"
+                         html1+="<div class='row'><button class=\"btn "+classname+" classbtn\"  type=\"button\">"+name+"</button></div>"
                         continue;
                     }
                     if(usercounttemp.class_type==3){

+ 9 - 7
VisualInspection/js/statistics/assess_situation.js

@@ -36,11 +36,13 @@ function querySituationClick(){
     var url = "statistics/score/info";
     var strTbody='';
     post_common_service( url,param,function(data){
-        // 道管中心排名
-        ranking_method(data);
-            for(i=0;i<data.length;i++){
-                $(".table-tbody").append(gethtml(data[i],i));
-            }          
+            var list = data.list;
+            // 道管中心排名
+            ranking_method(list);
+            for(i=0;i<list.length;i++){       
+                $(".table-tbody").append(gethtml(list[i],i));
+            }
+            $(".table-tbody").append(getTotalHtml(data));      
         },function(error){
                 return "" ;
    });
@@ -52,7 +54,7 @@ function initQuerySituation(){
     var endD = new Date();
     var now = new Date();
     var startD = new Date(now.getTime() - 7 * 24 * 3600 * 1000);
-    var start_time = startD.getFullYear()+"-"+(startD.getMonth()+1)+"-26"; 
+    var start_time = startD.getFullYear()+"-"+(startD.getMonth())+"-26"; 
     var end_time = endD.getFullYear()+"-"+(endD.getMonth()+1)+"-25"; 
     //默认初始化时间页面回显
     $("#start-time").val(start_time);
@@ -77,7 +79,7 @@ function initQuerySituation(){
             ranking_method(list);
             for(i=0;i<list.length;i++){       
                 $(".table-tbody").append(gethtml(list[i],i));
-            }   
+            }
             $(".table-tbody").append(getTotalHtml(data));      
         },function(error){
             return "" ;