修改内容

hdw

2018-10-25 bb65f33c9fdff40844f17e95e3e75aed2b42bda2

 gx_tieta/WebRoot/charge-test.jsp

@@ -419,10 +419,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>

@@ -3498,18 +3498,23 @@
            if(model.code == 1){

               //console.info(model.data);

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

                  if(model.data[i].batt_test_type == 3){

                  var _data = model.data[i];

                  if(_data.batt_test_type == 3){

                     arr.push({

                        note: model.data[i].note,

                        val:model.data[i].BattGroupId,

                        fbs: model.data[i].batt_test_tlong,

                        note:_data.note,

                        val:_data.BattGroupId,

                        province: _data.stationName1,

                        city: _data.stationName2,

                        home: _data.stationName,

                        isCharge:0

                     });

                  }else if(model.data[i].batt_test_type == 2){

                  }else if(_data.batt_test_type == 2){

                     arr.push({

                        note: model.data[i].note,

                        val:model.data[i].BattGroupId,

                        fbs: model.data[i].batt_test_tlong,

                        note: _data.note,

                        val: _data.BattGroupId,

                        province: _data.stationName1,

                        city: _data.stationName2,

                        home: _data.stationName,

                        isCharge:1

                     });

                  }

@@ -3523,75 +3528,6 @@
              

           }            

      });

   }

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

   function createBattListen(ele, list) {

      //console.info(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+'" fbs="'+list[i].fbs+'" note="'+list[i].note+'">'+list[i].val+'电池组充电测试!</a></li>');

            charge_num++;

         }else {

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

            discharge_num++;

         }

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

      var batt_list = $('#ele_content .batt-listen .batt-list');

      batt_list.on('click', 'a', function(){

         var fbsId = $(this).attr('fbs');

         var isSpecial = regFbsId(fbsId);

         $('.special-mon-data').removeClass('show');

         batt_list.find('a').removeClass('active');

         $(this).addClass('active');

         BattGroupId=$(this).attr("value");

         locationBattPos($(this).attr('note'), $(this).attr('value'));

         if(isSpecial) {

				
         }else {

            clearfourPicture();

         }

      });

   });

	
   function BattlocationById(battid){

      if(battid!=undefined){

         BattGroupId = battid;

         $('#lside a').css({'background-color':'#fff'});

         //获得一级菜单并展示二级菜单

         var secTag =$('#'+battid).parent().parent().siblings().first().parent().parent().siblings().first().next();

         var secTagA = $('#'+battid).parent().parent().siblings().first();

         //console.info(secTagA.text()+'******');

         if(secTagA.text().trim().length == 0) {

            secTagA.hide();

         }

         secTag.show();

         //$('#'+thr_id).parent().parent().siblings().first().parent().parent().siblings().first().next().show();

         //获得二级菜单并展示三级菜单

         $('#'+battid).parent().parent().siblings().first().next().show();

         $('#'+battid).css('background-color','#9bbaf3');

         //一级菜单展开样式

         $('#'+battid).parent().parent().siblings().first().parent().parent().siblings().first().children('.arrow').removeClass("down");

         $('#'+battid).parent().parent().siblings().first().parent().parent().siblings().first().children('.arrow').addClass("up");

         $('#'+battid).parent().parent().siblings().first().children('.mark').text('-');

         $('#'+battid).parent().parent().siblings().first().children('.mark').addClass('black');

         //alert($('#'+thr_id).parent().parent().siblings().first().text());

         location.hash="#"+battid;

         location.hash = '';

         $('#'+battid).click();

      }

   }

   

   //跳转到指定的电池组统计分析查询

@@ -4614,6 +4550,7 @@
      var second = GLOBAL.pages.siderbar.second;   // 二级导航

      var third = GLOBAL.pages.siderbar.third;   // 三级导航

      var fourth = GLOBAL.pages.siderbar.fourth;   // 四级导航

      var localSideBar = GLOBAL.pages.siderbar.localSideBar;   // 定位机房

      var treeView = new TreeView($('#lside'));

      $('#lside').width($('#ele_content').width());

      treeView.setContainer();

@@ -4685,6 +4622,24 @@
            searchAll_lowAction();         //获取阀值

         }

         

         // 电池充放电数据监控

         var batt_list = $('.batt-listen .batt-list');

         batt_list.on('click', 'a', function(){

            batt_list.find('a').removeClass('active');

            $(this).addClass('active');

            var battInfo = $(this).parent().data('attr');	
				
            var tmp = {

               province: battInfo.province,

               city: battInfo.city,

               home: battInfo.home,

               homeid: battInfo.note,

               battid: battInfo.val

            };

            console.log(tmp);

            localSideBar(treeView, treeView.container, tmp);

         });

			
         

         // 设置记录的笔数为-1

         $('#testrecordcout').val('-1');