From 2fe250ece8de95b3f70172fe5b45793ab6a3084a Mon Sep 17 00:00:00 2001
From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139>
Date: 星期五, 18 一月 2019 17:30:50 +0800
Subject: [PATCH] 未审批可更改
---
gx_tieta/WebRoot/batt-state-manage.jsp | 92 ++++++++++++++++++++++++++++++++++++++-------
1 files changed, 77 insertions(+), 15 deletions(-)
diff --git a/gx_tieta/WebRoot/batt-state-manage.jsp b/gx_tieta/WebRoot/batt-state-manage.jsp
index a246567..052a8a7 100644
--- a/gx_tieta/WebRoot/batt-state-manage.jsp
+++ b/gx_tieta/WebRoot/batt-state-manage.jsp
@@ -16,7 +16,7 @@
<meta http-equiv="expires" content="0">
<meta http-equiv="keywords" content="keyword1,keyword2,keyword3">
<meta http-equiv="description" content="This is my page">
- <title><s:text name="Station_statequery"/></title> <!-- 鏈烘埧鐘舵�佹煡璇� -->
+ <title><s:text name="Station_real_status_query"/></title> <!-- 鏈烘埧瀹炴椂鐘舵�佹煡璇� -->
<link href="css/basic.css" rel="stylesheet">
<link rel="stylesheet" href="css/BrdwMaint.css">
<link rel="stylesheet" type="text/css" href="css/loading.css">
@@ -82,7 +82,7 @@
<!-- 涓讳綋鍐呭 -->
<div id="main">
<div id="eleInfor">
- <span class="summary"><s:text name="Station_statequery"/>--><s:text name="Show/hide_the_query_conditions"/></span>
+ <span class="summary"><s:text name="Station_real_status_query"/>--><s:text name="Show/hide_the_query_conditions"/></span>
<div class="checkCon filter-container">
<form action="" id="search_form">
<!-- 缁存姢鍖轰俊鎭� -->
@@ -170,6 +170,7 @@
<script type="text/javascript" src="js/createTab.js"></script>
<script type="text/javascript" src="src/layui.all.js"></script>
<script type="text/javascript" src="pages/js/common.js"></script>
+ <script type="text/javascript" src="js/rightmenu.js"></script>
<script type="text/javascript">
var Page={
pageCurr:1,
@@ -255,7 +256,36 @@
$('#paging .search').click(function() {
searchstationstate(true);
});
-
+
+ var menuItems = [{
+ txt: '瀹炴椂-鐩戞祴鏁版嵁',cla: 'menu-control'
+ }];
+ // 娣诲姞鍙抽敭鑿滃崟
+ tblHd.on('click', 'tbody tr', function(e) {
+ // 鍒ゆ柇鏄惁涓哄彸閿�
+ if(e.which == 3) {
+ var disX = (e || event).clientX + 10; //鑾峰彇榧犳爣鐐瑰嚮鐨勬í鍧愭爣
+ var disY = (e || event).clientY + 10; // 鑾峰彇榧犳爣鐐瑰嚮鐨勭旱鍧愭爣
+ var trData = $(this).data('attr');
+ menuItems[0].data = trData;
+ //console.log(trData);
+ rightMenu.showMenu(menuItems, disX, disY);
+ }
+ });
+
+ // 鐐瑰嚮瀹炴椂-鐩戞祴鏁版嵁璺宠浆
+ $('body').on('click', '.menu-control', function() {
+ var _data = $(this).data('data');
+ //console.log(_data);
+ var province = _data.stationName1;
+ var city = _data.stationName2;
+ var county = _data.stationName5;
+ var home = _data.stationName;
+
+ var url = skipUrl('control.jsp',province,city,county,home);
+ window.open(url);
+ });
+
// 鐐瑰嚮琛ㄦ牸閫夐」鏄剧ず琛ㄦ牸閫夐」寮瑰嚭妗�
$('#paging .card-opt').click(function() {
var checkboxList = $('#cardOption .con_table table tbody').find('input[type="checkbox"]');
@@ -599,7 +629,7 @@
var index = 0;
var data = JSON.parse(data.result);
if(data.code==1&&data.data!=null){
- //console.info(data.data);
+ console.info(data.data);
var data = data.data;
//console.info(data[0].dev_id);
for(var i=0;i<data.length;i++){
@@ -645,11 +675,11 @@
if(_data.station_stat_xuhang){
arrTd[index++] = create_fa_font('fa-television','red',{msg: '缁埅寮傚父'});
arrTd[index++] = _data.station_xuhang_start_time;
- arrTd[index++] = StringtoData(_data.station_xuhang_start_time);
+ arrTd[index++] = StringtoData(_data.station_xuhang_start_time);
}else{
arrTd[index++] = create_fa_font('fa-television','green',{msg: '姝ｅ父'});
- arrTd[index++] = "-";
- arrTd[index++] = formartTime(0);
+ arrTd[index++] = _data.station_xuhang_start_time;
+ arrTd[index++] = getXunHangTimeLong(_data.station_xuhang_end_time, _data.station_xuhang_start_time, _data.station_stat_xuhang);
}
// 寮�闂ㄥ叧闂ㄥ紓甯�
@@ -678,21 +708,53 @@
$('#current').text(Page.pageCurr+"/"+pageNum);
}
layer.close(load);
- createAllTbl(tblHd, tblBd, arrTh, arrTd, tblStatus);
+ createFullTbl(tblHd, tblBd, arrTh, arrTd, tblStatus);
+
+ // 缁欐瘡涓�琛屾坊鍔犳暟鎹�
+ var trList = tblBd.find('tbody tr');
+ // 閬嶅巻鍐呭缁檛r娣诲姞attr
+ for(var i=0; i<data.length; i++) {
+ trList.eq(i).data('attr', data[i]);
+ }
window.clearTimeout(myTimeOut);
myTimeOut = window.setTimeout(searchstationstate, 8000);
}
});
}
+
+ // 椤甸潰瀹瑰櫒澶у皬鏀瑰彉瑙﹀彂
+ $(window).resize(function() {
+ setTblWidth(tblHd, tblBd);
+ });
+
+ // 鑾峰彇缁埅鏃堕暱
function StringtoData(value){
- var date1= value; //寮�濮嬫椂闂�
- var date2 = new Date(); //缁撴潫鏃堕棿
- var date3 = date2.getTime() - new Date(date1).getTime(); //鏃堕棿宸殑姣鏁�
- var date4 = Math.floor(date3/(1000));
- return formartTime(date4);
- }
- //鏍煎紡鍖栨椂闂磛alue浼犲叆涓虹
+ var date1= value; //寮�濮嬫椂闂�
+ var date2 = new Date(); //缁撴潫鏃堕棿
+ var date3 = date2.getTime() - new Date(date1).getTime(); //鏃堕棿宸殑姣鏁�
+ var date4 = Math.floor(date3/(1000));
+ return formartTime(date4);
+ }
+
+ // 閫氳繃缁埅寮�濮嬫椂闂村拰缁撴潫鏃堕棿鑾峰彇缁埅鐨勬椂闀�
+ function getXunHangTimeLong(start, end, state) {
+ var timeLong = '';
+ if(start && end) {
+ var _timeLong = new Date(end).getTime()-new Date(start).getTime();
+ timeLong = Math.floor(_timeLong/(1000));
+ }
+
+ // 鏈�缁堟椂闂磝x澶﹛x鏃秞x鍒嗛挓
+ var rsTime = '-';
+ if(isNumber(timeLong)&&!state) {
+ rsTime = formartTime(timeLong)
+ }
+
+ return rsTime;
+ }
+
+ //鏍煎紡鍖栨椂闂磛alue浼犲叆涓虹
function formartTime(value){
value = Math.abs(parseInt(value));
//console.info(value);
--
Gitblit v1.9.1