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/batt-fault-manage.jsp | 42 +++++++++++++++++++++++++++++++++++++-----
1 files changed, 37 insertions(+), 5 deletions(-)
diff --git a/gx_tieta/WebRoot/batt-fault-manage.jsp b/gx_tieta/WebRoot/batt-fault-manage.jsp
index 3db4193..047e0db 100644
--- a/gx_tieta/WebRoot/batt-fault-manage.jsp
+++ b/gx_tieta/WebRoot/batt-fault-manage.jsp
@@ -63,6 +63,7 @@
</td>
<td>
<select name="" id="question_name">
+ <option value="-1">鍏ㄩ儴</option>
<option value="0">鐢垫睜闂</option>
<option value="1">鐢垫簮闂</option>
<option value="2">绌鸿皟闂</option>
@@ -126,9 +127,9 @@
<script type="text/javascript" src="js/rightmenu.js"></script>
<script type="text/javascript" src="js/myConfirm.js"></script>
<script type="text/javascript" src="js/myinterval.js"></script>
- <script type="text/javascript" src="js/pageUtil.js"></script>
<script type="text/javascript" src="src/layui.js"></script>
<script type="text/javascript" src="js/pageUtil.js"></script>
+ <script type="text/javascript" src="pages/js/common.js"></script>
<script type="text/html" id="toolBar">
<a class="layui-btn layui-btn-xs" lay-event="details">鏁呴殰璇︽儏</a>
<a class="layui-btn layui-btn-xs" lay-event="delError">鎺掗櫎鏁呴殰鏂规</a>
@@ -156,6 +157,9 @@
,element = layui.element
,$=layui.jquery
,form = layui.form;
+
+ var homeQuestion = GLOBAL.HomeQues; // 鏈烘埧闂鍒楄〃
+ $('#question_name').html(homeQuestion.getOptions(true));
var uploadIframe; // 闈㈡澘
// 琛ㄦ牸鏁版嵁閰嶇疆椤�
var tOptions = {
@@ -164,6 +168,7 @@
,cellMinWidth: 80
,cols: [[
{field:'stationName3', title:'鏈烘埧鍚嶇О', align:'center',width:450}
+ ,{field:'ques_type', title:'鏁呴殰绫诲瀷', align:'center',width:150}
,{field:'note', title:'鏁呴殰鎻愬嚭鏃ユ湡', align:'center',width:150}
,{field:'originator', title:'鏁呴殰鎻愬嚭浜�', align:'center',width:150}
,{field:'error_en', title: '鏁呴殰鎺掗櫎鐘舵��', align: 'center',width:150}
@@ -361,9 +366,11 @@
searchfault();
});
+ var isNewLoad = true;
// 鐪�-甯�-鏈烘埧-鐢垫睜缁�
$(document).ready(function() {
//椤甸潰鍔犺浇鏃舵煡璇㈢淮鎶ゅ尯涓殑鏋㈢航绫诲瀷
+ var pre_province = getQueryString("province");
$.post("User_battgroup_baojigroup_battgroupAction!serchStationName1InGroup", null,
function(data) {
data = data.result;
@@ -380,6 +387,9 @@
} else {
$option.text(data.data[i - 1]);
$option.attr("value", data.data[i - 1]);
+ if(pre_province == data.data[i - 1] && isNewLoad){
+ $option.attr('selected',true);
+ }
}
$select.append($option);
}
@@ -395,6 +405,8 @@
var data = {
StationName1: $("#station_name1").val()
};
+ var pre_city = getQueryString('city');
+ console.info(pre_city);
// 璇锋眰鑾峰彇褰撳墠鐪佷笅鐨勫競
$.ajax({
type: "post",
@@ -412,6 +424,9 @@
for (var i = 0; i < _data.length; i++) {
var __data = _data[i];
var tmp = getOptionsData(__data.StationName2, __data.StationName2, __data);
+ if(pre_city == __data.StationName2 && isNewLoad){
+ tmp = getOptionsData(__data.StationName2, __data.StationName2, __data,{},true);
+ }
optsList.push(tmp);
}
// 鏍规嵁鏁版嵁鐢熸垚涓嬫媺鍒楄〃
@@ -432,7 +447,7 @@
StationName1:$("#station_name1").val(),
StationName2:$("#city").val(),
};
-
+ var pre_county = getQueryString('county');
// 鏌ヨ鍖哄幙
$.ajax({
type: 'post',
@@ -452,6 +467,9 @@
StationId: __data.StationId
};
var tmp = getOptionsData(__data.StationName5, __data.StationName5, __data, _attr);
+ if(pre_county == __data.StationName5 && isNewLoad){
+ tmp = getOptionsData(__data.StationName5, __data.StationName5, __data, _attr,{},true);
+ }
optsList.push(tmp);
}
@@ -486,6 +504,7 @@
StationName2: $("#city").val(),
StationName5: $("#county").val()
};
+ var pre_home = getQueryString('home');
//var selectvalue=$("#station_name1 option:selected").val();
//alert(selectvalue);
$.post("BattInfAction!serchStationName3", "json=" + JSON.stringify(tmp),
@@ -502,12 +521,16 @@
StationId: __data.StationId
};
var tmp = getOptionsData(__data.StationName3, __data.StationName3, __data, _attr);
+ if(pre_home == __data.StationName && isNewLoad){
+ tmp = getOptionsData(__data.StationName3, __data.StationName3, __data, _attr,{},true);
+ isNewLoad = false
+ }
optsList.push(tmp);
}
// 鏍规嵁鏁版嵁鐢熸垚涓嬫媺鍒楄〃
createOptions($select, optsList, true);
-
+ searchfault();
} else {
$("#station_name3").text('').html('<option>鏆傛棤鍙祴鏈烘埧绔欑偣</option>');
@@ -517,11 +540,14 @@
// 鏋勯�犳煡璇㈠悗鍙版暟鎹�
function tempCondition(){
+ var sid = $('#station_name3').find('option:selected').attr('stationid');
+ sid = sid?sid: "";
temp ={
- StationId:"",
+ StationId: sid,
StationName1:$('#station_name1').val(),
StationName2:$('#city').val(),
- StationName5:"",
+ StationName5:$('#county').val(),
+ MonCount: $('#question_name').val(),
page:Page,
};
return temp;
@@ -564,6 +590,7 @@
tmp.originator = _data.uname;
tmp.solve_user = _data.solve_uname;
tmp.solve_record_time = solve_record_time;
+ tmp.ques_type = homeQuestion.getLayuiBtn(_data.error_state);
tOptions.data.push(tmp);
Page.pageAll = _data.page.pageAll;
}
@@ -626,6 +653,11 @@
$('#number').val(Page.pageSize);
}
});
+
+ // 鍒囨崲闂绫诲瀷閲嶆柊璁剧疆鍒嗛〉淇℃伅
+ $('#question_name').change(function() {
+ Page.pageCurr = 1;
+ });
});
</script>
</body>
--
Gitblit v1.9.1