From a5c50ff60d14cad5ff27bfcade405c796f9ab0d3 Mon Sep 17 00:00:00 2001
From: vincent <1341870251@qq.com>
Date: 星期六, 30 五月 2020 09:29:25 +0800
Subject: [PATCH] #
---
src/main/webapp/views/console.html | 197 ++++++++++++++++++++++++++++++++++++-------------
1 files changed, 144 insertions(+), 53 deletions(-)
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index 7c185eb..987f16d 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,74 +10,96 @@
<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 {
- border: 1px transparent;
- border-radius: 3px;
- cursor: pointer;
- width: 50px;
- text-align: center;
- background-color: #21ff3a;
- font-size: 13px;
- }
- /* 鏃犳晥绔欑偣锛堝繀椤诲湪site涓嬮潰锛� */
- .site-none {
- border: none;
- background-color: transparent;
- }
-
- .main-part {
+ .system-state {
position: absolute;
- top: 200px;
- left: 400px;
- /*transform: translate(-50%, 0);*/
+ top: 40px;
+ right: 20px;
}
- /* 杈撻�佺嚎绗竴鍒� */
- .site-row-1 {
-
- }
- /* 杈撻�佺嚎绗簩鍒� */
- .site-row-2 {
- position: absolute;
- left: 300px;
- top: 220px;
- }
- .site-row-2 .site {
+ .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;
}
</style>
</head>
<body>
<header>
- <span>鎻忚堪淇℃伅</span>
+ <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>
+ </div>
+
</header>
<main>
<!-- 宸﹁緭閫佺嚎 -->
- <!-- 绗竴鍒� -->
- <div class="site-row-1">
-
+ <!-- 绗竴鍒楋紙瀹藉害 100px锛�-->
+ <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>
+ <div id="site-4" class="site" style="width: 80px; height: 60px;line-height: 60px">4</div>
+ <div id="site-5" class="site" style="width: 80px; height: 50px;line-height: 50px">5</div>
+ <div id="site-6" class="site" >6</div>
+ <div id="site-7" class="site" style="width: 80px; height: 82px;line-height: 82px">7</div>
+ <div id="site-8" class="site" style="width: 80px; height: 42px;line-height: 40px">8</div>
+ <div id="site-9" class="site" >9</div>
</div>
- <!-- 绗簩鍒� -->
- <div class="site-row-2">
- <div id="site-32" class="site">32</div>
- <div id="site-31" class="site">31</div>
- <div id="site-30" class="site">30</div>
- <div id="site-23" class="site">23</div>
- <div id="site-22" class="site">22</div>
- <div id="site-20" class="site">20</div>
- <div id="site-19" class="site">19</div>
- <div id="site-17" class="site">17</div>
- <div id="site-16" class="site">16</div>
- <div id="site-15" class="site">15</div>
- <div id="site-13" class="site">13</div>
- <div id="site-12" class="site">12</div>
- <div id="site-10" class="site">10</div>
+ <!-- 绗簩鍒楋紙瀹藉害 100px锛� -->
+ <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-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>
+ <div id="site-19" class="site" style="width: 80px;">19</div>
+ <div id="site-17" class="site" >17</div>
+ <div id="site-16" class="site" style="width: 80px; height: 42px;line-height: 40px">16</div>
+ <div id="site-15" class="site" style="width: 80px; height: 42px;line-height: 40px">15</div>
+ <div id="site-13" class="site" >13</div>
+ <div id="site-12" class="site" style="width: 80px;">12</div>
+ <div id="site-10" class="site" >10</div>
</div>
-
+ <!-- 绗笁鍒楋紙瀹藉害 100px锛�-->
+ <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 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>
+ <div id="site-25" class="site" >25</div>
+ </div>
<!-- 璐ф灦 + 鍫嗗灈鏈� + 鍏ュ簱绔欑偣 + 鍑哄簱绔欑偣 -->
<div class="main-part">
@@ -109,6 +132,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">
@@ -137,12 +164,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">
@@ -171,6 +202,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">
@@ -199,6 +234,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>
@@ -232,6 +271,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">
@@ -260,12 +303,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">
@@ -294,6 +341,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">
@@ -322,11 +373,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