From 2c99685a60ecc2da91364642b45a636d1af13b1f Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 07 八月 2020 16:53:31 +0800
Subject: [PATCH] #
---
src/main/webapp/views/console.html | 31 ++++++++++++++++---------------
1 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index 45548ef..7a7e438 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -203,7 +203,7 @@
<!-- 鍫嗗灈鏈� -->
<div class="crn">
<hr class="pathway">
- <div id="crn-1" class="machine"></div>
+ <div id="crn-2" class="machine"></div>
</div>
<!-- 璐ф灦 -->
<div class="stock-group">
@@ -342,7 +342,7 @@
<!-- 鍫嗗灈鏈� -->
<div class="crn">
<hr class="pathway">
- <div id="crn-2" class="machine"></div>
+ <div id="crn-1" class="machine"></div>
</div>
<!-- 璐ф灦 -->
<div class="stock-group">
@@ -638,7 +638,7 @@
// 绯荤粺杩愯寮�鍏�
function systemSwitch() {
- if (top.systemRunning){
+ if (parent.systemRunning){
layer.prompt({title: '璇疯緭鍏ュ彛浠わ紝骞跺仠姝� WCS 绯荤粺', formType: 1, shadeClose: true}, function(pass, idx){
layer.close(idx);
doSwitch(0, pass); // 鍋滄wcs绯荤粺
@@ -669,14 +669,14 @@
if (res.data.status) {
$('#system-icon').attr("class", "system-icon-open");
$('#system-run-desc').html("绯荤粺杩愯涓�...");
- top.systemRunning = true;
+ parent.systemRunning = true;
} else {
$('#system-icon').attr("class", "system-icon-close");
$('#system-run-desc').html("绯荤粺宸插仠姝�!");
- top.systemRunning = false;
+ parent.systemRunning = false;
}
} else if (res.code === 403){
- top.location.href = baseUrl+"/login";
+ window.location.href = baseUrl+"/login";
} else {
alert(res.msg);
}
@@ -696,14 +696,14 @@
if (res.data.status) {
$('#system-icon').attr("class", "system-icon-open");
$('#system-run-desc').html("绯荤粺杩愯涓�...");
- top.systemRunning = true;
+ parent.systemRunning = true;
} else {
$('#system-icon').attr("class", "system-icon-close");
$('#system-run-desc').html("绯荤粺宸插仠姝�!");
- top.systemRunning = false;
+ parent.systemRunning = false;
}
} else if (res.code === 403){
- top.location.href = baseUrl+"/login";
+ window.location.href = baseUrl+"/login";
} else {
alert(res.msg);
}
@@ -724,7 +724,7 @@
$("#site-"+sites[i].siteId).attr("class", "site " + sites[i].siteStatus);
}
} else if (res.code === 403){
- top.location.href = baseUrl+"/login";
+ window.location.href = baseUrl+"/login";
} else {
alert(res.msg);
}
@@ -745,7 +745,7 @@
crnAnimate(crns[i].crnId, crns[i].offset);
}
} else if (res.code === 403){
- top.location.href = baseUrl+"/login";
+ window.location.href = baseUrl+"/login";
} else {
alert(res.msg);
}
@@ -763,12 +763,10 @@
if (res.code === 200){
var barcodes = res.data;
for (var i = 0; i < barcodes.length; i++){
- console.log(barcodes[i].barcodeId);
- console.log(barcodes[i].codeValue);
$("#code-decoder-data-"+barcodes[i].barcodeId).html(barcodes[i].codeValue);
}
} else if (res.code === 403){
- top.location.href = baseUrl+"/login";
+ window.location.href = baseUrl+"/login";
} else {
alert(res.msg);
}
@@ -797,8 +795,11 @@
// 杈撻�佽澶囩偣鍑讳簨浠�
$('.site').on('click', function () {
var id = this.id.split("-")[1];
+ if (id === undefined) {
+ return;
+ }
layer.open({
- title: id + "绔欑偣淇℃伅璇︽儏",
+ title: id + " 绔欑偣淇℃伅璇︽儏",
closeBtn: 0,
skin: 'layui-layer-lan',
offset: '180px',
--
Gitblit v1.9.1