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/main.html |   47 ++++++++++++++++++++++++++---------------------
 1 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/src/main/resources/templates/main.html b/src/main/resources/templates/main.html
index 344efc5..b9eabfb 100644
--- a/src/main/resources/templates/main.html
+++ b/src/main/resources/templates/main.html
@@ -106,14 +106,16 @@
     <th:block th:include="include :: publicity-css"/>
 </head>
 <body>
-<div class="container" style="height: 850px!important;">
+<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"
                      aria-hidden="true">
@@ -121,13 +123,13 @@
                 </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"
-                     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>
-                </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"-->
+<!--                     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>-->
+<!--                </svg>-->
+<!--            </i></div>-->
 
             <div class="switch_fullscreen flexNone ant-tooltip-open" id="logout"><i _ngcontent-vjs-c1="" nz-icon=""
                                                                                     nztheme="outline" nztype="logout"
@@ -137,7 +139,10 @@
                     <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="rowCenter">
@@ -281,19 +286,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">
@@ -306,6 +298,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