#

luxiaotao1123

2022-03-09 8fc757864f420c2cd57adb046dfe3e621a363978

#

 src/main/webapp/static/css/console.css

@@ -28,7 +28,7 @@
    width: 100%;
    height: 23%    ;
    position: absolute;
    bottom: 1%;
    bottom: 2.5%;
}
/* 控制开关 */
.system-state {

 src/main/webapp/static/css/crn.css

@@ -1,11 +1,14 @@
body {
    padding: 10px;
    background-color: #f1f1f1;
}
.button-window {
    float: left;
    width: 5%;
    width: 100%;
    height: 100%;
    padding: 10px;
    background-color: #6CA7A8;
    border-radius: 5px;
    box-shadow: 0 0 3px rgba(0 0 0 .3);
}
/* -------------------- 第一模块 -------------------- */
.log-board {
@@ -19,7 +22,7 @@
.command-log {
    float: left;
    height: 100%;
    width: 19%;
    width: 20%;
    text-align: center;
}
.command-log h2 {
@@ -51,7 +54,7 @@
.crn-state {
    float: left;
    height: 100%;
    width: 76%;
    width: 80%;
    overflow: auto;
}
/* 堆垛机状态表 */

 src/main/webapp/static/css/index.css

@@ -41,7 +41,7 @@
}
.sidebar ul {
    font-size: 20px;
    font-weight: 700;
    font-weight: 5c00;
    padding-left: 15%;

}
@@ -51,16 +51,17 @@
}

.sidebar a:hover {
    color: rgb(87,214,201);
    color: rgb(255, 148, 111);
}



.nav-unselect {
    color: #5D7677;
    color: #FFFFFF;
}
.nav-select {
    color: rgb(87,214,201);
    font-weight: 900;
    color: rgb(255, 148, 111);
}



 src/main/webapp/static/css/pipeline.css

@@ -1,5 +1,5 @@
body {
    padding: 10px;
    /*padding: 10px;*/
    background-color: #f1f1f1;
}
main {
@@ -11,13 +11,17 @@
}
.button-window {
    float: left;
    width: 5%;
    width: 100%;
    height: 100%;
    padding: 10px;
    background-color: #6CA7A8;
    border-radius: 5px;
    box-shadow: 0 0 3px rgba(0 0 0 .3);
}
.main-board {
    padding-left: 1%;
    float: left;
    width: 47.5%;
    width: 50%;
    height: 100%;
    overflow: auto;
}

 src/main/webapp/views/console.html

@@ -1219,53 +1219,67 @@
</body>
</html>
<script>
    var tData = []
    var tData = [
        {"time":"2022-02-22 14:24:53","barcode":"80000009"},
        {"time":"2022-02-22 14:24:53","barcode":"80000019"},
        {"time":"2022-02-22 14:24:53","barcode":"80000019"},
        {"time":"2022-02-22 14:24:53","barcode":"80000019"},
        {"time":"2022-02-22 14:24:53","barcode":"80000019"},
        {"time":"2022-02-22 14:24:53","barcode":"80000019"},
        {"time":"2022-02-22 14:24:53","barcode":"80000019"},
        {"time":"2022-02-22 14:24:53","barcode":"80000019"},
        {"time":"2022-02-22 14:24:53","barcode":"80000019"},
        {"time":"2022-02-22 14:24:53","barcode":"80000019"},
        {"time":"2022-02-22 14:24:53","barcode":"80000019"},
        {"time":"2022-02-22 14:24:53","barcode":"80000019"},
        {"time":"2022-02-22 14:24:53","barcode":"80000019"},
        {"time":"2022-02-22 14:24:53","barcode":"80000019"},
        {"time":"2022-02-22 14:24:53","barcode":"80000019"},
        {"time":"2022-02-22 14:24:53","barcode":"80000019"},
        {"time":"2022-02-22 14:24:53","barcode":"80000019"},
        {"time":"2022-02-22 14:24:53","barcode":"80000019"},
        {"time":"2022-02-22 14:24:53","barcode":"80000019"},
        {"time":"2022-02-22 14:24:53","barcode":"80000019"},
        {"time":"2022-02-22 14:24:53","barcode":"80000019"},
        {"time":"2022-02-22 14:24:53","barcode":"80000019"},
        {"time":"2022-02-22 14:24:53","barcode":"80000019"},
        {"time":"2022-02-22 14:24:53","barcode":"80000019"},
        {"time":"2022-02-22 14:24:53","barcode":"80000019"},
    ]
    var tDate1 = []
    var tDate2 = []
    var tDate3 = []
    function getCodeData(){
        $.ajax({
            url:baseUrl +'/console/barcode/output/site',
            method:'GET',
            success:function (res) {
                if(res.code === 200){
                    tData = eval(res.data);
                    console.log(tData)
    // function getCodeData(){
    //     $.ajax({
    //         url:baseUrl +'/xgmwcs/console/barcode/output/site',
    //         method:'GET',
    //         success:function (res) {
    //             if(res.code === 200){
    //                 tData = res.data
    //             }
    //         }
    //     })
    // }
    // setInterval(getCodeData(),1000)
                    if(tData.length<=5){
                        tData1 = tData
                    } else if (tData.length<=10){
                        tDate1 = tData.slice(0,5)
                        tData.splice(0,5)
                        tDate2 = tData
                        console.log(tDate2)
                    } else if(tData.length<=15){
                        tDate1 = tData.slice(0,5)
                        tDate2 = tData.slice(6,10)
                        tData.splice(0,10)
                        tDate3 = tData
                        console.log(tDate3)
                    } else {
                        tData = tData.slice(-15)
                        tDate1 = tData.slice(-15)
                        tDate2 = tData.slice(-10)
                        tDate3 = tData.slice(-5)

                    }
                }
            }
        })
    }
    setInterval(function () {
        getCodeData();
        renderBarCode();
    }, 1000)




    function renderBarCode() {
        for (var i = 0;i<tDate1.length;i++){
            console.log(tDate1[i])
            var str1 = '<li><span>' + tDate1[i].barcode + '</span><span class="right">' + tDate1[i].time + '</span></li>'
            $('#barcode1').append(str1)
        }
@@ -1278,6 +1292,7 @@
            $('#barcode3').append(str3)
        }
    }
    setInterval(renderBarCode(),1000)
