From 651c30db295e199e08105dab74b3a7a5e503e74b Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.14>
Date: 星期三, 28 十一月 2018 11:16:28 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/index.jsp | 34 ++++++++++++++++++++++++++++++----
1 files changed, 30 insertions(+), 4 deletions(-)
diff --git a/gx_tieta/WebRoot/index.jsp b/gx_tieta/WebRoot/index.jsp
index fdcef10..351d3e4 100644
--- a/gx_tieta/WebRoot/index.jsp
+++ b/gx_tieta/WebRoot/index.jsp
@@ -3886,6 +3886,7 @@
// 鐐瑰嚮鏈烘埧绫诲瀷澶嶉�夋
$('#homeType input[type=checkbox]').click(function() {
var homeType = getHomeType();
+ getInstallNum();
updateStation(true);
});
@@ -3981,13 +3982,38 @@
success: function(result) {
// 鏍煎紡鍖栨暟鎹�
var rs = JSON.parse(result.result);
- var txt = rs.newsum+'/'+rs.sum;
+ //console.log(rs);
+ if(rs.code == 1) {
+ var txt = getInstallNumByType(rs.data,getHomeType());
- // 鏇存柊鏂囨湰鍊�
- $('#installnum').text(txt);
+ // 鏇存柊鏂囨湰鍊�
+ $('#installnum').text(txt);
+ }
+
}
});
- };
+ }
+
+ // 鏇村叿閫夋嫨鏈烘埧鐨勭被鍨嬭繑鍥炴枃鏈�
+ function getInstallNumByType(data,type) {
+ var rs = '鏈煡/鏈煡';
+ switch(type) {
+ case 0:
+ rs = '0/0';
+ break;
+ case 2:
+ rs = data[0]+'/'+data[1];
+ break;
+ case 12:
+ rs = data[2]+'/'+data[3];
+ break;
+ case 14:
+ rs = data[4]+'/'+data[5];
+ break;
+ }
+
+ return rs;
+ }
});
// 0=鍏ㄩ儴涓嶉�� 14=鍏ㄩ儴閫変腑 2=閫変腑2V 12=閫変腑12V
--
Gitblit v1.9.1