From b4828d7800516141d6bdb419111a5f4e0e7ac554 Mon Sep 17 00:00:00 2001
From: hdw <hdw@192.168.7.127>
Date: 星期三, 09 一月 2019 11:56:00 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/batt-life-manage.jsp | 73 +++++++++++++++++++++++++++++++++---
1 files changed, 66 insertions(+), 7 deletions(-)
diff --git a/gx_tieta/WebRoot/batt-life-manage.jsp b/gx_tieta/WebRoot/batt-life-manage.jsp
index b39def7..abb8c45 100644
--- a/gx_tieta/WebRoot/batt-life-manage.jsp
+++ b/gx_tieta/WebRoot/batt-life-manage.jsp
@@ -131,6 +131,7 @@
<s:text name="Goto"/><!-- 杞埌 --><input type="text" id="page_num" value="1"/>
<a href="javascript:" id="go"><s:text name="Jump"/><!-- 璺宠浆 --></a>
</span>
+ <a href="javascript:startStationThread();" class="start-station-stical">鍚姩缁埅缁熻</a>
</div>
</div>
<!-- 琛ㄦ牸閫夐」鍐呭 -->
@@ -160,7 +161,7 @@
var tblStatus = new Array(); // 琛ㄦ牸鐘舵�佹暟缁�
var tblOptsHd = new Array(); // 琛ㄦ牸閫夐」澶撮儴
var tblOptsBd = new Array(); // 琛ㄦ牸閫夐」鏁扮粍
- arrTh = ['璁惧ID', '鏈烘埧鍚嶇О', '瀹為檯瀹归噺', '鏍囩О瀹归噺','瀹為檯鐢垫祦','瀹為檯缁埅鏃堕棿(min)', '鐞嗚缁埅鏃堕棿(min)', '鏄惁鎺夌珯'];
+ arrTh = ['璁惧ID', '鏈烘埧鍚嶇О', '瀹為檯瀹归噺', '鏍囩О瀹归噺','璐熻浇鐢垫祦', '鏈�灏忓疄闄呯画鑸椂闂�(min)','骞冲潎瀹為檯缁埅鏃堕棿(min)', '鏈�澶у疄闄呯画鑸椂闂�(min)', '鐞嗚缁埅鏃堕棿(min)', '鏄惁鎺夌珯'];
//arrTh = ['<s:text name="Maintenance_area"/>', '<s:text name="Computer_name"/>', '<s:text name="Nominal_capacity"/>(AH)', '<s:text name="Actual_capacity"/>(AH)','<s:text name="Residual_capacity"/>(AH)', '<s:text name="real_time"/><s:text name="Current"/>(A)', '<s:text name="Power_cut"/><s:text name="Endurance"/><s:text name="Time"/>'];
//tblOptsHd = ['缂栧彿', '閫夐」', '鏄惁閫夋嫨'];
tblOptsHd = ['<s:text name="Number"/>', '<s:text name="Options"/>', '<s:text name="IsChecked"/>'];
@@ -184,6 +185,36 @@
var cardBd = $('#cardOption .con_table');
createCard(cardHd, tblOptsHd, tblOptsBd);
createCard(cardBd, tblOptsHd, tblOptsBd);
+
+ // 璁剧疆鏄惁鎺夌珯
+ var pre_is_stand = getQueryString('is_stand');
+ if(pre_is_stand){
+ $('#is_stand').val(pre_is_stand);
+
+ if(pre_is_stand == 0) {
+ $('#actual_timelong').val(0);
+ $('#actual_timelong').prop('disabled', true);
+ }
+ }
+
+ // 璁剧疆缁埅鏃堕暱
+ var pre_timelong = getQueryString('timelong');
+ if(pre_timelong){
+ $('#actual_timelong').val(pre_timelong);
+ }
+
+ // 鐐瑰嚮鏄惁鎺夌珯涓哄惁璁剧疆缁埅鏃堕暱涓嶅彲鐐�
+ $('#is_stand').change(function() {
+ $('#actual_timelong').prop('disabled', false);
+ console.log($(this).val())
+ // 闈炴帀绔欒缃画鑸椂闀挎棤娉曠偣鍑�
+ if($(this).val() == 0) {
+ $('#actual_timelong').val(0);
+ $('#actual_timelong').prop('disabled', true);
+ }
+
+
+ });
});
// 鐢熸垚琛ㄦ牸
@@ -461,17 +492,14 @@
//鏋勯�犳煡璇㈡潯浠�
function createSearchParam(){
- //alert($('#endu_type').val());
- //Page.pageCurr = $('#number').val();
- //console.info(Page);
var temp = {
page:Page,
stationName:$('#station_name').val(), //鏈烘埧鍚�
stationName5:$('#county').val(),
stationName2:$('#city').val(), //甯�
stationName1:$('#station_name1').val(), //鐪�
- is_out_stand:$('#is_stand').val(), //鏄惁鎺夌珯
- endurance_actual_timelong:$('#actual_timelong').val(), //瀹為檯
+ is_out_stand: $('#is_stand').val(), //鏄惁鎺夌珯
+ endurance_actual_timelong: $('#actual_timelong').val(), //瀹為檯
};
//console.info(temp);
return temp;
@@ -493,9 +521,9 @@
datatype:'json',
data:"json="+json,
success:function(data){
- //console.info(data);
var data = JSON.parse(data.result);
layer.close(load);
+ //console.info(data);
if(data.code==1&&data.data.length>0){
data=data.data;
var index = 0;
@@ -506,8 +534,11 @@
arrTd[index++]=data[i].real_cap;
arrTd[index++]=data[i].moncapstd;
arrTd[index++]=data[i].real_curr;
+ arrTd[index++]=data[i].endurance_actual_timelong_min;
arrTd[index++]=data[i].endurance_actual_timelong;
+ arrTd[index++]=data[i].endurance_actual_timelong_max;
arrTd[index++]=data[i].endurance_theory_timelong;
+ //console.info(data[i].deviceId+"===="+data[i].is_out_stand);
if(data[i].is_out_stand==0){ //鏈帀绔�(缁胯壊)
arrTd[index++]='<div class="status effect" ></div>';
}
@@ -656,6 +687,34 @@
//console.info(ArrTd);
eleform.submit();
}
+
+ //鍚姩鏈烘埧缁埅绾跨▼
+ function startStationThread(){
+ load = layer.load(1);
+ var temp = {
+ thread_id:2019001,
+ thread_en:1,
+ };
+ $.ajax({
+ type:"post",
+ url:"Thread_utilAction!update",
+ async:true,
+ datatype:'json',
+ data:"json="+JSON.stringify(temp),
+ success:function(data){
+ layer.close(load);
+ //console.info(data);
+ var model = JSON.parse(data.result);
+ if(model.code == 1){
+ layer.msg("鍚姩鎴愬姛");
+ }else{
+ layer.msg("鍚姩澶辫触");
+ }
+ },error:function(){
+ layer.msg("鍚姩澶辫触");
+ }
+ });
+ }
</script>
</body>
</html>
\ No newline at end of file
--
Gitblit v1.9.1