From daf105a4c7cfd299d6473939b4d678a3e9f91f23 Mon Sep 17 00:00:00 2001
From: LiJun <LiJun@192.168.10.18>
Date: 星期四, 01 十一月 2018 17:37:50 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/batt-fault-manage.jsp | 275 +++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 227 insertions(+), 48 deletions(-)
diff --git a/gx_tieta/WebRoot/batt-fault-manage.jsp b/gx_tieta/WebRoot/batt-fault-manage.jsp
index 2e14351..e764ea4 100644
--- a/gx_tieta/WebRoot/batt-fault-manage.jsp
+++ b/gx_tieta/WebRoot/batt-fault-manage.jsp
@@ -26,10 +26,7 @@
.filter-container .filter-content th {
text-align: center;
}
- .data-footer{
- overflow:hidden;
- margin-top:50px;
- }
+
</style>
</head>
@@ -42,7 +39,36 @@
<div class="filter-container">
<div class="filter-title"><a href="javascript:;">闂鍙嶉</a></div>
<div class="filter-content">
-
+ <table>
+ <tbody>
+ <tr>
+ <th>鐪�</th> <!-- 鐪� -->
+ <th>甯�</th> <!-- 甯� -->
+ <th><s:text name="Computer_site"/></th> <!-- 鏈烘埧绔欑偣 -->
+
+
+ </tr>
+ <tr>
+ <td>
+ <select name="" id="station_name1">
+
+ </select>
+ </td>
+ <td>
+ <select name="" id="city">
+
+ </select>
+ </td>
+ <td>
+ <select name="" id="station_name3">
+
+ </select>
+ </td>
+
+
+ </tr>
+ </tbody>
+ </table>
</div>
</div>
@@ -56,10 +82,10 @@
<table id="eleInfoTbl" lay-filter="eleInfoTbl"></table>
</div>
- <div class="data-footer">
+ <div >
<!-- 鍒嗛〉鍐呭 -->
<div id="paging">
- <!-- <a href="javascript:" class="search">娣诲姞</a> 娣诲姞 -->
+ <a href="javascript:" id="search" class="layui-btn layui-btn-normal search">鏌ユ壘</a>
<a class="layui-btn layui-btn-normal addbtn">娣诲姞</a>
<script type="text/html" id="toolBar">
<a class="layui-btn layui-btn-xs" lay-event="details">娣诲姞</a>
@@ -117,62 +143,215 @@
// 鐢熸垚琛ㄦ牸鏁版嵁
table.render(tOptions);
-
-
-
- $(document).ready(function(){
- console.info(1111);
- tOptions.data=getData(100,0);
- var tableObj = table.render(tOptions);
- tableObj.reload(tOptions);
- });
+ // $(document).ready(function(){
+ //console.info(1111);
+ // tOptions.data=getData(100,0);
+ // var tableObj = table.render(tOptions);
+ // tableObj.reload(tOptions);
+ // });
function getData(a,b){
var arr=[];
for(i=0;i<a;i++){
- arr.push({'station_name1':b,'city':b+i,'stationName3':b+i+1,'note':b+i+2,'question':'hahaha鍝堝搱鍗″崱鍗″崱鍗″崱鍗″崱'+i});
+ arr.push({'station_name1':b,'city':b+i,'stationName3':b+i+1,'note':b+i+2,'question':'hahaha鍝堝搱鍗″崱鍗″崱鍗″崱鍗″崱'+i});
}
- return arr
+ return arr
}
-
-
-
-
-
-
-
-
+
$(document).on('click','.addbtn',function(){
searchStationHistRecord();
});
function searchStationHistRecord(){
// 灏唒aram娣诲姞鍒�#detailsOpts
- //$('#detailsOpts').data('data', param);
-
+ //$('#detailsOpts').data('data', param);
// 璇锋眰鑾峰彇褰撳墠鐪佷笅鐨勫競
+ // 鏄剧ず闈㈡澘
+ layer.open({
+ type: 2,
+ title: '<span style="font-weight:bold">>>闂娣诲姞</span>',
+ area: ['650px', '450px'],
+ fixed: false, //涓嶅浐瀹�
+ maxmin: true,
+ content: 'iframe/batt-fault-manage-add.html'
+ });
- // 鏄剧ず闈㈡澘
- layer.open({
- type: 2,
- title: '<span style="font-weight:bold">>>闂娣诲姞</span>',
- area: ['600px', '400px'],
- fixed: false, //涓嶅浐瀹�
- maxmin: true,
- content: 'iframe/batt-fault-manage-add.html'
- });
-
- }
-
-
-
-
-
- });
+ }
+
+ // 鐪�-甯�-鏈烘埧-鐢垫睜缁�
+ $(document).ready(function() {
+ //椤甸潰鍔犺浇鏃舵煡璇㈢淮鎶ゅ尯涓殑鏋㈢航绫诲瀷
+ $.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('');
+ for (var i = 0; i <= data.data.length; i++) {
+ $option = $("<option></option>");
+ if (i == 0) {
+ $option.html("鍏ㄩ儴(" + data.data.length + ")");
+ $option.attr("value", "");
+ } else {
+ $option.text(data.data[i - 1]);
+ $option.attr("value", data.data[i - 1]);
+ }
+ $select.append($option);
+ }
+ } else {
+ $("#station_name1").text('').html('<option>鏆傛棤绠＄悊鐨勭淮鎶ゅ尯</option>');
+ }
+ 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();
+ });
+
+ //鏍规嵁鐪侊紝甯傛煡璇㈢珯鐐�
+ 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);
+ console.info(rs);
+ if (rs.code == 1) {
+ var _data = rs.data;
+ var $select = $("#station_name3");
+ // 鏍规嵁鏁版嵁鏋勯�犵敓鎴愪笅鎷夊垪琛ㄧ殑鏁版嵁
+ 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.StationName3, __data, _attr);
+ optsList.push(tmp);
+ }
+
+ // 鏍规嵁鏁版嵁鐢熸垚涓嬫媺鍒楄〃
+ createOptions($select, optsList, true);
+
+ } else {
+ $("#station_name3").text('').html('<option>鏆傛棤鍙祴鏈烘埧绔欑偣</option>');
+
+ }
+ });
+ }
+
+ function tempCondition(){
+ temp ={
+ StationId:"",
+ StationName1:$('#station_name1').val(),
+ StationName2:$('#city').val(),
+ StationName5:"",
+ page:{
+ pageSize:10,
+ pageCurr:1,
+ },
+ }
+ console.info(temp);
+ return temp;
+ }
+
+ function searchfault()
+ {
+ var sData = tempCondition();
+ var loading = layer.load();
+ // 鏍规嵁鏌ヨ鏉′欢锛屾煡璇㈠唴瀹�
+ $.ajax({
+ type: 'post',
+ async: true,
+ url: 'Deverror_recordAction!serchByCondition',
+ data: "json="+JSON.stringify(sData),
+ dataType: 'json',
+ success: function(result) {
+ //console.info(result);
+ var data = JSON.parse(result.result);
+ console.info(data)
+ if(data.code==1&&data.data.length>0){
+ console.info(data);
+ var data = data.data;
+ for(i=0;i<data.length;i++){
+ var tmp = {};
+ var data = data[i];
+ tmp.station_name1 = data.stationName1;
+ tmp.city = data.stationName2;
+ tmp.stationName3 = data.stationName;
+ tmp.note = data.record_time;
+ tmp.question = data.error_descript;
+ tOptions.data.push(tmp);
+ }
+ //tOptions.data.length = data.length;
+ }else {
+ layer.msg('鏆傛棤鏁版嵁锛�', {icon:0, shade: 0.1,shadeClose:true});
+ }
+ console.info(tOptions);
+ var pageNum = tOptions.data.length;
+ console.info(pageNum);
+ tOptions.limit = pageNum;
+ // 璁剧疆鍒嗛〉淇℃伅
+ $('#total').text(pageNum);
+ table.render(tOptions);
+ layer.close(loading);
+ }
+ });
+ }
+
+ $('#search').click(function(){
+ searchfault();
+ });
+
+});
-
-
-
+
</script>
</body>
--
Gitblit v1.9.1