修复位置显示bug

hdw

2018-11-15 0c414c8027c6b3a91a0bc44f9ca99d1ed1b04ca6

 gx_tieta/WebRoot/control.jsp

@@ -28,7 +28,6 @@
   <!-- <link rel="stylesheet" type="text/css" href="pages/css/mylayui.css"> -->

   <script type="text/javascript" src="js/echarts.js"></script>

   <script type="text/javascript" src="js/jquery-1.8.3.js"></script>

   <script type="text/javascript" src="js/base.js"></script>

   <script type="text/javascript" src="js/right-menu.js"></script>

   <style>

      body {

@@ -235,7 +234,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 +1129,10 @@
   <!-- 整体的遮罩层 -->

   <div id="allShade"></div>

   <div class="clear"></div>

   <!-- iframe数据临时存储位置 -->

   <div id="homeInfoIframeData"></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>

@@ -1149,11 +1152,10 @@
   <script type="text/javascript" src="js/dischargetest/sysData.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>

   <!-- 引入电路图 -->

   <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");

@@ -1216,7 +1218,7 @@
      // 设置页面权限模块

      $(function() {

         var testOp = checkUserPermit(permits, 'batt_test_op_permit');

         console.log(testOp);

         //console.log(testOp);

         if(!testOp) {

            $(".ele-circle .tools-btn").remove();

         }

@@ -1760,6 +1762,8 @@
         searchDevStatusByDev_id();

         findrtstate();

         findrtdata();

         //查询设备的dcdc状态

         searchDevDcDcState();

      }

      

      //根据设备id查询设备当前的开关状态

@@ -1780,6 +1784,7 @@
               var model = eval("("+data.result+")");

               //console.log(model);

               

					
               var outTime = 2*60;            //设备超时时间(2分钟)

               var isOutTime = true;         //通讯中断      判断设备是否通讯中断    true:中断    false:正常

               var batt = getBatt();         //获取当前选中的电池组

@@ -1794,6 +1799,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 +3043,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 battid = batt.BattGroupId;

            $(this).attr('href', 'charge-test.jsp?province='+province+'&city='+city+'&county='+county+'&home='+home+'&battid='+battid);

         });

      });

   

@@ -3129,9 +3143,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 +3461,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,10 +3483,20 @@
         // 拓扑图图标

         changeEleCircleOpt(eleCircle, 'DCDC1', {statusImg:-1});   // 放电单元

         changeEleCircleOpt(eleCircle, 'DCDC2', {statusImg:-1});   // 充电单元

			
         //console.log(data);

         // 没有形参就不做任何操作

         if(data == undefined) {

            status.hide();

            var opts = [{

               name: 'none',

               type: 'text',

               status: 0,

               notShow: false,

               content: {

                  text:'设备状态：<span class="red">未连接</span>'

               }

            }];

            status.setOpts(opts);

            //status.hide();

            return false;   // 结束函数

         }

         

@@ -3480,6 +3504,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'];

            // 设置二级管的导通压降

@@ -3507,6 +3532,7 @@
            status.setStatus('msg', isLink);

            // 设置温度信息

            status.setStatus('tmp', alarms[2] == 'true'?0:1);

				
            // 设置核容停止原因

            if(data.dev_workstate == 2) {

               status.setStatus('stop', 99);

@@ -3520,7 +3546,27 @@
            // 拓扑图图标

            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);

				
            // 设置核容停止原因

            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();

         }

      }

