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/dischargetest.jsp |  206 +++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 172 insertions(+), 34 deletions(-)

diff --git a/gx_tieta/WebRoot/dischargetest.jsp b/gx_tieta/WebRoot/dischargetest.jsp
index 7df1b5a..492948c 100644
--- a/gx_tieta/WebRoot/dischargetest.jsp
+++ b/gx_tieta/WebRoot/dischargetest.jsp
@@ -67,6 +67,19 @@
 			outline: none !important;
 			border: 1px solid #FF0000 !important;
 		}
+		.page-link {
+			cursor: pointer;
+		}
+		.page-link:hover {
+			color: #1495E7;
+		}
+		.page-link:active {
+			color: #FF0000;
+		}
+		i.fa.f-size16 {
+			font-size: 16px;
+			vertical-align: middle;
+		}
 	</style>
   </head> 
   <body>
@@ -209,7 +222,7 @@
 						</tr>
 						<tr>
 							<th><s:text name="Booster"/><s:text name="Upper_limit"/><!-- 鍗囧帇涓婇檺 -->锛圴锛�</th>
-							<th><s:text name="Charging_current"/><!-- 鍏呯數鐢垫祦 -->锛圓锛�</th>
+							<th id="ChargeCurrSetLabel"><s:text name="Charging_current"/><!-- 鍏呯數鐢垫祦 -->锛�<span class="val-range"></span>A锛�<i class="fa fa-edit page-link f-size16" title="淇敼鍏呯數鐢垫祦鑼冨洿"></i></th>
 						</tr>
 						<tr>
 							<td><input id="DCVolHighLimit" type="text" value="0"><i class="fa fa-frown-o error-img" title="鏁版嵁鏍煎紡閿欒"></i></td>
@@ -732,46 +745,160 @@
 					};	// 鍏呯數鐢垫祦
 					
 					$('.popup.fbs9100 .popup-tbl td i').removeClass('error-data');
