From 3bc13fee2122079839a8ae9d93f9e5c01daf59d2 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.14>
Date: 星期三, 28 十一月 2018 15:35:35 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/control.jsp | 61 +++++++++++++++++++++++++++++-
1 files changed, 59 insertions(+), 2 deletions(-)
diff --git a/gx_tieta/WebRoot/control.jsp b/gx_tieta/WebRoot/control.jsp
index 865aa6c..423c39b 100644
--- a/gx_tieta/WebRoot/control.jsp
+++ b/gx_tieta/WebRoot/control.jsp
@@ -1074,14 +1074,16 @@
<div class="popup-title"><span>鐢垫睜鍙傛暟璁剧疆</span> <a href="javascript:;" class="close">X</a></div>
<div class="popup-content">
<div class="popup-tbl">
+ <input type="hidden" id="battInfo_dev_id" value=""> <!-- dev_id -->
+ <input type="hidden" id="battInfo_ip" value=""> <!-- IP鍦板潃 -->
<table>
<tbody>
<tr>
- <th>鏈烘埧ID</th>
+ <th>璁惧ID</th>
<th>鏈烘埧鍚嶇О</th>
</tr>
<tr>
- <td><input type="text" id="battInfo_home_id" readonly="readonly" value=""></td>
+ <td><input type="text" id="battInfo_fbs_id" readonly="readonly" value=""></td>
<td><input type="text" id="battInfo_home_name" readonly="readonly" value=""></td>
</tr>
<tr>
@@ -1247,6 +1249,7 @@
<script type="text/javascript" src="js/dischargetest/bts.js"></script>
<script type="text/javascript" src="js/dischargetest/4016.js"></script>
<script type="text/javascript" src="js/dischargetest/sysData.js"></script>
+ <script type="text/javascript" src="js/dischargetest/battData.js"></script>
<script type="text/javascript" src="pages/js/pages/control-common.js"></script>
<script type="text/javascript" src="pages/js/pages/siderbar.js"></script>
<script type="text/javascript" src="js/rightmenu.js"></script>
@@ -5146,9 +5149,63 @@
// 鐢垫睜鍙傛暟
+ var battCMD = GLOBAL.CMD.batt; // cmd鍛戒护
+ var battPopup = GLOBAL.battInfoPopup; // 鐢垫睜鍙傛暟妯″潡
$('#battInfoBtn').click(function() {
+ var batt = getBatt();
+ // console.log(batt);
+ var temp = {
+ dev_id: batt.FBSDeviceId
+ };
+
+ // 鏌ヨ鐢垫睜鍙傛暟闈㈡澘淇℃伅
+ var load = layer.load(1);
+ battPopup.search(temp, batt, function(res, binf) {
+ layer.close(load);
+ // console.log(res);
+ });
battInfo_popup.showPopup(); // 鏄剧ずbattInfo_popup寮瑰嚭妗嗗拰閬僵灞�
});
+
+ // 鐐瑰嚮璁惧畾
+ $('#battInfo_en').click(function() {
+ // 璁剧疆鐢垫睜鍙傛暟闈㈡澘淇℃伅
+ var load = layer.load(1);
+ battPopup.set(function(res) {
+ layer.close(load);
+ layer.msg(res.msg);
+ });
+ });
+
+ // 鐐瑰嚮璇诲彇
+ $('#battInfo_read').click(function() {
+ // 璁剧疆鐢垫睜鍙傛暟闈㈡澘淇℃伅
+ var load = layer.load(1);
+ battPopup.read(function(res) {
+ layer.close(load);
+ layer.msg('鑾峰彇鍙傛暟鎴愬姛');
+ });
+ });
+
+ // 鏌ヨ鐢垫睜鍙傛暟鐨勫��
+ function searchBattInfo(temp, binf) {
+ var load = layer.load(1);
+ // 鏌ヨ鐢垫睜鍙傛暟
+ $.ajax({
+ type: 'post'
+ ,async: true
+ ,url:'Fbs9100_battparamAction_action_serchByCondition'
+ ,data: 'json='+JSON.stringify(temp)
+ ,dataType: 'json'
+ ,success: function(res) {
+ var rs = JSON.parse(res.result);
+ console.log(rs);
+ }
+ ,complete: function() {
+ layer.close(load);
+ }
+ });
+ }
});
// 鏈哄巻鍗℃ā鍧�
--
Gitblit v1.9.1