提交内容

hdw

2018-10-25 3d175b70811d8da4258aa0ec6cc6d79ff912b36f

 gx_tieta/WebRoot/control.jsp

@@ -286,10 +286,10 @@
               <td><s:text name="Computer_room_IP"/></td>            <!-- 机房IP -->

               <td id="StationIP"></td>

            </tr>

            <!-- <tr>

               <td><s:text name="Batt_group"/>ID</td>                        电池组ID

            <tr>

               <td><s:text name="Batt_group"/>ID</td>                        <!-- 电池组ID -->

               <td id="batt_group_id"></td>

            </tr> -->

            </tr>

            <tr>

               <td><s:text name="Battery_name"/></td>               <!-- 电池组名称 -->

               <td id="BattGroupName"></td>

@@ -863,7 +863,7 @@
      

      //var eMenuWidth = $('#echarts_menu').width();

      //$('#echarts_menu').width(eMenuWidth);

      var isnotshowvalue=false;         //是否显示柱状值

      var isnotshowvalue=true;         //是否显示柱状值

      var mon_res_list;         //电池内阻数组

      var mon_vol_list;         //电池电压数组

      var mon_ser_list;         //电池电导数组

@@ -1425,7 +1425,7 @@
      //根据设备id查询设备当前的开关状态

      function searchDevStatusByDev_id(){

         var obj = getBatt();

         //console.info(obj);

         console.info(obj);

         var lasttype = mygraph.graphtype;   //记录上一次的状态

         $.ajax({    

              type: "post",             

@@ -1438,7 +1438,8 @@
              success: function(data){ 

               data = eval("("+data+")");

               var model = eval("("+data.result+")");

               //console.log(model);

               console.log(model);

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

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

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

@@ -1450,6 +1451,8 @@
               }else {

                  _str = GLOBAL.circleStatus.BTSCircle(batt, model, mygraph, updateEleCircle);

               }

               console.log(mygraph);

               debugger;

               if(model.code == 1) {

                  var nowTime = new Date().getTime();      //当前时间

                  var record = new Date(model.data[0].record_datetime).getTime();

@@ -2742,29 +2745,7 @@
      });

   }

   

   //生成充放电监测模块内容

   function createBattListen(ele, list) {

      ele.text("");

      var discharge_num = 0;

      var charge_num = 0;

      var ul = $('<ul></ul>');

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

         var li = "";

         if(list[i].isCharge) {

            li = $('<li><a href="javascript:;" class="batt-charge" value="'+list[i].val+'" note="'+list[i].note+'">'+list[i].val+'电池组充电测试!</a></li>');

            charge_num++;

         }else {

            li = $('<li><a href="javascript:;" class="batt-discharge" value="'+list[i].val+'" note="'+list[i].note+'">'+list[i].val+'电池组放电测试!</a></li>');

            discharge_num++;

         }

			
         li.data('attr', list[i]);

         ul.append(li);

      }

      $('#ele_content .batt-listen .count-num').find('span').eq(0).text(discharge_num);

      $('#ele_content .batt-listen .count-num').find('span').eq(1).text(charge_num);

      ele.append(ul);

   }

	
   // 点击电池充放电监测列表触发事件

   $(function() {

      

@@ -3339,7 +3320,8 @@
               searchBtsBattInfoByStation(temp);   // 查询机房信息

               searchBTSTestParam({

                  num: CMD_BTS_GetDischargeParm,

                  dev_id: batt.FBSDeviceId

                  dev_id: batt.FBSDeviceId,

                  TestCmd: 0

               });

               BTS_popup.showPopup();

               

@@ -3371,7 +3353,8 @@
            if(regEquipType(batt.FBSDeviceId, globalPattern.BTS)) {

               var temp = {

                  num: CMD_BTS_Stop,

                  dev_id: batt.FBSDeviceId

                  dev_id: batt.FBSDeviceId,

                  TestCmd: 0

               };

               // 显示是否停止测试

               myConfirm.show({

@@ -3415,7 +3398,8 @@
         $('#btn_flush').click(function (){

            var temp = {

               dev_id:$('#dev_id').val(),

               num:CMD_BTS_GetDischargeParm

               num:CMD_BTS_GetDischargeParm,

               TestCmd: 0

            };

            searchBTSTestParam(temp);

         });

@@ -3440,7 +3424,8 @@
            // 构造启动条件

            var temp = {

               num: CMD_BTS_Start,

               dev_id: $('#dev_id').val()

               dev_id: $('#dev_id').val(),

               TestCmd: $('#discharge_type').val()

            };

            sendCmdToBTSDev(temp);

         });

@@ -3973,9 +3958,19 @@
               }

               mygraph.ischange = 1;            //重新绘制拓扑图

               

					
               // 负载电流

               var loadCurr = batt.Load_curr+'A';

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

					
               // 最大核容电流

               var disCurrMax = batt.DisCurrMax+'A';

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

					
               getBattStr();

               searchBattAlarmParam();            //查询电池告警参数

               clearInterval(time);

               mygraph.graphtype = 4;

               showtable();

               time=window.setInterval("showtable()",4000);

            }

@@ -3989,8 +3984,8 @@
                   BattGroupId=$(this).attr("id");

                   var disX=(e||event).clientX+10;         //得到鼠标点击X的位置

                 var disY=(e||event).clientY+10;         //得到鼠标点击Y的位置

                 var scrollY=$("body").scrollTop();      //获取浏览器滚动的高度

				
                 var scrollY=$(window).scrollTop();      //获取浏览器滚动的高度

               console.log(scrollY);

                 var oRightMenu=document.getElementById("right_menu");

                 

                 $(this).click();

@@ -3999,9 +3994,10 @@
                 $("#right_menu").show();

                 $("#right_menu .more_menu").hide();

                 $("#right_menu .angle").hide();

                 console.log(disX+"***"+disY);

                 //使菜单跟随鼠标位置

                 oRightMenu.style.left=disX+'px';

                 oRightMenu.style.top=disY+scrollY+'px';

                 oRightMenu.style.left= disX+'px';

                 oRightMenu.style.top= disY+scrollY+'px';

                 

                 setPosition($("#right_menu"),disX, disY);