mrzhssss
2022-01-14 7ea9e40063bb40954b1c73675e2ed1963df99c4d
更新baseurl地址
5个文件已修改
33 ■■■■■ 已修改文件
src/main/java/zy/cloud/wms/manager/controller/ItemController.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/static/css/style.css 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/static/js/item/item.js 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/static/js/tableData.js 19 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/index_datashow.html 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/zy/cloud/wms/manager/controller/ItemController.java
@@ -47,6 +47,7 @@
                  @RequestParam(required = false)String orderByType,
                  @RequestParam Map<String, Object> param){
        EntityWrapper<Item> wrapper = new EntityWrapper<>();
//        allLike(Item,null,wrapper,param.get("id"));
        excludeTrash(param);
        convert(param, wrapper);
        hostEq(wrapper);
src/main/webapp/static/css/style.css
@@ -69,9 +69,9 @@
   text-align: center;
   
}
.normal {
    background-color: #009966;
}
/*.normal {*/
/*    background-color: #009966;*/
/*}*/
.nor-mal {
    background-color: #3a4a5a;
}
src/main/webapp/static/js/item/item.js
@@ -72,7 +72,7 @@
            statusCode: 200
        },
        done: function(res, curr, count) {
            console.log(res.data)
            if (res.code === 403) {
                top.location.href = baseUrl+"/";
            }
@@ -177,7 +177,7 @@
            success: function (layero, dIndex) {
                layDateRender();
                form.val('detail', mData);
                console.log(mData)
                form.on('submit(editSubmit)', function (data) {
                    var loadIndex = layer.load(2);
@@ -287,6 +287,7 @@
function tableReload(child) {
    var searchData = {};
    $.each($('#search-box [name]').serializeArray(), function() {
        searchData[this.name] = this.value;
    });
src/main/webapp/static/js/tableData.js
@@ -1,7 +1,7 @@
    var proData = ["项目名称","开始时间","结束时间",]
    var getTheaddData = function(){
        $.ajax({
            url:'http://192.168.4.99:8080/wms/projectPlan/flowStatus',
            url:baseUrl + '/projectPlan/flowStatus',
            type:'GET',
            dataType:'JSON',
            data:{},
@@ -22,17 +22,19 @@
            },
            })
            }
    setInterval(getTheaddData(),10000)
            setTimeout(getTheaddData(),1000)
    var getThbodyData = function(){
        $.ajax({
            url:'http://192.168.4.99:8080/wms/projectPlan/toFront',
            url:baseUrl+'/projectPlan/toFront',
            type:'GET',
            dataType:'JSON',
            data:{},
            success:function(res){                
                if(res.code==200){
                    data=res.data
                    console.log(data)
                    // 判断时间是否有null  有null的改为 ""
                    for(var i = 0;i<data.length;i++){
                        var dataNode = data[i].nodes
@@ -74,12 +76,12 @@
                            var realEndTime$ = data[t].nodes[k].realEndTime$.substring(0,10)
                            // 项目节点计划结束时间
                            var endTime$ = data[t].nodes[k].endTime$.substring(0,10)
                            console.log(endTime$)
                            var myDate = new Date()
                            var nowDay = myDate.getFullYear()+"-"+(myDate.getMonth()+1)+"-"+myDate.getDate()
                            var eDay = new Date(endTime$)
                            // 判断realEndTime$.substring(0,10) 是否为空
                            console.log(realEndTime$)
                            if(realEndTime$ === ""){
                                // 计划日期与系统日期比较
                                    var ExDay = eDay.getTime()-myDate.getTime()
@@ -115,7 +117,6 @@
                
            }
        })
    }
    setInterval(getThbodyData(),10000)
    }
    setInterval(getThbodyData(),2000)
    
src/main/webapp/views/index_datashow.html
@@ -4,7 +4,9 @@
    <meta charset="UTF-8">
    <title>项目进度表</title>
    <link rel="stylesheet" href="../static/css/style.css">
    <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>