From 5f42fb4ab590de114fada76abd6fc114b748ccb7 Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期五, 14 一月 2022 15:53:25 +0800
Subject: [PATCH] 更新前后端传输数据

---
 src/main/webapp/static/js/projectPlan/projectPlan.js                     |   12 +-
 src/main/java/zy/cloud/wms/manager/controller/CstmrController.java       |    3 
 src/main/java/zy/cloud/wms/manager/entity/FlowsDTO.java                  |    7 
 src/main/java/zy/cloud/wms/manager/entity/ProjectPlan.java               |   12 +
 src/main/webapp/views/item/item.html                                     |   10 +-
 src/main/webapp/static/js/tableData.js                                   |    6 
 src/main/java/zy/cloud/wms/manager/entity/Item.java                      |   40 +++++++
 src/main/java/zy/cloud/wms/manager/controller/ItemController.java        |   10 +
 src/main/java/zy/cloud/wms/manager/entity/ItemsDTO.java                  |    6 
 src/main/java/zy/cloud/wms/common/web/BaseController.java                |    2 
 src/main/webapp/static/js/clock.js                                       |   25 ++--
 src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java |   40 ++++++--
 src/main/webapp/views/projectPlan/projectPlan.html                       |   32 +++---
 src/main/webapp/static/js/item/item.js                                   |   75 ++++++++-------
 14 files changed, 176 insertions(+), 104 deletions(-)

diff --git a/src/main/java/zy/cloud/wms/common/web/BaseController.java b/src/main/java/zy/cloud/wms/common/web/BaseController.java
index 317682a..0cac5ba 100644
--- a/src/main/java/zy/cloud/wms/common/web/BaseController.java
+++ b/src/main/java/zy/cloud/wms/common/web/BaseController.java
@@ -163,12 +163,14 @@
             return;
         }
         List<String> columns = new ArrayList<>();
+        //濡傛灉鍙橀噺鍖呭惈Final,Static,transient淇グ绗�, 璺宠繃璇ュ彉閲�
         for (Field field :Cools.getAllFields(cls)){
             if (Modifier.isFinal(field.getModifiers())
                     || Modifier.isStatic(field.getModifiers())
                     || Modifier.isTransient(field.getModifiers())){
                 continue;
             }
+
             String column = null;
             if (field.isAnnotationPresent(TableField.class)) {
                 column = field.getAnnotation(TableField.class).value();
diff --git a/src/main/java/zy/cloud/wms/manager/controller/CstmrController.java b/src/main/java/zy/cloud/wms/manager/controller/CstmrController.java
index 348b897..63516c1 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/CstmrController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/CstmrController.java
@@ -41,7 +41,8 @@
         excludeTrash(param);
         convert(param, wrapper);
         hostEq(wrapper);
-        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+//        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+        wrapper.orderBy("create_time",false);
         return R.ok(cstmrService.selectPage(new Page<>(curr, limit), wrapper));
     }
 
diff --git a/src/main/java/zy/cloud/wms/manager/controller/ItemController.java b/src/main/java/zy/cloud/wms/manager/controller/ItemController.java
index 8c21370..61d3d42 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/ItemController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/ItemController.java
@@ -47,7 +47,9 @@
                   @RequestParam(required = false)String orderByType,
                   @RequestParam Map<String, Object> param){
         EntityWrapper<Item> wrapper = new EntityWrapper<>();
-//        allLike(Item,null,wrapper,param.get("id"));
+        HashSet<String> excludeField = new HashSet<>();
+
+//        allLike(Item.class,excludeField,wrapper, (String) param.get("id"));
         excludeTrash(param);
         convert(param, wrapper);
         hostEq(wrapper);
@@ -85,6 +87,9 @@
         if (!Cools.isEmpty(name)) {
             throw new CoolException("涓嶅彲鏈夐噸澶嶉」鐩悕");
         }
+        if (item.getRealMonth() < 0){
+            throw new CoolException("瀹炴柦鍛ㄦ湡涓嶅彲涓鸿礋鏁�");
+        }
 
         item.setHostId(getHostId());
         item.setCreateBy(getUserId());
@@ -106,6 +111,9 @@
         if (!item.getType().equals("1")) {
             throw new CoolException("鐩墠浠呮敮鎸侀泦鎴愰」鐩�");
         }
+        if (item.getRealMonth() < 0){
+            throw new CoolException("瀹炴柦鍛ㄦ湡涓嶅彲涓鸿礋鏁�");
+        }
         item.setUpdateBy(getUserId());
         item.setUpdateTime(new Date());
         itemService.update(item,new EntityWrapper<Item>()
diff --git a/src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java b/src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java
index 1f81ed4..50d8a0f 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java
@@ -60,13 +60,21 @@
         }
         excludeTrash(param);
         convert(param, wrapper);
-
+//        HashSet<String> excludeItems = new HashSet<>();
+//        excludeItems.add("id");
+//        excludeItems.add("item_id");
+//        excludeItems.add("weight_num");
+//        excludeItems.add("create_time");
+//        excludeItems.add("create_id");
+//        excludeItems.add("modify_time");
+//        excludeItems.add("modify_id");
+//
+//        allLike(ProjectPlan.class,excludeItems,wrapper, (String) param.get("id"));
         wrapper.orderBy("item_id");
-
-
 //        if (!Cools.isEmpty(orderByField)) {
 //            wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
 //        }
+
         return R.ok(projectPlanService.selectPage(new Page<>(curr, limit), wrapper));
     }
 
