加

didiyu

2018-10-17 d8289e24b58b0764df52a1eb0b9c33ef60b8efa5

 gx_tieta/WebRoot/ele-match-group.jsp

@@ -23,7 +23,13 @@
   <link rel="stylesheet" type="text/css" href="css/basic.css" />

   <link rel="stylesheet" href="css/common.css">

   <link rel="stylesheet" href="pages/css/common.css">

   <link rel="stylesheet" href="pages/css/mylayui.css">

   <style type="text/css">

      #main {

         position: absolute;

         top: 124px;

         bottom: 32px;

      }

      #sideBar {

         height: 100%;

      }

@@ -131,8 +137,7 @@
            ,defaultToolbar: ['exports', 'filter']

            ,cellMinWidth: 80

            ,cols: [[

              {type: 'radio', fixed: 'left'}

               ,{field:'stationname', title:'机房名称', align:'center', width: 380}

              {field:'stationname', title:'机房名称', align:'center', width: 380}

               ,{field:'groupname', title:'电池组名称', align:'center'}

               ,{field:'monnum', title:'单体编号', align:'center'}

               ,{field:'brandname', title:'品牌名称', align:'center'}

@@ -145,7 +150,7 @@
                

             ]

             ,page: {}

             ,height: 'full-170'

             ,height: 'full-165'

         };

         

         var toolBarTpl = groupTblTools.innerHTML;

@@ -228,6 +233,7 @@
                  if(rs.code == 1) {

                     var data = rs.data;

                     var num = 0;

                     //console.log(data);

                     var rsData = formaterTblData(data);

                     // 设置表格的数据

                     num = rsData.length;

@@ -259,16 +265,21 @@
               var obj = {};

               obj.stationname = _data.StationName;   // 机房名称

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

               obj.brandname = _data.BattProducer;      // 品牌

               obj.monvol = _data.MonVolStd;         // 标称电压

               obj.nominalcap = Number(_data.MonCapStd);      // 标称容量

               for(var k=0; k<_data.obj.length;k++) {

                  var _obj = $.extend({}, obj);

                  var __data = _data.obj[k];

                  // 设置单体信息

                  _obj.monnum = '#'+__data.mon_num;   // 单体编号

                  _obj.brandname = __data.note;      // 品牌

                  _obj.relcap = Number(__data.test_cap.toFixed(1));   // 实际容量

                  _obj.percap = Number((__data.percent*100).toFixed(1));   // 容量百分比

                  rs.push(_obj);

						
                  // 判断电池单体不存在

                  if(__data.mon_num != -1) {

                     rs.push(_obj);

                  }

               }

            }