From 0c414c8027c6b3a91a0bc44f9ca99d1ed1b04ca6 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期四, 15 十一月 2018 15:12:42 +0800
Subject: [PATCH] 修复位置显示bug
---
gx_tieta/WebRoot/control.jsp | 298 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 283 insertions(+), 15 deletions(-)
diff --git a/gx_tieta/WebRoot/control.jsp b/gx_tieta/WebRoot/control.jsp
index d59fe55..0e86670 100644
--- a/gx_tieta/WebRoot/control.jsp
+++ b/gx_tieta/WebRoot/control.jsp
@@ -28,7 +28,6 @@
<!-- <link rel="stylesheet" type="text/css" href="pages/css/mylayui.css"> -->
<script type="text/javascript" src="js/echarts.js"></script>
<script type="text/javascript" src="js/jquery-1.8.3.js"></script>
- <script type="text/javascript" src="js/base.js"></script>
<script type="text/javascript" src="js/right-menu.js"></script>
<style>
body {
@@ -1130,6 +1129,8 @@
<!-- 鏁翠綋鐨勯伄缃╁眰 -->
<div id="allShade"></div>
<div class="clear"></div>
+ <!-- iframe鏁版嵁涓存椂瀛樺偍浣嶇疆 -->
+ <div id="homeInfoIframeData"></div>
<!-- 寮曞叆layui妗嗘灦 -->
<script type="text/javascript" src="src/layui.all.js"></script>
<script type="text/javascript" src="pages/js/common.js"></script>
@@ -1151,6 +1152,7 @@
<script type="text/javascript" src="js/dischargetest/sysData.js"></script>
<script type="text/javascript" src="pages/js/pages/control-common.js"></script>
<script type="text/javascript" src="pages/js/pages/siderbar.js"></script>
+ <script type="text/javascript" src="js/rightmenu.js"></script>
<!-- 寮曞叆鐢佃矾鍥� -->
<script type="text/javascript" src="js/elecircle.js"></script>
<script type="text/javascript" src="js/elecircle.content.js"></script>
@@ -1216,7 +1218,7 @@
// 璁剧疆椤甸潰鏉冮檺妯″潡
$(function() {
var testOp = checkUserPermit(permits, 'batt_test_op_permit');
- console.log(testOp);
+ //console.log(testOp);
if(!testOp) {
$(".ele-circle .tools-btn").remove();
}
@@ -1760,6 +1762,8 @@
searchDevStatusByDev_id();
findrtstate();
findrtdata();
+ //鏌ヨ璁惧鐨刣cdc鐘舵��
+ searchDevDcDcState();
}
//鏍规嵁璁惧id鏌ヨ璁惧褰撳墠鐨勫紑鍏崇姸鎬�
@@ -3039,8 +3043,8 @@
var city = batt.StationName2;
var county = batt.StationName5;
var home = batt.StationName;
- var homeid = batt.BattGroupId;
- $(this).attr('href', 'charge-test.jsp?province='+province+'&city='+city+'&county='+county+'&home='+home+'&homeid='+homeid);
+ var battid = batt.BattGroupId;
+ $(this).attr('href', 'charge-test.jsp?province='+province+'&city='+city+'&county='+county+'&home='+home+'&battid='+battid);
});
});
@@ -3479,10 +3483,20 @@
// 鎷撴墤鍥惧浘鏍�
changeEleCircleOpt(eleCircle, 'DCDC1', {statusImg:-1}); // 鏀剧數鍗曞厓
changeEleCircleOpt(eleCircle, 'DCDC2', {statusImg:-1}); // 鍏呯數鍗曞厓
- console.log(data);
+ //console.log(data);
// 娌℃湁褰㈠弬灏变笉鍋氫换浣曟搷浣�
if(data == undefined) {
- status.hide();
+ var opts = [{
+ name: 'none',
+ type: 'text',
+ status: 0,
+ notShow: false,
+ content: {
+ text:'璁惧鐘舵�侊細<span class="red">鏈繛鎺�</span>'
+ }
+ }];
+ status.setOpts(opts);
+ //status.hide();
return false; // 缁撴潫鍑芥暟
}
@@ -3518,6 +3532,7 @@
status.setStatus('msg', isLink);
// 璁剧疆娓╁害淇℃伅
status.setStatus('tmp', alarms[2] == 'true'?0:1);
+
// 璁剧疆鏍稿鍋滄鍘熷洜
if(data.dev_workstate == 2) {
status.setStatus('stop', 99);
@@ -3539,11 +3554,7 @@
status.setStatus('workstatus', data.dev_workstate);
// 璁剧疆鏍稿鍋滄鍘熷洜
- if(data.dev_workstate == 2) {
- status.setStatus('stop', 99);
- }else {
- status.setStatus('stop', data.dev_last_captest_stop_type);
- }
+ status.setStatus('stop', data.dev_last_captest_stop_type);
// 璁剧疆閫氫俊璁℃暟
status.setText('count', "閫氫俊璁℃暟锛�"+data.dev_commcount);
@@ -4343,6 +4354,8 @@
// 鐢垫睜缁�
treeView.ele.on('click', '.eleGroup', function() {
var eleGroup = $(this).data('attr');
+ var status = GLOBAL.circleStatus.status;
+ var btsOpts = GLOBAL.circleStatus.btsOpts;
// 鏍规嵁BattGroupId鏌ヨ鏁版嵁
if(BattGroupId != eleGroup.BattGroupId) {
BattGroupId = eleGroup.BattGroupId;
@@ -4368,7 +4381,7 @@
// 璐熻浇鐢垫祦
var loadCurr = batt.Load_curr+'A';
changeEleCircleOpt(eleCircle, 'loaderCurr', {name:'鏈�澶ц礋杞界數娴侊細'+loadCurr});
- changeEleCircleOpt(eleCircle, 'signal', {isShow:false});
+
// 鏈�澶ф牳瀹圭數娴�
var disCurrMax = batt.DisCurrMax+'A';
changeEleCircleOpt(eleCircle, 'disCurrMax', {name:'鏈�澶ф牳瀹圭數娴侊細'+disCurrMax});
@@ -4413,6 +4426,46 @@
//鍏ㄩ儴鏀剁缉
$('#all_hide').click(function(){
treeView.ele.find('li').removeClass('sider-menu-open');
+ });
+
+ // 鐢佃矾鎷撴墤鍥惧彸閿彍鍗�
+ var menuItems = [
+ {txt: '鍩虹珯鏈哄巻鍗�', cla: 'home-info-card'},
+ {txt: '鏈烘埧瀹炴椂鐘舵�佹煡璇�', cla: 'target', data:{target: 'batt-state-manage.jsp'}},
+ {txt: '璁惧娴侀噺缁熻鏌ヨ', cla: 'target', data:{target: 'batt-traffic-statistics1.jsp'}},
+ {txt: '鏈烘埧缁埅鑳藉姏鏌ヨ', cla: 'target', data: {target: 'batt-life-manage.jsp'}},
+ {txt: '璁惧鍏呮斁鐢垫ā鍧楃姸鎬�', cla:'target', data: {target: 'equip-charge-param.jsp'}},
+ {txt: '鏈烘埧鍘嗗彶浜嬩欢鏌ヨ', cla:'target', data: {target: 'batt-state-statistical.jsp'}},
+ ];
+ // 缁欒〃鏍兼坊鍔犺嚜宸辩殑鍙抽敭鑿滃崟
+ $('#contai').on('mousedown','.ele-circle canvas',function(e){
+ var batt = getBatt();
+ if (e.which == 3) {
+ var disX = (e || event).clientX + 10; //鑾峰彇榧犳爣鐐瑰嚮鐨勬í鍧愭爣
+ var disY = (e || event).clientY + 10; // 鑾峰彇榧犳爣鐐瑰嚮鐨勭旱鍧愭爣
+
+ rightMenu.showMenu(menuItems, disX, disY);
+ }
+ });
+
+ // 鐐瑰嚮鍙抽敭鑿滃崟璺宠浆
+ $('body').on('click', '#rightMenu .target', function() {
+ var batt = getBatt();
+ var pageName = $(this).data('data').target;
+ var province = batt.StationName1;
+ var city = batt.StationName2;
+ var county = batt.StationName5;
+ var home = batt.StationName;
+ var battid = batt.BattGroupId;
+ // 瀹炵幇璺宠浆
+ window.open(skipUrl(pageName, province, city, county, home, battid));
+ });
+
+ // 鐐瑰嚮鍩虹珯鏈哄巻鍗�
+ $('body').on('click', '#rightMenu .home-info-card', function() {
+ var batt = getBatt();
+ // 鏄剧ず鍩虹珯鏈哄巻鍗�
+ showHomeInfo(batt.StationId);
});
// 宸ュ叿鏉℃暣浣撴牱寮�
@@ -4771,6 +4824,9 @@
// 鐐瑰嚮鏌ョ湅褰撳墠淇″彿鐨勮川閲�
$('#signalBtn').click(function() {
var batt = getBatt();
+ var status = GLOBAL.circleStatus.status;
+ var btsOpts = GLOBAL.circleStatus.btsOpts;
+ //var btsOpts = GLOBAL.circleStatus.btsOpts;
signalSearch.dev_id = batt.FBSDeviceId;
var load = layer.load(1);
// 璇锋眰鍚庡彴鑾峰彇淇″彿鐨勮川閲�
@@ -4796,7 +4852,9 @@
// 鍥剧墖鎻忚堪
signalOpts.name = '淇″彿寮哄害锛�'+signalInfo.signal;
- changeEleCircleOpt(eleCircle, 'signal', signalOpts);
+
+ // 鏄剧ず淇″彿寮哄害
+ layer.msg(signalOpts.name, {time: 5000});
});
});
@@ -4813,11 +4871,17 @@
if(testCsq) {
rs.signal = RegExp.$1;
rs.bitError = RegExp.$2;
- if(rs.signal>20) {
+ if(rs.signal>25) {
rs.img = 1;
+ rs.signal += '锛堝己锛�';
+ }else if(rs.signal>19) {
+ rs.img = 1;
+ rs.signal += '锛堜腑锛�';
+ }else {
+ rs.signal += '锛堝急锛�';
}
}
-
+ //console.info(rs);
return rs;
}
});
@@ -4869,6 +4933,210 @@
console.log(RegExp.$2);
console.log(data.data.ack_inf);
}); */
+
+
+ //鑾峰彇璁惧鐨刣cdc鐘舵��
+ function searchDevDcDcState(temp){
+ var obj = getBatt();
+ var temp = {
+ dev_id: obj.FBSDeviceId
+ };
+
+ $.ajax({
+ type: "post",
+ url: "Fbs9100s_dcdc_stateAction_action_serchByInfo",
+ 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){
+ var dcdcWarn = '';
+ var data = rs.data;
+ for(var i=0; i<data.length; i++) {
+ var _data = data[i];
+ if(i == (data.length-1)) {
+ dcdcWarn += '0x'+_data.dcdc_SMR_Alarm1_16;
+ }else {
+ dcdcWarn += '0x'+_data.dcdc_SMR_Alarm1_16+'/';
+ }
+ }
+
+ changeEleCircleOpt(eleCircle, 'dcdcWarn', {name: 'DCDC妯″潡鍛婅锛�'+dcdcWarn});
+ }else{
+ changeEleCircleOpt(eleCircle, 'dcdcWarn', {name: 'DCDC妯″潡鍛婅锛氭湭鐭�'}); //
+ }
+ },
+ error: function() {
+
+ }
+ });
+ }
+
+ // 鏄剧ず鏈烘埧淇℃伅
+ function showHomeInfo(sid) {
+ var temp = {
+ StationId: sid
+ };
+
+ // 鏌ヨ鍩虹珯鐨勪俊鎭�
+ $.ajax({
+ type: 'post',
+ async: true,
+ url: 'BattInfAction!serchBattAllInfoByStationId',
+ data: 'json='+JSON.stringify(temp),
+ dataType: 'json',
+ success: function(result) {
+ var rs = JSON.parse(result.result);
+ if(rs.code == 1) {
+ var data = rs.data;
+ //console.log(data);
+ var rsData = formatHomeInfo(data);
+ $('#homeInfoIframeData').data('data', rsData);
+ // 鏄剧ず闈㈡澘
+ layer.open({
+ type: 2,
+ title: '<i class="fa fa-home"></i>鍩虹珯淇℃伅',
+ area: ['960px', '524px'],
+ fixed: false, //涓嶅浐瀹�
+ maxmin: true,
+ content: 'iframe/homeinfo.html'
+ });
+ }else {
+ layer.msg('鏆傛棤鍩虹珯淇℃伅锛�');
+ }
+
+ }
+ });
+ }
+
+ // 鏍煎紡鍖栨満鎴夸俊鎭暟鎹�
+ function formatHomeInfo(data) {
+ var groupDefaults = {
+ homeid: '',
+ homename: '',
+ homeip: '',
+ groupid: '',
+ groupname: '',
+ ordernum: '',
+ brand: '',
+ model: '',
+ monproperty: '',
+ startusetime: '',
+ chargecurr: '',
+ chargevol: '',
+ equipeinfo: '',
+ person: ''
+ };
+
+ var homeDefaults = {
+
+ };
+ var rs = {
+ tabc:[]
+ };
+ var tabc = rs.tabc;
+ // 閬嶅巻data鐢熸垚鏈烘埧鐨勫��
+ for(var i=0; i<data.length; i++) {
+ var _data = data[i];
+ var tmp = {};
+ tmp.title = '鐢垫睜缁�'+(i+1)+'淇℃伅';
+ tmp.type = 'group';
+ tmp.content = $.extend({}, groupDefaults);
+ tmp.tshow = '';
+ tmp.cshow = '';
+ if(i==0) {
+ tmp.tshow = 'layui-this';
+ tmp.cshow = 'layui-show';
+ }
+ // 璁剧疆content鐨勫��
+ var content = tmp.content;
+ content.homeid = _data.StationId; // 鏈烘埧id
+ content.homename = _data.StationName; // 鏈烘埧鍚嶇О
+ content.homeip = _data.StationIp; // 鏈烘埧ip
+ content.groupid = _data.BattGroupId; // 鐢垫睜缁刬d
+ content.groupname = _data.BattGroupName; // 鐢垫睜缁勫悕绉�
+ content.ordernum = _data.GroupIndexInFBSDevice+1;// 鐢垫睜缁勭紪鍙�
+ content.brand = _data.BattProducer; // 鐢垫睜鍝佺墝
+ content.model = _data.BattModel;
+ var monproperty = '鏍囩О瀹归噺锛�'+_data.MonCapStd+'AH'+'锛涙爣绉板崟浣撶數鍘嬶細'+_data.MonVolStd+'V'+'锛涙爣绉板唴闃伙細'+_data.MonResStd.toFixed(3)+'m惟'
+ +'锛涙爣绉版俯搴︼細'+_data.MonTmpStd+'鈩�'+'锛涘崟浣撴暟閲忥細'+_data.MonCount+'鑺�';
+ content.monproperty = monproperty;
+ content.startusetime = new Date(_data.BattInUseDate).format('yyyy-MM-dd');
+ content.chargecurr = _data.BattFloatCurrent;
+ content.chargevol = _data.FloatVolLevel;
+ var equipeinfo = '鍨嬪彿锛�'+_data.FBSDeviceName+'锛汭D锛�'+_data.FBSDeviceId
+ +'锛汭P锛�'+_data.FbsDeviceIp+'锛汢Index锛�'+_data.GroupIndexInFBSDevice;
+ content.equipeinfo = equipeinfo;
+ content.person = '';
+
+ tabc.push(tmp);
+ }
+ var StationId_ex = data[0].StationId_ex;
+ var homeData = data[0].binf_ex;
+ var tmp = {};
+ tmp.title = '鍩虹珯淇℃伅';
+ tmp.type = 'home';
+ tmp.content = $.extend({}, homeDefaults);
+ tmp.tshow = '';
+ tmp.cshow = '';
+ // 璁剧疆content鐨勫��
+ var content = tmp.content;
+ content.stationid = StationId_ex;
+ content.stationname = homeData.stationName;
+ content.homeid = homeData.stationId;
+ content.organize = homeData.affiliation;
+ content.datasource = homeData.dataSources;
+ content.addrstyle = homeData.stationType;
+ var position = '缁忓害锛�'+homeData.longitude+'锛涚含搴︼細'+homeData.latitude;
+ content.position = position;
+ content.addr = homeData.stationAddr;
+ var blockedState = homeData.blockedState?'鏄�': '鍚�';
+ var stationstatus = '绔欏潃绛夌骇锛�'+homeData.stationLevel+'锛涚淮鎶ょ姸鎬侊細'+homeData.maintenanceState+'锛涘皝閿佺姸鎬侊細'+blockedState;
+ content.stationstatus = stationstatus;
+ content.maintain = homeData.maintenanceCompany;
+ var environment = '涓氬姟鍦烘櫙锛�'+homeData.businessScenario+'锛涜鐩栧満鏅細'+homeData.CoverScenario+'锛涚珯鍧�鍦板舰锛�'+homeData.siteTerrain;
+ content.environment = environment;
+ var isShare = homeData.isShare?'鏄�':'鍚�';
+ var addrpower = '浜ф潈鎬ц川锛�'+homeData.propertyRights+'锛涳紙鍘燂級浜ф潈鍗曚綅锛�'+homeData.propertyUnit+'锛涙槸鍚﹀叡浜細'+isShare;
+ content.addrpower = addrpower;
+ content.usecompany = homeData.useUnit;
+ content.physicsaddrnum = homeData.siteCode;
+ content.hisphysicsaddrnum = homeData.historySiteCode;
+ content.addrinsidenum = homeData.siteInternalNumber;
+ content.addrpinyin = homeData.sitePinyinReferred;
+ content.chinesename = homeData.siteChineseReferred; // 涓枃绠�绉�
+ content.isopenbusiness = homeData.isOpenBusiness;
+ content.entryperson = homeData.schoolPersonnel;
+ content.entrytime = homeData.entryTime;
+ content.revisedperson = homeData.modifyPeople;
+ content.revisedtime = homeData.modifyTime;
+ content.remark = homeData.note;
+ var addrMark = homeData.siteReceivesMark?'鏄�':'鍚�';
+ var isEffe = homeData.siteValidity?'鏄�':'鍚�';
+ var isactive = '绔欏潃鎺ユ敹鏍囪锛�'+addrMark+'锛涙槸鍚︽湁鏁堬細'+isEffe;
+ content.isactive = isactive;
+ content.yidongaddrname = homeData.siteNameCMCC;
+ content.dianxinaddrname = homeData.siteNameCTC;
+ content.liantongaddrname = homeData.siteNameCUCC;
+ content.brand = homeData.producer;
+ content.endurtime = homeData.lastTimeLong;
+ content.endurstyle = homeData.lastTimeType;
+ content.endurstarttime = homeData.lastTimeDate;
+ content.shareinfo = homeData.shareInfo;
+ var buystauts = "绉诲姩璐拱:"+(homeData.electPowerCMCC==1?'鏄�':'鍚�')+";鐢典俊璐拱:"+(homeData.electPowerCTC==1?'鏄�':'鍚�')+";鑱旈�氳喘涔�:"+(homeData.electPowerCUCC==1?'鏄�':'鍚�');
+ content.buystatus = buystauts;
+ var ischarge = homeData.isCanElectPower==1?'鏄�':'鍚�';
+ content.ischarge = ischarge;
+ content.distance = homeData.upperStationRoute;
+ content.degree = homeData.upperStationDifficult;
+ content.repair = homeData.clienteleErrorService;
+
+ tabc.push(tmp);
+ // 杩斿洖缁撴灉闆�
+ return rs;
+ }
</script>
<script type="text/javascript" src="js/Title.js"></script>
<script type="text/javascript" src="js/control.js"></script>
--
Gitblit v1.9.1