From c350b737713fe518c22036dfc9a2574bcafcb15c Mon Sep 17 00:00:00 2001
From: vincent <1341870251@qq.com>
Date: 星期二, 02 六月 2020 15:18:08 +0800
Subject: [PATCH] #

---
 src/main/webapp/static/css/console.css |  203 ++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 176 insertions(+), 27 deletions(-)

diff --git a/src/main/webapp/static/css/console.css b/src/main/webapp/static/css/console.css
index 3ffc1cc..1f24a7f 100644
--- a/src/main/webapp/static/css/console.css
+++ b/src/main/webapp/static/css/console.css
@@ -4,47 +4,98 @@
 
 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%;
-    border: 1px solid red;
-    text-align: center;
     opacity: 0.8;
     position: relative;
 }
-header h1 {
-    margin: 0;
-    letter-spacing: 2px;
+/* 鍒嗗壊绾� */
+.header-hr {
+    border-radius: 5px;
+    border: 1px solid #777;
+    width: 80%;
+    position: absolute;
+    bottom: 0;
+}
+/* 绯荤粺杩愯鐘舵�� */
+.system-state {
+    float: left;
+    margin-left: 30px;
+    margin-top: 30px;
+    text-align: center;
+    color: #2d6aff;
+}
+.system-icon {
+    width: 100px;
+    height: 100px;
+    background-image: url("../image/stop48.png");
+    background-repeat: no-repeat;
+    background-size:100% 100%;
+    background-position: top center;
+    cursor: pointer;
+}
+.system-state span {
+    display: inline-block;
+    padding-top: 10px;
+    font-weight: bold;
 }
 
 /* 鐘舵�佹樉绀� */
-.machine-state {
+.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;
 }
-.crn-state-group {
-    margin-bottom: 5px;
-}
-/* 鍫嗗灈鏈虹姸鎬� */
-.crn-state {
+.tips-item label {
     display: inline-block;
-    width: 50px;
-    text-align: center;
+    width: 130px;
+    text-align: right;
+    font-size: xx-small;
 }
-/* 绔欑偣鐘舵�� */
-.site-state {
+.item-group {
     display: inline-block;
-    width: 50px;
-    text-align: center;
+}
+.item-group span {
+    font-size: xx-small;
+    padding: 0 10px;
 }
 
 /* ------------------------------------ 涓讳綋 ------------------------------------*/
 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;
 }
 
@@ -55,21 +106,21 @@
 }
 /* 杈撻�佺嚎绗竴鍒� */
 .site-row-1 {
-    left: 400px;
+    left: 100px;
 }
 .site-row-1 .site {
     width: 100px;
 }
 /* 杈撻�佺嚎绗簩鍒� */
 .site-row-2 {
-    left: 500px;
+    left: 200px;
 }
 .site-row-2 .site {
     width: 100px;
 }
 /* 杈撻�佺嚎绗笁鍒� */
 .site-row-3 {
-    left: 600px;
+    left: 300px;
     width: 100px;
 }
 .site-row-3 .site {
@@ -78,7 +129,7 @@
 }
 /* 杈撻�佺嚎绗洓鍒� */
 .site-row-4 {
-    left: 700px;
+    left: 400px;
     width: 100px;
 }
 .site-row-4 .site {
@@ -102,16 +153,40 @@
     border: none;
     background-color: transparent;
 }
+/* 鑷姩 */
+.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;
+}
+
 
 /* ------------------ 璐ф灦鎬绘垚 ------------------ */
 .main-part {
     position: absolute;
     top: 250px;
-    left: 600px;
+    left: 300px;
 }
-
+.main-part .lane {
+    margin-bottom: 30px;
+}
 /* 鎺掑彿 */
 .row-no {
+    font-weight: bolder;
     margin-left: 80px;
 }
 
@@ -166,6 +241,41 @@
     cursor: pointer;
 }
 
+/* 鍏ュ簱 */
+.machine-put {
+    background-color: #90d0f3;
+}
+/* 鍑哄簱 */
+.machine-take {
+    background-color: yellow;
+}
+/* 搴撳埌搴� */
+.machine-stock-move {
+    background-color: #0c24fb;
+    color: #fff;
+}
+/* 绔欏埌绔� */
+.machine-site-move {
+    background-color: #faa328;
+}
+/* PToP */
+.machine-p-move {
+    background-color: #128014;
+    color: #fff;
+}
+/* 寮傚父 */
+.machine-error {
+    background-color: red;
+}
+/* 鑷姩 */
+.machine-auto {
+    background-color: rgb(42,253,47);
+}
+/* 闈炶嚜鍔�/鏀跺埌 */
+.machine-unauto {
+    background-color: #aaaaaa;
+}
+
 /* 鍫嗗灈鏈鸿建閬� */
 .pathway {
     margin-left: 30px;
@@ -175,15 +285,54 @@
     color: #333 !important;
     width: 90%;
     margin-top: 10px;
-    z-index: -1;
 }
-
 
 /* 杈撻�佺嚎鐩稿叧 */
 .site:hover {
     opacity: 0.7;
 }
 
+/* 鍏ュ簱鍙� */
+.cargo-put {
+    top: 68px;
+    left: 113px;
+    position: absolute;
+    width: 50px;
+    height: 50px;
+    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: 240px;
+    left: 470px;
+}
+/* 鎵爜鍣ㄦ暟鎹�1 */
+#code-decoder-data-1 {
+    font-size: xx-small;
+    margin-left: 35px;
+}
+
+
 
 /* 鍔ㄧ敾 */
 /*.machine {*/

--
Gitblit v1.9.1