From c85dd597e1484ccc131bfe4147cc766194b6873b Mon Sep 17 00:00:00 2001
From: vincent <1341870251@qq.com>
Date: 星期六, 30 五月 2020 11:13:31 +0800
Subject: [PATCH] #

---
 src/main/webapp/views/console.html     |   83 ++++++++++++++++++++++++-----------------
 src/main/webapp/static/css/console.css |    8 ++++
 2 files changed, 57 insertions(+), 34 deletions(-)

diff --git a/src/main/webapp/static/css/console.css b/src/main/webapp/static/css/console.css
index f7c83d9..aa62a3a 100644
--- a/src/main/webapp/static/css/console.css
+++ b/src/main/webapp/static/css/console.css
@@ -72,6 +72,14 @@
     border: none;
     background-color: transparent;
 }
+/* 鑷姩 */
+.site-auto {
+    background-color: rgb(42,253,47);
+}
+/* 闈炶嚜鍔�/鏀跺埌 */
+.site-unauto {
+    background-color: #aaaaaa;
+}
 
 /* ------------------ 璐ф灦鎬绘垚 ------------------ */
 .main-part {
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index 2a05660..a45a316 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -18,6 +18,14 @@
             opacity: 0.8;
             position: relative;
         }
+        /* 鍒嗗壊绾� */
+        .header-hr {
+            border-radius: 5px;
+            border: 1px solid #777;
+            width: 80%;
+            position: absolute;
+            bottom: 0;
+        }
         /* 绯荤粺杩愯鐘舵�� */
         .system-state {
             float: left;
@@ -38,6 +46,7 @@
 
         /* 鐘舵�佹樉绀� */
         .data-window {
+            float: left;
             width: 70%;
             text-align: center;
         }
@@ -47,16 +56,18 @@
             letter-spacing: 1px;
             font-weight: inherit;
         }
-        .crn-label, .site-label {
-            display: inline-block;
-            width: 15%;
-            text-align: right;
-            margin-bottom: 5px;
-            font-size: 13px;
-        }
+
         /* 鍫嗗灈鏈虹姸鎬� */
         .crn-state-group {
             text-align: left;
+            font-size: 12px;
+        }
+        .crn-label {
+            float: left;
+            width: 20%;
+            text-align: right;
+            margin-bottom: 5px;
+            font-size: 13px;
         }
         .crn-state {
             display: inline-block;
@@ -64,25 +75,22 @@
             text-align: center;
         }
         /* 绔欑偣鐘舵�� */
+        .site-label {
+            width: 20%;
+            text-align: right;
+            margin-bottom: 5px;
+            font-size: 13px;
+        }
         .site-state-group {
+            display: inline-block;
             text-align: left;
         }
-        .site-state {
-            display: inline-block;
-            width: 50px;
-            text-align: center;
-        }
-
-
-
-
-        /* 鍒嗗壊绾� */
-        .header-hr {
-            border-radius: 5px;
-            border: 1px solid #777;
-            width: 80%;
-            position: absolute;
-            bottom: 0;
+        .site-state-group .site {
+            float: left;
+            height: 22px;
+            width: auto;
+            padding: 0 10px;
+            border: none;
         }
 
     </style>
@@ -97,17 +105,24 @@
 
     <!-- 淇℃伅灞曠ず -->
     <div class="data-window">
-        <h1>鑷姩浠撳簱 WCS 鐩戞帶鍥�</h1>
-        <!--&lt;!&ndash;<div class="crn-state-group">&ndash;&gt;-->
-            <!--&lt;!&ndash;<label class="crn-label">鍫嗗灈鏈虹姸鎬侀鑹�:</label>&ndash;&gt;-->
-            <!--&lt;!&ndash;<span class="crn-state" style="background-color: #21ff3a">鑷姩</span>&ndash;&gt;-->
-            <!--&lt;!&ndash;<span class="crn-state" style="background-color: red">寮傚父</span>&ndash;&gt;-->
-        <!--&lt;!&ndash;</div>&ndash;&gt;-->
-        <!--&lt;!&ndash;<div class="site-state-group">&ndash;&gt;-->
-            <!--&lt;!&ndash;<label class="site-label">杈撻�佽澶囩姸鎬侀鑹�:</label>&ndash;&gt;-->
-            <!--&lt;!&ndash;<span class="site-state" style="background-color: #21ff3a;">鑷姩</span>&ndash;&gt;-->
-            <!--&lt;!&ndash;<span class="site-state" style="background-color: red;">寮傚父</span>&ndash;&gt;-->
-        <!--&lt;!&ndash;</div>&ndash;&gt;-->
+        <h1>鑷姩浠撳簱&nbsp;WCS&nbsp;鐩戞帶鍥�</h1>
+
+        <div>
+            <label class="crn-label">鍫嗗灈鏈虹姸鎬侀鑹�:</label>
+            <div class="crn-state-group">
+                <span class="crn-state" style="background-color: #21ff3a">鑷姩</span>
+                <span class="crn-state" style="background-color: red">寮傚父</span>
+            </div>
+        </div>
+
+        <div>
+            <label class="site-label">杈撻�佽澶囩姸鎬侀鑹�:</label>
+            <div class="site-state-group">
+                <div class="site site-auto">鑷姩</div>
+                <div class="site site-unauto">闈炶嚜鍔�/鎵嬪姩</div>
+            </div>
+        </div>
+
     </div>
 
     <!--鍒嗗壊绾�-->

--
Gitblit v1.9.1