From 8745b76acfd45eadd720d7ce6d87c77e6e0682b9 Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期二, 06 九月 2022 12:46:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zypms' into zypms

---
 src/main/webapp/views/index_datashow.html |   33 ++++++++++++++++++---------------
 1 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/src/main/webapp/views/index_datashow.html b/src/main/webapp/views/index_datashow.html
index a891391..d58879a 100644
--- a/src/main/webapp/views/index_datashow.html
+++ b/src/main/webapp/views/index_datashow.html
@@ -16,27 +16,30 @@
     <div id="root">
 		<!-- 鏍囬 -->
 		<div id="top-tab">
-			<h1>椤圭洰杩涘害琛�</h1>
+			<h1>甯歌椤圭洰杩涘害琛�</h1>
 
 			<img src="../static/image/logo-bar.png" alt="logo">
 			<div id="showTime">
 				
 			</div>
 		</div>
-		<table id="proType" cellspacing="0" cellpadding="0">
-			<thead id="type-header"></thead>
-		</table>
-        <table id="main-tab" cellspacing="0" cellpadding="0">
-			<!-- 琛ㄥご -->
-			<thead id="tab-header">
-				
-			</thead>
-			<!-- 琛ㄨ韩浣� -->
-			<tbody id="tab-body"> </tbody>
-			<!-- 娉ㄦ剰浜嬮」 -->
-			<tr><th>娉ㄦ剰浜嬮」</th></tr>
-		   
-        </table>
+		<div class="table-room" >
+			<table id="proType" cellspacing="0" cellpadding="0">
+				<thead id="type-header"></thead>
+			</table>
+			<table id="main-tab" cellspacing="0" cellpadding="0">
+				<!-- 琛ㄥご -->
+				<thead id="tab-header">
+
+				</thead>
+				<!-- 琛ㄨ韩浣� -->
+				<tbody id="tab-body"> </tbody>
+				<!-- 娉ㄦ剰浜嬮」 -->
+				<tr><th>娉ㄦ剰浜嬮」</th></tr>
+
+			</table>
+		</div>
+
     </div>
 	<div id="details">
 		<div class="head">

--
Gitblit v1.9.1