From 12c384847af42270e2ba167467173a928a59ded2 Mon Sep 17 00:00:00 2001
From: didiyu <1293722656@qq.com>
Date: 星期四, 29 十一月 2018 10:05:03 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://didiyu@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/control.jsp | 199 ++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 184 insertions(+), 15 deletions(-)
diff --git a/gx_tieta/WebRoot/control.jsp b/gx_tieta/WebRoot/control.jsp
index 5e1f4ce..bffa62a 100644
--- a/gx_tieta/WebRoot/control.jsp
+++ b/gx_tieta/WebRoot/control.jsp
@@ -252,7 +252,12 @@
<br>
<a href="javascript:void(0);" id="stopTest" class="whyc-btn whyc-btn-disabled" id="specialGraphExport">
<span class="whyc-btn-icon fa fa-stop-circle"></span>
- <span class="whyc-btn-txt" id="stopTestBtn">鍋滄娴嬭瘯</span>
+ <span class="whyc-btn-txt">鍋滄娴嬭瘯</span>
+ </a>
+ <br>
+ <a href="javascript:void(0);" id="battInfoBtn" class="whyc-btn whyc-btn-disabled" id="specialGraphExport">
+ <span class="whyc-btn-icon fa fa-battery-full"></span>
+ <span class="whyc-btn-txt">鐢垫睜鍙傛暟</span>
</a>
<br>
<a href="javascript:void(0);" id="sysSet" class="whyc-btn whyc-btn-disabled" id="specialGraphExport">
@@ -1064,6 +1069,78 @@
<input type="button" name="" id="sysSet_en" class="status-change-set " value="璁剧疆" >
</div>
</div>
+ <!-- 鐢垫睜鍙傛暟 -->
+ <div class="popup" id="battInfo_popup">
+ <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>鏈烘埧鍚嶇О</th>
+ </tr>
+ <tr>
+ <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>
+ <th>鐢垫睜鏍囩О瀹归噺锛�1~6000.0AH锛�</th>
+ <th>鐢垫睜鏍囩О鍐呴樆锛�1~60000u惟锛�</th>
+ </tr>
+ <tr>
+ <td><input type="text" id="battInfo_nom_cap" value=""></td>
+ <td><input type="text" id="battInfo_nom_res" value=""></td>
+ </tr>
+ <tr>
+ <th>鐢垫睜缁勬暟锛�1~2锛�</th>
+ <th>姣忕粍鐢垫睜鍗曚綋鏁伴噺锛�1~300 锛�</th>
+ </tr>
+ <tr>
+ <td><input type="text" id="battInfo_batt_num" value=""></td>
+ <td><input type="text" id="battInfo_batt_mon_num" value=""></td>
+ </tr>
+ <tr>
+ <th>鍗曚綋鏍囩О鐢靛帇锛�0.1~20.0V锛�</th>
+ <th>鐢垫睜缁勭鏍囩О鐢靛帇锛�0.1~600.0V锛�</th>
+ </tr>
+ <tr>
+ <td><input type="text" id="battInfo_batt_nom_vol" value=""></td>
+ <td><input type="text" id="battInfo_group_nom_vol" value=""></td>
+ </tr>
+ <tr>
+ <th>鐢垫睜鏍囩О娓╁害锛�0.1~60.0鈩冿級</th>
+ <th>鐢垫睜娴厖鐢靛帇闃�鍊硷紙0.1~60.0V锛�</th>
+ </tr>
+ <tr>
+ <td><input type="text" id="battInfo_batt_nom_temp" value=""></td>
+ <td><input type="text" id="battInfo_batt_float_vol" value=""></td>
+ </tr>
+ <tr>
+ <th>鐢垫睜娴厖鐢垫祦闃�鍊硷紙0.1~30.0A锛�</th>
+ <th>鍦ㄧ嚎鐢靛帇浣庨榾鍊硷紙0.1~60.0V锛�</th>
+ </tr>
+ <tr>
+ <td><input type="text" id="battInfo_batt_float_curr" value=""></td>
+ <td><input type="text" id="battInfo_online_low_vol" value=""></td>
+ </tr>
+ <tr>
+ <th>鐢垫睜缁勮繛鎺ョ被鍨�(0~1)</th>
+ </tr>
+ <tr>
+ <td><input type="text" id="battInfo_batt_link_type" value=""></td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ </div>
+ <div class="popup-footer">
+ <input type="button" name="" id="battInfo_read" value="璇诲彇" >
+ <input type="button" name="" id="battInfo_en" class="status-change-set whyc-btn-disabled" value="璁剧疆" >
+ </div>
+ </div>
<!-- 鍗曚綋鏇茬嚎 -->
<div class="popup w960 mr480x" id="monLineGraphPopup">
@@ -1172,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>
@@ -1260,6 +1338,7 @@
var equip4016_popup = new Popup($('#equip4016'));
var sysSet_popup = new Popup($('#sysSet_popup'));
var localNav = new Popup($('#localNav'));
+ var battInfo_popup = new Popup($('#battInfo_popup'));
// 鍏呮斁鐢靛脊鍑烘璁剧疆
$(function() {
// 鍒濆鍖朙D9鍏呮斁鐢靛脊鍑烘
@@ -1291,6 +1370,12 @@
$('#sysSet_popup').find('.close').bind('click', function() {
sysSet_popup.hidePopup(); // 闅愯棌sysSet_popup寮瑰嚭妗嗗拰閬僵灞�
});
+
+ // 璁剧疆鐢垫睜鍙傛暟
+ $('#battInfo_popup').find('.close').bind('click', function() {
+ battInfo_popup.hidePopup(); // 闅愯棌battInfo_popup寮瑰嚭妗嗗拰閬僵灞�
+ });
+
// bts闈㈡澘鍏呯數鐢垫祦缂栬緫
$('#ChargeCurrSetLabel .fa-edit').click(function() {
@@ -1364,6 +1449,7 @@
equip4016_popup.hidePopup(); // 闅愯棌4016寮瑰嚭妗嗗拰閬僵灞�
localNav.hidePopup();
sysSet_popup.hidePopup(); // 闅愯棌sysSet_popup寮瑰嚭妗嗗拰閬僵灞�
+ battInfo_popup.hidePopup(); // 闅愯棌battInfo_popup寮瑰嚭妗嗗拰閬僵灞�
});
});
//鍒濆鍖栨煴鐘跺浘
@@ -4983,17 +5069,19 @@
// 鐐瑰嚮璁惧杩涚▼鎸夐挳
$('#threadInfo').click(function() {
- console.log(threadInfoSearch);
+ // console.log(threadInfoSearch);
+ var batt = getBatt();
+ //console.log(batt);
+ threadInfoSearch.dev_id = batt.FBSDeviceId;
SendDeviceThreadInfo(threadInfoSearch,function(data){
- searchDeviceThreadInfo({dev_id:910000001});
+ searchDeviceThreadInfo({dev_id: threadInfoSearch.dev_id});
});
});
-
-
-
//缁橤PRS鍙戦�佹寚瀹氱殑鍛戒护锛岃幏鍙朅T杩斿洖鍊�
+ var threadInfoLoad;
function SendDeviceThreadInfo(param,callback){
+ threadInfoLoad = layer.load(1);
$.ajax({
type:"post",
url: "Bts_gprs_stateAction_action_update_bts_task_inf",
@@ -5027,16 +5115,21 @@
async:true,
dataType:'json',
data:'json='+JSON.stringify(param),
- success: function(data){
+ success: function(data){
+ layer.close(threadInfoLoad);
var model = eval('('+data.result+')');
- console.info(model);
- var btsTaskInf = model.data[0].bts_task_inf;
- layer.open({
- title: '璁惧杩涚▼',
- width: 380,
- height: 450,
- content: '<pre>'+btsTaskInf+'</pre>'
- });
+ if(model.code == 1) {
+ var btsTaskInf = model.data[0].bts_task_inf;
+ layer.open({
+ title: '璁惧杩涚▼',
+ width: 380,
+ height: 450,
+ content: '<pre>'+btsTaskInf+'</pre>'
+ });
+ }else {
+ layer.msg('鏌ヨ澶辫触');
+ }
+
if(callback && typeof callback == 'function'){
callback(model);
@@ -5054,6 +5147,82 @@
});
}
+
+ // 鐢垫睜鍙傛暟
+ var battCMD = GLOBAL.CMD.batt; // cmd鍛戒护
+ var battPopup = GLOBAL.battInfoPopup; // 鐢垫睜鍙傛暟妯″潡
+ battPopup.testVal(); // 璁剧疆闈㈡澘鐨勫彇鍊艰寖鍥�
+ $('#battInfoBtn').click(function() {
+ // 鑾峰彇鐢垫睜淇℃伅
+ var batt = getBatt();
+ var temp = {
+ dev_id: batt.FBSDeviceId
+ };
+
+ // 鏌ヨ鐢垫睜鍙傛暟闈㈡澘淇℃伅
+ var load = layer.load(1);
+ battPopup.search(temp, batt, function(res, binf) {
+ layer.close(load);
+ battInfo_popup.showPopup(); // 鏄剧ずbattInfo_popup寮瑰嚭妗嗗拰閬僵灞�
+ });
+
+ });
+
+ // 鐐瑰嚮璁惧畾
+ $('#battInfo_en').click(function() {
+ if($(this).hasClass('whyc-btn-disabled')) {
+ return;
+ }
+ // 璁剧疆鐢垫睜鍙傛暟闈㈡澘淇℃伅
+ var load = layer.load(1);
+ battPopup.set(function(res) {
+ layer.close(load);
+ layer.msg(res.msg);
+ });
+ });
+
+ // 鐐瑰嚮璇诲彇
+ $('#battInfo_read').click(function() {
+ var batt = getBatt();
+ var temp = {
+ dev_id: batt.FBSDeviceId
+ };
+ // 璁剧疆鐢垫睜鍙傛暟闈㈡澘淇℃伅
+ var load = layer.load(1);
+ battPopup.read(function(res) {
+ layer.close(load);
+ // console.log(res);
+ if(res.code == 1) {
+ battPopup.search(temp, batt, function(res, binf) {
+ layer.close(load);
+ layer.msg('鑾峰彇鍙傛暟鎴愬姛');
+ });
+ }else {
+ 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