From 3897c8800805f6e99e30d700fe0c11c5ed2df84a Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期五, 26 九月 2025 14:24:59 +0800
Subject: [PATCH] 1
---
src/main/webapp/views/crn.html | 40 ++++++++++++++++++++++++++--------------
1 files changed, 26 insertions(+), 14 deletions(-)
diff --git a/src/main/webapp/views/crn.html b/src/main/webapp/views/crn.html
index dba0d58..84acbd9 100644
--- a/src/main/webapp/views/crn.html
+++ b/src/main/webapp/views/crn.html
@@ -98,7 +98,8 @@
<th>鍫嗗灈鏈�</th>
<th>妯″紡</th>
<th>鐘舵��</th>
- <th>鏈夌墿</th>
+ <th>宸ヤ綅1鏈夌墿</th>
+ <th>宸ヤ綅2鏈夌墿</th>
<th>鍒�</th>
<th>灞�</th>
<th>璐у弶瀹氫綅</th>
@@ -122,9 +123,12 @@
<th>宸ヤ綔鍙�</th>
<th>鐘舵��</th>
<th>婧愮珯</th>
- <th>鐩爣绔�</th>
- <th>婧愬簱浣�</th>
- <th>鐩爣搴撲綅</th>
+ <th>鐩爣绔�1</th>
+ <th>婧愬簱浣�1</th>
+ <th>鐩爣搴撲綅1</th>
+ <th>鐩爣绔�2</th>
+ <th>婧愬簱浣�2</th>
+ <th>鐩爣搴撲綅2</th>
<!-- <th>璧拌閫熷害锛坢/min)</th>-->
<!-- <th>鍗囬檷閫熷害锛坢/min)</th>-->
<!-- <th>鍙夌墮閫熷害锛坢/min)</th>-->
@@ -220,7 +224,9 @@
<!-- <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(1)">浠诲姟瀹屾垚1</button>
+ <button class="item" onclick="taskComplete(2)">浠诲姟瀹屾垚2</button>
+
<!-- <button class="item" onclick="pause()">鏆傚仠</button>-->
<!-- <button class="item" onclick="boot()">鍚姩</button>-->
<button class="item" onclick="clearCommand()">娓呴櫎鍛戒护</button>
@@ -320,13 +326,15 @@
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].loading);
- setVal(tr.children("td").eq(4), table[i-1].bay);
- setVal(tr.children("td").eq(5), table[i-1].lev);
- setVal(tr.children("td").eq(6), table[i-1].forkOffset);
- setVal(tr.children("td").eq(7), table[i-1].liftPos);
- setVal(tr.children("td").eq(8), table[i-1].walkPos);
- setVal(tr.children("td").eq(9), table[i-1].warnCode);
- setVal(tr.children("td").eq(10), table[i-1].alarm);
+ setVal(tr.children("td").eq(4), table[i-1].loadTwoing);
+
+ setVal(tr.children("td").eq(5), table[i-1].bay);
+ setVal(tr.children("td").eq(6), table[i-1].lev);
+ setVal(tr.children("td").eq(7), table[i-1].forkOffset);
+ setVal(tr.children("td").eq(8), table[i-1].liftPos);
+ setVal(tr.children("td").eq(9), table[i-1].walkPos);
+ setVal(tr.children("td").eq(10), table[i-1].warnCode);
+ setVal(tr.children("td").eq(11), table[i-1].alarm);
}
} else if (res.code === 403){
window.location.href = baseUrl+"/login";
@@ -360,6 +368,10 @@
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].staNo2);
+ setVal(tr.children("td").eq(8), table[i-1].sourceLocNo2);
+ setVal(tr.children("td").eq(9), table[i-1].locNo2);
// setVal(tr.children("td").eq(7), table[i-1].xspeed);
// setVal(tr.children("td").eq(8), table[i-1].yspeed);
// setVal(tr.children("td").eq(9), table[i-1].zspeed);
@@ -452,8 +464,8 @@
}
// 浠诲姟瀹屾垚
- function taskComplete() {
- http.post(baseUrl+"/crn/operator/taskComplete", getReqParam(), function (res) {
+ function taskComplete(c) {
+ http.post(baseUrl+"/crn/operator/taskComplete?c="+c, getReqParam(), function (res) {
layer.msg(res.msg);
});
}
--
Gitblit v1.9.1