From 51b59b6534012af93c35bcb9c95086b64f5dfe7e Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期一, 12 九月 2022 13:53:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zypms' into zypms
---
src/main/webapp/views/index_datashow3.html | 65 ++++++++++++++++++++++++++------
1 files changed, 53 insertions(+), 12 deletions(-)
diff --git a/src/main/webapp/views/index_datashow3.html b/src/main/webapp/views/index_datashow3.html
index 2a14f99..53cce78 100644
--- a/src/main/webapp/views/index_datashow3.html
+++ b/src/main/webapp/views/index_datashow3.html
@@ -4,14 +4,19 @@
<meta charset="UTF-8">
<title>椤圭洰杩涘害琛�</title>
<link rel="stylesheet" href="../static/css/style3.css">
+ <link rel="stylesheet" href="../static/layui/css/layui.css" media="all">
<script src="../static/js/config.js"></script>
+ <script type="text/javascript" src="../static/layui/layui.js" charset="utf-8"></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/common.js"></script>
+ <!-- <script src="../static/js/tableData.js"></script>-->
<!-- <script src="../static/js/tableData2.js"></script>-->
<script src="../static/js/tableData3.js"></script>
- <script src="../static/js/projectShow2.js"></script>
+ <script src="../static/js/projectShow3.js"></script>
+ <script src="../static/js/changetime.js"></script>
<script src="../static/js/cols.js"></script>
+ <!--<script src="../static/layui/lay/module/laydate/laydate.js"></script>-->
</head>
<body>
<div id="root">
@@ -38,26 +43,59 @@
</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>
<button id="closee" onclick="">纭� 璁�</button>
</div>
+
+
</body>
</html>
+<script type="text/html" id="realTimes">
+ <form id="detail" lay-filter="detail" class="layui-form admin-form">
+ <div class="layui-row">
+ <div class="layui-form-item">
+ <label class="layui-form-label">瀹為檯缁撴潫鏃堕棿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="realEndTime" id="realEndTime" placeholder="璇疯緭鍏ュ疄闄呯粨鏉熸椂闂�">
+ </div>
+ </div>
+ </div>
+ <hr class="layui-bg-gray">
+ <div class="layui-form-item text-right">
+ <button class="layui-btn" lay-filter="editSubmit" lay-submit="">淇濆瓨</button>
+ <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button>
+ </div>
+ </form>
+ <!--<div id="realTime" >-->
+ <!-- <h3 class="text">鎻愮ず</h3>-->
+ <!-- <div class="input">-->
+ <!-- <text>缁撴潫鏃堕棿锛�</text>-->
+ <!-- <input id="realEndTime" placeholder="璇疯緭鍏ュ疄闄呭畬鎴愭椂闂�">-->
+ <!-- </div>-->
+ <!-- <button id="closeed" onclick="">纭� 璁�</button>-->
+ <!--</div>-->
+</script>
+
<script type="text/javascript">
$("#close").on("click",function(){
$("#details").attr("style","display:none")
@@ -65,4 +103,7 @@
$("#closee").on("click",function(){
$("#tips").attr("style","display:none")
})
+ $("#closeed").on("click",function(){
+
+ })
</script>
\ No newline at end of file
--
Gitblit v1.9.1