From cb15c6400b7dfc3855e5fdd76b8b217bf6bc9567 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <xltys1995>
Date: 星期三, 30 十二月 2020 10:55:09 +0800
Subject: [PATCH] #
---
src/main/webapp/views/pipeline.html | 562 ++++++++++++++++++++------------------------------------
1 files changed, 202 insertions(+), 360 deletions(-)
diff --git a/src/main/webapp/views/pipeline.html b/src/main/webapp/views/pipeline.html
index 9d8c117..9dd0be1 100644
--- a/src/main/webapp/views/pipeline.html
+++ b/src/main/webapp/views/pipeline.html
@@ -11,6 +11,7 @@
<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>
</style>
@@ -21,12 +22,12 @@
<div id="plc-error" class="main-board" style="padding-left: 10px">
<!-- 澶撮儴 -->
<div class="plc-log-header">
- <div style="height: 40%">
- <span>涓滀晶PLC鎵ц鎸囦护</span>
- </div>
- <div style="height: 40%">
- <span>瑗夸晶PLC鎵ц鎸囦护</span>
- </div>
+<!-- <div style="height: 40%">-->
+<!-- <span>涓滀晶PLC鎵ц鎸囦护</span>-->
+<!-- </div>-->
+<!-- <div style="height: 40%">-->
+<!-- <span>瑗夸晶PLC鎵ц鎸囦护</span>-->
+<!-- </div>-->
<div>
<span style="color: #1E9FFF">PLC寮傚父淇℃伅琛�:</span>
</div>
@@ -61,375 +62,76 @@
<th>鏈夌墿</th>
<th>鍙叆</th>
<th>鍙嚭</th>
- <th>闇�姹傚叆</th>
- <th>闇�姹傚嚭</th>
- <th>楂樹綆搴�</th>
+ <th>鍏ュ簱鏍囪</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">
+ <form>
+ <div class="form-item">
+ <label class="form-label">绔欏彿:</label>
+ <div class="form-input">
+ <input id="siteId" name="siteId" class="layui-input" lay-verify="required|number" autocomplete="off" disabled="disabled">
+ </div>
+ </div>
+ <div class="form-item">
+ <label class="form-label">宸ヤ綔鍙�:</label>
+ <div class="form-input">
+ <input id="workNo" name="workNo" type="number" class="layui-input" lay-verify="number" autocomplete="off">
+ </div>
+ </div>
+ <div class="form-item">
+ <label class="form-label">鐩爣绔�:</label>
+ <div class="form-input">
+ <input id="staNo" name="staNo" type="number" class="layui-input" lay-verify="number" autocomplete="off">
+ </div>
+ </div>
+ <div class="form-item">
+ <label class="form-label">鍏ュ簱鏍囪:</label>
+ <div class="form-input">
+ <input id="pakMk" name="pakMk" type="text" class="layui-input" autocomplete="off">
+ </div>
+ </div>
+ <div class="form-item form-button-container">
+ <button class="form-button" id="save">淇濆瓨</button>
+ <button class="form-button" id="cancel" style="background-color: #D0D0D0">鍙栨秷</button>
+ </div>
+ </form>
+</div>
</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");
+ getSiteOutput();
},500);
-
-
// plc寮傚父淇℃伅琛ㄨ幏鍙�
function getPlcError() {
@@ -449,12 +151,65 @@
tr.children("td").eq(2).html(table[i-1].error);
}
} else if (res.code === 403){
- top.location.href = baseUrl+"/login";
+ window.location.href = baseUrl+"/login";
} else {
- alert(res.msg);
+ console.log(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].pakMk);
+ setVal(tr.children("td").eq(7), table[i-1].emptyMk);
+ setVal(tr.children("td").eq(8), table[i-1].staNo);
+ }
+ } else if (res.code === 403){
+ window.location.href = baseUrl+"/login";
+ } else {
+ console.log(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);
+ }
+ }
+ })
}
// 鏃ュ織杈撳嚭妗�
@@ -466,14 +221,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;
+ 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" +
@@ -483,5 +244,86 @@
$('#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);
+ }
+
+ // 璇︽儏鎿嶄綔 -------------------------------------------------------------------------
+ var layerDetl;
+ $(document).on('dblclick ','#site-table tr', function () {
+ var siteId = $(this).children("td").eq(0).html();
+ if (siteId !== null && siteId !== "") {
+ layerDetl = layer.open({
+ type: 1,
+ title: false,
+ shadeClose: true,
+ offset: 'rt',
+ anim: 5,
+ shade: [0],
+ area: ['340px', '255px'],
+ closeBtn: 0,
+ content: $("#site-detl"),
+ success: function(layero, index){
+ http.get(baseUrl+ "/site/detl/"+siteId, null, function (res) {
+ $('#siteId').val(siteId);
+ $('#workNo').val(res.data.workNo);
+ $('#staNo').val(res.data.staNo);
+ $('#pakMk').val(res.data.pakMk);
+ })
+ },
+ end: function () {
+ $('#siteId').val("");
+ $('#workNo').val("");
+ $('#staNo').val("");
+ $('#pakMk').val("");
+ }
+ })
+ }
+ });
+
+ $(document).on('click ','#save', function () {
+ http.post(baseUrl+ "/site//detl/update", {
+ siteId: $('#siteId').val(),
+ workNo: $('#workNo').val(),
+ staNo: $('#staNo').val(),
+ pakMk: $('#pakMk').val()
+ }, function (res) {
+ layer.msg("淇敼鎴愬姛",{icon: 1,});
+ })
+ })
+ $(document).on('click ','#cancel', function () {
+ $('#siteId').val("");
+ $('#workNo').val("");
+ $('#staNo').val("");
+ $('#pakMk').val("");
+ layer.close(layerDetl);
+ })
+
</script>
</html>
\ No newline at end of file
--
Gitblit v1.9.1