From 58d3d34b740a07099384152e0024e6c09891eca5 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期二, 28 十月 2025 16:30:30 +0800
Subject: [PATCH] #
---
src/main/webapp/views/crn.html | 41 ++++++++++++++++++++++++++++++++++++-----
1 files changed, 36 insertions(+), 5 deletions(-)
diff --git a/src/main/webapp/views/crn.html b/src/main/webapp/views/crn.html
index 3999603..77ba3f9 100644
--- a/src/main/webapp/views/crn.html
+++ b/src/main/webapp/views/crn.html
@@ -83,6 +83,12 @@
<!-- <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">
@@ -126,6 +132,10 @@
<th>鍗囬檷璺濈(Km)</th>
<th>璧拌鏃堕暱(H)</th>
<th>鍗囬檷鏃堕暱(H)</th>
+ <th>鍏ュ簱浠诲姟涓婇檺</th>
+ <th>褰撳墠鍏ュ簱浠诲姟</th>
+ <th>鎬讳换鍔℃暟閲忎笂闄�</th>
+ <th>褰撳墠鎬讳换鍔℃暟閲�</th>
</tr>
</thead>
<tbody>
@@ -145,14 +155,15 @@
<!-- 璁惧浠诲姟閫夋嫨 -->
<div class="task-select">
<!-- 鍫嗗灈鏈洪�夋嫨 -->
- <div id="crn-select" class="operator-item">
+ <div id="crn-select" class="operator-item" style="width: 55%">
<span class="select-title">鍫嗗灈鏈哄彿</span>
- <div class="select-container">
+ <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="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>
<!-- 婧愮珯/婧愬簱浣� 閫夋嫨 -->
@@ -212,7 +223,7 @@
<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="coorMove()">鍫嗗灈鏈虹Щ鍔�</button>
<button class="item" onclick="taskComplete()">浠诲姟瀹屾垚</button>
<!-- <button class="item" onclick="pause()">鏆傚仠</button>-->
<!-- <button class="item" onclick="boot()">鍚姩</button>-->
@@ -345,6 +356,7 @@
crnMsgTableFullRows = table.length;
}
for (var i=1;i<=table.length;i++){
+ console.log(table[i-1])
var tr = tableEl.find("tr").eq(i);
setVal(tr.children("td").eq(0), table[i-1].crnNo);
setVal(tr.children("td").eq(1), table[i-1].workNo);
@@ -360,6 +372,20 @@
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(14), table[i-1].crnSearchDetectTaskCount);
+
+ let currentInTask = "<span>" + table[i-1].currentInTask + "</span>";
+ if (table[i - 1].currentInTask > table[i - 1].crnSearchDetectTaskCount) {
+ currentInTask = "<span style='color: red;font-weight: bolder;'>" + table[i-1].currentInTask + "</span>";
+ }
+ setVal(tr.children("td").eq(15), currentInTask);
+
+ setVal(tr.children("td").eq(16), table[i-1].applyInTaskTotalCount);
+ let currentTotalTask = "<span>" + table[i-1].currentTotalTask + "</span>";
+ if (table[i - 1].currentTotalTask > table[i - 1].applyInTaskTotalCount) {
+ currentTotalTask = "<span style='color: red;font-weight: bolder;'>" + table[i-1].currentTotalTask + "</span>";
+ }
+ setVal(tr.children("td").eq(17), currentTotalTask);
}
} else if (res.code === 403){
window.location.href = baseUrl+"/login";
@@ -425,7 +451,7 @@
// 鍧愭爣绉诲姩
function coorMove() {
- http.post(baseUrl+"/crn/operator/coorMove", getReqParam(), function (res) {
+ http.post(baseUrl+"/crn/operator/crnMove", getReqParam(), function (res) {
layer.msg(res.msg);
});
}
@@ -486,6 +512,7 @@
headers: {'token': localStorage.getItem('token')},
method: 'POST',
success: function (res) {
+ console.log(res)
if (res.code === 200) {
crnOutput(res.data);
} else if (res.code === 403) {
@@ -538,7 +565,7 @@
var one = $('#crn-msg-table thead').height();
var total = $('.crn-msg').height();
var count = total / one;
- count = parseInt(count) - 1;
+ count = parseInt(count);
crnMsgTableBlankRows = count;
line = count;
} else {
@@ -561,6 +588,10 @@
" <td></td>\n" +
" <td></td>\n" +
" <td></td>\n" +
+ " <td></td>\n" +
+ " <td></td>\n" +
+ " <td></td>\n" +
+ " <td></td>\n" +
" </tr>\n";
}
$('#crn-msg-table tbody').after(html);
--
Gitblit v1.9.1