From d113a9c68c36e9e54ffe56342e30d59e5ee0629d Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期五, 09 九月 2022 14:50:10 +0800
Subject: [PATCH] #

---
 src/main/webapp/static/css/style3.css        |    6 +-
 src/main/webapp/static/css/style4.css        |   10 ++++-
 src/main/webapp/static/js/changetime.js      |    1 
 src/main/webapp/views/index_datashow3.html   |   26 ++++++++-----
 src/main/resources/application.yml           |    2 
 src/main/webapp/views/testview/testview.html |   29 ++++++++------
 6 files changed, 45 insertions(+), 29 deletions(-)

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 5f78c24..c0fc9ae 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -12,7 +12,7 @@
     #姝e紡鏁版嵁搴�
 #    url: jdbc:sqlserver://192.168.4.15:1433;databasename=zypms_pro
     #澶囦唤鏁版嵁搴�
-    url: jdbc:sqlserver://localhost:1433;databasename=zypms
+    url: jdbc:sqlserver://192.168.4.15:1433;databasename=zypms
     username: sa
     password: sa@123
   mvc:
diff --git a/src/main/webapp/static/css/style3.css b/src/main/webapp/static/css/style3.css
index 88d4b0f..c8fecac 100644
--- a/src/main/webapp/static/css/style3.css
+++ b/src/main/webapp/static/css/style3.css
@@ -17,7 +17,7 @@
     width: 100%;
 	/*margin: 0;*/
 	/*background-color: !* #2C3E50 *! #2e4e7e;*/
-	position: absolute;
+	position: relative;
 }
 
 #top-tab {
@@ -115,7 +115,8 @@
 /* 寮瑰嚭灞� */
 #details {
 	width: 98%;
-	height: 90%;
+	height: 170%;
+	margin-bottom: 100px;
 	background-color: #FFF;
 	box-shadow: 0px 5px 20px #000;
 	border-radius: 15px;
@@ -123,7 +124,6 @@
 	top:2.5%;
 	left:1%;
 	display: none;
-	
 }
 #tips {
 	width: 30%;
diff --git a/src/main/webapp/static/css/style4.css b/src/main/webapp/static/css/style4.css
index 52339e3..d9d7f69 100644
--- a/src/main/webapp/static/css/style4.css
+++ b/src/main/webapp/static/css/style4.css
@@ -10,6 +10,7 @@
 	/*min-height: 1080px;*/
 	/*height: auto !important;*/
 	height: 1080px;
+	margin-bottom: 100px;
 }
 .header {
 	height: 8rem;
@@ -51,11 +52,16 @@
 	left: 0;
 	top: 50px;
 	position: absolute;
-	/*background-color: #fff;*/
 	width: 92%;
 	margin-left: 4%;
 	min-height: 300px;
 	height: auto !important;
 	height: 300px;
-	box-shadow: 0px 0px 20px #888888;
+	background-color: #FFFFFF;
+}
+.colors {
+	position: relative;
+	/*width: 100%;*/
+	background-color: #FFFFFF;
+	/*box-shadow: 0px 0px 20px #888888;*/
 }
\ No newline at end of file
diff --git a/src/main/webapp/static/js/changetime.js b/src/main/webapp/static/js/changetime.js
new file mode 100644
index 0000000..0d7d00e
--- /dev/null
+++ b/src/main/webapp/static/js/changetime.js
@@ -0,0 +1 @@
+$(document).onclick
\ No newline at end of file
diff --git a/src/main/webapp/views/index_datashow3.html b/src/main/webapp/views/index_datashow3.html
index cb0d86d..9b03d02 100644
--- a/src/main/webapp/views/index_datashow3.html
+++ b/src/main/webapp/views/index_datashow3.html
@@ -11,6 +11,7 @@
 <!--	<script src="../static/js/tableData2.js"></script>-->
 	<script src="../static/js/tableData3.js"></script>
 	<script src="../static/js/projectShow3.js"></script>
