From f08b12e7d8c4b4d965702f3bd950aa2b56fae94a Mon Sep 17 00:00:00 2001
From: chenrui <1950717904@qq.com>
Date: Sun, 3 Nov 2024 16:46:20 +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   | 38 +++++++-------
 .../code/registration/staticRegistration.html | 24 ++++++---
 .../code/statistical/staticProgram.html       | 49 +++++++++++--------
 .../code/statistical/statisticalPanel.html    | 11 +++--
 .../statisticsEnterprise.html                 | 10 ++--
 5 files changed, 78 insertions(+), 54 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 828f4a79..7611078b 100755
--- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/css/stat1.css
+++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/css/stat1.css
@@ -208,11 +208,22 @@ body {
 
 .chart-box {
     float: left;
-    margin: 1% 5%;
+    margin: 1% 2%;
     width: 45%;
     height: 45%;
 }
 
+.chart-box h3 {
+    position: relative;
+    color: #333;
+    font-size: 1.5rem;
+}
+
+.chart-box .echarts {
+    width: 100%;
+    height: 80%;
+}
+
 .static-content {
     float: left;
     clear: both;
@@ -229,7 +240,7 @@ body {
     padding-left: 20px;
 }
 
-.static-content li label:before {
+.static-content li label:before, .chart-box h3::before {
     position: absolute;
     top: 20%;
     left: -5px;
@@ -240,11 +251,15 @@ body {
     font-family: 'FontAwesome';
 }
 
+.chart-box h3::before {
+    top: 25%;
+    left: -25px;
+}
+
 .static-content li span {
     margin: 0 5px 0 10px;
 }
 
-
 .static-content li b {
     color: #136efb;
     font-size: 1.5rem;
@@ -275,20 +290,3 @@ h1.page-title {
     background-color: #ccc;
 }
 
-.tab_item2 {
-    /*position: absolute;*/
-    z-index: -9999;
-    width: 100%;
-    height: 100%;
-    display: flex;
-    flex-wrap: wrap;
-    align-content: space-around;
-    justify-content: center
-
-}
-
-.tab_item2 .echarts {
-    width: 45%;
-    height: 45%;
-}
-
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 27e26b2a..360faea9 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
@@ -8,9 +8,12 @@
             position: absolute;
             top: 27%;
             left: 30%;
+            padding: 2%;
             width: 40%;
-            height: 25%;
-            background-color: azure;
+            min-height: 25%;
+            background-color: #fff;
+            border-radius: 5px;
+            box-shadow: 0 0 10px #ddd;
         }
         #showDetail table {
             border-collapse: separate;
@@ -41,12 +44,21 @@
         }
         #detail-close{
             position: absolute;
-            color: red;
-            width: 10px;
-            top: -4%;
+            top: -5%;
             right: -1%;
+            width: 30px;
+            height: 30px;
+            background-color: #fff;
+            color: #999;
             cursor: pointer;
+            font-size: 24px;
+            font-family: sans-serif;
+            border-radius: 50%;
+            box-shadow: 0 0 5px #999;
+            text-align: center;
+            line-height: 25px;
         }
+
     </style>
 </head>
 <body class="gray-bg">
@@ -132,7 +144,7 @@
             </div>
 
             <div id="showDetail" class="detail-list">
-                <div id="detail-close" style="color: red" onclick="closeDetail()">x</div>
+                <span id="detail-close" onclick="closeDetail()">×</span>
                 <table>
                     <thead>
                         <tr>
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 a61a2fb4..a1fd2d3d 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
@@ -1,7 +1,8 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
         "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
-<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<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 :: datetimepicker-css" />
@@ -58,19 +59,20 @@
                                         <a class="btn btn-reset btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
                                     </li>
                                 </ul>
+                                <div class="static-content">
+                                    <ul>
+                                        <li id="b">
+                                            <p><span id="yearDate">2024</span>:</p>
+                                            <p><label>年度计划</label><b><span id="yearTotal">0</span></b></p>
+                                            <p><label>季度计划</label><b><span id="quarterTotal">0</span></b></p>
+                                            <p><label>月度计划</label><b><span id="monthTotal">0</span></b></p>
+                                        </li>
+
+                                    </ul>
+                                </div>
                             </div>
 
-                            <div class="static-content">
-                                <ul>
-                                    <li id="b">
-                                        <p><span id="yearDate">2024</span>:</p>
-                                        <p><label>年度计划：</label><b><span id="yearTotal">0</span></b></p>
-                                        <p><label>季度计划：</label><b><span id="quarterTotal">0</span></b></p>
-                                        <p><label>月度计划：</label><b><span id="monthTotal">0</span></b></p>
-                                    </li>
 
-                                </ul>
-                            </div>
                         </form>
                     </div>
 
@@ -80,7 +82,7 @@
                 </div>
             </div>
         </div>
-        <div id="con_one_2" class="tab_item2">
+        <div id="con_one_2" class="tab_item">
             <!--<div class="tab_cont">
                 <div class="listhead">
                     <table width="100%" border="0" cellpadding="0" cellspacing="0" class="desktab">
@@ -107,15 +109,22 @@
                 </div>
             </div>
             <div class="chartbox" id="echartRing"></div>-->
-            <div class="echarts" id="echars1">
-                <div style="width: 20%;height: 5%">
-                    <span>2024</span>检查计划总数量排行
-                </div>
+            <div class="chart-box">
+                <h3>2024年检查计划总数量排行（TOP10）</h3>
+                <div class="echarts" id="echars1"></div>
+            </div>
+            <div class="chart-box">
+                <h3>2024年年度检查计划排行（TOP10）</h3>
+                <div class="echarts" id="echars2"></div>
+            </div>
+            <div class="chart-box">
+                <h3>2024年季度检查计划排行（TOP10）</h3>
+                <div class="echarts" id="echars3"></div>
+            </div>
+            <div class="chart-box">
+                <h3>2024年月度检查计划排行（TOP10）</h3>
+                <div class="echarts" id="echars4"></div>
             </div>
-            <div class="echarts" id="echars2"></div>
-            <div class="echarts" id="echars3"></div>
-            <div class="echarts" id="echars4"></div>
-
         </div>
    </div>
 </div>
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 e2cf0c05..ee41dc55 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
@@ -8,7 +8,7 @@
     <th:block th:include="zdxtInclude :: header('综合分析')"/>
     <th:block th:include="zdxtInclude :: datetimepicker-css" />
     <link type="text/css" href="/css/stat1.css" rel="stylesheet"/>
-    <style type="text/css">
+    <style>
         .statwrap .panel-card{
             width: 32%;
             height: 35%;
@@ -57,8 +57,8 @@
             display: flex;
             flex-direction: column;
             justify-content: space-around;
-            margin-left: -5%;
-            width: 35%;
+            margin-left: -3%;
+            width: 45%;
             height: 52%;
             border-right: 1px solid #eee;
         }
@@ -140,9 +140,14 @@
             font-size: 1.5rem;
         }
 
+        .select-list {
+            float: right;
+            margin: 2% 1% 1% 0;
+        }
     </style>
 </head>
 <body>
+<h1 class="page-title">综合统计分析</h1>
 <form id="formId">
     <div class="select-list">
         <ul>
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 3545826d..7149dbf3 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
@@ -120,7 +120,7 @@
                                 <p th:text="|占比总计  ${number3}|"></p>
                             </li>
                         </ul>-->
-                        <div class="static-content">
+                        <div class="static-content" style="margin: 1% 0;">
                             <ul>
                                 <li id="enterpriseFragment" th:fragment="enterpriseFragment">
                                     <p th:text="|${year}年:|"></p>
@@ -226,7 +226,7 @@
     });*/
     $(function() {
         var options2 = {
-            modalName: "投诉类型统计",
+            modalName: "企业类型统计",
             showHeader: true,
             showFooter: false,
             showColumns: false,
@@ -312,13 +312,13 @@
                     color:['#1874CD','#3A5FCD','#436EEE','#4876FF','#1E90FF'],
                     tooltip: {},
                     legend: {
-                        data: ['投诉类型统计']
+                        data: ['企业类型统计']
                     },
                     series: [
                         {
-                            name: '投诉类型统计',
+                            name: '企业类型统计',
                             type: 'pie',
-                            radius: ['40%', '70%'],
+                            radius: ['30%', '50%'],
                             data: response,
                             label: {
                                 show: true,