From c422d0d7da0d26f39cd40f9070311ffbb2f9c009 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <xltys1995>
Date: 星期四, 27 八月 2020 18:32:03 +0800
Subject: [PATCH] #v2.0
---
src/main/webapp/views/crn.html | 60 +++++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 45 insertions(+), 15 deletions(-)
diff --git a/src/main/webapp/views/crn.html b/src/main/webapp/views/crn.html
index 7f74fb4..1dc9e5a 100644
--- a/src/main/webapp/views/crn.html
+++ b/src/main/webapp/views/crn.html
@@ -27,11 +27,11 @@
<span> </span>
<input id="crn1" disabled="disabled">
</div>
-<!-- <div class="crn-command-item">-->
-<!-- <label>2#</label>-->
-<!-- <span> </span>-->
-<!-- <input id="crn2" disabled="disabled">-->
-<!-- </div>-->
+ <div class="crn-command-item">
+ <label>2#</label>
+ <span> </span>
+ <input id="crn2" disabled="disabled">
+ </div>
</div>
<!-- 鍫嗗灈鏈虹姸鎬佷綅淇℃伅 -->
<div class="crn-state">
@@ -42,12 +42,15 @@
<th>浠诲姟鍙�</th>
<th>妯″紡</th>
<th>鐘舵��</th>
- <th>鎶ヨ</th>
<th>鏈夌墿</th>
<th>鍒�</th>
<th>灞�</th>
+ <th>璧拌鍘熺偣</th>
+ <th>鍗囬檷鍘熺偣</th>
<th>璐у弶浣嶇疆</th>
- <th>杞借揣鍙颁綅缃�</th>
+ <th>璧拌瀹氫綅</th>
+ <th>鍗囬檷瀹氫綅</th>
+ <th>鎬ュ仠</th>
<th>寮傚父鐮�</th>
</tr>
</thead>
@@ -69,6 +72,13 @@
<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>
</tr>
</thead>
<tbody>
@@ -250,13 +260,16 @@
setVal(tr.children("td").eq(1), table[i-1].workNo);
setVal(tr.children("td").eq(2), table[i-1].statusType);
setVal(tr.children("td").eq(3), table[i-1].status);
- setVal(tr.children("td").eq(4), table[i-1].warn);
- setVal(tr.children("td").eq(5), table[i-1].loading);
- setVal(tr.children("td").eq(6), table[i-1].bay);
- setVal(tr.children("td").eq(7), table[i-1].lev);
- setVal(tr.children("td").eq(8), table[i-1].forkOffset);
- setVal(tr.children("td").eq(9), table[i-1].liftPos);
- setVal(tr.children("td").eq(10), table[i-1].warnCode);
+ setVal(tr.children("td").eq(4), table[i-1].loading);
+ 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].xorigin);
+ setVal(tr.children("td").eq(8), table[i-1].yorigin);
+ setVal(tr.children("td").eq(9), table[i-1].forkOffset);
+ setVal(tr.children("td").eq(10), table[i-1].xlocation);
+ setVal(tr.children("td").eq(11), table[i-1].ylocation);
+ setVal(tr.children("td").eq(12), table[i-1].stop);
+ setVal(tr.children("td").eq(13), table[i-1].warnCode);
}
} else if (res.code === 403){
window.location.href = baseUrl+"/login";
@@ -290,7 +303,14 @@
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(6), table[i-1].error);
+ setVal(tr.children("td").eq(7), table[i-1].error);
+ setVal(tr.children("td").eq(8), table[i-1].xspeed);
+ setVal(tr.children("td").eq(9), table[i-1].yspeed);
+ setVal(tr.children("td").eq(10), table[i-1].zspeed);
+ setVal(tr.children("td").eq(11), table[i-1].xdistance);
+ setVal(tr.children("td").eq(12), table[i-1].ydistance);
+ setVal(tr.children("td").eq(13), table[i-1].xduration);
+ setVal(tr.children("td").eq(14), table[i-1].yduration);
}
} else if (res.code === 403){
window.location.href = baseUrl+"/login";
@@ -457,6 +477,9 @@
" <td></td>\n" +
" <td></td>\n" +
" <td></td>\n" +
+ " <td></td>\n" +
+ " <td></td>\n" +
+ " <td></td>\n" +
" </tr>\n";
}
$('#crn-state-table tbody').after(html);
@@ -486,6 +509,13 @@
" <td></td>\n" +
" <td></td>\n" +
" <td></td>\n" +
+ " <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