From afd1187f44b00693d03ecc9c8767845b29b3f663 Mon Sep 17 00:00:00 2001
From: chenrui <1950717904@qq.com>
Date: Tue, 5 Nov 2024 15:21:33 +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          |  1 +
 .../src/main/resources/static/css/style.css          |  6 ++++++
 .../code/complaintStatic/complaintStatic.html        |  4 ++--
 .../project/code/deptStatic/deptStatic.html          |  2 +-
 .../project/code/registration/registration.html      |  2 +-
 .../code/registration/staticRegistration.html        |  2 +-
 .../project/code/statistical/staticProgram.html      |  5 +++--
 .../project/code/statistical/statisticalPanel.html   |  8 ++++----
 .../statisticsEnterprise/statisticsEnterprise.html   | 12 ++++++------
 .../templates/project/message/info/info.html         |  2 +-
 10 files changed, 26 insertions(+), 18 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 7611078b..e51c85a8 100755
--- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/css/stat1.css
+++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/css/stat1.css
@@ -274,6 +274,7 @@ h1.page-title {
 }
 
 
+
 /** 滚动条样式 **/
 ::-webkit-scrollbar-track {
     background-color: #F5F5F5;
diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/css/style.css b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/css/style.css
index a096918f..ffc3e125 100644
--- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/css/style.css
+++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/css/style.css
@@ -7405,4 +7405,10 @@ td .btn-primary, td .btn-success, td .btn-danger, td .btn-info, td .btn-reset, t
 .form-control[disabled], .form-control[readonly], fieldset[disabled] .form-control, .select2-container--bootstrap.select2-container--disabled .select2-selection, .select2-container--bootstrap.select2-container--disabled .select2-selection--multiple .select2-selection__choice {
     opacity: 0.7;
     border-color: #e5e6e7 !important;
+}
+
+/********* table style *******/
+
+tbody tr:nth-child(even) {
+    background: #f8fdff;
 }
\ No newline at end of file
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 7d290722..95c6a477 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
@@ -86,7 +86,7 @@
                             <li>
                                 <a class="btn btn-success btn-sm" onclick="searchComplaint1()"><i class="fa fa-search"></i>&nbsp;搜索</a>
                                 <a class="btn btn-reset btn-sm" onclick="complaintRest(1)"><i class="fa fa-refresh"></i>&nbsp;重置</a>
-                                <a class="btn btn-warning btn-sm" onclick="complaintDownload1()"><i class="fa fa-download"></i>导出</a>
+                                <a class="btn btn-warning btn-sm" onclick="complaintDownload1()"><i class="fa fa-share-square-o"></i> 导出</a>
                                 <a id="closeButton" onclick="closeC()">关闭</a>
                             </li>
                             <!--<ul>
@@ -157,7 +157,7 @@
                             <li>
                                 <a class="btn btn-success btn-sm" onclick="searchComplaint('form',2)"><i class="fa fa-search"></i>&nbsp;搜索</a>
                                 <a class="btn btn-reset btn-sm" onclick="complaintRest(2)"><i class="fa fa-refresh"></i>&nbsp;重置</a>
-                                <a class="btn btn-warning btn-sm" onclick="complaintDownload(2)"><i class="fa fa-download"></i>下载</a>
+                                <a class="btn btn-warning btn-sm" onclick="complaintDownload(2)"><i class="fa fa-share-square-o"></i> 导出</a>
                             </li>
                         </ul>
                         <!--<ul>
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 d3b2b3c9..c38ecff2 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
@@ -28,7 +28,7 @@
                         <li>
                             <a class="btn btn-success btn-sm" onclick="deptSearch()"><i class="fa fa-search"></i>&nbsp;搜索</a>
                             <a class="btn btn-reset btn-sm" onclick="deptRest()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
-                            <a class="btn btn-warning btn-sm" onclick="download1()"><i class="fa fa-download"></i>导出</a>
+                            <a class="btn btn-warning btn-sm" onclick="download1()"><i class="fa fa-share-square-o"></i> 导出</a>
                         </li>
                     </ul>
                     <!--<ul>
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 539d9f96..7e8d06cd 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
@@ -129,7 +129,7 @@
                                 <li>
                                     <a class="btn btn-success btn-sm" onclick="search1()"><i class="fa fa-search"></i>&nbsp;搜索</a>
                                     <a class="btn btn-reset btn-sm" onclick="rest1()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
-                                    <a class="btn btn-warning btn-sm" onclick="download1()"><i class="fa fa-download"></i>导出</a>
+                                    <a class="btn btn-warning btn-sm" onclick="download1()"><i class="fa fa-share-square-o"></i> 导出</a>
                                 </li>
                             </ul>
                             <div class="static-content">
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 28a08b44..3dcf0b33 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
@@ -140,7 +140,7 @@
                             <li>
                                 <a class="btn btn-success btn-sm" onclick="search1()"><i class="fa fa-search"></i>&nbsp;搜索</a>
                                 <a class="btn btn-reset btn-sm" onclick="resetR()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
-                                <a class="btn btn-warning btn-sm" onclick="download1()"><i class="fa fa-download"></i>下载</a>
+                                <a class="btn btn-warning btn-sm" onclick="download1()"><i class="fa fa-share-square-o"></i> 导出</a>
                             </li>
                         </ul>
                     </div>
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 e16d7742..42ae6325 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
@@ -4,9 +4,9 @@
 <html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro"
       xmlns="http://www.w3.org/1999/html">
 <head>
-    <th:block th:include="zdxtInclude :: header('检查计划统计')"/>
+    <th:block th:include="zdxtInclude :: header('检查计划统计')" />
     <th:block th:include="zdxtInclude :: datetimepicker-css" />
-    <link type="text/css" href="/css/stat1.css" rel="stylesheet"/>
+    <link type="text/css" href="/css/stat1.css" rel="stylesheet" />
 </head>
 
 <body>
@@ -89,6 +89,7 @@
                                             <option value="12">12月</option>
                                         </select>
                                     </li>
+                                    <li>
                                         <a class="btn btn-success btn-sm" onclick="query()"><i class="fa fa-search"></i>&nbsp;搜索</a>
                                         <a class="btn btn-reset btn-sm" onclick="resetP()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
                                     </li>
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 f439156c..83988403 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
@@ -188,7 +188,7 @@
             <li>
                 <a class="btn btn-success btn-sm" onclick="searchP()"><i class="fa fa-search"></i>&nbsp;搜索</a>
                 <a class="btn btn-reset btn-sm" onclick="restP()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
-                <a class="btn btn-warning btn-sm" onclick="download1()"><i class="fa fa-download"></i>导出</a>
+                <a class="btn btn-warning btn-sm" onclick="download1()"><i class="fa fa-share-square-o"></i> 导出</a>
             </li>
         </ul>
     </div>
@@ -350,7 +350,7 @@
                 </div>
             </div>
             <div class="panel-card-bottom">
-                <div class="panel-card-right">
+                <div class="panel-card-left">
                     <div class="cont-title">涉事单位数量</div>
                     <div class="cont-total"><b><span id="warn-qy-total" class="data-change">--</span></b><span>家</span></div>
                     <div class="percent-tag">
@@ -360,7 +360,7 @@
                         <span class="data-change" id="warn-qy-huan">--</span><label id="warn-qy-huan-timeType">较上年</label>
                     </div>
                 </div>
-                <div class="panel-card-left">
+                <div class="panel-card-right">
                     <div class="cont-title">本部门发布预警数量</div>
                     <div class="cont-total"><b><span id="warn-dw-total"></span></b><span>次</span></div>
                     <div class="percent-tag">
@@ -404,7 +404,7 @@
                 </div>
                 <div class="panel-card-right">
                     <div class="cont-title">投诉企业数量</div>
-                    <div class="cont-total"><b><span id="complaint-dw-total"></span></b><span>件</span></div>
+                    <div class="cont-total"><b><span id="complaint-dw-total"></span></b><span>家</span></div>
                     <div class="percent-tag">
 <!--                        <span class="data-fall">&#8595</span>-->
 <!--                        <span class="data-fall" id="complaint-dw-huan-top">&#8595</span>-->
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 d9bddd5e..1c39fc53 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
@@ -3,8 +3,8 @@
 
 <html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 <head>
-    <th:block th:include="include :: header('企业统计')"/>
-    <link type="text/css" href="/css/stat1.css" rel="stylesheet"/>
+    <th:block th:include="include :: header('企业统计')" />
+    <link type="text/css" href="/css/stat1.css" rel="stylesheet" />
     <style>
         .tab-content {
             display: none;
@@ -58,8 +58,8 @@
                         <li>
                             <a class="btn btn-success btn-sm" onclick="searchE()"><i class="fa fa-search"></i>&nbsp;搜索</a>
                             <a class="btn btn-reset btn-sm" onclick="restE()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
-                            <a class="btn btn-warning btn-sm" onclick="complaintDownload1()"><i class="fa fa-download"></i>导出</a>
-                            <a id="closeButton" onclick="closeE()">返回</a>
+                            <a class="btn btn-warning btn-sm" onclick="complaintDownload1()"><i class="fa fa-share-square-o"></i> 导出</a>
+                            <a class="btn btn-info btn-sm" id="closeButton" onclick="closeE()"><i class="fa fa-reply"></i> 返回</a>
                         </li>
                     </ul>
                     <div class="static-content">
@@ -121,7 +121,7 @@
                             <!--<li>
                                 <a class="btn btn-success btn-sm" onclick="eSearch2()"><i class="fa fa-search"></i>&nbsp;搜索</a>
                                 <a class="btn btn-reset btn-sm" onclick="eRest2()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
-                                <a class="btn btn-warning btn-sm" onclick="complaintDownload(2)"><i class="fa fa-download"></i>下载</a>
+                                <a class="btn btn-warning btn-sm" onclick="complaintDownload(2)"><i class="fa fa-share-square-o"></i> 导出</a>
                             </li>-->
                         </ul>
                         <!--<ul>
@@ -139,7 +139,7 @@
                                     <p><label th:text="企业数量"></label><b th:text="${number2}"></b></p>
                                     <p></i><label th:text="占比总计"></label><b th:text="${number3}"></b></p>
                                 </li>
-                                <li><a class="btn btn-warning btn-sm" onclick="complaintDownload(2)"><i class="fa fa-download"></i>导出</a></li>
+                                <li><a class="btn btn-warning btn-sm" onclick="complaintDownload(2)"><i class="fa fa-share-square-o"></i> 导出</a></li>
                             </ul>
                         </div>
                     </div>
diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/message/info/info.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/message/info/info.html
index c8c29337..49960eed 100644
--- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/message/info/info.html
+++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/message/info/info.html
@@ -42,7 +42,7 @@
                     <i class="fa fa-remove"></i> 删除
                 </a>
             <!--    <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:info:export">
-                    <i class="fa fa-download"></i> 导出
+                    <i class="fa fa-share-square-o"></i> 导出
                  </a>-->
             </div>
             <div class="col-sm-12 select-table table-bordered">