From 85af02c8e04b4b29aff22209f5e228109738aeaf Mon Sep 17 00:00:00 2001
From: meizf <48540969@qq.com>
Date: Thu, 27 Nov 2025 11:47:37 +0800
Subject: [PATCH] =?UTF-8?q?1.=E9=A1=B5=E9=9D=A2=E6=95=B0=E6=8D=AE=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9=202.=E6=A3=80?=
 =?UTF-8?q?=E6=9F=A5=E8=AE=A1=E5=88=92=E7=BB=9F=E8=AE=A1=E5=B9=B4=E5=AD=A3?=
 =?UTF-8?q?=E6=9C=88=E7=BB=9F=E8=AE=A1=E5=9B=BE=E8=A1=A8=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../code/complaintStatic/complaintStatic.html |  4 +-
 .../project/code/deptStatic/deptStatic.html   |  2 +-
 .../code/registration/registerView.html       |  6 +-
 .../code/registration/registration.html       | 27 ++------
 .../code/statistical/staticProgram.html       | 62 +++++++++++++++----
 .../statisticsEnterprise.html                 |  2 +-
 6 files changed, 64 insertions(+), 39 deletions(-)

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 0f18a0ff..0a90fa24 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
@@ -112,7 +112,7 @@
                         <div class="static-content">
                             <ul>
                                 <li id="complaintA" th:fragment="complaintA">
-                                    <p><span id="timeString"></span></p>
+                                    <p><span id="timeString" style="margin: 0"></span>：</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>
@@ -183,7 +183,7 @@
                             <ul>
                                 <li id="complaintB" th:fragment="complaintB">
 <!--                                    <p><span th:text="|${year}年:|"></span></p>-->
-                                    <p><span id="timeString2"></span></p>
+                                    <p><span id="timeString2" style="margin: 0"></span>：</p>
                                     <p><label th:text="总数量"></label><b th:text="${Number3}"></b></p>
                                     <p><label th:text="投诉数量"></label><b th:text="${Number3}"></b></p>
                                     <p></i><label th:text="占比总计"></label><b th:text="${dou}"></b></p>
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 428bb986..114e139e 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
@@ -40,7 +40,7 @@
                     <div class="static-content">
                         <ul>
                             <li id="b" th:fragment="b">
-                                <p>全市:</p>
+                                <p>全市：</p>
                                 <p><label th:text="执法单位"></label><b th:text="${deptNumber}"></b></p>
                                 <p></i><label th:text="执法人员"></label><b th:text="${lawNumber}"></b></p>
                             </li>
diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/registerView.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/registerView.html
index a17930d7..38ae7a73 100644
--- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/registerView.html
+++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/registerView.html
@@ -37,9 +37,9 @@
                         <div class="static-content">
                             <ul>
                                 <li id="b">
-                                    <p>近30天</p>
-                                    <p><label>被执法企业数量</label><b id="warnEn"></b> 家</p>
-                                    <p><label>总执法次数</label><b id="warnCount"></b> 次</p>
+                                    <p>近30天：</p>
+                                    <p><label>被执法企业数量</label><b id="warnEn"></b></p>
+                                    <p><label>总执法次数</label><b id="warnCount"></b></p>
                                 </li>
                             </ul>
                         </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 6acc7ff9..141a6f74 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
@@ -167,7 +167,7 @@
                                         <p th:text="|占比  ${checkDouble}|"></p>
                                     </li>-->
                                     <li id="a" th:fragment="a">
-                                        <p><span id="timeString"></span></p>
+                                        <p><span id="timeString" style="margin: 0"></span>：</p>
                                         <p><label th:text="涉企执法总数"></label><b th:text="${total}"></b></p>
                                         <p><label th:text="${check}"></label><b th:text="${checkNumber}"></b><span th:text="占比"></span><b th:text="${checkDouble}"></b></p>
                                     </li>
@@ -243,7 +243,7 @@
                                     </ul>
                                 </div>
                             </form>
-                            <div id="echartRegistration" style="width: 600px;height:300px;"></div>
+                            <div id="echartRegistration" style="width: 750px;height:300px;"></div>
                         </div>
                         <!--<div class="chart-box" id="container1" style="width: 600px; height: 600px;"></div>
                         <div class="chart-box" id="container2" style="width: 500px; height: 500px;"></div>
@@ -251,15 +251,15 @@
                         <div class="chart-box" id="container4" style="width: 500px; height: 500px;"></div>-->
                         <div class="chart-box">
                             <h3 class="chart-title"><span id="echarts2-title" class="chart-title"></span>执法数量排行（TOP10）</h3>
-                            <div class="echarts" id="echarts2" style="width: 800px; height: 300px;"></div>
+                            <div class="echarts" id="echarts2" style="width: 750px; height: 300px;"></div>
                         </div>
                         <div class="chart-box">
                             <h3 class="chart-title"><span id="echarts3-title" class="chart-title"></span>执法数量排行（TOP10）</h3>
-                            <div class="echarts" id="echarts3" style="width: 600px; height: 300px;"></div>
+                            <div class="echarts" id="echarts3" style="width: 750px; height: 300px;"></div>
                         </div>
                         <div class="chart-box">
                             <h3 class="chart-title"><span id="echarts4-title" class="chart-title"></span>执法数量排行（TOP10）</h3>
-                            <div class="echarts" id="echarts4" style="width: 800px; height: 300px;"></div>
+                            <div class="echarts" id="echarts4" style="width: 750px; height: 300px;"></div>
                         </div>
                     </div>
                 </div>
@@ -742,11 +742,6 @@
                                 textStyle: {
                                     color: 'rgba(0,0,0,.5)'
                                 },
