From a8f493302dd22b5bb07be905e0a4bb021c51a4bf Mon Sep 17 00:00:00 2001 From: zouyx <1798599149@qq.com> Date: Tue, 5 Nov 2024 11:25:52 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../code/complaintStatic/complaintA.html | 2 +- .../code/complaintStatic/complaintStatic.html | 6 +- .../project/code/deptStatic/deptStatic.html | 2 +- .../code/registration/staticRegistration.html | 84 +++++++++++++++++-- .../code/statistical/staticProgram.html | 80 +++++++++++++++--- .../code/statistical/statisticalPanel.html | 68 ++++++++++----- .../enterpriseFragment.html | 2 +- .../statisticsEnterprise.html | 23 ++--- .../statisticsWarning/statisticsWarning.html | 12 ++- ...nforcementInspectionProgramController.java | 3 +- .../EnforcementRegistrationController.java | 3 +- .../StatisticsEnterpriseController.java | 16 ++-- .../EnforcementInspectionProgramMapper.xml | 4 +- .../LawEnforcementWarningListMapper.xml | 32 +++++-- 14 files changed, 260 insertions(+), 77 deletions(-) diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/complaintStatic/complaintA.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/complaintStatic/complaintA.html index cad580e1..f411c62b 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/complaintStatic/complaintA.html +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/complaintStatic/complaintA.html @@ -5,7 +5,7 @@

  • -

    +

    • 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 9e8faee3..7d290722 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 @@ -39,7 +39,7 @@
    @@ -220,7 +220,7 @@ columns: [ { field : 'complaintDepartment', - title : '投诉对象' + title : '被投诉对象' }, { field : 'complaintType', diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/deptStatic/deptStatic.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/deptStatic/deptStatic.html index 6bd4cf0e..d3b2b3c9 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/deptStatic/deptStatic.html +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/deptStatic/deptStatic.html @@ -83,7 +83,7 @@ },*/ { field : 'zfdw', - title : '执法部门' + title : '部门名称' }, { field : 'name', 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 360faea9..28a08b44 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 @@ -91,13 +91,16 @@ - + + -
  • + +
  • +

    自定义时间：

    + + - +
  •  搜索 -  重置 +  重置 下载
    • @@ -171,9 +180,12 @@ var prefix = ctx + "code/registration"; var searchType; window.onload = function () { + /*$("#quarter").hide(); + $("#month").hide(); + $("#custom").hide();*/ $("#quarter").hide(); $("#month").hide(); - $("#custom").hide(); + $("#select-time").hide(); $("#showDetail").hide(); }; $(function() { @@ -286,7 +298,7 @@ }; $.table.init(options); }); - function timeType() { + /*function timeType() { var dateSearch = document.getElementById("dateSearch"); if(dateSearch.value =="quarter"){ $("#quarter").show(); @@ -325,6 +337,54 @@ $("#quarter").val(""); $("#month").val(""); } + }*/ + + function timeType() { + var dateSearch = document.getElementById("dateSearch"); + console.log(dateSearch.value); + if(dateSearch.value=="quarter"){ + $("#year").show(); + if(document.getElementById("year").value==''){ + document.getElementById("year").value=currentYear; + } + $("#select-time").hide(); + document.getElementById("startTime").value=""; + document.getElementById("endTime").value=""; + $("#quarter").show(); + $("#month").hide(); + document.getElementById("month").value=""; + }else if(dateSearch.value=="month"){ + $("#year").show(); + if(document.getElementById("year").value==''){ + document.getElementById("year").value=currentYear; + } + $("#select-time").hide(); + document.getElementById("startTime").value=""; + document.getElementById("endTime").value=""; + $("#quarter").hide(); + document.getElementById("quarter").value=""; + $("#month").show(); + }else if(dateSearch.value=="select-time"){ + $("#select-time").show(); + $("#year").hide(); + document.getElementById("year").value=""; + $("#quarter").hide(); + document.getElementById("quarter").value=""; + $("#month").hide(); + document.getElementById("month").value=""; + }else { + $("#year").show(); + if(document.getElementById("year").value==''){ + document.getElementById("year").value=currentYear; + } + $("#select-time").hide(); + document.getElementById("startTime").value=""; + document.getElementById("endTime").value=""; + $("#quarter").hide(); + document.getElementById("quarter").value=""; + $("#month").hide(); + document.getElementById("month").value=""; + } } function search1 (formId) { var currentId = $.common.isEmpty(formId) ? $('form').attr('id') : formId; @@ -424,14 +484,14 @@ var encodedUri=encodeURI(csvContent); var link=do*/ - layui.use('laydate', function(){ + /*layui.use('laydate', function(){ var laydate = layui.laydate; laydate.render({ elem: '#year', type: 'year', trigger: 'click' }); - }); + });*/ function openStaticDetail(enterpriseNumber) { $("#enterpriseNumber").val(enterpriseNumber); @@ -467,6 +527,12 @@ function closeDetail() { $("#showDetail").hide(); } + + function resetR(){ + $('form').eq(0).trigger("reset"); + search1(); + timeType(); + } \ No newline at end of file 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 2ca29fae..e16d7742 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 @@ -28,7 +28,7 @@

    执法部门：

    -
  • +
  • +

    时段：

    + + + + +
    •  搜索 -  重置 +  重置
    @@ -212,7 +212,7 @@ ↑ ↓ - 32 + 32
    @@ -223,7 +223,7 @@ ↑ ↓ -- - +
    @@ -237,7 +237,7 @@ ↑ ↓ - 125000 + 125000
    @@ -248,7 +248,7 @@ ↑ ↓ - +
    @@ -260,7 +260,7 @@ ↑ ↓ - 0.39万 + 0.39万
    @@ -274,7 +274,7 @@ ↑ ↓ - 35 + 35
    @@ -286,7 +286,7 @@ ↑ ↓ - 62 + 62
    @@ -296,7 +296,7 @@ ↑ ↓ - -- + --
    @@ -310,7 +310,7 @@ ↑ ↓ - -- + -- @@ -322,7 +322,7 @@ ↑ ↓ - -- + --
    @@ -332,7 +332,7 @@ ↑ ↓ - -- + --
    @@ -346,7 +346,7 @@ ↑ ↓ - -- + --
    @@ -357,7 +357,7 @@ ↑ ↓ - -- + --
    @@ -370,7 +370,7 @@ ↑ - -- + --
    @@ -386,32 +386,32 @@ ↑ - -- + --
    被投诉部门数量
    -
    件
    +
    个
    ↑ - -- + --
    投诉企业数量
    -
    个
    +
    件
    ↑ - -- + --
    @@ -456,6 +456,9 @@ * 查询执法部门数据 */ function queryStatisticalPanelDeptAndUser() { + $("#dept-huan-timeType").text(typeMake()); + $("#user-huan-timeType").text(typeMake()); + $("#oneself-user-huan-timeType").text(typeMake()); $.ajax({ url: prefix2 + '/statisticalPanelDeptAndUser', //后台url data: $("#formId").serialize(), @@ -491,6 +494,9 @@ * 查询企业数据 */ function enterprise() { + $("#enterprise-huan-timeType").text(typeMake()); + $("#enterprise-xc-huan-timeType").text(typeMake()); + $("#enterprise-zx-huan-timeType").text(typeMake()); $.ajax({ url: prefix2 + '/enterprise', //后台url data: $("#formId").serialize(), @@ -534,6 +540,9 @@ * 查询企业数据 */ function statisticProgram() { + $("#program-huan-timeType").text(typeMake()); + $("#program-xz-huan-timeType").text(typeMake()); + $("#program-dw-huan-timeType").text(typeMake()); $.ajax({ url: prefix2 + '/statisticProgram', //后台url data: $("#formId").serialize(), @@ -577,6 +586,9 @@ * 查询执法登记数据 */ function registration() { + $("#regis-huan-timeType").text(typeMake()); + $("#regis-dw-huan-timeType").text(typeMake()); + $("#regis-lh-huan-timeType").text(typeMake()); $.ajax({ url: prefix2 + '/registration', //后台url data: $("#formId").serialize(), @@ -617,6 +629,9 @@ * 查询执法预警数据 */ function warning() { + $("#warn-huan-timeType").text(typeMake()); + $("#warn-qy-huan-timeType").text(typeMake()); + $("#warn-dw-huan-timeType").text(typeMake()); $.ajax({ url: prefix2 + '/warning', //后台url data: $("#formId").serialize(), @@ -655,6 +670,9 @@ } function complaint() { + $("#complaint-huan-timeType").text(typeMake()); + $("#complaint-qy-huan-timeType").text(typeMake()); + $("#complaint-dw-huan-timeType").text(typeMake()); $.ajax({ url: prefix2 + '/complaint', //后台url data: $("#formId").serialize(), @@ -709,7 +727,15 @@ function searchP(){ this.initData(); } - + function typeMake(){ + if(document.getElementById("month").value!=''&&document.getElementById("month").value!=null){ + return '较上月'; + }else if(document.getElementById("quarter").value!=''&&document.getElementById("quarter").value!=null){ + return '较上季' + }else{ + return '较上年' + } + } \ No newline at end of file diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statisticsEnterprise/enterpriseFragment.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statisticsEnterprise/enterpriseFragment.html index 6a443d3f..aaf0bea7 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statisticsEnterprise/enterpriseFragment.html +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statisticsEnterprise/enterpriseFragment.html @@ -3,7 +3,7 @@
  • -

    +

    • 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 81ccc476..d9bddd5e 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 @@ -84,13 +84,13 @@
    +

    至今：

    - +
  • 导出
    • @@ -182,7 +183,7 @@ field : 'name', title : '区域', formatter:function (value,row,index) { - return ''+value+''; + return ''+value+''; } }, { @@ -316,11 +317,11 @@ $.ajax({ url: prefix + "/type", method: 'GET', - data:params, + //data:params, success:function (response){ $('#bootstrap-table2').bootstrapTable('load', response); var option3 = { - color:['#1874CD','#3A5FCD','#436EEE','#4876FF','#1E90FF'], + /*color:['#1874CD','#3A5FCD','#436EEE','#4876FF','#1E90FF'],*/ tooltip: {}, legend: { data: ['企业类型统计'] diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statisticsWarning/statisticsWarning.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statisticsWarning/statisticsWarning.html index 0cf5198c..f6a82b22 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statisticsWarning/statisticsWarning.html +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statisticsWarning/statisticsWarning.html @@ -17,10 +17,10 @@

    执法部门：

    -
  • +

  • 时段：

    - --> +