From 96ffbcb2516c45231f48165f5b8c87898d9901c5 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期二, 30 八月 2022 15:37:31 +0800
Subject: [PATCH] #
---
/dev/null | 507 ----------------------------------------------
src/main/webapp/views/console.html | 58 ++--
src/main/webapp/static/css/console.css | 37 ++-
3 files changed, 54 insertions(+), 548 deletions(-)
diff --git a/src/main/webapp/static/css/console-0.css b/src/main/webapp/static/css/console-0.css
deleted file mode 100644
index 7b1a5f0..0000000
--- a/src/main/webapp/static/css/console-0.css
+++ /dev/null
@@ -1,507 +0,0 @@
-html {
- height: 100%;
-}
-
-body {
- height: 100%;
- background-color: #f1f1f1;
- border-radius: 5px;
- box-shadow: 0 0 3px rgba(0,0,0,.3);
- padding: 10px;
-}
-
-/* ------------------------------------ 澶撮儴 ------------------------------------*/
-header {
- border-radius: 5px;
- box-shadow: 0 0 3px rgba(0,0,0,.3);
- background-color: #fff;
- height: 17%;
- opacity: 0.8;
- position: relative;
-}
-/* 鍒嗗壊绾� */
-.header-hr {
- border-radius: 5px;
- border: 1px solid #777;
- width: 80%;
- position: absolute;
- bottom: 0;
-}
-/* 绯荤粺杩愯鐘舵�� */
-.system-state {
- float: left;
- width: 10%;
- height: 100%;
- padding: 20px;
- text-align: center;
- color: #2d6aff;
-}
-#system-icon {
- display: inline-block;
- width: 70%;
- height: 70%;
- background-repeat: no-repeat;
- background-size:100% 100%;
- background-position: top center;
- cursor: pointer;
-}
-.system-icon-open {
- background-image: url("../image/stop48.png");
-}
-.system-icon-close {
- background-image: url("../image/start48.png");
-}
-
-#system-run-desc {
- font-size: large;
- display: inline-block;
- padding-top: 10px;
- font-weight: bold;
- overflow: hidden;
- text-overflow:ellipsis;
- white-space: nowrap;
-}
-
-/* 鐘舵�佹樉绀� */
-.data-window {
- padding-top: 20px;
- float: left;
- width: 70%;
- text-align: center;
-}
-.data-window h1 {
- font-size: 3em;
- margin: 0;
- letter-spacing: 1px;
- font-weight: inherit;
-}
-
-/* 棰滆壊鎻愮ず */
-.tips {
- position: absolute;
- bottom: 7%;
- left: 10%;
-}
-.tips-item {
- margin-bottom: 0;
- font-size: 0;
- text-align: left;
-}
-.tips-item label {
- display: inline-block;
- width: 130px;
- text-align: right;
- font-size: xx-small;
-}
-.item-group {
- display: inline-block;
-}
-.item-group span {
- font-size: xx-small;
- padding: 0 10px;
-}
-
-/* ------------------------------------ 涓讳綋 ------------------------------------*/
-main {
- margin-top: 8px;
- border-radius: 5px;
- box-shadow: 0 0 3px rgba(0,0,0,.3);
- background-color: #fff;
- height: 82%;
- position: relative;
-}
-
-/* ------------------ 杈撻�佺嚎鎬绘垚 ------------------ */
-.site-row {
- position: absolute;
- top: 122px;
-}
-/* 杈撻�佺嚎绗�0鍒� */
-.site-row-0 {
- top: 162px;
- left: 140px;
-}
-.site-row-0 .site {
- width: 80px;
-}
-
-/* 杈撻�佺嚎绗竴鍒� */
-.site-row-1 {
- top: 188px;
- left: 120px;
-}
-.site-row-1 .site {
- width: 70px;
-}
-
-/* 杈撻�佺嚎绗簩鍒� */
-.site-row-2 {
- top: 188px;
- left: 190px;
-}
-.site-row-2 .site {
- width: 70px;
-}
-
-/* 杈撻�佺嚎绗笁鍒� */
-.site-row-3 {
- top: 229px;
- left: 260px;
-}
-.site-row-3 .site {
- width: 70px;
-}
-
-/* 杈撻�佺嚎绗�4鍒� */
-.site-row-4 {
- top: 188px;
- left: 260px;
-}
-.site-row-4 .site {
- /*width: 80px;*/
-}
-
-/* 杈撻�佺嚎绗�5鍒� */
-.site-row-5 {
- top: 55px;
- left: 400px;
-}
-.site-row-5 .site {
- width: 70px;
-}
-
-.site-row-6 {
- top: 55px;
- left: 470px;
-}
-.site-row-6 .site {
- width: 70px;
-}
-
-/* 绔欑偣 */
-.site {
- color: #333;
- height: 20px;
- border: 1px solid #fff;
- cursor: pointer;
- width: 50px;
- text-align: center;
- background-color: #21ff3a;
- font-size: 13px;
-}
-/*绌虹珯鐐�*/
-.site-1{
- color: #333;
- height: 20px;
- border: 1px solid #fff;
- cursor: pointer;
- width: 50px;
- text-align: center;
- background-color: #ffffff;
- font-size: 13px;
-}
-/* 鏃犳晥绔欑偣锛堝繀椤诲湪site涓嬮潰锛� */
-
-.site-none {
- border: none;
- background-color: transparent;
- cursor: default;
-}
-/* 鑷姩 */
-.site-auto {
- background-color: rgb(42,253,47);
-}
-/* 闈炶嚜鍔�/鏀跺埌 */
-.site-unauto {
- background-color: #aaaaaa;
-}
-/* 鑷姩+鏈夌墿+ID */
-.site-auto-run-id {
- background-color: red;
-}
-/* 鑷姩+鏈夌墿 */
-.site-auto-run {
- background-color: #fc29f8;
-}
-/* 鑷姩+鏈夌墿+ID */
-.site-auto-id {
- background-color: yellow;
-}
-
-/* ------------------ 鍙拌溅 ------------------ */
-/* 杞ㄩ亾 */
-.car-track {
- position: absolute;
- /*background: url(../image/bg.jpg);*/
-}
-#car-track-1 {
- text-align: center;
- top: 122px;
- left: 100px;
- width: 100px;
- height: 180px;
-}
-#car-track-1 div {
- height: 100%;
- display: inline-block;
- width: 75%;
- border-left: 5px solid #313131;
- border-right: 5px solid #313131;
-}
-
-/* 杞� */
-.car {
- position: absolute;
-}
-#site-8 {
- top: 122px;
- left: 100px;
- width: 100px;
- height: 20px;
- line-height: 20px;
- position: absolute;
-}
-
-/* ------------------ 璐ф灦鎬绘垚 ------------------ */
-.main-part {
- position: absolute;
- top: 10px;
- left: 540px;
-}
-.main-part .lane {
- /*margin-bottom: 30px;*/
-}
-/* 鎺掑彿 */
-.row-no {
- font-size: 14px;
- font-weight: bold;
- margin-left: 10px;
-}
-
-/* 搴撲綅缁� */
-.stock-group .item {
- float: left;
- border-top: 1px solid #333!important;
- border-bottom: 1px solid #333!important;
- border-left: 1px solid #333!important;
- border-right: 1px solid #333!important;
- border-right: none;
- cursor: inherit;
-}
-.stock-group .item:last-child {
- /*border-right: 1px solid #333!important;*/
-}
-.stock-group::after, .stock-group::before {
- content: "";
- display: table;
- clear: both;
-}
-.stock-group .site {
- width: 80px;
- float: left;
-}
-button.item {
- font-size: 13px;
- padding: 1px 1px 1px 1px;
- width: 30px;
- height: 20px;
- outline: none;
- cursor: pointer;
- color: #333;
- background-color: transparent;
- transition: 0.4s;
-}
-button.item:hover {
- background-color: #333;
- color: #fff;
-}
-
-/* 鍫嗗灈鏈� */
-.machine {
- margin-left: 30px;
- position: relative;
- 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;
-}
-
-/* 鍏ュ簱 */
-.machine-pakin {
- background-image: url("../image/Crane_store.png");
-}
-/* 鍑哄簱 */
-.machine-pakout {
- background-image: url("../image/Crane_retrieve.png");
-}
-/* 搴撳埌搴� */
-.machine-stock-move {
- background-image: url("../image/Crane_loctoloc.png");
-}
-/* 绔欏埌绔� */
-.machine-site-move {
- background-image: url("../image/Crane_stntostn.png");
-}
-/* p to p */
-.machine-p-move {
- background-image: url("../image/Crane_hptoohp.png");
-}
-/* 寮傚父 */
-.machine-error {
- background-image: url("../image/Crane_error.png");
-}
-/* 鑷姩 */
-.machine-auto {
- background-image: url("../image/Crane_auto.png");
-}
-/* 闈炶嚜鍔�/鏀跺埌 */
-.machine-un-auto {
- background-image: url("../image/Crane_manual.png");
-}
-
-
-
-/* 鍏ュ簱 */
-.machine-put-flag {
- background-color: #90d0f3;
-}
-/* 鍑哄簱 */
-.machine-take-flag {
- background-color: yellow;
-}
-/* 搴撳埌搴� */
-.machine-stock-move-flag {
- background-color: #0c24fb;
- color: #fff;
-}
-/* 绔欏埌绔� */
-.machine-site-move-flag {
- background-color: #faa328;
-}
-/* PToP */
-.machine-p-move-flag {
- background-color: #128014;
- color: #fff;
-}
-/* 寮傚父 */
-.machine-error-flag {
- background-color: red;
-}
-/* 鑷姩 */
-.machine-auto-flag {
- background-color: rgb(42,253,47);
-}
-/* 闈炶嚜鍔�/鏀跺埌 */
-.machine-unauto-flag {
- background-color: #aaaaaa;
-}
-
-/* 鍫嗗灈鏈鸿建閬� */
-.pathway {
- margin-left: 30px;
- border: 1px solid #333;
- position: absolute;
- background-color:#333!important;
- color: #333 !important;
- width: 100%;
- margin-top: 10px;
-}
-
-/* 杈撻�佺嚎鐩稿叧 */
-.site:hover {
- opacity: 0.7;
-}
-
-/* 鍏ュ簱鍙� */
-/*.cargo-put-0 {*/
-/* transform: rotateY(180deg);*/
-/* top: 338px;*/
-/* left: 1710px;*/
-/* position: absolute;*/
-/* width: 50px;*/
-/* height: 40px;*/
-/* background-image: url("../image/fork_r.png");*/
-/* background-repeat: no-repeat;*/
-/* background-size:100% 100%;*/
-/* background-position: top center;*/
-/*}*/
-/*.cargo-put-1 {*/
-/* top: 108px;*/
-/* left: 152px;*/
-/* position: absolute;*/
-/* width: 50px;*/
-/* height: 40px;*/
-/* background-image: url("../image/fork_r.png");*/
-/* background-repeat: no-repeat;*/
-/* background-size:100% 100%;*/
-/* 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 {
- font-size: small;
- display: inline-block;
- /*transform: scale(0.90);*/
-}
-/* 鎵爜鍣�1 */
-#code-decoder-1 {
- top: 267px;
- left: 1780px;
-}
-/* 鎵爜鍣ㄦ暟鎹�1 */
-#code-decoder-data-1 {
- font-size: xx-small;
- margin-left: 35px;
-}
-/* 纾呯Г */
-.scale {
- position: absolute;
- width: 50px;
- height: 20px;
- /*background-image: url("../image/bscanner.png");*/
- background-repeat: no-repeat;
- background-size:100% 60%;
- background-position: top center;
-}
-/* 纾呯Г1 */
-#scale-1 {
- top: 290px;
- left: 240px;
-}
-
-/* 寮圭獥 */
-form .form-item {
- display: inline-block;
- padding-top: 10px;
- padding-left: 5px;
-}
-form .form-item-label {
- float: left;
- text-align: right;
- padding: 1px 6px;
- display: inline-block;
- vertical-align: middle;
-}
-form .form-item-input {
- display: inline-block;
- float: left;
- vertical-align: middle;
-}
-form .form-item-input input {
- height: 1.5rem;
- padding-left: 0.5rem;
-}
-
diff --git a/src/main/webapp/static/css/console.css b/src/main/webapp/static/css/console.css
index fd618b0..6466afe 100644
--- a/src/main/webapp/static/css/console.css
+++ b/src/main/webapp/static/css/console.css
@@ -289,34 +289,49 @@
top: 122px;
}
.site-row-1 {
- top: 67px;
- left: 392px;
+ top: 327px;
+ left: 417px;
}
.site-row-1 .site {
width: 80px;
}
.site-row-2 {
- top: 67px;
- left: 474px;
+ top: 327px;
+ left: 499px;
}
.site-row-2 .site {
- width: 80px;
+ width: 70px;
}
.site-row-3 {
- top: 67px;
- left: 556px;
+ top: 327px;
+ left: 571px;
}
.site-row-3 .site {
width: 80px;
}
.site-row-4 {
- top: 67px;
- left: 638px;
+ top: 327px;
+ left: 653px;
}
.site-row-4 .site {
- width: 80px;
+ width: 70px;
+}
+/* 杈撻�佺嚎绗�5鍒� */
+.site-row-5 {
+ top: 213px;
+ left: 725px;
+}
+.site-row-5 .site {
+ width: 70px;
}
+.site-row-6 {
+ top: 213px;
+ left: 797px;
+}
+.site-row-6 .site {
+ width: 70px;
+}
/* ------------------ 璐ф灦鎬绘垚 ------------------ */
.main-part {
@@ -351,7 +366,7 @@
border-right: 1px solid rgb(194,76,65);
}
.stock-group .item-hide {
- opacity: .8;
+ opacity: .7;
}
/*.stock-group .item-hide:hover {*/
/* opacity: 0;*/
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index 40d68fb..34a8653 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -18,50 +18,48 @@
<main class="main">
<!-- 绗�1鍒� -->
<div class="site-row site-row-1">
- <div id="site-102" class="site" style="height: 18px;line-height: 18px;width:80px;margin-top: 340px">102</div>
-
- <div id="site-101" class="site" style="height: 18px;line-height: 18px;width:80px;margin-top: 20px">101</div>
-
- <div id="site-100" class="site" style="height: 18px;line-height: 18px;width:80px;margin-top: 184px">100</div>
+ <div id="site-100" class="site" style="height: 36px;line-height: 36px;">100</div>
+ <div id="site-200" class="site" style="height: 30px;line-height: 30px;margin-top: 26px;">200</div>
</div>
<!-- 绗�2鍒�-->
<div class="site-row site-row-2">
+ <div id="site-101" class="site" style="height: 36px;line-height: 36px;">101</div>
+ <div id="site-300" class="site" style="height: 24px;line-height: 24px;">300</div>
+ <div id="site-201" class="site" style="height: 30px;line-height: 30px;">201</div>
</div>
<!-- 绗�3鍒� -->
<div class="site-row site-row-3">
- <div id="site-118" class="site" style="height: 18px;line-height: 18px;width:80px;">118</div>
-
- <div id="site-115" class="site" style="height: 18px;line-height: 18px;width:80px;margin-top: 47px">115</div>
-
- <div id="site-112" class="site" style="height: 18px;line-height: 18px;width:80px;margin-top: 168px">112</div>
-
- <div id="site-107" class="site" style="height: 18px;line-height: 18px;width:80px;margin-top: 105px">107</div>
-
- <div id="site-103" class="site" style="height: 18px;line-height: 18px;width:80px;margin-top: 184px">103</div>
+ <div id="site-102" class="site" style="height: 36px;line-height: 36px;">102</div>
+ <div id="site-202" class="site" style="height: 30px;line-height: 30px;margin-top: 26px;">202</div>
</div>
<!-- 绗�4鍒� -->
<div class="site-row site-row-4">
- <div id="site-119" class="site" style="height: 18px;line-height: 18px;width:80px;">119</div>
-
- <div id="site-117" class="site" style="height: 18px;line-height: 18px;width:80px;margin-top: 27px">117</div>
- <div id="site-116" class="site" style="height: 18px;line-height: 18px;width:80px;">116</div>
-
- <div id="site-113" class="site" style="height: 18px;line-height: 18px;width:80px;margin-top: 168px">113</div>
- <div id="site-114" class="site" style="height: 18px;line-height: 18px;width:80px;">114</div>
-
- <div id="site-111" class="site" style="height: 18px;line-height: 18px;width:80px;margin-top: 25px">111</div>
- <div id="site-110" class="site" style="height: 18px;line-height: 18px;width:80px;">110</div>
- <div id="site-109" class="site" style="height: 18px;line-height: 18px;width:80px;">109</div>
- <div id="site-108" class="site" style="height: 18px;line-height: 18px;width:80px;">108</div>
-
- <div id="site-104" class="site" style="height: 18px;line-height: 18px;width:80px;margin-top: 184px">104</div>
- <div id="site-105" class="site" style="height: 18px;line-height: 18px;width:80px;">105</div>
+ <div id="site-103" class="site" style="height: 36px;line-height: 36px;">103</div>
+ <div id="site-203" class="site" style="height: 30px;line-height: 30px;margin-top: 26px;">203</div>
</div>
<!-- 绗�5鍒� -->
<div class="site-row site-row-5">
+ <div id="site-107" class="site" style="height: 36px;line-height: 36px;">107</div>
+ <div id="site-106" class="site" style="height: 36px;line-height: 36px;">106</div>
+ <div id="site-105" class="site" style="height: 36px;line-height: 36px;">105</div>
+ <div id="site-104" class="site" style="height: 36px;line-height: 36px;">104</div>
+
+ <div id="site-204" class="site" style="height: 30px;line-height: 30px;margin-top: 26px">204</div>
+ <div id="site-205" class="site" style="height: 32px;line-height: 32px;">205</div>
+ <div id="site-206" class="site" style="height: 32px;line-height: 32px;">206</div>
+ <div id="site-207" class="site" style="height: 32px;line-height: 32px;">207</div>
</div>
<!-- 绗�6鍒� -->
<div class="site-row site-row-6">
+ <div id="site-108" class="site" style="height: 36px;line-height: 36px;">108</div>
+ <div id="site-109" class="site" style="height: 36px;line-height: 36px;">109</div>
+ <div id="site-110" class="site" style="height: 36px;line-height: 36px;">110</div>
+ <div id="site-111" class="site" style="height: 36px;line-height: 36px;">111</div>
+
+ <div id="site-211" class="site" style="height: 30px;line-height: 30px;margin-top: 26px">211</div>
+ <div id="site-210" class="site" style="height: 32px;line-height: 32px;">210</div>
+ <div id="site-209" class="site" style="height: 32px;line-height: 32px;">209</div>
+ <div id="site-208" class="site" style="height: 32px;line-height: 32px;">208</div>
</div>
<!-- 璐ф灦 + 鍫嗗灈鏈� + 鍏ュ簱绔欑偣 -->
@@ -1297,7 +1295,7 @@
})
item.addEventListener('mouseleave', function () {
items.forEach((item)=> {
- item.style.opacity= .8;
+ item.style.opacity= .7;
})
})
})
--
Gitblit v1.9.1