From 67047bebb45c0426ac96df76ed18e3879ffc09b0 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.26>
Date: 星期四, 18 十月 2018 11:49:59 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/pages/css/pages/navconfig.css | 3 +
gx_tieta/WebRoot/navConfig.jsp | 7 ++-
gx_tieta/src/global_zh_CN.properties | 10 +++++
gx_tieta/WebRoot/batt-state-manage.jsp | 50 ++++++++++++++++++++-----
gx_tieta/WebRoot/batt-state-statistical.jsp | 10 -----
5 files changed, 56 insertions(+), 24 deletions(-)
diff --git a/gx_tieta/WebRoot/batt-state-manage.jsp b/gx_tieta/WebRoot/batt-state-manage.jsp
index b395055..c0afd76 100644
--- a/gx_tieta/WebRoot/batt-state-manage.jsp
+++ b/gx_tieta/WebRoot/batt-state-manage.jsp
@@ -24,7 +24,7 @@
<meta http-equiv="description" content="This is my page">
<style type="text/css">
- body {
+ body {
overflow-x: hidden !important;
}
#tbHead table{
@@ -65,7 +65,8 @@
.filter a:hover {
background-color: #2f97ff;
color: #FFFFFF;
- }
+ }
+
</style>
</head>
<body>
@@ -168,7 +169,7 @@
var tblStatus = new Array(); // 琛ㄦ牸鐘舵�佹暟缁�
var tblOptsHd = new Array(); // 琛ㄦ牸閫夐」澶撮儴
var tblOptsBd = new Array(); // 琛ㄦ牸閫夐」鏁扮粍
- arrTh = ['鐪�','甯�', '鏈烘埧鍚嶇О','鍋滅數','鍋滅數寮�濮嬫椂闂�', '鍙戠數','鍙戠數寮�濮嬫椂闂�','鎺夌珯','鎺夌珯寮�濮嬫椂闂�', '寮�闂�/寮�鍏崇數婧愬紓甯�','寮�闂�/寮�鍏崇數婧愬紓甯稿紑濮嬫椂闂�', '娓╁害寮傚父','婀垮害寮傚父'];
+ arrTh = ['鐪�','甯�', '鏈烘埧鍚嶇О','鍋滅數','鍋滅數寮�濮嬫椂闂�','鍋滅數鏃堕暱','鍙戠數','鍙戠數寮�濮嬫椂闂�','鍙戠數鏃堕暱','鎺夌珯','鎺夌珯寮�濮嬫椂闂�', '鎺夌珯鏃堕暱','寮�闂�/鍏抽棬寮傚父','寮�闂�/鍏抽棬寮傚父寮�濮嬫椂闂�','寮�闂�/鍏抽棬寮傚父鏃堕暱', '娓╁害寮傚父','婀垮害寮傚父'];
//tblOptsHd = ['缂栧彿', '閫夐」', '鏄惁閫夋嫨'];
tblOptsHd = ['<s:text name="Number"/>', '<s:text name="Options"/>', '<s:text name="IsChecked"/>'];
@@ -193,6 +194,17 @@
createCard(cardHd, tblOptsHd, tblOptsBd);
createCard(cardBd, tblOptsHd, tblOptsBd);
});
+
+
+ $(document).ready(function(){
+ $('#tbBrdw').scroll(function(){
+ var scrollX=$(this).scrollLeft();
+ $('#tbHead table').css('left',-scrollX+'px');
+ });
+
+ });
+
+
// 鐐瑰嚮鏉′欢绛涢�夋洿鏀硅〃鏍肩殑楂樺害
$(function() {
@@ -219,7 +231,7 @@
$('#paging .search').click(function() {
- searchstationstate();
+ searchstationstate();
//noContent.showNoContent(); //鏄剧ず鏌ヨ澶辫触妗�
});
@@ -415,7 +427,7 @@
}
- searchstationstate();
+ searchstationstate();
});
}
@@ -468,7 +480,7 @@
}
arrTd[index++]=_data.station_poff_start_time //鍋滅數寮�濮嬫椂闂�
-
+ arrTd[index++]=formartTime(_data.station_poff_tlong); //鍋滅數鏃堕暱
// 鍙戠數
if(_data.station_stat_fadian) {
arrTd[index++]= create_ali_font('icon-dynamotor', 'red', {msg: '鍙戠數寮傚父'}); //鍙戠數
@@ -476,8 +488,8 @@
arrTd[index++]= create_ali_font('icon-dynamotor', 'green', {msg: '姝ｅ父'}); //鍙戠數
}
- arrTd[index++]=_data.station_fadian_start_time;//鍙戠數寮�濮嬫椂闂�
-
+ arrTd[index++]=_data.station_fadian_start_time; //鍙戠數寮�濮嬫椂闂�
+ arrTd[index++]=formartTime(_data.station_fadian_tlong);
// 鎺夌珯
if(_data.station_stat_diaozhan) {
arrTd[index++]= create_ali_font('icon-dianchi', 'red', {msg: '宸叉帀绔�'});
@@ -486,7 +498,7 @@
}
arrTd[index++]=_data.station_diaozhan_start_time;//鎺夌珯寮�濮嬫椂闂�
-
+ arrTd[index++]=formartTime(_data.station_diaozhan_tlong);
// 寮�闂ㄥ叧闂ㄥ紓甯�
if(_data.station_stat_dooropen) {
arrTd[index++] = create_ali_font('icon-quankaimen', 'red', {msg: '寮�闂�'});
@@ -495,6 +507,7 @@
}
arrTd[index++]=_data.station_dooropen_start_time;//寮�闂ㄥ叧闂ㄥ紓甯告椂闂�
+ arrTd[index++]=formartTime(_data.station_dooropen_tlong);
arrTd[index++]=_data.station_temp; //娓╁害
arrTd[index++]=_data.station_damp; //婀垮害
@@ -509,7 +522,24 @@
})
}
-
+ //鏍煎紡鍖栨椂闂�
+ function formartTime(value){
+ value = Math.abs(parseInt(value));
+ //console.info(value);
+ var day_num = 0;
+ var hour_num = 0;
+ var min_num = 0;
+ if(value>=24*60){
+ day_num = Math.floor(value/(24*60));
+ value = value%(24*60);
+ }
+ if(value>=60){
+ hour_num = Math.floor(value/60);
+ value = value%60;
+ }
+ min_num = value;
+ return day_num+"澶�"+hour_num+"灏忔椂"+min_num+"鍒�";
+ }
//棣栭〉
$('#home').click(function(){
diff --git a/gx_tieta/WebRoot/batt-state-statistical.jsp b/gx_tieta/WebRoot/batt-state-statistical.jsp
index 36c3558..7bc9ae2 100644
--- a/gx_tieta/WebRoot/batt-state-statistical.jsp
+++ b/gx_tieta/WebRoot/batt-state-statistical.jsp
@@ -162,16 +162,6 @@
ArrWarnTb = new Array(); // 鐢ㄤ簬瀛樻斁琛ㄦ牸鏁版嵁
createFullTbl($('.tbl-header'), $('.tbl-body'), ArrWarnTh, ArrWarnTb);
- var arr=$.map(ArrWarnTh,function(n){return{'name':n,'state':1 }});
- $('.condi-opt td').each(function(k){
- $(this).find('input').click(function(){
- var changeTh=[];
- if($(this).prop("checked")){arr[k+1].state=1;}
- else{arr[k+1].state=0;}
- $.each(arr,function(i,v){if(v.state){changeTh.push(v.name)}});
- createFullTbl($('.tbl-header'), $('.tbl-body'), changeTh, ArrWarnTb);
- })
- });
// 鐐瑰嚮琛ㄦ牸鐨勫彸閿樉绀哄彸閿彍鍗�
var $tblBody = $('.tbl-body');
diff --git a/gx_tieta/WebRoot/navConfig.jsp b/gx_tieta/WebRoot/navConfig.jsp
index 4ba3658..ed87da7 100644
--- a/gx_tieta/WebRoot/navConfig.jsp
+++ b/gx_tieta/WebRoot/navConfig.jsp
@@ -14,6 +14,7 @@
<meta charset="UTF-8">
<title><s:text name='Site_content_configuration'/></title> <!-- 閰嶇疆椤甸潰鍐呭 -->
<link type="text/css" rel="stylesheet" href="css/basic.css" />
+ <link type="text/css" rel="stylesheet" href="src/css/layui.css" />
<link type="text/css" rel="stylesheet" href="css/loading.css" />
<link type="text/css" rel="stylesheet" href="css/navConfigLayout.css" />
<link type="text/css" rel="stylesheet" href="css/index_layout.css" />
@@ -150,9 +151,9 @@
<div id="navSort">
<div class="navSort-title fb">瀛愬鑸帓搴�<div class="fr f16 mr10"><i class="fa fa-close navSort-close" onclick="GLOBAL.Nav.hide()"></i></div></div>
<div class="navSort-content clearfix">
- <div class="navSort-content-item mr10 fl"></div>
- <div class="navSort-content-item mr10 fl"></div>
- <div class="navSort-content-item mr10 fl"></div>
+ <div class="navSort-content-item layui-col-md4"></div>
+ <div class="navSort-content-item layui-col-md4"></div>
+ <div class="navSort-content-item layui-col-md4"></div>
</div>
</div>
diff --git a/gx_tieta/WebRoot/pages/css/pages/navconfig.css b/gx_tieta/WebRoot/pages/css/pages/navconfig.css
index 4bd7714..677c710 100644
--- a/gx_tieta/WebRoot/pages/css/pages/navconfig.css
+++ b/gx_tieta/WebRoot/pages/css/pages/navconfig.css
@@ -31,7 +31,8 @@
overflow-y: auto;
}
.navSort-content-item {
- width: 350px;
+ padding-left: 15px;
+ padding-right: 15px;
}
#navSortShadow {
display: none;
diff --git a/gx_tieta/src/global_zh_CN.properties b/gx_tieta/src/global_zh_CN.properties
index 3d1d844..accf309 100644
--- a/gx_tieta/src/global_zh_CN.properties
+++ b/gx_tieta/src/global_zh_CN.properties
@@ -1085,3 +1085,13 @@
################## ele-match-group.jsp \u7535\u6c60\u7ec4\u914d\u7ec4\u7ba1\u7406 ####################################
Batt_pack_management = \u7535\u6c60\u7ec4\u914d\u7ec4\u7ba1\u7406
+
+################## set-match-group.jsp \u7535\u6c60\u7ec4\u914d\u7ec4\u8bb0\u5f55 #################################
+Batt_makegrouprecord = \u7535\u6c60\u7ec4\u914d\u7ec4\u8bb0\u5f55
+
+################## batt-state-mange.jsp \u673a\u623f\u72b6\u6001\u67e5\u8be2 ###########################
+Station_statequery = \u673a\u623f\u72b6\u6001\u67e5\u8be2
+
+################## batt-state-statistical.jsp \u673a\u623f\u72b6\u6001\u7edf\u8ba1 #############################
+Station_statestatistical = \u673a\u623f\u72b6\u6001\u7edf\u8ba1\u67e5\u8be2
+
--
Gitblit v1.9.1