From 7313e9afe3cb2584757780d18c731904cb6b12f8 Mon Sep 17 00:00:00 2001
From: whycq <whycq>
Date: 星期二, 14 十二月 2021 16:51:25 +0800
Subject: [PATCH] YCQ
---
src/main/webapp/views/console.html | 138 ++++++++++++++++++++++++---------------------
src/main/webapp/static/css/console.css | 24 ++++---
2 files changed, 86 insertions(+), 76 deletions(-)
diff --git a/src/main/webapp/static/css/console.css b/src/main/webapp/static/css/console.css
index cacb56b..57071a5 100644
--- a/src/main/webapp/static/css/console.css
+++ b/src/main/webapp/static/css/console.css
@@ -127,7 +127,8 @@
/* 杈撻�佺嚎绗竴鍒� */
.site-row-1 {
- left: 220px;
+ top: 188px;
+ left: 160px;
}
.site-row-1 .site {
width: 80px;
@@ -135,7 +136,7 @@
/* 杈撻�佺嚎绗簩鍒� */
.site-row-2 {
- top: 52px;
+ top: 55px;
left: 300px;
}
.site-row-2 .site {
@@ -144,7 +145,7 @@
/* 杈撻�佺嚎绗笁鍒� */
.site-row-3 {
- top: 52px;
+ top: 55px;
left: 370px;
}
.site-row-3 .site {
@@ -153,8 +154,8 @@
/* 杈撻�佺嚎绗�4鍒� */
.site-row-4 {
- top: 122px;
- left: 1540px;
+ top: 229px;
+ left: 160px;
}
.site-row-4 .site {
width: 80px;
@@ -162,8 +163,8 @@
/* 杈撻�佺嚎绗�5鍒� */
.site-row-5 {
- top: 163px;
- left: 1620px;
+ top: 229px;
+ left: 0px;
}
.site-row-5 .site {
width: 80px;
@@ -171,8 +172,8 @@
/* 杈撻�佺嚎绗�6鍒� */
.site-row-6 {
- top: 122px;
- left: 1700px;
+ top: 188px;
+ left: 80px;
}
.site-row-6 .site {
width: 80px;
@@ -273,8 +274,9 @@
}
/* 鎺掑彿 */
.row-no {
- font-weight: bolder;
- margin-left: 80px;
+ font-size: 14px;
+ font-weight: bold;
+ margin-left: 10px;
}
/* 搴撲綅缁� */
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index f70f5a8..aa9b049 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -102,82 +102,75 @@
<!-- </div>-->
<!-- 绗�1鍒楋紙瀹藉害 100px锛� -->
-<!-- <div class="site-row site-row-1">-->
-<!-- <div id="site-103" class="site" style="height: 20px;line-height: 20px;margin-bottom: 20px">103</div>-->
-<!-- <div id="site-127" class="site" style="height: 20px;line-height: 20px;margin-bottom: 84px">127</div>-->
-<!-- <div id="site-128" class="site" style="height: 20px;line-height: 20px">128</div>-->
-<!-- </div>-->
+ <div class="site-row site-row-1">
+ <div id="site-176" class="site" style="height: 20px;line-height: 20px;width:140px;margin-bottom: 21px">176</div>
+ <div id="site-170" class="site" style="height: 20px;line-height: 20px;width:70px;margin-bottom: 245px;position: relative;float: right">170</div>
+ <div id="site-180" class="site" style="height: 20px;line-height: 20px;width:70px;position: relative;clear:right;float: right">180</div>
+ </div>
<!-- <!– 绗�2鍒楋紙瀹藉害 100px锛� –>-->
<div class="site-row site-row-2">
- <div id="site-163" class="site" style="height: 30px;line-height: 30px;width: 70px">163</div>
- <div id="site-162" class="site" style="height: 30px;line-height: 30px;width: 70px">162</div>
- <div id="site-161" class="site" style="height: 85px;line-height: 20px;width: 70px">161</div>
- <div id="site-160" class="site" style="height: 30px;line-height: 30px;width: 70px">160</div>
- <div id="site-159" class="site" style="height: 30px;line-height: 30px;width: 70px">159</div>
- <div id="site-158" class="site" style="height: 85px;line-height: 22px;width: 70px">158</div>
- <div id="site-157" class="site" style="height: 30px;line-height: 30px;width: 70px">157</div>
- <div id="site-156" class="site" style="height: 30px;line-height: 30px;width: 70px">156</div>
- <div id="site-155" class="site" style="height: 85px;line-height: 20px;width: 70px">155</div>
- <div id="site-154" class="site" style="height: 30px;line-height: 30px;width: 70px">154</div>
- <div id="site-153" class="site" style="height: 30px;line-height: 30px;width: 70px">153</div>
- <div id="site-152" class="site" style="height: 85px;line-height: 20px;width: 70px">152</div>
- <div id="site-151" class="site" style="height: 30px;line-height: 20px;width: 70px">151</div>
- <div id="site-150" class="site" style="height: 30px;line-height: 30px;width: 70px">150</div>
+ <div id="site-163" class="site" style="height: 31px;line-height: 31px;width: 70px">163</div>
+ <div id="site-162" class="site" style="height: 31px;line-height: 31px;width: 70px">162</div>
+ <div id="site-161" class="site" style="height: 71px;line-height: 71px;width: 70px">161</div>
+ <div id="site-160" class="site" style="height: 31px;line-height: 31px;width: 70px">160</div>
+ <div id="site-159" class="site" style="height: 31px;line-height: 31px;width: 70px">159</div>
+ <div id="site-158" class="site" style="height: 70px;line-height: 70px;width: 70px">158</div>
+ <div id="site-157" class="site" style="height: 31px;line-height: 31px;width: 70px">157</div>
+ <div id="site-156" class="site" style="height: 31px;line-height: 31px;width: 70px">156</div>
+ <div id="site-155" class="site" style="height: 70px;line-height: 70px;width: 70px">155</div>
+ <div id="site-154" class="site" style="height: 31px;line-height: 31px;width: 70px">154</div>
+ <div id="site-153" class="site" style="height: 31px;line-height: 31px;width: 70px">153</div>
+ <div id="site-152" class="site" style="height: 70px;line-height: 70px;width: 70px">152</div>
+ <div id="site-151" class="site" style="height: 31px;line-height: 31px;width: 70px">151</div>
+ <div id="site-150" class="site" style="height: 31px;line-height: 31px;width: 70px">150</div>
</div>
<!-- <!– 绗�3鍒楋紙瀹藉害 100px锛� –>-->
<div class="site-row site-row-3">
- <div id="site-120" class="site" style="height: 30px;line-height: 30px;width: 70px">120(8888)</div>
- <div id="site-121" class="site" style="height: 30px;line-height: 30px;width: 70px">121(8888)</div>
- <div id="site-122" class="site" style="height: 85px;line-height: 85px;width: 70px">122</div>
- <div id="site-123" class="site" style="height: 30px;line-height: 30px;width: 70px">123</div>
- <div id="site-124" class="site" style="height: 30px;line-height: 30px;width: 70px">124</div>
- <div id="site-125" class="site" style="height: 85px;line-height: 85px;width: 70px">125</div>
- <div id="site-126" class="site" style="height: 30px;line-height: 30px;width: 70px">126</div>
- <div id="site-127" class="site" style="height: 30px;line-height: 30px;width: 70px">127</div>
- <div id="site-128" class="site" style="height: 85px;line-height: 85px;width: 70px">128</div>
- <div id="site-129" class="site" style="height: 30px;line-height: 30px;width: 70px">129</div>
- <div id="site-130" class="site" style="height: 30px;line-height: 30px;width: 70px">130</div>
- <div id="site-131" class="site" style="height: 85px;line-height: 85px;width: 70px">131</div>
- <div id="site-132" class="site" style="height: 30px;line-height: 30px;width: 70px">132</div>
- <div id="site-133" class="site" style="height: 30px;line-height: 30px;width: 70px">133</div>
+ <div id="site-120" class="site" style="height: 31px;line-height: 31px;width: 70px">120(8888)</div>
+ <div id="site-121" class="site" style="height: 31px;line-height: 31px;width: 70px">121(8888)</div>
+ <div id="site-122" class="site" style="height: 71px;line-height: 71px;width: 70px">122</div>
+ <div id="site-123" class="site" style="height: 31px;line-height: 31px;width: 70px">123</div>
+ <div id="site-124" class="site" style="height: 31px;line-height: 31px;width: 70px">124</div>
+ <div id="site-125" class="site" style="height: 70px;line-height: 70px;width: 70px">125</div>
+ <div id="site-126" class="site" style="height: 31px;line-height: 31px;width: 70px">126</div>
+ <div id="site-127" class="site" style="height: 31px;line-height: 31px;width: 70px">127</div>
+ <div id="site-128" class="site" style="height: 70px;line-height: 70px;width: 70px">128</div>
+ <div id="site-129" class="site" style="height: 31px;line-height: 31px;width: 70px">129</div>
+ <div id="site-130" class="site" style="height: 31px;line-height: 31px;width: 70px">130</div>
+ <div id="site-131" class="site" style="height: 70px;line-height: 71px;width: 71px">131</div>
+ <div id="site-132" class="site" style="height: 31px;line-height: 31px;width: 70px">132</div>
+ <div id="site-133" class="site" style="height: 31px;line-height: 31px;width: 70px">133</div>
</div>
<!----------- 鍙宠緭閫佺嚎 ---------->
<!-- 绗�4鍒�(鍙宠竟锛夛紙瀹藉害 100px锛� -->
-<!-- <div class="site-row site-row-4">-->
-<!-- <div id="site-200" class="site" style="height: 20px;line-height: 20px;margin-bottom: 21px; width: 160px">200</div>-->
-<!-- <div id="site-202" class="site" style="height: 20px;line-height: 20px;margin-bottom: 44px;">202</div>-->
-<!-- <div id="site-203" class="site" style="height: 20px;line-height: 20px;margin-bottom: 21px; width: 160px">203</div>-->
-<!-- <div id="site-205" class="site" style="height: 20px;line-height: 20px;">205</div>-->
-<!-- </div>-->
+ <div class="site-row site-row-4">
+ <div id="site-171" class="site" style="height: 20px;line-height: 20px;margin-bottom: 245px; width: 70px">171</div>
+ <div id="site-181" class="site" style="height: 20px;line-height: 20px;margin-bottom: 44px; width: 70px">181</div>
+ </div>
- <!-- 绗�5鍒楋紙瀹藉害 100px锛� -->
-<!-- <div class="site-row site-row-5">-->
-<!-- <div id="site-201" class="site" style="height: 20px;line-height: 20px;margin-bottom: 85px">201</div>-->
-<!-- <div id="site-204" class="site" style="height: 20px;line-height: 20px;">204</div>-->
-<!-- </div>-->
+<!-- 绗�5鍒楋紙瀹藉害 100px锛� -->
+ <div class="site-row site-row-5">
+ <div id="site-173" class="site" style="height: 20px;line-height: 20px;margin-bottom: 85px">173</div>
+
+ </div>
<!-- 绗�6鍒楋紙瀹藉害 100px锛�-->
-<!-- <div class="site-row site-row-6">-->
-<!-- <div id="site-305" class="site" style="height: 20px;line-height: 20px;">305</div>-->
-<!-- <div id="site-308" class="site" style="height: 21px;line-height: 21px;">308</div>-->
-<!-- <div id="site-304" class="site" style="height: 20px;line-height: 20px;">304</div>-->
-<!-- <div id="site-303" class="site" style="height: 44px;line-height: 44px;">303</div>-->
-<!-- <div id="site-302" class="site" style="height: 20px;line-height: 20px;">302</div>-->
-<!-- <div id="site-307" class="site" style="height: 21px;line-height: 21px;">307</div>-->
-<!-- <div id="site-301" class="site" style="height: 20px;line-height: 20px;">301</div>-->
-<!-- <div id="site-306" class="site" style="height: 20px;line-height: 20px;">306</div>-->
-<!-- <div id="site-300" class="site" style="height: 20px;line-height: 20px;">300</div>-->
-<!-- </div>-->
+ <div class="site-row site-row-6">
+ <div id="site-175" class="site" style="height: 20px;line-height: 20px;">175</div>
+ <div id="site-174" class="site" style="height: 21px;line-height: 21px;">174</div>
+ <div id="site-172" class="site" style="height: 20px;line-height: 20px;margin-bottom: 245px">172</div>
+ <div id="site-182" class="site" style="height: 20px;line-height: 20px;">182</div>
+ </div>
<!-- 璐ф灦 + 鍫嗗灈鏈� + 鍏ュ簱绔欑偣 + 鍑哄簱绔欑偣 -->
<div class="main-part">
<!--绗竴缁�-->
<div class="lane">
- <span class="row-no">1#</span>
+ <span class="row-no"></span>
<!-- 璐ф灦 -->
<div class="stock-group">
<div class="site" style="background-color: white"></div>
@@ -216,6 +209,7 @@
<button class="item">66</button>
<button class="item">68</button>
<button class="item">70</button>
+ <span class="row-no">1#</span>
</div>
<div class="stock-group">
<div id="site-100" class="site" style="">100</div>
@@ -254,6 +248,7 @@
<button class="item">66</button>
<button class="item">68</button>
<button class="item">70</button>
+ <span class="row-no">2#</span>
</div>
<!-- 鍫嗗灈鏈� -->
<div class="crn">
@@ -298,6 +293,7 @@
<button class="item">66</button>
<button class="item">68</button>
<button class="item">70</button>
+ <span class="row-no">3#</span>
</div>
<div class="stock-group">
<div class="site" style="background-color: white"></div>
@@ -336,12 +332,12 @@
<button class="item">66</button>
<button class="item">68</button>
<button class="item">70</button>
+ <span class="row-no">4#</span>
</div>
- <span class="row-no">4#</span>
</div>
<!--绗簩缁�-->
<div class="lane">
- <span class="row-no">5#</span>
+ <span class="row-no"></span>
<!-- 璐ф灦 -->
<div class="stock-group">
<div class="site" style="background-color: white"></div>
@@ -380,6 +376,7 @@
<button class="item">66</button>
<button class="item">68</button>
<button class="item">70</button>
+ <span class="row-no">5#</span>
</div>
<div class="stock-group">
<div id="site-102" class="site" style="">102</div>
@@ -418,6 +415,7 @@
<button class="item">66</button>
<button class="item">68</button>
<button class="item">70</button>
+ <span class="row-no">6#</span>
</div>
<!-- 鍫嗗灈鏈� -->
<div class="crn">
@@ -462,6 +460,7 @@
<button class="item">66</button>
<button class="item">68</button>
<button class="item">70</button>
+ <span class="row-no">7#</span>
</div>
<div class="stock-group">
<div class="site" style="background-color: white"></div>
@@ -500,12 +499,12 @@
<button class="item">66</button>
<button class="item">68</button>
<button class="item">70</button>
+ <span class="row-no">8#</span>
</div>
- <span class="row-no">8#</span>
</div>
<!--绗笁缁�-->
<div class="lane">
- <span class="row-no">9#</span>
+ <span class="row-no"></span>
<!-- 璐ф灦 -->
<div class="stock-group">
<div class="site" style="background-color: white"></div>
@@ -544,6 +543,7 @@
<button class="item">66</button>
<button class="item">68</button>
<button class="item">70</button>
+ <span class="row-no">9#</span>
</div>
<div class="stock-group">
<div id="site-104" class="site" style="">104</div>
@@ -582,6 +582,7 @@
<button class="item">66</button>
<button class="item">68</button>
<button class="item">70</button>
+ <span class="row-no">10#</span>
</div>
<!-- 鍫嗗灈鏈� -->
<div class="crn">
@@ -626,6 +627,7 @@
<button class="item">66</button>
<button class="item">68</button>
<button class="item">70</button>
+ <span class="row-no">11#</span>
</div>
<div class="stock-group">
<div class="site" style="background-color: white"></div>
@@ -664,12 +666,12 @@
<button class="item">66</button>
<button class="item">68</button>
<button class="item">70</button>
+ <span class="row-no">12#</span>
</div>
- <span class="row-no">12#</span>
</div>
<!--绗洓缁�-->
<div class="lane">
- <span class="row-no">13#</span>
+ <span class="row-no"></span>
<!-- 璐ф灦 -->
<div class="stock-group">
<div class="site" style="background-color: white"></div>
@@ -708,6 +710,7 @@
<button class="item">66</button>
<button class="item">68</button>
<button class="item">70</button>
+ <span class="row-no">13#</span>
</div>
<div class="stock-group">
<div id="site-106" class="site" style="">106</div>
@@ -746,6 +749,7 @@
<button class="item">66</button>
<button class="item">68</button>
<button class="item">70</button>
+ <span class="row-no">14#</span>
</div>
<!-- 鍫嗗灈鏈� -->
<div class="crn">
@@ -790,6 +794,7 @@
<button class="item">66</button>
<button class="item">68</button>
<button class="item">70</button>
+ <span class="row-no">15#</span>
</div>
<div class="stock-group">
<div class="site" style="background-color: white"></div>
@@ -828,12 +833,12 @@
<button class="item">66</button>
<button class="item">68</button>
<button class="item">70</button>
+ <span class="row-no">16#</span>
</div>
- <span class="row-no">16#</span>
</div>
<!--绗簲缁�-->
<div class="lane">
- <span class="row-no">17#</span>
+ <span class="row-no"></span>
<!-- 璐ф灦 -->
<div class="stock-group">
<div class="site" style="background-color: white"></div>
@@ -872,6 +877,7 @@
<button class="item">66</button>
<button class="item">68</button>
<button class="item">70</button>
+ <span class="row-no">17#</span>
</div>
<div class="stock-group">
<div id="site-108" class="site" style="">108</div>
@@ -910,6 +916,7 @@
<button class="item">66</button>
<button class="item">68</button>
<button class="item">70</button>
+ <span class="row-no">18#</span>
</div>
<!-- 鍫嗗灈鏈� -->
<div class="crn">
@@ -954,6 +961,7 @@
<button class="item">66</button>
<button class="item">68</button>
<button class="item">70</button>
+ <span class="row-no">19#</span>
</div>
<div class="stock-group">
<div class="site" style="background-color: white"></div>
@@ -992,8 +1000,8 @@
<button class="item">66</button>
<button class="item">68</button>
<button class="item">70</button>
+ <span class="row-no">20#</span>
</div>
- <span class="row-no">20#</span>
</div>
</div>
</main>
--
Gitblit v1.9.1