From 44d9cc533a7ff51146d6f33530c84ef4f50dbe2e Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期四, 27 九月 2018 16:58:13 +0800
Subject: [PATCH] station3->0
---
gx_tieta/WebRoot/elewarn.jsp | 4
gx_tieta/WebRoot/eleAnalyse.jsp | 4
gx_tieta/WebRoot/eleHistoryWarn.jsp | 4
gx_tieta/WebRoot/dischargetest.jsp | 4
gx_tieta/WebRoot/eleMonomer.jsp | 4
gx_tieta/WebRoot/ele-param.jsp | 2
gx_tieta/WebRoot/equip-charge-param.jsp | 2
gx_tieta/WebRoot/pages/js/pages/siderbar.js | 7 -
gx_tieta/WebRoot/equipHistWarn1.jsp | 164 +++++++++++++++++++----------------------
gx_tieta/WebRoot/equipment.jsp | 2
gx_tieta/WebRoot/taskplan.jsp | 4
gx_tieta/WebRoot/elestatus.jsp | 4
gx_tieta/WebRoot/control.jsp | 5
gx_tieta/WebRoot/endure.jsp | 2
gx_tieta/WebRoot/eleAssess.jsp | 4
gx_tieta/WebRoot/batt-attention.jsp | 4
gx_tieta/WebRoot/dataManage.jsp | 4
gx_tieta/WebRoot/equipWarn1.jsp | 3
gx_tieta/WebRoot/ele_statistics.jsp | 4
19 files changed, 109 insertions(+), 122 deletions(-)
diff --git a/gx_tieta/WebRoot/batt-attention.jsp b/gx_tieta/WebRoot/batt-attention.jsp
index 6201b94..a559668 100644
--- a/gx_tieta/WebRoot/batt-attention.jsp
+++ b/gx_tieta/WebRoot/batt-attention.jsp
@@ -417,7 +417,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);
}
@@ -441,7 +441,7 @@
var tmp = {
StationName1:$("#station_name1").val(),
StationName2:$("#city").val(),
- StationName3: $("#station_name").val(),
+ StationName: $("#station_name").val(),
StationId: stationid
};
diff --git a/gx_tieta/WebRoot/control.jsp b/gx_tieta/WebRoot/control.jsp
index 0c733b9..6d70783 100644
--- a/gx_tieta/WebRoot/control.jsp
+++ b/gx_tieta/WebRoot/control.jsp
@@ -3976,11 +3976,10 @@
// 鏈烘埧->鐢垫睜缁�
treeView.ele.on('click', '.home', function() {
var home = $(this).data('attr');
- console.log(home);
var tmp = {
StationName1: home.StationName1,
StationName2: home.StationName2,
- StationName3: home.StationName3,
+ StationName: home.StationName,
StationId: home.StationId
};
fourth(treeView, $(this).parent(), tmp);
@@ -3994,7 +3993,7 @@
BattGroupId = eleGroup.BattGroupId;
// 瀵笲TS9611鍋氱壒娈婄殑澶勭悊
var batt = getBatt();
- console.info(batt);
+ //console.info(batt);
$('#eleCircleBtn').removeClass('hide');
if(regEquipType(batt.FBSDeviceId, globalPattern.BTSSreen)) {
var isAct = $('#eleCircleBtn').hasClass('action');
diff --git a/gx_tieta/WebRoot/dataManage.jsp b/gx_tieta/WebRoot/dataManage.jsp
index 4c32f73..200518c 100644
--- a/gx_tieta/WebRoot/dataManage.jsp
+++ b/gx_tieta/WebRoot/dataManage.jsp
@@ -688,7 +688,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);
}
@@ -712,7 +712,7 @@
var tmp = {
StationName1:$("#station_name1").val(),
StationName2:$("#city").val(),
- StationName3: $("#station_name").val(),
+ StationName: $("#station_name").val(),
StationId: stationid
};
diff --git a/gx_tieta/WebRoot/dischargetest.jsp b/gx_tieta/WebRoot/dischargetest.jsp
index 86e3428..10f87bd 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
};
diff --git a/gx_tieta/WebRoot/ele-param.jsp b/gx_tieta/WebRoot/ele-param.jsp
index 9250770..555548b 100644
--- a/gx_tieta/WebRoot/ele-param.jsp
+++ b/gx_tieta/WebRoot/ele-param.jsp
@@ -672,7 +672,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);
}
diff --git a/gx_tieta/WebRoot/eleAnalyse.jsp b/gx_tieta/WebRoot/eleAnalyse.jsp
index 7e99583..29e5c4d 100644
--- a/gx_tieta/WebRoot/eleAnalyse.jsp
+++ b/gx_tieta/WebRoot/eleAnalyse.jsp
@@ -396,7 +396,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);
}
@@ -421,7 +421,7 @@
var tmp = {
StationName1:$("#station_name1").val(),
StationName2:$("#city").val(),
- StationName3: $("#station_name").val(),
+ StationName: $("#station_name").val(),
StationId: stationid
};
diff --git a/gx_tieta/WebRoot/eleAssess.jsp b/gx_tieta/WebRoot/eleAssess.jsp
index f0fc993..b5b35a4 100644
--- a/gx_tieta/WebRoot/eleAssess.jsp
+++ b/gx_tieta/WebRoot/eleAssess.jsp
@@ -657,7 +657,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);
}
@@ -682,7 +682,7 @@
var tmp = {
StationName1:$("#station_name1").val(),
StationName2:$("#city").val(),
- StationName3: $("#station_name").val(),
+ StationName: $("#station_name").val(),
StationId: stationid
};
diff --git a/gx_tieta/WebRoot/eleHistoryWarn.jsp b/gx_tieta/WebRoot/eleHistoryWarn.jsp
index e7b7f1a..c07690e 100644
--- a/gx_tieta/WebRoot/eleHistoryWarn.jsp
+++ b/gx_tieta/WebRoot/eleHistoryWarn.jsp
@@ -517,7 +517,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);
}
@@ -542,7 +542,7 @@
var tmp = {
StationName1:$("#station_name1").val(),
StationName2:$("#city").val(),
- StationName3: $("#station_name").val(),
+ StationName: $("#station_name").val(),
StationId: stationid
};
diff --git a/gx_tieta/WebRoot/eleMonomer.jsp b/gx_tieta/WebRoot/eleMonomer.jsp
index 1038da6..21478ba 100644
--- a/gx_tieta/WebRoot/eleMonomer.jsp
+++ b/gx_tieta/WebRoot/eleMonomer.jsp
@@ -712,7 +712,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);
}
@@ -737,7 +737,7 @@
var tmp = {
StationName1:$("#station_name1").val(),
StationName2:$("#city").val(),
- StationName3: $("#station_name").val(),
+ StationName: $("#station_name").val(),
StationId: stationid
};
diff --git a/gx_tieta/WebRoot/ele_statistics.jsp b/gx_tieta/WebRoot/ele_statistics.jsp
index 0bd219c..7e7fcb1 100644
--- a/gx_tieta/WebRoot/ele_statistics.jsp
+++ b/gx_tieta/WebRoot/ele_statistics.jsp
@@ -634,7 +634,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);
}
@@ -658,7 +658,7 @@
var tmp = {
StationName1:$("#station_name1").val(),
StationName2:$("#city").val(),
- StationName3: $("#station_name").val(),
+ StationName: $("#station_name").val(),
StationId: stationid
};
diff --git a/gx_tieta/WebRoot/elestatus.jsp b/gx_tieta/WebRoot/elestatus.jsp
index 882da69..6e114a0 100644
--- a/gx_tieta/WebRoot/elestatus.jsp
+++ b/gx_tieta/WebRoot/elestatus.jsp
@@ -430,7 +430,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);
}
@@ -455,7 +455,7 @@
var tmp = {
StationName1:$("#station_name1").val(),
StationName2:$("#city").val(),
- StationName3: $("#station_name").val(),
+ StationName: $("#station_name").val(),
StationId: stationid
};
diff --git a/gx_tieta/WebRoot/elewarn.jsp b/gx_tieta/WebRoot/elewarn.jsp
index 4285093..2c1aa56 100644
--- a/gx_tieta/WebRoot/elewarn.jsp
+++ b/gx_tieta/WebRoot/elewarn.jsp
@@ -649,7 +649,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);
}
@@ -674,7 +674,7 @@
var tmp = {
StationName1:$("#station_name1").val(),
StationName2:$("#city").val(),
- StationName3: $("#station_name").val(),
+ StationName: $("#station_name").val(),
StationId: stationid
};
diff --git a/gx_tieta/WebRoot/endure.jsp b/gx_tieta/WebRoot/endure.jsp
index bf3f9d1..2c7e2e8 100644
--- a/gx_tieta/WebRoot/endure.jsp
+++ b/gx_tieta/WebRoot/endure.jsp
@@ -376,7 +376,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);
}
diff --git a/gx_tieta/WebRoot/equip-charge-param.jsp b/gx_tieta/WebRoot/equip-charge-param.jsp
index 28bbe8a..a2192f4 100644
--- a/gx_tieta/WebRoot/equip-charge-param.jsp
+++ b/gx_tieta/WebRoot/equip-charge-param.jsp
@@ -444,7 +444,7 @@
var __data = _data[i];
var _attr = {
'stataion_name1': __data.StationName1,
- 'stataion_name': __data.StationName3,
+ 'stataion_name': __data.StationName,
'dev_name': __data.FBSDeviceName
};
var tmp = getOptionsData(__data.StationName3, __data.FBSDeviceId, __data, _attr);
diff --git a/gx_tieta/WebRoot/equipHistWarn1.jsp b/gx_tieta/WebRoot/equipHistWarn1.jsp
index 10be0cc..d1f260e 100644
--- a/gx_tieta/WebRoot/equipHistWarn1.jsp
+++ b/gx_tieta/WebRoot/equipHistWarn1.jsp
@@ -89,13 +89,18 @@
<!-- 缁存姢鍖轰俊鎭� -->
<table>
<tr class="fWeight">
- <td><s:text name="Maintenance_area"/></td> <!-- 缁存姢鍖� -->
+ <td>鐪�</td> <!-- 鐪� -->
+ <td>甯�</td> <!-- 甯� -->
<td><s:text name="Computer_name"/></td> <!-- 鏈烘埧绔欑偣锛堟垨鏈烘埧璁惧锛� -->
<td colspan="2"><s:text name="Alarm_start_time"/></td> <!-- 鍛婅寮�濮嬫椂闂存 -->
</tr>
<tr>
<td>
<select id="station_name1" name="station_name1">
+ </select>
+ </td>
+ <td>
+ <select id="city" name="station_name2">
</select>
</td>
<td>
@@ -523,7 +528,8 @@
});
}
- $(document).ready(function(){
+ // 鐪�-甯�-鏈烘埧-鐢垫睜缁�
+ $(document).ready(function(){
//椤甸潰鍔犺浇鏃舵煡璇㈢淮鎶ゅ尯涓殑鏋㈢航绫诲瀷
$.post("User_battgroup_baojigroup_battgroupAction!serchStationName1InGroup",null,function(data){
data=data.result;
@@ -546,118 +552,99 @@
}else{
$("#station_name1").text('').html('<option>鏆傛棤绠＄悊鐨勭淮鎶ゅ尯</option>');
}
- findStationNamebyStationname1();
+ findCity();
});
});
- //褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊鏈烘埧绔欑偣
+ // 鏍规嵁缁存姢鍖虹殑鍐呭鏌ヨ甯�
+ function findCity() {
+ var data = {
+ StationName1: $("#station_name1").val()
+ };
+ // 璇锋眰鑾峰彇褰撳墠鐪佷笅鐨勫競
+ $.ajax({
+ type: "post",
+ url: "BattInfAction!serchStationName2",
+ async:true,
+ dataType:'json',
+ data:"json = "+JSON.stringify(data),
+ success: function(data){
+ var rs = JSON.parse(data.result);
+ var $select = $("#city");
+ if(rs.code == 1) {
+ var _data= rs.data;
+ // 鏍规嵁鏁版嵁鏋勯�犵敓鎴愪笅鎷夊垪琛ㄧ殑鏁版嵁
+ var optsList = [];
+ for(var i=0;i<_data.length;i++){
+ var __data = _data[i];
+ var tmp = getOptionsData(__data.StationName2, __data.StationName2, __data);
+ optsList.push(tmp);
+ }
+ // 鏍规嵁鏁版嵁鐢熸垚涓嬫媺鍒楄〃
+ createOptions($select, optsList, true);
+ }else {
+ $select.text('').html('<option>鏆傛棤鍙祴甯�</option>');
+ }
+ findStationNamebyStationname1();
+ }
+ });
+ }
+
+ //褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊甯�
$('#station_name1').change(function(){
+ findCity();
+ });
+
+ //褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊鏈烘埧绔欑偣
+ $('#city').change(function(){
findStationNamebyStationname1();
});
- var isNewload = true;
- //鏍规嵁缁存姢鍖烘煡璇㈢珯鐐�
+ //鏍规嵁鐪侊紝甯傛煡璇㈢珯鐐�
function findStationNamebyStationname1(){
- var user = {
- UNote:$("#station_name1 option:selected").val()
+ var tmp = {
+ StationName1:$("#station_name1").val(),
+ StationName2:$("#city").val()
};
- var stationid = getQueryString("stationId");
//var selectvalue=$("#station_name1 option:selected").val();
//alert(selectvalue);
- $.post("User_battgroup_baojigroup_battgroupAction!serchStationNameInGroup","json="+JSON.stringify(user),function(data){
- //console.info(data);
- data=data.result;
- data=eval("("+data+")");
- if(data.code==1 && data.data.length>0){
+ $.post("BattInfAction!serchStationName3","json="+JSON.stringify(tmp),function(data){
+ var rs = JSON.parse(data.result);
+ if(rs.code==1){
+ var _data = rs.data;
var $select = $("#station_name");
- $select.text('');
- for(var i=0;i<=data.data.length;i++){
- var $option=$("<option></option>");
- if(i==0){
- $option.html("<s:text name='All'/>(<s:text name='Common'/>"+data.data.length+"<s:text name='Species'/>)");
- $option.attr("value", "");
- }else{
- $option.text(data.data[i-1]);
- $option.attr("value",data.data[i-1]);
- if(stationid!=undefined && stationid == data.data[i-1].StationId && isNewload){
- $option.attr("selected",true);
- isNewload = false;
- }
- }
- $select.append($option);
+ // 鏍规嵁鏁版嵁鏋勯�犵敓鎴愪笅鎷夊垪琛ㄧ殑鏁版嵁
+ var optsList = [];
+ for(var i=0;i<_data.length;i++){
+ var __data = _data[i];
+ var _attr = {
+ StationId: __data.StationId
+ };
+ var tmp = getOptionsData(__data.StationName3, __data.StationName, __data, _attr);
+ optsList.push(tmp);
}
+
+ // 鏍规嵁鏁版嵁鐢熸垚涓嬫媺鍒楄〃
+ createOptions($select, optsList, true);
}else{
- $("#station_name").text('').html('<option>鏆傛棤绠＄悊鐨勬満鎴跨珯鐐�</option>');
+ $("#station_name").text('').html('<option>鏆傛棤鍙祴鏈烘埧绔欑偣</option>');
}
seachDevHisAlarm();
});
}
-
- /* //椤甸潰鍔犺浇鏃舵煡璇㈢淮鎶ゅ尯涓殑鏋㈢航绫诲瀷
- $.post("BattInfAction_serchByStation",null,function(data){
- data=data.result;
- data=eval("("+data+")");
- //console.info(data);
- if(data.code==1 && data.data.length>0){
- var $select=$("#station_name1");
- $select.text("");
- for(var i=0;i<=data.data.length;i++){
- $option=$("<option></option>");
- if(i==0){
- $option.html("<s:text name='All'/>(<s:text name='Common'/>"+data.sum+"<s:text name='Species'/>)");
- $option.attr("value", "");
- }else{
- $option.text(data.data[i-1].StationName1);
- $option.attr("value",data.data[i-1].StationName1);
- }
- $select.append($option);
- }
- }
- findStationNamebyStationname1();
- });
- //褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊鏈烘埧绔欑偣
- $('#station_name1').change(function(){
- findStationNamebyStationname1();
+ // 鏍规嵁鏈烘埧鍚嶇О鏌ヨ鐢垫睜缁�
+ $('#station_name').change(function(){
+ seachDevHisAlarm();
});
-
- //鏍规嵁缁存姢鍖烘煡璇㈢珯鐐�
- function findStationNamebyStationname1(){
- var stationid = getQueryString("stationId");
- var selectvalue=$("#station_name1 option:selected").val();
- //alert(selectvalue);
- $.post("BattInfAction_serchByStationName","bif.StationName1="+selectvalue,function(data){
- //console.info(data);
- data=data.result;
- data=eval("("+data+")");
- if(data.code==1 && data.data.length>0){
- var $select = $("#station_name");
- $select.text("");
- for(var i=0;i<=data.data.length;i++){
- var $option=$("<option></option>");
- if(i==0){
- $option.html("<s:text name='All'/>(<s:text name='Common'/>"+data.sum+"<s:text name='Species'/>)");
- $option.attr("value", "");
- }else{
- $option.text(data.data[i-1].StationName);
- $option.attr("value",data.data[i-1].StationName);
- if(stationid !=undefined && stationid == data.data[i-1].StationName){
- $option.attr("selected",true);
- }
- }
- $select.append($option);
- }
- seachDevHisAlarm();
- }
- });
- } */
//鏋勯�犳煡璇㈡潯浠�
function createSearchParam(){
var temp = {
binf:{
StationName:$('#station_name').val(), //鏈烘埧鍚�
- StationName1:$('#station_name1').val(), //缁存姢鍖�
+ StationName2:$('#city').val(), // 甯�
+ StationName1:$('#station_name1').val(), // 鐪�
BattProductDate:$('#starttime').val()+" 00:00:00",
BattProductDate1:$('#endtime').val()+" 23:59:59",
},
@@ -666,6 +653,7 @@
pageCurr:Page.pageCurr, //褰撳墠椤�
}
};
+ console.log(temp);
return temp;
}
diff --git a/gx_tieta/WebRoot/equipWarn1.jsp b/gx_tieta/WebRoot/equipWarn1.jsp
index 95012b7..24490ce 100644
--- a/gx_tieta/WebRoot/equipWarn1.jsp
+++ b/gx_tieta/WebRoot/equipWarn1.jsp
@@ -574,6 +574,7 @@
pageCurr:Page.pageCurr, //褰撳墠椤�
}
};
+ console.log(temp);
return temp;
}
@@ -966,7 +967,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);
}
diff --git a/gx_tieta/WebRoot/equipment.jsp b/gx_tieta/WebRoot/equipment.jsp
index cd153cb..000e8ef 100644
--- a/gx_tieta/WebRoot/equipment.jsp
+++ b/gx_tieta/WebRoot/equipment.jsp
@@ -930,7 +930,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);
}
diff --git a/gx_tieta/WebRoot/pages/js/pages/siderbar.js b/gx_tieta/WebRoot/pages/js/pages/siderbar.js
index 2c36469..b15bc4f 100644
--- a/gx_tieta/WebRoot/pages/js/pages/siderbar.js
+++ b/gx_tieta/WebRoot/pages/js/pages/siderbar.js
@@ -301,13 +301,12 @@
success: function(data){
var rs = JSON.parse(data.result);
treeView.delProgress(container);
- console.info(rs);
if(rs.code == 1) {
var _data= rs.data;
var formatData = [];
for(var i=0; i<_data.length;i++) {
var __data = _data[i];
- var tmp = treeView.getFolder(__data.StationName3, 'home', __data);
+ var tmp = treeView.getFolder(__data.StationName, 'home', __data);
formatData.push(tmp);
}
treeView.treeView(container, formatData);
@@ -329,7 +328,7 @@
var tmp = {
StationName1: data.StationName1,
StationName2: data.StationName2,
- StationName3: data.StationName3,
+ StationName: data.StationName,
StationId: data.StationId
};
fourth(treeView, container, tmp, true);
@@ -357,7 +356,7 @@
var formatData = [];
for(var i=0; i<_data.length;i++) {
var __data = _data[i];
- var tmp = treeView.getFile(__data.StationName3, 'home', '',__data);
+ var tmp = treeView.getFile(__data.StationName, 'home', '',__data);
formatData.push(tmp);
}
treeView.treeView(container, formatData);
diff --git a/gx_tieta/WebRoot/taskplan.jsp b/gx_tieta/WebRoot/taskplan.jsp
index e378ba5..11f9adb 100644
--- a/gx_tieta/WebRoot/taskplan.jsp
+++ b/gx_tieta/WebRoot/taskplan.jsp
@@ -546,7 +546,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);
}
@@ -571,7 +571,7 @@
var tmp = {
StationName1:$("#station_name1").val(),
StationName2:$("#city").val(),
- StationName3: $("#station_name").val(),
+ StationName: $("#station_name").val(),
StationId: stationid
};
--
Gitblit v1.9.1