From 2aeea7b010e96f74a52bc4ed5873c41c177a5953 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <xltys1995>
Date: 星期四, 27 八月 2020 14:09:57 +0800
Subject: [PATCH] #
---
src/main/webapp/views/crn.html | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/main/webapp/views/crn.html b/src/main/webapp/views/crn.html
index a8fda83..7f74fb4 100644
--- a/src/main/webapp/views/crn.html
+++ b/src/main/webapp/views/crn.html
@@ -48,6 +48,7 @@
<th>灞�</th>
<th>璐у弶浣嶇疆</th>
<th>杞借揣鍙颁綅缃�</th>
+ <th>寮傚父鐮�</th>
</tr>
</thead>
<tbody>
@@ -67,6 +68,7 @@
<th>鐩爣绔�</th>
<th>婧愬簱浣�</th>
<th>鐩爣搴撲綅</th>
+ <th>寮傚父</th>
</tr>
</thead>
<tbody>
@@ -190,7 +192,7 @@
getCommandLog();
},1000);
setInterval(function () {
- getSiteOutput();
+ getCrnOutput();
operatorBlockShow();
},500);
@@ -254,6 +256,7 @@
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);
}
} else if (res.code === 403){
window.location.href = baseUrl+"/login";
@@ -287,6 +290,7 @@
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);
}
} else if (res.code === 403){
window.location.href = baseUrl+"/login";
@@ -407,7 +411,7 @@
}
// 杈撻�佽澶囨棩蹇楄緭鍑� -----------------------------------------------------------------------
- function getSiteOutput() {
+ function getCrnOutput() {
$.ajax({
url: baseUrl + "/crn/output/site",
headers: {'token': localStorage.getItem('token')},
@@ -452,6 +456,7 @@
" <td></td>\n" +
" <td></td>\n" +
" <td></td>\n" +
+ " <td></td>\n" +
" </tr>\n";
}
$('#crn-state-table tbody').after(html);
@@ -480,6 +485,7 @@
" <td></td>\n" +
" <td></td>\n" +
" <td></td>\n" +
+ " <td></td>\n" +
" </tr>\n";
}
$('#crn-msg-table tbody').after(html);
--
Gitblit v1.9.1