From 65254e0e2860fa86af8c377b42c80efa25592fe7 Mon Sep 17 00:00:00 2001
From: zouyx <1798599149@qq.com>
Date: Thu, 13 Feb 2025 14:22:38 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=91=E7=9D=A3=E7=AB=AF-=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../project/code/complaintStatic/complaintStatic.html    | 2 +-
 .../project/code/registration/staticRegistration.html    | 1 +
 .../project/code/statistical/staticProgram.html          | 9 +++++++--
 .../code/statisticsEnterprise/statisticsEnterprise.html  | 7 +++++++
 4 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/complaintStatic/complaintStatic.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/complaintStatic/complaintStatic.html
index 8a06b1cf..6e8fb45e 100644
--- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/complaintStatic/complaintStatic.html
+++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/complaintStatic/complaintStatic.html
@@ -236,7 +236,7 @@
             var options1 = {
                 modalName: "执法投诉统计",
                 showHeader: true,
-                showFooter: true,
+                showFooter: false,
                 showColumns: false,
                 showRefresh: false,
                 showToggle: false,
diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/staticRegistration.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/staticRegistration.html
index 36204dfb..f7c7e427 100644
--- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/staticRegistration.html
+++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/staticRegistration.html
@@ -152,6 +152,7 @@
                 showColumns: false,
                 showRefresh: false,
                 showToggle: false,
+                height:$(window).height()-$(".search-collapse").height()-$("#toolbar").height(),
                 pagination: true,
                 pageSize: 10,
                 pageList: [10, 25, 50],
diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/staticProgram.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/staticProgram.html
index 7f389808..47194eed 100644
--- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/staticProgram.html
+++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/staticProgram.html
@@ -24,7 +24,7 @@
     </div>
 
     <div class="tab_box">
-        <div id="con_one_1" class="tab_item" style="z-index: 1;">
+        <div id="con_one_1" class="tab_item" style="z-index: 1;height: 110%">
             <div class="container-div">
                 <div class="row">
                     <div class="col-sm-12 search-collapse">
@@ -122,7 +122,7 @@
                 </div>
             </div>
         </div>
-        <div id="con_one_2" class="tab_item">
+        <div id="con_one_2" class="tab_item" style="height: 110%">
             <form id="form2">
                 <div class="select-list">
                     <ul>
@@ -182,6 +182,7 @@
         $("#chart-box-2").hide();
         $("#chart-box-3").hide();
         echartsTotal();
+        $(".fixed-table-toolbar").hide();
     };
 
     function setTab(name, cursel, n) {
@@ -382,6 +383,10 @@
             showColumns: false,
             showRefresh: false,
             showToggle: false,
+            height:$(window).height()-$(".search-collapse").height()-$("#toolbar").height()-50,
+            pagination: true,
+            pageSize: 10,
+            pageList: [10, 25, 50],
             columns: [
                 /*{
                 checkbox: true
diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statisticsEnterprise/statisticsEnterprise.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statisticsEnterprise/statisticsEnterprise.html
index 2643e8a4..e249bc22 100644
--- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statisticsEnterprise/statisticsEnterprise.html
+++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statisticsEnterprise/statisticsEnterprise.html
@@ -268,6 +268,10 @@
             showColumns: false,
             showRefresh: false,
             showToggle: false,
+            pagination: true,
+            pageSize: 10,
+            pageList: [10, 25, 50],
+            // height:$(window).height()-$(".search-collapse").height()-$("#toolbar").height(),
             //quarterBoolean:quarterBoolean,
             columns: [
                 {
@@ -468,6 +472,9 @@
                     showRefresh: false,
                     showToggle: false,
                     pagination: true,
+                    pageSize: 10,
+                    pageList: [10, 25, 50],
+                    // height:$(window).height()-$(".search-collapse").height()-$("#toolbar").height(),
                     columns: [
                         {
                             field : 'address',