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/equipment.jsp | 144 +++++++++++++++++++++++++++++++----------------
1 files changed, 94 insertions(+), 50 deletions(-)
diff --git a/gx_tieta/WebRoot/equipment.jsp b/gx_tieta/WebRoot/equipment.jsp
index 923bf44..000e8ef 100644
--- a/gx_tieta/WebRoot/equipment.jsp
+++ b/gx_tieta/WebRoot/equipment.jsp
@@ -66,7 +66,8 @@
<input type="hidden" value="10" name="bup.page.pageSize" id="pageSize" />
<table>
<tr class="fWeight">
- <td><s:text name="Maintenance_area"/></td> <!-- 缁存姢鍖� -->
+ <td>鐪�</td> <!-- 鐪� -->
+ <td>甯�</td> <!-- 甯� -->
<td><s:text name="Computer_site"/></td> <!-- 鏈烘埧绔欑偣锛堟垨鏈烘埧璁惧锛� -->
<td><s:text name ="Statistical"/><s:text name ="Parameter"/></td> <!-- 缁熻鍙傛暟 -->
@@ -77,6 +78,10 @@
<tr>
<td>
<select id="station_name1">
+ </select>
+ </td>
+ <td>
+ <select id="city">
</select>
</td>
<td>
@@ -833,77 +838,116 @@
}
});
}
-
-
+ // 鐪�-甯�-鏈烘埧-鐢垫睜缁�
$(document).ready(function(){
//椤甸潰鍔犺浇鏃舵煡璇㈢淮鎶ゅ尯涓殑鏋㈢航绫诲瀷
- $.post("BattInfAction_serchByStation",null,function(data){
+ $.post("User_battgroup_baojigroup_battgroupAction!serchStationName1InGroup",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("");
+ 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.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].StationName1);
- $option.attr("value",data.data[i-1].StationName1);
+ $option.text(data.data[i-1]);
+ $option.attr("value",data.data[i-1]);
}
$select.append($option);
- }
- }
- findStationNamebyStationname1();
-
- var $yearselect = $('#search-year');
- var d = new Date();
- //console.info(d.getFullYear());
- for(var i=1970;i<= d.getFullYear();i++){
- var $option = $("<option></option>");
- $option.attr("value",i);
- $option.text(i);
- if(i == d.getFullYear()){
- $option.attr("selected", true);
}
- $yearselect.append($option);
+ }else{
+ $("#station_name1").text('').html('<option>鏆傛棤绠＄悊鐨勭淮鎶ゅ尯</option>');
}
+ findCity();
});
-
- //褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊鏈烘埧绔欑偣
- $('#station_name1').change(function(){
- findStationNamebyStationname1();
- });
-
- //鏍规嵁缁存姢鍖烘煡璇㈢珯鐐�
- function findStationNamebyStationname1(){
- 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+")");
- //console.info(data);
- if(data.code==1 && data.data.length>0){
- var $select = $("#station_name");
- $select.text("");
- for(var i=0;i<data.data.length;i++){
- $option=$("<option></option>");
- $option.text(data.data[i].StationName);
- $option.attr("value",data.data[i].StationId);
- $select.append($option);
- }
- }
- });
- }
});
+ // 鏍规嵁缁存姢鍖虹殑鍐呭鏌ヨ甯�
+ 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();
+ });
+
+ //鏍规嵁鐪侊紝甯傛煡璇㈢珯鐐�
+ function findStationNamebyStationname1(){
+ var tmp = {
+ StationName1:$("#station_name1").val(),
+ StationName2:$("#city").val()
+ };
+ //var selectvalue=$("#station_name1 option:selected").val();
+ //alert(selectvalue);
+ $.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");
+ // 鏍规嵁鏁版嵁鏋勯�犵敓鎴愪笅鎷夊垪琛ㄧ殑鏁版嵁
+ 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);
+ }else{
+ $("#station_name").text('').html('<option>鏆傛棤鍙祴鏈烘埧绔欑偣</option>');
+ }
+ });
+ }
+
+ // 鏌ヨ淇℃伅
function createSearchParam(){
var temp = {
StationId:$('#station_name').val(),
StationName1:$('#station_name1').val(),
+ StationName2:$('#city').val(),
BattProductDate:$('#startime').val()+" 00:00:00",
BattProductDate1:$('#endtime').val()+" 23:59:59",
MonCount:Page.pageCurr,
--
Gitblit v1.9.1