From 072c0326cf2fbc3da197d7c12be0751f97d4463e Mon Sep 17 00:00:00 2001
From: chenrui <1950717904@qq.com>
Date: Sat, 2 Nov 2024 20:04:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/static/css/stat1.css   |  6 ++
 .../LawEnforcementWarningList.html            |  2 +-
 .../registrationDetail.html                   |  4 +-
 .../StatisticsWarning/statisticsWarning.html  | 10 +++
 .../code/registration/registration.html       |  4 +-
 .../code/registration/staticRegistration.html |  6 +-
 .../code/statistical/statisticalPanel.html    | 79 +++++++++++++++++++
 7 files changed, 103 insertions(+), 8 deletions(-)

diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/css/stat1.css b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/css/stat1.css
index aa438604..84d9423c 100755
--- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/css/stat1.css
+++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/css/stat1.css
@@ -232,6 +232,7 @@ body {
 	padding-left: 20px;
 }
 
+
 .static-content li label:before {
 	position: absolute;
 	top: 20%;
@@ -243,6 +244,11 @@ body {
 	font-family: 'FontAwesome';
 }
 
+.static-content li span {
+	 margin: 0 5px 0 10px;
+ }
+
+
 .static-content li b {
 	color: #136efb;
 	font-size: 1.5rem;
diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/LawEnforcementWarningList/LawEnforcementWarningList.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/LawEnforcementWarningList/LawEnforcementWarningList.html
index b9509781..3b6e3f06 100644
--- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/LawEnforcementWarningList/LawEnforcementWarningList.html
+++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/LawEnforcementWarningList/LawEnforcementWarningList.html
@@ -114,7 +114,7 @@
                     align: 'center',
                     formatter: function(value, row, index) {
                         var actions = [];
-                        actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="detail(\'' + row.id + '\')"><i class="fa fa-eye"></i>详情</a> ');
+                        actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="detail(\'' + row.id + '\')"><i class="fa fa-eye"></i> 详情</a> ');
                         return actions.join('');
                     }
                 }
diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/LawEnforcementWarningList/registrationDetail.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/LawEnforcementWarningList/registrationDetail.html
index d3d072ad..0ce06a59 100644
--- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/LawEnforcementWarningList/registrationDetail.html
+++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/LawEnforcementWarningList/registrationDetail.html
@@ -113,8 +113,8 @@
                     align: 'center',
                     formatter: function(value, row, index) {
                         var actions = [];
-                        // actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
-                        // actions.push('<a class="btn btn-danger btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.id + '\')"><i class="fa fa-eye"></i>详情</a>');
+                        // actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i> 编辑</a> ');
+                        // actions.push('<a class="btn btn-danger btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.id + '\')"><i class="fa fa-eye"></i> 详情</a>');
                         return actions.join('');
                     }
                 }]
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 a5209188..eb2fcaaf 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
@@ -68,6 +68,16 @@
                             <p th:text="|投诉对象  ${Number2}|"></p>
                         </li>
                     </ul>-->
+                    <div class="static-content">
+                        <ul>
+                            <li id="fragmentW" th:fragment="fragmentW">
+                                <p th:text="|${year}年:|"></p>
+                                <p><label th:text="预警次数"></label><b th:text="${Number1}"></b></p>
+                                <p></i><label th:text="涉事单位"></label><b th:text="${Number2}"></b></p>
+                            </li>
+
+                        </ul>
+                    </div>
                 </div>
             </form>
         </div>
diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/registration.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/registration.html
index 7a1f2ee7..99b772f6 100644
--- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/registration.html
+++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/registration.html
@@ -142,8 +142,8 @@
                                     </li>-->
                                     <li id="a" th:fragment="a">
                                         <p>2024年:</p>
