~whychwj/haha.git

			@@ -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() {
			// 初始化LD9充放电弹出框
			@@ -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});
			});
			});




			//给GPRS发送指定的命令，获取AT返回值
			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);
			}
			});
			}
			});

			// 机历卡模块