From 9f3f31e66b2ffb217155b9bcd294da4ec12b6e34 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 16 十月 2023 15:38:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tzskasrs' into tzskasrs
---
src/main/webapp/static/js/agvBasDevp/basDevp.js | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/main/webapp/static/js/agvBasDevp/basDevp.js b/src/main/webapp/static/js/agvBasDevp/basDevp.js
index 75c55ac..c17a0b3 100644
--- a/src/main/webapp/static/js/agvBasDevp/basDevp.js
+++ b/src/main/webapp/static/js/agvBasDevp/basDevp.js
@@ -385,7 +385,7 @@
layer.msg("姝ょ珯鐐圭殑鐘舵�佷笉瀛樺湪鐗╂枡");
return;
}
- locDetlToLayer(data.barcode);
+ locDetlToLayer(data.devNo,data.barcode);
break;
case 'unbind':
// locDetl(data.locNo);
@@ -572,8 +572,9 @@
}
// iframe鐗╂枡璇︽儏
- function locDetlToLayer(val) {
- barcode = val;
+ function locDetlToLayer(val1,val2) {
+ devNo = val1;
+ barcode = val2;
layer.open({
type: 2,
title: '绔欑偣鏄庣粏',
--
Gitblit v1.9.1