From cb15c6400b7dfc3855e5fdd76b8b217bf6bc9567 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <xltys1995>
Date: 星期三, 30 十二月 2020 10:55:09 +0800
Subject: [PATCH] #
---
src/main/webapp/static/css/console.css | 253 +++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 195 insertions(+), 58 deletions(-)
diff --git a/src/main/webapp/static/css/console.css b/src/main/webapp/static/css/console.css
index 0035f9a..c82ff51 100644
--- a/src/main/webapp/static/css/console.css
+++ b/src/main/webapp/static/css/console.css
@@ -4,13 +4,17 @@
body {
height: 100%;
- background-color: #fff;
+ 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: 20%;
opacity: 0.8;
position: relative;
@@ -26,24 +30,36 @@
/* 绯荤粺杩愯鐘舵�� */
.system-state {
float: left;
- margin-left: 30px;
- margin-top: 30px;
+ width: 10%;
+ height: 100%;
+ padding: 20px;
text-align: center;
color: #2d6aff;
}
-.system-icon {
- width: 100px;
- height: 100px;
- background-image: url("../image/stop48.png");
+#system-icon {
+ display: inline-block;
+ width: 70%;
+ height: 70%;
background-repeat: no-repeat;
background-size:100% 100%;
background-position: top center;
cursor: pointer;
}
-.system-state span {
+.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;
}
/* 鐘舵�佹樉绀� */
@@ -63,7 +79,7 @@
/* 棰滆壊鎻愮ず */
.tips {
position: absolute;
- bottom: 5%;
+ bottom: 7%;
left: 10%;
}
.tips-item {
@@ -87,7 +103,11 @@
/* ------------------------------------ 涓讳綋 ------------------------------------*/
main {
- height: 80%;
+ margin-top: 8px;
+ border-radius: 5px;
+ box-shadow: 0 0 3px rgba(0,0,0,.3);
+ background-color: #fff;
+ height: 75.8%;
position: relative;
}
@@ -98,35 +118,28 @@
}
/* 杈撻�佺嚎绗竴鍒� */
.site-row-1 {
- left: 400px;
+ left: 200px;
}
.site-row-1 .site {
width: 100px;
}
+
/* 杈撻�佺嚎绗簩鍒� */
.site-row-2 {
- left: 500px;
+ top: 226px;
+ left: 440px;
}
.site-row-2 .site {
- width: 100px;
+ width: 80px;
}
+
/* 杈撻�佺嚎绗笁鍒� */
.site-row-3 {
- left: 600px;
- width: 100px;
+ top: 226px;
+ left: 520px;
}
.site-row-3 .site {
- float: left;
- width: 100px;
-}
-/* 杈撻�佺嚎绗洓鍒� */
-.site-row-4 {
- left: 700px;
- width: 100px;
-}
-.site-row-4 .site {
- float: right;
- width: 100px;
+ width: 80px;
}
/* 绔欑偣 */
@@ -144,6 +157,7 @@
.site-none {
border: none;
background-color: transparent;
+ cursor: default;
}
/* 鑷姩 */
.site-auto {
@@ -166,18 +180,52 @@
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: 250px;
- left: 600px;
+ top: 100px;
+ left: 300px;
}
.main-part .lane {
- margin-bottom: 30px;
+ /*margin-bottom: 30px;*/
}
/* 鎺掑彿 */
.row-no {
+ font-weight: bolder;
margin-left: 80px;
}
@@ -189,6 +237,7 @@
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;*/
@@ -233,41 +282,74 @@
}
/* 鍏ュ簱 */
-.machine-put {
- background-color: #90d0f3;
+.machine-pakin {
+ background-image: url("../image/Crane_store.png");
}
/* 鍑哄簱 */
-.machine-take {
- background-color: yellow;
+.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 {
+.machine-site-move-flag {
background-color: #faa328;
}
/* PToP */
-.machine-p-move {
+.machine-p-move-flag {
background-color: #128014;
color: #fff;
}
/* 寮傚父 */
-.machine-error {
+.machine-error-flag {
background-color: red;
}
/* 鑷姩 */
-.machine-auto {
+.machine-auto-flag {
background-color: rgb(42,253,47);
}
/* 闈炶嚜鍔�/鏀跺埌 */
-.machine-unauto {
+.machine-unauto-flag {
background-color: #aaaaaa;
}
-
-
/* 鍫嗗灈鏈鸿建閬� */
.pathway {
@@ -276,30 +358,85 @@
position: absolute;
background-color:#333!important;
color: #333 !important;
- width: 90%;
+ width: 93%;
margin-top: 10px;
- z-index: -1;
}
-
/* 杈撻�佺嚎鐩稿叧 */
.site:hover {
opacity: 0.7;
}
+/* 鍏ュ簱鍙� */
+.cargo-put {
+ transform: rotateY(180deg);
+ top: 265px;
+ left: 313px;
+ 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: 300px;
+ left: 200px;
+}
+/* 鎵爜鍣ㄦ暟鎹�1 */
+#code-decoder-data-1 {
+ font-size: xx-small;
+ margin-left: 35px;
+}
+/* 鎵爜鍣�2 */
+#code-decoder-2 {
+ top: 285px;
+ left: 440px;
+}
+/* 鎵爜鍣ㄦ暟鎹�2 */
+#code-decoder-data-2 {
+ font-size: xx-small;
+ margin-left: 35px;
+}
-/* 鍔ㄧ敾 */
-/*.machine {*/
- /*position: relative;*/
- /*-webkit-animation: machine 2s;*/
- /*animation: machine 2s;*/
- /*animation-fill-mode: forwards;*/
-/*}*/
-/*@-webkit-keyframes machine {*/
- /*from {left: 0;}*/
- /*to {left: 100px}*/
-/*}*/
-/*@keyframes animationCrn {*/
- /*from {left: 0}*/
- /*to {left: 100px}*/
-/*}*/
\ No newline at end of file
+/* 寮圭獥 */
+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;
+}
+
--
Gitblit v1.9.1