From 36de27cf6c6010bd2c8a5d1e09f12fc49932f4a9 Mon Sep 17 00:00:00 2001
From: 18516761980 <4761516tqsxp>
Date: 星期五, 14 一月 2022 13:59:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'gitblit/zypms' into zypms
---
src/main/webapp/static/js/projectPlan/projectPlan.js | 58 ++++++++++++++++------------
src/main/webapp/views/item/item.html | 8 ++--
src/main/webapp/static/js/tableData.js | 16 ++++++-
src/main/webapp/views/projectPlan/projectPlan.html | 8 ++--
src/main/webapp/static/js/item/item.js | 2 -
5 files changed, 54 insertions(+), 38 deletions(-)
diff --git a/src/main/webapp/static/js/item/item.js b/src/main/webapp/static/js/item/item.js
index 15ee0ef..c74bfdc 100644
--- a/src/main/webapp/static/js/item/item.js
+++ b/src/main/webapp/static/js/item/item.js
@@ -177,9 +177,7 @@
success: function (layero, dIndex) {
layDateRender();
form.val('detail', mData);
-
form.on('submit(editSubmit)', function (data) {
-
var loadIndex = layer.load(2);
$.ajax({
url: baseUrl+"/item/"+(mData?'update':'add')+"/auth",
diff --git a/src/main/webapp/static/js/projectPlan/projectPlan.js b/src/main/webapp/static/js/projectPlan/projectPlan.js
index bc873fd..73e8a33 100644
--- a/src/main/webapp/static/js/projectPlan/projectPlan.js
+++ b/src/main/webapp/static/js/projectPlan/projectPlan.js
@@ -169,7 +169,7 @@
title: (mData ? '淇敼' : '娣诲姞') + '璁㈠崟鐘舵��',
content: $('#editDialog').html(),
success: function (layero, dIndex) {
- layDateRender();
+ layDateRender(mData);
form.val('detail', mData);
form.on('submit(editSubmit)', function (data) {
if(mData === '娣诲姞'){
@@ -244,31 +244,39 @@
});
// 鏃堕棿閫夋嫨鍣�
- function layDateRender() {
+ function layDateRender(mData) {
+ setTimeout(function () {
layDate.render({
- elem: '#startTime\\$',
- type: 'datetime'
- });
- layDate.render({
- elem: '#realStartTime\\$',
- type: 'datetime'
- });
- layDate.render({
- elem: '#endTime\\$',
- type: 'datetime'
- });
- layDate.render({
- elem: '#realEndTime\\$',
- type: 'datetime'
- });
- layDate.render({
- elem: '#createTime\\$',
- type: 'datetime'
- });
- layDate.render({
- elem: '#modifyTime\\$',
- type: 'datetime'
- });
+ elem: '#startTime\\$',
+ type: 'datetime',
+ value: mData!==null&&mData!==undefined?strToDate(mData['startTime$']):null
+ });
+ layDate.render({
+ elem: '#realStartTime\\$',
+ type: 'datetime',
+ value: mData!==null&&mData!==undefined?strToDate(mData['realStartTime$']):null
+ });
+ layDate.render({
+ elem: '#endTime\\$',
+ type: 'datetime',
+ value: mData!==null&&mData!==undefined?strToDate(mData['endTime$']):null
+ });
+ layDate.render({
+ elem: '#realEndTime\\$',
+ type: 'datetime',
+ value: mData!==null&&mData!==undefined?strToDate(mData['realEndTime$']):null
+ });
+ layDate.render({
+ elem: '#createTime\\$',
+ type: 'datetime',
+ value: mData!==null&&mData!==undefined?strToDate(mData['createTime$']):null
+ });
+ layDate.render({
+ elem: '#modifyTime\\$',
+ type: 'datetime',
+ value: mData!==null&&mData!==undefined?strToDate(mData['modifyTime$']):null
+ });
+ }, 500);
}
layDateRender();
diff --git a/src/main/webapp/static/js/tableData.js b/src/main/webapp/static/js/tableData.js
index 2511f97..89f5c13 100644
--- a/src/main/webapp/static/js/tableData.js
+++ b/src/main/webapp/static/js/tableData.js
@@ -1,3 +1,13 @@
+setTimeout(function(){
+ getTheaddData()
+
+},500)
+setInterval(function(){
+
+ getThbodyData()
+
+},500)
+
var proData = ["椤圭洰鍚嶇О","寮�濮嬫椂闂�","缁撴潫鏃堕棿",]
var getTheaddData = function(){
$.ajax({
@@ -22,7 +32,7 @@
},
})
}
- setTimeout(getTheaddData(),1000)
+
var getThbodyData = function(){
@@ -76,7 +86,7 @@
var realEndTime$ = data[t].nodes[k].realEndTime$.substring(0,10)
// 椤圭洰鑺傜偣璁″垝缁撴潫鏃堕棿
var endTime$ = data[t].nodes[k].endTime$.substring(0,10)
-
+
var myDate = new Date()
var nowDay = myDate.getFullYear()+"-"+(myDate.getMonth()+1)+"-"+myDate.getDate()
var eDay = new Date(endTime$)
@@ -118,5 +128,5 @@
}
})
}
- setInterval(getThbodyData(),2000)
+
diff --git a/src/main/webapp/views/item/item.html b/src/main/webapp/views/item/item.html
index df15154..9b846bd 100644
--- a/src/main/webapp/views/item/item.html
+++ b/src/main/webapp/views/item/item.html
@@ -83,13 +83,13 @@
<div class="layui-form-item">
<label class="layui-form-label layui-form-required">璁″垝寮�濮嬫椂闂�: </label>
<div class="layui-input-block">
- <input class="layui-input" name="startTime" id="startTime$" placeholder="璇疯緭鍏ヨ鍒掑紑濮嬫椂闂�" lay-vertype="tips" lay-verify="required">
+ <input class="layui-input" name="startTime$" id="startTime$" placeholder="璇疯緭鍏ヨ鍒掑紑濮嬫椂闂�" lay-vertype="tips" lay-verify="required">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">瀹為檯寮�濮嬫椂闂�: </label>
<div class="layui-input-block">
- <input class="layui-input" name="realStartTime" id="realStartTime$" placeholder="璇疯緭鍏ュ疄闄呭紑濮嬫椂闂�">
+ <input class="layui-input" name="realStartTime$" id="realStartTime$" placeholder="璇疯緭鍏ュ疄闄呭紑濮嬫椂闂�">
</div>
</div>
@@ -168,14 +168,14 @@
<div class="layui-form-item">
<label class="layui-form-label layui-form-required">璁″垝缁撴潫鏃堕棿: </label>
<div class="layui-input-block">
- <input class="layui-input" name="endTime" id="endTime$" placeholder="璇疯緭鍏ヨ鍒掔粨鏉熸椂闂�" lay-vertype="tips" lay-verify="required">
+ <input class="layui-input" name="endTime$" id="endTime$" placeholder="璇疯緭鍏ヨ鍒掔粨鏉熸椂闂�" lay-vertype="tips" lay-verify="required">
</div>
</div>
<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="璇疯緭鍏ュ疄闄呯粨鏉熸椂闂�">
+ <input class="layui-input" name="realEndTime$" id="realEndTime$" placeholder="璇疯緭鍏ュ疄闄呯粨鏉熸椂闂�">
</div>
</div>
diff --git a/src/main/webapp/views/projectPlan/projectPlan.html b/src/main/webapp/views/projectPlan/projectPlan.html
index abb5b26..6aee187 100644
--- a/src/main/webapp/views/projectPlan/projectPlan.html
+++ b/src/main/webapp/views/projectPlan/projectPlan.html
@@ -111,26 +111,26 @@
<div class="layui-form-item">
<label class="layui-form-label">璁″垝寮�濮嬫椂闂�: </label>
<div class="layui-input-block">
- <input class="layui-input" name="startTime" id="startTime$" placeholder="璇疯緭鍏ヨ鍒掑紑濮嬫椂闂�">
+ <input class="layui-input" name="startTime$" id="startTime$" placeholder="璇疯緭鍏ヨ鍒掑紑濮嬫椂闂�">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">璁″垝缁撴潫鏃堕棿: </label>
<div class="layui-input-block">
- <input class="layui-input" name="endTime" id="endTime$" placeholder="璇疯緭鍏ヨ鍒掔粨鏉熸椂闂�">
+ <input class="layui-input" name="endTime$" id="endTime$" placeholder="璇疯緭鍏ヨ鍒掔粨鏉熸椂闂�">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">瀹為檯寮�濮嬫椂闂�: </label>
<div class="layui-input-block">
- <input class="layui-input" name="realStartTime" id="realStartTime$" placeholder="璇疯緭鍏ュ疄闄呭紑濮嬫椂闂�">
+ <input class="layui-input" name="realStartTime$" id="realStartTime$" placeholder="璇疯緭鍏ュ疄闄呭紑濮嬫椂闂�">
</div>
</div>
<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="璇疯緭鍏ュ疄闄呯粨鏉熸椂闂�">
+ <input class="layui-input" name="realEndTime$" id="realEndTime$" placeholder="璇疯緭鍏ュ疄闄呯粨鏉熸椂闂�">
</div>
</div>
<div class="layui-form-item">
--
Gitblit v1.9.1