From baf11d9f195732cfc0cc45a66b58ec2c1633cd4d Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 19 七月 2023 09:03:11 +0800
Subject: [PATCH] command write
---
src/main/webapp/views/lift.html | 191 +++++++++++++++++++++++++----------------------
1 files changed, 100 insertions(+), 91 deletions(-)
diff --git a/src/main/webapp/views/lift.html b/src/main/webapp/views/lift.html
index 1522ddc..76a83f2 100644
--- a/src/main/webapp/views/lift.html
+++ b/src/main/webapp/views/lift.html
@@ -65,6 +65,7 @@
<th>杩涜緭閫佺嚎鍗℃墭鐩樻姤璀�</th>
<th>鍑鸿緭閫佺嚎鍗℃墭鐩樻姤璀�</th>
<th>浣滀笟鏍囪</th>
+ <th>绌挎杞﹀彿</th>
</tr>
</thead>
<tbody>
@@ -95,11 +96,20 @@
<fieldset>
<legend>鎵嬪姩鎿嶄綔</legend>
<div class="button-group">
- <button class="item" onclick="liftOperator(1)">涓婂崌涓�灞�</button>
- <button class="item" onclick="liftOperator(2)">涓嬮檷涓�灞�</button>
- <button class="item" onclick="liftOperator(3)">鏈夎揣姝ｈ浆</button>
- <button class="item" onclick="liftOperator(4)">鏈夎揣鍙嶈浆</button>
- <button class="item" onclick="liftOperator(5)">澶嶄綅</button>
+ <select id="liftLev">
+ <option value="1" selected>1F</option>
+ <option value="3">2F</option>
+ <option value="4">3F</option>
+ <option value="5">4F</option>
+ <option value="2">杈撻�佺嚎浣嶇疆</option>
+ </select>
+ <button class="item" onclick="liftOperator(1)">绉诲姩鎻愬崌鏈�</button>
+ <button class="item" onclick="liftOperator(3)">鏃犺揣姝ｈ浆</button>
+ <button class="item" onclick="liftOperator(4)">鏃犺揣鍙嶈浆</button>
+ <button class="item" onclick="liftOperator(5)">鏈夎揣姝ｈ浆</button>
+ <button class="item" onclick="liftOperator(6)">鏈夎揣鍙嶈浆</button>
+ <button class="item" onclick="liftOperator(7)">閾炬潯鍋滄</button>
+ <button class="item" onclick="liftOperator(0)">澶嶄綅</button>
</div>
</fieldset>
</div>
@@ -108,6 +118,33 @@
<!-- 鎻愬崌鏈烘棩蹇楄緭鍑� -->
<div class="lift-output-board">
<textarea id="lift-output"></textarea>
+ </div>
+
+ <div id="lift-detl" style="display: none">
+ <div>
+ <div class="form-item">
+ <label class="form-label">绔欏彿:</label>
+ <div class="form-input">
+ <input id="liftNo" name="liftNo" 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="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>
+ </div>
</div>
</div>
</div>
@@ -153,82 +190,6 @@
}
}
- var layerIdx;
- $(document).on('click ','.pos-btn', function () {
- let liftNo = Number($(this).parent().attr("data-liftNo"));
- layerIdx = layer.open({
- type: 1,
- title: false,
- shadeClose: true,
- offset: [$(this).offset().top + 30 + 'px', $(this).offset().left + 'px'],
- anim: 5,
- shade: [0],
- area: ['310px', '370px'],
- closeBtn: 0,
- content: $("#lift-detl"),
- success: function(layero, index){
- http.get(baseUrl+ "/lift/detl/"+liftNo, null, function (res) {
- $('#liftNo').val(liftNo);
- $('#workNo').val(res.data.workNo);
- $('#row').val(res.data.row);
- $('#bay').val(res.data.bay);
- $('#lev').val(res.data.lev);
- $('#crnNo').val(res.data.crnNo);
- $('#pakMk').val(res.data.pakMk);
- })
- },
- end: function () {
- $('#liftNo').val("");
- $('#workNo').val("");
- $('#row').val("");
- $('#bay').val("");
- $('#lev').val("");
- $('#crnNo').val("");
- $('#pakMk').val("");
- }
- })
- })
-
- var layerIdx0;
- $(document).on('click ','.mode-btn', function () {
- let liftNo = Number($(this).parent().attr("data-liftNo"));
- layerIdx0 = layer.open({
- type: 1,
- title: false,
- shadeClose: true,
- offset: [$(this).offset().top + 30 + 'px', $(this).offset().left + 'px'],
- anim: 5,
- shade: [0],
- area: ['70%', '85%'],
- closeBtn: 0,
- content: $("#lift-detl2"),
- success: function(layero, index){
- console.log(liftNo)
- http.get(baseUrl+ "/lift/sensor/detl/"+liftNo, null, function (res) {
- $('#liftNo1').val(res.data.liftNo);
- getColor(res.data.pakInTask,'#pakInTask');
- getColor(res.data.pakOutTask,'#pakOutTask');
- getColor(res.data.pakMoveTask,'#pakMoveTask');
- getColor(res.data.goHpTask,'#goHpTask');
- getColor(res.data.goOHpTask,'#goOHpTask');
- getColor(res.data.goHpAvoid,'#goHpAvoid');
- getColor(res.data.goOHpAvoid,'#goOHpAvoid');
- getColor(res.data.pakInEmpty,'#pakInEmpty');
- getColor(res.data.pakInFinish,'#pakInFinish');
- getColor(res.data.pakOutEmpty,'#pakOutEmpty');
- getColor(res.data.pakOutFinish,'#pakOutFinish');
- getColor(res.data.goHpAvoidFinish,'#goHpAvoidFinish');
- getColor(res.data.goOHpAvoidFinish,'#goOHpAvoidFinish');
- getColor(res.data.goHpAvoidErr,'#goHpAvoidErr');
- getColor(res.data.goOHpAvoidErr,'#goOHpAvoidErr');
- })
- },
- end: function () {
- $('#liftNo').val("");
- }
- })
- })
-
function getColor(res,e){
$(e).val(res?"鉁�":"鈥�");
if (res){
@@ -242,19 +203,11 @@
http.post(baseUrl+ "/lift/detl/update", {
liftNo: $('#liftNo').val(),
workNo: $('#workNo').val(),
- row: $('#row').val(),
- bay: $('#bay').val(),
- lev: $('#lev').val(),
- crnNo: $('#crnNo').val(),
pakMk: $('#pakMk').val(),
}, function (res) {
layer.msg("淇敼鎴愬姛", {icon: 1,});
layer.close(layerIdx);
})
- })
-
- $(document).on('click ','#cancel', function () {
- layer.close(layerIdx);
})
function setliftRadio() {
@@ -322,8 +275,8 @@
setVal(tr.children("td").eq(12), table[i-1].servoError1);
setVal(tr.children("td").eq(13), table[i-1].servoError2);
setVal(tr.children("td").eq(14), table[i-1].servoError3);
- setVal(tr.children("td").eq(14), table[i-1].servoError4);
- setVal(tr.children("td").eq(14), table[i-1].liftActualSpeed);
+ setVal(tr.children("td").eq(15), table[i-1].servoError4);
+ setVal(tr.children("td").eq(16), table[i-1].liftActualSpeed);
}
} else if (res.code === 403){
window.location.href = baseUrl+"/login";
@@ -360,6 +313,7 @@
setVal(tr.children("td").eq(7), table[i-1].inConveyLineCardTrayAlarm$);
setVal(tr.children("td").eq(8), table[i-1].outConveyLineCardTrayAlarm$);
setVal(tr.children("td").eq(9), table[i-1].pakMk);
+ setVal(tr.children("td").eq(10), table[i-1].shuttleNo);
}
} else if (res.code === 403){
window.location.href = baseUrl+"/login";
@@ -393,6 +347,7 @@
http.post(baseUrl+"/lift/operator/lift", {
liftNo: $('input[name="liftSelect"]:checked').val(),
liftTaskMode: liftTaskMode,
+ lev: $("#liftLev").val()
}, function (res) {
layer.msg(res.msg, {icon: 1});
});
@@ -481,4 +436,58 @@
liftOutputDom.scrollTop = liftOutputDom.scrollHeight;
}
+ // 璇︽儏鎿嶄綔 -------------------------------------------------------------------------
+ var layerDetl;
+ $(document).on('dblclick ','#lift-msg-table tr', function () {
+ var liftNo = $(this).children("td").eq(0).html();
+ if (liftNo !== null && liftNo !== "") {
+ layerDetl = layer.open({
+ type: 1,
+ title: false,
+ shadeClose: true,
+ offset: 'rt',
+ anim: 5,
+ shade: [0],
+ area: ['340px', '255px'],
+ closeBtn: 0,
+ content: $("#lift-detl"),
+ success: function(layero, index){
+ $.ajax({
+ url: baseUrl+ "/lift/table/lift/msg",
+ 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++){
+ if (liftNo == table[i-1].liftNo) {
+ $('#liftNo').val(liftNo);
+ $('#workNo').val(table[i-1].workNo);
+ $('#pakMk').val(table[i-1].pakMk);
+ }
+ }
+ } else if (res.code === 403){
+ window.location.href = baseUrl+"/login";
+ } else {
+ console.log(res.msg);
+ }
+ }
+ });
+ },
+ end: function () {
+ $('#liftNo').val("");
+ $('#workNo').val("");
+ $('#pakMk').val("");
+ }
+ })
+ }
+ });
+
+ $(document).on('click ','#cancel', function () {
+ $('#liftNo').val("");
+ $('#workNo').val("");
+ $('#pakMk').val("");
+ layer.close(layerDetl);
+ })
+
</script>
--
Gitblit v1.9.1