From 1c02e66149af3199dad71e3fb93c36b3f7e871b9 Mon Sep 17 00:00:00 2001
From: LiJun <LiJun@192.168.10.18>
Date: 星期二, 30 十月 2018 10:22:22 +0800
Subject: [PATCH] 告警语音播报

---
 gx_tieta/WebRoot/dischargetest.jsp |   19 ++++++++++++-------
 1 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/gx_tieta/WebRoot/dischargetest.jsp b/gx_tieta/WebRoot/dischargetest.jsp
index 86e3428..fb40743 100644
--- a/gx_tieta/WebRoot/dischargetest.jsp
+++ b/gx_tieta/WebRoot/dischargetest.jsp
@@ -1217,7 +1217,7 @@
 						var _attr = {
 							StationId: __data.StationId
 						};
-						var tmp = getOptionsData(__data.StationName3, __data.StationName3, __data, _attr);
+						var tmp = getOptionsData(__data.StationName3, __data.StationName, __data, _attr);
 						optsList.push(tmp);
 					}
 					
@@ -1241,7 +1241,7 @@
 			var tmp = {
 				StationName1:$("#station_name1").val(),
 				StationName2:$("#city").val(),
-				StationName3: $("#station_name").val(),
+				StationName: $("#station_name").val(),
 				StationId: stationid
 			};
 		
@@ -1418,9 +1418,9 @@
 				if(regEquipType(dev_id, globalPattern.LD9) || regEquipType(dev_id, globalPattern.BTS)) {
 					if(confirm("纭鍋滄"+dev_id+"璁惧鐨勬祴璇曞悧锛�")){
 						if(regEquipType(dev_id, globalPattern.LD9)){
-							sendLD9DischargeParam(CMD_Stop);
+							sendLD9DischargeParam(CMD_Stop,true);
 						}else if(regEquipType(dev_id, globalPattern.BTS)){				
-							checkDischargeParam(CMD_Stop);
+							checkDischargeParam(CMD_Stop,true);
 						}				
 					}
 				}
@@ -1483,7 +1483,8 @@
 			loading.showLoading();
 			flushDischargeParam({
 				num:CMD_GetDischargeParm,
-				dev_id:$('#dev_id').val()
+				dev_id:$('#dev_id').val(),
+				TestCmd:0,
 			});
 		});
 		
@@ -1586,13 +1587,16 @@
 		}
 		
 		//鍚戝鎴风鍙戦�佹寚瀹氱殑鍛戒护
-		function checkDischargeParam(cmd){
+		function checkDischargeParam(cmd,stop){
 			var dev_id = $('#main .tbl-body tbody tr.active').find('td').eq(2).text();
 			loading.showLoading($('#main'));
+			var distype = stop?0:$('#discharge_type').val();
 			var param = {
 				num:cmd,
-				dev_id:dev_id
+				dev_id:dev_id,
+				TestCmd:distype
 			};	
+			
 			$.ajax({ 	
 	        	type: "post", 				
 		        url:"Fbs9100_setparamAction_action_serchbyDev_id",				
@@ -1837,6 +1841,7 @@
 						updateUserDevinfo();			//璁剧疆鏀剧數鍙傛暟鎴愬姛鍚庝慨鏀圭敤鎴锋坊鍔犵殑鏀剧數璁惧淇℃伅
 						flushDischargeParam({
 							num:CMD_GetDischargeParm,
+							TestCmd:$('#discharge_type').val(),
 							dev_id:$('#dev_id').val()
 						});
 						paramsBtn.startTest(true);

--
Gitblit v1.9.1