From 9247dcffd28f79e631c6bd7e402b7983d2de69e8 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 20 八月 2020 15:48:05 +0800
Subject: [PATCH] #
---
src/main/webapp/views/pipeline.html | 684 +++++++++++++++++---------------------------------------
1 files changed, 215 insertions(+), 469 deletions(-)
diff --git a/src/main/webapp/views/pipeline.html b/src/main/webapp/views/pipeline.html
index 7a3fd2f..6768bdf 100644
--- a/src/main/webapp/views/pipeline.html
+++ b/src/main/webapp/views/pipeline.html
@@ -10,65 +10,9 @@
<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/common.js"></script>
<script type="text/javascript" src="../static/js/layer/layer.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 +22,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 +43,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>
@@ -180,368 +62,232 @@
<th>鏈夌墿</th>
<th>鍙叆</th>
<th>鍙嚭</th>
- <th>闇�姹傚叆</th>
- <th>闇�姹傚嚭</th>
- <th>楂樹綆搴�</th>
+ <th>闇�姹�1</th>
+ <th>绌烘澘淇″彿</th>
<th>鐩爣绔�</th>
</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>
<footer>
<textarea id="output"></textarea>
</footer>
+
+<div id="site-detl" style="display: none">
+ <div class="layui-form">
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">绔欑偣:</label>
+ <div class="layui-input-block">
+ <input id="siteId" name="siteId" placeholder="璇疯緭鍏ョ珯鐐圭紪鍙�" class="layui-input" lay-verify="required|number" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">宸ヤ綔鍙�:</label>
+ <div class="layui-input-block">
+ <input id="workNo" name="workNo" type="number" placeholder="璇疯緭鍏ュ伐浣滃彿" class="layui-input" lay-verify="number" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">鐩爣绔�:</label>
+ <div class="layui-input-block">
+ <input id="staNo" name="staNo" type="number" placeholder="璇疯緭鍏ョ洰鏍囩珯" class="layui-input" lay-verify="number" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-form-item cool-button-contain">
+ <button class="layui-btn layui-btn-normal" id="print" lay-filter="print" lay-submit="">鎵撳嵃</button>
+ <button class="layui-btn layui-btn-primary" id="cancel">鍙栨秷</button>
+ </div>
+ </div>
+</div>
</body>
<script>
+ // 鍒濆鍖�
+ // 绌虹櫧琛屾暟
+ 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 () {
+ getSiteOutput();
+ },500);
+
+ $(document).on('click','#site-table tr', function () {
+ var siteId = $(this).children("td").eq(0).html();
+ if (siteId !== null && siteId !== "") {
+ layer.open({
+ type: 1,
+ title: false,
+ shadeClose: true,
+ offset: 'rt',
+ anim: 5,
+ shade: [0],
+ area: ['340px', '215px'],
+ closeBtn: 0,
+ content: $("#site-detl"),
+ success: function(layero, index){
+
+ }
+ })
+ }
+ });
+
+
+ // 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){
+ window.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].inEnable);
+ setVal(tr.children("td").eq(5), table[i-1].outEnable);
+ setVal(tr.children("td").eq(6), table[i-1].inreq1);
+ setVal(tr.children("td").eq(7), table[i-1].emptyMk);
+ setVal(tr.children("td").eq(9), table[i-1].staNo);
+ }
+ } else if (res.code === 403){
+ window.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) {
+ window.location.href = baseUrl + "/login";
+ } else {
+ alert(res.msg);
+ }
+ }
+ })
+ }
+
+ // 鏃ュ織杈撳嚭妗�
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);
+ // ------------------------------------------------------------------------------------------------
+
+ // 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 < line; i ++){
+ html += " <tr>\n" +
+ " <td></td>\n" +
+ " <td></td>\n" +
+ " <td></td>\n" +
+ " </tr>\n";
+ }
+ $('#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" +
+ " </tr>\n";
+ }
+ $('#site-table tbody').after(html);
+ }
</script>
</html>
\ No newline at end of file
--
Gitblit v1.9.1