From c350b737713fe518c22036dfc9a2574bcafcb15c Mon Sep 17 00:00:00 2001
From: vincent <1341870251@qq.com>
Date: 星期二, 02 六月 2020 15:18:08 +0800
Subject: [PATCH] #
---
src/main/webapp/views/pipeline.html | 581 ++++++++++++++++-----------------------------------------
1 files changed, 169 insertions(+), 412 deletions(-)
diff --git a/src/main/webapp/views/pipeline.html b/src/main/webapp/views/pipeline.html
index 5353db0..384f97d 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>
@@ -99,6 +42,7 @@
</tr>
</thead>
<tbody>
+
</tbody>
</table>
</div>
@@ -124,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>
@@ -470,14 +77,144 @@
</footer>
</body>
<script>
- // 绌虹櫧琛ㄦ牸娓叉煋
+ // 鍒濆鍖�
+ // 绌虹櫧琛屾暟
+ var plcErrorTableBlankRows = 0;
+ var siteTableBlankRows = 0;
+ // 瀹為檯琛屾暟
+ var plcErrorTableFullRows = 0;
+ var siteTableFullRows = 0;
+ var outputDom = document.getElementById("output");
$(document).ready(function() {
- var one = $('#plc-error-table thead').height();
- var total = $('.plc-log-body').height();
- var count = total / one;
- count = parseInt(count);
+ initPlcErrorTable();
+ getPlcError();
+ initSiteTable();
+ getSite();
+ });
+ // 瀹炴椂璁块棶
+ setInterval(function () {
+ getPlcError();
+ getSite();
+ }, 1000);
+ setInterval(function () {
+ getSiteOutput();
+ },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 getSite() {
+ var tableEl = $('#site-table');
+ $.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 getSiteOutput() {
+ $.ajax({
+ url: baseUrl + "/site/output/site",
+ headers: {'token': localStorage.getItem('token')},
+ method: 'POST',
+ success: function (res) {
+ if (res.code === 200) {
+ output(res.data);
+ } 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;
+ plcErrorTableBlankRows = 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" +
@@ -485,18 +222,38 @@
" </tr>\n";
}
$('#plc-error-table tbody').after(html);
- });
-
- // 鏃ュ織杈撳嚭妗�
- var outputDom = document.getElementById("output");
- function output(content){
- outputDom.value += content;
- outputDom.scrollTop = outputDom.scrollHeight;
}
- setInterval(function () {
- output("\n" +new Date().toLocaleString() + "銆�2020-5-29 13:14:22銆戞壂鎻弍lcA 鐩爣绔�--27328372372832763643234323432342");
- },500);
+ // 绔欑偣绌虹櫧琛ㄦ牸娓叉煋
+ 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