From bd6095e7af86faf7ed0a5ca188775aeac7b031f2 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期二, 06 九月 2022 09:40:55 +0800
Subject: [PATCH] Merge branch 'zypms' of http://47.97.1.152:5880/r/wms_saas into zypms
---
src/main/webapp/views/index_datashow.html | 36 ++++++++++++++++++++----------------
1 files changed, 20 insertions(+), 16 deletions(-)
diff --git a/src/main/webapp/views/index_datashow.html b/src/main/webapp/views/index_datashow.html
index 7cbb87c..d58879a 100644
--- a/src/main/webapp/views/index_datashow.html
+++ b/src/main/webapp/views/index_datashow.html
@@ -7,7 +7,8 @@
<script src="../static/js/config.js"></script>
<script src="../static/js/jquery-3.3.1.min.js"></script>
<script src="../static/js/clock.js"></script>
- <script src="../static/js/tableData.js"></script>
+<!-- <script src="../static/js/tableData.js"></script>-->
+ <script src="../static/js/tableData2.js"></script>
<script src="../static/js/projectShow.js"></script>
<script src="../static/js/cols.js"></script>
</head>
@@ -15,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