From c422d0d7da0d26f39cd40f9070311ffbb2f9c009 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <xltys1995>
Date: 星期四, 27 八月 2020 18:32:03 +0800
Subject: [PATCH] #v2.0
---
src/main/webapp/views/pipeline.html | 116 ++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 88 insertions(+), 28 deletions(-)
diff --git a/src/main/webapp/views/pipeline.html b/src/main/webapp/views/pipeline.html
index 96ba05f..8bd1f02 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,9 +62,8 @@
<th>鏈夌墿</th>
<th>鍙叆</th>
<th>鍙嚭</th>
- <th>闇�姹傚叆</th>
- <th>闇�姹傚嚭</th>
- <th>楂樹綆搴�</th>
+ <th>闇�姹�1</th>
+ <th>绌烘澘淇″彿</th>
<th>鐩爣绔�</th>
</tr>
</thead>
@@ -75,6 +75,33 @@
<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 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>
// 鍒濆鍖�
@@ -99,7 +126,6 @@
setInterval(function () {
getSiteOutput();
},500);
-
// plc寮傚父淇℃伅琛ㄨ幏鍙�
function getPlcError() {
@@ -147,23 +173,11 @@
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);
+ 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(8), table[i-1].staNo);
}
} else if (res.code === 403){
window.location.href = baseUrl+"/login";
@@ -249,11 +263,57 @@
" <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', '215px'],
+ 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);
+ })
+ },
+ end: function () {
+ $('#siteId').val("");
+ $('#workNo').val("");
+ $('#staNo').val("");
+ }
+ })
+ }
+ });
+
+ $(document).on('click ','#save', function () {
+ http.post(baseUrl+ "/site//detl/update", {
+ siteId: $('#siteId').val(),
+ workNo: $('#workNo').val(),
+ staNo: $('#staNo').val()
+ }, function (res) {
+ layer.msg("淇敼鎴愬姛",{icon: 1,});
+ })
+ })
+ $(document).on('click ','#cancel', function () {
+ $('#siteId').val("");
+ $('#workNo').val("");
+ $('#staNo').val("");
+ layer.close(layerDetl);
+ })
+
</script>
</html>
\ No newline at end of file
--
Gitblit v1.9.1