From 511d4ceb774ce6ccc1827545a205ba55a0ff26c0 Mon Sep 17 00:00:00 2001
From: czkh <czkh@163.com>
Date: 星期一, 01 十二月 2025 09:06:14 +0800
Subject: [PATCH] #1
---
src/main/webapp/views/crn.html | 129 +++++++++++++++++++++++++++----------------
1 files changed, 81 insertions(+), 48 deletions(-)
diff --git a/src/main/webapp/views/crn.html b/src/main/webapp/views/crn.html
index 7a75854..84acbd9 100644
--- a/src/main/webapp/views/crn.html
+++ b/src/main/webapp/views/crn.html
@@ -59,18 +59,36 @@
<!-- <span> </span>-->
<input id="crn1" disabled="disabled">
</div>
- <div class="crn-command-item">
- <label>2#</label>
- <button id="demoBtn-2" class="demoBtn" onclick="demoSwitch(this.id)"> - </button>
- <!-- <span> </span>-->
- <input id="crn2" disabled="disabled">
- </div>
- <div class="crn-command-item">
- <label>3#</label>
- <button id="demoBtn-3" class="demoBtn" onclick="demoSwitch(this.id)"> - </button>
- <!-- <span> </span>-->
- <input id="crn3" disabled="disabled">
- </div>
+<!-- <div class="crn-command-item">-->
+<!-- <label>2#</label>-->
+<!-- <button id="demoBtn-2" class="demoBtn" onclick="demoSwitch(this.id)"> - </button>-->
+<!-- <!– <span> </span>–>-->
+<!-- <input id="crn2" disabled="disabled">-->
+<!-- </div>-->
+<!-- <div class="crn-command-item">-->
+<!-- <label>3#</label>-->
+<!-- <button id="demoBtn-3" class="demoBtn" onclick="demoSwitch(this.id)"> - </button>-->
+<!-- <!– <span> </span>–>-->
+<!-- <input id="crn3" disabled="disabled">-->
+<!-- </div>-->
+<!-- <div class="crn-command-item">-->
+<!-- <label>4#</label>-->
+<!-- <button id="demoBtn-4" class="demoBtn" onclick="demoSwitch(this.id)"> - </button>-->
+<!-- <!– <span> </span>–>-->
+<!-- <input id="crn4" disabled="disabled">-->
+<!-- </div>-->
+ <!-- <div class="crn-command-item">-->
+ <!-- <label>5#</label>-->
+ <!-- <button id="demoBtn-5" class="demoBtn" onclick="demoSwitch(this.id)"> - </button>-->
+ <!-- <!– <span> </span>–>-->
+ <!-- <input id="crn5" disabled="disabled">-->
+ <!-- </div>-->
+ <!-- <div class="crn-command-item">-->
+ <!-- <label>6#</label>-->
+ <!-- <button id="demoBtn-6" class="demoBtn" onclick="demoSwitch(this.id)"> - </button>-->
+ <!-- <!– <span> </span>–>-->
+ <!-- <input id="crn6" disabled="disabled">-->
+ <!-- </div>-->
</div>
<!-- 鍫嗗灈鏈虹姸鎬佷綅淇℃伅 -->
<div class="crn-state">
@@ -80,7 +98,8 @@
<th>鍫嗗灈鏈�</th>
<th>妯″紡</th>
<th>鐘舵��</th>
- <th>鏈夌墿</th>
+ <th>宸ヤ綅1鏈夌墿</th>
+ <th>宸ヤ綅2鏈夌墿</th>
<th>鍒�</th>
<th>灞�</th>
<th>璐у弶瀹氫綅</th>
@@ -104,16 +123,19 @@
<th>宸ヤ綔鍙�</th>
<th>鐘舵��</th>
<th>婧愮珯</th>
- <th>鐩爣绔�</th>
- <th>婧愬簱浣�</th>
- <th>鐩爣搴撲綅</th>
- <th>璧拌閫熷害锛坢/min)</th>
- <th>鍗囬檷閫熷害锛坢/min)</th>
- <th>鍙夌墮閫熷害锛坢/min)</th>
- <th>璧拌璺濈(Km)</th>
- <th>鍗囬檷璺濈(Km)</th>
- <th>璧拌鏃堕暱(H)</th>
- <th>鍗囬檷鏃堕暱(H)</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>-->
+ <!-- <th>璧拌璺濈(Km)</th>-->
+ <!-- <th>鍗囬檷璺濈(Km)</th>-->
+ <!-- <th>璧拌鏃堕暱(H)</th>-->
+ <!-- <th>鍗囬檷鏃堕暱(H)</th>-->
</tr>
</thead>
<tbody>
@@ -137,8 +159,11 @@
<span class="select-title">鍫嗗灈鏈哄彿</span>
<div class="select-container" style="padding: 20px 0;">
<label><input type="radio" name="crnSelect" value="1" checked> 1鍙峰爢鍨涙満</label>
- <label><input type="radio" name="crnSelect" value="2"> 2鍙峰爢鍨涙満</label>
- <label><input type="radio" name="crnSelect" value="3"> 3鍙峰爢鍨涙満</label>
+<!-- <label><input type="radio" name="crnSelect" value="2"> 2鍙峰爢鍨涙満</label>-->
+<!-- <label><input type="radio" name="crnSelect" value="3"> 3鍙峰爢鍨涙満</label>-->
+<!-- <label><input type="radio" name="crnSelect" value="4"> 4鍙峰爢鍨涙満</label>-->
+ <!-- <label><input type="radio" name="crnSelect" value="5"> 5鍙峰爢鍨涙満</label>-->
+ <!-- <label><input type="radio" name="crnSelect" value="6"> 6鍙峰爢鍨涙満</label>-->
</div>
</div>
<!-- 婧愮珯/婧愬簱浣� 閫夋嫨 -->
@@ -192,18 +217,20 @@
<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="siteMove()">绔欏埌绔�</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(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>-->
-<!-- <button class="item" onclick="handleReset()">澶嶄綅</button>-->
+ <button class="item" onclick="clearCommand()">娓呴櫎鍛戒护</button>
+ <button class="item" onclick="handleReset()">澶嶄綅</button>
</div>
</fieldset>
</div>
@@ -299,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";
@@ -339,13 +368,17 @@
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].xspeed);
- setVal(tr.children("td").eq(8), table[i-1].yspeed);
- setVal(tr.children("td").eq(9), table[i-1].zspeed);
- setVal(tr.children("td").eq(10), table[i-1].xdistance);
- setVal(tr.children("td").eq(11), table[i-1].ydistance);
- setVal(tr.children("td").eq(12), table[i-1].xduration);
- setVal(tr.children("td").eq(13), table[i-1].yduration);
+
+ 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);
+ // setVal(tr.children("td").eq(10), table[i-1].xdistance);
+ // setVal(tr.children("td").eq(11), table[i-1].ydistance);
+ // setVal(tr.children("td").eq(12), table[i-1].xduration);
+ // setVal(tr.children("td").eq(13), table[i-1].yduration);
}
} else if (res.code === 403){
window.location.href = baseUrl+"/login";
@@ -431,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