From 890c164aaf39c9ca28de044d8ac55bd4fe8cbc3e Mon Sep 17 00:00:00 2001
From: vincent <1341870251@qq.com>
Date: 星期二, 02 六月 2020 11:05:44 +0800
Subject: [PATCH] #
---
src/main/webapp/views/pipeline.html | 206 +++++++++++++++++++--------------------------------
1 files changed, 76 insertions(+), 130 deletions(-)
diff --git a/src/main/webapp/views/pipeline.html b/src/main/webapp/views/pipeline.html
index 7a3fd2f..325b9eb 100644
--- a/src/main/webapp/views/pipeline.html
+++ b/src/main/webapp/views/pipeline.html
@@ -10,65 +10,8 @@
<link rel="stylesheet" type="text/css" href="../static/css/common.css">
<link rel="stylesheet" type="text/css" href="../static/css/pipeline.css">
<script type="text/javascript" src="../static/js/jquery/jquery-3.3.1.min.js"></script>
- <script type="text/javascript" src="../static/js/layer/layer.js"></script>
+ <script type="text/javascript" src="../static/js/common.js"></script>
<style>
- .plc-log-header {
- height: 15%;
- }
- .plc-log-body {
- height: 85%;
- overflow: auto;
- }
-
-
- /* 绔欑偣琛ㄦ牸 */
- #site-table {
- font-size: 12px;
- border-collapse: collapse;
- margin: 0 auto;
- text-align: center;
- }
- #site-table td, #site-table th {
- border: 1px solid #cad9ea;
- color: #666;
- height: 25px;
- }
- #site-table thead th {
- background-color: #CCE8EB;
- width: 100px;
- }
- #site-table tr:nth-child(odd) {
- background: #fff;
- }
- #site-table tr:nth-child(even) {
- background: #F5FAFA;
- }
-
-
-
- /* plc寮傚父琛ㄦ牸 */
- #plc-error-table {
- font-size: 12px;
- border-collapse: collapse;
- margin: 0 auto;
- }
- #plc-error-table td, #plc-error-table th {
- border: 1px solid #cad9ea;
- color: #666;
- height: 25px;
- text-align: left;
- padding-left: 5px;
- }
- #plc-error-table thead th {
- background-color: #CCE8EB;
- width: 100px;
- }
- #plc-error-table tr:nth-child(odd) {
- background: #fff;
- }
- #plc-error-table tr:nth-child(even) {
- background: #F5FAFA;
- }
</style>
</head>
@@ -78,16 +21,18 @@
<div id="plc-error" class="main-board" style="padding-left: 10px">
<!-- 澶撮儴 -->
<div class="plc-log-header">
- <div style="height: 50%">
+ <div style="height: 40%">
<span>涓滀晶PLC鎵ц鎸囦护</span>
</div>
- <div style="height: 50%">
+ <div style="height: 40%">
<span>瑗夸晶PLC鎵ц鎸囦护</span>
+ </div>
+ <div>
+ <span style="color: #1E9FFF">PLC寮傚父淇℃伅琛�:</span>
</div>
</div>
<!-- 涓讳綋 -->
<div class="plc-log-body">
- <span>PLC寮傚父淇℃伅</span>
<table id="plc-error-table">
<thead>
<tr>
@@ -97,71 +42,7 @@
</tr>
</thead>
<tbody>
- <tr>
- <td>23532</td>
- <td>PLC閿欒鎻忚堪PLC閿欒鎻忚堪1</td>
- <td>寮傚父寮傚父寮傚父寮傚父寮傚父寮傚父寮傚父</td>
- </tr>
- <tr>
- <td></td>
- <td></td>
- <td></td>
- </tr>
- <tr>
- <td></td>
- <td></td>
- <td></td>
- </tr>
- <tr>
- <td></td>
- <td></td>
- <td></td>
- </tr>
- <tr>
- <td></td>
- <td></td>
- <td></td>
- </tr>
- <tr>
- <td></td>
- <td></td>
- <td></td>
- </tr>
- <tr>
- <td></td>
- <td></td>
- <td></td>
- </tr>
- <tr>
- <td></td>
- <td></td>
- <td></td>
- </tr>
- <tr>
- <td></td>
- <td></td>
- <td></td>
- </tr>
- <tr>
- <td></td>
- <td></td>
- <td></td>
- </tr>
- <tr>
- <td></td>
- <td></td>
- <td></td>
- </tr>
- <tr>
- <td></td>
- <td></td>
- <td></td>
- </tr>
- <tr>
- <td></td>
- <td></td>
- <td></td>
- </tr>
+
</tbody>
</table>
</div>
@@ -533,15 +414,80 @@
</footer>
</body>
<script>
+ // 鍒濆鍖�
+ var plcErrorTableFieldCount = 0;
var outputDom = document.getElementById("output");
- function output(content){
- outputDom.value += content;
- outputDom.scrollTop = outputDom.scrollHeight;
- }
+ $(document).ready(function() {
+ initPlcErrorTable();
+ getPlcError();
+ });
+ // 瀹炴椂璁块棶
+ setInterval(function () {
+ getPlcError();
+ }, 1000);
setInterval(function () {
output("\n" +new Date().toLocaleString() + "銆�2020-5-29 13:14:22銆戞壂鎻弍lcA 鐩爣绔�--27328372372832763643234323432342");
},500);
+
+ // plc寮傚父淇℃伅琛ㄨ幏鍙�
+ function getPlcError() {
+ var tableEl = $('#plc-error-table');
+ tableEl.children("tr").children("td").html("");
+ $.ajax({
+ url: baseUrl+ "/site/table/plc/errors",
+ headers: {'token': localStorage.getItem('token')},
+ method: 'POST',
+ success: function (res) {
+ if (res.code === 200){
+ var table = res.data;
+ for (var i=1;i<=table.length;i++){
+ var tr = tableEl.find("tr").eq(i);
+ tr.children("td").eq(0).html(table[i-1].no);
+ tr.children("td").eq(1).html(table[i-1].plcDesc);
+ tr.children("td").eq(2).html(table[i-1].error);
+ }
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/login";
+ } else {
+ alert(res.msg);
+ }
+ }
+ });
+ }
+
+ // 鏃ュ織杈撳嚭妗�
+ function output(content){
+ outputDom.value += content;
+ outputDom.scrollTop = outputDom.scrollHeight;
+ }
+
+ // ------------------------------------------------------------------------------------------------
+
+ // plc寮傚父绌虹櫧琛ㄦ牸娓叉煋
+ function initPlcErrorTable(row) {
+ var line;
+ if (row === undefined){
+ var one = $('#plc-error-table thead').height();
+ var total = $('.plc-log-body').height();
+ var count = total / one;
+ count = parseInt(count) - 1;
+ plcErrorTableFieldCount = count;
+ line = count;
+ } else {
+ line = row;
+ }
+ var html = "";
+ for (var i = 0; i < line; i ++){
+ html += " <tr>\n" +
+ " <td></td>\n" +
+ " <td></td>\n" +
+ " <td></td>\n" +
+ " </tr>\n";
+ }
+ $('#plc-error-table tbody').after(html);
+ }
+
</script>
</html>
\ No newline at end of file
--
Gitblit v1.9.1