From bb65f33c9fdff40844f17e95e3e75aed2b42bda2 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期四, 25 十月 2018 14:47:33 +0800
Subject: [PATCH] 修改内容
---
gx_tieta/WebRoot/js/base.js | 2
gx_tieta/WebRoot/control.jsp | 58 ++++------
gx_tieta/WebRoot/js/elecircle.content.js | 82 +++++++++------
gx_tieta/WebRoot/charge-test.jsp | 115 +++++++----------------
gx_tieta/WebRoot/index.jsp | 12 +
gx_tieta/WebRoot/js/dischargetest/bts.js | 3
gx_tieta/WebRoot/pages/js/pages/siderbar.js | 26 +++++
7 files changed, 145 insertions(+), 153 deletions(-)
diff --git a/gx_tieta/WebRoot/charge-test.jsp b/gx_tieta/WebRoot/charge-test.jsp
index ebe89f4..084de30 100644
--- a/gx_tieta/WebRoot/charge-test.jsp
+++ b/gx_tieta/WebRoot/charge-test.jsp
@@ -419,10 +419,10 @@
<td><s:text name="Computer_room_IP"/></td> <!-- 鏈烘埧IP -->
<td id="StationIP"></td>
</tr>
- <!-- <tr>
- <td><s:text name="Batt_group"/>ID</td> 鐢垫睜缁処D
+ <tr>
+ <td><s:text name="Batt_group"/>ID</td> <!-- 鐢垫睜缁処D -->
<td id="batt_group_id"></td>
- </tr> -->
+ </tr>
<tr>
<td><s:text name="Battery_name"/></td> <!-- 鐢垫睜缁勫悕绉� -->
<td id="BattGroupName"></td>
@@ -3498,18 +3498,23 @@
if(model.code == 1){
//console.info(model.data);
for(var i = 0;i<model.data.length;i++){
- if(model.data[i].batt_test_type == 3){
+ var _data = model.data[i];
+ if(_data.batt_test_type == 3){
arr.push({
- note: model.data[i].note,
- val:model.data[i].BattGroupId,
- fbs: model.data[i].batt_test_tlong,
+ note:_data.note,
+ val:_data.BattGroupId,
+ province: _data.stationName1,
+ city: _data.stationName2,
+ home: _data.stationName,
isCharge:0
});
- }else if(model.data[i].batt_test_type == 2){
+ }else if(_data.batt_test_type == 2){
arr.push({
- note: model.data[i].note,
- val:model.data[i].BattGroupId,
- fbs: model.data[i].batt_test_tlong,
+ note: _data.note,
+ val: _data.BattGroupId,
+ province: _data.stationName1,
+ city: _data.stationName2,
+ home: _data.stationName,
isCharge:1
});
}
@@ -3523,75 +3528,6 @@
}
});
- }
-
- // 鐢熸垚鍏呮斁鐢电洃娴嬫ā鍧楀唴瀹�
- function createBattListen(ele, list) {
- //console.info(list);
- ele.text("");
- var discharge_num = 0;
- var charge_num = 0;
- var ul = $('<ul></ul>');
- for(var i = 0; i < list.length; i++) {
- var li = "";
- if(list[i].isCharge) {
- li = $('<li><a href="javascript:;" class="batt-charge" value="'+list[i].val+'" fbs="'+list[i].fbs+'" note="'+list[i].note+'">'+list[i].val+'鐢垫睜缁勫厖鐢垫祴璇�!</a></li>');
- charge_num++;
- }else {
- li = $('<li><a href="javascript:;" class="batt-discharge" value="'+list[i].val+'" fbs="'+list[i].fbs+'" note="'+list[i].note+'">'+list[i].val+'鐢垫睜缁勬斁鐢垫祴璇�!</a></li>');
- discharge_num++;
- }
- ul.append(li);
- }
- $('#ele_content .batt-listen .count-num').find('span').eq(0).text(discharge_num);
- $('#ele_content .batt-listen .count-num').find('span').eq(1).text(charge_num);
- ele.append(ul);
- }
- // 鐐瑰嚮鐢垫睜鍏呮斁鐢电洃娴嬪垪琛ㄨЕ鍙戜簨浠�
- $(function() {
- var batt_list = $('#ele_content .batt-listen .batt-list');
- batt_list.on('click', 'a', function(){
- var fbsId = $(this).attr('fbs');
- var isSpecial = regFbsId(fbsId);
- $('.special-mon-data').removeClass('show');
- batt_list.find('a').removeClass('active');
- $(this).addClass('active');
- BattGroupId=$(this).attr("value");
- locationBattPos($(this).attr('note'), $(this).attr('value'));
- if(isSpecial) {
-
- }else {
- clearfourPicture();
- }
- });
- });
-
- function BattlocationById(battid){
- if(battid!=undefined){
- BattGroupId = battid;
- $('#lside a').css({'background-color':'#fff'});
- //鑾峰緱涓�绾ц彍鍗曞苟灞曠ず浜岀骇鑿滃崟
- var secTag =$('#'+battid).parent().parent().siblings().first().parent().parent().siblings().first().next();
- var secTagA = $('#'+battid).parent().parent().siblings().first();
- //console.info(secTagA.text()+'******');
- if(secTagA.text().trim().length == 0) {
- secTagA.hide();
- }
- secTag.show();
- //$('#'+thr_id).parent().parent().siblings().first().parent().parent().siblings().first().next().show();
- //鑾峰緱浜岀骇鑿滃崟骞跺睍绀轰笁绾ц彍鍗�
- $('#'+battid).parent().parent().siblings().first().next().show();
- $('#'+battid).css('background-color','#9bbaf3');
- //涓�绾ц彍鍗曞睍寮�鏍峰紡
- $('#'+battid).parent().parent().siblings().first().parent().parent().siblings().first().children('.arrow').removeClass("down");
- $('#'+battid).parent().parent().siblings().first().parent().parent().siblings().first().children('.arrow').addClass("up");
- $('#'+battid).parent().parent().siblings().first().children('.mark').text('-');
- $('#'+battid).parent().parent().siblings().first().children('.mark').addClass('black');
- //alert($('#'+thr_id).parent().parent().siblings().first().text());
- location.hash="#"+battid;
- location.hash = '';
- $('#'+battid).click();
- }
}
//璺宠浆鍒版寚瀹氱殑鐢垫睜缁勭粺璁″垎鏋愭煡璇�
@@ -4614,6 +4550,7 @@
var second = GLOBAL.pages.siderbar.second; // 浜岀骇瀵艰埅
var third = GLOBAL.pages.siderbar.third; // 涓夌骇瀵艰埅
var fourth = GLOBAL.pages.siderbar.fourth; // 鍥涚骇瀵艰埅
+ var localSideBar = GLOBAL.pages.siderbar.localSideBar; // 瀹氫綅鏈烘埧
var treeView = new TreeView($('#lside'));
$('#lside').width($('#ele_content').width());
treeView.setContainer();
@@ -4685,6 +4622,24 @@
searchAll_lowAction(); //鑾峰彇闃�鍊�
}
+ // 鐢垫睜鍏呮斁鐢垫暟鎹洃鎺�
+ var batt_list = $('.batt-listen .batt-list');
+ batt_list.on('click', 'a', function(){
+ batt_list.find('a').removeClass('active');
+ $(this).addClass('active');
+ var battInfo = $(this).parent().data('attr');
+
+ var tmp = {
+ province: battInfo.province,
+ city: battInfo.city,
+ home: battInfo.home,
+ homeid: battInfo.note,
+ battid: battInfo.val
+ };
+ console.log(tmp);
+ localSideBar(treeView, treeView.container, tmp);
+ });
+
// 璁剧疆璁板綍鐨勭瑪鏁颁负-1
$('#testrecordcout').val('-1');
diff --git a/gx_tieta/WebRoot/control.jsp b/gx_tieta/WebRoot/control.jsp
index 312a61f..ee80a7c 100644
--- a/gx_tieta/WebRoot/control.jsp
+++ b/gx_tieta/WebRoot/control.jsp
@@ -286,10 +286,10 @@
<td><s:text name="Computer_room_IP"/></td> <!-- 鏈烘埧IP -->
<td id="StationIP"></td>
</tr>
- <!-- <tr>
- <td><s:text name="Batt_group"/>ID</td> 鐢垫睜缁処D
+ <tr>
+ <td><s:text name="Batt_group"/>ID</td> <!-- 鐢垫睜缁処D -->
<td id="batt_group_id"></td>
- </tr> -->
+ </tr>
<tr>
<td><s:text name="Battery_name"/></td> <!-- 鐢垫睜缁勫悕绉� -->
<td id="BattGroupName"></td>
@@ -863,7 +863,7 @@
//var eMenuWidth = $('#echarts_menu').width();
//$('#echarts_menu').width(eMenuWidth);
- var isnotshowvalue=false; //鏄惁鏄剧ず鏌辩姸鍊�
+ var isnotshowvalue=true; //鏄惁鏄剧ず鏌辩姸鍊�
var mon_res_list; //鐢垫睜鍐呴樆鏁扮粍
var mon_vol_list; //鐢垫睜鐢靛帇鏁扮粍
var mon_ser_list; //鐢垫睜鐢靛鏁扮粍
@@ -2742,29 +2742,7 @@
});
}
- //鐢熸垚鍏呮斁鐢电洃娴嬫ā鍧楀唴瀹�
- function createBattListen(ele, list) {
- ele.text("");
- var discharge_num = 0;
- var charge_num = 0;
- var ul = $('<ul></ul>');
- for(var i = 0; i < list.length; i++) {
- var li = "";
- if(list[i].isCharge) {
- li = $('<li><a href="javascript:;" class="batt-charge" value="'+list[i].val+'" note="'+list[i].note+'">'+list[i].val+'鐢垫睜缁勫厖鐢垫祴璇�!</a></li>');
- charge_num++;
- }else {
- li = $('<li><a href="javascript:;" class="batt-discharge" value="'+list[i].val+'" note="'+list[i].note+'">'+list[i].val+'鐢垫睜缁勬斁鐢垫祴璇�!</a></li>');
- discharge_num++;
- }
-
- li.data('attr', list[i]);
- ul.append(li);
- }
- $('#ele_content .batt-listen .count-num').find('span').eq(0).text(discharge_num);
- $('#ele_content .batt-listen .count-num').find('span').eq(1).text(charge_num);
- ele.append(ul);
- }
+
// 鐐瑰嚮鐢垫睜鍏呮斁鐢电洃娴嬪垪琛ㄨЕ鍙戜簨浠�
$(function() {
@@ -3339,7 +3317,8 @@
searchBtsBattInfoByStation(temp); // 鏌ヨ鏈烘埧淇℃伅
searchBTSTestParam({
num: CMD_BTS_GetDischargeParm,
- dev_id: batt.FBSDeviceId
+ dev_id: batt.FBSDeviceId,
+ TestCmd: 0
});
BTS_popup.showPopup();
@@ -3415,7 +3394,8 @@
$('#btn_flush').click(function (){
var temp = {
dev_id:$('#dev_id').val(),
- num:CMD_BTS_GetDischargeParm
+ num:CMD_BTS_GetDischargeParm,
+ TestCmd: 0
};
searchBTSTestParam(temp);
});
@@ -3440,7 +3420,8 @@
// 鏋勯�犲惎鍔ㄦ潯浠�
var temp = {
num: CMD_BTS_Start,
- dev_id: $('#dev_id').val()
+ dev_id: $('#dev_id').val(),
+ TestCmd: $('#discharge_type').val()
};
sendCmdToBTSDev(temp);
});
@@ -3973,6 +3954,14 @@
}
mygraph.ischange = 1; //閲嶆柊缁樺埗鎷撴墤鍥�
+ // 璐熻浇鐢垫祦
+ var loadCurr = batt.Load_curr+'A';
+ changeEleCircleOpt(eleCircle, 'loaderCurr', {name:'鏈�澶ц礋杞界數娴侊細'+loadCurr});
+
+ // 鏈�澶ф牳瀹圭數娴�
+ var disCurrMax = batt.DisCurrMax+'A';
+ changeEleCircleOpt(eleCircle, 'disCurrMax', {name:'鏈�澶ф牳瀹圭數娴侊細'+disCurrMax});
+
getBattStr();
searchBattAlarmParam(); //鏌ヨ鐢垫睜鍛婅鍙傛暟
clearInterval(time);
@@ -3989,8 +3978,8 @@
BattGroupId=$(this).attr("id");
var disX=(e||event).clientX+10; //寰楀埌榧犳爣鐐瑰嚮X鐨勪綅缃�
var disY=(e||event).clientY+10; //寰楀埌榧犳爣鐐瑰嚮Y鐨勪綅缃�
- var scrollY=$("body").scrollTop(); //鑾峰彇娴忚鍣ㄦ粴鍔ㄧ殑楂樺害
-
+ var scrollY=$(window).scrollTop(); //鑾峰彇娴忚鍣ㄦ粴鍔ㄧ殑楂樺害
+ console.log(scrollY);
var oRightMenu=document.getElementById("right_menu");
$(this).click();
@@ -3999,9 +3988,10 @@
$("#right_menu").show();
$("#right_menu .more_menu").hide();
$("#right_menu .angle").hide();
+ console.log(disX+"***"+disY);
//浣胯彍鍗曡窡闅忛紶鏍囦綅缃�
- oRightMenu.style.left=disX+'px';
- oRightMenu.style.top=disY+scrollY+'px';
+ oRightMenu.style.left= disX+'px';
+ oRightMenu.style.top= disY+scrollY+'px';
setPosition($("#right_menu"),disX, disY);
diff --git a/gx_tieta/WebRoot/index.jsp b/gx_tieta/WebRoot/index.jsp
index 2064a1b..eb12531 100644
--- a/gx_tieta/WebRoot/index.jsp
+++ b/gx_tieta/WebRoot/index.jsp
@@ -83,6 +83,12 @@
overflow-y: auto;
overflow-x: hidden;
}
+ .BMapLib_bubble_content a {
+ color: #2A3AF0;
+ }
+ .BMapLib_bubble_content a:hover {
+ text-decoration: underline;
+ }
body .layui-layer-dialog {
min-width:400px;
}
@@ -1763,7 +1769,7 @@
function showMapPanel(target, warnList) {
var point = target.point;
- console.log(target.getLabel());
+ //console.log(target.getLabel());
var searchInforWin = null;
for(var i = 0; i < warnList.length; i++) {
if(warnList[i].lng == point.lng && warnList[i].lat == point.lat) {
@@ -2108,7 +2114,7 @@
var allStation = [];
var mapPages = {
- pageSize:100, // 姣忛〉鐨勮鏁�
+ pageSize:1000, // 姣忛〉鐨勮鏁�
pageCurr:1, // 褰撳墠椤电爜鏁�
pageAll:1, // 鏁扮洰
pageNum: 0,
@@ -2197,6 +2203,7 @@
data: "json="+JSON.stringify(mapPages),
success: function(result) {
var data = JSON.parse(result.result);
+ console.log(data);
for(var i=0; i<data.length; i++) {
var _data = data[i];
var _list = formatUpdateStation(_data);
@@ -2246,7 +2253,6 @@
alert('闈㈡澘淇℃伅鏌ヨ澶辫触锛�');
return;
}
-
var temp = {
StationId: stationInfo.sId
};
diff --git a/gx_tieta/WebRoot/js/base.js b/gx_tieta/WebRoot/js/base.js
index 0369186..8e63b62 100644
--- a/gx_tieta/WebRoot/js/base.js
+++ b/gx_tieta/WebRoot/js/base.js
@@ -387,7 +387,7 @@
document.getElementById("StationId").innerHTML=data.StationId; //鏈烘埧id
document.getElementById("StationName").innerHTML=data.StationName; //鏈烘埧鍚嶇О
document.getElementById("StationIP").innerHTML=data.StationIp; //鏈烘埧ip
- //document.getElementById("batt_group_id").innerHTML=data.BattGroupId; //鐢垫睜缁刬p
+ document.getElementById("batt_group_id").innerHTML=data.BattGroupId; //鐢垫睜缁刬p
document.getElementById("BattGroupName").innerHTML=data.BattGroupName; //鐢垫睜缁勫悕绉�
document.getElementById("BattGroupNum").innerHTML=data.BattGroupNum; //鐢垫睜缁勫簭鍙�
diff --git a/gx_tieta/WebRoot/js/dischargetest/bts.js b/gx_tieta/WebRoot/js/dischargetest/bts.js
index d7439b0..92bdd03 100644
--- a/gx_tieta/WebRoot/js/dischargetest/bts.js
+++ b/gx_tieta/WebRoot/js/dischargetest/bts.js
@@ -239,7 +239,8 @@
noContent.showNoContent("淇敼娴嬭瘯鍙傛暟鎴愬姛");
var temp = {
num:CMD_61850_GETPARAM,
- dev_id:param.dev_id
+ dev_id:param.dev_id,
+ TestCmd: 0
};
searchBTSTestParam(temp,true); //閲嶆柊璇诲彇涓�娆℃祴璇曞弬鏁�
diff --git a/gx_tieta/WebRoot/js/elecircle.content.js b/gx_tieta/WebRoot/js/elecircle.content.js
index ea321c3..47e27b4 100644
--- a/gx_tieta/WebRoot/js/elecircle.content.js
+++ b/gx_tieta/WebRoot/js/elecircle.content.js
@@ -314,42 +314,42 @@
});
// 浜屾瀬绠′笂鏂圭殑妯嚎
- eleCircle.drawLine({
- startX: 380,
- startY: 135,
- endX: 430,
- endY: 135,
- strokeStyle: '#FF0000',
- });
+// eleCircle.drawLine({
+// startX: 380,
+// startY: 135,
+// endX: 430,
+// endY: 135,
+// strokeStyle: '#FF0000',
+// });
// 浜屾瀬绠′笂鏂圭殑绔栫嚎
- eleCircle.drawLine({
- startX: 430,
- startY: 135,
- endX: 430,
- endY: 160,
- strokeStyle: '#FF0000',
- });
+// eleCircle.drawLine({
+// startX: 430,
+// startY: 135,
+// endX: 430,
+// endY: 160,
+// strokeStyle: '#FF0000',
+// });
// 浜屾瀬绠′笅鏂圭殑绔栫嚎
- eleCircle.drawLine({
- startX: 430,
- startY: 220,
- endX: 430,
- endY: 250,
- strokeStyle: '#FF0000',
- });
+// eleCircle.drawLine({
+// startX: 430,
+// startY: 220,
+// endX: 430,
+// endY: 250,
+// strokeStyle: '#FF0000',
+// });
// 浜屾瀬绠′笅鏂圭殑妯嚎
- eleCircle.drawLine({
- startX: 430,
- startY: 250,
- endX: 380,
- endY: 250,
- strokeStyle: '#FF0000',
- });
+// eleCircle.drawLine({
+// startX: 430,
+// startY: 250,
+// endX: 380,
+// endY: 250,
+// strokeStyle: '#FF0000',
+// });
// BATC+绔笂鏂圭殑铏氱嚎
@@ -418,11 +418,11 @@
});
// 缁樺埗浜屾瀬绠o
- eleCircle.drawDiode({
- startX: 430,
- startY: 160,
- id: 'diode'
- });
+// eleCircle.drawDiode({
+// startX: 430,
+// startY: 160,
+// id: 'diode'
+// });
// 缁樺埗ko寮�鍏�
eleCircle.drawSwitchBtn({
@@ -528,6 +528,22 @@
id: 'eleCurrent'
});
+ // 璐熻浇鐢垫祦
+ eleCircle.drawText({
+ id: 'loaderCurr',
+ startX: 600,
+ startY: 50,
+ name: '鏈�澶ц礋杞界數娴侊細0A',
+ });
+
+ // 鏈�澶ф牳瀹圭數娴�
+ eleCircle.drawText({
+ id: 'disCurrMax',
+ startX: 600,
+ startY: 70,
+ name: '鏈�澶ф牳瀹圭數娴侊細0A',
+ });
+
// 娴厖鐢垫祦鏂瑰悜
var floatCurr = [
{
diff --git a/gx_tieta/WebRoot/pages/js/pages/siderbar.js b/gx_tieta/WebRoot/pages/js/pages/siderbar.js
index 6d51ccf..6c6d979 100644
--- a/gx_tieta/WebRoot/pages/js/pages/siderbar.js
+++ b/gx_tieta/WebRoot/pages/js/pages/siderbar.js
@@ -625,4 +625,28 @@
}
});
}
-})(jQuery, window, document, GLOBAL);
\ No newline at end of file
+})(jQuery, window, document, GLOBAL);
+
+//鐢熸垚鍏呮斁鐢电洃娴嬫ā鍧楀唴瀹�
+function createBattListen(ele, list) {
+ ele.text("");
+ var discharge_num = 0;
+ var charge_num = 0;
+ var ul = $('<ul></ul>');
+ for(var i = 0; i < list.length; i++) {
+ var li = "";
+ if(list[i].isCharge) {
+ li = $('<li><a href="javascript:;" class="batt-charge" value="'+list[i].val+'" note="'+list[i].note+'">'+list[i].val+'鐢垫睜缁勫厖鐢垫祴璇�!</a></li>');
+ charge_num++;
+ }else {
+ li = $('<li><a href="javascript:;" class="batt-discharge" value="'+list[i].val+'" note="'+list[i].note+'">'+list[i].val+'鐢垫睜缁勬斁鐢垫祴璇�!</a></li>');
+ discharge_num++;
+ }
+
+ li.data('attr', list[i]);
+ ul.append(li);
+ }
+ $('#ele_content .batt-listen .count-num').find('span').eq(0).text(discharge_num);
+ $('#ele_content .batt-listen .count-num').find('span').eq(1).text(charge_num);
+ ele.append(ul);
+}
\ No newline at end of file
--
Gitblit v1.9.1