From c2b0be1a368a88e4adb6dda12d0aa5d3bb0df838 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 27 六月 2023 16:50:50 +0800
Subject: [PATCH] 搜索最近穿梭车，提升机完成方法
---
src/main/webapp/views/shuttle.html | 204 ++++++++++++++++++++++++++------------------------
1 files changed, 106 insertions(+), 98 deletions(-)
diff --git a/src/main/webapp/views/shuttle.html b/src/main/webapp/views/shuttle.html
index ce3a332..680c66b 100644
--- a/src/main/webapp/views/shuttle.html
+++ b/src/main/webapp/views/shuttle.html
@@ -72,6 +72,8 @@
<th>鍗囬檷浼烘湇璐熻浇</th>
<th>琛岃蛋浼烘湇璐熻浇</th>
<th>浣滀笟鏍囪</th>
+ <th>搴撲綅鍙�</th>
+ <th>褰撳墠妤煎眰</th>
</tr>
</thead>
<tbody>
@@ -99,42 +101,83 @@
<!-- 璁惧浠诲姟鎿嶄綔 -->
<div class="task-operator">
- <div style="display: flex;">
- <div class="task-operator" style="height: auto;width: 100%;">
- <div class="operator-item" style="height: auto">
- <span class="select-title">婧愬簱浣�/鐩爣搴撲綅</span>
- <div class="select-container" style="height: auto">
- <div class="select-container-item">
- <span>婧愬簱浣�</span>
- <label><input id="sourceLocNo" type="text" name="sourceLocNo" /></label>
- </div>
- <div class="select-container-item">
- <span>鐩爣搴撲綅</span>
- <label><input id="distLocNo" type="text" name="distLocNo" /></label>
+ <fieldset style="height: auto;padding-bottom: 20px;">
+ <legend>鎵嬪姩鎿嶄綔</legend>
+ <div style="display: flex;">
+ <div style="width: 30%;">
+ <div class="operator-item" style="height: auto;width: 100%;">
+ <span class="select-title">婧愬簱浣�/鐩爣搴撲綅</span>
+ <div class="select-container" style="height: auto;padding: 30px 10px 20px 10px;">
+ <div class="select-container-item">
+ <span>婧愬簱浣�</span>
+ <label><input id="sourceLocNo" type="text" name="sourceLocNo" /></label>
+ </div>
+ <div class="select-container-item">
+ <span>鐩爣搴撲綅</span>
+ <label><input id="distLocNo" type="text" name="distLocNo" /></label>
+ </div>
+
+ <div style="margin-top: 10px;">
+ <button class="item" onclick="shuttleOperator(1)">鍏ュ簱</button>
+ <button class="item" onclick="shuttleOperator(2)">鍑哄簱</button>
+ <button class="item" onclick="shuttleOperator(14)">绉诲姩鍒扮洰鏍囧簱浣�</button>
+ <button class="item" onclick="shuttleOperator(16)">绉诲姩鍒版彁鍗囨満</button>
+ </div>
</div>
</div>
</div>
- </div>
- </div>
- <fieldset style="height: auto;padding-bottom: 20px;">
- <legend>鎵嬪姩鎿嶄綔</legend>
- <div class="button-group">
- <button class="item" onclick="shuttleOperator(1)">鍏ュ簱</button>
- <button class="item" onclick="shuttleOperator(2)">鍑哄簱</button>
- <button class="item" onclick="shuttleOperator(3)">鎵樼洏椤跺崌</button>
- <button class="item" onclick="shuttleOperator(4)">鎵樼洏涓嬮檷</button>
- <button class="item" onclick="shuttleOperator(5)">宸︾Щ</button>
- <button class="item" onclick="shuttleOperator(6)">鍙崇Щ</button>
- <button class="item" onclick="shuttleOperator(7)">鍚庣Щ</button>
- <button class="item" onclick="shuttleOperator(8)">鍓嶇Щ</button>
- <button class="item" onclick="shuttleOperator(9)">澶嶄綅</button>
- <button class="item" onclick="shuttleOperator(10)">姝ｆ柟鍚�(宸�)瀵诲簱浣�</button>
- <button class="item" onclick="shuttleOperator(11)">璐熸柟鍚�(鍙�)瀵诲簱浣�</button>
- <button class="item" onclick="shuttleOperator(12)">姝ｆ柟鍚�(鍓�)瀵诲簱浣�</button>
- <button class="item" onclick="shuttleOperator(13)">璐熸柟鍚�(鍚�)瀵诲簱浣�</button>
- <button class="item" onclick="shuttleOperator(14)">绉诲姩鍒扮洰鏍囧簱浣�</button>
- <button class="item" onclick="shuttleOperator(15)">鍏呯數寮�鍏�</button>
+ <div style="width: 40%;">
+ <div class="operator-item" style="height: auto;width: 100%;">
+ <span class="select-title">鐩稿叧鎸囦护</span>
+ <div class="select-container" style="height: auto;padding: 30px 10px 10px 10px;">
+ <div class="button-group">
+ <button class="item" onclick="shuttleOperator(3)">鎵樼洏椤跺崌</button>
+ <button class="item" onclick="shuttleOperator(4)">鎵樼洏涓嬮檷</button>
+ <button class="item" onclick="shuttleOperator(5)">宸︾Щ</button>
+ <button class="item" onclick="shuttleOperator(6)">鍙崇Щ</button>
+ <button class="item" onclick="shuttleOperator(7)">鍚庣Щ</button>
+ <button class="item" onclick="shuttleOperator(8)">鍓嶇Щ</button>
+ <button class="item" onclick="shuttleOperator(9)">澶嶄綅</button>
+ <button class="item" onclick="shuttleOperator(10)">姝ｆ柟鍚�(鍙�)瀵诲簱浣�</button>
+ <button class="item" onclick="shuttleOperator(11)">璐熸柟鍚�(宸�)瀵诲簱浣�</button>
+ <button class="item" onclick="shuttleOperator(12)">姝ｆ柟鍚�(鍓�)瀵诲簱浣�</button>
+ <button class="item" onclick="shuttleOperator(13)">璐熸柟鍚�(鍚�)瀵诲簱浣�</button>
+ <button class="item" onclick="shuttleOperator(15)">鍏呯數寮�鍏�</button>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div style="width: 20%;">
+ <div class="operator-item" style="height: auto;width: 100%;">
+ <span class="select-title">璁剧疆閰嶇疆鍙傛暟</span>
+ <div class="select-container" style="height: auto;padding: 30px 10px 10px 10px;">
+ <div class="select-container-item">
+ <span>杩愯閫熷害</span>
+ <label><input id="runSpeed" type="text" name="runSpeed" /></label>
+ </div>
+ <div class="select-container-item">
+ <span>鍏呯數闃堝��</span>
+ <label><input id="chargeLine" type="text" name="runSpeed" /></label>
+ </div>
+
+ <div>
+ <button class="item" onclick="shuttleParamSave()">淇濆瓨</button>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div style="width: 15%;">
+ <div class="operator-item" style="height: auto;width: 100%;">
+ <span class="select-title">閰嶇疆鍙傛暟</span>
+ <div class="select-container" style="height: auto;padding: 30px 10px 10px 10px;">
+ <div>杩愯閫熷害锛�<span id="runSpeedText"></span></div>
+ <div>鍏呯數闃堝�硷細<span id="chargeLineText"></span></div>
+ </div>
+ </div>
+ </div>
</div>
</fieldset>
</div>
@@ -428,38 +471,6 @@
console.log(shuttleNo)
http.get(baseUrl+ "/shuttle/sensor/detl/"+shuttleNo, null, function (res) {
$('#shuttleNo1').val(res.data.shuttleNo);
- // getColor(res.data.liftErr,'#liftErr');
- // getColor(res.data.inFetchErr,'#inFetchErr');
- // getColor(res.data.outFetchErr,'#outFetchErr');
- // getColor(res.data.antiErr,'#antiErr');
- // getColor(res.data.liftSwitchErr,'#liftSwitchErr');
- // getColor(res.data.trackErr,'#trackErr');
- // getColor(res.data.timeoutErr,'#timeoutErr');
- // getColor(res.data.connectErr,'#connectErr');
- // getColor(res.data.emergencyErr,'#emergencyErr');
- // getColor(res.data.taskTypeErr,'#taskTypeErr');
- // getColor(res.data.taskNoErr,'#taskNoErr');
- // getColor(res.data.newTaskErr,'#newTaskErr');
- // getColor(res.data.errTaskErr,'#errTaskErr');
- // getColor(res.data.stopErr,'#stopErr');
- // getColor(res.data.offlineTaskErr,'#offlineTaskErr');
- // getColor(res.data.startTaskErr,'#startTaskErr');
- // getColor(res.data.voltageTaskErr,'#voltageTaskErr');
- // getColor(res.data.devpErr,'#devpErr');
- // getColor(res.data.online,'#online');
- // getColor(res.data.notOnTrack,'#notOnTrack');
- // getColor(res.data.lowVoltage,'#lowVoltage');
- // getColor(res.data.electricityLoss,'#electricityLoss');
- // getColor(res.data.forcedTravel,'#forcedTravel');
- // getColor(res.data.demoMode,'#demoMode');
- // getColor(res.data.brushConnect,'#brushConnect');
- // getColor(res.data.taskManualForbid,'#taskManualForbid');
- // getColor(res.data.onlineManualForbid,'#onlineManualForbid');
- // getColor(res.data.devpEmergency,'#devpEmergency');
- // getColor(res.data.taskInterrupt,'#taskInterrupt');
- // getColor(res.data.taskClear,'#taskClear');
- // getColor(res.data.taskConfirmTimeout,'#taskConfirmTimeout');
- // getColor(res.data.taskWithCharge,'#taskWithCharge');
getColor(res.data.pakInTask,'#pakInTask');
getColor(res.data.pakOutTask,'#pakOutTask');
getColor(res.data.pakMoveTask,'#pakMoveTask');
@@ -475,8 +486,6 @@
getColor(res.data.goOHpAvoidFinish,'#goOHpAvoidFinish');
getColor(res.data.goHpAvoidErr,'#goHpAvoidErr');
getColor(res.data.goOHpAvoidErr,'#goOHpAvoidErr');
- // getColor(res.data.autoMode,'#autoMode');
- // getColor(res.data.voltageLow,'#voltageLow');
})
},
end: function () {
@@ -493,36 +502,6 @@
$(e).attr("style", "color: #00FF00;");
}
}
-
- // $(document).on('click ','.mode-btn', function () {
- // let shuttleNo = Number($(this).parent().attr("data-shuttleNo"));
- // layer.confirm("鏀瑰彉" + shuttleNo + ' 鍙风┛姊溅鍦ㄧ嚎鐘舵�佸悧锛�', function(){
- // var index = layer.load(1, {
- // shade: [0.1,'#fff']
- // });
- // $.ajax({
- // url: baseUrl+ "/shuttle/mode/switch",
- // headers: {'token': localStorage.getItem('token')},
- // data: {
- // shuttleNo: Number(shuttleNo),
- // 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+ "/shuttle/detl/update", {
@@ -596,7 +575,7 @@
// $("#mode-"+table[i-1].shuttleNo).html(table[i-1].statusVal===0?'鑱旀満':'鑴辨満');
let tr = tableEl.find("tr").eq(i);
setVal(tr.children("td").eq(0), table[i-1].shuttleNo);
- setVal(tr.children("td").eq(1), table[i-1].status);
+ setVal(tr.children("td").eq(1), table[i-1].status$);
setVal(tr.children("td").eq(2), table[i-1].busyStatus);
setVal(tr.children("td").eq(3), table[i-1].currentCode);
setVal(tr.children("td").eq(4), table[i-1].batteryPower);
@@ -611,7 +590,7 @@
setVal(tr.children("td").eq(13), table[i-1].currentOrBeforeCode);
setVal(tr.children("td").eq(14), table[i-1].codeOffsetX);
setVal(tr.children("td").eq(15), table[i-1].codeOffsetY);
- setVal(tr.children("td").eq(16), table[i-1].currentVoltage);
+ setVal(tr.children("td").eq(16), table[i-1].currentVoltage$);
setVal(tr.children("td").eq(17), table[i-1].currentAnalogValue);
}
} else if (res.code === 403){
@@ -649,6 +628,13 @@
setVal(tr.children("td").eq(7), table[i-1].currentLiftServoLoad);
setVal(tr.children("td").eq(8), table[i-1].currentMoveServoLoad);
setVal(tr.children("td").eq(9), table[i-1].pakMk);
+ setVal(tr.children("td").eq(10), table[i-1].locNo);
+ setVal(tr.children("td").eq(11), table[i-1].lev);
+
+ if (table[i-1].shuttleNo == parseInt($('input[name="shuttleSelect"]:checked').val())) {
+ $("#runSpeedText").text(table[i-1].runSpeed)
+ $("#chargeLineText").text(table[i-1].chargeLine + "%")
+ }
}
} else if (res.code === 403){
window.location.href = baseUrl+"/login";
@@ -773,4 +759,26 @@
shuttleOutputDom.scrollTop = shuttleOutputDom.scrollHeight;
}
+ //鍥涘悜绌挎杞﹂厤缃弬鏁颁繚瀛�
+ function shuttleParamSave() {
+ $.ajax({
+ url: baseUrl+ "/shuttle/runSpeed/" + $('input[name="shuttleSelect"]:checked').val(),
+ headers: {'token': localStorage.getItem('token')},
+ method: 'POST',
+ data: {
+ runSpeed: $("#runSpeed").val(),
+ chargeLine: $("#chargeLine").val(),
+ },
+ success: function (res) {
+ if (res.code === 200){
+ layer.msg("閰嶇疆宸蹭繚瀛�", {icon: 1,});
+ } else if (res.code === 403){
+ window.location.href = baseUrl+"/login";
+ } else {
+ console.log(res.msg);
+ }
+ }
+ });
+ }
+
</script>
--
Gitblit v1.9.1