From 7ede62a9384aabfecdf38d1f01f771ae10a7f160 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期一, 12 九月 2022 15:33:38 +0800
Subject: [PATCH] #
---
src/main/webapp/static/css/style.css | 6 +++++-
src/main/webapp/static/js/changetime.js | 4 +++-
src/main/webapp/views/index_datashow.html | 21 +++++++++++++++++++++
src/main/webapp/static/js/tableData2.js | 5 +++--
4 files changed, 32 insertions(+), 4 deletions(-)
diff --git a/src/main/webapp/static/css/style.css b/src/main/webapp/static/css/style.css
index f8fc7aa..50899d9 100644
--- a/src/main/webapp/static/css/style.css
+++ b/src/main/webapp/static/css/style.css
@@ -291,7 +291,11 @@
-
+.admin-form {
+ padding: 25px 30px 0 0 !important;
+ margin: 0 !important;
+}
+.text-right{text-align:right}
diff --git a/src/main/webapp/static/js/changetime.js b/src/main/webapp/static/js/changetime.js
index a46b69a..5bd42be 100644
--- a/src/main/webapp/static/js/changetime.js
+++ b/src/main/webapp/static/js/changetime.js
@@ -15,12 +15,14 @@
})
return
}
+ str = this.id.split('-')
layer.open({
type: 1,
area: '400px',
title: '娣诲姞缁撴潫鏃堕棿',
content: $('#realTimes').html(),
success: function (layero, index) {
+ console.log(str)
layui.form.on('submit(editSubmit)', function (data) {
realEndTime = $("#realEndTime").val();
param = {
@@ -45,7 +47,7 @@
elem: '#realEndTime'
,type: 'datetime'
})
- str = this.id.split('-')
+
})
})
diff --git a/src/main/webapp/static/js/tableData2.js b/src/main/webapp/static/js/tableData2.js
index 9b0a439..eca9afd 100644
--- a/src/main/webapp/static/js/tableData2.js
+++ b/src/main/webapp/static/js/tableData2.js
@@ -111,10 +111,11 @@
}
str = ''
for (var j = 0; j < node.length; j++) {
- var nodeName = node[j].flowId$ // 鑺傜偣鍚嶇О
+ var weightNum = node[j].weightNum
+ var itemId = node[j].itemId
var nodeEndTime = node[j].endTime$.substring(0, 10)
var nodeRealStartTime = node[j].realEndTime$.substring(0, 10)
- str1 = '<td class="normal">' + '<p>' + nodeEndTime + '</p>' + '<p>' + nodeRealStartTime + '</p>' + '</td>'
+ str1 = '<td class="normal" id="item-'+ itemId + '-' + weightNum +'">' + '<p>' + nodeEndTime + '</p>' + '<p>' + nodeRealStartTime + '</p>' + '</td>'
str = str + str1
}
var str2 = '<tr id="row' + i + '" class="row">'
diff --git a/src/main/webapp/views/index_datashow.html b/src/main/webapp/views/index_datashow.html
index 7e11191..1713975 100644
--- a/src/main/webapp/views/index_datashow.html
+++ b/src/main/webapp/views/index_datashow.html
@@ -4,12 +4,16 @@
<meta charset="UTF-8">
<title>椤圭洰杩涘害琛�</title>
<link rel="stylesheet" href="../static/css/style.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/common.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/changetime.js"></script>
<script src="../static/js/cols.js"></script>
</head>
<body>
@@ -63,6 +67,23 @@
</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>
+</script>
<script type="text/javascript">
$("#close").on("click",function(){
$("#details").attr("style","display:none")
--
Gitblit v1.9.1