From 1a9f0067e8c8b7ef1111b2dd3cf087397943f14c Mon Sep 17 00:00:00 2001
From: whycq <123456>
Date: 星期一, 08 八月 2022 08:05:34 +0800
Subject: [PATCH] #
---
src/main/webapp/views/console.html | 1 +
src/main/webapp/static/js/console.js | 5 ++---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 2917e1a..25d9512 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -50,7 +50,7 @@
/**
* 鏉＄爜鏁伴噺
*/
- private int barcodeSize = 1;
+ private int barcodeSize = 3;
public IoModeType ioMode = IoModeType.NONE;
public SiemensDevpThread(DevpSlave slave) {
@@ -168,7 +168,7 @@
}
Thread.sleep(200);
- OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB100.190",(short)(barcodeSize*8));
+ OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB100.150",(short)(barcodeSize*8));
if (result2.IsSuccess) {
for (int i = 0; i < barcodeSize; i++) {
String barcode = siemensS7Net.getByteTransform().TransString(result2.Content,i*8,8, "UTF-8");
diff --git a/src/main/webapp/static/js/console.js b/src/main/webapp/static/js/console.js
index eea1df2..34af77e 100644
--- a/src/main/webapp/static/js/console.js
+++ b/src/main/webapp/static/js/console.js
@@ -97,7 +97,6 @@
var position = (i+1)*100
floorBtn =
"<button class='floorBtn btn-16' onclick='changFloor("+i+")' style='top: "+position+"px;'>" + floor +"</button>"
- console.log(mapInfo.areas[0].floors.length)
if (mapInfo.areas[0].floors.length == 1) {
floorBtnss = ''
} else {
@@ -137,7 +136,7 @@
$(".main-part").append(floorInfo)
$("#line-total").html(total[0])
- listenChange();
+ // listenChange();
}
function changFloor(e) {
@@ -146,5 +145,5 @@
$(".main-part").append(floorInfo)
$("#line-total").empty()
$("#line-total").html(total[e])
- listenChange();
+ // listenChange();
}
\ No newline at end of file
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index fde6b24..60fd15b 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -344,6 +344,7 @@
url: baseUrl + '/console/barcode/output/site',
method: 'GET',
success: function (res) {
+ console.log(res)
if (res.code === 200) {
tData = eval(res.data);
if (tData.length <= 5) {
--
Gitblit v1.9.1