未审批可更改

D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore

2019-01-18 2fe250ece8de95b3f70172fe5b45793ab6a3084a

 gx_tieta/WebRoot/batt-state-statistical.jsp

@@ -105,17 +105,17 @@
      <div id="paging">

         <a href="javascript:" class="search"><s:text name="Search"/></a>      <!-- 查询 -->

         <a href="javascript:" id="export_table"><s:text name="Export"/></a>      <!-- 导出 -->

         <span id="current">1/1</span>

         <span><s:text name="Each_page"/><!-- 每页 --><input type="text" id="number" value="10"/><s:text name="Item"/><!-- 条 --></span>

         <!-- <span id="current">1/1</span>

         <span><s:text name="Each_page"/>每页<input type="text" id="number" value="10"/><s:text name="Item"/>条</span> -->

         <s:text name="Total_data"/><!-- 数据总量 --><span id="total">0</span>&nbsp;&nbsp;

         <a href="javascript:" id="home"><s:text name="HomePage"/><!-- 首页 --></a> 
         <a href="javascript:" id="pre"><s:text name="Page_Up"/><!-- 上一页 --></a>

         <a href="javascript:" id="next_p"><s:text name="Page_Down"/><!-- 下一页 --></a>

         <a href="javascript:" id="last"><s:text name="End_Page"/><!-- 尾页 --></a>

         <!-- <a href="javascript:" id="home"><s:text name="HomePage"/>首页</a> 
         <a href="javascript:" id="pre"><s:text name="Page_Up"/>上一页</a>

         <a href="javascript:" id="next_p"><s:text name="Page_Down"/>下一页</a>

         <a href="javascript:" id="last"><s:text name="End_Page"/>尾页</a>

         <span id="cont">

            <s:text name="Goto"/><!-- 转到 --><input type="text" id="page_num" value="1"/>

            <a href="javascript:" id="go"><s:text name="Jump"/><!-- 跳转 --></a>

         </span>

            <s:text name="Goto"/>转到<input type="text" id="page_num" value="1"/>

            <a href="javascript:" id="go"><s:text name="Jump"/>跳转</a>

         </span> -->

      </div>

   </div>

   <div id="details"></div>

@@ -168,7 +168,7 @@
             ]]

            ,data:[]

             ,page: false

             ,height: 'full-280'

             ,height: 'full-270'

         };

         

         // 生成表格数据

@@ -252,21 +252,24 @@
               dataType:'json',

               data:"json="+json,

               success:function(data){

                  //console.info(data);

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

                  console.info(data);

                  if(data.code==1&&data!=null){

                     //console.log(data.data);

                     tOptions.data = data.data;

                     $('#total').text(data.data.length);

                    }else {

                       tOptions.data = [];

                       $('#total').text(0);

                    }

                    layer.close(load);

                    tOptions.limit = tOptions.data.length;

                    table.render(tOptions);

                    

                    // 触发window的resize事件显示最右侧的详情信息浮动

                    $(window).resize();

               }

            })

            });

         }

         

         // 构造查询条件

@@ -339,11 +342,9 @@
               tmp.push(_data.station_event_type_tempup);      // 温度上限

               tmp.push(_data.station_event_type_templow);   // 温度下限

               tmp.push(_data.station_event_type_dampup);      // 湿度上限

               tmp.push(_data.station_event_type_damplow);      // 湿度下限

					
               tmp.push(_data.station_event_type_damplow);      // 湿度下限	
               rs.push(tmp);

            }

				
            }		
            return rs;

         }