From 538496d2361fb5cd6ab2a48f609a37b5cbfb5e4d Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 15 八月 2020 15:47:01 +0800
Subject: [PATCH] #
---
src/main/webapp/views/crn.html | 66 ++++++++++++++------------------
1 files changed, 29 insertions(+), 37 deletions(-)
diff --git a/src/main/webapp/views/crn.html b/src/main/webapp/views/crn.html
index e39cd89..7ba4b80 100644
--- a/src/main/webapp/views/crn.html
+++ b/src/main/webapp/views/crn.html
@@ -11,6 +11,7 @@
<link rel="stylesheet" type="text/css" href="../static/css/crn.css">
<script type="text/javascript" src="../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../static/js/common.js"></script>
+ <script type="text/javascript" src="../static/js/layer/layer.js"></script>
<style>
</style>
@@ -38,18 +39,15 @@
<thead>
<tr>
<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>
+ <th>杞借揣鍙颁綅缃�</th>
</tr>
</thead>
<tbody>
@@ -81,6 +79,7 @@
<!-- 鎵嬪姩鎿嶄綔 -->
<div class="crn-operation">
+ <!-- 閬僵灞� -->
<div class="crn-operation-shade">
<span class="crn-operation-shade-span">
WCS 绯荤粺杩愯涓紝璇峰仠姝㈠悗鎿嶄綔
@@ -198,7 +197,7 @@
// 鍒ゆ柇鎵嬪姩鎿嶄綔妯″潡鏄惁鍙敤
function operatorBlockShow() {
- if (top.systemRunning) {
+ if (parent.systemRunning) {
$('.crn-operation').css("opacity", "0.5");
$('.crn-operation-shade').show();
$('.crn-operation-shade-span').show();
@@ -222,14 +221,13 @@
$("#crn"+commands[i].crnNo).val(commands[i].command);
}
} else if (res.code === 403) {
- top.location.href = baseUrl + "/login";
+ window.location.href = baseUrl + "/login";
} else {
alert(res.msg);
}
}
})
}
-
// 鍫嗗灈鏈轰俊鎭〃鑾峰彇 ---- 琛ㄤ竴
function getCrnStateInfo() {
@@ -248,21 +246,18 @@
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].type);
- setVal(tr.children("td").eq(2), table[i-1].warn);
- setVal(tr.children("td").eq(3), table[i-1].loading);
- setVal(tr.children("td").eq(4), table[i-1].bay);
- setVal(tr.children("td").eq(5), table[i-1].lev);
- setVal(tr.children("td").eq(6), table[i-1].forkOffset);
- setVal(tr.children("td").eq(7), table[i-1].bayCoor);
- setVal(tr.children("td").eq(8), table[i-1].levCoor);
- setVal(tr.children("td").eq(9), table[i-1].complete);
- 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);
+ 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);
}
} else if (res.code === 403){
- top.location.href = baseUrl+"/login";
+ window.location.href = baseUrl+"/login";
} else {
alert(res.msg);
}
@@ -298,7 +293,7 @@
setVal(tr.children("td").eq(9), table[i-1].command);
}
} else if (res.code === 403){
- top.location.href = baseUrl+"/login";
+ window.location.href = baseUrl+"/login";
} else {
alert(res.msg);
}
@@ -334,70 +329,70 @@
// 鍏ュ簱
function put() {
http.post(baseUrl+"/crn/operator/put", getReqParam(), function (res) {
- alert(res.msg);
+ layer.msg(res.msg);
});
}
// 鍑哄簱
function take() {
http.post(baseUrl+"/crn/operator/take", getReqParam(), function (res) {
- alert(res.msg);
+ layer.msg(res.msg);
});
}
// 搴撲綅杞Щ
function stockMove() {
http.post(baseUrl+"/crn/operator/stockMove", getReqParam(), function (res) {
- alert(res.msg);
+ layer.msg(res.msg);
});
}
// 绔欏埌绔�
function siteMove() {
http.post(baseUrl+"/crn/operator/siteMove", getReqParam(), function (res) {
- alert(res.msg);
+ layer.msg(res.msg);
});
}
// 鍧愭爣绉诲姩
function coorMove() {
http.post(baseUrl+"/crn/operator/coorMove", getReqParam(), function (res) {
- alert(res.msg);
+ layer.msg(res.msg);
});
}
// 鍥炲師鐐�
function bacOrigin() {
http.post(baseUrl+"/crn/operator/bacOrigin", getReqParam(), function (res) {
- alert(res.msg);
+ layer.msg(res.msg);
});
}
// 浠诲姟瀹屾垚
function taskComplete() {
http.post(baseUrl+"/crn/operator/taskComplete", getReqParam(), function (res) {
- alert(res.msg);
+ layer.msg(res.msg);
});
}
// 鏆傚仠
function pause() {
http.post(baseUrl+"/crn/operator/pause", getReqParam(), function (res) {
- alert(res.msg);
+ layer.msg(res.msg);
});
}
// 鍚姩
function boot() {
http.post(baseUrl+"/crn/operator/boot", getReqParam(), function (res) {
- alert(res.msg);
+ layer.msg(res.msg);
});
}
// 娓呴櫎鍛戒护
function clearCommand() {
http.post(baseUrl+"/crn/operator/clearCommand", getReqParam(), function (res) {
- alert(res.msg);
+ layer.msg(res.msg);
});
}
@@ -411,7 +406,7 @@
if (res.code === 200) {
crnOutput(res.data);
} else if (res.code === 403) {
- top.location.href = baseUrl + "/login";
+ window.location.href = baseUrl + "/login";
} else {
alert(res.msg);
}
@@ -437,9 +432,6 @@
var html = "";
for (var i = 0; i < line; i ++){
html += " <tr>\n" +
- " <td></td>\n" +
- " <td></td>\n" +
- " <td></td>\n" +
" <td></td>\n" +
" <td></td>\n" +
" <td></td>\n" +
--
Gitblit v1.9.1