From 7ce087fd752a1f0222a5b49865091136f758da5d Mon Sep 17 00:00:00 2001
From: vincent <1341870251@qq.com>
Date: 星期六, 30 五月 2020 13:05:59 +0800
Subject: [PATCH] #
---
src/main/webapp/views/console.html | 95 +++++++++++++++++++++++------------------------
1 files changed, 46 insertions(+), 49 deletions(-)
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index a45a316..9130e97 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -57,42 +57,30 @@
font-weight: inherit;
}
- /* 鍫嗗灈鏈虹姸鎬� */
- .crn-state-group {
- text-align: left;
- font-size: 12px;
+ /* 棰滆壊鎻愮ず */
+ .tips {
+ position: absolute;
+ bottom: 5%;
+ left: 10%;
}
- .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;
+ .tips-item {
+ margin-bottom: 0;
+ font-size: 0;
text-align: left;
}
- .site-state-group .site {
- float: left;
- height: 22px;
- width: auto;
+ .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;
- border: none;
}
-
</style>
</head>
<body>
@@ -105,24 +93,35 @@
<!-- 淇℃伅灞曠ず -->
<div class="data-window">
+ <!-- 鏍囬 -->
<h1>鑷姩浠撳簱 WCS 鐩戞帶鍥�</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 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>
- <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>
<!--鍒嗗壊绾�-->
@@ -456,11 +455,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