From 18ed07ad1e27266dd1e5bd0c43f0214239c2b79f Mon Sep 17 00:00:00 2001
From: whycq <whycq>
Date: 星期三, 16 三月 2022 13:02:19 +0800
Subject: [PATCH] # 加站台 加logo
---
src/main/webapp/static/images/zy-logo.png | 0
src/main/webapp/views/console.html | 32 ++++++++++++---
src/main/webapp/static/css/console.css | 37 +++++++++++++++---
3 files changed, 56 insertions(+), 13 deletions(-)
diff --git a/src/main/webapp/static/css/console.css b/src/main/webapp/static/css/console.css
index aa50cf6..4a74204 100644
--- a/src/main/webapp/static/css/console.css
+++ b/src/main/webapp/static/css/console.css
@@ -12,17 +12,35 @@
}
.head {
height: 10%;
- width: 20%;
- padding-top: 1%;
- padding-left: 1%;
+ width: 100%;
color: #FFFFFF;
}
+.head-left {
+ height: 100%;
+ width: 20%;
+ display: inline-block;
+}
+.head-right {
+ height: 100%;
+ width: 30%;
+ display: inline-block;
+ float: right;
+}
.head h1 {
+ margin-top: 2%;
+ margin-left: 2%;
font-weight: 400;
letter-spacing:3px;
}
.head h6 {
+ margin-left: 2%;
font-weight: 400;
+}
+
+img {
+ float: right;
+ margin-top: 10px;
+ margin-right: 10px;
}
#body {
width: 100%;
@@ -293,16 +311,23 @@
width: 80px;
}
-.site-row-5 {
+.site-row-4 {
top: 71px;
left: 448px;
+}
+.site-row-4 .site {
+ width: 80px;
+}
+.site-row-5 {
+ top: 71px;
+ left: 530px;
}
.site-row-5 .site {
width: 80px;
}
.site-row-6 {
top: 71px;
- left: 530px;
+ left: 612px;
}
.site-row-6 .site {
width: 80px;
@@ -313,7 +338,7 @@
.main-part {
position: absolute;
top: 20px;
- left: 612px;
+ left: 694px;
}
.main-part .lane {
margin-top: 30px;
diff --git a/src/main/webapp/static/images/zy-logo.png b/src/main/webapp/static/images/zy-logo.png
new file mode 100644
index 0000000..4865504
--- /dev/null
+++ b/src/main/webapp/static/images/zy-logo.png
Binary files differ
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index a1d0f1f..932fc12 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -17,8 +17,13 @@
<body>
<div id="root">
<div class="head">
- <h1>鑷姩浠撳簱WCS鐩戞帶鍥�</h1>
- <h6>AUTOMATIC WAREHOUSE WCS MONITORING DIAGRAM</h6>
+ <div class="head-left">
+ <h1>鑷姩浠撳簱WCS鐩戞帶鍥�</h1>
+ <h6>AUTOMATIC WAREHOUSE WCS MONITORING DIAGRAM</h6>
+ </div>
+ <div class="head-right">
+ <img src="../static/images/zy-logo.png" alt="涓壃" height="44" width="80" >
+ </div>
</div>
<!--绗�1鍒楋紙瀹藉害 70px锛� -->
<div class="site-row site-row-1">
@@ -50,8 +55,8 @@
</div>
<!-- 绗�4鍒楋紙瀹藉害 70px 140px锛� -->
- <!--<!– 绗�5鍒楋紙瀹藉害 70px锛� –>-->
- <div class="site-row site-row-5">
+ <!--<!– 绗�4鍒楋紙瀹藉害 70px锛� –>-->
+ <div class="site-row site-row-4">
<div id="site-163" class="site" style="height: 28.5px;line-height: 28.5px">163</div>
<div id="site-162" class="site" style="height: 28.5px;line-height: 28.5px">162</div>
<div id="site-161" class="site" style="height: 71px;line-height: 71px">161</div>
@@ -67,8 +72,8 @@
<div id="site-151" class="site" style="height: 28.5px;line-height: 28.5px">151</div>
<div id="site-150" class="site" style="height: 28.5px;line-height: 28.5px">150</div>
</div>
- <!--<!– 绗�6鍒楋紙瀹藉害 70px锛� –>-->
- <div class="site-row site-row-6">
+ <!--<!– 绗�5鍒楋紙瀹藉害 70px锛� –>-->
+ <div class="site-row site-row-5">
<div id="site-120" class="site" style="height: 28.5px;line-height: 28.5px">120</div>
<div id="site-121" class="site" style="height: 28.5px;line-height: 28.5px">121</div>
<div id="site-122" class="site" style="height: 71px;line-height: 71px">122</div>
@@ -83,6 +88,19 @@
<div id="site-131" class="site" style="height: 71px;line-height: 71px">131</div>
<div id="site-132" class="site" style="height: 28.5px;line-height: 28.5px">132</div>
<div id="site-133" class="site" style="height: 28.5px;line-height: 28.5px">133</div>
+ </div>
+ <!--<!– 绗�6鍒楋紙瀹藉害 70px锛� –>-->
+ <div class="site-row site-row-6">
+ <div id="site-183" class="site">183</div>
+ <div id="site-184" class="site" style="margin-top: 21px">184</div>
+ <div id="site-185" class="site" style="margin-top: 73px">185</div>
+ <div id="site-186" class="site" style="margin-top: 21px">186</div>
+ <div id="site-187" class="site" style="margin-top: 73px">187</div>
+ <div id="site-188" class="site" style="margin-top: 21px">188</div>
+ <div id="site-189" class="site" style="margin-top: 73px">189</div>
+ <div id="site-190" class="site" style="margin-top: 21px">190</div>
+ <div id="site-191" class="site" style="margin-top: 73px">191</div>
+ <div id="site-192" class="site" style="margin-top: 21px">192</div>
</div>
<!-- 璐ф灦 + 鍫嗗灈鏈� + 鍏ュ簱绔欑偣 -->
@@ -955,7 +973,7 @@
<div class="body-head">杈撻�佺嚎鐘舵��</div>
<div class="state states">
<span>杩愯緭绾挎�绘暟</span>
- <span class="line-ss">48</span>
+ <span class="line-ss">58</span>
</div>
<div class="button"><span>鎵�鏈夌姸鎬�</span></div>
<div class="button item-group">
--
Gitblit v1.9.1