~whychwj/haha.git

			@@ -235,7 +235,7 @@
			<div class="tools-btn">
			<a href="javascript:void(0);" id="setParamBtn" class="whyc-btn whyc-btn-disabled" id="specialGraphExport">
			<span class="whyc-btn-icon fa fa-play-circle"></span>
			<span class="whyc-btn-txt">启动核容测试</span>
			<span class="whyc-btn-txt">核容测试</span>
			</a>
			<br>
			<a href="javascript:void(0);" id="stopTest" class="whyc-btn whyc-btn-disabled" id="specialGraphExport">
			@@ -1130,6 +1130,8 @@
			<!-- 整体的遮罩层 -->
			<div id="allShade"></div>
			<div class="clear"></div>
			<!-- 引入layui框架 -->
			<script type="text/javascript" src="src/layui.all.js"></script>
			<script type="text/javascript" src="pages/js/common.js"></script>
			<script type="text/javascript" src="js/jquery.bigcolorpicker.min.js"></script>
			<script type="text/javascript" src="jqueryui/jquery-ui.js"></script>
			@@ -1152,8 +1154,6 @@
			<!-- 引入电路图 -->
			<script type="text/javascript" src="js/elecircle.js"></script>
			<script type="text/javascript" src="js/elecircle.content.js"></script>
			<!-- 引入layui框架 -->
			<script type="text/javascript" src="src/layui.all.js"></script>
			<script type="text/javascript">
			var permits;
			<% Object obj=session.getAttribute("permits");
			@@ -1780,6 +1780,7 @@
			var model = eval("("+data.result+")");
			//console.log(model);


			var outTime = 2*60; //设备超时时间(2分钟)
			var isOutTime = true; //通讯中断判断设备是否通讯中断 true:中断 false:正常
			var batt = getBatt(); //获取当前选中的电池组
			@@ -1794,6 +1795,14 @@
			//console.log(mygraph);
			//debugger;
			if(model.code == 1) {
			var _data = model.data[0];

			var alarmstates = GLOBAL.BTS9100.alarmstates;
			var lastStopReason = getStateFromIndex(_data.dev_last_captest_stop_type,alarmstates);
			//console.info("上一次核容测试停止原因："+lastStopReason);
			//console.info("通信计数："+_data.dev_commcount);
			//console.info("通信丢包率："+(_data.dev_commcount==0?0:(_data.dev_errcommcount*100/_data.dev_commcount)));

			var nowTime = new Date().getTime(); //当前时间
			var record = new Date(model.data[0].record_datetime).getTime();

			@@ -3030,7 +3039,8 @@
			var city = batt.StationName2;
			var county = batt.StationName5;
			var home = batt.StationName;
			$(this).attr('href', 'charge-test.jsp?province='+province+'&city='+city+'&county='+county+'&home='+home);
			var homeid = batt.BattGroupId;
			$(this).attr('href', 'charge-test.jsp?province='+province+'&city='+city+'&county='+county+'&home='+home+'&homeid='+homeid);
			});
			});

			@@ -3129,9 +3139,7 @@
			function targetBattReport(){
			var batt = getBatt();
			var url = skipUrl("eleAnalyse.jsp",batt.StationName1,batt.StationName2,batt.StationName5,batt.StationName,batt.BattGroupId);
			//console.info(url);
			window.open(url);
			//window.open("eleAnalyse.jsp?battgroupId="+BattGroupId+"&stationId="+batt.StationId);
			}
			// 使用jquery实现左导航的显示和隐藏
			$(document).ready(function(){
			@@ -3449,9 +3457,11 @@
			});
			}
			// 根据设备信息显示对应电路拓扑图

			function updateEleCircle(batt, data, mygraph) {
			var status = GLOBAL.circleStatus.status;
			//console.info(status);
			var e61850Opts = GLOBAL.circleStatus.e61850Opts;
			var btsOpts = GLOBAL.circleStatus.btsOpts;
			// 初始化二级管
			changeEleCircleOpt(eleCircle, 'diode', {
			isShowValue: false,
			@@ -3469,7 +3479,7 @@
			// 拓扑图图标
			changeEleCircleOpt(eleCircle, 'DCDC1', {statusImg:-1}); // 放电单元
			changeEleCircleOpt(eleCircle, 'DCDC2', {statusImg:-1}); // 充电单元

			console.log(data);
			// 没有形参就不做任何操作
			if(data == undefined) {
			status.hide();
			@@ -3480,6 +3490,7 @@
			if(regEquipType(data.dev_id, globalPattern.equip61850)) {
			//console.info(data);
			var alarms = data.dev_61850alarms.split(',');
			status.setOpts(e61850Opts);
			status.show();
			//alarms = ['true', 'false', 'true', 'true'];
			// 设置二级管的导通压降
			@@ -3520,7 +3531,31 @@
			// 拓扑图图标
			changeEleCircleOpt(eleCircle, 'DCDC1', {statusImg:mygraph.graphtype}); // 放电单元
			changeEleCircleOpt(eleCircle, 'DCDC2', {statusImg:mygraph.graphtype}); // 充电单元
			}else {
			}else if(regEquipType(data.dev_id, globalPattern.BTS)){ // 判断如果是BTS9100的设备
			// 设置状态的配置项
			status.setOpts(btsOpts);

			// 工作状态
			status.setStatus('workstatus', data.dev_workstate);

			// 设置核容停止原因
			if(data.dev_workstate == 2) {
			status.setStatus('stop', 99);
			}else {
			status.setStatus('stop', data.dev_last_captest_stop_type);
			}

			// 设置通信计数
			status.setText('count', "通信计数："+data.dev_commcount);

			// 设置丢包率
			var errorCount = data.dev_errcommcount;
			var allCount = data.dev_commcount+errorCount;
			var percent= (allCount==0?0:errorCount/allCount*100).toFixed(3);
			status.setText('percent', "通信丢包率："+percent+'%');

			status.show();
			}else{
			status.hide();
			}
			}
			@@ -4498,16 +4533,18 @@
			$('#sysSet_read').click(function() {
			var batt = getBatt();
			var temp = {
			dev_id:batt.FBSDeviceId
			dev_id:batt.FBSDeviceId,
			num: sysCMD.get
			};
			searchSysData(temp, true);
			});

			// 点击设置系统参数
			// 点击系统参数按钮
			$('#sysSet').click(function() {
			var batt = getBatt();
			var temp = {
			dev_id:batt.FBSDeviceId
			dev_id:batt.FBSDeviceId,
			num: sysCMD.get
			};
			searchSysData(temp);
			});
			@@ -4534,7 +4571,7 @@
			var batt = getBatt();
			var temp = {
			dev_id: batt.FBSDeviceId,
			cmd: sysCMD.restart
			num: sysCMD.restart
			};

			/* console.log(temp);
			@@ -4665,8 +4702,8 @@
			$('#sysSet_endur').val(data.GroupVolRange); // 总续航时间
			$('#sysSet_firTime').val(data.GroupVolSorce); // 保一次下电续航时间
			$('#sysSet_range').val(data.CurrentRange); // 电流钳量程
			$('#sysSet_firVol').val(data.CurrentTyte); // 一次下电电压
			$('#sysSet_secVol').val(data.MonomerOrder); // 二次下电电压
			$('#sysSet_firVol').val(data.CurrentTyte/10); // 一次下电电压
			$('#sysSet_secVol').val(data.MonomerOrder/10); // 二次下电电压
			$('#sysSet_dcdc').val(data.LoaderCount); // DCDC模块数量
			$('#sysSet_sourceStyle').val(data.DtCardCount); // 单体数据来源类型
			$('#sysSet_bleedNum').val(data.POF_BG_Boost_Cnt); // 停电升压榨干电池数量
			@@ -4708,8 +4745,8 @@
			GroupVolRange: endur,
			GroupVolSorce: firTime,
			CurrentRange: range,
			CurrentTyte: firVol,
			MonomerOrder: secVol,
			CurrentTyte: firVol*10,
			MonomerOrder: secVol*10,
			LoaderCount: dcdc,
			DtCardCount: sourceStyle,
			POF_BG_Boost_Cnt:bleedNum,
			@@ -4735,8 +4772,10 @@
			$('#signalBtn').click(function() {
			var batt = getBatt();
			signalSearch.dev_id = batt.FBSDeviceId;
			var load = layer.load(1);
			// 请求后台获取信号的质量
			searchStationSignal(signalSearch,function(data){
			layer.close(load);
			// 基础配置
			var signalOpts = {
			img: signalBad,
			@@ -4809,7 +4848,14 @@
			dev_id:910000577
			};


			//根据索引获取状态
			function getStateFromIndex(index,statearr){
			var state = '无';
			if(index>0 && statearr && statearr.length>index){
			state = statearr[index];
			}
			return state;
			}

			/* searchStationSignal(temp,function(data){
			changeEleCircleOpt(eleCircle, 'signal', {