From fe78ade0acf1c83986fe0b5ffa92fd2ead09555c Mon Sep 17 00:00:00 2001
From: vincent <1341870251@qq.com>
Date: 星期四, 04 六月 2020 16:04:12 +0800
Subject: [PATCH] #gateway-core
---
src/main/webapp/views/console.html | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index 6e7edc7..5676366 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">
@@ -619,7 +619,6 @@
</body>
<script>
- var systemRunning = true;
var crn1Position = 0;
var crn2Position = 0;
// 鍒濆鍖�
@@ -639,7 +638,7 @@
// 绯荤粺杩愯寮�鍏�
function systemSwitch() {
- if (systemRunning){
+ if (top.systemRunning){
layer.prompt({title: '璇疯緭鍏ュ彛浠わ紝骞跺仠姝� WCS 绯荤粺', formType: 1, shadeClose: true}, function(pass, idx){
layer.close(idx);
doSwitch(0, pass); // 鍋滄wcs绯荤粺
@@ -670,11 +669,11 @@
if (res.data.status) {
$('#system-icon').attr("class", "system-icon-open");
$('#system-run-desc').html("绯荤粺杩愯涓�...");
- systemRunning = true;
+ top.systemRunning = true;
} else {
$('#system-icon').attr("class", "system-icon-close");
$('#system-run-desc').html("绯荤粺宸插仠姝�!");
- systemRunning = false;
+ top.systemRunning = false;
}
} else if (res.code === 403){
top.location.href = baseUrl+"/login";
@@ -697,11 +696,11 @@
if (res.data.status) {
$('#system-icon').attr("class", "system-icon-open");
$('#system-run-desc').html("绯荤粺杩愯涓�...");
- systemRunning = true;
+ top.systemRunning = true;
} else {
$('#system-icon').attr("class", "system-icon-close");
$('#system-run-desc').html("绯荤粺宸插仠姝�!");
- systemRunning = false;
+ top.systemRunning = false;
}
} else if (res.code === 403){
top.location.href = baseUrl+"/login";
@@ -764,8 +763,6 @@
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){
@@ -798,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