From f99e01a5e62998ea3ccdd3e74c51bc6a0ca68bb9 Mon Sep 17 00:00:00 2001
From: whyclj <1525436766@qq.com>
Date: 星期三, 02 一月 2019 17:39:10 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/ex-battinfo.jsp | 26 ++++++++++++++++----------
gx_tieta/src/com/fgkj/services/Battinf_applyService.java | 9 +++++++++
2 files changed, 25 insertions(+), 10 deletions(-)
diff --git a/gx_tieta/WebRoot/ex-battinfo.jsp b/gx_tieta/WebRoot/ex-battinfo.jsp
index c0b02b5..efa9644 100644
--- a/gx_tieta/WebRoot/ex-battinfo.jsp
+++ b/gx_tieta/WebRoot/ex-battinfo.jsp
@@ -481,7 +481,7 @@
// 璺宠浆鍒板疄鏃堕〉闈�
function controlPage(data) {
- console.log(data);
+ // console.log(data);
var home = data.StationName;
var province = data.StationName1;
var city = data.StationName2;
@@ -550,7 +550,7 @@
,complete: function() {
layer.close(load);
// 鍚姩鑷姩鍒锋柊
- //updateSearch();
+ updateSearch();
}
});
}
@@ -581,6 +581,7 @@
//console.log(res);
var rs = JSON.parse(res.result);
var resData = [];
+ var isUpdateTbl = false;
if(rs.code == 1) {
var data = rs.data;
// console.log(data);
@@ -588,17 +589,22 @@
for(var i=0; i<data.length; i++) {
var _data = data[i];
var _tmp = formaterResData(_data);
- resData.push(_tmp);
- Page.setAll(_data.apply_note);
+
+ if(_data.apply_note != Page.all) {
+ resData.push(_tmp);
+ Page.setAll(_data.apply_note);
+ isUpdateTbl = true;
+ }
}
}else {
Page.setAll(0);
}
- $('#applyNum').text(Page.all); // 璁剧疆寰界珷
- tOptions.data = resData; // 璁剧疆琛ㄦ牸鐨勬暟鎹�
-
- // 鐢熸垚琛ㄦ牸鏁版嵁
- table.reload('pageTbl', tOptions);
+ // console.log(isUpdateTbl);
+ if(isUpdateTbl) {
+ $('#applyNum').text(Page.all); // 璁剧疆寰界珷
+ tOptions.data = resData; // 璁剧疆琛ㄦ牸鐨勬暟鎹�
+ table.render(tOptions);
+ }
// 瀹炴椂鍥炶皟
updateSearch.timer = setTimeout(updateSearch, 4000);
@@ -645,7 +651,7 @@
// 鐢熸垚琛ㄦ牸鏁版嵁
table.render(acceptOptions);
- console.log(table);
+ // console.log(table);
}
,complete: function() {
layer.close(load);
diff --git a/gx_tieta/src/com/fgkj/services/Battinf_applyService.java b/gx_tieta/src/com/fgkj/services/Battinf_applyService.java
index 16ec177..6ad260f 100644
--- a/gx_tieta/src/com/fgkj/services/Battinf_applyService.java
+++ b/gx_tieta/src/com/fgkj/services/Battinf_applyService.java
@@ -4,7 +4,11 @@
import com.fgkj.dao.BaseDAO;
import com.fgkj.dao.BaseDAOFactory;
+import com.fgkj.dao.BattTestData;
+import com.fgkj.dao.ProcessServerDao;
import com.fgkj.dao.impl.Battinf_applyImpl;
+import com.fgkj.dao.impl.Process_surveyImpl;
+import com.fgkj.dto.Process_survey;
import com.fgkj.dto.ServiceModel;
public class Battinf_applyService {
@@ -20,6 +24,11 @@
public ServiceModel update(Object obj){
boolean bl=dao.update(obj);
if(bl){
+ BattTestData.run_cmd();
+ //灏嗗憡璀︾殑鏈嶅姟璁句负閲嶅惎
+ Process_survey process=new Process_survey();
+ process.setProcessName(ProcessServerDao.BMS_FBSDEV_ALARM_BATT);
+ Boolean b=(new Process_surveyImpl()).update(process);
model.setCode(1);
model.setMsg("鐢宠鎴愬姛!");
}else{
--
Gitblit v1.9.1