From b4d8cb69ff3a3d35a10a7e5c487ff683b31cc9f1 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 24 二月 2023 10:06:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
management/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriver_info.js | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/management/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriver_info.js b/management/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriver_info.js
index fd5ba96..00f7f6c 100644
--- a/management/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriver_info.js
+++ b/management/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriver_info.js
@@ -40,6 +40,10 @@
parent.layer.close(window.parent.TDriver.layerIndex);
}
+TDriverInfoDlg.closeException = function() {
+ parent.layer.close(window.parent.TDriverException.layerIndex);
+}
+
/**
* 收集数据
*/
@@ -72,6 +76,8 @@
.set('serverStatus')
.set('integral')
.set('status')
+ .set('area')
+ .set('areaId')
.set('createTime');
}
--
Gitblit v1.7.1