From 759e123c07b3e89550564a3137491e16c300b9f9 Mon Sep 17 00:00:00 2001 From: whycq <you@example.com> Date: 星期二, 27 六月 2023 18:57:54 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/controller/ConsoleController.java | 12 ------------ src/main/webapp/views/console.html | 20 -------------------- 2 files changed, 0 insertions(+), 32 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/ConsoleController.java b/src/main/java/com/zy/asrs/controller/ConsoleController.java index 1bfdeab..5095582 100644 --- a/src/main/java/com/zy/asrs/controller/ConsoleController.java +++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java @@ -167,18 +167,6 @@ return R.ok().add(list); } - @PostMapping("/latest/inSta/data/barcode") - @ManagerAuth(memo = "鏉$爜鎵弿浠疄鏃舵暟鎹�") - public R barcodeData(Integer barcodeId){ - BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, barcodeId); - if (null == barcodeThread) { - return R.ok(); - } - BarcodeDataVo vo = new BarcodeDataVo(); - vo.setBarcodeId(barcodeId); - vo.setCodeValue(barcodeThread.getBarcode()); - return R.ok().add(vo); - } @PostMapping("/latest/data/scale") @ManagerAuth(memo = "纾呯Г瀹炴椂鏁版嵁") diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html index fe997be..4bc096b 100644 --- a/src/main/webapp/views/console.html +++ b/src/main/webapp/views/console.html @@ -1075,7 +1075,6 @@ getSystemRunningStatus(); getBarcodeInfo(); getScaleInfo(); - getInStaBarcodeInfo(1); }, 1000); setInterval(function () { getSitesInfo(); @@ -1206,25 +1205,6 @@ } } }); - } - // 鍏ュ簱绔欐壂鐮佸櫒鏁版嵁瀹炴椂鑾峰彇 - function getInStaBarcodeInfo(barcodeId) { - $.ajax({ - url: baseUrl + "/latest/inSta/data/barcode", - data: {barcodeId:barcodeId}, - headers: {'token': localStorage.getItem('token')}, - method: 'POST', - success: function (res) { - console.log(res) - if (res.code === 200){ - - } else if (res.code === 403){ - parent.location.href = baseUrl+"/login"; - } else { - console.log(res.msg); - } - } - }) } // 鎵爜鍣ㄥ疄鏃舵暟鎹幏鍙� -- Gitblit v1.9.1