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 | 66 ++++++++++++++++++++-------------
1 files changed, 40 insertions(+), 26 deletions(-)
diff --git a/src/main/webapp/views/index_datashow.html b/src/main/webapp/views/index_datashow.html
index c69af47..d58879a 100644
--- a/src/main/webapp/views/index_datashow.html
+++ b/src/main/webapp/views/index_datashow.html
@@ -4,54 +4,68 @@
<meta charset="UTF-8">
<title>椤圭洰杩涘害琛�</title>
<link rel="stylesheet" href="../static/css/style.css">
-
+ <script src="../static/js/config.js"></script>
<script src="../static/js/jquery-3.3.1.min.js"></script>
- <script src="../static/js/common.js"></script>
-<!-- <script src="../static/js/index.js" type="text/javascript" charset="utf-8"></script>-->
<script src="../static/js/clock.js"></script>
- <script src="../static/js/tableData.js"></script>
-<!-- <script src="../static/js/projectShow.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>
<body>
<div id="root">
<!-- 鏍囬 -->
<div id="top-tab">
- <h1>涓壃绔嬪簱 2022骞撮泦鎴愰」鐩繘搴︿竴瑙堣〃</h1>
- <div id="showTime"></div>
- </div>
- <table id="main-tab" cellspacing="0" cellpadding="0">
- <!-- 琛ㄥご -->
- <thead id="tab-header">
+ <h1>甯歌椤圭洰杩涘害琛�</h1>
+
+ <img src="../static/image/logo-bar.png" alt="logo">
+ <div id="showTime">
- </thead>
- <!-- 琛ㄨ韩浣� -->
- <tbody id="tab-body"> </tbody>
- <!-- 娉ㄦ剰浜嬮」 -->
- <tr><th>娉ㄦ剰浜嬮」</th></tr>
-
- </table>
+ </div>
+ </div>
+ <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">
<h2></h2>
- <button id="close" type="button" style="float: right;">鍏抽棴</button>
+ <button id="close" type="button" style="float: right;">鍏� 闂�</button>
</div>
- <table id="details-tab">
+ <table id="details-tab-left" cellspacing="0" cellpadding="0"></table>
+ <table id="details-tab" cellspacing="0" cellpadding="0">
<thead>
- <tr><th>浠诲姟鍚嶇О</th><th>寮�濮嬫椂闂�</th><th>缁撴潫鏃堕棿</th></tr>
</thead>
<tbody>
- <tr><td>寮�濮嬫椂闂�</td><td>2022-01-11</td><td></td></tr>
- <tr><td>缁撴潫鏃堕棿</td><td>2022-02-05</td><td></td></tr>
- <tr><td>鍚堢害绛捐</td><td>2022-02-05</td><td></td></tr>
</tbody>
</table>
+ </div>
+ <div id="tips">
+ <h3>鎻愮ず</h3>
+ <div id="text">褰撳墠椤圭洰璁″垝鏃堕棿涓嶅畬鏁达紱璇疯ˉ鍏呭畬鎴愬悗閲嶈瘯!</div>
+ <button id="closee" onclick="">纭� 璁�</button>
</div>
</body>
</html>
<script type="text/javascript">
- // 鏄庣粏鍏抽棴
$("#close").on("click",function(){
$("#details").attr("style","display:none")
})
-</script>
+ $("#closee").on("click",function(){
+ $("#tips").attr("style","display:none")
+ })
+</script>
\ No newline at end of file
--
Gitblit v1.9.1