浏览代码

滚动条BUGFIX

seimin 1 年之前
父节点
当前提交
7d3ca362a4

+ 8 - 7
assets/views/report/event_form.html

@@ -236,7 +236,7 @@
236
                                     </tr>
236
                                     </tr>
237
                                 </thead>
237
                                 </thead>
238
                             </table>
238
                             </table>
239
-                            <div class="jry_table_wrap" ng-nicescroll nice-scroll-end="topEndComplete()">
239
+                            <div class="jry_table_wrap">
240
                                 <table class="jry_table jry_table_body" cellspacing="0" cellpadding="16"
240
                                 <table class="jry_table jry_table_body" cellspacing="0" cellpadding="16"
241
                                     style="font-weight:normal !important;margin-bottom: 16px;table-layout:fixed">
241
                                     style="font-weight:normal !important;margin-bottom: 16px;table-layout:fixed">
242
                                     <tbody class="tbody-hover">
242
                                     <tbody class="tbody-hover">
@@ -344,7 +344,7 @@
344
                                     </tr>
344
                                     </tr>
345
                                 </thead>
345
                                 </thead>
346
                             </table>
346
                             </table>
347
-                            <div class="jry_table_wrap" ng-nicescroll>
347
+                            <div class="jry_table_wrap">
348
                                 <table class="jry_table jry_table_body" cellspacing="0" cellpadding="16"
348
                                 <table class="jry_table jry_table_body" cellspacing="0" cellpadding="16"
349
                                     style="font-weight:normal !important;margin-bottom: 16px;table-layout:fixed">
349
                                     style="font-weight:normal !important;margin-bottom: 16px;table-layout:fixed">
350
                                     <tbody class="tbody-hover">
350
                                     <tbody class="tbody-hover">
@@ -475,7 +475,7 @@
475
                                     </tr>
475
                                     </tr>
476
                                 </thead>
476
                                 </thead>
477
                             </table>
477
                             </table>
478
-                            <div class="jry_table_wrap jry_table_wrap2" ng-nicescroll>
478
+                            <div class="jry_table_wrap jry_table_wrap2">
479
                                 <table class="jry_table jry_table_body" cellspacing="0" cellpadding="16"
479
                                 <table class="jry_table jry_table_body" cellspacing="0" cellpadding="16"
480
                                     style="font-weight:normal !important;margin-bottom: 16px;table-layout:fixed">
480
                                     style="font-weight:normal !important;margin-bottom: 16px;table-layout:fixed">
481
                                     <tbody class="tbody-hover">
481
                                     <tbody class="tbody-hover">
@@ -619,7 +619,7 @@
619
                                     </tr>
619
                                     </tr>
620
                                 </thead>
620
                                 </thead>
621
                             </table>
621
                             </table>
622
-                            <div class="jry_table_wrap" ng-nicescroll nice-scroll-end="topEndComplete()">
622
+                            <div class="jry_table_wrap">
623
                                 <table class="jry_table jry_table_body" cellspacing="0" cellpadding="16"
623
                                 <table class="jry_table jry_table_body" cellspacing="0" cellpadding="16"
624
                                     style="font-weight:normal !important;margin-bottom: 16px;table-layout:fixed">
624
                                     style="font-weight:normal !important;margin-bottom: 16px;table-layout:fixed">
625
                                     <tbody class="tbody-hover">
625
                                     <tbody class="tbody-hover">
@@ -697,7 +697,7 @@
697
                                     </tr>
697
                                     </tr>
698
                                 </thead>
698
                                 </thead>
699
                             </table>
699
                             </table>
700
-                            <div class="jry_table_wrap" ng-nicescroll>
700
+                            <div class="jry_table_wrap">
701
                                 <table class="jry_table jry_table_body" cellspacing="0" cellpadding="16"
701
                                 <table class="jry_table jry_table_body" cellspacing="0" cellpadding="16"
702
                                     style="font-weight:normal !important;margin-bottom: 16px;table-layout:fixed">
702
                                     style="font-weight:normal !important;margin-bottom: 16px;table-layout:fixed">
703
                                     <tbody class="tbody-hover">
703
                                     <tbody class="tbody-hover">
@@ -763,7 +763,7 @@
763
                                     </tr>
763
                                     </tr>
764
                                 </thead>
764
                                 </thead>
765
                             </table>
765
                             </table>
766
-                            <div class="jry_table_wrap" ng-nicescroll>
766
+                            <div class="jry_table_wrap">
767
                                 <table class="jry_table jry_table_body" cellspacing="0" cellpadding="16"
767
                                 <table class="jry_table jry_table_body" cellspacing="0" cellpadding="16"
768
                                     style="font-weight:normal !important;margin-bottom: 16px;table-layout:fixed">
768
                                     style="font-weight:normal !important;margin-bottom: 16px;table-layout:fixed">
769
                                     <tbody class="tbody-hover">
769
                                     <tbody class="tbody-hover">
