From 92e25bfb1a5bb7212984ce0d08e94c9f6ecad666 Mon Sep 17 00:00:00 2001
From: vincent <1341870251@qq.com>
Date: 星期二, 02 六月 2020 10:41:18 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/client/controller/SiteController.java | 3 ++-
src/main/webapp/views/pipeline.html | 27 ++++++++++++---------------
2 files changed, 14 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/zy/client/controller/SiteController.java b/src/main/java/com/zy/client/controller/SiteController.java
index 9eccd10..d30698e 100644
--- a/src/main/java/com/zy/client/controller/SiteController.java
+++ b/src/main/java/com/zy/client/controller/SiteController.java
@@ -9,6 +9,7 @@
import java.util.ArrayList;
import java.util.List;
+import java.util.Random;
/**
* 杈撻�佽澶囨帴鍙�
@@ -22,7 +23,7 @@
@ManagerAuth(memo = "杈撻�佽澶噋lc寮傚父淇℃伅琛�")
public R crnLatestData(){
List<PlcErrorTable> list = new ArrayList<>();
- for (int i=0;i<10;i++){
+ for (int i = 0; i<new Random().nextInt(30); i++){
PlcErrorTable table = new PlcErrorTable();
table.setNo(String.valueOf(i));
table.setError("寮傚父淇℃伅");
diff --git a/src/main/webapp/views/pipeline.html b/src/main/webapp/views/pipeline.html
index 03b337a..8c90b9e 100644
--- a/src/main/webapp/views/pipeline.html
+++ b/src/main/webapp/views/pipeline.html
@@ -11,7 +11,6 @@
<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/common.js"></script>
- <script type="text/javascript" src="../static/js/handlebars/handlebars-v4.5.3.js"></script>
<style>
</style>
@@ -414,22 +413,14 @@
<textarea id="output"></textarea>
</footer>
</body>
-<script type="text/template" id="plcErrorTable">
- {{#each data}}
- <tr>
- <td>{{no}}</td>
- <td>{{plcDesc}}</td>
- <td>{{error}}</td>
- </tr>
- {{/each}}
-</script>
<script>
// 鍒濆鍖�
+ var plcErrorTableFieldCount = 0;
var outputDom = document.getElementById("output");
// 瀹炴椂璁块棶
setInterval(function () {
getPlcError();
- }, 500);
+ }, 1000);
// 绌虹櫧琛ㄦ牸娓叉煋
$(document).ready(function() {
@@ -437,6 +428,7 @@
var total = $('.plc-log-body').height();
var count = total / one;
count = parseInt(count);
+ plcErrorTableFieldCount = count - 1;
var html = "";
for (var i = 0; i < count-1; i ++){
html += " <tr>\n" +
@@ -452,16 +444,21 @@
// 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 tpl = $("#plcErrorTable").html();
- var template = Handlebars.compile(tpl);
- var html = template(res);
- $('#plc-error-table').append(html);
+ 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 {
--
Gitblit v1.9.1