-                                formatter: function (value) {
-                                    // 设定一个最大长度，例如10个字符
-                                    const maxLength = 6;
-                                    return value.length > maxLength ? value.slice(0, maxLength) + '...' : value;
-                                }
                             },
                             splitLine:{
                                 lineStyle:{
@@ -863,12 +858,7 @@
                                 textStyle: {
                                     color: 'rgba(0,0,0,.5)'
                                 },
-                                formatter: function (value) {
-                                    // 设定一个最大长度，例如10个字符
-                                    const maxLength = 6;
-                                    return value.length > maxLength ? value.slice(0, maxLength) + '...' : value;
-                                }
-                            },
+                               },
                             splitLine:{
                                 lineStyle:{
                                     color:['#f2f2f2'],
@@ -985,11 +975,6 @@
                                 textStyle: {
                                     color: 'rgba(0,0,0,.5)'
                                 },
-                                formatter: function (value) {
-                                    // 设定一个最大长度，例如10个字符
-                                    const maxLength = 6;
-                                    return value.length > maxLength ? value.slice(0, maxLength) + '...' : value;
-                                }
                             },
                             splitLine:{
                                 lineStyle:{
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 6fced1f7..de20d9a4 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,6 +28,7 @@
             <div class="container-div">
                 <div class="row">
                     <div class="col-sm-12 search-collapse">
+
                         <form id="formId">
                             <input type="hidden" id="timeType" name="timeType"/>
                             <input type="hidden" id="bureauDeptId" name="bureauDeptId"/>
@@ -87,7 +88,7 @@
                                 <div class="static-content">
                                     <ul>
                                         <li id="b">
-                                            <p><span id="timeString"></span>:</p>
+                                            <p><span id="timeString" style="margin: 0"></span>：</p>
                                             <p><label>计划总数</label><b><span id="total">0</span></b></p>
                                             <p><label>年度计划</label><b><span id="yearTotal">0</span></b></p>
                                             <p><label>季度计划</label><b><span id="quarterTotal">0</span></b></p>
@@ -141,7 +142,7 @@
             </div>
         </div>
    </div>
-</div>
+<!--</div>-->
 <script type="text/javascript" src="/js/echarts.min.js"></script>
 <th:block th:include="zdxtInclude :: footer"/>
 <th:block th:include="zdxtInclude :: datetimepicker-js" />
@@ -678,9 +679,12 @@
                             data:xdata,
                             axisLabel: {
                                 show: true,
-                                rotate: '30',
-                                textStyle: {
-                                    color: 'rgba(0,0,0,.5)'
+                                interval: 0,
+                                rotate:  30,
+                                formatter: function (value) {
+                                    // 设定一个最大长度，例如10个字符
+                                    const maxLength = 6;
+                                    return value.length > maxLength ? value.slice(0, maxLength) + '...' : value;
                                 }
                             },
                             splitLine:{
@@ -742,6 +746,12 @@
                                         ]
                                     )
                                 }},
+                            label: {
+                                normal: {
+                                    show: true, //是否显示标签
+                                    position: 'outside', //标签的位置。
+                                }
+                            },
                             data:ydata,
                         },
                     ]
@@ -823,9 +833,12 @@
                            data:xdata,
                            axisLabel: {
                                show: true,
-                               rotate: '30',
-                               textStyle: {
-                                   color: 'rgba(0,0,0,.5)'
+                               interval: 0,
+                               rotate:  30,
+                               formatter: function (value) {
+                                   // 设定一个最大长度，例如10个字符
+                                   const maxLength = 6;
+                                   return value.length > maxLength ? value.slice(0, maxLength) + '...' : value;
                                }
                            },
                            splitLine:{
@@ -887,6 +900,12 @@
                                        ]
                                    )
                                }},
+                           label: {
+                               normal: {
+                                   show: true, //是否显示标签
+                                   position: 'outside', //标签的位置。
+                               }
+                           },
                            data:ydata1,
                        },
                        {
@@ -910,6 +929,12 @@
                                        ]
                                    )
                                }},
+                           label: {
+                               normal: {
+                                   show: true, //是否显示标签
+                                   position: 'outside', //标签的位置。
+                               }
+                           },
                            data:ydata2,
                        },
                        {
@@ -934,6 +959,12 @@
                                        ]
                                    )
                                }},
+                           label: {
+                               normal: {
+                                   show: true, //是否显示标签
+                                   position: 'outside', //标签的位置。
+                               }
+                           },
                            data:ydata3,
                        },
                        {
@@ -957,6 +988,12 @@
                                        ]
                                    )
                                }},
+                           label: {
+                               normal: {
+                                   show: true, //是否显示标签
+                                   position: 'outside', //标签的位置。
+                               }
+                           },
                            data:ydata4,
                        },
                    ]
@@ -1063,9 +1100,12 @@
                             data:xdata,
                             axisLabel: {
                                 show: true,
-                                rotate: '30',
-                                textStyle: {
-                                    color: 'rgba(0,0,0,.5)'
+                                interval: 0,
+                                rotate:  30,
+                                formatter: function (value) {
+                                    // 设定一个最大长度，例如10个字符
+                                    const maxLength = 6;
+                                    return value.length > maxLength ? value.slice(0, maxLength) + '...' : value;
                                 }
                             },
                             splitLine:{
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 59cccf73..1731cc86 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
@@ -161,7 +161,7 @@
                             <ul>
                                 <li id="enterpriseFragment" th:fragment="enterpriseFragment">
                                     <!--<p><span th:text="|${year}年:|"></span></p>-->
-                                    <p><span>至今：</span></p>
+                                    <p><span style="margin: 0">至今：</span></p>
                                     <p><label th:text="企业数量"></label><b th:text="${number2}"></b></p>
                                     <p></i><label th:text="占比总计"></label><b th:text="${number3}"></b></p>
                                 </li>