From 5b9caa35736fe2cbf2614a59ba5ed0d3dc256b61 Mon Sep 17 00:00:00 2001 From: chenrui <1950717904@qq.com> Date: Tue, 7 Jan 2025 11:52:27 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=B8=8D=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E7=9A=84=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/EmergencyService/pom.xml | 2 +- .../framework/web/page/TableDataInfo.java | 4 +-- .../zdxtEmergencyBootStart/pom.xml | 5 --- .../src/main/resources/static/css/stat.css | 2 +- .../src/main/resources/templates/login.html | 18 +++++----- .../project/code/statistical/statistical.html | 10 +++--- .../resources/mapper/StatisticalMapper.xml | 33 +------------------ lib/ZdxtComponent/pom.xml | 2 +- 8 files changed, 21 insertions(+), 55 deletions(-) diff --git a/lib/EmergencyService/pom.xml b/lib/EmergencyService/pom.xml index 64921bfd..b5e910b0 100644 --- a/lib/EmergencyService/pom.xml +++ b/lib/EmergencyService/pom.xml @@ -13,7 +13,7 @@ zdxtEmergencyBootStart zdxtEmergencyAppService zdxtEmergencyLogService - zdxtEmergencyExcelService + zdxtEmergencyMessageService zdxtLawEnforcementCodeService zdxtEmergencyDictService diff --git a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/framework/web/page/TableDataInfo.java b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/framework/web/page/TableDataInfo.java index 91b770a9..14052577 100644 --- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/framework/web/page/TableDataInfo.java +++ b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/framework/web/page/TableDataInfo.java @@ -5,7 +5,7 @@ import java.util.List; /** * 表格分页数据对象 - * + * * @author ruoyi */ public class TableDataInfo implements Serializable @@ -33,7 +33,7 @@ public class TableDataInfo implements Serializable /** * 分页 - * + * * @param list 列表数据 * @param total 总记录数 */ diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/pom.xml b/lib/EmergencyService/zdxtEmergencyBootStart/pom.xml index d6c3921e..a11dec58 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/pom.xml +++ b/lib/EmergencyService/zdxtEmergencyBootStart/pom.xml @@ -52,11 +52,6 @@ zdxtTableManagementComponent 1.0 - - EmergencyService - zdxtEmergencyExcelService - 1.0 - ZdxtComponent diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/css/stat.css b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/css/stat.css index 14024d1b..fc992723 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/css/stat.css +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/css/stat.css @@ -39,7 +39,7 @@ body { top: 110px; right: 1%; align-items: center; - width: 67%; + width: 70%; } .seltime > i { diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/login.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/login.html index ff23c3ea..93bc89f6 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/login.html +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/login.html @@ -87,15 +87,15 @@ -
-
验证码
- -
- - - -
-
+ + + + + + + + +
记住密码 diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/statistical.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/statistical.html index c5fb7a2f..8483ccca 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/statistical.html +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/statistical.html @@ -14,9 +14,11 @@ 年度 @@ -726,7 +728,7 @@ tmpList.push({name: list[i].name, value: list[i].total}) } document.getElementById("enterprise_Total").innerText=data.data.length; - console.log(data) + console.log(data); var tabStr = fillTable(tmpList); document.getElementById("echartSortTable").innerHTML = tabStr; diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/StatisticalMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/StatisticalMapper.xml index 88a42405..a8f08d7e 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/StatisticalMapper.xml +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/StatisticalMapper.xml @@ -41,10 +41,7 @@ @@ -110,10 +97,6 @@ from enforcement_registration er AND DATE_FORMAT(er.enforcement_time, '%Y%m' ) = DATE_FORMAT( CURDATE(), '%Y%m' ) - - - ${params.dataScope} - @@ -145,8 +128,6 @@ AND er.check_category = #{checkCategory} - - ${params.dataScope} GROUP BY er.law_enforcement_id ORDER BY total DESC limit 100 @@ -174,8 +155,6 @@ AND er.check_category = #{checkCategory} - - ${params.dataScope} GROUP BY er.law_enforcer_id ORDER BY total DESC limit 100 @@ -205,8 +184,6 @@ AND r.check_category = #{checkCategory} - - ${params.dataScope} GROUP BY d.id ORDER BY total DESC limit 100 @@ -233,8 +210,6 @@ AND r.check_category = #{checkCategory} - - ${params.dataScope} GROUP BY i.company_org_type ORDER BY total DESC limit 100 @@ -257,8 +232,6 @@ AND check_category = #{checkCategory} - - ${params.dataScope} GROUP BY DATE_FORMAT(enforcement_time, '%Y-%m-%d') ORDER BY enforcement_time ASC @@ -280,8 +253,6 @@ AND check_category = #{checkCategory} - - ${params.dataScope} GROUP BY enterprise_number ORDER BY total desc @@ -310,8 +281,6 @@ AND er.check_category = #{checkCategory} - - ${params.dataScope} GROUP BY DATE_FORMAT(enforcement_time, '%Y-%m-%d'), er.enterprise_number ORDER BY total DESC limit 100 diff --git a/lib/ZdxtComponent/pom.xml b/lib/ZdxtComponent/pom.xml index 053671fe..665bd684 100644 --- a/lib/ZdxtComponent/pom.xml +++ b/lib/ZdxtComponent/pom.xml @@ -14,7 +14,7 @@ zdxtVisualizationComponent zdxtBaiduUeditorComponent zdxtTableManagementComponent - zdxtExcelComponent + zdxtDynamicFormComponent zdxtAutoCodeComponent