From 0cbcebcfc77bbdffd8055b878060a459c2e286e5 Mon Sep 17 00:00:00 2001
From: vincent <1341870251@qq.com>
Date: 星期五, 29 五月 2020 17:26:46 +0800
Subject: [PATCH] #

---
 src/main/webapp/views/console.html |  144 +++++++++++++++++++++++++++++-------------------
 1 files changed, 87 insertions(+), 57 deletions(-)

diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index 7c185eb..d5d7f2b 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -9,43 +9,9 @@
     <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 {
-            position: absolute;
-            top: 200px;
-            left: 400px;
-            /*transform: translate(-50%, 0);*/
-        }
-
-        /* 杈撻�佺嚎绗竴鍒� */
-        .site-row-1 {
-
-        }
-        /* 杈撻�佺嚎绗簩鍒� */
-        .site-row-2 {
-            position: absolute;
-            left: 300px;
-            top: 220px;
-        }
-        .site-row-2 .site {
-            width: 100px;
-        }
 
     </style>
 </head>
@@ -56,27 +22,49 @@
 <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">
@@ -142,7 +130,7 @@
         <!-- 鍫嗗灈鏈� -->
         <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">
@@ -265,7 +253,7 @@
         <!-- 鍫嗗灈鏈� -->
         <div class="crn">
             <hr class="pathway">
-            <div class="machine"></div>
+            <div id="crn2" class="machine"></div>
         </div>
         <!-- 璐ф灦 -->
         <div class="stock-group">
@@ -327,6 +315,48 @@
     </div>
 
     <!-- 鍙宠緭閫佺嚎 -->
+    <input id="val" type="text">
+    <button id="animate">animate</button>
 </main>
+
+
+<!-- 寮瑰嚭灞� -->
+<form id="msg" style="display: none">
+    <input name="name" type="text">
+    <input name="password" type="password">
+    <button>纭畾</button>
+</form>
 </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: $("#msg")
+        });
+    })
+
+</script>
 </html>
\ No newline at end of file

--
Gitblit v1.9.1