From 46055e8bf59e050a7e4e5b0844cd134bdbf9c445 Mon Sep 17 00:00:00 2001
From: vincent <1341870251@qq.com>
Date: 星期六, 30 五月 2020 12:56:13 +0800
Subject: [PATCH] #
---
src/main/webapp/views/console.html | 147 +++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 124 insertions(+), 23 deletions(-)
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index 987f16d..272a006 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -13,12 +13,27 @@
<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>
- .system-state {
- position: absolute;
- top: 40px;
- right: 20px;
+ header {
+ height: 20%;
+ opacity: 0.8;
+ position: relative;
}
-
+ /* 鍒嗗壊绾� */
+ .header-hr {
+ border-radius: 5px;
+ border: 1px solid #777;
+ width: 80%;
+ position: absolute;
+ bottom: 0;
+ }
+ /* 绯荤粺杩愯鐘舵�� */
+ .system-state {
+ float: left;
+ margin-left: 30px;
+ margin-top: 30px;
+ text-align: center;
+ color: #2d6aff;
+ }
.system-icon {
width: 100px;
height: 100px;
@@ -29,30 +44,116 @@
cursor: pointer;
}
+ /* 鐘舵�佹樉绀� */
+ .data-window {
+ float: left;
+ width: 70%;
+ text-align: center;
+ }
+ .data-window h1 {
+ font-size: 3em;
+ margin: 0;
+ letter-spacing: 1px;
+ font-weight: inherit;
+ }
+
+ /*!* 鍫嗗灈鏈虹姸鎬� *!*/
+ /*.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;*/
+ /*width: 50px;*/
+ /*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-group .site {*/
+ /*float: left;*/
+ /*height: 22px;*/
+ /*width: auto;*/
+ /*padding: 0 10px;*/
+ /*border: none;*/
+ /*}*/
+ .tips-item {
+ font-size: 0;
+ text-align: left;
+ }
+ .tips-item label {
+ display: inline-block;
+ width: 130px;
+ text-align: right;
+ font-size: xx-small;
+ }
+ .item-group {
+ display: inline-block;
+ }
+ .item-group span {
+ font-size: xx-small;
+ padding: 0 10px;
+ }
</style>
</head>
<body>
<header>
- <h1>鑷姩浠撳簱 WCS 鐩戞帶鍥�</h1>
- <!-- 鐘舵�� -->
- <div class="machine-state">
- <div class="crn-state-group">
- <span>鍫嗗灈鏈虹姸鎬�:</span>
- <span class="crn-state" style="background-color: #21ff3a">鑷姩</span>
- <span class="crn-state" style="background-color: red">寮傚父</span>
- </div>
- <div class="site-state-group">
- <span>绔欑偣鐘舵��:</span>
- <span class="site-state" style="background-color: #21ff3a;">鑷姩</span>
- <span class="site-state" style="background-color: red;">寮傚父</span>
- </div>
- </div>
-
- <!-- 绯荤粺杩愯 -->
+ <!-- 绯荤粺杩愯鐘舵�� -->
<div class="system-state">
<div class="system-icon"></div>
+ <span>绯荤粺杩愯涓�...</span>
</div>
-
+
+ <!-- 淇℃伅灞曠ず -->
+ <div class="data-window">
+ <h1>鑷姩浠撳簱 WCS 鐩戞帶鍥�</h1>
+
+ <div class="tips">
+ <div class="tips-item">
+ <label>鍫嗗灈鏈虹姸鎬侀鑹�: </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>杈撻�佽澶囩姸鎬侀鑹�: </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>
+
+ <!--鍒嗗壊绾�-->
+ <hr class="header-hr">
</header>
<main>
@@ -73,7 +174,7 @@
<div class="site-row site-row-2">
<div id="site-32" class="site" style="width: 80px; height: 50px;line-height: 50px">32</div>
<div id="site-31" class="site" >31</div>
- <div id="site-30" class="site" style="width: 80px; height: 30px;line-height: 30px">30</div>
+ <div id="site-30" class="site" style="width: 80px; height: 30px;line-height: 30px; background-color: red;">30</div>
<div id="site-23" class="site" >23</div>
<div id="site-22" class="site" style="width: 80px; height: 50px;line-height: 50px">22</div>
<div id="site-20" class="site" >20</div>
--
Gitblit v1.9.1