From 8969fb33ff721386d7a11a494a5be2b9154d8bc2 Mon Sep 17 00:00:00 2001
From: vincent <1341870251@qq.com>
Date: 星期五, 29 五月 2020 13:22:31 +0800
Subject: [PATCH] #
---
src/main/webapp/static/css/common.css | 2
src/main/webapp/static/image/Crane_manual.png | 0
src/main/webapp/static/image/Crane_hptoohp.png | 0
src/main/webapp/static/image/Crane_loctoloc.png | 0
src/main/webapp/static/image/Crane_store.png | 0
src/main/webapp/static/image/Crane_retrieve.png | 0
src/main/webapp/views/console.html | 236 +++++++++++++++++++++++++++++++++++++++++++---
src/main/webapp/static/image/Crane_error.png | 0
src/main/webapp/static/css/console.css | 34 +++++-
src/main/webapp/static/image/Crane_auto.png | 0
src/main/webapp/static/image/Crane_stntostn.png | 0
11 files changed, 244 insertions(+), 28 deletions(-)
diff --git a/src/main/webapp/static/css/common.css b/src/main/webapp/static/css/common.css
index e5db386..f388ea3 100644
--- a/src/main/webapp/static/css/common.css
+++ b/src/main/webapp/static/css/common.css
@@ -25,7 +25,7 @@
display: table;
clear: both;
}
-.row div:empty {
+.col-md3:empty {
background:rgba(0,0,0,0.04);
border: 1px solid rgba(0,0,0,.3);
min-height:32px;
diff --git a/src/main/webapp/static/css/console.css b/src/main/webapp/static/css/console.css
index cfc8cbe..9e1c583 100644
--- a/src/main/webapp/static/css/console.css
+++ b/src/main/webapp/static/css/console.css
@@ -1,16 +1,19 @@
+html {
+ height: 100%;
+}
+body {
+ height: 100%;
+}
+
/* 搴撲綅缁� */
.stock-group .item {
float: left;
- border-top: 2px solid #333;
- border-bottom: 2px solid #333;
+ border-top: 1px solid #333;
+ border-bottom: 1px solid #333;
border-left: 1px solid #333;
- border-right: 1px solid #333;
-}
-.stock-group .item:first-child {
- border-left: 2px solid #333;
}
.stock-group .item:last-child {
- border-right: 2px solid #333;
+ border-right: 1px solid #333;
}
.stock-group::after, .stock-group::before {
content: "";
@@ -18,9 +21,10 @@
clear: both;
}
button.item {
+ font-size: 13px;
padding: 1px 1px 1px 1px;
- width: 22px;
- height: 22px;
+ width: 20px;
+ height: 20px;
outline: none;
cursor: pointer;
color: #333;
@@ -30,4 +34,16 @@
button.item:hover {
background-color: #333;
color: #fff;
+}
+
+/* 鍫嗗灈鏈� */
+.machine {
+ background-color: #fff;
+ height: 20px;
+ width: 80px;
+ background-image: url("../image/Crane_auto.png");
+ background-repeat: no-repeat;
+ background-size:100% 100%;
+ background-position: top center;
+ cursor: pointer;
}
\ No newline at end of file
diff --git a/src/main/webapp/static/image/Crane_auto.png b/src/main/webapp/static/image/Crane_auto.png
new file mode 100644
index 0000000..a1553de
--- /dev/null
+++ b/src/main/webapp/static/image/Crane_auto.png
Binary files differ
diff --git a/src/main/webapp/static/image/Crane_error.png b/src/main/webapp/static/image/Crane_error.png
new file mode 100644
index 0000000..bffbd3f
--- /dev/null
+++ b/src/main/webapp/static/image/Crane_error.png
Binary files differ
diff --git a/src/main/webapp/static/image/Crane_hptoohp.png b/src/main/webapp/static/image/Crane_hptoohp.png
new file mode 100644
index 0000000..e0d47d0
--- /dev/null
+++ b/src/main/webapp/static/image/Crane_hptoohp.png
Binary files differ
diff --git a/src/main/webapp/static/image/Crane_loctoloc.png b/src/main/webapp/static/image/Crane_loctoloc.png
new file mode 100644
index 0000000..a9a0b8c
--- /dev/null
+++ b/src/main/webapp/static/image/Crane_loctoloc.png
Binary files differ
diff --git a/src/main/webapp/static/image/Crane_manual.png b/src/main/webapp/static/image/Crane_manual.png
new file mode 100644
index 0000000..017112a
--- /dev/null
+++ b/src/main/webapp/static/image/Crane_manual.png
Binary files differ
diff --git a/src/main/webapp/static/image/Crane_retrieve.png b/src/main/webapp/static/image/Crane_retrieve.png
new file mode 100644
index 0000000..8019a70
--- /dev/null
+++ b/src/main/webapp/static/image/Crane_retrieve.png
Binary files differ
diff --git a/src/main/webapp/static/image/Crane_stntostn.png b/src/main/webapp/static/image/Crane_stntostn.png
new file mode 100644
index 0000000..df0eca7
--- /dev/null
+++ b/src/main/webapp/static/image/Crane_stntostn.png
Binary files differ
diff --git a/src/main/webapp/static/image/Crane_store.png b/src/main/webapp/static/image/Crane_store.png
new file mode 100644
index 0000000..238352d
--- /dev/null
+++ b/src/main/webapp/static/image/Crane_store.png
Binary files differ
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index 2362a34..094f543 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -10,23 +10,32 @@
<link rel="stylesheet" type="text/css" href="../static/css/common.css">
<link rel="stylesheet" type="text/css" href="../static/css/console.css">
<style>
- html {
- height: 100%;
- }
- body {
- height: 100%;
- /*background-color: #007DDB;*/
- }
-
/* 澶撮儴 */
header {
height: 20%;
border: 1px solid red;
}
-
/* 涓讳綋 */
main {
height: 80%;
+ position: relative;
+ }
+
+ .main-part {
+ position: absolute;
+ top: 100px;
+ left: 400px;
+ /*transform: translate(-50%, 0);*/
+ }
+ /* 鍫嗗灈鏈鸿建閬� */
+ .pathway {
+ border: 1px solid #000;
+ position: absolute;
+ background-color:#eee!important;
+ color: #000000 !important;
+ width: 100%;
+ margin-top: 10px;
+ z-index: -1;
}
@@ -37,13 +46,40 @@
<span>鎻忚堪淇℃伅</span>
</header>
<main>
- <!-- 宸﹁緭閫佺嚎 -->
- <div class="site">
-
- </div>
- <!-- 璐ф灦 + 鍫嗗灈鏈� -->
+ <!-- 璐ф灦 + 鍫嗗灈鏈� + 鍏ュ簱鐐� + 鍑哄簱鐐� -->
<div class="main-part">
+
+ <!--杈撻�佺嚎-->
+
+ <!--绗竴鎺�-->
+ <span>1#</span>
<!-- 璐ф灦 -->
+ <div class="stock-group">
+ <button class="item">1</button>
+ <button class="item">2</button>
+ <button class="item">3</button>
+ <button class="item">4</button>
+ <button class="item">5</button>
+ <button class="item">6</button>
+ <button class="item">7</button>
+ <button class="item">8</button>
+ <button class="item">9</button>
+ <button class="item">10</button>
+ <button class="item">11</button>
+ <button class="item">12</button>
+ <button class="item">13</button>
+ <button class="item">14</button>
+ <button class="item">15</button>
+ <button class="item">16</button>
+ <button class="item">17</button>
+ <button class="item">18</button>
+ <button class="item">19</button>
+ <button class="item">20</button>
+ <button class="item">21</button>
+ <button class="item">22</button>
+ <button class="item">23</button>
+ <button class="item">24</button>
+ </div>
<div class="stock-group">
<button class="item">1</button>
<button class="item">2</button>
@@ -73,12 +109,176 @@
<!-- 鍫嗗灈鏈� -->
<div class="crn">
<hr class="pathway">
- <button class="machine">鍫嗗灈鏈�</button>
+ <div class="machine"></div>
</div>
- </div>
- <!-- 鍙宠緭閫佺嚎 -->
- <div class="site">
+ <!-- 璐ф灦 -->
+ <div class="stock-group">
+ <button class="item">1</button>
+ <button class="item">2</button>
+ <button class="item">3</button>
+ <button class="item">4</button>
+ <button class="item">5</button>
+ <button class="item">6</button>
+ <button class="item">7</button>
+ <button class="item">8</button>
+ <button class="item">9</button>
+ <button class="item">10</button>
+ <button class="item">11</button>
+ <button class="item">12</button>
+ <button class="item">13</button>
+ <button class="item">14</button>
+ <button class="item">15</button>
+ <button class="item">16</button>
+ <button class="item">17</button>
+ <button class="item">18</button>
+ <button class="item">19</button>
+ <button class="item">20</button>
+ <button class="item">21</button>
+ <button class="item">22</button>
+ <button class="item">23</button>
+ <button class="item">24</button>
+ </div>
+ <div class="stock-group">
+ <button class="item">1</button>
+ <button class="item">2</button>
+ <button class="item">3</button>
+ <button class="item">4</button>
+ <button class="item">5</button>
+ <button class="item">6</button>
+ <button class="item">7</button>
+ <button class="item">8</button>
+ <button class="item">9</button>
+ <button class="item">10</button>
+ <button class="item">11</button>
+ <button class="item">12</button>
+ <button class="item">13</button>
+ <button class="item">14</button>
+ <button class="item">15</button>
+ <button class="item">16</button>
+ <button class="item">17</button>
+ <button class="item">18</button>
+ <button class="item">19</button>
+ <button class="item">20</button>
+ <button class="item">21</button>
+ <button class="item">22</button>
+ <button class="item">23</button>
+ <button class="item">24</button>
+ </div>
+ <br>
+ <!--绗簩鎺�-->
+ <span>2#</span>
+ <!-- 璐ф灦 -->
+ <div class="stock-group">
+ <button class="item">1</button>
+ <button class="item">2</button>
+ <button class="item">3</button>
+ <button class="item">4</button>
+ <button class="item">5</button>
+ <button class="item">6</button>
+ <button class="item">7</button>
+ <button class="item">8</button>
+ <button class="item">9</button>
+ <button class="item">10</button>
+ <button class="item">11</button>
+ <button class="item">12</button>
+ <button class="item">13</button>
+ <button class="item">14</button>
+ <button class="item">15</button>
+ <button class="item">16</button>
+ <button class="item">17</button>
+ <button class="item">18</button>
+ <button class="item">19</button>
+ <button class="item">20</button>
+ <button class="item">21</button>
+ <button class="item">22</button>
+ <button class="item">23</button>
+ <button class="item">24</button>
+ </div>
+ <div class="stock-group">
+ <button class="item">1</button>
+ <button class="item">2</button>
+ <button class="item">3</button>
+ <button class="item">4</button>
+ <button class="item">5</button>
+ <button class="item">6</button>
+ <button class="item">7</button>
+ <button class="item">8</button>
+ <button class="item">9</button>
+ <button class="item">10</button>
+ <button class="item">11</button>
+ <button class="item">12</button>
+ <button class="item">13</button>
+ <button class="item">14</button>
+ <button class="item">15</button>
+ <button class="item">16</button>
+ <button class="item">17</button>
+ <button class="item">18</button>
+ <button class="item">19</button>
+ <button class="item">20</button>
+ <button class="item">21</button>
+ <button class="item">22</button>
+ <button class="item">23</button>
+ <button class="item">24</button>
+ </div>
+ <!-- 鍫嗗灈鏈� -->
+ <div class="crn">
+ <hr class="pathway">
+ <div class="machine"></div>
+ </div>
+ <!-- 璐ф灦 -->
+ <div class="stock-group">
+ <button class="item">1</button>
+ <button class="item">2</button>
+ <button class="item">3</button>
+ <button class="item">4</button>
+ <button class="item">5</button>
+ <button class="item">6</button>
+ <button class="item">7</button>
+ <button class="item">8</button>
+ <button class="item">9</button>
+ <button class="item">10</button>
+ <button class="item">11</button>
+ <button class="item">12</button>
+ <button class="item">13</button>
+ <button class="item">14</button>
+ <button class="item">15</button>
+ <button class="item">16</button>
+ <button class="item">17</button>
+ <button class="item">18</button>
+ <button class="item">19</button>
+ <button class="item">20</button>
+ <button class="item">21</button>
+ <button class="item">22</button>
+ <button class="item">23</button>
+ <button class="item">24</button>
+ </div>
+ <div class="stock-group">
+ <button class="item">1</button>
+ <button class="item">2</button>
+ <button class="item">3</button>
+ <button class="item">4</button>
+ <button class="item">5</button>
+ <button class="item">6</button>
+ <button class="item">7</button>
+ <button class="item">8</button>
+ <button class="item">9</button>
+ <button class="item">10</button>
+ <button class="item">11</button>
+ <button class="item">12</button>
+ <button class="item">13</button>
+ <button class="item">14</button>
+ <button class="item">15</button>
+ <button class="item">16</button>
+ <button class="item">17</button>
+ <button class="item">18</button>
+ <button class="item">19</button>
+ <button class="item">20</button>
+ <button class="item">21</button>
+ <button class="item">22</button>
+ <button class="item">23</button>
+ <button class="item">24</button>
+ </div>
</div>
</main>
</body>
--
Gitblit v1.9.1