From 2000726aeae69e167461d47c41463d8fac3d8054 Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期一, 09 十月 2023 17:17:51 +0800
Subject: [PATCH] 修改页面

---
 src/main/resources/templates/tr/report/publicity.html |   37 +++++++++++++++++++++----------------
 1 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/src/main/resources/templates/tr/report/publicity.html b/src/main/resources/templates/tr/report/publicity.html
index b0a5c76..179fcb8 100644
--- a/src/main/resources/templates/tr/report/publicity.html
+++ b/src/main/resources/templates/tr/report/publicity.html
@@ -11,21 +11,23 @@
 <body>
 <div class="container">
     <div class="header">
+        <div class="header-cont">
         <div class="header_left row">
             <div class="logo_text">安全管理服务</div>
         </div>
         <div class="header_center">安全信息公示平台</div>
         <div class="header_right">
             <div class="datetime">2019-2020</div>
+            <div class="btn-cont">
             <div class="switch_fullscreen flexNone"><i class="anticon anticon-fullscreen">
-                <svg viewBox="64 64 896 896" fill="currentColor" width="1em" height="1em" data-icon="fullscreen"
+                <svg viewBox="64 64 896 896" fill="currentColor" width="0.8em" height="0.8em" data-icon="fullscreen"
                      aria-hidden="true">
                     <path d="M290 236.4l43.9-43.9a8.01 8.01 0 0 0-4.7-13.6L169 160c-5.1-.6-9.5 3.7-8.9 8.9L179 329.1c.8 6.6 8.9 9.4 13.6 4.7l43.7-43.7L370 423.7c3.1 3.1 8.2 3.1 11.3 0l42.4-42.3c3.1-3.1 3.1-8.2 0-11.3L290 236.4zm352.7 187.3c3.1 3.1 8.2 3.1 11.3 0l133.7-133.6 43.7 43.7a8.01 8.01 0 0 0 13.6-4.7L863.9 169c.6-5.1-3.7-9.5-8.9-8.9L694.8 179c-6.6.8-9.4 8.9-4.7 13.6l43.9 43.9L600.3 370a8.03 8.03 0 0 0 0 11.3l42.4 42.4zM845 694.9c-.8-6.6-8.9-9.4-13.6-4.7l-43.7 43.7L654 600.3a8.03 8.03 0 0 0-11.3 0l-42.4 42.3a8.03 8.03 0 0 0 0 11.3L734 787.6l-43.9 43.9a8.01 8.01 0 0 0 4.7 13.6L855 864c5.1.6 9.5-3.7 8.9-8.9L845 694.9zm-463.7-94.6a8.03 8.03 0 0 0-11.3 0L236.3 733.9l-43.7-43.7a8.01 8.01 0 0 0-13.6 4.7L160.1 855c-.6 5.1 3.7 9.5 8.9 8.9L329.2 845c6.6-.8 9.4-8.9 4.7-13.6L290 787.6 423.7 654c3.1-3.1 3.1-8.2 0-11.3l-42.4-42.4z"></path>
                 </svg>
             </i></div>
 
             <div class="switch_fullscreen flexNone" id="homePage"><i class="anticon anticon-home">
-                <svg viewBox="64 64 896 896" fill="currentColor" width="1em" height="1em" data-icon="home"
+                <svg viewBox="64 64 896 896" fill="currentColor" width="0.8em" height="0.8em" data-icon="home"
                      aria-hidden="true">
                     <path d="M946.5 505L560.1 118.8l-25.9-25.9a31.5 31.5 0 0 0-44.4 0L77.5 505a63.9 63.9 0 0 0-18.8 46c.4 35.2 29.7 63.3 64.9 63.3h42.5V940h691.8V614.3h43.4c17.1 0 33.2-6.7 45.3-18.8a63.6 63.6 0 0 0 18.7-45.3c0-17-6.7-33.1-18.8-45.2zM568 868H456V664h112v204zm217.9-325.7V868H632V640c0-22.1-17.9-40-40-40H432c-22.1 0-40 17.9-40 40v228H238.1V542.3h-96l370-369.7 23.1 23.1L882 542.3h-96.1z">
                     </path>