</script>
<script type="text/javascript">
    // 弹窗站点信息
@@ -1399,7 +1414,6 @@
            },
            method: 'POST',
            success: function (res) {
                console.log(res)
                layer.close(index);
                if (res.code === 200){
                    if (res.data.status) {

 src/main/webapp/views/crn.html

@@ -41,7 +41,11 @@
    </style>
</head>
<body>
<div style="padding: 10px;height: 100%;float: left;width: 6%">
<div class="button-window"></div>
</div>
<div style="height: 100%;padding-left: 6%">
    <div style="padding: 10px;height: 100%">
<!-- 日志监控板 -->
<div class="log-board">
    <!-- 执行命令 -->
@@ -223,6 +227,8 @@
<div class="crn-output-board">
    <textarea id="crn-output"></textarea>
</div>
    </div>
</div>
</body>
<script>
    // 空白行数

 src/main/webapp/views/pipeline.html

@@ -17,8 +17,14 @@
    </style>
</head>
<body>
<main>
<div style="padding: 10px;height: 100%;float: left;width: 6%">
    <div class="button-window"></div>
</div>

<div style="height: 100%;padding-left: 6%">
    <div style="padding: 10px;height: 100%">
        <main>

    <!-- plc异常日志监控版 -->
    <div id="plc-error" class="main-board" style="padding-left: 10px">
        <!-- 头部 -->
@@ -109,6 +115,11 @@
        </div>
    </form>
</div>
    </div>

</div>


</body>
<script>
    // 初始化