From 7fce1827e14e6ae3599d9751b73ae9f197d1c807 Mon Sep 17 00:00:00 2001
From: MonstorUncle <295228902@qq.com>
Date: Sat, 29 Oct 2022 22:04:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=9C=8B=E6=9D=BF=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                    |  1 +
 .../RunMonitor/Views/SmartScreen/Index.cshtml |  6 +-
 WaterCloud.Web/wwwroot/css/smartscreen.css    | 74 ++++++++++++++++---
 3 files changed, 68 insertions(+), 13 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1c144e5..e70004f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -343,3 +343,4 @@ healthchecksdb
 /操作手册
 /WaterCloud.WebApi/DataProtection/key-b88755a6-8db4-4ef4-9e6f-0632160bc5f6.xml
 WaterCloud.WebApi/DataProtection/key-0141591b-0e47-4210-8fca-63db33d568d7.xml
+/WaterCloud.Web/.config
diff --git a/WaterCloud.Web/Areas/RunMonitor/Views/SmartScreen/Index.cshtml b/WaterCloud.Web/Areas/RunMonitor/Views/SmartScreen/Index.cshtml
index fa242fa..db05733 100644
--- a/WaterCloud.Web/Areas/RunMonitor/Views/SmartScreen/Index.cshtml
+++ b/WaterCloud.Web/Areas/RunMonitor/Views/SmartScreen/Index.cshtml
@@ -592,7 +592,7 @@
                         itemGap: 12,
                         bottom: '3%',
 
-                        data: ['热成型', '激光切割', '点焊'],
+                        data: ['冲压', '切割', '点焊'],
                         textStyle: {
                             color: 'rgba(255,255,255,.6)',
                             fontSize: fontSize,
@@ -600,7 +600,7 @@
                     },
                     series: [
                         {
-                            name: '热成型',
+                            name: '冲压',
                             type: 'pie',
                             clockWise: false,
                             center: ['50%', '42%'],
@@ -618,7 +618,7 @@
                             }]
                         },
                         {
-                            name: '激光切割',
+                            name: '切割',
                             type: 'pie',
                             clockWise: false,
                             center: ['50%', '42%'],
diff --git a/WaterCloud.Web/wwwroot/css/smartscreen.css b/WaterCloud.Web/wwwroot/css/smartscreen.css
index fd6b7f6..c491dde 100644
--- a/WaterCloud.Web/wwwroot/css/smartscreen.css
+++ b/WaterCloud.Web/wwwroot/css/smartscreen.css
@@ -9,7 +9,7 @@
 *, body {
     padding: 0px;
     margin: 0px;
-    color: #222;
+    color: #fff;
     font-family: "微软雅黑";
 }
 
@@ -109,9 +109,16 @@ a:hover {
 
 .allnav {
     min-height: 200px;
-    height: 2.3rem
+    height: 2.25rem
+}
+.allnav2 {
+    min-height: 350px;
+    height: 3.9rem
+}
+.allnav3 {
+    min-height: 700px;
+    height: 8.85rem
 }
-
 .loading {
     position: fixed;
     left: 0;
@@ -329,7 +336,6 @@ a:hover {
     padding-top: .2rem;
     padding-bottom: .4rem;
 }
-
 .map {
     position: relative;
     height: 4.6rem;
@@ -620,16 +626,28 @@ a:hover {
     body {
         background: #000d4a;
     }
+    .head h1 {
+        color: #fff;
+        text-align: center;
+        font-size: 20px;
+        line-height:20px;
+    }
+    .alltitle {
+        font-size: 16px;
+        color: #fff;
+        text-align: center;
+        line-height: 16px;
+    }
 }
 .layuimini-site-mobile {
     display: block !important;
     position: absolute;
     z-index: 100000;
-    top: 5px;
-    right: 5px;
-    width: 40px;
-    height: 40px;
-    line-height: 40px;
+    top: 10px;
+    right: 40px;
+    width: 30px;
+    height: 30px;
+    line-height: 30px;
     border-radius: 2px;
     text-align: center;
     background-color: rgba(0, 0, 0, .7);
@@ -643,4 +661,40 @@ a:hover {
 body.demo.layui-layer-content {
     background-color: #c00;
     color: #fff;
-}
\ No newline at end of file
+}
+table{
+
+}
+    table th {
+        font-size: .2rem;
+        text-align: left;
+        border: 1px solid rgba(25,186,139,.17);
+        background:#06c;
+    }
+    table td {
+        font-size: .18rem;
+        text-align: left;
+        border: 1px solid rgba(25,186,139,.17);
+    }
+.textbox{
+}
+    .textbox .textboxheader {
+        font-size: .31rem;
+        color: rgba(255,255,255,.7);
+        padding-top: .2rem;
+        text-align:center;
+    }
+    .textbox .textboxnav {
+        font-size: .5rem;
+        color: #ffeb7b;
+        font-family: electronicFont;
+        font-weight: bold;
+        text-align: center;
+    }
+.half {
+    width: 50%;
+    float: left;
+}
+.layui-layer-dialog .layui-layer-padding {
+    color: black;
+}