Merge branch 'master' of http://git.bocai108.com:10180/Ethan/Customer-Service

application/admin/controller/Report.php

@@ -292,8 +292,7 @@ class Report extends Base
             'times_inline' => $times_inline_array
         );
     }
-
-
+    
     // 工作报表
     public function workreport()
     {
@@ -398,5 +397,4 @@ class Report extends Base
 
         return $this->fetch();
     }
-
 }//end class

application/admin/view/admins/editpower.html

@@ -82,7 +82,9 @@
                 $(this).parent().parent().find('[level=1]').prop('checked','checked');
             }
             else{
-                if($(this).parent().find('input:checked').length==0){
+                if($(this).parent().find('[level=2]').checked){
+                    //$(this).parent().parent().find('[level=1]').removeAttr('checked');
+                }else{
                     $(this).parent().parent().find('[level=1]').removeAttr('checked');
                 }
 
@@ -91,13 +93,6 @@
     });
 </script>
 <script>
-    $(".fa-comments-o").change(function(){
-        if($(".fa-comments-o:checked").length!=0){
-            $("#fa-comments-o").prop("checked",true);
-        }else{
-            $("#fa-comments-o").prop("checked",false);
-        }
-    });
 
     function checkboxOnclick(checkbox){