@@ -4308,6 +4354,8 @@
         // 电池组

         treeView.ele.on('click', '.eleGroup', function() {

            var eleGroup = $(this).data('attr');

            var status = GLOBAL.circleStatus.status;

            var btsOpts = GLOBAL.circleStatus.btsOpts;

            // 根据BattGroupId查询数据

            if(BattGroupId != eleGroup.BattGroupId) {

               BattGroupId = eleGroup.BattGroupId;

@@ -4333,7 +4381,7 @@
               // 负载电流

               var loadCurr = batt.Load_curr+'A';

               changeEleCircleOpt(eleCircle, 'loaderCurr', {name:'最大负载电流：'+loadCurr});

               changeEleCircleOpt(eleCircle, 'signal', {isShow:false});

					
               // 最大核容电流

               var disCurrMax = batt.DisCurrMax+'A';

               changeEleCircleOpt(eleCircle, 'disCurrMax', {name:'最大核容电流：'+disCurrMax});

@@ -4378,6 +4426,46 @@
         //全部收缩

         $('#all_hide').click(function(){

            treeView.ele.find('li').removeClass('sider-menu-open');

         });

			
         // 电路拓扑图右键菜单

         var menuItems = [

            {txt: '基站机历卡', cla: 'home-info-card'},

            {txt: '机房实时状态查询', cla: 'target', data:{target: 'batt-state-manage.jsp'}},

            {txt: '设备流量统计查询', cla: 'target', data:{target: 'batt-traffic-statistics1.jsp'}},

            {txt: '机房续航能力查询', cla: 'target', data: {target: 'batt-life-manage.jsp'}},

            {txt: '设备充放电模块状态', cla:'target', data: {target: 'equip-charge-param.jsp'}},

            {txt: '机房历史事件查询', cla:'target', data: {target: 'batt-state-statistical.jsp'}},

         ];

         // 给表格添加自己的右键菜单

         $('#contai').on('mousedown','.ele-circle canvas',function(e){

            var batt = getBatt();

            if (e.which == 3) {

               var disX = (e || event).clientX + 10;   //获取鼠标点击的横坐标

               var disY = (e || event).clientY + 10;   // 获取鼠标点击的纵坐标

					
               rightMenu.showMenu(menuItems, disX, disY);

            }

         });

			
         // 点击右键菜单跳转

         $('body').on('click', '#rightMenu .target', function() {

            var batt = getBatt();

            var pageName = $(this).data('data').target;

            var province = batt.StationName1;

            var city = batt.StationName2;

            var county = batt.StationName5;

            var home = batt.StationName;

            var battid = batt.BattGroupId;

            // 实现跳转

            window.open(skipUrl(pageName, province, city, county, home, battid));

         });

			
         // 点击基站机历卡

         $('body').on('click', '#rightMenu .home-info-card', function() {

            var batt = getBatt();

            // 显示基站机历卡

            showHomeInfo(batt.StationId);

         });

         

         // 工具条整体样式

@@ -4498,16 +4586,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 +4624,7 @@
                  var batt = getBatt();

                  var temp = {

                     dev_id: batt.FBSDeviceId,

                     cmd: sysCMD.restart

                     num: sysCMD.restart

                  };

                  

                  /* console.log(temp);

@@ -4665,8 +4755,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 +4798,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,

@@ -4734,9 +4824,14 @@
         // 点击查看当前信号的质量

         $('#signalBtn').click(function() {

            var batt = getBatt();

            var status = GLOBAL.circleStatus.status;

            var btsOpts = GLOBAL.circleStatus.btsOpts;

            //var btsOpts = GLOBAL.circleStatus.btsOpts;

            signalSearch.dev_id = batt.FBSDeviceId;

            var load = layer.load(1);

            // 请求后台获取信号的质量

            searchStationSignal(signalSearch,function(data){

               layer.close(load);

               // 基础配置

               var signalOpts = {

                  img: signalBad,

@@ -4757,7 +4852,9 @@
               

               // 图片描述

               signalOpts.name = '信号强度：'+signalInfo.signal;

               changeEleCircleOpt(eleCircle, 'signal', signalOpts);

					
               // 显示信号强度

               layer.msg(signalOpts.name, {time: 5000});

            });

            

         });

@@ -4774,11 +4871,17 @@
            if(testCsq) {

               rs.signal = RegExp.$1;

               rs.bitError = RegExp.$2;

               if(rs.signal>20) {

               if(rs.signal>25) {

                  rs.img = 1;

                  rs.signal += '（强）';

               }else if(rs.signal>19) {

                  rs.img = 1;

                  rs.signal += '（中）';

               }else {

                  rs.signal += '（弱）';

               }

            }

				
            //console.info(rs);

            return rs;

         }

      });

@@ -4809,7 +4912,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', {

@@ -4823,6 +4933,210 @@
         console.log(RegExp.$2);

         console.log(data.data.ack_inf);

      }); */

		
		
      //获取设备的dcdc状态

      function searchDevDcDcState(temp){

         var obj = getBatt();

         var temp = {

            dev_id: obj.FBSDeviceId	
         };

		
         $.ajax({

               type: "post",

               url: "Fbs9100s_dcdc_stateAction_action_serchByInfo",

               async: true,

               dataType: 'json',

               data: "json = " + JSON.stringify(temp),

               success: function(result) {

                   var rs = JSON.parse(result.result);

                   //console.info(rs);

                   if(rs.code == 1){

                      var dcdcWarn = '';

                      var data = rs.data;

                      for(var i=0; i<data.length; i++) {

                         var _data = data[i];

                         if(i ==  (data.length-1)) {

                            dcdcWarn += '0x'+_data.dcdc_SMR_Alarm1_16;

                         }else {

                            dcdcWarn += '0x'+_data.dcdc_SMR_Alarm1_16+'/';

                         }

                      }

	                
                      changeEleCircleOpt(eleCircle, 'dcdcWarn', {name: 'DCDC模块告警：'+dcdcWarn});

                   }else{

                      changeEleCircleOpt(eleCircle, 'dcdcWarn', {name: 'DCDC模块告警：未知'});   // 
                   }

               },

               error: function() {

	            	
               }

           });

      }

		
      // 显示机房信息

      function showHomeInfo(sid) {

         var temp = {

            StationId: sid

         };

			
         // 查询基站的信息

         $.ajax({

            type: 'post',

            async: true,

            url: 'BattInfAction!serchBattAllInfoByStationId',

            data: 'json='+JSON.stringify(temp),

            dataType: 'json',

            success: function(result) {

               var rs = JSON.parse(result.result);

               if(rs.code == 1) {

                  var data = rs.data;

                  //console.log(data);

                  var rsData = formatHomeInfo(data);

                  $('#homeInfoIframeData').data('data', rsData);

                  // 显示面板

                  layer.open({

                     type: 2,

                     title: '<i class="fa fa-home"></i>基站信息',

                     area: ['960px', '524px'],

                     fixed: false, //不固定

                     maxmin: true,

                     content: 'iframe/homeinfo.html'

                  });

               }else {

                  layer.msg('暂无基站信息！');

               }

					
            }

         });

      }

		
      // 格式化机房信息数据

      function formatHomeInfo(data) {

         var groupDefaults = {

            homeid: '',

            homename: '',

            homeip: '',

            groupid: '',

            groupname: '',

            ordernum: '',

            brand: '',

            model: '',

            monproperty: '',

            startusetime: '',

            chargecurr: '',

            chargevol: '',

            equipeinfo: '',

            person: ''

         };

			
         var homeDefaults = {

				
         };

         var rs = {

            tabc:[]

         };

         var tabc = rs.tabc;

         // 遍历data生成机房的值

         for(var i=0; i<data.length; i++) {

            var _data = data[i];

            var tmp = {};

            tmp.title = '电池组'+(i+1)+'信息';

            tmp.type = 'group';

            tmp.content = $.extend({}, groupDefaults);

            tmp.tshow = '';

               tmp.cshow = '';

            if(i==0) {

               tmp.tshow = 'layui-this';

                  tmp.cshow = 'layui-show';

            }

            // 设置content的值

            var content = tmp.content;

            content.homeid = _data.StationId;             // 机房id

            content.homename = _data.StationName;         // 机房名称

            content.homeip = _data.StationIp;            // 机房ip

            content.groupid = _data.BattGroupId;         // 电池组id

            content.groupname = _data.BattGroupName;      // 电池组名称

            content.ordernum = _data.GroupIndexInFBSDevice+1;// 电池组编号

            content.brand = _data.BattProducer;            // 电池品牌

            content.model = _data.BattModel;

            var monproperty = '标称容量：'+_data.MonCapStd+'AH'+'；标称单体电压：'+_data.MonVolStd+'V'+'；标称内阻：'+_data.MonResStd.toFixed(3)+'mΩ'

                        +'；标称温度：'+_data.MonTmpStd+'℃'+'；单体数量：'+_data.MonCount+'节'; 
            content.monproperty = monproperty;

            content.startusetime = new Date(_data.BattInUseDate).format('yyyy-MM-dd');

            content.chargecurr = _data.BattFloatCurrent;

            content.chargevol = _data.FloatVolLevel;

            var equipeinfo = '型号：'+_data.FBSDeviceName+'；ID：'+_data.FBSDeviceId

                        +'；IP：'+_data.FbsDeviceIp+'；BIndex：'+_data.GroupIndexInFBSDevice;

            content.equipeinfo = equipeinfo;

            content.person = '';

				
            tabc.push(tmp);

         }

         var StationId_ex = data[0].StationId_ex;

         var homeData = data[0].binf_ex;

         var tmp = {};

         tmp.title = '基站信息';

         tmp.type = 'home';

         tmp.content = $.extend({}, homeDefaults);

         tmp.tshow = '';

           tmp.cshow = '';

           // 设置content的值

         var content = tmp.content;

         content.stationid = StationId_ex;

         content.stationname = homeData.stationName;

         content.homeid = homeData.stationId;

         content.organize = homeData.affiliation;

         content.datasource = homeData.dataSources;

         content.addrstyle = homeData.stationType;

         var position = '经度：'+homeData.longitude+'；纬度：'+homeData.latitude;

         content.position = position;

         content.addr = homeData.stationAddr;

         var blockedState = homeData.blockedState?'是': '否';

         var stationstatus = '站址等级：'+homeData.stationLevel+'；维护状态：'+homeData.maintenanceState+'；封锁状态：'+blockedState;

         content.stationstatus = stationstatus;

         content.maintain = homeData.maintenanceCompany;

         var environment = '业务场景：'+homeData.businessScenario+'；覆盖场景：'+homeData.CoverScenario+'；站址地形：'+homeData.siteTerrain;

         content.environment = environment;

         var isShare = homeData.isShare?'是':'否';

         var addrpower = '产权性质：'+homeData.propertyRights+'；（原）产权单位：'+homeData.propertyUnit+'；是否共享：'+isShare;

         content.addrpower = addrpower;

         content.usecompany = homeData.useUnit;

         content.physicsaddrnum = homeData.siteCode;

         content.hisphysicsaddrnum = homeData.historySiteCode;

         content.addrinsidenum = homeData.siteInternalNumber;

         content.addrpinyin = homeData.sitePinyinReferred;

         content.chinesename = homeData.siteChineseReferred;               // 中文简称

         content.isopenbusiness = homeData.isOpenBusiness;

         content.entryperson = homeData.schoolPersonnel;

         content.entrytime = homeData.entryTime;

         content.revisedperson = homeData.modifyPeople;

         content.revisedtime = homeData.modifyTime;

         content.remark = homeData.note;

         var addrMark = homeData.siteReceivesMark?'是':'否';

         var isEffe = homeData.siteValidity?'是':'否';

         var isactive = '站址接收标记：'+addrMark+'；是否有效：'+isEffe;

         content.isactive = isactive;

         content.yidongaddrname = homeData.siteNameCMCC;

         content.dianxinaddrname = homeData.siteNameCTC;

         content.liantongaddrname = homeData.siteNameCUCC;

         content.brand = homeData.producer;

         content.endurtime = homeData.lastTimeLong;

         content.endurstyle = homeData.lastTimeType;

         content.endurstarttime = homeData.lastTimeDate;

         content.shareinfo = homeData.shareInfo;

         var buystauts = "移动购买:"+(homeData.electPowerCMCC==1?'是':'否')+";电信购买:"+(homeData.electPowerCTC==1?'是':'否')+";联通购买:"+(homeData.electPowerCUCC==1?'是':'否');

         content.buystatus = buystauts;

         var ischarge = homeData.isCanElectPower==1?'是':'否';

         content.ischarge = ischarge;

         content.distance = homeData.upperStationRoute;

         content.degree = homeData.upperStationDifficult;

         content.repair = homeData.clienteleErrorService;

			
         tabc.push(tmp);

         // 返回结果集

         return rs;

      }

   </script>

   <script type="text/javascript" src="js/Title.js"></script>

   <script type="text/javascript" src="js/control.js"></script>