From 03e68b2be24ea024eae645c47da1d4cb1773302a Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 13 十月 2023 19:47:13 +0800
Subject: [PATCH] #
---
src/main/webapp/views/shuttle.html | 621 ++++++++++++++++++--------------------------------------
1 files changed, 202 insertions(+), 419 deletions(-)
diff --git a/src/main/webapp/views/shuttle.html b/src/main/webapp/views/shuttle.html
index f1eafbb..e038a00 100644
--- a/src/main/webapp/views/shuttle.html
+++ b/src/main/webapp/views/shuttle.html
@@ -20,32 +20,34 @@
<div style="padding: 10px;height: 100%">
<!-- 鏃ュ織鐩戞帶鏉� -->
<div class="log-board">
- <div class="command-log" id="commandLogId">
-<!-- <div data-shuttleNo="1" class="shuttle-command-item">-->
-<!-- <label>1#</label>-->
-<!-- <button class="demoBtn pos-btn">鏁版嵁缁存姢</button>-->
-<!-- <button id="mode-1" class="demoBtn mode-btn" >璁惧淇℃伅</button>-->
-<!-- </div>-->
- </div>
+<!-- <div class="command-log" id="commandLogId" style="width: 5%;">-->
+<!--<!– <div data-shuttleNo="1" class="shuttle-command-item">–>-->
+<!--<!– <label>1#</label>–>-->
+<!--<!– <button class="demoBtn pos-btn">鏁版嵁缁存姢</button>–>-->
+<!--<!– <button id="mode-1" class="demoBtn mode-btn" >璁惧淇℃伅</button>–>-->
+<!--<!– </div>–>-->
+<!-- </div>-->
<!-- 鍫嗗灈鏈虹姸鎬佷綅淇℃伅 -->
- <div class="shuttle-state">
+ <div class="shuttle-state" style="width: 100%;">
<table id="shuttle-state-table">
<thead>
<tr>
<th>鍥涘悜绌挎杞�</th>
- <th>寰呭畾</th>
- <th>鐘舵��</th>
- <th>鏈夌墿</th>
- <th>鍦ㄨ建</th>
+ <th>浠诲姟鐘舵��</th>
+ <th>灏忚溅鐘舵��</th>
+ <th>宸ヤ綔妯″紡</th>
+ <th>瀹為檯搴撲綅</th>
+ <th>瀹為檯鍧愭爣</th>
<th>鐢甸噺</th>
- <th>鎺�</th>
- <th>鍒�</th>
- <th>灞�</th>
- <th>绛夊緟WCS纭</th>
- <th>瀹氫綅</th>
+ <th>褰撳墠閫熷害</th>
+ <th>璐熻浇鐘舵��</th>
+ <th>椤跺崌浣嶇疆</th>
+ <th>杩愯鏂瑰悜</th>
+ <th>杩愯鏂瑰悜2</th>
<th>鍏呯數鐘舵��</th>
- <th>鎶ヨ淇℃伅1</th>
- <th>鎶ヨ淇℃伅2</th>
+ <th>鏁呴殰鐘舵��</th>
+ <th>鏁呴殰鐮�</th>
+ <th>绠″埗鐘舵��</th>
</tr>
</thead>
<tbody>
@@ -60,13 +62,18 @@
<tr>
<th>鍥涘悜绌挎杞�</th>
<th>宸ヤ綔鍙�</th>
- <th>鐘舵��</th>
- <th>婧愮珯</th>
- <th>鐩爣绔�</th>
<th>婧愬簱浣�</th>
<th>鐩爣搴撲綅</th>
- <th>閫熷害</th>
+ <th>鏈�楂樼數鑺數鍘�</th>
+ <th>鏈�浣庣數鑺數鍘�</th>
+ <th>鐢垫睜鐢靛帇</th>
+ <th>鍏呮斁鐢靛惊鐜鏁�</th>
+ <th>鍓╀綑鐢甸噺</th>
+ <th>鎬荤數閲�</th>
+ <th>鎬婚噷绋嬫暟</th>
<th>浣滀笟鏍囪</th>
+ <th>褰撳墠搴撲綅</th>
+ <th>浠ょ墝</th>
</tr>
</thead>
<tbody>
@@ -84,9 +91,9 @@
<!-- 璁惧浠诲姟閫夋嫨 -->
<div class="task-select">
<!-- 閫夋嫨 -->
- <div id="shuttle-select" class="operator-item">
+ <div id="shuttle-select" class="operator-item" style="width: 100%;">
<span class="select-title">鍥涘悜绌挎杞﹀彿</span>
- <div class="select-container" id="shuttleRadioBoxId">
+ <div class="select-container" id="shuttleRadioBoxId" style="display: flex;flex-wrap: wrap;justify-content: center;align-items: center;">
<!-- <label><input type="radio" name="shuttleSelect" value="1" checked> 1鍙风┛姊溅</label>-->
</div>
</div>
@@ -94,67 +101,48 @@
<!-- 璁惧浠诲姟鎿嶄綔 -->
<div class="task-operator">
- <div style="display: flex;">
- <div class="task-operator" style="height: auto;width: auto;">
- <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="sourceStaNo" type="number" name="points" min="0" /></label>
- </div>
- <div class="select-container-item">
- <span>鎺�</span>
- <label><input id="sourceRow" type="number" name="points" min="1" style="background-color: #a9eeff" value="1" /></label>
- </div>
- <div class="select-container-item">
- <span>鍒�</span>
- <label><input id="sourceBay" type="number" name="points" min="0" style="background-color: #a9eeff" value="0" /></label>
- </div>
- <div class="select-container-item">
- <span>灞�</span>
- <label><input id="sourceLev" type="number" name="points" min="1" style="background-color: #a9eeff" value="1" /></label>
- </div>
- </div>
- </div>
- </div>
-
- <div class="task-operator" style="height: auto;width: auto;">
- <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="distStaNo" type="number" name="points" min="0" /></label>
- </div>
- <div class="select-container-item">
- <span>鎺�</span>
- <label><input id="distRow" type="number" name="points" min="1" style="background-color: #a9eeff" value="1" /></label>
- </div>
- <div class="select-container-item">
- <span>鍒�</span>
- <label><input id="distBay" type="number" name="points" min="0" style="background-color: #a9eeff" value="0" /></label>
- </div>
- <div class="select-container-item">
- <span>灞�</span>
- <label><input id="distLev" type="number" name="points" min="1" style="background-color: #a9eeff" value="1" /></label>
- </div>
- </div>
- </div>
- </div>
- </div>
-
<fieldset style="height: auto;padding-bottom: 20px;">
<legend>鎵嬪姩鎿嶄綔</legend>
- <div class="button-group">
- <button class="item" onclick="shuttleOperator(4)">鎵樼洏椤跺崌</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(16)">浠诲姟瀹屾垚</button>
+ <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(18)">鎼繍璐х墿</button>
+ <button class="item" onclick="shuttleOperator(14)">绉诲姩鍒扮洰鏍囧簱浣�</button>
+ <button class="item" onclick="shuttleOperator(23)">绉诲姩鍒扮洰鏍囧簱浣�(浠诲姟)</button>
+<!-- <button class="item" onclick="shuttleOperator(16)">绉诲姩鍒版彁鍗囨満</button>-->
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <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(15)">鍏呯數寮�鍏�</button>
+ <button class="item" onclick="shuttleOperator(9)">澶嶄綅</button>
+ <button class="item" onclick="shuttleOperator(21)">绠″埗</button>
+ <button class="item" onclick="shuttleOperator(22)">鍙栨秷绠″埗</button>
+ </div>
+ </div>
+ </div>
+ </div>
+
</div>
</fieldset>
</div>
@@ -170,7 +158,7 @@
<div id="shuttle-detl" style="display: none">
<div>
<div class="form-item">
- <label class="form-label">鍥涘悜绌挎杞﹀彿:</label>
+ <label class="form-label">绌挎杞﹀彿:</label>
<div class="form-input">
<input id="shuttleNo" name="shuttleNo" class="layui-input" lay-verify="required|number" autocomplete="off" disabled="disabled">
</div>
@@ -182,174 +170,20 @@
</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="pakMk" name="pakMk" type="text" class="layui-input" autocomplete="off">
</div>
</div>
+ <div class="form-item">
+ <label class="form-label">浠ょ墝:</label>
+ <div class="form-input">
+ <input id="token" name="token" 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 id="shuttle-detl2" style="display: none">
- <div style="width: 1400px">
- <div class="form-item" style="text-align: left">
- <spen style="margin: 20px 10px 10px 10px; padding: 10px 10px 10px 10px;border: black;border-width: 3px;border-style:dotted;">
- 寮傚父锛�<spen style="color: #FD482C;">鉁�</spen>
- </spen>
- <spen style="margin: 20px 10px 10px 10px; padding: 10px 10px 10px 10px;border: black;border-width: 3px;border-style: double;">
- 姝ｅ父锛�<spen style="color: #00FF00;">鈥�</spen>
- </spen>
- </div>
- <div style="float:left;margin: 10px 10px 10px 10px; padding: 10px 10px 10px 10px;border: black;border-width: 3px;border-style:dotted;">
- <div class="form-item" style="text-align: center">
- <label>鍥涘悜绌挎杞﹀紓甯�</label>
- </div>
- <div class="form-item">
- <label class="form-label">鍥涘悜绌挎杞﹀彿:</label>
- <div class="form-input">
- <input id="shuttleNo1" name="shuttleNo" class="layui-input" lay-verify="required|number" autocomplete="off" disabled="disabled" readonly>
- </div>
- </div>
-
- </div>
- <div style="float:left;margin: 10px 10px 10px 10px; padding: 10px 10px 10px 10px;border: black;border-width: 3px;border-style:dotted">
- <div class="form-item" style="text-align: center">
- <label>鍥涘悜绌挎杞︽彁绀轰俊鎭�</label>
- </div>
-
- </div>
- <div style="float:left;margin: 10px 10px 10px 10px; padding: 10px 10px 10px 10px;border: black;border-width: 3px;border-style:dotted">
- <div class="form-item" style="text-align: center">
- <label>浠诲姟淇℃伅</label>
- </div>
- <div class="form-item">
- <label class="form-label">鍏ュ簱浠诲姟涓�:</label>
- <div class="form-input">
- <input id="pakInTask" name="pakInTask" class="layui-input" autocomplete="off" readonly>
- </div>
- </div>
- <div class="form-item">
- <label class="form-label">鍑哄簱浠诲姟涓�:</label>
- <div class="form-input">
- <input id="pakOutTask" name="pakOutTask" class="layui-input" autocomplete="off" readonly>
- </div>
- </div>
- <div class="form-item">
- <label class="form-label">绉诲簱浠诲姟涓�:</label>
- <div class="form-input">
- <input id="pakMoveTask" name="pakMoveTask" class="layui-input" autocomplete="off" readonly>
- </div>
- </div>
- <div class="form-item">
- <label class="form-label">鍥炲師鐐逛换鍔′腑:</label>
- <div class="form-input">
- <input id="goHpTask" name="goHpTask" class="layui-input" autocomplete="off" readonly>
- </div>
- </div>
- <div class="form-item">
- <label class="form-label">鍘诲弽鍘熺偣浠诲姟涓�:</label>
- <div class="form-input">
- <input id="goOHpTask" name="goOHpTask" class="layui-input" autocomplete="off" readonly>
- </div>
- </div>
- <div class="form-item">
- <label class="form-label">鍘诲師鐐归伩璁╀綅:</label>
- <div class="form-input">
- <input id="goHpAvoid" name="goHpAvoid" class="layui-input" autocomplete="off" readonly>
- </div>
- </div>
- <div class="form-item">
- <label class="form-label">鍘诲弽鍘熺偣閬胯浣�:</label>
- <div class="form-input">
- <input id="goOHpAvoid" name="goOHpAvoid" class="layui-input" autocomplete="off" readonly>
- </div>
- </div>
- <div class="form-item">
- <label class="form-label">鍏ュ簱鍙栫┖缁撴潫:</label>
- <div class="form-input">
- <input id="pakInEmpty" name="pakInEmpty" class="layui-input" autocomplete="off" readonly>
- </div>
- </div>
- <div class="form-item">
- <label class="form-label">鍏ュ簱姝ｅ父缁撴潫:</label>
- <div class="form-input">
- <input id="pakInFinish" name="pakInFinish" class="layui-input" autocomplete="off" readonly>
- </div>
- </div>
- <div class="form-item">
- <label class="form-label">鍑哄簱鍙栫┖缁撴潫:</label>
- <div class="form-input">
- <input id="pakOutEmpty" name="pakOutEmpty" class="layui-input" autocomplete="off" readonly>
- </div>
- </div>
- <div class="form-item">
- <label class="form-label">鍑哄簱姝ｅ父缁撴潫:</label>
- <div class="form-input">
- <input id="pakOutFinish" name="pakOutFinish" class="layui-input" autocomplete="off" readonly>
- </div>
- </div>
- <div class="form-item">
- <label class="form-label">鍘诲師鐐归伩璁╁畬鎴�:</label>
- <div class="form-input">
- <input id="goHpAvoidFinish" name="goHpAvoidFinish" class="layui-input" autocomplete="off" readonly>
- </div>
- </div>
- <div class="form-item">
- <label class="form-label">鍘诲弽鍘熺偣閬胯瀹屾垚:</label>
- <div class="form-input">
- <input id="goOHpAvoidFinish" name="goOHpAvoidFinish" class="layui-input" autocomplete="off" readonly>
- </div>
- </div>
- <div class="form-item">
- <label class="form-label">鍘诲師鐐归伩璁╁畬鎴�:</label>
- <div class="form-input">
- <input id="goHpAvoidErr" name="goHpAvoidErr" class="layui-input" autocomplete="off" readonly>
- </div>
- </div>
- <div class="form-item">
- <label class="form-label">鍘诲弽鍘熺偣閬胯瀹屾垚:</label>
- <div class="form-input">
- <input id="goOHpAvoidErr" name="goOHpAvoidErr" class="layui-input" autocomplete="off" readonly>
- </div>
- </div>
- </div>
- <div style="float:left;margin: 10px 10px 10px 10px; padding: 10px 10px 10px 10px;border: black;border-width: 3px;border-style:dotted">
- <div class="form-item" style="text-align: center">
- <label>鐘舵�佷俊鎭�</label>
- </div>
-<!-- <div class="form-item">-->
-<!-- <label class="form-label">鑱旀満妯″紡:</label>-->
-<!-- <div class="form-input">-->
-<!-- <input id="autoMode" name="autoMode" class="layui-input" autocomplete="off" readonly>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- <div class="form-item">-->
-<!-- <label class="form-label">鐢靛帇杩囦綆:</label>-->
-<!-- <div class="form-input">-->
-<!-- <input id="voltageLow" name="voltageLow" class="layui-input" autocomplete="off" readonly>-->
-<!-- </div>-->
-<!-- </div>-->
</div>
</div>
</div>
@@ -395,116 +229,6 @@
}
}
- var layerIdx;
- $(document).on('click ','.pos-btn', function () {
- let shuttleNo = Number($(this).parent().attr("data-shuttleNo"));
- 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: $("#shuttle-detl"),
- success: function(layero, index){
- http.get(baseUrl+ "/shuttle/detl/"+shuttleNo, null, function (res) {
- $('#shuttleNo').val(shuttleNo);
- $('#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 () {
- $('#shuttleNo').val("");
- $('#workNo').val("");
- $('#row').val("");
- $('#bay').val("");
- $('#lev').val("");
- $('#crnNo').val("");
- $('#pakMk').val("");
- }
- })
- })
-
- var layerIdx0;
- $(document).on('click ','.mode-btn', function () {
- let shuttleNo = Number($(this).parent().attr("data-shuttleNo"));
- 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: $("#shuttle-detl2"),
- success: function(layero, index){
- 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');
- 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');
- // getColor(res.data.autoMode,'#autoMode');
- // getColor(res.data.voltageLow,'#voltageLow');
- })
- },
- end: function () {
- $('#shuttleNo').val("");
- }
- })
- })
-
function getColor(res,e){
$(e).val(res?"鉁�":"鈥�");
if (res){
@@ -514,53 +238,16 @@
}
}
- // $(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", {
shuttleNo: $('#shuttleNo').val(),
workNo: $('#workNo').val(),
- row: $('#row').val(),
- bay: $('#bay').val(),
- lev: $('#lev').val(),
- crnNo: $('#crnNo').val(),
pakMk: $('#pakMk').val(),
+ token: $('#token').val(),
}, function (res) {
layer.msg("淇敼鎴愬姛", {icon: 1,});
- layer.close(layerIdx);
+ layer.close(layerDetl);
})
- })
-
- $(document).on('click ','#cancel', function () {
- layer.close(layerIdx);
})
function setShuttleRadio() {
@@ -584,8 +271,8 @@
//娓叉煋鍥涘悜绌挎杞︽暟鎹淮鎶ゅ拰璁惧淇℃伅html
let shuttleCommandLogBox = '<div class="shuttle-command-item" data-shuttleNo="' + table[i - 1].shuttleNo + '">\n' +
'<label>' + table[i - 1].shuttleNo + '#</label>\n' +
- '<button class="demoBtn pos-btn">鏁版嵁缁存姢</button>\n' +
- '<button class="demoBtn mode-btn" id="mode-' + table[i - 1].shuttleNo + '">璁惧淇℃伅</button>\n' +
+ // '<button class="demoBtn pos-btn">鏁版嵁缁存姢</button>\n' +
+ // '<button class="demoBtn mode-btn" id="mode-' + table[i - 1].shuttleNo + '">璁惧淇℃伅</button>\n' +
'</div>'
$("#commandLogId").append(shuttleCommandLogBox);
}
@@ -616,19 +303,21 @@
// $("#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(2), table[i-1].status);
- setVal(tr.children("td").eq(3), table[i-1].loading);
- setVal(tr.children("td").eq(4), table[i-1].track);
- setVal(tr.children("td").eq(5), table[i-1].batteryPower);
- setVal(tr.children("td").eq(6), table[i-1].row);
- setVal(tr.children("td").eq(7), table[i-1].bay);
- 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].chargeStatus);
- setVal(tr.children("td").eq(12), table[i-1].alarm1);
- setVal(tr.children("td").eq(13), table[i-1].alarm2);
+ setVal(tr.children("td").eq(1), table[i-1].protocolStatus$);
+ setVal(tr.children("td").eq(2), table[i-1].free$);
+ setVal(tr.children("td").eq(3), table[i-1].workingMode$);
+ setVal(tr.children("td").eq(4), table[i-1].point$);
+ setVal(tr.children("td").eq(5), table[i-1].point$$);
+ setVal(tr.children("td").eq(6), table[i-1].powerPercent$);
+ setVal(tr.children("td").eq(7), table[i-1].speed);
+ setVal(tr.children("td").eq(8), table[i-1].loadState$);
+ setVal(tr.children("td").eq(9), table[i-1].liftPosition$);
+ setVal(tr.children("td").eq(10), table[i-1].runDir$);
+ setVal(tr.children("td").eq(11), table[i-1].runDir2$);
+ setVal(tr.children("td").eq(12), table[i-1].chargState$);
+ setVal(tr.children("td").eq(13), table[i-1].errState$);
+ setVal(tr.children("td").eq(14), table[i-1].errCode$);
+ setVal(tr.children("td").eq(15), table[i-1].suspendState$);
}
} else if (res.code === 403){
window.location.href = baseUrl+"/login";
@@ -643,7 +332,7 @@
function getShuttleMsgInfo() {
let tableEl = $('#shuttle-msg-table');
$.ajax({
- url: baseUrl+ "/shuttle/table/shuttle/msg",
+ url: baseUrl+ "/shuttle/table/shuttle/state",
headers: {'token': localStorage.getItem('token')},
method: 'POST',
success: function (res) {
@@ -656,14 +345,23 @@
for (var i=1;i<=table.length;i++){
var 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].workNo);
- setVal(tr.children("td").eq(2), table[i-1].status);
- setVal(tr.children("td").eq(3), table[i-1].sourceStaNo);
- setVal(tr.children("td").eq(4), table[i-1].staNo);
- setVal(tr.children("td").eq(5), table[i-1].sourceLocNo);
- 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].pakMk);
+ setVal(tr.children("td").eq(1), table[i-1].taskNo);
+ setVal(tr.children("td").eq(2), table[i-1].sourceLocNo);
+ setVal(tr.children("td").eq(3), table[i-1].locNo);
+ setVal(tr.children("td").eq(4), table[i-1].maxCellVoltage$);
+ setVal(tr.children("td").eq(5), table[i-1].minCellVoltage$);
+ setVal(tr.children("td").eq(6), table[i-1].voltage$);
+ setVal(tr.children("td").eq(7), table[i-1].chargeCycleTimes);
+ setVal(tr.children("td").eq(8), table[i-1].surplusQuantity);
+ setVal(tr.children("td").eq(9), table[i-1].countQuantity);
+ setVal(tr.children("td").eq(10), table[i-1].statusSum ? table[i - 1].statusSum.mileage : '');
+ setVal(tr.children("td").eq(11), table[i-1].pakMk$);
+ setVal(tr.children("td").eq(12), table[i-1].currentLocNo);
+ setVal(tr.children("td").eq(13), table[i-1].token);
+ 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";
@@ -696,7 +394,9 @@
function shuttleOperator(shuttleTaskMode) {
http.post(baseUrl+"/shuttle/operator/shuttle", {
shuttleNo: $('input[name="shuttleSelect"]:checked').val(),
- shuttleTaskMode: shuttleTaskMode
+ shuttleTaskMode: shuttleTaskMode,
+ sourceLocNo: $("#sourceLocNo").val(),
+ distLocNo: $("#distLocNo").val()
}, function (res) {
layer.msg(res.msg, {icon: 1});
});
@@ -721,6 +421,9 @@
let html = "";
for (let i = 0; i < line; i ++){
html += " <tr>\n" +
+ " <td></td>\n" +
+ " <td></td>\n" +
+ " <td></td>\n" +
" <td></td>\n" +
" <td></td>\n" +
" <td></td>\n" +
@@ -783,4 +486,84 @@
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);
+ }
+ }
+ });
+ }
+
+ // 璇︽儏鎿嶄綔 -------------------------------------------------------------------------
+ var layerDetl;
+ $(document).on('dblclick ','#shuttle-msg-table tr', function () {
+ var shuttleNo = $(this).children("td").eq(0).html();
+ if (shuttleNo !== null && shuttleNo !== "") {
+ layerDetl = layer.open({
+ type: 1,
+ title: false,
+ shadeClose: true,
+ offset: 'rt',
+ anim: 5,
+ shade: [0],
+ area: ['340px', '255px'],
+ closeBtn: 0,
+ content: $("#shuttle-detl"),
+ success: function(layero, index){
+ $.ajax({
+ url: baseUrl+ "/shuttle/table/shuttle/state",
+ 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 (shuttleNo == table[i-1].shuttleNo) {
+ $('#shuttleNo').val(shuttleNo);
+ $('#workNo').val(table[i-1].taskNo);
+ $('#pakMk').val(table[i-1].pakMk$);
+ $('#token').val(table[i-1].token);
+ }
+ }
+ } else if (res.code === 403){
+ window.location.href = baseUrl+"/login";
+ } else {
+ console.log(res.msg);
+ }
+ }
+ });
+ },
+ end: function () {
+ $('#shuttleNo').val("");
+ $('#workNo').val("");
+ $('#pakMk').val("");
+ $('#token').val("");
+ }
+ })
+ }
+ });
+
+ $(document).on('click ','#cancel', function () {
+ $('#shuttleNo').val("");
+ $('#workNo').val("");
+ $('#pakMk').val("");
+ $('#token').val("");
+ layer.close(layerDetl);
+ })
+
+
</script>
--
Gitblit v1.9.1