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

---
 src/main/webapp/views/console.html |  117 +++++++++++++++-------------------------------------------
 1 files changed, 31 insertions(+), 86 deletions(-)

diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index 2a05660..645841d 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -13,77 +13,6 @@
     <script type="text/javascript" src="../static/js/jquery/jquery-3.3.1.min.js"></script>
     <script type="text/javascript" src="../static/js/layer/layer.js"></script>
     <style>
-        header {
-            height: 20%;
-            opacity: 0.8;
-            position: relative;
-        }
-        /* 绯荤粺杩愯鐘舵�� */
-        .system-state {
-            float: left;
-            margin-left: 30px;
-            margin-top: 30px;
-            text-align: center;
-            color: #2d6aff;
-        }
-        .system-icon {
-            width: 100px;
-            height: 100px;
-            background-image: url("../static/image/stop48.png");
-            background-repeat: no-repeat;
-            background-size:100% 100%;
-            background-position: top center;
-            cursor: pointer;
-        }
-
-        /* 鐘舵�佹樉绀� */
-        .data-window {
-            width: 70%;
-            text-align: center;
-        }
-        .data-window h1 {
-            font-size: 3em;
-            margin: 0;
-            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;
-        }
-        .crn-state {
-            display: inline-block;
-            width: 50px;
-            text-align: center;
-        }
-        /* 绔欑偣鐘舵�� */
-        .site-state-group {
-            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;
-        }
 
     </style>
 </head>
@@ -97,17 +26,35 @@
 
     <!-- 淇℃伅灞曠ず -->
     <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 class="tips">
+            <div class="tips-item">
+                <label>鍫嗗灈鏈虹姸鎬侀鑹�:&nbsp;</label>
+                <div class="item-group">
+                    <span class="machine-put">鍏ュ簱</span>
+                    <span class="machine-take">鍑哄簱</span>
+                    <span class="machine-stock-move">搴撳埌搴�</span>
+                    <span class="machine-site-move">绔欏埌绔�</span>
+                    <span class="machine-p-move">PToP</span>
+                    <span class="machine-error">寮傚父</span>
+                    <span class="machine-auto">鑷姩</span>
+                    <span class="machine-unauto">闈炶嚜鍔�/鎵嬪姩</span>
+                </div>
+            </div>
+            <div class="tips-item">
+                <label>杈撻�佽澶囩姸鎬侀鑹�:&nbsp;</label>
+                <div class="item-group">
+                    <span class="site-auto-run-id">鑷姩+鏈夌墿+ID</span>
+                    <span class="site-auto-run">鑷姩+鏈夌墿</span>
+                    <span class="site-auto-id">鑷姩+ID</span>
+                    <span class="site-auto">鑷姩</span>
+                    <span class="site-unauto">闈炶嚜鍔�/鎵嬪姩</span>
+                </div>
+            </div>
+        </div>
     </div>
 
     <!--鍒嗗壊绾�-->
@@ -441,11 +388,9 @@
     </div>
 
     <!-- 鍙宠緭閫佺嚎 -->
-    <input id="val" type="text">
-    <button id="animate">animate</button>
+    <!--<input id="val" type="text">-->
+    <!--<button id="animate">animate</button>-->
 </main>
-
-
 </body>
 <script>
     var crn1Position = 0;

--
Gitblit v1.9.1