-                                        <p><label th:text="联合检查"></label><b th:text="${unite}"></b></p>
-                                        <p></i><label th:text="${check}"></label><b th:text="${checkNumber}"></b></p>
+                                        <p><label th:text="联合检查"></label><b th:text="${unite}"></b><span th:text="占比"></span><b th:text="${uniteDouble}"></b></p>
+                                        <p><label th:text="${check}"></label><b th:text="${checkNumber}"></b><span th:text="占比"></span><b th:text="${checkDouble}"></b></p>
                                     </li>
 
                                 </ul>
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 ccbb2f4d..27e26b2a 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
@@ -240,7 +240,7 @@
                         align : 'center',
                         formatter:function (value,row,index) {
                             if(value >= 3   && value <= 4){
-                                return "<span style='color: yellow'>"+value+"</span>";
+                                return "<span style='color: #e9af01'>"+value+"</span>";
                             }else{
                                 return "-";
                             }
@@ -252,7 +252,7 @@
                         align : 'center',
                         formatter:function (value,row,index) {
                             if(value >= 5   && value <= 6){
-                                return "<span style='color: orange'>"+value+"</span>";
+                                return "<span style='color: #f97602;font-weight: 600;'>"+value+"</span>";
                             }else{
                                 return "-";
                             }
@@ -264,7 +264,7 @@
                         align : 'center',
                         formatter:function (value,row,index) {
                             if(value >= 7){
-                                return "<span style='color: red'>"+value+"</span>";
+                                return "<span style='color: red;font-weight: 600;'>"+value+"</span>";
                             }else{
                                 return "-";
                             }
diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/statisticalPanel.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/statisticalPanel.html
index d509c102..aaa3ecfe 100644
--- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/statisticalPanel.html
+++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/statisticalPanel.html
@@ -58,7 +58,53 @@
     </style>
 </head>
 <body>
+<form id="formId">
+    <div class="select-list">
+        <ul>
+            <li>
+                <p>时段：</p>
+                <select id="year" name="year">
+                    <!--<option value="2024">2024</option>-->
+                    <option th:each="y:${yearList}" th:text="${y}" th:value="${y}"></option>
+                </select>
+                <select id="dateSearch" name="dateSearch" onchange="timeType()">
+                    <option value="year">年度</option>
+                    <option value="quarter">季度</option>
+                    <option value="month">月度</option>
+                </select>
+                <select id="quarter" name="quarter">
+                    <option value="">所有</option>
+                    <option value="1">第一季度</option>
+                    <option value="2">第二季度</option>
+                    <option value="3">第三季度</option>
+                    <option value="4">第四季度</option>
+                </select>
+                <select id="month" name="month">
+                    <option value="">所有</option>
+                    <option value="01">1月</option>
+                    <option value="02">2月</option>
+                    <option value="03">3月</option>
+                    <option value="04">4月</option>
+                    <option value="05">5月</option>
+                    <option value="06">6月</option>
+                    <option value="07">7月</option>
+                    <option value="08">8月</option>
+                    <option value="09">9月</option>
+                    <option value="10">10月</option>
+                    <option value="11">11月</option>
+                    <option value="12">12月</option>
+                </select>
+            </li>
+            <li>
+                <a class="btn btn-success btn-sm" onclick="searchW()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                <a class="btn btn-reset btn-sm" onclick="restW()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                <a class="btn btn-warning btn-sm" onclick="download1()"><i class="fa fa-download"></i>导出</a>
+            </li>
+        </ul>
+    </div>
+</form>
     <div class="statwrap">
+
         <div class="panel-card">
             <div class="panel-card-top">
                 <div style="font-size: 17px">执法部门数量</div>
@@ -91,5 +137,38 @@
         <div class="panel-card"></div>
         <div class="panel-card"></div>
     </div>
+<th:block th:include="zdxtInclude :: footer" />
+    <script th:inline="javascript">
+        var prefix = ctx + "code/enforcementInspectionProgram";
+        window.onload=function (){
+            wTable();
+            $("#quarter").hide();
+            $("#month").hide();
+        }
+        function restW(){
+            $('form').eq(0).trigger("reset");
+            console.log($.common.formToJSON($('form').eq(0).attr('id')));
+            searchW();
+            timeType();
+        }
+        function timeType() {
+            var dateSearch = document.getElementById("dateSearch");
+            console.log(dateSearch.value)
+            if(dateSearch.value=="quarter"){
+                $("#quarter").show();
+                $("#month").hide();
+                document.getElementById("month").value="";
+            }else if(dateSearch.value=="month"){
+                $("#quarter").hide();
+                document.getElementById("quarter").value="";
+                $("#month").show();
+            }else {
+                $("#quarter").hide();
+                document.getElementById("quarter").value="";
+                $("#month").hide();
+                document.getElementById("month").value="";
+            }
+        }
+    </script>
 </body>
 </html>
\ No newline at end of file