From e15bba44445d695ce7a9c5efefc0e649ee7d4a7a Mon Sep 17 00:00:00 2001
From: vincent <1341870251@qq.com>
Date: 星期二, 02 六月 2020 14:36:03 +0800
Subject: [PATCH] #
---
src/main/webapp/views/crn.html | 42 +++++++++++++++++++++++++++++++++++++++---
1 files changed, 39 insertions(+), 3 deletions(-)
diff --git a/src/main/webapp/views/crn.html b/src/main/webapp/views/crn.html
index 2a5be06..ac5eb55 100644
--- a/src/main/webapp/views/crn.html
+++ b/src/main/webapp/views/crn.html
@@ -176,11 +176,13 @@
initCrnStateTable();
getCrnStateInfo();
initCrnMsgTable();
+ getCrnMsgInfo();
});
// 鏁版嵁鏇存柊
setInterval(function () {
getCrnStateInfo();
- },500);
+ getCrnMsgInfo();
+ },1000);
setInterval(function () {
getSiteOutput();
},500);
@@ -215,6 +217,42 @@
setVal(tr.children("td").eq(10), table[i-1].workNo);
setVal(tr.children("td").eq(11), table[i-1].status);
setVal(tr.children("td").eq(12), table[i-1].warnCode);
+ }
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/login";
+ } else {
+ alert(res.msg);
+ }
+ }
+ });
+ }
+
+ // 鍫嗗灈鏈烘暟鎹〃鑾峰彇 ---- 琛ㄤ簩
+ function getCrnMsgInfo() {
+ var tableEl = $('#crn-msg-table');
+ $.ajax({
+ url: baseUrl+ "/crn/table/crn/msg",
+ headers: {'token': localStorage.getItem('token')},
+ method: 'POST',
+ success: function (res) {
+ if (res.code === 200){
+ var table = res.data;
+ if (table.length > crnStateTableBlankRows && table.length !== crnStateTableFullRows) {
+ initCrnStateTable(table.length-crnStateTableBlankRows);
+ crnStateTableFullRows = table.length;
+ }
+ for (var i=1;i<=table.length;i++){
+ 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].status);
+ setVal(tr.children("td").eq(2), table[i-1].workNo);
+ setVal(tr.children("td").eq(3), table[i-1].sourceStaNo);
+ 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].error);
+ setVal(tr.children("td").eq(8), table[i-1].origin);
+ setVal(tr.children("td").eq(9), table[i-1].command);
}
} else if (res.code === 403){
top.location.href = baseUrl+"/login";
@@ -315,8 +353,6 @@
crnOutputDom.value += content;
crnOutputDom.scrollTop = crnOutputDom.scrollHeight;
}
-
-
</script>
</html>
\ No newline at end of file
--
Gitblit v1.9.1