From 85784d74c87c95d6f6994be691166dba3a3a32b6 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 01 九月 2020 15:35:32 +0800
Subject: [PATCH] #
---
src/main/webapp/static/css/console.css | 172 +++++++++++++++++++++++++++++++++++---------------------
1 files changed, 107 insertions(+), 65 deletions(-)
diff --git a/src/main/webapp/static/css/console.css b/src/main/webapp/static/css/console.css
index 1f24a7f..a14069d 100644
--- a/src/main/webapp/static/css/console.css
+++ b/src/main/webapp/static/css/console.css
@@ -30,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;
}
/* 鐘舵�佹樉绀� */
@@ -111,31 +123,6 @@
.site-row-1 .site {
width: 100px;
}
-/* 杈撻�佺嚎绗簩鍒� */
-.site-row-2 {
- left: 200px;
-}
-.site-row-2 .site {
- width: 100px;
-}
-/* 杈撻�佺嚎绗笁鍒� */
-.site-row-3 {
- left: 300px;
- width: 100px;
-}
-.site-row-3 .site {
- float: left;
- width: 100px;
-}
-/* 杈撻�佺嚎绗洓鍒� */
-.site-row-4 {
- left: 400px;
- width: 100px;
-}
-.site-row-4 .site {
- float: right;
- width: 100px;
-}
/* 绔欑偣 */
.site {
@@ -152,6 +139,7 @@
.site-none {
border: none;
background-color: transparent;
+ cursor: default;
}
/* 鑷姩 */
.site-auto {
@@ -178,11 +166,11 @@
/* ------------------ 璐ф灦鎬绘垚 ------------------ */
.main-part {
position: absolute;
- top: 250px;
- left: 300px;
+ top: 100px;
+ left: 200px;
}
.main-part .lane {
- margin-bottom: 30px;
+ /*margin-bottom: 30px;*/
}
/* 鎺掑彿 */
.row-no {
@@ -198,6 +186,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;*/
@@ -242,37 +231,72 @@
}
/* 鍏ュ簱 */
-.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;
}
@@ -283,7 +307,7 @@
position: absolute;
background-color:#333!important;
color: #333 !important;
- width: 90%;
+ width: 95%;
margin-top: 10px;
}
@@ -294,11 +318,12 @@
/* 鍏ュ簱鍙� */
.cargo-put {
- top: 68px;
- left: 113px;
+ /*transform: rotateY(180deg);*/
+ top: 160px;
+ left: 43px;
position: absolute;
width: 50px;
- height: 50px;
+ height: 40px;
background-image: url("../image/fork_r.png");
background-repeat: no-repeat;
background-size:100% 100%;
@@ -323,8 +348,8 @@
}
/* 鎵爜鍣�1 */
#code-decoder-1 {
- top: 240px;
- left: 470px;
+ top: 144px;
+ left: 100px;
}
/* 鎵爜鍣ㄦ暟鎹�1 */
#code-decoder-data-1 {
@@ -332,20 +357,37 @@
margin-left: 35px;
}
+/* 鎵爜鍣�1 */
+#code-decoder-2 {
+ top: 204px;
+ left: 100px;
+}
+/* 鎵爜鍣ㄦ暟鎹�1 */
+#code-decoder-data-2 {
+ font-size: xx-small;
+ margin-left: 35px;
+}
+/* 寮圭獥 */
+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;
+}
-/* 鍔ㄧ敾 */
-/*.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
--
Gitblit v1.9.1