From f06c97b7d66d5108571d5a093e88827c459a2a76 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期四, 06 十二月 2018 10:24:48 +0800
Subject: [PATCH] 修改续航时间
---
gx_tieta/WebRoot/ele-param1.jsp | 3 ++-
gx_tieta/WebRoot/batt-state-manage.jsp | 42 +++++++++++++++++++++++++++++++-----------
gx_tieta/WebRoot/iframe/batt-info-add.html | 3 +--
3 files changed, 34 insertions(+), 14 deletions(-)
diff --git a/gx_tieta/WebRoot/batt-state-manage.jsp b/gx_tieta/WebRoot/batt-state-manage.jsp
index 048ff45..3510401 100644
--- a/gx_tieta/WebRoot/batt-state-manage.jsp
+++ b/gx_tieta/WebRoot/batt-state-manage.jsp
@@ -629,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++){
@@ -675,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);
}
// 寮�闂ㄥ叧闂ㄥ紓甯�
@@ -722,14 +722,34 @@
}
});
}
+
+ // 鑾峰彇缁埅鏃堕暱
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);
diff --git a/gx_tieta/WebRoot/ele-param1.jsp b/gx_tieta/WebRoot/ele-param1.jsp
index c5523e4..9437d58 100644
--- a/gx_tieta/WebRoot/ele-param1.jsp
+++ b/gx_tieta/WebRoot/ele-param1.jsp
@@ -496,7 +496,8 @@
function delBattGroup(obj) {
//console.log(obj);
var data = obj.data;
- var content = '鏄惁纭鍒犻櫎<span style="font-weight: bold; color: #FF5722">'+data.StationName3+'</span>'
+ var content = '鏄惁纭鍒犻櫎<span style="font-weight: bold; color: #FF5722">'+data.StationName3+
+ '-'+data.BattGroupName+'</span>'
layer.confirm(content,{
icon: 2
,title: '鎻愮ず'
diff --git a/gx_tieta/WebRoot/iframe/batt-info-add.html b/gx_tieta/WebRoot/iframe/batt-info-add.html
index 4082fd0..e671491 100644
--- a/gx_tieta/WebRoot/iframe/batt-info-add.html
+++ b/gx_tieta/WebRoot/iframe/batt-info-add.html
@@ -542,8 +542,7 @@
}, 3000);
}else{
layer.msg('娣诲姞澶辫触锛�');
- }
- loading.hideLoading($('#main'));
+ }
},
error:function(){
layer.msg('娣诲姞澶辫触锛�');
--
Gitblit v1.9.1