From 6ca818de1f93c61ddfa92a3ce285280304c50927 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期三, 31 十月 2018 10:19:43 +0800
Subject: [PATCH] 电池信息配置
---
gx_tieta/WebRoot/dischargetest.jsp | 73 ++++++++++++++++++++++++++++++++----
1 files changed, 65 insertions(+), 8 deletions(-)
diff --git a/gx_tieta/WebRoot/dischargetest.jsp b/gx_tieta/WebRoot/dischargetest.jsp
index 10f87bd..8655f70 100644
--- a/gx_tieta/WebRoot/dischargetest.jsp
+++ b/gx_tieta/WebRoot/dischargetest.jsp
@@ -85,7 +85,8 @@
<thead>
<tr>
<th>鐪�</th>
- <th>甯�<!-- 缁存姢鍖� --></th>
+ <th>甯�</th>
+ <th>鍖�/鍘�</th>
<th><s:text name="Computer_site"/><!-- 鏈烘埧绔欑偣锛堟垨鏈烘埧璁惧锛� --></th>
<th><s:text name="Battery_name"/><!-- 钃勭數姹犵粍鍚嶇О --></th>
</tr>
@@ -98,6 +99,10 @@
</td>
<td>
<select id="city">
+ </select>
+ </td>
+ <td>
+ <select id="county">
</select>
</td>
<td>
@@ -1180,7 +1185,8 @@
}else {
$select.text('').html('<option>鏆傛棤鍙祴甯�</option>');
}
- findStationNamebyStationname1();
+ // 鏌ヨ鍖�/鍘�
+ findCounty();
}
});
}
@@ -1194,14 +1200,59 @@
//褰撳競鐨勫�煎彉鎹㈡椂鏇存柊鏈烘埧绔欑偣
$('#city').change(function(){
+ findCounty();
+ });
+
+ //褰撳尯/鍘跨殑鍊煎彉鎹㈡椂鏇存柊鏈烘埧绔欑偣
+ $('#county').change(function(){
findStationNamebyStationname1();
});
+
+ // 鏌ヨ鍖�/鍘�
+ function findCounty() {
+ var tmp = {
+ StationName1:$("#station_name1").val(),
+ StationName2:$("#city").val(),
+ };
+
+ // 鏌ヨ鍖哄幙
+ $.ajax({
+ type: 'post',
+ async: true,
+ url: "BattInfAction!serchStationName5",
+ data: "json="+JSON.stringify(tmp),
+ success:function(data) {
+ var rs = JSON.parse(data.result);
+ var $select = $("#county");
+ if(rs.code==1){
+ var _data = rs.data;
+ // 鏍规嵁鏁版嵁鏋勯�犵敓鎴愪笅鎷夊垪琛ㄧ殑鏁版嵁
+ var optsList = [];
+ for(var i=0;i<_data.length;i++){
+ var __data = _data[i];
+ var _attr = {
+ StationId: __data.StationId
+ };
+ var tmp = getOptionsData(__data.StationName5, __data.StationName5, __data, _attr);
+ optsList.push(tmp);
+ }
+
+ // 鏍规嵁鏁版嵁鐢熸垚涓嬫媺鍒楄〃
+ createOptions($select, optsList, true);
+ }else{
+ $select.text('').html('<option>鏆傛棤鍙祴鏈烘埧绔欑偣</option>');
+ }
+ findStationNamebyStationname1();
+ }
+ });
+ }
//鏍规嵁缁存姢鍖烘煡璇㈢珯鐐�
function findStationNamebyStationname1(){
var tmp = {
StationName1:$("#station_name1").val(),
- StationName2:$("#city").val()
+ StationName2:$("#city").val(),
+ StationName5: $("#county").val()
};
//var selectvalue=$("#station_name1 option:selected").val();
//alert(selectvalue);
@@ -1241,6 +1292,7 @@
var tmp = {
StationName1:$("#station_name1").val(),
StationName2:$("#city").val(),
+ StationName5:$("#county").val(),
StationName: $("#station_name").val(),
StationId: stationid
};
@@ -1418,9 +1470,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 +1535,8 @@
loading.showLoading();
flushDischargeParam({
num:CMD_GetDischargeParm,
- dev_id:$('#dev_id').val()
+ dev_id:$('#dev_id').val(),
+ TestCmd:0,
});
});
@@ -1586,13 +1639,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 +1893,7 @@
updateUserDevinfo(); //璁剧疆鏀剧數鍙傛暟鎴愬姛鍚庝慨鏀圭敤鎴锋坊鍔犵殑鏀剧數璁惧淇℃伅
flushDischargeParam({
num:CMD_GetDischargeParm,
+ TestCmd:$('#discharge_type').val(),
dev_id:$('#dev_id').val()
});
paramsBtn.startTest(true);
--
Gitblit v1.9.1