From 30fd57f9bae8c05e99f85c41efdcb14b52c29d29 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.23>
Date: 星期四, 01 十一月 2018 16:15:09 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/batt-life-manage.jsp | 10 +-
gx_tieta/WebRoot/dischargeplan.jsp | 148 ++++++++++++++++++++++++++++++++++++++++++------
gx_tieta/WebRoot/taskplan.jsp | 2
3 files changed, 134 insertions(+), 26 deletions(-)
diff --git a/gx_tieta/WebRoot/batt-life-manage.jsp b/gx_tieta/WebRoot/batt-life-manage.jsp
index 8b93c25..e3b830e 100644
--- a/gx_tieta/WebRoot/batt-life-manage.jsp
+++ b/gx_tieta/WebRoot/batt-life-manage.jsp
@@ -465,7 +465,7 @@
function searchBattLife(isLoad){
var temp = createSearchParam();
var json = JSON.stringify(temp);
- var arrTd = new Array();
+ arrTd = new Array();
var load;
if(isLoad) {
load = layer.load(1);
@@ -503,12 +503,12 @@
Page.pageAll = data[data.length-1].page.pageAll;
var pageNum=Math.ceil(Page.pageAll/Page.pageSize);
$('#total').text(Page.pageAll);
- $('#current').text(Page.pageCurr+"/"+pageNum);
- createAllTbl(tblHd, tblBd, arrTh, arrTd, tblStatus);
+ $('#current').text(Page.pageCurr+"/"+pageNum);
}
-
- }
+ createAllTbl(tblHd, tblBd, arrTh, arrTd, tblStatus);
+ }
});
+
}
//棣栭〉
$('#home').click(function(){
diff --git a/gx_tieta/WebRoot/dischargeplan.jsp b/gx_tieta/WebRoot/dischargeplan.jsp
index 5bfa3ad..57748a7 100644
--- a/gx_tieta/WebRoot/dischargeplan.jsp
+++ b/gx_tieta/WebRoot/dischargeplan.jsp
@@ -20,7 +20,7 @@
<link rel="stylesheet" type="text/css" href="css/dischargeplan_layout.css">
<link rel="stylesheet" type="text/css" href="css/progress.css">
<link rel="stylesheet" type="text/css" href="css/popup.css">
-
+ <link href="src/css/layui.css" type="text/css" rel="stylesheet">
<!-- 瀵煎叆Echarts鐨刯s鍖� -->
<script type="text/javascript" src="js/echarts.js"></script>
<!-- 瀵煎叆frame.js -->
@@ -42,6 +42,7 @@
<tr class="fWeight">
<td>鐪�</td> <!-- 鐪� -->
<td>甯�</td> <!-- 甯� -->
+ <td>鍖�/鍘�</td> <!-- 鍖�/鍘� -->
<td><s:text name="Computer_site"/></td> <!-- 鏈烘埧绔欑偣锛堟垨鏈烘埧璁惧锛� -->
<td><s:text name="Battery"/></td> <!-- 钃勭數姹犵粍 -->
<td><s:text name="Test"/><s:text name="Status"/></td> <!-- 娴嬭瘯鐘舵�� -->
@@ -56,14 +57,13 @@
<select id="city" name="station_name2"></select>
</td>
<td>
- <select id="station_name" name="station_name">
-
- </select>
+ <select id="county" name="station_name5"></select>
</td>
<td>
- <select id="battgroup_name" name="battgroup_name">
-
- </select>
+ <select id="station_name" name="station_name"></select>
+ </td>
+ <td>
+ <select id="battgroup_name" name="battgroup_name"></select>
</td>
<td>
<select id="discharge-state" name="discharge-state">
@@ -167,6 +167,7 @@
<script type="text/javascript" src="js/popup.js"></script>
<!-- 瀵煎叆Jquery -->
<script type="text/javascript" src="js/jquery-ui.js"></script>
+ <script type="text/javascript" src="src/layui.all.js"></script>
<script type="text/javascript">
var Page = {
pageSize:10, //姣忛〉鐨勮鏁�
@@ -487,7 +488,7 @@
var formjson;
function searchDischarge(){
- loading.showLoading();
+ var load = layer.load(1);
var jsontemp = $('#search_form').serialize();
if(formjson != jsontemp){
Page.pageCurr = 1;
@@ -502,7 +503,7 @@
async:true,
dataType:'text',
data:"json="+json,
- success: function(data){
+ success: function(data){
arrTd = new Array();
data = eval('('+data+')');
var model = eval('('+data.result+')');
@@ -546,11 +547,11 @@
$('#page_num').val(Page.pageCurr);
//console.info(arrTd);
changeTblByStatus();
- loading.hideLoading();
+ layer.close(load);
}
}).error(function(){
noContent.showNoContent("<s:text name='Search'/><s:text name='Fail'/>,<s:text name='Please'/><s:text name='Examine'/><s:text name='Network'/><s:text name='Connect'/>锛�"); //鏌ヨ澶辫触,璇锋鏌ョ綉缁滆繛鎺�
- loading.hideLoading();
+ layer.close(load);
});
}
@@ -619,7 +620,9 @@
$('#end-discharge-end-date').val(new Date().format('yyyy-MM-dd'));
// 鐪�-甯�-鏈烘埧-鐢垫睜缁�
+ var filterLoad;
$(document).ready(function(){
+ filterLoad = layer.load();
//椤甸潰鍔犺浇鏃舵煡璇㈢淮鎶ゅ尯涓殑鏋㈢航绫诲瀷
$.post("User_battgroup_baojigroup_battgroupAction!serchStationName1InGroup",null,function(data){
data=data.result;
@@ -647,10 +650,14 @@
});
// 鏍规嵁缁存姢鍖虹殑鍐呭鏌ヨ甯�
- function findCity() {
+ function findCity(isLoad) {
var data = {
StationName1: $("#station_name1").val()
};
+ // 鏄惁娣诲姞绛夊緟
+ if(isLoad) {
+ filterLoad = layer.load();
+ }
// 璇锋眰鑾峰彇褰撳墠鐪佷笅鐨勫競
$.ajax({
type: "post",
@@ -675,27 +682,121 @@
}else {
$select.text('').html('<option>鏆傛棤鍙祴甯�</option>');
}
- findStationNamebyStationname1();
+ findCounty();
}
});
}
+ // 鏌ヨ鍖�/鍘�
+ function findCounty(isLoad) {
+ var tmp = {
+ StationName1:$("#station_name1").val(),
+ StationName2:$("#city").val(),
+ };
+ // 鏄惁娣诲姞绛夊緟
+ if(isLoad) {
+ filterLoad = layer.load();
+ }
+ // 鏌ヨ鍖哄幙
+ $.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>');
+ }
+ findCounty();
+ }
+ });
+ }
+
+ // 鏌ヨ鍖�/鍘�
+ function findCounty(isLoad) {
+ var tmp = {
+ StationName1:$("#station_name1").val(),
+ StationName2:$("#city").val(),
+ };
+ // 鏄惁娣诲姞绛夊緟
+ if(isLoad) {
+ filterLoad = layer.load();
+ }
+ // 鏌ヨ鍖哄幙
+ $.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();
+ }
+ });
+ }
+
//褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊甯�
$('#station_name1').change(function(){
- findCity();
+ findCity(true);
});
//褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊鏈烘埧绔欑偣
$('#city').change(function(){
- findStationNamebyStationname1();
+ findCounty(true);
+ });
+
+ //褰撳尯/鍘跨殑鍊煎彉鎹㈡椂鏇存柊鏈烘埧绔欑偣
+ $('#county').change(function(){
+ findStationNamebyStationname1(true);
});
//鏍规嵁鐪侊紝甯傛煡璇㈢珯鐐�
- function findStationNamebyStationname1(){
+ function findStationNamebyStationname1(isLoad){
var tmp = {
StationName1:$("#station_name1").val(),
- StationName2:$("#city").val()
+ StationName2:$("#city").val(),
+ StationName5:$("#county").val()
};
+ // 鏄惁娣诲姞绛夊緟
+ if(isLoad) {
+ filterLoad = layer.load();
+ }
//var selectvalue=$("#station_name1 option:selected").val();
//alert(selectvalue);
$.post("BattInfAction!serchStationName3","json="+JSON.stringify(tmp),function(data){
@@ -725,20 +826,24 @@
// 鏍规嵁鏈烘埧鍚嶇О鏌ヨ鐢垫睜缁�
$('#station_name').change(function(){
- findserchByBattGroupNamebystationname();
+ findserchByBattGroupNamebystationname(true);
});
//鏍规嵁鐪侊紝甯傚拰鏈烘埧鏌ヨ钃勭數姹犵粍
- function findserchByBattGroupNamebystationname(){
+ function findserchByBattGroupNamebystationname(isLoad){
var stationid = $("#station_name").find('option:selected').attr('stationid')?$("#station_name").find('option:selected').attr('stationid'):'';
// 鏋勯�犳煡璇㈡潯浠�
var tmp = {
StationName1:$("#station_name1").val(),
StationName2:$("#city").val(),
+ StationName5:$("#county").val(),
StationName: $("#station_name").val(),
StationId: stationid
};
-
+ // 鏄惁娣诲姞绛夊緟
+ if(isLoad) {
+ filterLoad = layer.load();
+ }
$.post("BattInfAction!serchBattByStation","json="+JSON.stringify(tmp),function(data){
data=data.result;
//console.info(data);
@@ -767,6 +872,8 @@
}else{
$("#battgroup_name").text('').html('<option>鏆傛棤鍙祴钃勭數姹犵粍</option>');
}
+
+ layer.close(filterLoad);
});
}
@@ -797,6 +904,7 @@
var temp = {
binf:{
StationName:$('#station_name').val(),
+ StationName5:$('#county').val(),
StationName2:$('#city').val(),
StationName1:$('#station_name1').val(),
BattGroupId:$('#battgroup_name').val(),
diff --git a/gx_tieta/WebRoot/taskplan.jsp b/gx_tieta/WebRoot/taskplan.jsp
index 3c526d6..716de17 100644
--- a/gx_tieta/WebRoot/taskplan.jsp
+++ b/gx_tieta/WebRoot/taskplan.jsp
@@ -702,7 +702,7 @@
StationName:$('#station_name').val(),
StationName2:$('#city').val(),
StationName1:$('#station_name1').val(),
- StationNmae5:$('#county').val(),
+ StationName5:$('#county').val(),
BattGroupId:$('#battgroup_name').val(),
BattProducer:$('#producer').val(),
BattInUseDate:$('#startinusedate').val()+" 00:00:00",
--
Gitblit v1.9.1