From a6b4c1e19b3b3fdcf80d7f69f20fe406205fcf8f Mon Sep 17 00:00:00 2001
From: LiJun <LiJun@192.168.10.20>
Date: 星期一, 26 十一月 2018 11:54:39 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/control.jsp | 85 +++
gx_tieta/WebRoot/index.jsp | 56 ++
gx_tieta/WebRoot/mobil/batt-state-statistical.html | 555 +++++++++++++++++++++++
gx_tieta/WebRoot/mobil/batt-traffic-statistics.html | 555 +++++++++++++++++++++++
gx_tieta/src/com/fgkj/services/ram/Bts_station_stateService.java | 18
gx_tieta/src/com/fgkj/dao/impl/ram/Bts_station_stateImpl.java | 24
gx_tieta/src/com/fgkj/dao/impl/BadBatt_monImpl.java | 40 +
gx_tieta/src/com/fgkj/actions/ram/Bts_station_stateAction.java | 10
gx_tieta/WebRoot/pages/js/common.js | 1
gx_tieta/src/com/fgkj/dao/impl/Battalarm_dataDAOImpl.java | 37 +
gx_tieta/WebRoot/mobil/count-report.html | 6
11 files changed, 1,356 insertions(+), 31 deletions(-)
diff --git a/gx_tieta/WebRoot/control.jsp b/gx_tieta/WebRoot/control.jsp
index 796836d..ce75ad6 100644
--- a/gx_tieta/WebRoot/control.jsp
+++ b/gx_tieta/WebRoot/control.jsp
@@ -264,6 +264,11 @@
<span class="whyc-btn-icon fa fa-signal"></span>
<span class="whyc-btn-txt">淇″彿璐ㄩ噺</span>
</a>
+ <br>
+ <a href="javascript:void(0);" id="threadInfo" class="whyc-btn whyc-btn-disabled" id="specialGraphExport">
+ <span class="whyc-btn-icon fa fa-desktop"></span>
+ <span class="whyc-btn-txt">璁惧杩涚▼</span>
+ </a>
</div>
</div>
</div>
@@ -4969,6 +4974,86 @@
//console.info(rs);
return rs;
}
+
+ // 璁惧杩涚▼鏄剧ず
+ var threadInfoSearch = {
+ num: gprs.threadinfo,
+ dev_id:910000001
+ };
+
+ // 鐐瑰嚮璁惧杩涚▼鎸夐挳
+ $('#threadInfo').click(function() {
+ console.log(threadInfoSearch);
+ SendDeviceThreadInfo(threadInfoSearch,function(data){
+ searchDeviceThreadInfo({dev_id:910000001});
+ });
+ });
+
+
+
+
+ //缁橤PRS鍙戦�佹寚瀹氱殑鍛戒护锛岃幏鍙朅T杩斿洖鍊�
+ function SendDeviceThreadInfo(param,callback){
+ $.ajax({
+ type:"post",
+ url: "Bts_gprs_stateAction_action_update_bts_task_inf",
+ async:true,
+ dataType:'json',
+ data:'json='+JSON.stringify(param),
+ success: function(data){
+ var model = eval('('+data.result+')');
+ console.info(model);
+ if(callback && typeof callback == 'function'){
+ callback(model);
+ }
+ },error:function(e){
+ var model = {
+ code:0,
+ data:e,
+ msg:'閫氫俊澶辫触'
+ };
+ if(callback && typeof callback == 'function'){
+ callback(model);
+ }
+ }
+ });
+ }
+
+ //鏌ヨ璁惧鐨勮繘绋嬩俊鎭�
+ function searchDeviceThreadInfo(param,callback){
+ $.ajax({
+ type:"post",
+ url: "Bts_gprs_stateAction_action_serchByCondition",
+ async:true,
+ dataType:'json',
+ data:'json='+JSON.stringify(param),
+ success: function(data){
+ var model = eval('('+data.result+')');
+ console.info(model);
+ var btsTaskInf = model.data[0].bts_task_inf;
+ layer.open({
+ title: '璁惧杩涚▼',
+ width: 380,
+ height: 450,
+ content: '<pre>'+btsTaskInf+'</pre>'
+ });
+
+ if(callback && typeof callback == 'function'){
+ callback(model);
+ }
+ },error:function(e){
+ var model = {
+ code:0,
+ data:e,
+ msg:'閫氫俊澶辫触'
+ };
+ if(callback && typeof callback == 'function'){
+ callback(model);
+ }
+ }
+ });
+ }
+
});
// 鏈哄巻鍗℃ā鍧�
diff --git a/gx_tieta/WebRoot/index.jsp b/gx_tieta/WebRoot/index.jsp
index 0264804..e7640d6 100644
--- a/gx_tieta/WebRoot/index.jsp
+++ b/gx_tieta/WebRoot/index.jsp
@@ -1582,28 +1582,42 @@
// 鏅�氭満鎴挎弿杩�
function mapImgDescNormal(iconExplain) {
- // 鏈烘埧钀藉悗
+ // 钀藉悗鏈烘埧
var iconList = $('<div class="explain-list" style="padding: 4px 6px; border-bottom: 1px slid #ccc; display:block"></div>');
var input = $('<input type="checkbox" data-img="item-behind" checked="checked">');
+ var span = $('<span>鐢垫睜钀藉悗鏈烘埧</span>');
var icon = $('<img src="'+mapImages.behind+'">');
- var span = $('<span>鐢垫睜缁勮惤鍚庢満鎴�</span>');
+ var badge = $('<a href="javascript:;" class="layui-badge-rim mrr8 badge-behind">0</a>');
iconList.append(input);
iconList.append(span);
iconList.append(icon);
+ iconList.append(badge);
iconExplain.append(iconList);
- // 鏈烘埧鍛婅
+ // 鍛婅鏈烘埧
var iconList = $('<div class="explain-list" style="padding: 4px 6px; border-bottom: 1px slid #ccc; display:block"></div>');
var input = $('<input type="checkbox" data-img="item-warn" checked="checked">');
+ var span = $('<span>鐢垫睜鍛婅鏈烘埧</span>');
var icon = $('<img src="'+mapImages.warn+'">');
- var span = $('<span>鐢垫睜缁勫憡璀︽満鎴�</span>');
+ var badge = $('<a href="javascript:;" class="layui-badge-rim mrr8 badge-warn">0</a>');
iconList.append(input);
iconList.append(span);
iconList.append(icon);
+ iconList.append(badge);
iconList.append('<div class="clear"></div>');
iconExplain.append(iconList);
-
+ // 鎺夌珯鏈烘埧
+ var iconList = $('<div class="explain-list" style="padding: 4px 6px; border-bottom: 1px slid #ccc; display:block"></div>');
+ var input = $('<input type="checkbox" data-img="item-down" checked="checked">');
+ var icon = $('<img src="'+mapImages.timeout+'">');
+ var span = $('<span>鎺夌珯鏈烘埧</span>');
+ var badge = $('<a href="javascript:;" class="layui-badge-rim mrr8 badge-down">0</a>');
+ iconList.append(input);
+ iconList.append(span);
+ iconList.append(icon);
+ iconList.append(badge);
+ //iconExplain.append(iconList);
// 鏈烘埧寤舵椂
var iconList = $('<div class="explain-list" style="padding: 4px 6px; border-bottom: 1px slid #ccc; display:block"></div>');
@@ -1613,16 +1627,18 @@
iconList.append(input);
iconList.append(span);
iconList.append(icon);
- iconExplain.append(iconList);
+ //iconExplain.append(iconList);
// 鍋滅數鏈烘埧
var iconList = $('<div class="explain-list" style="padding: 4px 6px; border-bottom: 1px slid #ccc; display:block"></div>');
var input = $('<input type="checkbox" data-img="item-poff" checked="checked">');
var icon = $('<img src="'+mapImages.powercut+'">');
var span = $('<span>鍋滅數鏈烘埧</span>');
+ var badge = $('<a href="javascript:;" class="layui-badge-rim mrr8 badge-powercut">0</a>');
iconList.append(input);
iconList.append(span);
iconList.append(icon);
+ iconList.append(badge);
iconExplain.append(iconList);
// 姝ｅ父鏈烘埧
@@ -1630,12 +1646,40 @@
var input = $('<input type="checkbox" data-img="item-normal" checked="checked">');
var icon = $('<img src="'+mapImages.normal+'">');
var span = $('<span>姝ｅ父鏈烘埧</span>');
+ var badge = $('<a href="javascript:;" class="layui-badge-rim mrr8 badge-normal">0</a>');
iconList.append(input);
iconList.append(span);
iconList.append(icon);
+ iconList.append(badge);
iconExplain.append(iconList);
+
+ // 缁埅涓嶈冻3灏忔椂鏈烘埧
+ var iconList = $('<div class="explain-list" style="padding: 4px 6px; border-bottom: 1px slid #ccc; display:block"></div>');
+ var input = $('<input type="checkbox" data-img="item-weak" checked="checked">');
+ var icon = $('<img src="'+mapImages.normal+'">');
+ var span = $('<span>缁埅涓嶈冻3灏忔椂鏈烘埧</span>');
+ var badge = $('<a href="javascript:;" class="layui-badge-rim mrr8 badge-weak">0</a>');
+ iconList.append(input);
+ iconList.append(span);
+ iconList.append(icon);
+ iconList.append(badge);
+ //iconExplain.append(iconList);
+
+
}
+ // 鏇存柊鍦板浘鍥炬爣badge鐨勫��
+ function updateMapIconBadge() {
+ var mapImgDesc = $('#mapImgDesc');
+ var behind = mapImgDesc.find('.badge-behind'); // 鐢垫睜钀藉悗鏈烘埧
+ var warn = mapImgDesc.find('.badge-warn'); // 鐢垫睜鍛婅鏈烘埧
+ var down = mapImgDesc.find('.badge-down'); // 鎺夌珯鏈烘埧
+ var powercut = mapImgDesc.find('.badge-powercut'); // 鍋滅數鏈烘埧
+ var normal = mapImgDesc.find('.badge-normal'); // 姝ｅ父鏈烘埧
+ var weak = mapImgDesc.find('.badge-weak'); // 缁埅涓嶈冻3灏忔椂鏈烘埧
+ }
+
+
// 61850鎻忚堪
function mapImgDesc61850(iconExplain) {
// 鏍稿/鍋滅數鏀剧數
diff --git a/gx_tieta/WebRoot/mobil/batt-state-statistical.html b/gx_tieta/WebRoot/mobil/batt-state-statistical.html
new file mode 100644
index 0000000..04f963b
--- /dev/null
+++ b/gx_tieta/WebRoot/mobil/batt-state-statistical.html
@@ -0,0 +1,555 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+ <meta charset="UTF-8">
+ <title>鏈烘埧鍘嗗彶浜嬩欢鏌ヨ</title>
+ <meta name="viewport" content="width=device-width,initial-scale=1">
+ <meta name="apple-mobile-web-app-capable" content="yes">
+ <meta name="apple-mobile-web-app-status-bar-style" content="black">
+ <link rel="stylesheet" href="mobilCss/jquery.mobile-1.4.5.min.css"/>
+ <link href="mobilCss/mobiscroll.core-2.5.2.css" rel="stylesheet" type="text/css" />
+ <link href="mobilCss/mobiscroll.animation-2.5.2.css" rel="stylesheet" type="text/css" />
+ <link rel="stylesheet" type="text/css" href="css/tbl.css">
+ <script type="text/javascript" src="mobilJs/jquery-1.8.2.js"></script>
+ <script type="text/javascript" src="mobilJs/jquery.mobile-1.4.5.min.js"></script>
+ <style type="text/css">
+
+ /*瑙勫畾闈㈡澘鐨勬牱寮�*/
+ .ui-panel {
+ width: 80%;
+ }
+ .ui-panel-dismiss{
+ width: 20%;
+ }
+ .ui-panel-inner{
+ padding:0 !important;
+ }
+ .ui-collapsible-heading-toggle{
+ padding-left: 1em !important;
+ }
+ .panel-header{
+ padding: 8px 0;
+ font-size: 1.2em;
+ text-indent: 1em;
+ background-color: #DFDCDC;
+ }
+ /*瑙勫畾寮�鍏崇殑浣嶇疆*/
+ .ui-flipswitch {
+ margin-left: 0.5em;
+ }
+
+ .ui-field-contain{
+ padding: 0 0.6em ;
+ }
+ .ui-field-contain {
+ border-bottom-color: #828282;
+ border-bottom-color: rgba(0,0,0,.15);
+ border-bottom-width: 1px;
+ border-bottom-style: none;
+ }
+ .sicon{
+ display:inline-block;width:4%;margin:1em 0;float:left;
+ }
+ .checkdata{
+ display:inline-block;width:48%;margin:0 0 0 0;float:left;
+ }
+
+ .next-page, .pre-page {
+ position: fixed;
+ width: 40px;
+ height: 40px;
+ top: 50%;
+ margin-top: -15px;
+ }
+ .next-page {
+ right: 0;
+ }
+ .pre-page {
+ left: 0;
+ }
+
+
+ table {
+ margin-top:.5em;
+ border-collapse:separate;
+ border-spacing:0 .5em;
+ }
+
+ tbody tr td{
+ overflow: hidden;
+ text-overflow:ellipsis;
+ white-space: nowrap;
+ }
+ </style>
+ <link rel="stylesheet" href="css/fgpanel.css">
+</head>
+<body>
+ <div data-role="page">
+ <div class="fg-panel">
+ <form>
+ <div class="fg-panel-header">绛涢��</div>
+ <div class="fg-panel-content">
+ <fieldset data-role="controlgroup">
+ <p>鐪�</p>
+ <select id="mainteArea" data-mini="true">
+ <option value="">鍏ㄩ儴</option>
+ <option value="">涓�鏋㈢航</option>
+ <option value="">浜屾灑绾�</option>
+ <option value="">鏋㈢航妤�</option>
+ </select>
+ <p>甯�</p>
+ <select id="city" data-mini="true">
+ <option value="">鍏ㄩ儴</option>
+ </select>
+ <p>鍖�/鍘�</p>
+ <select id="country" data-mini="true">
+ <option value="">鍏ㄩ儴</option>
+ </select>
+ <p>鏈烘埧绔欑偣</p>
+ <select id="homeName" data-mini="true">
+ <option value="">鍏ㄩ儴</option>
+ </select>
+ <p>缁熻鏂瑰紡</p>
+ <select id="" data-mini="true">
+ <option value="">鎸夊勾缁熻</option>
+ <option value="">鎸夋湀缁熻</option>
+
+ </select>
+ <p>鏃堕棿</p>
+ <div class="checkdata">
+ <input id="startTestrecord" type="text" name="appDate" class="appDatefir" value="2000-01-01" />
+ </div>
+ <span class="sicon">¯</span>
+ <div class="checkdata">
+ <input id="endTestrecord" type="text" name="appDate" class="appDatesec" value="2017-01-01" />
+ </div>
+
+ </fieldset>
+ </div>
+ <div class="fg-panel-btn">
+ <a href="javascript:panel.hide(true);" id="submit" data-role="button" class="ui-btn ui-mini ui-btn-b ui-shadow">纭畾</a>
+ </div>
+ </form>
+ </div>
+ <!-- 澶撮儴鍐呭 -->
+ <div data-role="header" data-position="fixed">
+ <a href="count-report.html" target="_top" class="ui-btn ui-corner-all ui-shadow ui-icon-back ui-btn-icon-left" style="padding-top: 0.7em; padding-bottom: 0.7em;">杩斿洖</a>
+ <h1>鏈烘埧鍘嗗彶浜嬩欢鏌ヨ</h1>
+ <a href="javascript:panel.show();" class="ui-btn ui-corner-all ui-shadow ui-icon-grid ui-btn-icon-left" style="padding-top: 0.7em; padding-bottom: 0.7em;" id="screen">绛涢��</a>
+ </div>
+ <!-- 涓讳綋鍐呭 -->
+ <div data-role="main">
+ <div class="pre-page"><a href="#" class="ui-btn ui-corner-all ui-icon-carat-l ui-btn-icon-notext">鍥炬爣</a></div>
+ <div class="next-page"><a href="#" class="ui-btn ui-corner-all ui-icon-carat-r ui-btn-icon-notext">鍥炬爣</a></div>
+ <!-- 琛ㄦ牸瀹瑰櫒 -->
+ <div class="tbl-container"></div>
+ <table data-role="table" class="ui-responsive ui-shadow" id="tab" >
+
+ </table>
+ </div>
+ </div>
+</body>
+
+<script src="mobilJs/mobiscroll.core-2.5.2.js" type="text/javascript"></script>
+<script src="mobilJs/mobiscroll.core-2.5.2-zh.js" type="text/javascript"></script>
+<script src="mobilJs/mobiscroll.datetime-2.5.1.js" type="text/javascript"></script>
+<script src="mobilJs/mobiscroll.datetime-2.5.1-zh.js" type="text/javascript"></script>
+<script type="text/javascript" src="js/tbl.js"></script>
+<script type="text/javascript" src="mobilJs/base.js"></script>
+<script type="text/javascript" src="js/panel.js"></script>
+<script type="text/javascript">
+ $(function () {
+ setTimes($("#startTestrecord"),'2000-01-01');
+ setTimes($("#endTestrecord"),new Date().format('yyyy-MM-dd'));
+
+ });
+</script>
+ <script type="text/javascript">
+ $('document').ready(function(){panel.show();});
+
+ var arr=new Array(); //褰撳墠琛ㄦ牸td鏁版嵁
+ var Page = {
+ pageSize:10, //姣忛〉鐨勮鏁�
+ pageCurr:1, //褰撳墠椤电爜鏁�
+ pageAll:0,
+ };
+
+ var arrTh = ['鍛婅鏃堕棿娈�', '鏈烘埧鍚嶇О', '鍋滅數娆℃暟', '鍙戠數娆℃暟','鎺夌珯娆℃暟','寮�闂ㄥ紓甯告鏁�','缁埅娆℃暟','娓╁害涓婇檺鍛婅','娓╁害涓嬮檺鍛婅','婀垮害涓婇檺鍛婅','婀垮害涓嬮檺鍛婅','璇︽儏'];
+ dataArr = [];
+ var startTime = "1980-01-01";
+ var endTime = new Date().format('yyyy-MM-dd');
+ var tbl = $('.tbl-container');
+ createTbl(tbl, arrTh, dataArr);
+ $(document).ready(function(){
+ setPage();
+ $("#submit").click(function(){
+ Page.pageCurr=1;
+ searchBadBatt();
+ });
+ });
+
+ //鏌ヨ鐢垫睜淇℃伅
+ function searchBadBatt(){
+ loadshow();
+ var stationid = $("#station_name").find('option:selected').attr('stationid')?$("#station_name").find('option:selected').attr('stationid'):'';
+ var temp = createSearchForm();
+ console.info(stationid);
+ /*var temp = {
+ StationName1:$("#station_name1").val(),
+ StationName2:$("#city").val(),
+ StationName5: $("#county").val(),
+ StationName: $("#station_name").val(),
+ StationId: stationid
+ };*/
+ //console.info(temp);
+ var json = JSON.stringify(temp);
+ //console.info(json);
+ arrTd = new Array();
+ $.post("Batt_Maint_DealarmAction_serchByConditionNew","result="+json,function(data){
+ data=eval("("+data.result+")");
+ //console.info(data);
+ if(data.code==1 && data.data.length>0){
+ data=data.data;
+ //console.info(data);
+ arr=new Array();
+ index=0;
+ for(var i=0;i<data.length;i++){
+ Page.pageAll=data[i].Size;
+ arr[index++]=data[i].BattGroupId; //鐢垫睜缁刬d
+ arr[index++]=data[i].StationName; //鏈烘埧鍚嶇О
+ arr[index++]=data[i].StationIp; //鏈烘埧IP
+ arr[index++]=data[i].BattGroupName; //鐢垫睜缁勫悕绉�
+ arr[index++]=data[i].BattGroupNum; //鐢垫睜缁勫簭鍙�
+
+
+ }
+ //console.info(Page);
+ createTbl(tbl, arrTh, arr);
+
+ }else{
+ $('#searchNull').popup('open');
+ Page.pageAll = 0;
+ }
+ setPage();
+ //console.info(Page);
+ loadclose();
+ }).error(function(){
+ loadclose();
+ $('#searchErr').popup('open');
+ });
+
+ }
+
+
+
+ function createSearchForm(){
+ var temp={
+ page:{
+ pageCurr:Page.pageCurr,
+ pageSize:Page.pageSize,
+ },
+ binf:{
+ StationName1:$('#mainteArea').val(),
+ StationName2:$('#city').val(),
+ StationName5:$('#country').val(),
+ StationName:$('#homeName').val(),
+
+ },
+
+ tdata:{
+
+ record_time:$('#startTestrecord').val(), //鐢垫睜娴嬭瘯璁板綍鏃堕棿娈�
+ record_time1:$('#endTestrecord').val()
+
+ }
+
+ };
+ return temp;
+ }
+ // stringify(createSearchForm());
+ //椤甸潰鍔犺浇鏃舵煡璇㈢渷
+ $.post("BattInfAction_serchByStation",null,function(data){
+ data = data.result;
+ data = eval("("+data+")");
+ //console.info(data);
+ //console.info(data.code);
+ if(data.code==1&&data.data.length>0){
+ var $Ostation_name1=$("#mainteArea");
+ $Ostation_name1.text("");
+ var arr = new Array();
+ for(var i=0;i<=data.data.length;i++)
+ {
+ if(i == 0){
+ arr.push({
+ val:"",
+ txt:"鍏ㄩ儴(鍏�"+data.sum+"涓�)",
+ });
+ }else{
+ arr.push({
+ val:data.data[i-1].StationName1,
+ txt:data.data[i-1].StationName1,
+ });
+ }
+ }
+ updataSel($Ostation_name1, arr);
+ }
+ findCity();
+ });
+
+
+//褰撶渷鏀瑰彉鏃舵洿鏂板競
+ function findCity(){
+ var data = {
+ StationName1: $("#mainteArea").val()
+ };
+ //console.info(data);
+ // 璇锋眰鑾峰彇褰撳墠鐪佷笅鐨勫競
+ $.ajax({
+ type: "post",
+ url: "BattInfAction!serchStationName2",
+ async:true,
+ dataType:'json',
+ data:"json = "+JSON.stringify(data),
+ success: function(data){
+ data = data.result;
+ data = eval("("+data+")");
+ //console.info(data);
+ //console.info(data.code);
+ if(data.code==1&&data.data.length>0){
+ var $Ostation_name1=$("#city");
+ $Ostation_name1.text("");
+ var arr = new Array();
+ for(var i=0;i<=data.data.length;i++)
+ {
+ if(i == 0){
+ arr.push({
+ val:"",
+ txt:"鍏ㄩ儴(鍏�"+data.data.length+"涓�)",
+ });
+ }else{
+ arr.push({
+ val:data.data[i-1].StationName2,
+ txt:data.data[i-1].StationName2,
+ });
+ }
+ }
+ updataSel($Ostation_name1, arr);
+ }
+ findCounty();
+ }
+ });
+ }
+
+//褰撳競鏀瑰彉鏃舵洿鏂板尯/鍘�
+ function findCounty(){
+ var data = {
+ StationName1: $("#mainteArea").val(),
+ StationName2:$("#city").val(),
+ };
+ //console.info(data);
+ $.ajax({
+ type: "post",
+ url: "BattInfAction!serchStationName5",
+ async:true,
+ dataType:'json',
+ data:"json = "+JSON.stringify(data),
+ success: function(data){
+ data = data.result;
+ data = eval("("+data+")");
+ //console.info(data);
+ //console.info(data.code);
+ if(data.code==1&&data.data.length>0){
+ var $Ostation_name1=$("#country");
+ $Ostation_name1.text("");
+ var arr = new Array();
+ for(var i=0;i<=data.data.length;i++)
+ {
+ if(i == 0){
+ arr.push({
+ val:"",
+ txt:"鍏ㄩ儴(鍏�"+data.data.length+"涓�)",
+ });
+ }else{
+ arr.push({
+ val:data.data[i-1].StationName5,
+ txt:data.data[i-1].StationName5,
+ });
+ }
+ }
+ updataSel($Ostation_name1, arr);
+ }
+ findStationNamebyStationname1();
+ }
+ });
+ }
+
+ //褰撳尯鍘挎洿鏂版椂鏇存柊鏈烘埧
+ function findStationNamebyStationname1(){
+ var data = {
+ StationName1: $("#mainteArea").val(),
+ StationName2:$("#city").val(),
+ StationName5:$("#country").val()
+ };
+ //console.info(data);
+ $.ajax({
+ type: "post",
+ url: "BattInfAction!serchStationName3",
+ async:true,
+ dataType:'json',
+ data:"json = "+JSON.stringify(data),
+ success: function(data){
+ data = data.result;
+ data = eval("("+data+")");
+ //console.info(data);
+ //console.info(data.code);
+ if(data.code==1&&data.data.length>0){
+ var $Ostation_name1=$("#homeName");
+ $Ostation_name1.text("");
+ var arr = new Array();
+ for(var i=0;i<=data.data.length;i++)
+ {
+ if(i == 0){
+ arr.push({
+ val:"",
+ stationid:"",
+ txt:"鍏ㄩ儴(鍏�"+data.data.length+"涓�)",
+ });
+ }else{
+ arr.push({
+ val:data.data[i-1].StationName3,
+ stationid:data.data[i-1].StationId,
+ txt:data.data[i-1].StationName3,
+ });
+ }
+ }
+ //console.info(111111111111111);
+ updataSelStation($Ostation_name1, arr);
+ }
+
+ findserchByBattGroupNamebystationname();
+ }
+ });
+ }
+
+ //鏍规嵁鏈烘埧鑾峰彇鐢垫睜缁�
+ function findserchByBattGroupNamebystationname(){
+ var stationid = $("#station_name").find('option:selected').attr('stationid')?$("#station_name").find('option:selected').attr('stationid'):'';
+
+ var data = {
+ StationName1: $("#mainteArea").val(),
+ StationName2:$("#city").val(),
+ StationName5:$("#country").val(),
+ StationName: $("#homeName").val(),
+ StationId: stationid
+ };
+
+ //console.info(data);
+ $.ajax({
+ type: "post",
+ url: "BattInfAction!serchBattByStation",
+ async:true,
+ dataType:'json',
+ data:"json = "+JSON.stringify(data),
+ success: function(data){
+ data = data.result;
+ data = eval("("+data+")");
+ //console.warn();
+ //console.info(data);
+ //console.info(data.code);
+ if(data.code==1&&data.data.length>0){
+ var $Ostation_name1=$("#battgroup_name");
+ $Ostation_name1.text("");
+ var arr = new Array();
+ for(var i=0;i<=data.data.length;i++)
+ {
+ if(i == 0){
+ arr.push({
+ val:0,
+ txt:"鍏ㄩ儴(鍏�"+data.data.length+"涓�)",
+ });
+ }else{
+ arr.push({
+ val:data.data[i-1].BattGroupId,
+ txt:data.data[i-1].BattGroupName,
+ });
+ }
+ }
+ updataSel($Ostation_name1, arr);
+ }
+
+ }
+ });
+ }
+
+ //褰撶渷鏀瑰彉鏃舵洿鏂板競
+ $('#mainteArea').change(function(){
+ findCity();
+ });
+ //褰撳競鏀瑰彉鏃舵敼鍙樺尯/鍘�
+ $('#city').change(function(){
+ findCounty();
+ });
+ //褰撳尯/鍘挎敼鍙樻椂鏀瑰彉鏈烘埧
+ $('#country').change(function(){
+ findStationNamebyStationname1();
+ });
+ //褰撴満鎴挎敼鍙樻椂锛屾洿鏂扮數姹犵粍
+ $('#homeName').change(function(){
+ findserchByBattGroupNamebystationname();
+ });
+
+
+
+ $(function() {
+ //鐐瑰嚮涓婁竴椤�
+ $('.pre-page').on('click', 'a', function() {
+ if(Page.pageCurr>1){
+ Page.pageCurr = Page.pageCurr - 1;
+ searchBadBatt();
+ }
+ });
+
+ //鐐瑰嚮涓嬩竴椤�
+ $('.next-page').on('click', 'a', function() {
+ var pageNum = Math.ceil(Page.pageAll/Page.pageSize);
+ if(Page.pageCurr<pageNum){
+ Page.pageCurr = Page.pageCurr + 1;
+ searchBadBatt();
+ }
+ });
+ });
+
+
+ // 鍒ゆ柇鏄惁鏄剧ず缈婚〉鎸夐挳
+ function setPageTurning(isShowPre, isShowNext) {
+ if(isShowPre) { // 鍒ゆ柇鏄惁鏄剧ず鍚戜笂缈婚〉鎸夐挳
+ $('.pre-page').show();
+ }else {
+ $('.pre-page').hide();
+ }
+
+ if(isShowNext) { // 鍒ゆ柇鏄惁鏄剧ず鍚戜笅缈婚〉鎸夐挳
+ $('.next-page').show();
+ }else {
+ $('.next-page').hide();
+ }
+ }
+
+ //璁剧疆椤甸潰鐨勮烦杞摼鎺�
+ function setPage(){
+ if(Page.pageCurr <= 1){
+ $('.pre-page').hide();
+ }else{
+ $('.pre-page').show();
+ }
+ var pageNum = Math.ceil(Page.pageAll/Page.pageSize);
+
+ if(Page.pageCurr < pageNum){
+ $('.next-page').show();
+ }else{
+ $('.next-page').hide();
+ }
+
+ }
+ </script>
+</html>
\ No newline at end of file
diff --git a/gx_tieta/WebRoot/mobil/batt-traffic-statistics.html b/gx_tieta/WebRoot/mobil/batt-traffic-statistics.html
new file mode 100644
index 0000000..11b7eca
--- /dev/null
+++ b/gx_tieta/WebRoot/mobil/batt-traffic-statistics.html
@@ -0,0 +1,555 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+ <meta charset="UTF-8">
+ <title>璁惧娴侀噺缁熻鏌ヨ</title>
+ <meta name="viewport" content="width=device-width,initial-scale=1">
+ <meta name="apple-mobile-web-app-capable" content="yes">
+ <meta name="apple-mobile-web-app-status-bar-style" content="black">
+ <link rel="stylesheet" href="mobilCss/jquery.mobile-1.4.5.min.css"/>
+ <link href="mobilCss/mobiscroll.core-2.5.2.css" rel="stylesheet" type="text/css" />
+ <link href="mobilCss/mobiscroll.animation-2.5.2.css" rel="stylesheet" type="text/css" />
+ <link rel="stylesheet" type="text/css" href="css/tbl.css">
+ <script type="text/javascript" src="mobilJs/jquery-1.8.2.js"></script>
+ <script type="text/javascript" src="mobilJs/jquery.mobile-1.4.5.min.js"></script>
+ <style type="text/css">
+
+ /*瑙勫畾闈㈡澘鐨勬牱寮�*/
+ .ui-panel {
+ width: 80%;
+ }
+ .ui-panel-dismiss{
+ width: 20%;
+ }
+ .ui-panel-inner{
+ padding:0 !important;
+ }
+ .ui-collapsible-heading-toggle{
+ padding-left: 1em !important;
+ }
+ .panel-header{
+ padding: 8px 0;
+ font-size: 1.2em;
+ text-indent: 1em;
+ background-color: #DFDCDC;
+ }
+ /*瑙勫畾寮�鍏崇殑浣嶇疆*/
+ .ui-flipswitch {
+ margin-left: 0.5em;
+ }
+
+ .ui-field-contain{
+ padding: 0 0.6em ;
+ }
+ .ui-field-contain {
+ border-bottom-color: #828282;
+ border-bottom-color: rgba(0,0,0,.15);
+ border-bottom-width: 1px;
+ border-bottom-style: none;
+ }
+ .sicon{
+ display:inline-block;width:4%;margin:1em 0;float:left;
+ }
+ .checkdata{
+ display:inline-block;width:48%;margin:0 0 0 0;float:left;
+ }
+
+ .next-page, .pre-page {
+ position: fixed;
+ width: 40px;
+ height: 40px;
+ top: 50%;
+ margin-top: -15px;
+ }
+ .next-page {
+ right: 0;
+ }
+ .pre-page {
+ left: 0;
+ }
+
+
+ table {
+ margin-top:.5em;
+ border-collapse:separate;
+ border-spacing:0 .5em;
+ }
+
+ tbody tr td{
+ overflow: hidden;
+ text-overflow:ellipsis;
+ white-space: nowrap;
+ }
+ </style>
+ <link rel="stylesheet" href="css/fgpanel.css">
+</head>
+<body>
+ <div data-role="page">
+ <div class="fg-panel">
+ <form>
+ <div class="fg-panel-header">绛涢��</div>
+ <div class="fg-panel-content">
+ <fieldset data-role="controlgroup">
+ <p>鐪�</p>
+ <select id="mainteArea" data-mini="true">
+ <option value="">鍏ㄩ儴</option>
+ <option value="">涓�鏋㈢航</option>
+ <option value="">浜屾灑绾�</option>
+ <option value="">鏋㈢航妤�</option>
+ </select>
+ <p>甯�</p>
+ <select id="city" data-mini="true">
+ <option value="">鍏ㄩ儴</option>
+ </select>
+ <p>鍖�/鍘�</p>
+ <select id="country" data-mini="true">
+ <option value="">鍏ㄩ儴</option>
+ </select>
+ <p>鏈烘埧绔欑偣</p>
+ <select id="homeName" data-mini="true">
+ <option value="">鍏ㄩ儴</option>
+ </select>
+ <p>缁熻鏂瑰紡</p>
+ <select id="" data-mini="true">
+ <option value="">鎸夊勾缁熻</option>
+ <option value="">鎸夋湀缁熻</option>
+ <option value="">鎸夋棩缁熻</option>
+ </select>
+ <p>鏃堕棿娈�</p>
+ <div class="checkdata">
+ <input id="startTestrecord" type="text" name="appDate" class="appDatefir" value="2000-01-01" />
+ </div>
+ <span class="sicon">¯</span>
+ <div class="checkdata">
+ <input id="endTestrecord" type="text" name="appDate" class="appDatesec" value="2017-01-01" />
+ </div>
+
+ </fieldset>
+ </div>
+ <div class="fg-panel-btn">
+ <a href="javascript:panel.hide(true);" id="submit" data-role="button" class="ui-btn ui-mini ui-btn-b ui-shadow">纭畾</a>
+ </div>
+ </form>
+ </div>
+ <!-- 澶撮儴鍐呭 -->
+ <div data-role="header" data-position="fixed">
+ <a href="count-report.html" target="_top" class="ui-btn ui-corner-all ui-shadow ui-icon-back ui-btn-icon-left" style="padding-top: 0.7em; padding-bottom: 0.7em;">杩斿洖</a>
+ <h1>璁惧娴侀噺缁熻鏌ヨ</h1>
+ <a href="javascript:panel.show();" class="ui-btn ui-corner-all ui-shadow ui-icon-grid ui-btn-icon-left" style="padding-top: 0.7em; padding-bottom: 0.7em;" id="screen">绛涢��</a>
+ </div>
+ <!-- 涓讳綋鍐呭 -->
+ <div data-role="main">
+ <div class="pre-page"><a href="#" class="ui-btn ui-corner-all ui-icon-carat-l ui-btn-icon-notext">鍥炬爣</a></div>
+ <div class="next-page"><a href="#" class="ui-btn ui-corner-all ui-icon-carat-r ui-btn-icon-notext">鍥炬爣</a></div>
+ <!-- 琛ㄦ牸瀹瑰櫒 -->
+ <div class="tbl-container"></div>
+ <table data-role="table" class="ui-responsive ui-shadow" id="tab" >
+
+ </table>
+ </div>
+ </div>
+</body>
+
+<script src="mobilJs/mobiscroll.core-2.5.2.js" type="text/javascript"></script>
+<script src="mobilJs/mobiscroll.core-2.5.2-zh.js" type="text/javascript"></script>
+<script src="mobilJs/mobiscroll.datetime-2.5.1.js" type="text/javascript"></script>
+<script src="mobilJs/mobiscroll.datetime-2.5.1-zh.js" type="text/javascript"></script>
+<script type="text/javascript" src="js/tbl.js"></script>
+<script type="text/javascript" src="mobilJs/base.js"></script>
+<script type="text/javascript" src="js/panel.js"></script>
+<script type="text/javascript">
+ $(function () {
+ setTimes($("#startTestrecord"),'2000-01-01');
+ setTimes($("#endTestrecord"),new Date().format('yyyy-MM-dd'));
+
+ });
+</script>
+ <script type="text/javascript">
+ $('document').ready(function(){panel.show();});
+
+ var arr=new Array(); //褰撳墠琛ㄦ牸td鏁版嵁
+ var Page = {
+ pageSize:10, //姣忛〉鐨勮鏁�
+ pageCurr:1, //褰撳墠椤电爜鏁�
+ pageAll:0,
+ };
+
+ var arrTh = ['缁熻鏃堕棿娈�', '鐪�', '甯�', '鏈烘埧鍚嶇О','娴侀噺'];
+ dataArr = [];
+ var startTime = "1980-01-01";
+ var endTime = new Date().format('yyyy-MM-dd');
+ var tbl = $('.tbl-container');
+ createTbl(tbl, arrTh, dataArr);
+ $(document).ready(function(){
+ setPage();
+ $("#submit").click(function(){
+ Page.pageCurr=1;
+ searchBadBatt();
+ });
+ });
+
+ //鏌ヨ鐢垫睜淇℃伅
+ function searchBadBatt(){
+ loadshow();
+ var stationid = $("#station_name").find('option:selected').attr('stationid')?$("#station_name").find('option:selected').attr('stationid'):'';
+ var temp = createSearchForm();
+ console.info(stationid);
+ /*var temp = {
+ StationName1:$("#station_name1").val(),
+ StationName2:$("#city").val(),
+ StationName5: $("#county").val(),
+ StationName: $("#station_name").val(),
+ StationId: stationid
+ };*/
+ //console.info(temp);
+ var json = JSON.stringify(temp);
+ //console.info(json);
+ arrTd = new Array();
+ $.post("Batt_Maint_DealarmAction_serchByConditionNew","result="+json,function(data){
+ data=eval("("+data.result+")");
+ //console.info(data);
+ if(data.code==1 && data.data.length>0){
+ data=data.data;
+ //console.info(data);
+ arr=new Array();
+ index=0;
+ for(var i=0;i<data.length;i++){
+ Page.pageAll=data[i].Size;
+ arr[index++]=data[i].BattGroupId; //鐢垫睜缁刬d
+ arr[index++]=data[i].StationName; //鏈烘埧鍚嶇О
+ arr[index++]=data[i].StationIp; //鏈烘埧IP
+ arr[index++]=data[i].BattGroupName; //鐢垫睜缁勫悕绉�
+ arr[index++]=data[i].BattGroupNum; //鐢垫睜缁勫簭鍙�
+
+
+ }
+ //console.info(Page);
+ createTbl(tbl, arrTh, arr);
+
+ }else{
+ $('#searchNull').popup('open');
+ Page.pageAll = 0;
+ }
+ setPage();
+ //console.info(Page);
+ loadclose();
+ }).error(function(){
+ loadclose();
+ $('#searchErr').popup('open');
+ });
+
+ }
+
+
+
+ function createSearchForm(){
+ var temp={
+ page:{
+ pageCurr:Page.pageCurr,
+ pageSize:Page.pageSize,
+ },
+ binf:{
+ StationName1:$('#mainteArea').val(),
+ StationName2:$('#city').val(),
+ StationName5:$('#country').val(),
+ StationName:$('#homeName').val(),
+
+ },
+
+ tdata:{
+
+ record_time:$('#startTestrecord').val(), //鐢垫睜娴嬭瘯璁板綍鏃堕棿娈�
+ record_time1:$('#endTestrecord').val()
+
+ }
+
+ };
+ return temp;
+ }
+ // stringify(createSearchForm());
+ //椤甸潰鍔犺浇鏃舵煡璇㈢渷
+ $.post("BattInfAction_serchByStation",null,function(data){
+ data = data.result;
+ data = eval("("+data+")");
+ //console.info(data);
+ //console.info(data.code);
+ if(data.code==1&&data.data.length>0){
+ var $Ostation_name1=$("#mainteArea");
+ $Ostation_name1.text("");
+ var arr = new Array();
+ for(var i=0;i<=data.data.length;i++)
+ {
+ if(i == 0){
+ arr.push({
+ val:"",
+ txt:"鍏ㄩ儴(鍏�"+data.sum+"涓�)",
+ });
+ }else{
+ arr.push({
+ val:data.data[i-1].StationName1,
+ txt:data.data[i-1].StationName1,
+ });
+ }
+ }
+ updataSel($Ostation_name1, arr);
+ }
+ findCity();
+ });
+
+
+//褰撶渷鏀瑰彉鏃舵洿鏂板競
+ function findCity(){
+ var data = {
+ StationName1: $("#mainteArea").val()
+ };
+ //console.info(data);
+ // 璇锋眰鑾峰彇褰撳墠鐪佷笅鐨勫競
+ $.ajax({
+ type: "post",
+ url: "BattInfAction!serchStationName2",
+ async:true,
+ dataType:'json',
+ data:"json = "+JSON.stringify(data),
+ success: function(data){
+ data = data.result;
+ data = eval("("+data+")");
+ //console.info(data);
+ //console.info(data.code);
+ if(data.code==1&&data.data.length>0){
+ var $Ostation_name1=$("#city");
+ $Ostation_name1.text("");
+ var arr = new Array();
+ for(var i=0;i<=data.data.length;i++)
+ {
+ if(i == 0){
+ arr.push({
+ val:"",
+ txt:"鍏ㄩ儴(鍏�"+data.data.length+"涓�)",
+ });
+ }else{
+ arr.push({
+ val:data.data[i-1].StationName2,
+ txt:data.data[i-1].StationName2,
+ });
+ }
+ }
+ updataSel($Ostation_name1, arr);
+ }
+ findCounty();
+ }
+ });
+ }
+
+//褰撳競鏀瑰彉鏃舵洿鏂板尯/鍘�
+ function findCounty(){
+ var data = {
+ StationName1: $("#mainteArea").val(),
+ StationName2:$("#city").val(),
+ };
+ //console.info(data);
+ $.ajax({
+ type: "post",
+ url: "BattInfAction!serchStationName5",
+ async:true,
+ dataType:'json',
+ data:"json = "+JSON.stringify(data),
+ success: function(data){
+ data = data.result;
+ data = eval("("+data+")");
+ //console.info(data);
+ //console.info(data.code);
+ if(data.code==1&&data.data.length>0){
+ var $Ostation_name1=$("#country");
+ $Ostation_name1.text("");
+ var arr = new Array();
+ for(var i=0;i<=data.data.length;i++)
+ {
+ if(i == 0){
+ arr.push({
+ val:"",
+ txt:"鍏ㄩ儴(鍏�"+data.data.length+"涓�)",
+ });
+ }else{
+ arr.push({
+ val:data.data[i-1].StationName5,
+ txt:data.data[i-1].StationName5,
+ });
+ }
+ }
+ updataSel($Ostation_name1, arr);
+ }
+ findStationNamebyStationname1();
+ }
+ });
+ }
+
+ //褰撳尯鍘挎洿鏂版椂鏇存柊鏈烘埧
+ function findStationNamebyStationname1(){
+ var data = {
+ StationName1: $("#mainteArea").val(),
+ StationName2:$("#city").val(),
+ StationName5:$("#country").val()
+ };
+ //console.info(data);
+ $.ajax({
+ type: "post",
+ url: "BattInfAction!serchStationName3",
+ async:true,
+ dataType:'json',
+ data:"json = "+JSON.stringify(data),
+ success: function(data){
+ data = data.result;
+ data = eval("("+data+")");
+ //console.info(data);
+ //console.info(data.code);
+ if(data.code==1&&data.data.length>0){
+ var $Ostation_name1=$("#homeName");
+ $Ostation_name1.text("");
+ var arr = new Array();
+ for(var i=0;i<=data.data.length;i++)
+ {
+ if(i == 0){
+ arr.push({
+ val:"",
+ stationid:"",
+ txt:"鍏ㄩ儴(鍏�"+data.data.length+"涓�)",
+ });
+ }else{
+ arr.push({
+ val:data.data[i-1].StationName3,
+ stationid:data.data[i-1].StationId,
+ txt:data.data[i-1].StationName3,
+ });
+ }
+ }
+ //console.info(111111111111111);
+ updataSelStation($Ostation_name1, arr);
+ }
+
+ findserchByBattGroupNamebystationname();
+ }
+ });
+ }
+
+ //鏍规嵁鏈烘埧鑾峰彇鐢垫睜缁�
+ function findserchByBattGroupNamebystationname(){
+ var stationid = $("#station_name").find('option:selected').attr('stationid')?$("#station_name").find('option:selected').attr('stationid'):'';
+
+ var data = {
+ StationName1: $("#mainteArea").val(),
+ StationName2:$("#city").val(),
+ StationName5:$("#country").val(),
+ StationName: $("#homeName").val(),
+ StationId: stationid
+ };
+
+ //console.info(data);
+ $.ajax({
+ type: "post",
+ url: "BattInfAction!serchBattByStation",
+ async:true,
+ dataType:'json',
+ data:"json = "+JSON.stringify(data),
+ success: function(data){
+ data = data.result;
+ data = eval("("+data+")");
+ //console.warn();
+ //console.info(data);
+ //console.info(data.code);
+ if(data.code==1&&data.data.length>0){
+ var $Ostation_name1=$("#battgroup_name");
+ $Ostation_name1.text("");
+ var arr = new Array();
+ for(var i=0;i<=data.data.length;i++)
+ {
+ if(i == 0){
+ arr.push({
+ val:0,
+ txt:"鍏ㄩ儴(鍏�"+data.data.length+"涓�)",
+ });
+ }else{
+ arr.push({
+ val:data.data[i-1].BattGroupId,
+ txt:data.data[i-1].BattGroupName,
+ });
+ }
+ }
+ updataSel($Ostation_name1, arr);
+ }
+
+ }
+ });
+ }
+
+ //褰撶渷鏀瑰彉鏃舵洿鏂板競
+ $('#mainteArea').change(function(){
+ findCity();
+ });
+ //褰撳競鏀瑰彉鏃舵敼鍙樺尯/鍘�
+ $('#city').change(function(){
+ findCounty();
+ });
+ //褰撳尯/鍘挎敼鍙樻椂鏀瑰彉鏈烘埧
+ $('#country').change(function(){
+ findStationNamebyStationname1();
+ });
+ //褰撴満鎴挎敼鍙樻椂锛屾洿鏂扮數姹犵粍
+ $('#homeName').change(function(){
+ findserchByBattGroupNamebystationname();
+ });
+
+
+
+ $(function() {
+ //鐐瑰嚮涓婁竴椤�
+ $('.pre-page').on('click', 'a', function() {
+ if(Page.pageCurr>1){
+ Page.pageCurr = Page.pageCurr - 1;
+ searchBadBatt();
+ }
+ });
+
+ //鐐瑰嚮涓嬩竴椤�
+ $('.next-page').on('click', 'a', function() {
+ var pageNum = Math.ceil(Page.pageAll/Page.pageSize);
+ if(Page.pageCurr<pageNum){
+ Page.pageCurr = Page.pageCurr + 1;
+ searchBadBatt();
+ }
+ });
+ });
+
+
+ // 鍒ゆ柇鏄惁鏄剧ず缈婚〉鎸夐挳
+ function setPageTurning(isShowPre, isShowNext) {
+ if(isShowPre) { // 鍒ゆ柇鏄惁鏄剧ず鍚戜笂缈婚〉鎸夐挳
+ $('.pre-page').show();
+ }else {
+ $('.pre-page').hide();
+ }
+
+ if(isShowNext) { // 鍒ゆ柇鏄惁鏄剧ず鍚戜笅缈婚〉鎸夐挳
+ $('.next-page').show();
+ }else {
+ $('.next-page').hide();
+ }
+ }
+
+ //璁剧疆椤甸潰鐨勮烦杞摼鎺�
+ function setPage(){
+ if(Page.pageCurr <= 1){
+ $('.pre-page').hide();
+ }else{
+ $('.pre-page').show();
+ }
+ var pageNum = Math.ceil(Page.pageAll/Page.pageSize);
+
+ if(Page.pageCurr < pageNum){
+ $('.next-page').show();
+ }else{
+ $('.next-page').hide();
+ }
+
+ }
+ </script>
+</html>
\ No newline at end of file
diff --git a/gx_tieta/WebRoot/mobil/count-report.html b/gx_tieta/WebRoot/mobil/count-report.html
index 77d36b5..7d3bfbb 100644
--- a/gx_tieta/WebRoot/mobil/count-report.html
+++ b/gx_tieta/WebRoot/mobil/count-report.html
@@ -46,6 +46,12 @@
<li>
<a href="batt-state-manage.html" target="_top" data-transition="slidefade">鏈烘埧瀹炴椂鐘舵�佹煡璇�</a>
</li>
+ <li>
+ <a href="batt-state-statistical.html" target="_top" data-transition="slidefade">鏈烘埧鍘嗗彶浜嬩欢鏌ヨ</a>
+ </li>
+ <li>
+ <a href="batt-traffic-statistics.html" target="_top" data-transition="slidefade">璁惧娴侀噺缁熻鏌ヨ</a>
+ </li>
<!-- <li>
<a href="powercut.html" data-ajax="false" data-transition="slidefade">鏈烘埧鍋滅數鏌ヨ</a>
</li>
diff --git a/gx_tieta/WebRoot/pages/js/common.js b/gx_tieta/WebRoot/pages/js/common.js
index cf9e222..d9071ea 100644
--- a/gx_tieta/WebRoot/pages/js/common.js
+++ b/gx_tieta/WebRoot/pages/js/common.js
@@ -464,6 +464,7 @@
gl.namespace('CMD.gprs');
gl.CMD.gprs.param = 145;
gl.CMD.gprs.signal = "CSQ";
+ gl.CMD.gprs.threadinfo = 0x17;
})(jQuery, window, document, GLOBAL);
// 鍦板浘淇℃伅
diff --git a/gx_tieta/src/com/fgkj/actions/ram/Bts_station_stateAction.java b/gx_tieta/src/com/fgkj/actions/ram/Bts_station_stateAction.java
index d3a110f..7537c98 100644
--- a/gx_tieta/src/com/fgkj/actions/ram/Bts_station_stateAction.java
+++ b/gx_tieta/src/com/fgkj/actions/ram/Bts_station_stateAction.java
@@ -27,14 +27,20 @@
return SUCCESS;
}
- //鏈烘埧鏂數缁熻(棣栭〉涓婄殑楗肩姸鍥�)
+ //鏈烘埧鏂數缁熻(棣栭〉涓婄殑楗肩姸鍥�)
public String serchPowerOff(){
User_inf uinf=(User_inf) ActionUtil.getUser();
ServiceModel model = service.serchPowerOff(uinf);
result = tojson(model);
return SUCCESS;
}
-
+ //鍦板浘鍙充笅瑙掓樉绀哄嚭宸插畨瑁呮満鎴夸腑(鍋滅數鏁�/鎺夌珯鏁�/鏈烘埧鍛婅鏁�/钀藉悗鍗曚綋鏈烘埧鏁�)
+ public String serchStationState(){
+ User_inf uinf=(User_inf) ActionUtil.getUser();
+ ServiceModel model = service.serchStationState(uinf);
+ result = tojson(model);
+ return SUCCESS;
+ }
diff --git a/gx_tieta/src/com/fgkj/dao/impl/BadBatt_monImpl.java b/gx_tieta/src/com/fgkj/dao/impl/BadBatt_monImpl.java
index 0d3825a..04aeb5e 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/BadBatt_monImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/BadBatt_monImpl.java
@@ -377,8 +377,38 @@
}
return list;
}
-
-
+
+ //鏌ヨ瀛樺湪钀藉悗鍗曚綋寰楁満鎴夸釜鏁�
+ public int searchBadBattInStation(Object obj) {
+ User_inf uinf=(User_inf) obj;
+ String sql=" select count(distinct db_battinf.tb_battinf.stationid) as nums from db_battinf.tb_battinf where station_install=1 " +
+ " and db_battinf.tb_battinf.battgroupid in (select distinct tb_badbatt_mon.BattGroupId from web_site.tb_badbatt_mon) " +
+ " and db_battinf.tb_battinf.stationid in ( select distinct db_user.tb_user_battgroup_baojigroup_battgroup.stationid " +
+ " from db_user.tb_user_battgroup_baojigroup_battgroup,db_user.tb_user_battgroup_baojigroup_usr " +
+ " where db_user.tb_user_battgroup_baojigroup_battgroup.baoji_group_id=db_user.tb_user_battgroup_baojigroup_usr.baoji_group_id " +
+ " and db_user.tb_user_battgroup_baojigroup_usr.uId=? ) ";
+ //System.out.println(sql);
+ List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{uinf.getUId()}, new CallBack() {
+
+ public List getResults(ResultSet rs) {
+ List list=new ArrayList();
+ try {
+ while(rs.next()){
+ list.add(rs.getInt("nums"));
+ }
+ } catch (SQLException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ return list;
+ }
+ });
+ int nums=0;//鏈�鍚庣殑缁撴灉
+ if(list!=null&&list.size()>0){
+ nums=(Integer) list.get(list.size()-1);
+ }
+ return nums;
+ }
public static void main(String[] args) throws ParseException {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
Date date1 = sdf.parse("2000-01-01");
@@ -410,10 +440,12 @@
bmd.setBinf(binf);
bmd.setPage(page);
bmd.setUinf(uinf);
- List<Batt_Maint_Dealarm> list=bimpl.serchByInfo(bmd);
+ /*List<Batt_Maint_Dealarm> list=bimpl.serchByInfo(bmd);
for (Batt_Maint_Dealarm b : list) {
System.out.println(b);
- }
+ }*/
+ int nums=bimpl.searchBadBattInStation(uinf);
+ System.out.println(nums);
}
diff --git a/gx_tieta/src/com/fgkj/dao/impl/Battalarm_dataDAOImpl.java b/gx_tieta/src/com/fgkj/dao/impl/Battalarm_dataDAOImpl.java
index 97f1712..e6ffb26 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/Battalarm_dataDAOImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/Battalarm_dataDAOImpl.java
@@ -1898,7 +1898,36 @@
return list;
}
-
+ //鏌ヨ瀛樺湪鐢垫睜鍛婅鐨勬満鎴夸釜鏁�
+ public int searchAlarmInStation(Object obj){
+ User_inf uinf=(User_inf) obj;
+ String sql=" select count(distinct db_battinf.tb_battinf.stationid) as nums from db_battinf.tb_battinf where station_install=1 " +
+ " and db_battinf.tb_battinf.battgroupid in (select distinct db_alarm.tb_battalarm_data.battgroupid from db_alarm.tb_battalarm_data) " +
+ " and db_battinf.tb_battinf.stationid in ( select distinct db_user.tb_user_battgroup_baojigroup_battgroup.stationid " +
+ " from db_user.tb_user_battgroup_baojigroup_battgroup,db_user.tb_user_battgroup_baojigroup_usr " +
+ " where db_user.tb_user_battgroup_baojigroup_battgroup.baoji_group_id=db_user.tb_user_battgroup_baojigroup_usr.baoji_group_id " +
+ " and db_user.tb_user_battgroup_baojigroup_usr.uId=? ) " ;
+ List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{uinf.getUId()}, new CallBack() {
+
+ public List getResults(ResultSet rs) {
+ List list=new ArrayList();
+ try {
+ while(rs.next()){
+ list.add(rs.getInt("nums"));
+ }
+ } catch (SQLException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ return list;
+ }
+ });
+ int nums=0;//鏈�鍚庣殑缁撴灉
+ if(list!=null&&list.size()>0){
+ nums=(Integer) list.get(list.size()-1);
+ }
+ return nums;
+ }
public static void main(String[] args) throws ParseException {
Battalarm_dataDAOImpl bimp = new Battalarm_dataDAOImpl();
@@ -1970,7 +1999,9 @@
for (int num : list) {
System.out.println(num);
}*/
- List list=bimp.serchIn30(uinf);
- System.out.println(list.size());
+ //List list=bimp.serchIn30(uinf);
+ //System.out.println(list.size());
+ int nums=bimp.searchAlarmInStation(uinf);
+ System.out.println(nums);
}
}
diff --git a/gx_tieta/src/com/fgkj/dao/impl/ram/Bts_station_stateImpl.java b/gx_tieta/src/com/fgkj/dao/impl/ram/Bts_station_stateImpl.java
index 26ef434..e8d8225 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/ram/Bts_station_stateImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/ram/Bts_station_stateImpl.java
@@ -182,13 +182,9 @@
public int serchByState(Object obj) {
User_inf uinf=(User_inf) obj;
String sql=" select count(*) as nums from db_ram_db.tb_bts_station_state where station_stat&2>1 " +
- " and tb_bts_station_state.station_id in (" +
- " select distinct db_battinf.tb_battinf.stationid " +
- " from db_battinf.tb_battinf " +
- " left outer join db_user.tb_user_battgroup_baojigroup_battgroup on db_user.tb_user_battgroup_baojigroup_battgroup.stationid=db_battinf.tb_battinf.stationid " +
- " left outer join db_user.tb_user_battgroup_baojigroup_usr on db_user.tb_user_battgroup_baojigroup_usr.baoji_group_id=db_user.tb_user_battgroup_baojigroup_battgroup.baoji_group_id " +
- " left outer join db_user.tb_user_inf on tb_user_inf.uid=db_user.tb_user_battgroup_baojigroup_usr.uid " +
- " where db_user.tb_user_inf.uid=? ) " ;
+ " and tb_bts_station_state.station_id in (" +
+ " select distinct db_user.tb_user_battgroup_baojigroup_battgroup.StationId from db_user.tb_user_battgroup_baojigroup_battgroup,db_user.tb_user_battgroup_baojigroup_usr where db_user.tb_user_battgroup_baojigroup_battgroup.baoji_group_id=db_user.tb_user_battgroup_baojigroup_usr.baoji_group_id and db_user.tb_user_battgroup_baojigroup_usr.uId=?" +
+ " ) ";
List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{uinf.getUId()}, new CallBack() {
public List getResults(ResultSet rs) {
@@ -215,12 +211,8 @@
User_inf uinf=(User_inf) obj;
String sql=" select count(*) as nums from db_ram_db.tb_bts_station_state where station_stat&32>1 " +
" and tb_bts_station_state.station_id in (" +
- " select distinct db_battinf.tb_battinf.stationid " +
- " from db_battinf.tb_battinf " +
- " left outer join db_user.tb_user_battgroup_baojigroup_battgroup on db_user.tb_user_battgroup_baojigroup_battgroup.stationid=db_battinf.tb_battinf.stationid " +
- " left outer join db_user.tb_user_battgroup_baojigroup_usr on db_user.tb_user_battgroup_baojigroup_usr.baoji_group_id=db_user.tb_user_battgroup_baojigroup_battgroup.baoji_group_id " +
- " left outer join db_user.tb_user_inf on tb_user_inf.uid=db_user.tb_user_battgroup_baojigroup_usr.uid " +
- " where db_user.tb_user_inf.uid=? ) " ;
+ " select distinct db_user.tb_user_battgroup_baojigroup_battgroup.StationId from db_user.tb_user_battgroup_baojigroup_battgroup,db_user.tb_user_battgroup_baojigroup_usr where db_user.tb_user_battgroup_baojigroup_battgroup.baoji_group_id=db_user.tb_user_battgroup_baojigroup_usr.baoji_group_id and db_user.tb_user_battgroup_baojigroup_usr.uId=?" +
+ " ) ";
List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{uinf.getUId()}, new CallBack() {
public List getResults(ResultSet rs) {
@@ -242,7 +234,7 @@
}
return nums;
}
- //鏌ヨ褰撳墠鏈烘埧鍋滅數鏁�(鏍规嵁station_id )
+ //鏌ヨ鍏蜂綋鏌愭満鎴垮仠鐢垫暟(鏍规嵁station_id )
public int serchByStationId(Object obj) {
BattMap_information binformation=(BattMap_information) obj;
String sql="select count(num) as nums from db_ram_db.tb_bts_station_state " +
@@ -295,11 +287,11 @@
//System.out.println(bs.getStation_stat_diaozhan()+" "+bs.getStation_stat_dooropen()+" "+bs.getStation_stat_fadian()+" "+bs.getStation_stat_xuhang()+" "+bs.getStation_stat_poff());
System.out.println(bs);
}
- /*int nums=bimpl.serchByState(uinf);*/
+ int nums=bimpl.serchByState(uinf);
/*BattMap_information bm=new BattMap_information();
bm.setStationId("42000570");
int nums=bimpl.serchByStationId(bm);*/
- int nums=bimpl.serchByState_diaozhan(uinf);
+ //int nums=bimpl.serchByState_diaozhan(uinf);
System.out.println(nums);
}
diff --git a/gx_tieta/src/com/fgkj/services/ram/Bts_station_stateService.java b/gx_tieta/src/com/fgkj/services/ram/Bts_station_stateService.java
index 1416cc3..3f27a1d 100644
--- a/gx_tieta/src/com/fgkj/services/ram/Bts_station_stateService.java
+++ b/gx_tieta/src/com/fgkj/services/ram/Bts_station_stateService.java
@@ -4,9 +4,12 @@
import com.fgkj.dao.BaseDAO;
import com.fgkj.dao.BaseDAOFactory;
+import com.fgkj.dao.impl.BadBatt_monImpl;
import com.fgkj.dao.impl.BattInfImpl;
import com.fgkj.dao.impl.BattPower_offImpl;
+import com.fgkj.dao.impl.Battalarm_dataDAOImpl;
import com.fgkj.dao.impl.ram.Bts_station_stateImpl;
+import com.fgkj.dto.Battalarm_data;
import com.fgkj.dto.ServiceModel;
public class Bts_station_stateService {
@@ -47,4 +50,19 @@
model.setCode(dianzhanNum);
return model;
}
+ //鍦板浘鍙充笅瑙掓樉绀哄嚭宸插畨瑁呮満鎴夸腑(鍋滅數鏁�/鎺夌珯鏁�/鏈烘埧鍛婅鏁�/钀藉悗鍗曚綋鏈烘埧鏁�)
+ public ServiceModel serchStationState(Object obj){
+ int powerNum=((Bts_station_stateImpl)dao).serchByState(obj); //鍋滅數瀹炴椂鏁�
+ int dianzhanNum=((Bts_station_stateImpl)dao).serchByState_diaozhan(obj); //鎺夌珯瀹炴椂鏁�
+ int badbattNum=(new BadBatt_monImpl()).searchBadBattInStation(obj);//瀛樺湪钀藉悗鍗曚綋鐨勬満鎴夸釜鏁�
+ int alarmNum=(new Battalarm_dataDAOImpl()).searchAlarmInStation(obj);//瀛樺湪鐢垫睜鍛婅鐨勬満鎴夸釜鏁�
+ int devNum=(new BattInfImpl()).serchByDeviceId(obj); //鎬昏澶囨暟
+ model.setSum(powerNum);//鍋滅數瀹炴椂鏁�
+ model.setCode(dianzhanNum);//鎺夌珯瀹炴椂鏁�
+ model.setNewsum(devNum); //鎬昏澶囨暟
+ model.setMsgN(String.valueOf(badbattNum));//瀛樺湪钀藉悗鍗曚綋鐨勬満鎴夸釜鏁�
+ model.setMsg(String.valueOf(alarmNum));//瀛樺湪鐢垫睜鍛婅鐨勬満鎴夸釜鏁�
+ return model;
+ }
+
}
--
Gitblit v1.9.1