From aa759e28b7f93b16c3d8dc5d3313e4bd485e4401 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期三, 08 一月 2025 13:57:36 +0800
Subject: [PATCH] #
---
src/main/webapp/views/rgv.html | 187 ++++++++++++++--------------------------------
1 files changed, 59 insertions(+), 128 deletions(-)
diff --git a/src/main/webapp/views/rgv.html b/src/main/webapp/views/rgv.html
index be5e6ba..3ff062d 100644
--- a/src/main/webapp/views/rgv.html
+++ b/src/main/webapp/views/rgv.html
@@ -90,18 +90,17 @@
<thead>
<tr>
<th>RGV</th>
- <th>妯″紡</th>
- <th>鐘舵��</th>
- <th>浠诲姟鍙�1</th>
- <th>鐘舵��1</th>
- <th>鏈夌墿1</th>
- <th>RGV浣嶇疆</th>
- <th>璧拌瀹氫綅</th>
- <th>浠诲姟鍙�2</th>
- <th>鐘舵��2</th>
- <th>鏈夌墿2</th>
- <th>鏁呴殰浠ｇ爜</th>
- <th>鏁呴殰鎻忚堪</th>
+ <th>鑷姩</th>
+ <th>鏈夌墿</th>
+ <th>灏忚溅鐩爣浣�</th>
+ <th>灏忚溅褰撳墠浣�</th>
+ <th>浠诲姟鍙�</th>
+ <th>鏃犺揣绌洪棽</th>
+ <th>鍙栬揣鍒颁綅</th>
+ <th>杩愯涓�</th>
+ <th>鐘舵��4</th>
+ <th>鐘舵��5</th>
+ <th>鐘舵��6</th>
</tr>
</thead>
<tbody>
@@ -114,13 +113,13 @@
<table id="rgv-msg-table">
<thead>
<tr>
- <th>RGV</th>
- <th>宸ヤ綔鍙�</th>
- <th>鐘舵��</th>
- <th>婧愮珯</th>
- <th>鐩爣绔�</th>
- <th>婧愬簱浣�</th>
- <th>鐩爣搴撲綅</th>
+<!-- <th>RGV</th>-->
+<!-- <th>宸ヤ綔鍙�</th>-->
+<!-- <th>鐘舵��</th>-->
+<!-- <th>婧愮珯</th>-->
+<!-- <th>鐩爣绔�</th>-->
+<!-- <th>婧愬簱浣�</th>-->
+<!-- <th>鐩爣搴撲綅</th>-->
<!-- <th>璧拌閫熷害锛坢/min)</th>-->
<!-- <th>鍗囬檷閫熷害锛坢/min)</th>-->
<!-- <th>鍙夌墮閫熷害锛坢/min)</th>-->
@@ -156,46 +155,46 @@
</div>
<!-- 婧愮珯/婧愬簱浣� 閫夋嫨 -->
<div id="source-select" class="operator-item">
- <span class="select-title">婧愮珯/婧愬簱浣�</span>
+ <span class="select-title">婧愮珯</span>
<div class="select-container">
<div class="select-container-item">
- <span>绔�</span>
+ <span>宸ヤ綅1婧愮珯</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="sourceRow" type="number" name="points" min="1" style="background-color: #a9eeff" value="1" /></label>
- </div>
- <div class="select-container-item">
- <span>鍒�</span>
+ <span>宸ヤ綅2婧愮珯</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 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 id="target-select" class="operator-item">
- <span class="select-title">鐩爣绔�/鐩爣搴撲綅</span>
+ <span class="select-title">鐩爣绔�</span>
<div class="select-container">
<div class="select-container-item">
- <span>绔�</span>
+ <span>宸ヤ綅1鐩爣绔�</span>
<label><input id="staNo" type="number" name="points" min="0" /></label>
</div>
+<!-- <div class="select-container-item">-->
+<!-- <span>鎺�</span>-->
+<!-- <label><input id="row" type="number" name="points" min="1" style="background-color: #a9eeff" value="1" /></label>-->
+<!-- </div>-->
<div class="select-container-item">
- <span>鎺�</span>
- <label><input id="row" type="number" name="points" min="1" style="background-color: #a9eeff" value="1" /></label>
- </div>
- <div class="select-container-item">
- <span>鍒�</span>
+ <span>宸ヤ綅2鐩爣绔�</span>
<label><input id="bay" type="number" name="points" min="0" style="background-color: #a9eeff" value="0" /></label>
</div>
- <div class="select-container-item">
- <span>灞�</span>
- <label><input id="lev" type="number" name="points" min="1" style="background-color: #a9eeff" value="1" /></label>
- </div>
+<!-- <div class="select-container-item">-->
+<!-- <span>灞�</span>-->
+<!-- <label><input id="lev" type="number" name="points" min="1" style="background-color: #a9eeff" value="1" /></label>-->
+<!-- </div>-->
</div>
</div>
</div>
@@ -205,18 +204,18 @@
<fieldset>
<legend>鎵嬪姩鎿嶄綔</legend>
<div class="button-group">
- <button class="item" onclick="put()">鍏ュ簱</button>
- <button class="item" onclick="take()">鍑哄簱</button>
- <button class="item" onclick="stockMove()">搴撲綅杞Щ</button>
+<!-- <button class="item" onclick="put()">鍙栨斁璐�</button>-->
+<!-- <button class="item" onclick="take()">鍙栬揣</button>-->
+<!-- <button class="item" onclick="stockMove()">鏀捐揣</button>-->
<!-- <button class="item" onclick="siteMove()">绔欏埌绔�</button>-->
<!-- <button class="item" onclick="bacOrigin()">鍥炲師鐐�</button>-->
<!-- <button class="item" onclick="reverseOrigin()">鍙嶅師鐐�</button>-->
<!-- <button class="item" onclick="coorMove()">鍧愭爣绉昏</button>-->
- <button class="item" onclick="taskComplete()">浠诲姟瀹屾垚</button>
+<!-- <button class="item" onclick="taskComplete()">浠诲姟瀹屾垚</button>-->
<!-- <button class="item" onclick="pause()">鏆傚仠</button>-->
<!-- <button class="item" onclick="boot()">鍚姩</button>-->
- <button class="item" onclick="clearCommand()">娓呴櫎鍛戒护</button>
- <button class="item" onclick="handleReset()">澶嶄綅</button>
+<!-- <button class="item" onclick="clearCommand()">娓呴櫎鍛戒护</button>-->
+<!-- <button class="item" onclick="handleReset()">澶嶄綅</button>-->
</div>
</fieldset>
</div>
@@ -239,7 +238,7 @@
// 鍒濆鍖�
var rgvOutputDom = document.getElementById("rgv-output");
$(document).ready(function() {
- getCommandLog();
+ // getCommandLog();
initRgvStateTable();
getRgvStateInfo();
initRgvMsgTable();
@@ -250,12 +249,12 @@
setInterval(function () {
getRgvStateInfo();
getRgvMsgInfo();
- getCommandLog();
+ // getCommandLog();
},1000);
setInterval(function () {
getRgvOutput();
operatorBlockShow();
- initDemo();
+ // initDemo();
},500);
// 鍒ゆ柇鎵嬪姩鎿嶄綔妯″潡鏄惁鍙敤
@@ -271,7 +270,7 @@
}
}
- // 鑾峰彇鍫嗗灈鏈烘墽琛屼腑鐨勫懡浠�
+ // 鑾峰彇RGV鎵ц涓殑鍛戒护
function getCommandLog() {
$.ajax({
url: baseUrl + "/rgv/command/ongoing",
@@ -312,16 +311,15 @@
setVal(tr.children("td").eq(0), table[i-1].rgvNo);
setVal(tr.children("td").eq(1), table[i-1].statusType);
setVal(tr.children("td").eq(2), table[i-1].status);
- setVal(tr.children("td").eq(3), table[i-1].workNo1);
- setVal(tr.children("td").eq(4), table[i-1].status1);
- setVal(tr.children("td").eq(5), table[i-1].loading1);
- setVal(tr.children("td").eq(6), table[i-1].rgvPos);
- setVal(tr.children("td").eq(7), table[i-1].walkPos);
- setVal(tr.children("td").eq(8), table[i-1].workNo2);
- setVal(tr.children("td").eq(9), table[i-1].status2);
- setVal(tr.children("td").eq(10), table[i-1].loading2);
- setVal(tr.children("td").eq(11), table[i-1].warnCode);
- setVal(tr.children("td").eq(12), table[i-1].alarm);
+ setVal(tr.children("td").eq(3), table[i-1].endRow);
+ setVal(tr.children("td").eq(4), table[i-1].nowRow);
+ setVal(tr.children("td").eq(5), table[i-1].workNo1);
+ setVal(tr.children("td").eq(6), table[i-1].status11);
+ setVal(tr.children("td").eq(7), table[i-1].status12);
+ setVal(tr.children("td").eq(8), table[i-1].status13);
+ setVal(tr.children("td").eq(9), table[i-1].status14);
+ setVal(tr.children("td").eq(10), table[i-1].status15);
+ setVal(tr.children("td").eq(11), table[i-1].status16);
}
} else if (res.code === 403){
window.location.href = baseUrl+"/login";
@@ -575,73 +573,6 @@
function rgvOutput(content){
rgvOutputDom.value += content;
rgvOutputDom.scrollTop = rgvOutputDom.scrollHeight;
- }
-
-
- var rgvDemoData;
- function initDemo() {
- $.ajax({
- url: baseUrl+"/rgv/demo/status",
- async: false,
- method: 'GET',
- success: function (res) {
- if (res.code === 200) {
- rgvDemoData = res.data;
- rgvDemoData.forEach(function (e) {
- $("#demoBtn-"+e.rgvNo).html(e.demo?'鍋滄':'婕旂ず');
- })
- } else if (res.code === 403){
- parent.location.href = baseUrl+"/login";
- } else {
- layer.msg(res.msg, {icon: 2});
- }
- }
- })
- }
-
- function demoSwitch(el) {
- var rgvId = el.split("-")[1];
- var opt;
- if (rgvDemoData == null) {
- initDemo();
- }
- for (var i = 0; i<rgvDemoData.length; i++) {
- if (Number(rgvDemoData[i].rgvNo) === Number(rgvId)) {
- opt = !rgvDemoData[i].demo;
- }
- }
- layer.confirm(rgvId + ' 鍙峰爢鍨涙満纭畾'+ (opt?'寮�濮�':'鍋滄') + '婕旂ず鍚楋紵', function(){
- doDemo(rgvId, 'root', opt); // 鍋滄wcs绯荤粺
- });
- }
-
- function doDemo(rgvId, password, opt) {
- // 鍔犺浇tips
- var index = layer.load(1, {
- shade: [0.1,'#fff']
- });
- $.ajax({
- url: baseUrl+ "/rgv/demo/switch",
- headers: {'token': localStorage.getItem('token')},
- // async: false,
- data: {
- rgvId: Number(rgvId),
- password: password,
- opt: opt
- },
- 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});
- }
- }
- });
-
}
</script>
--
Gitblit v1.9.1