From 53bb852d00830ea116f972575472cfd97c3a206c Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期一, 22 八月 2022 15:16:48 +0800
Subject: [PATCH] #
---
src/main/webapp/views/console.html | 2 ++
src/main/webapp/static/css/console.css | 23 ++++++++---------------
2 files changed, 10 insertions(+), 15 deletions(-)
diff --git a/src/main/webapp/static/css/console.css b/src/main/webapp/static/css/console.css
index 347fccc..af68f5f 100644
--- a/src/main/webapp/static/css/console.css
+++ b/src/main/webapp/static/css/console.css
@@ -1,6 +1,5 @@
* {
margin: 0;
- overflow: hidden;
}
html,body {
height: 100%;
@@ -39,7 +38,7 @@
width: 100%;
height: 23% ;
position: absolute;
- bottom: 2.5%;
+ bottom: 3.2%;
}
/*=============== SCROLL BAR ===============*/
@@ -61,7 +60,7 @@
/* 鎺у埗寮�鍏� */
.system-state {
- display: inline-block;
+ float: left;
width: 15%;
height: 100%;
background-color: rgba(0, 0, 0, 0.3);
@@ -70,7 +69,7 @@
}
/* 鍫嗗灈鏈虹姸鎬� */
.machine-status {
- display: inline-block;
+ float: left;
width: 15%;
height: 100%;
background-color: rgba(0, 0, 0, 0.3);
@@ -79,16 +78,11 @@
}
.state-ss {
margin-left: 60px;
-
}
-
-
-
-
/* 杈撻�佺嚎鐘舵�� */
.line-status {
- display: inline-block;
+ float: left;
width: 15%;
height: 100%;
background-color: rgba(0, 0, 0, 0.3);
@@ -109,7 +103,7 @@
}
/* 鏉＄爜鎵弿鍣� */
.bar-code {
- display: inline-block;
+ float: left;
width: 49%;
height: 100%;
background-color: rgba(0, 0, 0, 0.3);
@@ -387,17 +381,16 @@
/* 鍫嗗灈鏈鸿建閬� */
.pathway {
position: absolute;
- /*left: -10%;*/
-
+ margin-left: -80px;
border: 1px solid #333;
background-color:#333!important;
color: #333 !important;
- width: 100%;
+ width: 110%;
margin-top: 10px;
}
/* 鍫嗗灈鏈� */
.machine {
- margin-left: 30px;
+ margin-left: -80px;
position: relative;
background-color: rgb(108,167,168);
height: 20px;
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index a83a31c..ee1b073 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -1075,6 +1075,7 @@
<span class="machine-unauto-flag">闈炶嚜鍔�/鎵嬪姩</span>
</div>
</div>
+ <!-- 杈撻�佺嚎鐘舵�� -->
<div class="line-status">
<div class="body-head">杈撻�佺嚎鐘舵��</div>
<div class="state states">
@@ -1090,6 +1091,7 @@
<span class="site-unauto">闈炶嚜鍔�/鎵嬪姩</span>
</div>
</div>
+ <!-- 鏉＄爜琛ㄦ牸 -->
<div class="bar-code">
<div class="body-head" id="code">鏉＄爜鎵弿鍣�</div>
<div class="tablebox">
--
Gitblit v1.9.1