From 9ff1f1f221aeafc99653c846b2c2442f9c033ee5 Mon Sep 17 00:00:00 2001
From: tqs <56479841@qq.com>
Date: 星期二, 11 十月 2022 08:08:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'gitbit/gzynwcs' into gzynwcs
---
src/main/webapp/static/css/render.css | 78 +++++++++++++++++++++++++++++++--------
1 files changed, 62 insertions(+), 16 deletions(-)
diff --git a/src/main/webapp/static/css/render.css b/src/main/webapp/static/css/render.css
index deab3e7..c90fc30 100644
--- a/src/main/webapp/static/css/render.css
+++ b/src/main/webapp/static/css/render.css
@@ -299,6 +299,19 @@
border: 1px solid rgb(108,167,168);
background-color: rgb(108, 167, 168);
}
+
+/*搴撲綅*/
+.loc {
+ position: absolute;
+ color: #333;
+ cursor: pointer;
+ text-align: center;
+ background-color: rgb(120,255,129);
+ font-size: 14px;
+ z-index: 9;
+}
+
+
/* 鍏ュ簱 */
.machine-put-flag {
padding: 0 10px;
@@ -362,27 +375,27 @@
/* 闈欑疆瀹屾垚 */
-.loc-empty {
+.LOC_STAY_OVER {
background-color: rgb(163,214,242);
}
/* 鍦ㄥ簱闈欑疆涓�*/
-.loc-wait {
+.LOC_STAY {
background-color: rgb(151,180,0);
}
/* 鍦ㄥ簱寰呮祴 */
-.loc-in-wait {
+.LOC_WAIT_TESTINT {
background-color: rgb(58,77,249);
}
/* 鍦ㄥ簱娴嬭瘯涓� */
-.loc-testing {
+.LOC_TESTING {
background-color: rgb(240,140,10);
}
/* 寮傚父 */
-.loc-error {
+.LOC_ERROR {
background-color: rgb(252,48,48);
}
/* 绌哄簱浣� */
-.loc-empty {
+.LOC_EMPTY {
background-color: rgb(132,255,115);
}
@@ -446,11 +459,11 @@
width: 291px;
height: 365px;
background-image: url(../images/Popup-yellow.png);
- position: fixed;
+ position: absolute;
color:white;
- left: 50%;
- top: 50%;
- transform: translate(-50%,-50%);
+ /*left: 50%;*/
+ /*top: 50%;*/
+ /*transform: translate(-50%,-50%);*/
z-index: 101;
}
/* 杈撻�佽澶囧脊绐� */
@@ -458,11 +471,11 @@
width: 291px;
height: 336px;
background-image: url(../images/Popup-green.png);
- position: fixed;
+ position: absolute;
color:white;
- left: 50%;
- top: 50%;
- transform: translate(-50%,-50%);
+ /*left: 50%;*/
+ /*top: 50%;*/
+ /*transform: translate(-50%,-50%);*/
z-index: 101;
}
#siteWindow-head {
@@ -514,8 +527,41 @@
margin-top: 15px;
margin-right: 80px;
}
-
-
+/*搴撲綅寮圭獥*/
+#locWindow {
+ width: 292px;
+ height: 175px;
+ background-color: rgba(0,0,0,0.85);
+ border-radius: 20px;
+ position: absolute;
+ color:white;
+ z-index: 101;
+}
+#locWindow-head {
+ background-color: rgb(163,214,242);
+ width: 292px;
+ height: 55px;
+ line-height: 55px;
+ color: #000000;
+ font-weight: 700;
+ letter-spacing: 2px;
+ text-indent: 1em;
+}
+#locWindow-head .detailed {
+ display: inline-block;
+}
+#locWindow-head button {
+ width: 25px;
+ height: 25px;
+ padding: 0px;
+ border: none;
+ border-radius: 25px;
+ background-image: url(../images/siteclose.png);
+ display: inline-block;
+ float: right;
+ margin-top: 15px;
+ margin-right: 40px;
+}
/* 寮圭獥 */
form .form-item {
--
Gitblit v1.9.1