From 0aa1c9d1a42e2ac5639228d23dfedbc03ded6fb5 Mon Sep 17 00:00:00 2001
From: whycq <whycq>
Date: 星期三, 30 三月 2022 16:28:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zypms' into zypms

---
 src/main/webapp/static/css/style.css |  239 ++++++++++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 195 insertions(+), 44 deletions(-)

diff --git a/src/main/webapp/static/css/style.css b/src/main/webapp/static/css/style.css
index ecbd5f2..e77a081 100644
--- a/src/main/webapp/static/css/style.css
+++ b/src/main/webapp/static/css/style.css
@@ -14,18 +14,31 @@
 }
 #top-tab {
     width: 100%;
-    height: 10%;
+    height: 109px;
     background-image: url(../image/head_bg.png);
     background-repeat: no-repeat;
 	background-position: center center;
 	background-size: cover
 }
+#logo-bar {
+	width: 200px;
+	height: 109px;
+	position: absolute;
+}
+#top-tab img {
+	width: 200px;
+	height: 109px;
+	position: absolute;
+	top: -15px;
+	left: 20px;
+	transform: scale(0.6);
+}
+
 #top-tab h1{
     color:white;
     line-height: 94px;
     text-align: center;
 }
-
 #showTime {
     width: 350px;
     height: 80px;
@@ -37,23 +50,17 @@
     text-align: center;
     font-size: 20px;
 }
-#showTime {
-	float: right;
+
+#proType {
+	margin-top: 0%;
+	width: 50%;
+	color: #d9d9d9;
+	align: center;
+	margin-left: 25%;
+	font-size: 10px;
+	font-weight: 100;
 }
 
-table,th,td {
-	border: 1px solid #fff;
-	cursor: default;
-	
-}
-th {
-	height: 50px;
-	width: 50px;
-	background-color: /* #223962 */#3a4a5a;
-}
-td {
-	cursor: pointer;
-}
 
 #main-tab {
 	margin-top: 1%;
@@ -62,16 +69,30 @@
 	color: #d9d9d9;
 	margin-left: 1%;
 }
+#main-tab,th,td{
+	border: 1px solid #fff;
+	cursor: default;
+}
+#main-tab th {
+	height: 50px;
+	width: 50px;
+	background-color: /* #223962 */#3a4a5a;
+}
+
+
 #main-tab td {
    width: 50px;
    height: 50px;
    border-collapse: collapse;
    text-align: center;
-   
+   cursor: pointer;
 }
-/*.normal {*/
-/*	background-color: #009966;*/
-/*}*/
+#main-tab p {
+	font-size: 14px;
+}
+/* .normal {
+	background-color: #009966;
+} */
 .nor-mal {
 	background-color: #3a4a5a;
 }
@@ -80,8 +101,8 @@
 /* 寮瑰嚭灞� */
 #details {
 	width: 98%;
-	height: 95%;
-	background-color: rgba(255,255,255,1);
+	height: 90%;
+	background-color: #FFF;
 	box-shadow: 0px 5px 20px #000;
 	border-radius: 15px;
 	position: relative;
@@ -89,6 +110,50 @@
 	left:1%;
 	display: none;
 	
+}
+#tips {
+	width: 30%;
+	height: 20%;
+	background-color: #FFF;
+	box-shadow: 0px 5px 20px #000;
+	border-radius: 15px;
+	position: relative;
+	top:30%;
+	left:35%;
+	display: none;
+}
+#tips h3 {
+	text-indent: 1em;
+	height: 36px;
+	line-height: 36px;
+	background-color: #2E4E7E;
+	color: #FFFFFF;
+}
+#text {
+	height: 100px;
+	width: 576px;
+/* 	background-color: #016165; */
+	font-size: 18px;
+	font-weight: 900;
+	text-indent: 2em;
+	line-height: 100px;
+}
+#closee {
+	display: inline-block;
+	color: #FFFFFF;
+	height: 30px;
+	width: 80px;
+	background-color: #354352;
+	border: 1px #354352;
+	border-radius: 30px;
+	position: relative;
+	left: 50%;
+	top: 5%;
+	transform: translate(-50% ,-30%);
+}
+
+#details {
+	position: relative;
 }
 #details .head {
 	width: 100%;
@@ -100,33 +165,119 @@
 #details h2 {
 	display: inline-block;
 }
-button {
+#close {
 	display: inline-block;
+	color: #FFFFFF;
 	height: 30px;
 	width: 80px;
-	background-color: #009966;
-	border: 1px #009966;
+	background-color: #354352;
+	border: 1px #354352;
 	border-radius: 30px;
-	margin-top: 10px;
-	margin-right: 10px;
-}
-/* 鐢樼壒鍥� */
-#details-tab {
-	background-color: #282c35;
-	width: 90%;
-	height: 90%;
-	margin-left: 5%;
-	
-}
-#details-tab th {
-	height: 50px;
-	width: 50px;
-}
-#details-tab td {
-	height: 50px;
-	width: 50px;
+	margin-top: 20px;
+	margin-right: 50px;
 }
 
+/* 鐢樼壒鍥� */
+/*宸︿晶椤圭洰鑺傜偣鏃堕棿*/
+#details-tab-left {
+	display: inline-block;
+	position: absolute;
+	float: left;
+	width: 11%;
+	margin-top: 0.5%;
+	margin-left: 1%;
+}
+/*琛ㄥご*/
+.tab-head {
+	background-color: #354352;
+	color: #FFFFFF;
+	font-size: 6px;
+}
+.tab-head>th {
+	width: 73px;
+	height: 30px;
+}
+.tab-head>th:first-child {
+	width: 55px;
+}
+/*琛ㄨ韩*/
+.tab-body {
+	background-color: #354352;
+	color: #FFFFFF;
+	font-size: 6px;
+}
+.tab-body>td {
+	width: 73px;
+	height: 48px;
+	text-align: center;
+}
+.tab-body>td:first-child {
+	width: 55px;
+}
+/*鍙充晶杩涘害琛�*/
+#details-tab {
+	display: inline-block;
+	position: absolute;
+	clear: both;
+	background-color: #FFF;
+	width: 87%;
+	margin-top: 0.5%;
+	margin-left: 12%;
+	overflow-x: scroll;
+}
+
+#details-tab th td{
+	border: 1px solid #d9dce3;
+	cursor: default;
+
+}
+#details-tab th {
+	height: 30px;
+	width: 55px;
+}
+#details-tab td {
+	height: 25px;
+	text-align: center;
+	position: relative;
+
+}
+#tabBody td {
+	border: none;
+}
+
+.loadBox {
+	width: 50px;
+	height: 50px;
+	background-color: #354352;
+	color: #FFFFFF;
+	font-size: 6px;
+}
+.gz-color {
+	height: 50px;
+	border: none;
+}
+
+.loadBox-2 {
+	width: 50px;
+	background-color: #354352;
+	color: #FFFFFF;
+	font-size: 1px;
+	border: 1px solid #ffffff;
+}
+
+
+
+
+#tot th:hover {
+	background-color: #0c64eb;
+}
+
+.over-color{
+	background-color: #aeafaf;
+	opacity: 1;
+
+
+}
 
 
 

--
Gitblit v1.9.1