+	<script src="../static/js/projectShow3.js"></script>
 	<script src="../static/js/cols.js"></script>
 </head>
 <body>
@@ -38,19 +39,24 @@
 			</table>
 		</div>
     </div>
+
 	<div id="details">
-		<div class="head">
-			<h2></h2>
-			<button id="close" type="button" style="float: right;">鍏� 闂�</button>
+		<div style="width: 98%;height: 110%;">
+			<div class="head">
+				<h2></h2>
+				<button id="close" type="button" style="float: right;">鍏� 闂�</button>
+			</div>
+			<table id="details-tab-left" cellspacing="0" cellpadding="0"></table>
+			<table id="details-tab" cellspacing="0" cellpadding="0">
+				<thead>
+				</thead>
+				<tbody>
+				</tbody>
+			</table>
 		</div>
-		<table id="details-tab-left" cellspacing="0" cellpadding="0"></table>
-		<table id="details-tab" cellspacing="0" cellpadding="0">
-			<thead>
-			</thead>
-			<tbody>
-			</tbody>
-		</table>
 	</div>
+
+
 	<div id="tips">
 		<h3>鎻愮ず</h3>
 		<div id="text">褰撳墠椤圭洰璁″垝鏃堕棿涓嶅畬鏁达紱璇疯ˉ鍏呭畬鎴愬悗閲嶈瘯!</div>
diff --git a/src/main/webapp/views/testview/testview.html b/src/main/webapp/views/testview/testview.html
index e18d635..010fd88 100644
--- a/src/main/webapp/views/testview/testview.html
+++ b/src/main/webapp/views/testview/testview.html
@@ -154,19 +154,22 @@
             </table>
         </div>
         <div class="float">
-            <li style="height: 100px;background-color: #7a8191">1</li>
-            <li style="height: 100px;background-color: #7a8191">1</li>
-            <li style="height: 100px;background-color: #7a8191">1</li>
-            <li style="height: 100px;background-color: #7a8191">1</li>
-            <li style="height: 100px;background-color: #7a8191">1</li>
-            <li style="height: 100px;background-color: #7a8191">1</li>
-            <li style="height: 100px;background-color: #7a8191">1</li>
-            <li style="height: 100px;background-color: #7a8191">1</li>
-            <li style="height: 100px;background-color: #7a8191">1</li>
-            <li style="height: 100px;background-color: #7a8191">1</li>
-            <li style="height: 100px;background-color: #7a8191">1</li>
-            <li style="height: 100px;background-color: #7a8191">1</li>
-            <li style="height: 100px;background-color: #7a8191;margin-bottom: 100px">1</li>
+            <li style="height: 100px;background-color: #7a8191;margin: 7px">1</li>
+            <li style="height: 100px;background-color: #7a8191;margin: 7px">1</li>
+            <li style="height: 100px;background-color: #7a8191;margin: 7px">1</li>
+            <li style="height: 100px;background-color: #7a8191;margin: 7px">1</li>
+            <li style="height: 100px;background-color: #7a8191;margin: 7px">1</li>
+            <li style="height: 100px;background-color: #7a8191;margin: 7px">1</li>
+            <li style="height: 100px;background-color: #7a8191;margin: 7px">1</li>
+            <li style="height: 100px;background-color: #7a8191;margin: 7px">1</li>
+            <li style="height: 100px;background-color: #7a8191;margin: 7px">1</li>
+            <li style="height: 100px;background-color: #7a8191;margin: 7px">1</li>
+            <li style="height: 100px;background-color: #7a8191;margin: 7px">1</li>
+            <li style="height: 100px;background-color: #7a8191;margin: 7px">1</li>
+            <li style="height: 100px;background-color: #7a8191;;margin: 7px;">1</li>
+            <div style="height: 100px;width: 100%;background-color: #2e4e7e">
+
+            </div>
         </div>
     </div>
 

--
Gitblit v1.9.1