@@ -94,6 +102,7 @@
         if (!Cools.isEmpty(checkExist)) {
             throw new CoolException("鏉冮噸鍊煎啿绐�,璇锋鏌�");
         }
+
         FlowStatus id = flowStatusService.selectOne(new EntityWrapper<FlowStatus>()
                 .eq("id", projectPlan.getFlowId()));
         if (!Cools.isEmpty(id)) {
@@ -113,6 +122,10 @@
 
         if (Cools.isEmpty(projectPlan) || null == projectPlan.getId()) {
             return R.error();
+        }
+
+        if (projectPlan.getDelay() < 0){
+            throw new CoolException("寤舵湡澶╂暟涓嶅彲涓鸿礋鏁�");
         }
 
         projectPlan.setModifyTime(new Date());
@@ -284,19 +297,26 @@
         List<Item> items = itemService.selectList(new EntityWrapper<Item>()
                 .eq("status","1"));
         List<ItemsDTO> itemsDTOs = new ArrayList<>();
-        for (Item item : items) {
-            ItemsDTO itemsDTO = new ItemsDTO();
 
+        for (Item item : items) {
+
+            ItemsDTO itemsDTO = new ItemsDTO();
+            List<FlowsDTO> flows = new ArrayList<>();
             itemsDTO.setId(item.getName());
-            itemsDTO.setStartDay(item.getStartTime());
-            itemsDTO.setEndDay(item.getEndTime());
+            itemsDTO.setStartDay(item.getStartTime$());
+            itemsDTO.setEndDay(item.getEndTime$());
             List<ProjectPlan> allPlans = projectPlanService.selectList(new EntityWrapper<ProjectPlan>()
                     .eq("item_id", item.getId()));
             for (ProjectPlan projectPlan : allPlans) {
-                projectPlan.setFlowName(projectPlan.getFlowId$());
+                FlowsDTO flowsDTO = new FlowsDTO();
+                flowsDTO.setName(projectPlan.getFlowId$());
+                flowsDTO.setStartTime(projectPlan.getStartTime$());
+                flowsDTO.setEndTime$(projectPlan.getEndTime$());
+                flowsDTO.setRealStartTime$(projectPlan.getRealStartTime$());
+                flowsDTO.setRealEndTime$(projectPlan.getRealEndTime$());
+                flows.add(flowsDTO);
             }
-
-            itemsDTO.setNodes(allPlans);
+            itemsDTO.setNodes(flows);
             itemsDTOs.add(itemsDTO);
         }
         return R.ok().add(itemsDTOs);
diff --git a/src/main/java/zy/cloud/wms/manager/entity/FlowsDTO.java b/src/main/java/zy/cloud/wms/manager/entity/FlowsDTO.java
index aed8424..6d6a530 100644
--- a/src/main/java/zy/cloud/wms/manager/entity/FlowsDTO.java
+++ b/src/main/java/zy/cloud/wms/manager/entity/FlowsDTO.java
@@ -9,7 +9,8 @@
 @NoArgsConstructor
 public class FlowsDTO {
     private String name;
-    private Date deadline;
-    private Date realDeadline;
-    private int extraDay;
+    private String startTime;
+    private String endTime$;
+    private String realStartTime$;
+    private String realEndTime$;
 }
diff --git a/src/main/java/zy/cloud/wms/manager/entity/Item.java b/src/main/java/zy/cloud/wms/manager/entity/Item.java
index d0c4426..6dd0f21 100644
--- a/src/main/java/zy/cloud/wms/manager/entity/Item.java
+++ b/src/main/java/zy/cloud/wms/manager/entity/Item.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.FieldStrategy;
 import com.baomidou.mybatisplus.enums.IdType;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.core.common.Cools;
@@ -92,7 +93,7 @@
      * 寮�濮嬫椂闂�
      */
     @ApiModelProperty(value= "寮�濮嬫椂闂�")
-    @TableField("start_time")
+    @TableField(value = "start_time", strategy = FieldStrategy.IGNORED)
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date startTime;
 
@@ -100,7 +101,7 @@
      * 缁撴潫鏃堕棿
      */
     @ApiModelProperty(value= "缁撴潫鏃堕棿")
-    @TableField("end_time")
+    @TableField(value = "end_time" ,strategy = FieldStrategy.IGNORED)
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date endTime;
 
@@ -150,12 +151,12 @@
     private String type;
 
 
-    @TableField("real_start_time")
+    @TableField(value = "real_start_time", strategy = FieldStrategy.IGNORED)
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date realStartTime;
 
 
-    @TableField("real_end_time")
+    @TableField(value = "real_end_time", strategy = FieldStrategy.IGNORED)
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date realEndTime;
 
@@ -297,6 +298,13 @@
         return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.startTime);
     }
 
