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 | 113 +++++++++++++++++++++++++++++++++++---------------------
1 files changed, 70 insertions(+), 43 deletions(-)
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index a45a316..272a006 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -57,42 +57,58 @@
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;
+ /*!* 鍫嗗灈鏈虹姸鎬� *!*/
+ /*.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;
}
- .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>
@@ -107,19 +123,30 @@
<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>
- <div>
- <label class="site-label">杈撻�佽澶囩姸鎬侀鑹�:</label>
- <div class="site-state-group">
- <div class="site site-auto">鑷姩</div>
- <div class="site site-unauto">闈炶嚜鍔�/鎵嬪姩</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>
--
Gitblit v1.9.1