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 | 65 +++++++++++++++++++-------------
1 files changed, 38 insertions(+), 27 deletions(-)
diff --git a/src/main/webapp/views/pipeline.html b/src/main/webapp/views/pipeline.html
index d820bb2..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>
@@ -94,6 +95,12 @@
<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">
@@ -147,7 +154,7 @@
} else if (res.code === 403){
window.location.href = baseUrl+"/login";
} else {
- alert(res.msg);
+ console.log(res.msg);
}
}
});
@@ -175,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(8), table[i-1].staNo);
}
} else if (res.code === 403){
window.location.href = baseUrl+"/login";
} else {
- alert(res.msg);
+ console.log(res.msg);
}
}
});
@@ -280,7 +287,7 @@
offset: 'rt',
anim: 5,
shade: [0],
- area: ['340px', '215px'],
+ area: ['340px', '255px'],
closeBtn: 0,
content: $("#site-detl"),
success: function(layero, index){
@@ -288,12 +295,14 @@
$('#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("");
}
})
}
@@ -303,7 +312,8 @@
http.post(baseUrl+ "/site//detl/update", {
siteId: $('#siteId').val(),
workNo: $('#workNo').val(),
- staNo: $('#staNo').val()
+ staNo: $('#staNo').val(),
+ pakMk: $('#pakMk').val()
}, function (res) {
layer.msg("淇敼鎴愬姛",{icon: 1,});
})
@@ -312,6 +322,7 @@
$('#siteId').val("");
$('#workNo').val("");
$('#staNo').val("");
+ $('#pakMk').val("");
layer.close(layerDetl);
})
--
Gitblit v1.9.1