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 | 275 +++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 208 insertions(+), 67 deletions(-)
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index 35ec595..272a006 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -1,5 +1,6 @@
<!DOCTYPE html>
<html lang="en">
+<!--5灞� 28鍒� 1120搴撲綅-->
<head>
<meta charset="UTF-8">
<title>WCS鎺у埗涓績</title>
@@ -9,84 +10,156 @@
<link rel="stylesheet" type="text/css" href="../static/css/normalize.css">
<link rel="stylesheet" type="text/css" href="../static/css/common.css">
<link rel="stylesheet" type="text/css" href="../static/css/console.css">
+ <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>
- /* 绔欑偣 */
- .site {
- height: 20px;
- border: 1px solid red;
- border-radius: 3px;
- cursor: pointer;
- width: 50px;
- text-align: center;
- background-color: #21ff3a;
- font-size: 13px;
+ header {
+ height: 20%;
+ opacity: 0.8;
+ position: relative;
}
- /* 鏃犳晥绔欑偣锛堝繀椤诲湪site涓嬮潰锛� */
- .site-none {
- border: none;
- background-color: transparent;
- }
-
- .main-part {
+ /* 鍒嗗壊绾� */
+ .header-hr {
+ border-radius: 5px;
+ border: 1px solid #777;
+ width: 80%;
position: absolute;
- top: 200px;
- left: 400px;
- /*transform: translate(-50%, 0);*/
+ bottom: 0;
}
-
- /* --------- 杈撻�佺嚎鎬绘垚 --------- */
- /* 杈撻�佺嚎绗竴鍒� */
- .site-row-1 {
- position: absolute;
- left: 200px;
- top: 72px;
- }
- .site-row-1 .site {
- width: 100px;
- }
- /* 杈撻�佺嚎绗簩鍒� */
- .site-row-2 {
- position: absolute;
- left: 300px;
- top: 72px;
- }
- .site-row-2 .site {
- width: 100px;
- }
- /* 杈撻�佺嚎绗笁鍒� */
- .site-row-3 {
- position: absolute;
- left: 400px;
- top: 72px;
- width: 100px;
- }
- .site-row-3 .site {
+ /* 绯荤粺杩愯鐘舵�� */
+ .system-state {
float: left;
- width: 100px;
+ margin-left: 30px;
+ margin-top: 30px;
+ text-align: center;
+ color: #2d6aff;
}
- /* 杈撻�佺嚎绗洓鍒� */
- .site-row-4 {
- position: absolute;
- left: 500px;
- top: 72px;
+ .system-icon {
width: 100px;
- }
- .site-row-4 .site {
- float: right;
- 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 {
+ 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>
- <span>鎻忚堪淇℃伅</span>
+ <!-- 绯荤粺杩愯鐘舵�� -->
+ <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>
<!-- 宸﹁緭閫佺嚎 -->
<!-- 绗竴鍒楋紙瀹藉害 100px锛�-->
- <div class="site-row-1">
+ <div class="site-row site-row-1">
<div id="site-1" class="site" style="width: 80px; height: 50px;line-height: 50px">1[9999]</div>
<div id="site-2" class="site" >2</div>
<div id="site-3" class="site" style="width: 80px; height: 30px;line-height: 30px">3</div>
@@ -98,10 +171,10 @@
<div id="site-9" class="site" >9</div>
</div>
<!-- 绗簩鍒楋紙瀹藉害 100px锛� -->
- <div class="site-row-2">
+ <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>
@@ -114,15 +187,15 @@
<div id="site-10" class="site" >10</div>
</div>
<!-- 绗笁鍒楋紙瀹藉害 100px锛�-->
- <div class="site-row-3">
+ <div class="site-row site-row-3">
<div class="site-none" style="width: 80px; height: 50px;line-height: 50px"></div>
<div id="site-29" class="site" style="width: 50px;">29</div>
<div id="site-28" class="site" style="width: 50px;">28</div>
<div class="site-none" style="width: 80px; height: 50px;line-height: 30px"></div>
<div id="site-24" class="site" >24</div>
</div>
- <!-- 绗笁鍒楋紙瀹藉害 100px锛�-->
- <div class="site-row-4">
+ <!-- 绗洓鍒楋紙瀹藉害 100px锛�-->
+ <div class="site-row site-row-4">
<div class="site-none" style="width: 80px; height: 50px;line-height: 50px"></div>
<div id="site-27" class="site" >27</div>
<div id="site-26" class="site" style="width: 80px; height: 30px;line-height: 30px">26</div>
@@ -160,6 +233,10 @@
<button class="item">22</button>
<button class="item">23</button>
<button class="item">24</button>
+ <button class="item">25</button>
+ <button class="item">26</button>
+ <button class="item">27</button>
+ <button class="item">28</button>
<div class="site site-none"> </div>
</div>
<div class="stock-group">
@@ -188,12 +265,16 @@
<button class="item">22</button>
<button class="item">23</button>
<button class="item">24</button>
+ <button class="item">25</button>
+ <button class="item">26</button>
+ <button class="item">27</button>
+ <button class="item">28</button>
<div class="site site-none"> </div>
</div>
<!-- 鍫嗗灈鏈� -->
<div class="crn">
<hr class="pathway">
- <div class="machine" style="margin-left: 30px"></div>
+ <div id="crn1" class="machine"></div>
</div>
<!-- 璐ф灦 -->
<div class="stock-group">
@@ -222,6 +303,10 @@
<button class="item">22</button>
<button class="item">23</button>
<button class="item">24</button>
+ <button class="item">25</button>
+ <button class="item">26</button>
+ <button class="item">27</button>
+ <button class="item">28</button>
<div class="site site-none"> </div>
</div>
<div class="stock-group">
@@ -250,6 +335,10 @@
<button class="item">22</button>
<button class="item">23</button>
<button class="item">24</button>
+ <button class="item">25</button>
+ <button class="item">26</button>
+ <button class="item">27</button>
+ <button class="item">28</button>
<div class="site site-none"> </div>
</div>
<br>
@@ -283,6 +372,10 @@
<button class="item">22</button>
<button class="item">23</button>
<button class="item">24</button>
+ <button class="item">25</button>
+ <button class="item">26</button>
+ <button class="item">27</button>
+ <button class="item">28</button>
<div class="site site-none"> </div>
</div>
<div class="stock-group">
@@ -311,12 +404,16 @@
<button class="item">22</button>
<button class="item">23</button>
<button class="item">24</button>
+ <button class="item">25</button>
+ <button class="item">26</button>
+ <button class="item">27</button>
+ <button class="item">28</button>
<div class="site site-none"> </div>
</div>
<!-- 鍫嗗灈鏈� -->
<div class="crn">
<hr class="pathway">
- <div class="machine"></div>
+ <div id="crn2" class="machine"></div>
</div>
<!-- 璐ф灦 -->
<div class="stock-group">
@@ -345,6 +442,10 @@
<button class="item">22</button>
<button class="item">23</button>
<button class="item">24</button>
+ <button class="item">25</button>
+ <button class="item">26</button>
+ <button class="item">27</button>
+ <button class="item">28</button>
<div class="site site-none"> </div>
</div>
<div class="stock-group">
@@ -373,11 +474,51 @@
<button class="item">22</button>
<button class="item">23</button>
<button class="item">24</button>
+ <button class="item">25</button>
+ <button class="item">26</button>
+ <button class="item">27</button>
+ <button class="item">28</button>
<div class="site site-none"> </div>
</div>
</div>
<!-- 鍙宠緭閫佺嚎 -->
+ <input id="val" type="text">
+ <button id="animate">animate</button>
</main>
+
+
</body>
+<script>
+ var crn1Position = 0;
+ var crn2Position = 0;
+ $('#animate').click(function () {
+ crnAnimate(1, $('#val').val());
+ });
+
+ // 鍫嗗灈鏈哄亸绉诲姩鐢�
+ function crnAnimate(id, leftVal) {
+ switch (id) {
+ case 1:
+ $("#crn1").animate({left: leftVal+'px'}, 1000);
+ crn1Position = leftVal;
+ break;
+ case 2:
+ $("#crn2").animate({left: leftVal+'px'}, 1000);
+ crn2Position = leftVal;
+ break;
+ default:
+ break
+ }
+ }
+
+ $('.item').on('click', function () {
+ layer.open({
+ type: 1,
+ shadeClose: true, //鐐瑰嚮閬僵鍏抽棴灞�
+ content: 'text'
+ });
+ })
+
+</script>
</html>
\ No newline at end of file
--
Gitblit v1.9.1