@@ -1125,7 +1125,7 @@
1125
         margin-top: -1px;
1125
         margin-top: -1px;
1126
         height: 311px;
1126
         height: 311px;
1127
         overflow-x: hidden;
1127
         overflow-x: hidden;
1128
-        overflow-y: auto;
1128
+        overflow-y: scroll;
1129
     }
1129
     }
1130
 
1130
 
1131
     .jry_table_wrap2 {
1131
     .jry_table_wrap2 {
@@ -1143,6 +1143,7 @@
1143
     .jry_table_head {
1143
     .jry_table_head {
1144
         margin-top: 16px;
1144
         margin-top: 16px;
1145
         background-color: #f9f9f9;
1145
         background-color: #f9f9f9;
1146
+        width: calc(100% - 17px);
1146
     }
1147
     }
1147
 
1148
 
1148
     .jry_table_head th {
1149
     .jry_table_head th {

+ 8 - 7
assets/views/report/service_form.html

@@ -220,7 +220,7 @@
220
                                     </tr>
220
                                     </tr>
221
                                 </thead>
221
                                 </thead>
222
                             </table>
222
                             </table>
223
-                            <div class="jry_table_wrap" ng-nicescroll nice-scroll-end="topEndComplete()">
223
+                            <div class="jry_table_wrap">
224
                                 <table class="jry_table jry_table_body" cellspacing="0" cellpadding="16"
224
                                 <table class="jry_table jry_table_body" cellspacing="0" cellpadding="16"
225
                                     style="font-weight:normal !important;margin-bottom: 16px;table-layout:fixed">
225
                                     style="font-weight:normal !important;margin-bottom: 16px;table-layout:fixed">
226
                                     <tbody class="tbody-hover service_form-hover">
226
                                     <tbody class="tbody-hover service_form-hover">
@@ -361,7 +361,7 @@
361
                                     </tr>
361
                                     </tr>
362
                                 </thead>
362
                                 </thead>
363
                             </table>
363
                             </table>
364
-                            <div class="jry_table_wrap" ng-nicescroll>
364
+                            <div class="jry_table_wrap">
365
                                 <table class="jry_table jry_table_body" cellspacing="0" cellpadding="16"
365
                                 <table class="jry_table jry_table_body" cellspacing="0" cellpadding="16"
366
                                     style="font-weight:normal !important;margin-bottom: 16px;table-layout:fixed">
366
                                     style="font-weight:normal !important;margin-bottom: 16px;table-layout:fixed">
367
                                     <tbody class="tbody-hover">
367
                                     <tbody class="tbody-hover">
@@ -493,7 +493,7 @@
493
                                     </tr>
493
                                     </tr>
494
                                 </thead>
494
                                 </thead>
495
                             </table>
495
                             </table>
496
-                            <div class="jry_table_wrap" ng-nicescroll>
496
+                            <div class="jry_table_wrap">
497
                                 <table class="jry_table jry_table_body" cellspacing="0" cellpadding="16"
497
                                 <table class="jry_table jry_table_body" cellspacing="0" cellpadding="16"
498
                                     style="font-weight:normal !important;margin-bottom: 16px;table-layout:fixed">
498
                                     style="font-weight:normal !important;margin-bottom: 16px;table-layout:fixed">
499
                                     <tbody class="tbody-hover">
499
                                     <tbody class="tbody-hover">
@@ -628,7 +628,7 @@
628
                                     </tr>
628
                                     </tr>
629
                                 </thead>
629
                                 </thead>
630
                             </table>
630
                             </table>
631
-                            <div class="jry_table_wrap" ng-nicescroll>
631
+                            <div class="jry_table_wrap">
632
                                 <table class="jry_table jry_table_body" cellspacing="0" cellpadding="16"
632
                                 <table class="jry_table jry_table_body" cellspacing="0" cellpadding="16"
633
                                     style="font-weight:normal !important;margin-bottom: 16px;table-layout:fixed">
633
                                     style="font-weight:normal !important;margin-bottom: 16px;table-layout:fixed">
634
                                     <tbody class="tbody-hover">
634
                                     <tbody class="tbody-hover">
@@ -670,7 +670,7 @@
670
                 <div class="deck_cont_body_TB1" ng-if="isArrays(dhchtj_list)&&dhchtj_list.length>0">
670
                 <div class="deck_cont_body_TB1" ng-if="isArrays(dhchtj_list)&&dhchtj_list.length>0">
671
                     <div class="TB">
671
                     <div class="TB">
672
                         <div class="TB_head">
672
                         <div class="TB_head">
673
-                            
673
+
674
                         </div>
674
                         </div>
675
                         <div class="TB_cont">
675
                         <div class="TB_cont">
676
                             <table class="jry_table jry_table_head" cellspacing="0" cellpadding="16"
676
                             <table class="jry_table jry_table_head" cellspacing="0" cellpadding="16"
@@ -689,7 +689,7 @@
689
                                     </tr>
689
                                     </tr>
690
                                 </thead>
690
                                 </thead>
691
                             </table>
691
                             </table>
692
-                            <div class="jry_table_wrap" ng-nicescroll>
692
+                            <div class="jry_table_wrap">
693
                                 <table class="jry_table jry_table_body" cellspacing="0" cellpadding="16"
693
                                 <table class="jry_table jry_table_body" cellspacing="0" cellpadding="16"
694
                                     style="font-weight:normal !important;margin-bottom: 16px;table-layout:fixed">
694
                                     style="font-weight:normal !important;margin-bottom: 16px;table-layout:fixed">
695
                                     <tbody class="tbody-hover">
695
                                     <tbody class="tbody-hover">
@@ -1047,7 +1047,7 @@
1047
         margin-top: -1px;
1047
         margin-top: -1px;
1048
         height: 310px;
1048
         height: 310px;
1049
         overflow-x: hidden;
1049
         overflow-x: hidden;
1050
-        overflow-y: auto;
1050
+        overflow-y: scroll;
1051
     }
1051
     }
1052
 
1052
 
1053
     .jry_table {
1053
     .jry_table {
@@ -1060,6 +1060,7 @@
1060
     .jry_table_head {
1060
     .jry_table_head {
1061
         margin-top: 16px;
1061
         margin-top: 16px;
1062
         background-color: #f9f9f9;
1062
         background-color: #f9f9f9;
1063
+        width: calc(100% - 17px);
1063
     }
1064
     }
1064
 
1065
 
1065
     .jry_table_head th {
1066
     .jry_table_head th {

+ 3 - 2
assets/views/working/statistics.html

@@ -87,7 +87,7 @@
87
                                     </tr>
87
                                     </tr>
88
                                 </thead>
88
                                 </thead>
89
                             </table>
89
                             </table>
90
-                            <div class="jry_table_wrap" ng-nicescroll>
90
+                            <div class="jry_table_wrap">
91
                                 <table class="jry_table jry_table_body" cellspacing="0" cellpadding="16"
91
                                 <table class="jry_table jry_table_body" cellspacing="0" cellpadding="16"
92
                                     style="font-weight:normal !important;margin-bottom: 16px;table-layout:fixed">
92
                                     style="font-weight:normal !important;margin-bottom: 16px;table-layout:fixed">
93
                                     <tbody class="tbody-hover service_form-hover">
93
                                     <tbody class="tbody-hover service_form-hover">
@@ -454,7 +454,7 @@
454
         margin-top: -1px;
454
         margin-top: -1px;
455
         height: 310px;
455
         height: 310px;
456
         overflow-x: hidden;
456
         overflow-x: hidden;
457
-        overflow-y: auto;
457
+        overflow-y: scroll;
458
     }
458
     }
459
 
459
 
460
     .jry_table {
460
     .jry_table {
@@ -467,6 +467,7 @@
467
     .jry_table_head {
467
     .jry_table_head {
468
         margin-top: 16px;
468
         margin-top: 16px;
469
         background-color: #f9f9f9;
469
         background-color: #f9f9f9;
470
+        width: calc(100% - 17px);
470
     }
471
     }
471
 
472
 
472
     .jry_table_head th {
473
     .jry_table_head th {

+ 3 - 2
assets/views/working/statisticsDetail.html

@@ -100,7 +100,7 @@
100
                                     </tr>
100
                                     </tr>
101
                                 </thead>
101
                                 </thead>
102
                             </table>
102
                             </table>
103
-                            <div class="jry_table_wrap" ng-nicescroll>
103
+                            <div class="jry_table_wrap">
104
                                 <table class="jry_table jry_table_body" cellspacing="0" cellpadding="16"
104
                                 <table class="jry_table jry_table_body" cellspacing="0" cellpadding="16"
105
                                     style="font-weight:normal !important;margin-bottom: 16px;table-layout:fixed">
105
                                     style="font-weight:normal !important;margin-bottom: 16px;table-layout:fixed">
106
                                     <tbody class="tbody-hover service_form-hover">
106
                                     <tbody class="tbody-hover service_form-hover">
@@ -479,7 +479,7 @@
479
         margin-top: -1px;
479
         margin-top: -1px;
480
         height: 310px;
480
         height: 310px;
481
         overflow-x: hidden;
481
         overflow-x: hidden;
482
-        overflow-y: auto;
482
+        overflow-y: scroll;
483
     }
483
     }
484
 
484
 
485
     .jry_table {
485
     .jry_table {
@@ -492,6 +492,7 @@
492
     .jry_table_head {
492
     .jry_table_head {
493
         margin-top: 16px;
493
         margin-top: 16px;
494
         background-color: #f9f9f9;
494
         background-color: #f9f9f9;
495
+        width: calc(100% - 17px);
495
     }
496
     }
496
 
497
 
497
     .jry_table_head th {
498
     .jry_table_head th {