From d8dcf52cb8527f77e833956b6fea9dcb4bb6a708 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期三, 28 十一月 2018 15:06:15 +0800
Subject: [PATCH] 电池参数设置
---
gx_tieta/WebRoot/control.jsp | 61 ++++++++++++++
gx_tieta/WebRoot/js/dischargetest/battData.js | 146 ++++++++++++++++++++++++++++++++++++
gx_tieta/WebRoot/pages/js/common.js | 5 +
3 files changed, 210 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);
+ }
+ });
+ }
});
// 鏈哄巻鍗℃ā鍧�
diff --git a/gx_tieta/WebRoot/js/dischargetest/battData.js b/gx_tieta/WebRoot/js/dischargetest/battData.js
new file mode 100644
index 0000000..28bfd63
--- /dev/null
+++ b/gx_tieta/WebRoot/js/dischargetest/battData.js
@@ -0,0 +1,146 @@
+// 璁剧疆鐢垫睜鍙傛暟
+;(function($, window, document, gl, undefined) {
+ // 璁剧疆battInfoPopup
+ gl.namespace('battInfoPopup');
+ // 妯″潡渚濊禆GLOBAL.CMD.batt妯″潡
+ var cmd = GLOBAL.CMD.batt;
+ // 鏌ヨ鏈烘埧鐨勪俊鎭�
+ function search(temp, binf, callback) {
+ // 鏌ヨ鐢垫睜鍙傛暟
+ $.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);
+
+ // 璁剧疆闈㈡澘淇℃伅
+ setParam(rs, binf);
+ if(isFunction(callback)) {
+ callback(rs, binf);
+ }
+ }
+ });
+ }
+
+ // 灏唖earch娣诲姞鍒癰attInfoPopup鍛藉悕绌洪棿涓�
+ gl.battInfoPopup.search = search;
+
+ // 璇诲彇淇℃伅
+ function read(callback) {
+ var param = getParam();
+ param.num = cmd.get;
+ //console.log(param);
+ //return;
+
+ // 璇诲彇鐢垫睜鍙傛暟
+ $.ajax({
+ type: 'post'
+ ,async: true
+ ,url:'Fbs9100_battparamAction_action_update'
+ ,data: 'json='+JSON.stringify(param)
+ ,dataType: 'json'
+ ,success: function(res) {
+ var rs = JSON.parse(res.result);
+ // console.log(rs);
+ // 鏍规嵁璇诲彇鍒扮殑淇℃伅璁剧疆闈㈡澘鐨勪俊鎭�
+ //setParam(rs);
+
+ // 鍥炶皟鍐呭
+ if(isFunction(callback)) {
+ callback(rs);
+ }
+ }
+ });
+ }
+
+ // 灏唕ead娣诲姞鍒癰attInfoPopup鍛藉悕绌洪棿涓�
+ gl.battInfoPopup.read = read;
+
+ // 璁剧疆鏈烘埧鐢垫睜鐨勪俊鎭�
+ function set(callback) {
+ var param = getParam();
+ //console.log(param);
+ //return;
+ // 璁剧疆鐢垫睜鍙傛暟
+ $.ajax({
+ type: 'post'
+ ,async: true
+ ,url:'Fbs9100_battparamAction_action_update'
+ ,data: 'json='+JSON.stringify(param)
+ ,dataType: 'json'
+ ,success: function(res) {
+ var rs = JSON.parse(res.result);
+
+ // 鍥炶皟鍐呭
+ if(isFunction(callback)) {
+ callback(rs);
+ }
+ }
+ });
+ }
+
+ // 灏唖et娣诲姞鍒癰attInfoPopup鍛藉悕绌洪棿涓�
+ gl.battInfoPopup.set = set;
+
+ // 璁剧疆闈㈡澘鐨勬暟鎹�
+ function setParam(res, binf) {
+ if(binf) {
+ $('#battInfo_dev_id').val(binf.FBSDeviceId); // 璁惧鐨刬d
+ $('#battInfo_ip').val(binf.StationIp); // 璁惧鐨刬p
+ $('#battInfo_fbs_id').val(binf.FBSDeviceId); // 璁惧鐨刬d
+ $('#battInfo_home_name').val(binf.StationName); // 鏈烘埧鐨勫悕绉�
+ }
+ if(res.code == 0) {
+ $('#battInfo_nom_cap').val(1); // 鐢垫睜鏍囩О瀹归噺(AH)
+ $('#battInfo_nom_res').val(1); // 鐢垫睜鏍囩О鍐呴樆(u惟)
+ $('#battInfo_batt_num').val(1); // 鐢垫睜缁勬暟
+ $('#battInfo_batt_mon_num').val(1); // 姣忕粍鐢垫睜鍗曚綋鏁伴噺
+ $('#battInfo_batt_nom_vol').val(0); // 鍗曚綋鏍囩О鐢靛帇锛圴锛�
+ $('#battInfo_group_nom_vol').val(0);// 鐢垫睜缁勭鏍囩О鐢靛帇锛圴锛�
+ $('#battInfo_batt_nom_temp').val(0);// 鐢垫睜鏍囩О娓╁害锛堚剝锛�
+ $('#battInfo_batt_float_vol').val(0);// 鐢垫睜娴厖鐢靛帇闃�鍊硷紙V锛�
+ $('#battInfo_batt_float_curr').val(0);// 鐢垫睜娴厖鐢垫祦闃�鍊硷紙A锛�
+ $('#battInfo_online_low_vol').val(0); // 鍦ㄧ嚎鐢靛帇浣庨榾鍊硷紙V锛�
+ $('#battInfo_batt_link_type').val(1); // 鐢垫睜缁勮繛鎺ョ被鍨�
+ }else {
+ var data = res.data[0];
+ $('#battInfo_nom_cap').val(data.STD_CAP); // 鐢垫睜鏍囩О瀹归噺(AH)
+ $('#battInfo_nom_res').val(data.STD_RES); // 鐢垫睜鏍囩О鍐呴樆(u惟)
+ $('#battInfo_batt_num').val(data.BattGroupCount); // 鐢垫睜缁勬暟
+ $('#battInfo_batt_mon_num').val(data.EachGroupBattCount); // 姣忕粍鐢垫睜鍗曚綋鏁伴噺
+ $('#battInfo_batt_nom_vol').val(data.MonomerVol); // 鍗曚綋鏍囩О鐢靛帇锛圴锛�
+ $('#battInfo_group_nom_vol').val(data.GroupVol);// 鐢垫睜缁勭鏍囩О鐢靛帇锛圴锛�
+ $('#battInfo_batt_nom_temp').val(data.BattTemp);// 鐢垫睜鏍囩О娓╁害锛堚剝锛�
+ $('#battInfo_batt_float_vol').val(data.FloatChargeVol);// 鐢垫睜娴厖鐢靛帇闃�鍊硷紙V锛�
+ $('#battInfo_batt_float_curr').val(data.FloatChargeCurr);// 鐢垫睜娴厖鐢垫祦闃�鍊硷紙A锛�
+ $('#battInfo_online_low_vol').val(data.OnlineVolLow); // 鍦ㄧ嚎鐢靛帇浣庨榾鍊硷紙V锛�
+ $('#battInfo_batt_link_type').val(data.GroupConnType); // 鐢垫睜缁勮繛鎺ョ被鍨�
+
+ }
+
+
+ }
+
+ // 鑾峰彇闈㈡澘涓殑淇℃伅
+ function getParam() {
+ var rs = {};
+ rs.dev_ip = $('#battInfo_ip').val(); // 璁惧鐨刬p
+ rs.dev_id = $('#battInfo_dev_id').val(); // 璁惧鐨刬d
+ rs.num = cmd.set; // 璁剧疆鐨勫懡鍚�
+ rs.STD_CAP = $('#battInfo_nom_cap').val(); // 鐢垫睜鏍囩О瀹归噺(AH)
+ rs.STD_RES = $('#battInfo_nom_res').val(); // 鐢垫睜鏍囩О鍐呴樆(u惟)
+ rs.BattGroupCount = $('#battInfo_batt_num').val(); // 鐢垫睜缁勬暟
+ rs.EachGroupBattCount = $('#battInfo_batt_mon_num').val(); // 姣忕粍鐢垫睜鍗曚綋鏁伴噺
+ rs.MonomerVol = $('#battInfo_batt_nom_vol').val(); // 鍗曚綋鏍囩О鐢靛帇锛圴锛�
+ rs.GroupVol = $('#battInfo_group_nom_vol').val(); // 鐢垫睜缁勭鏍囩О鐢靛帇锛圴锛�
+ rs.BattTemp = $('#battInfo_batt_nom_temp').val(); // 鐢垫睜鏍囩О娓╁害锛堚剝锛�
+ rs.FloatChargeVol = $('#battInfo_batt_float_vol').val(); // 鐢垫睜娴厖鐢靛帇闃�鍊硷紙V锛�
+ rs.FloatChargeCurr = $('#battInfo_batt_float_curr').val(); // 鐢垫睜娴厖鐢垫祦闃�鍊硷紙A锛�
+ rs.OnlineVolLow = $('#battInfo_online_low_vol').val(); // 鍦ㄧ嚎鐢靛帇浣庨榾鍊硷紙V锛�
+ rs.GroupConnType = $('#battInfo_batt_link_type').val(); // 鐢垫睜缁勮繛鎺ョ被鍨�
+ return rs;
+ }
+})(jQuery, window, document, GLOBAL);
\ No newline at end of file
diff --git a/gx_tieta/WebRoot/pages/js/common.js b/gx_tieta/WebRoot/pages/js/common.js
index d9071ea..6587c43 100644
--- a/gx_tieta/WebRoot/pages/js/common.js
+++ b/gx_tieta/WebRoot/pages/js/common.js
@@ -465,6 +465,11 @@
gl.CMD.gprs.param = 145;
gl.CMD.gprs.signal = "CSQ";
gl.CMD.gprs.threadinfo = 0x17;
+
+ // CMD涓媌att
+ gl.namespace('CMD.batt');
+ gl.CMD.batt.get = 0x36; // 鑾峰彇鐢垫睜鍙傛暟
+ gl.CMD.batt.set = 0x37; // 璁剧疆鐢垫睜鍙傛暟
})(jQuery, window, document, GLOBAL);
// 鍦板浘淇℃伅
--
Gitblit v1.9.1