@@ -35,12 +37,15 @@
             <div class="switch_fullscreen flexNone ant-tooltip-open" id="logout"><i _ngcontent-vjs-c1="" nz-icon=""
                                                                         nztheme="outline" nztype="logout"
                                                                         class="anticon anticon-logout">
-                <svg viewBox="64 64 896 896" fill="currentColor" width="1em" height="1em" data-icon="logout"
+                <svg viewBox="64 64 896 896" fill="currentColor" width="0.8em" height="0.8em" data-icon="logout"
                      aria-hidden="true">
                     <path d="M868 732h-70.3c-4.8 0-9.3 2.1-12.3 5.8-7 8.5-14.5 16.7-22.4 24.5a353.84 353.84 0 0 1-112.7 75.9A352.8 352.8 0 0 1 512.4 866c-47.9 0-94.3-9.4-137.9-27.8a353.84 353.84 0 0 1-112.7-75.9 353.28 353.28 0 0 1-76-112.5C167.3 606.2 158 559.9 158 512s9.4-94.2 27.8-137.8c17.8-42.1 43.4-80 76-112.5s70.5-58.1 112.7-75.9c43.6-18.4 90-27.8 137.9-27.8 47.9 0 94.3 9.3 137.9 27.8 42.2 17.8 80.1 43.4 112.7 75.9 7.9 7.9 15.3 16.1 22.4 24.5 3 3.7 7.6 5.8 12.3 5.8H868c6.3 0 10.2-7 6.7-12.3C798 160.5 663.8 81.6 511.3 82 271.7 82.6 79.6 277.1 82 516.4 84.4 751.9 276.2 942 512.4 942c152.1 0 285.7-78.8 362.3-197.7 3.4-5.3-.4-12.3-6.7-12.3zm88.9-226.3L815 393.7c-5.3-4.2-13-.4-13 6.3v76H488c-4.4 0-8 3.6-8 8v56c0 4.4 3.6 8 8 8h314v76c0 6.7 7.8 10.5 13 6.3l141.9-112a8 8 0 0 0 0-12.6z"></path>
                 </svg>
             </i></div>
+            </div>
         </div>
+        </div>
+        <div class="title-line"></div>
     </div>
     <div class="firstRow">
         <div class="map">
@@ -183,19 +188,6 @@
     </div>
     <div class="endRow">
         <div class="endRow_left">
-            <div class="two_title">风险统计</div>
-            <div style="margin-bottom:0px; flex:1">
-                <div class="chart_card" style="margin: 0;padding: 0; border-width: 13px">
-                        <div id="risk" style="height: 195px"></div>
-                </div>
-            </div>
-            <div style="flex:1">
-                <div class="chart_card" style="margin: 0;padding: 0; border-width: 13px">
-                    <div id="riskPoint" style="height: 195px"></div>
-                </div>
-            </div>
-        </div>
-        <div class="endRow_right">
             <div class="two_title">隐患统计</div>
             <div style="margin-bottom:0px; flex:1;">
                 <div class="chart_card" style="margin: 0;padding: 0; border-width: 13px">
@@ -208,6 +200,19 @@
                 </div>
             </div>
         </div>
+        <div class="endRow_right">
+            <div class="two_title">风险统计</div>
+            <div style="margin-bottom:0px; flex:1">
+                <div class="chart_card" style="margin: 0;padding: 0; border-width: 13px">
+                    <div id="risk" style="height: 195px"></div>
+                </div>
+            </div>
+            <div style="flex:1">
+                <div class="chart_card" style="margin: 0;padding: 0; border-width: 13px">
+                    <div id="riskPoint" style="height: 195px"></div>
+                </div>
+            </div>
+        </div>
     </div>
 
 </div>

--
Gitblit v1.9.2