From ea8833f7c9fa7e6cda12319a79af8ffcda1f9e25 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期四, 03 三月 2022 15:30:31 +0800
Subject: [PATCH] #
---
src/main/webapp/views/pipeline.html | 165 +++++++++++++++++++++++++++++++++---------------------
1 files changed, 101 insertions(+), 64 deletions(-)
diff --git a/src/main/webapp/views/pipeline.html b/src/main/webapp/views/pipeline.html
index 6768bdf..1835d67 100644
--- a/src/main/webapp/views/pipeline.html
+++ b/src/main/webapp/views/pipeline.html
@@ -18,16 +18,17 @@
</head>
<body>
<main>
+ <div class="button-window"></div>
<!-- plc寮傚父鏃ュ織鐩戞帶鐗� -->
<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>
@@ -36,11 +37,11 @@
<div class="plc-log-body">
<table id="plc-error-table">
<thead>
- <tr>
- <th style="width: 200px">搴忓彿</th>
- <th style="width: 400px">PLC閿欒鎻忚堪</th>
- <th style="width: 400px">寮傚父</th>
- </tr>
+ <tr>
+ <th style="width: 200px">搴忓彿</th>
+ <th style="width: 400px">PLC閿欒鎻忚堪</th>
+ <th style="width: 400px">寮傚父</th>
+ </tr>
</thead>
<tbody>
@@ -55,17 +56,17 @@
<table id="site-table">
<!-- 琛ㄥご -->
<thead>
- <tr>
- <th>绔欏彿</th>
- <th>宸ヤ綔鍙�</th>
- <th>鑷姩</th>
- <th>鏈夌墿</th>
- <th>鍙叆</th>
- <th>鍙嚭</th>
- <th>闇�姹�1</th>
- <th>绌烘澘淇″彿</th>
- <th>鐩爣绔�</th>
- </tr>
+ <tr>
+ <th>绔欏彿</th>
+ <th>宸ヤ綔鍙�</th>
+ <th>鑷姩</th>
+ <th>鏈夌墿</th>
+ <th>鍙叆</th>
+ <th>鍙嚭</th>
+ <th>鍏ュ簱鏍囪</th>
+ <th>绌烘澘淇″彿</th>
+ <th>鐩爣绔�</th>
+ </tr>
</thead>
<!-- 琛ㄦ牸鍐呭 -->
<tbody></tbody>
@@ -77,30 +78,36 @@
</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">
+ <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="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 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="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 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="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 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>
+ <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>
@@ -127,27 +134,6 @@
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');
@@ -168,7 +154,7 @@
} else if (res.code === 403){
window.location.href = baseUrl+"/login";
} else {
- alert(res.msg);
+ console.log(res.msg);
}
}
});
@@ -196,14 +182,14 @@
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(6), table[i-1].pakMk);
setVal(tr.children("td").eq(7), table[i-1].emptyMk);
- setVal(tr.children("td").eq(9), table[i-1].staNo);
+ setVal(tr.children("td").eq(8), table[i-1].staNo);
}
} else if (res.code === 403){
window.location.href = baseUrl+"/login";
} else {
- alert(res.msg);
+ console.log(res.msg);
}
}
});
@@ -289,5 +275,56 @@
$('#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