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/java/com/zy/client/controller/SiteController.java | 2 +-
src/main/webapp/views/pipeline.html | 20 +++++++++++++-------
2 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/client/controller/SiteController.java b/src/main/java/com/zy/client/controller/SiteController.java
index d30698e..593864c 100644
--- a/src/main/java/com/zy/client/controller/SiteController.java
+++ b/src/main/java/com/zy/client/controller/SiteController.java
@@ -23,7 +23,7 @@
@ManagerAuth(memo = "杈撻�佽澶噋lc寮傚父淇℃伅琛�")
public R crnLatestData(){
List<PlcErrorTable> list = new ArrayList<>();
- for (int i = 0; i<new Random().nextInt(30); i++){
+ for (int i = 0; i<new Random().nextInt(13); 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 9d8c117..325b9eb 100644
--- a/src/main/webapp/views/pipeline.html
+++ b/src/main/webapp/views/pipeline.html
@@ -466,14 +466,20 @@
// ------------------------------------------------------------------------------------------------
// plc寮傚父绌虹櫧琛ㄦ牸娓叉煋
- function initPlcErrorTable() {
- var one = $('#plc-error-table thead').height();
- var total = $('.plc-log-body').height();
- var count = total / one;
- count = parseInt(count);
- plcErrorTableFieldCount = count - 1;
+ 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 < count-1; i ++){
+ for (var i = 0; i < line; i ++){
html += " <tr>\n" +
" <td></td>\n" +
" <td></td>\n" +
--
Gitblit v1.9.1