+					$('.popup.fbs9100 .popup-tbl input[type=text]').removeClass('error-data');
 				}
 			});
 		})(jQuery);
 		
 		// 鏇存敼鏀剧數闈㈡澘鐨勫�煎悗
 		$(function() {
-			$('.popup.fbs9100 .popup-tbl td i').tooltip();
-			// 鐩戞祴闈㈡澘涓殑input鏀瑰彉瑙﹀彂$.checkTestInfor()浜嬩欢
-			$('.popup.fbs9100 .popup-tbl').on('input propertychange', 'input', function() {
+			// 鏀剧數鐢垫祦
+			$('#discurr').testVal({
+				pattern: /^[0-9]+(\.[0-9]*)?$/,
+				regVal: true,
+				min: 0,
+				max: 1000,
+				msg: '鍙栧�艰寖鍥�0~1000A'
+			});
+			
+			// 鏀剧數灏忔椂鐜�
+			$('#hourrate').testVal({
+				pattern: /^[0-9]+$/,
+				regVal: false,
+				msg: '杈撳叆鐨勬暟鎹牸寮忎笉姝g‘'
+			});
+			
+			// 鏀剧數鐢靛
+			$('#discap').testVal({
+				pattern: /^[0-9]+$/,
+				regVal: true,
+				min: 0,
+				max: 90000,
+				msg: '鍙栧�艰寖鍥�0~90000AH'
+			});
+			
+			// 鏀剧數鏃堕暱
+			$('#distime').testVal({
+				pattern: /^[0-9]+$/,
+				regVal: true,
+				min: 0,
+				max: 5940,
+				msg: '鍙栧�艰寖鍥�0~5940鍒嗛挓'
+			});
+			
+			// 鍗曚綋涓嬮檺闃�鍊�
+			$('#MonomerVol_low').testVal({
+				pattern: /^[0-9]+(\.[0-9]*)?$/,
+				regVal: true,
+				min: 0,
+				max: 20,
+				msg: '鍙栧�艰寖鍥�0~20V'
+			});
+			
+			// 缁勭涓嬮檺闃�鍊糋roupVol_low
+			$('#GroupVol_low').testVal({
+				pattern: /^[0-9]+(\.[0-9]*)?$/,
+				regVal: true,
+				min: 0,
+				max: 60,
+				msg: '鍙栧�艰寖鍥�0~60V'
+			});
+			
+			// 鍗曚綋涓嬮檺鏁伴噺
+			$('#MonomerlowCount').testVal({
+				pattern: /^[0-9]+$/,
+				regVal: false,
+				msg: '杈撳叆鐨勬暟鎹牸寮忎笉姝g‘'
+			});
+			
+			// 鍗囧帇涓婇檺
+			$('#MonomerlowCount').testVal({
+				pattern: /^[0-9]+(\.[0-9]*)?$/,
+				regVal: false,
+				msg: '杈撳叆鐨勬暟鎹牸寮忎笉姝g‘'
+			});
+			
+			// 鍏呯數鐢垫祦
+			$('#ChargeCurrSet').testVal({
+				pattern: /^[0-9]+(\.[0-9]*)?$/,
+				regVal: false,
+				msg: '杈撳叆鐨勬暟鎹牸寮忎笉姝g‘'
+			});
+			
+			// 娓╁害涓婇檺
+			$('#TempUpHighLimit').testVal({
+				pattern: /^[0-9]+$/,
+				regVal: false,
+				msg: '杈撳叆鐨勬暟鎹牸寮忎笉姝g‘'
+			});
+			
+			
+			// bts闈㈡澘鍏呯數鐢垫祦缂栬緫
+			$('#ChargeCurrSetLabel .fa-edit').click(function() {
+				var battGroupId = $('#battgroupname').find('option:selected').attr('battgroupid');
+				//console.log(batt);
+				// 璁剧疆闈㈡澘
+				layer.open({
+					type: 1
+					,title: '璁剧疆鍏呯數鐢垫祦闃�鍊�'
+					, content: '<div style="width:300px; height: 50px;"><div style="margin-top: 20px;margin-left: 8px; margin-right: 8px;">'+
+								'<input type="text" style="width: 100%; height:32px; border: 1px solid #ccc;" id="setChargeCurrVal" value="">'+
+								'</div></div>'
+					,btn:['璁剧疆', '鍙栨秷']
+					,yes: function(index) {
+						var chargeCurrVal = $('#setChargeCurrVal').val();
+						var num = Number(chargeCurrVal);
+						if(isNaN(num) || num==0) {
+							layer.msg('璇疯緭鍏ユ暟瀛�');
+							return;
+						}
+						var tmp = {
+							charge_curr_max: num
+							,BattGroupId: battGroupId
+						}; 
+						var load;
+						// 璇锋眰璁剧疆鐢垫祦鐨勫悗鍙�
+						$.ajax({
+							type: 'post'
+							,async: true
+							,url: 'BattInfAction!update_charge'
+							,data: 'json='+JSON.stringify(tmp)
+							,dataType: 'json'
+							,beforeSend: function(){
+								load = layer.load(1);
+							}
+							,success: function(res) {
+								var rs = JSON.parse(res.result);
+								// 鍏抽棴绛夊緟妗�
+								layer.close(load);
+								//console.log(rs);
+								if(rs.code == 1) {
+									// 璁剧疆寮瑰嚭妗嗕俊鎭�
+									layer.msg('璁剧疆鎴愬姛锛�');
+									layer.close(index);
+									// 鍏呯數鐢垫祦
+									$('#ChargeCurrSet').testVal('option', 'allOpts', {
+										regVal: true
+										,update: true
+										,min: 0
+										,max: num
+										,msg: '鍙栧�艰寖鍥�0~'+num+'A'
+									});
+									
+									// 璁剧疆鏂囨湰鍊�
+									$('#ChargeCurrSetLabel .val-range').text('0~'+num);
+								}else {
+									layer.msg('璁剧疆澶辫触!璇烽噸鏂拌缃�');
+								}
+							}
+							
+						});
+					} 
+				});
+			});
+			
+			$('.popup.fbs9100').on('input propertychange', 'input[type=text]', function() {
 				$.checkTestInfor();
-				var bool = $.regPositiveNum($(this).val());
-				if(bool) {
-					// 璇诲彇鏀剧數鍙傛暟鎴愬姛鎵ц
-					if($.disTestInfor.success) {
-						paramsBtn.ensure(true);
-					}
-					$(this).next('i').removeClass('error-data');
-					$(this).myTooltip('hide');
-				}else {
-					paramsBtn.ensure(false);
-					//var errorImg = $('<i class="fa fa-frown-o error-img"></i>');
-					$(this).next('i').addClass('error-data');
-					$(this).myTooltip({
-	                    position: 'top',
-	                    thing: 'show',
-	                    content: '<span style="color:#FF0000">鏁版嵁鏍煎紡閿欒(璇疯緭鍏ユ鏁�)</span>'
-	                });
-				}
-			});
-			
-			// 褰撴枃鏈鑾峰彇鐒︾偣鏃�
-			$('.popup.fbs9100 .popup-tbl').on('focus', 'input', function() {
-				if($(this).next('i').hasClass('error-data')) {
-					$(this).myTooltip('show');
-				}
-			});
-			
-			// 鏂囨湰妗嗗け鍘荤劍鐐�
-			$('.popup.fbs9100 .popup-tbl').on('blur', 'input', function() {
-				$(this).myTooltip('hide');
 			});
 			
 			$('.popup.fbs9100').on('change', 'select', function() {
@@ -1128,6 +1255,17 @@
 						$('#DCVolHighLimit').val(list[i].fsparam.DCVolHighLimit);
 						$('#ChargeCurrSet').val(list[i].fsparam.ChargeCurrSet);
 						$('#TempUpHighLimit').val(list[i].fsparam.MonomerTmp_High);
+						
+						// 鍏呯數鐢垫祦
+						$('#ChargeCurrSet').testVal('option', 'allOpts', {
+							regVal: true,
+							min: 0,
+							max: list[0].binf.charge_curr_max,
+							msg: '鍙栧�艰寖鍥�0~'+list[0].binf.charge_curr_max+'A'
+						});
+						
+						// 璁剧疆鏂囨湰鍊�
+						$('#ChargeCurrSetLabel .val-range').text('0~'+list[0].binf.charge_curr_max);
 					}				
 				}
 			}

--
Gitblit v1.9.1