From 91ebc29db754494aef8ce055c288b0aeedf08fcf Mon Sep 17 00:00:00 2001
From: LiJun <LiJun@192.168.10.18>
Date: 星期二, 06 十一月 2018 09:09:06 +0800
Subject: [PATCH] 从实时监测跳转到电池组统计分析查询和电池组单体统计分析查询页面选中指定的电池组
---
gx_tieta/WebRoot/control.jsp | 80 ++++++++++++++++++++++++++++++++++++++--
1 files changed, 76 insertions(+), 4 deletions(-)
diff --git a/gx_tieta/WebRoot/control.jsp b/gx_tieta/WebRoot/control.jsp
index 9eee7d1..190b60c 100644
--- a/gx_tieta/WebRoot/control.jsp
+++ b/gx_tieta/WebRoot/control.jsp
@@ -2462,7 +2462,11 @@
$('#echarts_menu .batt-mon-search').click(function() {
var batt = getBatt();
- window.open('eleMonomer.jsp?stationId='+batt.StationId+'&battgroupId='+BattGroupId+'&battmon_num='+battmon_num);
+
+ var url = skipUrl("eleMonomer.jsp",batt.StationName1,batt.StationName2,batt.StationName5,batt.StationName,batt.BattGroupId,battmon_num);
+ //console.info(url);
+ window.open(url);
+ //window.open('eleMonomer.jsp?stationId='+batt.StationId+'&battgroupId='+BattGroupId+'&battmon_num='+battmon_num);
});
$('#echarts_menu .batt-attention').click(function() {
@@ -3118,7 +3122,10 @@
//璺宠浆鍒版寚瀹氱殑鐢垫睜缁勭粺璁″垎鏋愭煡璇�
function targetBattReport(){
var batt = getBatt();
- window.open("eleAnalyse.jsp?battgroupId="+BattGroupId+"&stationId="+batt.StationId);
+ var url = skipUrl("eleAnalyse.jsp",batt.StationName1,batt.StationName2,batt.StationName5,batt.StationName,batt.BattGroupId);
+ //console.info(url);
+ window.open(url);
+ //window.open("eleAnalyse.jsp?battgroupId="+BattGroupId+"&stationId="+batt.StationId);
}
// 浣跨敤jquery瀹炵幇宸﹀鑸殑鏄剧ず鍜岄殣钘�
$(document).ready(function(){
@@ -4000,7 +4007,12 @@
$('#monLineGraphPopup .control-popupClose .fa-file-text-o').click(function() {
var batt = getBatt();
var type = getPopupTabNum(getPopupTab());
- window.open('eleMonomer.jsp?stationId='+batt.StationId+'&battgroupId='+BattGroupId+'&battmon_num='+battmon_num+'&test_type='+type);
+
+ var url = skipUrl("eleMonomer.jsp",batt.StationName1,batt.StationName2,batt.StationName5,batt.StationName,batt.BattGroupId,battmon_num);
+ url += '&test_type='+type;
+ //console.info(url);
+ window.open(url);
+ //window.open('eleMonomer.jsp?stationId='+batt.StationId+'&battgroupId='+BattGroupId+'&battmon_num='+battmon_num+'&test_type='+type);
});
// 鐐瑰嚮閫夐」鍗℃洿鏂板浘琛�
@@ -4475,6 +4487,16 @@
// 绯荤粺鍙傛暟璁剧疆
$(function() {
var sysCMD = GLOBAL.CMD.sys;
+
+ // 鐐瑰嚮璇诲彇
+ $('#sysSet_read').click(function() {
+ var batt = getBatt();
+ var temp = {
+ dev_id:batt.FBSDeviceId
+ };
+ searchSysData(temp, true);
+ });
+
// 鐐瑰嚮璁剧疆绯荤粺鍙傛暟
$('#sysSet').click(function() {
var batt = getBatt();
@@ -4497,7 +4519,20 @@
layer.prompt({title: '杈撳叆閲嶅惎鍙ｄ护', formType: 1}, function(pass, index){
var _pass = hex_md5(pass);
if(_pass == resetPwd) {
+ // 鍏抽棴鍙ｄ护闈㈡澘
+ layer.close(index);
+ // 鏋勯�犻噸鍚懡鍚�
+ var batt = getBatt();
+ var temp = {
+ dev_id: batt.FBSDeviceId,
+ cmd: sysCMD.restart
+ };
+
+ /* console.log(temp);
layer.msg('鍔熻兘寮�鍙戜腑...');
+ return; */
+ // 閲嶅惎
+ restartSys(temp);
}else {
layer.msg('鍙ｄ护杈撳叆閿欒');
}
@@ -4506,7 +4541,7 @@
// 鏌ヨ璁惧鐨勭郴缁熷弬鏁�
- function searchSysData(temp) {
+ function searchSysData(temp, showSU) {
// 寮�鍚瓑寰呮
var load = layer.load(1);
// 璇锋眰鍚庡彴
@@ -4522,6 +4557,9 @@
if(rs.code == 1){
var data = rs.data[0];
setSysSetData(data);
+ if(showSU) {
+ noContent.showNoContent('璇诲彇鎴愬姛', true);
+ }
}else{
noContent.showNoContent('鏌ヨ澶辫触!');
}
@@ -4567,6 +4605,40 @@
});
}
+ // 閲嶅惎璁惧
+ function restartSys(temp) {
+ // 寮�鍚瓑寰呮
+ var load = layer.load(1);
+ // 璇锋眰鍚庡彴
+ $.ajax({
+ type: "post",
+ url: "Fbs9100_sysparamAction_action_update",
+ async: true,
+ dataType: 'json',
+ data: "json = " + JSON.stringify(temp),
+ success: function(result) {
+ var rs = JSON.parse(result.result);
+ console.info(rs);
+ if(rs.code == 1){
+ noContent.showNoContent('鍙戦�侀噸鍚懡浠ゆ垚鍔�', true);
+ }else{
+ noContent.showNoContent('鍙戦�侀噸鍚懡浠ゅけ璐�!');
+ }
+
+ // 鍏抽棴绛夊緟
+ layer.close(load);
+ },
+ error: function() {
+ noContent.showNoContent('鍙戦�侀噸鍚懡浠ゅけ璐�!');
+ // 鍏抽棴绛夊緟
+ layer.close(load);
+ }
+ });
+
+ }
+
+
+
// 鏍规嵁鏁版嵁璁剧疆闈㈡澘淇℃伅
function setSysSetData(data) {
$('#sysSet_dev_id').val(data.dev_id); // 璁惧ID
--
Gitblit v1.9.1