+    public String getStartTime0$(){
+        if (Cools.isEmpty(this.startTime)){
+            return "";
+        }
+        return new SimpleDateFormat("yyyy-MM-dd").format(this.startTime);
+    }
+
     public void setStartTime(Date startTime) {
         this.startTime = startTime;
     }
@@ -310,6 +318,12 @@
             return "";
         }
         return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.endTime);
+    }
+    public String getEndTime0$(){
+        if (Cools.isEmpty(this.endTime)){
+            return "";
+        }
+        return new SimpleDateFormat("yyyy-MM-dd").format(this.endTime);
     }
 
     public void setEndTime(Date endTime) {
@@ -400,6 +414,16 @@
         }
 
     }
+
+    public String getRealStartTime0$(){
+        if (!Cools.isEmpty(this.realStartTime)) {
+            return new SimpleDateFormat("yyyy-MM-dd").format(this.realStartTime);
+        }else {
+            return "";
+        }
+
+    }
+
     public String getRealEndTime$(){
         if (!Cools.isEmpty(this.realEndTime)) {
             return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.realEndTime);
@@ -407,6 +431,14 @@
             return "";
         }
     }
+    public String getRealEndTime0$(){
+        if (!Cools.isEmpty(this.realEndTime)) {
+            return new SimpleDateFormat("yyyy-MM-dd").format(this.realEndTime);
+        }else {
+            return "";
+        }
+    }
+
     public String getType$(){
         ProjectTypeService bean = SpringUtils.getBean(ProjectTypeService.class);
         ProjectType id = bean.selectOne(new EntityWrapper<ProjectType>()
diff --git a/src/main/java/zy/cloud/wms/manager/entity/ItemsDTO.java b/src/main/java/zy/cloud/wms/manager/entity/ItemsDTO.java
index 02844b4..1beaa1f 100644
--- a/src/main/java/zy/cloud/wms/manager/entity/ItemsDTO.java
+++ b/src/main/java/zy/cloud/wms/manager/entity/ItemsDTO.java
@@ -10,7 +10,7 @@
 @NoArgsConstructor
 public class ItemsDTO {
     private String id;
-    private Date startDay;
-    private Date endDay;
-    private List<ProjectPlan> nodes;
+    private String startDay;
+    private String endDay;
+    private List<FlowsDTO> nodes;
 }
diff --git a/src/main/java/zy/cloud/wms/manager/entity/ProjectPlan.java b/src/main/java/zy/cloud/wms/manager/entity/ProjectPlan.java
index d7df651..30099b0 100644
--- a/src/main/java/zy/cloud/wms/manager/entity/ProjectPlan.java
+++ b/src/main/java/zy/cloud/wms/manager/entity/ProjectPlan.java
@@ -1,5 +1,6 @@
 package zy.cloud.wms.manager.entity;
 
+import com.baomidou.mybatisplus.enums.FieldStrategy;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.core.common.Cools;
 import com.core.common.SpringUtils;
@@ -47,6 +48,7 @@
 
 @Data
 @TableName("sys_project_plan")
+
 public class ProjectPlan implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -64,6 +66,7 @@
     @ApiModelProperty(value= "椤圭洰ID")
     @TableId(value = "item_id", type = IdType.INPUT)
     @TableField("item_id")
+
     private Long itemId;
 
     /**
@@ -85,15 +88,16 @@
      * 鍚姩鏃ユ湡
      */
     @ApiModelProperty(value= "鍚姩鏃ユ湡")
-    @TableField("start_time")
+    @TableField(value = "start_time",strategy = FieldStrategy.IGNORED)
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+
     private Date startTime;
 
     /**
      * 瀹為檯鍚姩鏃ユ湡
      */
     @ApiModelProperty(value= "瀹為檯鍚姩鏃ユ湡")
-    @TableField("real_start_time")
+    @TableField(value = "real_start_time", strategy = FieldStrategy.IGNORED)
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date realStartTime;
 
@@ -101,7 +105,7 @@
      * 缁撴潫鏃ユ湡
      */
     @ApiModelProperty(value= "缁撴潫鏃ユ湡")
-    @TableField("end_time")
+    @TableField(value = "end_time", strategy = FieldStrategy.IGNORED)
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date endTime;
 
@@ -109,7 +113,7 @@
      * 瀹為檯缁撴潫鏃ユ湡
      */
     @ApiModelProperty(value= "瀹為檯缁撴潫鏃ユ湡")
-    @TableField("real_end_time")
+    @TableField(value = "real_end_time", strategy = FieldStrategy.IGNORED)
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date realEndTime;
 
diff --git a/src/main/webapp/static/js/clock.js b/src/main/webapp/static/js/clock.js
index a0a8d92..39b3f80 100644
--- a/src/main/webapp/static/js/clock.js
+++ b/src/main/webapp/static/js/clock.js
@@ -1,14 +1,11 @@
-  var t = null;
-        t = setTimeout(time,0);
-        function time() {
-            clearTimeout(t);
-            dt = new Date();
-            var y = dt.getFullYear();
-            var mt = dt.getMonth()+1;
-            var day = dt.getDate();
-            var h = dt.getHours();
-            var m = dt.getMinutes();
-            var s = dt.getSeconds();
-            document.getElementById('showTime').innerHTML = y+'骞�'+mt+'鏈�'+day+'鏃�'+h+'鏃�'+m+'鍒�'+s+'绉�';
-            t=setTimeout(time,1000);
-        }
\ No newline at end of file
+
+setInterval(function () {
+    let dt = new Date();
+    var y = dt.getFullYear();
+    var mt = dt.getMonth()+1;
+    var day = dt.getDate();
+    var h = dt.getHours();
+    var m = dt.getMinutes();
+    var s = dt.getSeconds();
+    document.getElementById('showTime').innerHTML =y+'骞�'+mt+'鏈�'+day+'鏃�'+h+'鏃�'+m+'鍒�'+s+'绉�';
+}, 1000);
\ No newline at end of file
diff --git a/src/main/webapp/static/js/item/item.js b/src/main/webapp/static/js/item/item.js
index c74bfdc..bad2e11 100644
--- a/src/main/webapp/static/js/item/item.js
+++ b/src/main/webapp/static/js/item/item.js
@@ -33,15 +33,10 @@
 
             // ,{field: 'member', align: 'center',title: '椤圭洰鎴愬憳'}
             // ,{field: 'leader', align: 'center',title: '椤圭洰缁忕悊'}
-            ,{field: 'startTime$', align: 'center',title: '璁″垝寮�濮嬫椂闂�',
-                templet : "<div>{{layui.util.toDateString(d.startTime$, 'yyyy-MM-dd')}}</div>"
-            }
-            ,{field: 'endTime$', align: 'center',title: '璁″垝缁撴潫鏃堕棿',
-                templet : "<div>{{layui.util.toDateString(d.endTime$, 'yyyy-MM-dd')}}</div>"}
-            ,{field: 'realStartTime$', align: 'center', title: '瀹為檯寮�濮嬫椂闂�',
-                templet : "<div>{{layui.util.toDateString(d.realStartTime$, 'yyyy-MM-dd')}}</div>"}
-            ,{field: 'realEndTime$', align: 'center', title: '瀹為檯缁撴潫鏃堕棿',
-                templet : "<div>{{layui.util.toDateString(d.realEndTime$, 'yyyy-MM-dd')}}</div>"}
+            ,{field: 'startTime0$', align: 'center',title: '璁″垝寮�濮嬫椂闂�'}
+            ,{field: 'endTime0$', align: 'center',title: '璁″垝缁撴潫鏃堕棿'}
+            ,{field: 'realStartTime0$', align: 'center', title: '瀹為檯寮�濮嬫椂闂�'}
+            ,{field: 'realEndTime0$', align: 'center', title: '瀹為檯缁撴潫鏃堕棿'}
             ,{field: 'type$', align: 'center', title: '椤圭洰绫诲瀷'}
             ,{field: 'originArea', align: 'center', title: '鐢熶骇鍦�'}
             ,{field: 'realMonth', align: 'center', title: '鏃堕棿璺ㄥ害(鏈�)'}
@@ -72,7 +67,7 @@
             statusCode: 200
         },
         done: function(res, curr, count) {
-
+            console.log(res)
             if (res.code === 403) {
                 top.location.href = baseUrl+"/";
             }
@@ -175,7 +170,7 @@
             title: (mData ? '淇敼' : '娣诲姞') + '椤圭洰淇℃伅',
             content: $('#editDialog').html(),
             success: function (layero, dIndex) {
-                layDateRender();
+                layDateRender(mData);
                 form.val('detail', mData);
                 form.on('submit(editSubmit)', function (data) {
                     var loadIndex = layer.load(2);
@@ -248,31 +243,41 @@
     });
 
     // 鏃堕棿閫夋嫨鍣�
-    function layDateRender() {
+    function layDateRender(mData) {
+        console.log(mData)
+        setTimeout(function () {
             layDate.render({
-        elem: '#startTime\\$',
-        type: 'datetime'
-    });
-        layDate.render({
-        elem: '#endTime\\$',
-        type: 'datetime'
-    });
-        layDate.render({
-        elem: '#createTime\\$',
-        type: 'datetime'
-    });
-        layDate.render({
-        elem: '#updateTime\\$',
-        type: 'datetime'
-    });
-    layDate.render({
-        elem: '#realStartTime\\$'
-        ,type: 'datetime'
-    });
-    layDate.render({
-        elem: '#realEndTime\\$'
-        ,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/projectPlan/projectPlan.js b/src/main/webapp/static/js/projectPlan/projectPlan.js
index 73e8a33..96c38fb 100644
--- a/src/main/webapp/static/js/projectPlan/projectPlan.js
+++ b/src/main/webapp/static/js/projectPlan/projectPlan.js
@@ -2,6 +2,8 @@
 var items;
 getItems();
 
+
+
 layui.config({
     base: baseUrl + "/static/layui/lay/modules/"
 }).use(['table','laydate', 'form', 'admin'], function(){
@@ -239,7 +241,7 @@
     // 閲嶇疆
     form.on('submit(reset)', function (data) {
         pageCurr = 1;
-        clearFormVal($('#search-box'));
+        $('#mysearch').val('');
         tableReload(false);
     });
 
@@ -247,22 +249,22 @@
     function layDateRender(mData) {
         setTimeout(function () {
             layDate.render({
-                elem: '#startTime\\$',
+                elem: '#startTime',
                 type: 'datetime',
                 value: mData!==null&&mData!==undefined?strToDate(mData['startTime$']):null
             });
             layDate.render({
-                elem: '#realStartTime\\$',
+                elem: '#realStartTime',
                 type: 'datetime',
                 value: mData!==null&&mData!==undefined?strToDate(mData['realStartTime$']):null
             });
             layDate.render({
-                elem: '#endTime\\$',
+                elem: '#endTime',
                 type: 'datetime',
                 value: mData!==null&&mData!==undefined?strToDate(mData['endTime$']):null
             });
             layDate.render({
-                elem: '#realEndTime\\$',
+                elem: '#realEndTime',
                 type: 'datetime',
                 value: mData!==null&&mData!==undefined?strToDate(mData['realEndTime$']):null
             });
diff --git a/src/main/webapp/static/js/tableData.js b/src/main/webapp/static/js/tableData.js
index 89f5c13..c3621fa 100644
--- a/src/main/webapp/static/js/tableData.js
+++ b/src/main/webapp/static/js/tableData.js
@@ -1,12 +1,12 @@
 setTimeout(function(){
 	getTheaddData()
-
-},500)
+	getThbodyData()
+},0)
 setInterval(function(){
 
 	getThbodyData()
 
-},500)
+},50000)
 
 	var proData = ["椤圭洰鍚嶇О","寮�濮嬫椂闂�","缁撴潫鏃堕棿",]
 	var getTheaddData = function(){
diff --git a/src/main/webapp/views/item/item.html b/src/main/webapp/views/item/item.html
index 9b846bd..769a861 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>
 
@@ -113,7 +113,7 @@
                 <div class="layui-form-item">
                     <label class="layui-form-label">瀹炴柦鍛ㄦ湡(鏈�): </label>
                     <div class="layui-input-block">
-                        <input class="layui-input" name="realMonth" id="realMonth$" placeholder="濉啓鏁板瓧鏈堜唤" type="number">
+                        <input class="layui-input" name="realMonth" id="realMonth$" placeholder="濉啓鏁板瓧鏈堜唤" type="number" onkeyup="if(this.value.length==1){this.value=this.value.replace(/[^1-9]/g,'')}else{this.value=this.value.replace(/\D/g,'')}" onafterpaste="if(this.value.length==1){this.value=this.value.replace(/[^1-9]/g,'')}else{this.value=this.value.replace(/\D/g,'')}">
                     </div>
                 </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 6aee187..8b5d016 100644
--- a/src/main/webapp/views/projectPlan/projectPlan.html
+++ b/src/main/webapp/views/projectPlan/projectPlan.html
@@ -23,16 +23,16 @@
             </select>
         </div>
     </div>
-    <!--    <div class="layui-inline">-->
-    <!--        <div class="layui-input-inline">-->
-    <!--            <input class="layui-input" type="text" name="id" placeholder="缂栧彿" autocomplete="off">-->
-    <!--        </div>-->
-    <!--    </div>-->
-    <!--    &lt;!&ndash; 寰呮坊鍔� &ndash;&gt;-->
-    <!--    <div id="data-search-btn" class="layui-btn-container layui-form-item">-->
-    <!--        <button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">鎼滅储</button>-->
-    <!--        <button id="reset" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="reset">閲嶇疆</button>-->
-    <!--    </div>-->
+        <div class="layui-inline">
+            <div class="layui-input-inline">
+                <input class="layui-input" id="mysearch" type="text" name="id" placeholder="缂栧彿" autocomplete="off">
+            </div>
+        </div>
+        <!-- 寰呮坊鍔� -->
+        <div id="data-search-btn" class="layui-btn-container layui-form-item">
+            <button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">鎼滅储</button>
+            <button id="reset" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="reset">閲嶇疆</button>
+        </div>
 </div>
 
 <!-- 琛ㄦ牸 -->
@@ -111,32 +111,32 @@
                 <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">
                     <label class="layui-form-label">寤舵湡澶╂暟: </label>
                     <div class="layui-input-block">
-                        <input class="layui-input" name="delay" placeholder="璇疯緭鍏ュ欢鏈熷ぉ鏁�">
+                        <input class="layui-input" name="delay" placeholder="璇疯緭鍏ュ欢鏈熷ぉ鏁�" type="number" onkeyup="if(this.value.length==1){this.value=this.value.replace(/[^1-9]/g,'')}else{this.value=this.value.replace(/\D/g,'')}" onafterpaste="if(this.value.length==1){this.value=this.value.replace(/[^1-9]/g,'')}else{this.value=this.value.replace(/\D/g,'')}">
                     </div>
                 </div>
                 <div class="layui-form-item">
@@ -205,7 +205,7 @@
     </form>
 </script>
 <script type="text/template" id="parentNodeGroup">
-    <option value="0">鏄剧ず鍏ㄩ儴</option>
+    <option value="0" selected>鏄剧ず鍏ㄩ儴</option>
     {{#each data}}
     <option value="{{this.key}}">{{this.val}}</option>
     {{/each}}

--
Gitblit v1.9.1