From 2ea423b0f01d4db3d879066cd6c9634cc6800c7c Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期四, 27 十一月 2025 16:37:43 +0800
Subject: [PATCH] #1
---
src/main/webapp/views/crn.html | 95 +++++++++++++++++++++++++++++------------------
1 files changed, 59 insertions(+), 36 deletions(-)
diff --git a/src/main/webapp/views/crn.html b/src/main/webapp/views/crn.html
index 427ac8c..d33d040 100644
--- a/src/main/webapp/views/crn.html
+++ b/src/main/webapp/views/crn.html
@@ -59,36 +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>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 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">
@@ -132,6 +132,10 @@
<th>鍗囬檷璺濈(Km)</th>
<th>璧拌鏃堕暱(H)</th>
<th>鍗囬檷鏃堕暱(H)</th>
+ <th>鍏ュ簱浠诲姟涓婇檺</th>
+ <th>褰撳墠鍏ュ簱浠诲姟</th>
+ <th>鎬讳换鍔℃暟閲忎笂闄�</th>
+ <th>褰撳墠鎬讳换鍔℃暟閲�</th>
</tr>
</thead>
<tbody>
@@ -155,11 +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="4"> 4鍙峰爢鍨涙満</label>
- <label><input type="radio" name="crnSelect" value="5"> 5鍙峰爢鍨涙満</label>
- <label><input type="radio" name="crnSelect" value="6"> 6鍙峰爢鍨涙満</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>
<!-- 婧愮珯/婧愬簱浣� 閫夋嫨 -->
@@ -352,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);
@@ -367,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";
@@ -546,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 {
@@ -569,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