From 819c8e537403db4c8e7da8efaeae7ce91fbdf232 Mon Sep 17 00:00:00 2001
From: vincent <1341870251@qq.com>
Date: 星期二, 02 六月 2020 13:11:03 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/client/controller/SiteController.java | 29 ++
src/main/webapp/views/pipeline.html | 433 +++++++++----------------------------------
src/main/java/com/zy/client/domain/SiteTableVo.java | 117 +++++++++++
src/main/webapp/static/js/common.js | 5
4 files changed, 239 insertions(+), 345 deletions(-)
diff --git a/src/main/java/com/zy/client/controller/SiteController.java b/src/main/java/com/zy/client/controller/SiteController.java
index 67a7881..378f39a 100644
--- a/src/main/java/com/zy/client/controller/SiteController.java
+++ b/src/main/java/com/zy/client/controller/SiteController.java
@@ -3,6 +3,7 @@
import com.core.annotations.ManagerAuth;
import com.core.common.R;
import com.zy.client.domain.PlcErrorTable;
+import com.zy.client.domain.SiteTableVo;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -10,6 +11,7 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Random;
+import java.util.concurrent.atomic.AtomicInteger;
/**
* 杈撻�佽澶囨帴鍙�
@@ -19,13 +21,32 @@
@RequestMapping("/site")
public class SiteController {
+ private AtomicInteger integer = new AtomicInteger();
+
@PostMapping("/table/site")
@ManagerAuth(memo = "绔欑偣淇℃伅琛�")
public R siteTable(){
-
-
-
- return R.ok();
+ List<SiteTableVo> list = new ArrayList<>();
+ for (int i=0;i<32;i++){
+ SiteTableVo vo = new SiteTableVo();
+ vo.setDevNo(String.valueOf(i));
+ vo.setWorkNo("1204");
+ vo.setAutoing("Y");
+ vo.setCanining("Y");
+ vo.setCanouting("N");
+ vo.setHighLow("1");
+ vo.setInreqIn("Y");
+ vo.setInreqOut("N");
+ vo.setLoading("Y");
+ if (integer.get() > 5) {
+ vo.setStaNo("0000");
+ } else {
+ vo.setStaNo("9998");
+ }
+ list.add(vo);
+ }
+ integer.getAndIncrement();
+ return R.ok().add(list);
}
@PostMapping("/table/plc/errors")
diff --git a/src/main/java/com/zy/client/domain/SiteTableVo.java b/src/main/java/com/zy/client/domain/SiteTableVo.java
new file mode 100644
index 0000000..ceb1ffe
--- /dev/null
+++ b/src/main/java/com/zy/client/domain/SiteTableVo.java
@@ -0,0 +1,117 @@
+package com.zy.client.domain;
+
+/**
+ * Created by vincent on 2020-06-02
+ */
+public class SiteTableVo {
+
+ // 绔欏彿
+ private String devNo;
+
+ // 宸ヤ綔鍙�
+ private String workNo;
+
+ // 鑷姩
+ private String autoing;
+
+ // 鏈夌墿
+ private String loading;
+
+ // 鍙叆
+ private String canining;
+
+ // 鍙嚭
+ private String canouting;
+
+ // 闇�姹傚叆
+ private String inreqIn;
+
+ // 闇�姹傚嚭
+ private String inreqOut;
+
+ // 楂樹綆搴�
+ private String highLow;
+
+ // 鐩爣绔�
+ private String staNo;
+
+ public String getDevNo() {
+ return devNo;
+ }
+
+ public void setDevNo(String devNo) {
+ this.devNo = devNo;
+ }
+
+ public String getWorkNo() {
+ return workNo;
+ }
+
+ public void setWorkNo(String workNo) {
+ this.workNo = workNo;
+ }
+
+ public String getAutoing() {
+ return autoing;
+ }
+
+ public void setAutoing(String autoing) {
+ this.autoing = autoing;
+ }
+
+ public String getLoading() {
+ return loading;
+ }
+
+ public void setLoading(String loading) {
+ this.loading = loading;
+ }
+
+ public String getCanining() {
+ return canining;
+ }
+
+ public void setCanining(String canining) {
+ this.canining = canining;
+ }
+
+ public String getCanouting() {
+ return canouting;
+ }
+
+ public void setCanouting(String canouting) {
+ this.canouting = canouting;
+ }
+
+ public String getInreqIn() {
+ return inreqIn;
+ }
+
+ public void setInreqIn(String inreqIn) {
+ this.inreqIn = inreqIn;
+ }
+
+ public String getInreqOut() {
+ return inreqOut;
+ }
+
+ public void setInreqOut(String inreqOut) {
+ this.inreqOut = inreqOut;
+ }
+
+ public String getHighLow() {
+ return highLow;
+ }
+
+ public void setHighLow(String highLow) {
+ this.highLow = highLow;
+ }
+
+ public String getStaNo() {
+ return staNo;
+ }
+
+ public void setStaNo(String staNo) {
+ this.staNo = staNo;
+ }
+}
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index 0e93302..c3a06a1 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -3,6 +3,11 @@
// 娴嬭瘯
var baseUrl = "";
+function setVal(el, val) {
+ if (el.text() !== val){
+ el.html(val);
+ }
+}
// 璇︽儏绐楀彛-楂樺害
var detailHeight = '80%';
diff --git a/src/main/webapp/views/pipeline.html b/src/main/webapp/views/pipeline.html
index 325b9eb..34a483c 100644
--- a/src/main/webapp/views/pipeline.html
+++ b/src/main/webapp/views/pipeline.html
@@ -68,344 +68,7 @@
</tr>
</thead>
<!-- 琛ㄦ牸鍐呭 -->
- <tbody>
- <tr>
- <td>12</td>
- <td>2223</td>
- <td>Y</td>
- <td>Y</td>
- <td>Y</td>
- <td>N</td>
- <td>Y</td>
- <td>N</td>
- <td>1</td>
- <td>1204</td>
- </tr>
- <tr>
- <td>12</td>
- <td>2223</td>
- <td>Y</td>
- <td>Y</td>
- <td>Y</td>
- <td>N</td>
- <td>Y</td>
- <td>N</td>
- <td>1</td>
- <td>1204</td>
- </tr>
- <tr>
- <td>12</td>
- <td>2223</td>
- <td>Y</td>
- <td>Y</td>
- <td>Y</td>
- <td>N</td>
- <td>Y</td>
- <td>N</td>
- <td>1</td>
- <td>1204</td>
- </tr>
- <tr>
- <td>12</td>
- <td>2223</td>
- <td>Y</td>
- <td>Y</td>
- <td>Y</td>
- <td>N</td>
- <td>Y</td>
- <td>N</td>
- <td>1</td>
- <td>1204</td>
- </tr>
- <tr>
- <td>12</td>
- <td>2223</td>
- <td>Y</td>
- <td>Y</td>
- <td>Y</td>
- <td>N</td>
- <td>Y</td>
- <td>N</td>
- <td>1</td>
- <td>1204</td>
- </tr>
- <tr>
- <td>12</td>
- <td>2223</td>
- <td>Y</td>
- <td>Y</td>
- <td>Y</td>
- <td>N</td>
- <td>Y</td>
- <td>N</td>
- <td>1</td>
- <td>1204</td>
- </tr>
- <tr>
- <td>12</td>
- <td>2223</td>
- <td>Y</td>
- <td>Y</td>
- <td>Y</td>
- <td>N</td>
- <td>Y</td>
- <td>N</td>
- <td>1</td>
- <td>1204</td>
- </tr>
- <tr>
- <td>12</td>
- <td>2223</td>
- <td>Y</td>
- <td>Y</td>
- <td>Y</td>
- <td>N</td>
- <td>Y</td>
- <td>N</td>
- <td>1</td>
- <td>1204</td>
- </tr>
- <tr>
- <td>12</td>
- <td>2223</td>
- <td>Y</td>
- <td>Y</td>
- <td>Y</td>
- <td>N</td>
- <td>Y</td>
- <td>N</td>
- <td>1</td>
- <td>1204</td>
- </tr>
- <tr>
- <td>12</td>
- <td>2223</td>
- <td>Y</td>
- <td>Y</td>
- <td>Y</td>
- <td>N</td>
- <td>Y</td>
- <td>N</td>
- <td>1</td>
- <td>1204</td>
- </tr>
- <tr>
- <td>12</td>
- <td>2223</td>
- <td>Y</td>
- <td>Y</td>
- <td>Y</td>
- <td>N</td>
- <td>Y</td>
- <td>N</td>
- <td>1</td>
- <td>1204</td>
- </tr>
- <tr>
- <td>12</td>
- <td>2223</td>
- <td>Y</td>
- <td>Y</td>
- <td>Y</td>
- <td>N</td>
- <td>Y</td>
- <td>N</td>
- <td>1</td>
- <td>1204</td>
- </tr>
- <tr>
- <td>12</td>
- <td>2223</td>
- <td>Y</td>
- <td>Y</td>
- <td>Y</td>
- <td>N</td>
- <td>Y</td>
- <td>N</td>
- <td>1</td>
- <td>1204</td>
- </tr>
- <tr>
- <td>12</td>
- <td>2223</td>
- <td>Y</td>
- <td>Y</td>
- <td>Y</td>
- <td>N</td>
- <td>Y</td>
- <td>N</td>
- <td>1</td>
- <td>1204</td>
- </tr>
- <tr>
- <td>12</td>
- <td>2223</td>
- <td>Y</td>
- <td>Y</td>
- <td>Y</td>
- <td>N</td>
- <td>Y</td>
- <td>N</td>
- <td>1</td>
- <td>1204</td>
- </tr>
- <tr>
- <td>12</td>
- <td>2223</td>
- <td>Y</td>
- <td>Y</td>
- <td>Y</td>
- <td>N</td>
- <td>Y</td>
- <td>N</td>
- <td>1</td>
- <td>1204</td>
- </tr>
- <tr>
- <td>12</td>
- <td>2223</td>
- <td>Y</td>
- <td>Y</td>
- <td>Y</td>
- <td>N</td>
- <td>Y</td>
- <td>N</td>
- <td>1</td>
- <td>1204</td>
- </tr>
- <tr>
- <td>12</td>
- <td>2223</td>
- <td>Y</td>
- <td>Y</td>
- <td>Y</td>
- <td>N</td>
- <td>Y</td>
- <td>N</td>
- <td>1</td>
- <td>1204</td>
- </tr>
- <tr>
- <td>12</td>
- <td>2223</td>
- <td>Y</td>
- <td>Y</td>
- <td>Y</td>
- <td>N</td>
- <td>Y</td>
- <td>N</td>
- <td>1</td>
- <td>1204</td>
- </tr>
- <tr>
- <td>12</td>
- <td>2223</td>
- <td>Y</td>
- <td>Y</td>
- <td>Y</td>
- <td>N</td>
- <td>Y</td>
- <td>N</td>
- <td>1</td>
- <td>1204</td>
- </tr>
- <tr>
- <td>12</td>
- <td>2223</td>
- <td>Y</td>
- <td>Y</td>
- <td>Y</td>
- <td>N</td>
- <td>Y</td>
- <td>N</td>
- <td>1</td>
- <td>1204</td>
- </tr>
- <tr>
- <td>12</td>
- <td>2223</td>
- <td>Y</td>
- <td>Y</td>
- <td>Y</td>
- <td>N</td>
- <td>Y</td>
- <td>N</td>
- <td>1</td>
- <td>1204</td>
- </tr>
- <tr>
- <td>12</td>
- <td>2223</td>
- <td>Y</td>
- <td>Y</td>
- <td>Y</td>
- <td>N</td>
- <td>Y</td>
- <td>N</td>
- <td>1</td>
- <td>1204</td>
- </tr>
- <tr>
- <td>12</td>
- <td>2223</td>
- <td>Y</td>
- <td>Y</td>
- <td>Y</td>
- <td>N</td>
- <td>Y</td>
- <td>N</td>
- <td>1</td>
- <td>1204</td>
- </tr>
- <tr>
- <td>12</td>
- <td>2223</td>
- <td>Y</td>
- <td>Y</td>
- <td>Y</td>
- <td>N</td>
- <td>Y</td>
- <td>N</td>
- <td>1</td>
- <td>1204</td>
- </tr>
- <tr>
- <td>12</td>
- <td>2223</td>
- <td>Y</td>
- <td>Y</td>
- <td>Y</td>
- <td>N</td>
- <td>Y</td>
- <td>N</td>
- <td>1</td>
- <td>1204</td>
- </tr>
- <tr>
- <td>12</td>
- <td>2223</td>
- <td>Y</td>
- <td>Y</td>
- <td>Y</td>
- <td>N</td>
- <td>Y</td>
- <td>N</td>
- <td>1</td>
- <td>1204</td>
- </tr>
- <tr>
- <td>12</td>
- <td>2223</td>
- <td>Y</td>
- <td>Y</td>
- <td>Y</td>
- <td>N</td>
- <td>Y</td>
- <td>N</td>
- <td>1</td>
- <td>1204</td>
- </tr>
- </tbody>
+ <tbody></tbody>
</table>
</div>
</main>
@@ -415,20 +78,29 @@
</body>
<script>
// 鍒濆鍖�
- var plcErrorTableFieldCount = 0;
+ // 绌虹櫧琛屾暟
+ var plcErrorTableBlankRows = 0;
+ var siteTableBlankRows = 0;
+ // 瀹為檯琛屾暟
+ var plcErrorTableFullRows = 0;
+ var siteTableFullRows = 0;
+
+
var outputDom = document.getElementById("output");
$(document).ready(function() {
initPlcErrorTable();
getPlcError();
+ initSiteTable();
+ getSite();
});
// 瀹炴椂璁块棶
setInterval(function () {
getPlcError();
+ getSite();
}, 1000);
setInterval(function () {
output("\n" +new Date().toLocaleString() + "銆�2020-5-29 13:14:22銆戞壂鎻弍lcA 鐩爣绔�--27328372372832763643234323432342");
},500);
-
// plc寮傚父淇℃伅琛ㄨ幏鍙�
@@ -457,6 +129,54 @@
});
}
+ // 绔欑偣淇℃伅琛ㄨ幏鍙�
+ function getSite() {
+ var tableEl = $('#site-table');
+ // tableEl.children("tr").children("td").html("");
+ $.ajax({
+ url: baseUrl+ "/site/table/site",
+ headers: {'token': localStorage.getItem('token')},
+ method: 'POST',
+ success: function (res) {
+ if (res.code === 200){
+ var table = res.data;
+ if (table.length > siteTableBlankRows && table.length !== siteTableFullRows) {
+ initSiteTable(table.length-siteTableBlankRows);
+ siteTableFullRows = table.length;
+ }
+ for (var i=1;i<=table.length;i++){
+ var tr = tableEl.find("tr").eq(i);
+ setVal(tr.children("td").eq(0), table[i-1].devNo);
+ setVal(tr.children("td").eq(1), table[i-1].workNo);
+ setVal(tr.children("td").eq(2), table[i-1].autoing);
+ setVal(tr.children("td").eq(3), table[i-1].loading);
+ setVal(tr.children("td").eq(4), table[i-1].canining);
+ setVal(tr.children("td").eq(5), table[i-1].canouting);
+ setVal(tr.children("td").eq(6), table[i-1].inreqIn);
+ setVal(tr.children("td").eq(7), table[i-1].inreqOut);
+ setVal(tr.children("td").eq(8), table[i-1].highLow);
+ setVal(tr.children("td").eq(9), table[i-1].staNo);
+
+ // tr.children("td").eq(0).html(table[i-1].devNo);
+ // tr.children("td").eq(1).html(table[i-1].workNo);
+ // tr.children("td").eq(2).html(table[i-1].autoing);
+ // tr.children("td").eq(3).html(table[i-1].loading);
+ // tr.children("td").eq(4).html(table[i-1].canining);
+ // tr.children("td").eq(5).html(table[i-1].canouting);
+ // tr.children("td").eq(6).html(table[i-1].inreqIn);
+ // tr.children("td").eq(7).html(table[i-1].inreqOut);
+ // tr.children("td").eq(8).html(table[i-1].highLow);
+ // tr.children("td").eq(9).html(table[i-1].staNo);
+ }
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/login";
+ } else {
+ alert(res.msg);
+ }
+ }
+ });
+ }
+
// 鏃ュ織杈撳嚭妗�
function output(content){
outputDom.value += content;
@@ -473,7 +193,7 @@
var total = $('.plc-log-body').height();
var count = total / one;
count = parseInt(count) - 1;
- plcErrorTableFieldCount = count;
+ plcErrorTableBlankRows = count;
line = count;
} else {
line = row;
@@ -489,5 +209,36 @@
$('#plc-error-table tbody').after(html);
}
+ // 绔欑偣绌虹櫧琛ㄦ牸娓叉煋
+ function initSiteTable(row) {
+ var line;
+ if (row === undefined){
+ var one = $('#site-table thead').height();
+ var total = $('#site-monitor').height();
+ var count = total / one;
+ count = parseInt(count) - 1;
+ siteTableBlankRows = 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" +
+ " <td></td>\n" +
+ " <td></td>\n" +
+ " <td></td>\n" +
+ " <td></td>\n" +
+ " <td></td>\n" +
+ " <td></td>\n" +
+ " <td></td>\n" +
+ " </tr>\n";
+ }
+ $('#site-table tbody').after(html);
+ }
+
</script>
</html>
\ No newline at end of file
--
Gitblit v1.9.1