From a7223a5dfc7c83c7fe3894e65d1fed84cae61a8e Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期三, 15 二月 2023 08:45:38 +0800
Subject: [PATCH] #
---
src/main/webapp/views/ste.html | 271 +++++++++++++++++++++++++++++++++++------------------
1 files changed, 177 insertions(+), 94 deletions(-)
diff --git a/src/main/webapp/views/ste.html b/src/main/webapp/views/ste.html
index 0c3da80..47ae428 100644
--- a/src/main/webapp/views/ste.html
+++ b/src/main/webapp/views/ste.html
@@ -21,65 +21,10 @@
<!-- 鏃ュ織鐩戞帶鏉� -->
<div class="log-board">
<div class="command-log">
- <div class="ste-command-item" style="margin-top: 30px">
+ <div data-steNo="1" class="ste-command-item">
<label>1#</label>
- <div class="dropdown-menu">
- <button id="steBtn-1" class="demoBtn" onclick="changePosition(this.id)">淇敼浣嶇疆</button>
- <ul class="dropdown-menu-nav dark" >
- <div class="dropdown-anchor"></div>
- <div class="form-item"><span>褰撳墠绌挎鏈猴細</span><input type="text"></div>
- <div class="form-item"><span>鎺掞細</span><input type="text"></div>
- <div class="form-item"><span>鍒楋細</span><input type="text"></div>
- <div class="form-item"><span>灞傦細</span><input type="text"></div>
- </ul>
- </div>
- <div class="dropdown-menu">
- <button class="demoBtn" onclick="">鎵�灞炲爢鍨涙満</button>
- <ul class="dropdown-menu-nav dark">
- <div class="dropdown-anchor"></div>
- <div class="form-item"><span>鍫嗗灈鏈哄彿锛�</span><input type="text"></div>
- </ul>
- </div>
- </div>
- <div class="ste-command-item" style="margin-top: 30px">
- <label>2#</label>
- <div class="dropdown-menu">
- <button id="steBtn-2" class="demoBtn" onclick="changePosition(this.id)">淇敼浣嶇疆</button>
- <ul class="dropdown-menu-nav dark" >
- <div class="dropdown-anchor"></div>
- <div class="form-item"><span>褰撳墠绌挎鏈猴細</span><input type="text"></div>
- <div class="form-item"><span>鎺掞細</span><input type="text"></div>
- <div class="form-item"><span>鍒楋細</span><input type="text"></div>
- <div class="form-item"><span>灞傦細</span><input type="text"></div>
- </ul>
- </div>
- <div class="dropdown-menu">
- <button class="demoBtn" onclick="">鎵�灞炲爢鍨涙満</button>
- <ul class="dropdown-menu-nav dark">
- <div class="dropdown-anchor"></div>
- <div class="form-item"><span>鍫嗗灈鏈哄彿锛�</span><input type="text"></div>
- </ul>
- </div>
- </div>
- <div class="ste-command-item" style="margin-top: 30px">
- <label>3#</label>
- <div class="dropdown-menu">
- <button id="steBtn-3" class="demoBtn" onclick="changePosition(this.id)">淇敼浣嶇疆</button>
- <ul class="dropdown-menu-nav dark" >
- <div class="dropdown-anchor"></div>
- <div class="form-item"><span>褰撳墠绌挎鏈猴細</span><input type="text"></div>
- <div class="form-item"><span>鎺掞細</span><input type="text"></div>
- <div class="form-item"><span>鍒楋細</span><input type="text"></div>
- <div class="form-item"><span>灞傦細</span><input type="text"></div>
- </ul>
- </div>
- <div class="dropdown-menu">
- <button class="demoBtn" onclick="">鎵�灞炲爢鍨涙満</button>
- <ul class="dropdown-menu-nav dark">
- <div class="dropdown-anchor"></div>
- <div class="form-item"><span>鍫嗗灈鏈哄彿锛�</span><input type="text"></div>
- </ul>
- </div>
+ <button class="demoBtn pos-btn">鏁版嵁缁存姢</button>
+ <button id="mode-1" class="demoBtn mode-btn" > - </button>
</div>
</div>
<!-- 鍫嗗灈鏈虹姸鎬佷綅淇℃伅 -->
@@ -98,6 +43,7 @@
<th>灞�</th>
<th>绛夊緟WCS纭</th>
<th>瀹氫綅</th>
+ <th>鍏呯數鐘舵��</th>
<th>鎶ヨ淇℃伅1</th>
<th>鎶ヨ淇℃伅2</th>
</tr>
@@ -121,6 +67,7 @@
<th>鐩爣搴撲綅</th>
<th>閫熷害</th>
<th>杩戠偣璺濈</th>
+ <th>浣滀笟鏍囪</th>
</tr>
</thead>
<tbody>
@@ -142,8 +89,6 @@
<span class="select-title">绌挎杞﹀彿</span>
<div class="select-container">
<label><input type="radio" name="steSelect" value="1" checked> 1鍙风┛姊溅</label>
- <label><input type="radio" name="steSelect" value="2"> 2鍙风┛姊溅</label>
- <label><input type="radio" name="steSelect" value="3"> 3鍙风┛姊溅</label>
</div>
</div>
</div>
@@ -152,24 +97,27 @@
<fieldset>
<legend>鎵嬪姩鎿嶄綔</legend>
<div class="button-group">
- <button class="item" onclick="leftTake()">宸﹀嚭搴�</button>
- <button class="item" onclick="rightTake()">鍙冲嚭搴�</button>
- <button class="item" onclick="leftPut()">宸﹀叆搴�</button>
- <button class="item" onclick="rightPut()">鍙冲叆搴�</button>
- <button class="item" onclick="leftStockMove()">宸︾Щ搴�</button>
- <button class="item" onclick="rightStockMove()">鍙崇Щ搴�</button>
- <button class="item" onclick="oOrigin()">鍘熺偣</button>
- <button class="item" onclick="farPoint()">杩滅偣</button>
- <button class="item" onclick="aPoint()">A 鐐�</button>
- <button class="item" onclick="bPoint()">B 鐐�</button>
- <button class="item" onclick="moveLift()">宸︽惉绉�</button>
- <button class="item" onclick="moveRight()">鍙虫惉绉�</button>
- <button class="item" onclick="charging()">鍏呯數</button>
- <button class="item" onclick="pause()">宸︾洏鐐�</button>
- <button class="item" onclick="boot()">鍙崇洏鐐�</button>
- <button class="item" onclick="boot()">浠诲姟瀹屾垚</button>
- <button class="item" onclick="clearCommand()">娓呴櫎鍛戒护</button>
- <button class="item" onclick="handleReset()">澶嶄綅</button>
+ <button class="item" onclick="steOperator(99)">鑱旀満</button>
+ <button class="item" onclick="steOperator(100)">鑴辨満</button>
+ <button class="item" onclick="steOperator(1)">鍚戝彸鍑哄簱</button>
+ <button class="item" onclick="steOperator(2)">鍚戝乏鍑哄簱</button>
+ <button class="item" onclick="steOperator(3)">浠庡彸鍏ュ簱</button>
+ <button class="item" onclick="steOperator(4)">浠庡乏鍏ュ簱</button>
+ <button class="item" onclick="steOperator(5)">宸︾Щ搴�</button>
+ <button class="item" onclick="steOperator(6)">鍙崇Щ搴�</button>
+ <button class="item" onclick="steOperator(7)">鍘诲彸绔�</button>
+ <button class="item" onclick="steOperator(8)">鍘诲乏绔�</button>
+ <button class="item" onclick="steOperator(9)">鍙冲緟鏈�</button>
+ <button class="item" onclick="steOperator(10)">宸﹀緟鏈�</button>
+<!-- <button class="item" onclick="steOperator(11)">宸︽惉绉�</button>-->
+<!-- <button class="item" onclick="steOperator(12)">鍙虫惉绉�</button>-->
+<!-- <button class="item" onclick="steOperator(13)">宸﹀厖鐢�</button>-->
+<!-- <button class="item" onclick="steOperator(14)">鍙冲厖鐢�</button>-->
+<!-- <button class="item" onclick="steOperator(17)">鏂紑鍏呯數</button>-->
+<!-- <button class="item" onclick="steOperator(14)">宸︾洏鐐�</button>-->
+<!-- <button class="item" onclick="steOperator(15)">鍙崇洏鐐�</button>-->
+ <button class="item" onclick="steOperator(16)">浠诲姟瀹屾垚</button>
+
</div>
</fieldset>
</div>
@@ -181,17 +129,59 @@
</div>
</div>
</div>
+
+ <div id="ste-detl" style="display: none">
+ <div>
+ <div class="form-item">
+ <label class="form-label">绌挎杞﹀彿:</label>
+ <div class="form-input">
+ <input id="steNo" name="steNo" 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="row" name="row" 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="bay" name="bay" type="number" class="layui-input" autocomplete="off">
+ </div>
+ </div>
+ <div class="form-item">
+ <label class="form-label">灞�:</label>
+ <div class="form-input">
+ <input id="lev" name="lev" type="number" class="layui-input" autocomplete="off">
+ </div>
+ </div>
+ <div class="form-item">
+ <label class="form-label">鍫嗗灈鏈�:</label>
+ <div class="form-input">
+ <input id="crnNo" name="crnNo" type="number" class="layui-input" 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>
+ </di>
+ </div>
</body>
</html>
-<script>
- layui.config({
- base: baseUrl + "/static/layui/lay/modules/"
- }).extend({
- dropdown: 'dropdown/dropdown',
- }).use(['dropdown'],function () {
- var dropdown = layui.dropdown;
- })
-</script>
<script>
// 绌虹櫧琛屾暟
var steStateTableBlankRows = 0;
@@ -231,10 +221,90 @@
}
}
- // 淇敼绌挎杞︿綅缃�
- function changePosition(id) {
+ var layerIdx;
+ $(document).on('click ','.pos-btn', function () {
+ let steNo = Number($(this).parent().attr("data-steNo"));
+ 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: $("#ste-detl"),
+ success: function(layero, index){
+ http.get(baseUrl+ "/ste/detl/"+steNo, null, function (res) {
+ $('#steNo').val(steNo);
+ $('#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 () {
+ $('#steNo').val("");
+ $('#workNo').val("");
+ $('#row').val("");
+ $('#bay').val("");
+ $('#lev').val("");
+ $('#crnNo').val("");
+ $('#pakMk').val("");
+ }
+ })
+ })
- }
+ $(document).on('click ','.mode-btn', function () {
+ let steNo = Number($(this).parent().attr("data-steNo"));
+ layer.confirm("鏀瑰彉" + steNo + ' 鍙风┛姊溅鍦ㄧ嚎鐘舵�佸悧锛�', function(){
+ var index = layer.load(1, {
+ shade: [0.1,'#fff']
+ });
+ $.ajax({
+ url: baseUrl+ "/ste/mode/switch",
+ headers: {'token': localStorage.getItem('token')},
+ data: {
+ steNo: Number(steNo),
+ password: 'root'
+ },
+ method: 'POST',
+ success: function (res) {
+ layer.close(index);
+ if (res.code === 200){
+ layer.msg(res.msg, {icon: 1});
+ } else if (res.code === 403){
+ window.location.href = baseUrl+"/login";
+ } else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ });
+ });
+ })
+
+
+
+ $(document).on('click ','#save', function () {
+ http.post(baseUrl+ "/ste/detl/update", {
+ steNo: $('#steNo').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 getSteStateInfo() {
@@ -251,6 +321,7 @@
steStateTableFullRows = table.length;
}
for (let i=1;i<=table.length;i++){
+ $("#mode-"+table[i-1].steNo).html(table[i-1].statusVal===0?'鑱旀満':'鑴辨満');
let tr = tableEl.find("tr").eq(i);
setVal(tr.children("td").eq(0), table[i-1].steNo);
setVal(tr.children("td").eq(1), table[i-1].statusType);
@@ -263,8 +334,9 @@
setVal(tr.children("td").eq(8), table[i-1].lev);
setVal(tr.children("td").eq(9), table[i-1].waiting);
setVal(tr.children("td").eq(10), table[i-1].loca);
- setVal(tr.children("td").eq(11), table[i-1].alarm1);
- setVal(tr.children("td").eq(12), table[i-1].alarm2);
+ setVal(tr.children("td").eq(11), table[i-1].chargeStatus);
+ setVal(tr.children("td").eq(12), table[i-1].alarm1);
+ setVal(tr.children("td").eq(13), table[i-1].alarm2);
}
} else if (res.code === 403){
window.location.href = baseUrl+"/login";
@@ -300,6 +372,7 @@
setVal(tr.children("td").eq(6), table[i-1].locNo);
setVal(tr.children("td").eq(7), table[i-1].speed);
setVal(tr.children("td").eq(8), table[i-1].closer);
+ setVal(tr.children("td").eq(9), table[i-1].pakMk);
}
} else if (res.code === 403){
window.location.href = baseUrl+"/login";
@@ -328,6 +401,17 @@
})
}
+ // 浠诲姟鎸囦护涓嬪彂
+ function steOperator(steTaskMode) {
+ http.post(baseUrl+"/ste/operator/ste", {
+ steNo: $('input[name="steSelect"]:checked').val(),
+ steTaskMode: steTaskMode
+ }, function (res) {
+ layer.msg(res.msg, {icon: 1});
+ });
+ }
+
+
// ------------------------------------------------------------------------------------------------
// 绌挎杞︿俊鎭〃鑾峰彇 ----- 琛ㄤ竴
@@ -346,6 +430,7 @@
let html = "";
for (let i = 0; i < line; i ++){
html += " <tr>\n" +
+ " <td></td>\n" +
" <td></td>\n" +
" <td></td>\n" +
" <td></td>\n" +
@@ -406,7 +491,5 @@
steOutputDom.value += content;
steOutputDom.scrollTop = steOutputDom.scrollHeight;
}
-
-
</script>
--
Gitblit v1.9.1