From 425e75affa5b4356f1e408f38a4381d3edfce896 Mon Sep 17 00:00:00 2001
From: vincent <1341870251@qq.com>
Date: 星期一, 01 六月 2020 15:47:21 +0800
Subject: [PATCH] #
---
src/main/webapp/views/console.html | 6 ++++++
src/main/webapp/static/css/console.css | 40 ++++++++++++++++++++++++++++++++++------
src/main/webapp/static/image/bscanner.png | 0
3 files changed, 40 insertions(+), 6 deletions(-)
diff --git a/src/main/webapp/static/css/console.css b/src/main/webapp/static/css/console.css
index 973e15b..f551b19 100644
--- a/src/main/webapp/static/css/console.css
+++ b/src/main/webapp/static/css/console.css
@@ -106,21 +106,21 @@
}
/* 杈撻�佺嚎绗竴鍒� */
.site-row-1 {
- left: 400px;
+ left: 100px;
}
.site-row-1 .site {
width: 100px;
}
/* 杈撻�佺嚎绗簩鍒� */
.site-row-2 {
- left: 500px;
+ left: 200px;
}
.site-row-2 .site {
width: 100px;
}
/* 杈撻�佺嚎绗笁鍒� */
.site-row-3 {
- left: 600px;
+ left: 300px;
width: 100px;
}
.site-row-3 .site {
@@ -129,7 +129,7 @@
}
/* 杈撻�佺嚎绗洓鍒� */
.site-row-4 {
- left: 700px;
+ left: 400px;
width: 100px;
}
.site-row-4 .site {
@@ -179,7 +179,7 @@
.main-part {
position: absolute;
top: 250px;
- left: 600px;
+ left: 300px;
}
.main-part .lane {
margin-bottom: 30px;
@@ -295,7 +295,7 @@
/* 鍏ュ簱鍙� */
.cargo-put {
top: 68px;
- left: 413px;
+ left: 113px;
position: absolute;
width: 50px;
height: 50px;
@@ -305,6 +305,34 @@
background-position: top center;
}
+/* 鎵爜鍣� */
+.code-decoder {
+ position: absolute;
+ width: 30px;
+ height: 30px;
+ background-image: url("../image/bscanner.png");
+ background-repeat: no-repeat;
+ background-size:100% 60%;
+ background-position: top center;
+}
+/* 鎵爜鍣ㄦ枃瀛� */
+.code-decoder-data {
+ display: inline-block;
+ transform: scale(0.90);
+}
+/* 鎵爜鍣�1 */
+#code-decoder-1 {
+ top: 240px;
+ left: 470px;
+}
+/* 鎵爜鍣ㄦ暟鎹�1 */
+#code-decoder-data-1 {
+ font-size: xx-small;
+ margin-left: 35px;
+}
+
+
+
/* 鍔ㄧ敾 */
/*.machine {*/
/*position: relative;*/
diff --git a/src/main/webapp/static/image/bscanner.png b/src/main/webapp/static/image/bscanner.png
new file mode 100644
index 0000000..741143c
--- /dev/null
+++ b/src/main/webapp/static/image/bscanner.png
Binary files differ
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index 286da59..e49cb25 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -62,8 +62,14 @@
</header>
<main>
+ <!----------- 宸ュ叿鏍� ---------->
<!-- 鍏ュ簱鍙� -->
<div class="cargo-put"></div>
+ <!-- 鎵爜鍣� -->
+ <div id="code-decoder-1" class="code-decoder">
+ <span id="code-decoder-data-1" class="code-decoder-data">0</span>
+ </div>
+
<!-- 宸﹁緭閫佺嚎 -->
<!-- 绗竴鍒楋紙瀹藉害 100px锛�-->
--
Gitblit v1.9.1