From 47baad903367aab2cc21475ee8b15bb25a90fc97 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期三, 21 十一月 2018 09:55:16 +0800
Subject: [PATCH] 更新实时界面放电测试面板数据
---
gx_tieta/WebRoot/control.jsp | 174 ++-------------------------------------------------------
1 files changed, 8 insertions(+), 166 deletions(-)
diff --git a/gx_tieta/WebRoot/control.jsp b/gx_tieta/WebRoot/control.jsp
index 5ea308b..b972711 100644
--- a/gx_tieta/WebRoot/control.jsp
+++ b/gx_tieta/WebRoot/control.jsp
@@ -376,6 +376,10 @@
<td><s:text name="Head"/></td> <!-- 璐熻矗浜� -->
<td></td>
</tr>
+ <tr>
+ <td>瀹夎浜哄憳</td> <!-- 璐熻矗浜� -->
+ <td id="installUser"></td>
+ </tr>
</table>
</div>
<div class="con-list ele-infor" style="height: 400px;overflow-y: auto">
@@ -656,7 +660,7 @@
</tr>
<tr>
<th><s:text name="Booster"/><s:text name="Upper_limit"/><!-- 鍗囧帇涓婇檺 -->锛圴锛�</th>
- <th><s:text name="Charging_current"/><!-- 鍏呯數鐢垫祦 -->锛圓锛�</th>
+ <th id="ChargeCurrSetLabel"><s:text name="Charging_current"/><!-- 鍏呯數鐢垫祦 -->锛圓锛�</th>
</tr>
<tr>
<td><input id="DCVolHighLimit" type="text" value="0"><i class="fa fa-frown-o error-img" title="鏁版嵁鏍煎紡閿欒"></i></td>
@@ -1156,6 +1160,7 @@
<!-- 寮曞叆鐢佃矾鍥� -->
<script type="text/javascript" src="js/elecircle.js"></script>
<script type="text/javascript" src="js/elecircle.content.js"></script>
+ <script type="text/javascript" src="pages/js/pages/homeInfo.js"></script>
<script type="text/javascript">
var permits;
<% Object obj=session.getAttribute("permits");
@@ -4438,7 +4443,7 @@
{txt: '鏈烘埧鍘嗗彶浜嬩欢鏌ヨ', cla:'target', data: {target: 'batt-state-statistical.jsp'}},
];
// 缁欒〃鏍兼坊鍔犺嚜宸辩殑鍙抽敭鑿滃崟
- $('#contai').on('mousedown','.ele-circle',function(e){
+ $('#contai').on('mousedown','.ele-circle canvas',function(e){
var batt = getBatt();
if (e.which == 3) {
var disX = (e || event).clientX + 10; //鑾峰彇榧犳爣鐐瑰嚮鐨勬í鍧愭爣
@@ -4457,6 +4462,7 @@
var county = batt.StationName5;
var home = batt.StationName;
var battid = batt.BattGroupId;
+
// 瀹炵幇璺宠浆
window.open(skipUrl(pageName, province, city, county, home, battid));
});
@@ -4972,170 +4978,6 @@
}
});
- }
-
- // 鏄剧ず鏈烘埧淇℃伅
- 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>
--
Gitblit v1.9.1