From a6b4c1e19b3b3fdcf80d7f69f20fe406205fcf8f Mon Sep 17 00:00:00 2001
From: LiJun <LiJun@192.168.10.20>
Date: 星期一, 26 十一月 2018 11:54:39 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/control.jsp | 340 ++++++++++++++++++++++++++++---------------------------
1 files changed, 173 insertions(+), 167 deletions(-)
diff --git a/gx_tieta/WebRoot/control.jsp b/gx_tieta/WebRoot/control.jsp
index 5ea308b..ce75ad6 100644
--- a/gx_tieta/WebRoot/control.jsp
+++ b/gx_tieta/WebRoot/control.jsp
@@ -120,6 +120,19 @@
.mr250 {
margin-left: -250px;
}
+ .page-link {
+ cursor: pointer;
+ }
+ .page-link:hover {
+ color: #1495E7;
+ }
+ .page-link:active {
+ color: #FF0000;
+ }
+ i.fa.f-size16 {
+ font-size: 16px;
+ vertical-align: middle;
+ }
</style>
</head>
@@ -251,6 +264,11 @@
<span class="whyc-btn-icon fa fa-signal"></span>
<span class="whyc-btn-txt">淇″彿璐ㄩ噺</span>
</a>
+ <br>
+ <a href="javascript:void(0);" id="threadInfo" class="whyc-btn whyc-btn-disabled" id="specialGraphExport">
+ <span class="whyc-btn-icon fa fa-desktop"></span>
+ <span class="whyc-btn-txt">璁惧杩涚▼</span>
+ </a>
</div>
</div>
</div>
@@ -375,6 +393,10 @@
<tr>
<td><s:text name="Head"/></td> <!-- 璐熻矗浜� -->
<td></td>
+ </tr>
+ <tr>
+ <td>瀹夎浜哄憳</td> <!-- 璐熻矗浜� -->
+ <td id="installUser"></td>
</tr>
</table>
</div>
@@ -656,7 +678,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"/><!-- 鍏呯數鐢垫祦 -->锛�<span class="val-range"></span>A锛�<i class="fa fa-edit page-link f-size16" title="淇敼鍏呯數鐢垫祦鑼冨洿"></i></th>
</tr>
<tr>
<td><input id="DCVolHighLimit" type="text" value="0"><i class="fa fa-frown-o error-img" title="鏁版嵁鏍煎紡閿欒"></i></td>
@@ -675,7 +697,7 @@
</div>
</div>
<div class="popup-footer">
- <input type="button" name="" id="btn_start_test" class="status-change-btn whyc-btn-disabled" value="鍚姩娴嬭瘯" > <!-- 鍚姩娴嬭瘯 -->
+ <input type="button" name="" id="btn_start_test" class="status-change-btn whyc-btn-disabled no-remove-disabled" value="鍚姩娴嬭瘯" > <!-- 鍚姩娴嬭瘯 -->
<input type="button" name="" id="btn_flush" value="璇诲彇" > <!-- 璇诲彇 -->
<input type="button" name="" id="btn_ensure" class="status-change-btn whyc-btn-disabled" value="璁惧畾" > <!-- 璁惧畾 -->
<!-- <input type="button" name="" id="bts_graph" value="鎷撴墤鍥�"> -->
@@ -1156,6 +1178,10 @@
<!-- 寮曞叆鐢佃矾鍥� -->
<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/html" id="setChargeCurrTpl">
+
+ </script>
<script type="text/javascript">
var permits;
<% Object obj=session.getAttribute("permits");
@@ -1266,6 +1292,69 @@
sysSet_popup.hidePopup(); // 闅愯棌sysSet_popup寮瑰嚭妗嗗拰閬僵灞�
});
+ // bts闈㈡澘鍏呯數鐢垫祦缂栬緫
+ $('#ChargeCurrSetLabel .fa-edit').click(function() {
+ var batt =getBatt();
+ //console.log(batt);
+ // 璁剧疆闈㈡澘
+ layer.open({
+ type: 1
+ ,title: '璁剧疆鍏呯數鐢垫祦闃�鍊�'
+ , content: '<div style="width:300px; height: 50px;"><div style="margin-top: 20px;margin-left: 8px; margin-right: 8px;">'+
+ '<input type="text" style="width: 100%; height:32px; border: 1px solid #ccc;" id="setChargeCurrVal" value="">'+
+ '</div></div>'
+ ,btn:['璁剧疆', '鍙栨秷']
+ ,yes: function(index) {
+ var chargeCurrVal = $('#setChargeCurrVal').val();
+ var num = Number(chargeCurrVal);
+ if(isNaN(num) || num==0) {
+ layer.msg('璇疯緭鍏ユ暟瀛�');
+ return;
+ }
+ var tmp = {
+ charge_curr_max: num
+ ,BattGroupId: batt.BattGroupId
+ };
+ var load;
+ // 璇锋眰璁剧疆鐢垫祦鐨勫悗鍙�
+ $.ajax({
+ type: 'post'
+ ,async: true
+ ,url: 'BattInfAction!update_charge'
+ ,data: 'json='+JSON.stringify(tmp)
+ ,dataType: 'json'
+ ,beforeSend: function(){
+ load = layer.load(1);
+ }
+ ,success: function(res) {
+ var rs = JSON.parse(res.result);
+ // 鍏抽棴绛夊緟妗�
+ layer.close(load);
+ //console.log(rs);
+ if(rs.code == 1) {
+ // 璁剧疆寮瑰嚭妗嗕俊鎭�
+ layer.msg('璁剧疆鎴愬姛锛�');
+ layer.close(index);
+ // 鍏呯數鐢垫祦
+ $('#ChargeCurrSet').testVal('option', 'allOpts', {
+ regVal: true
+ ,update: true
+ ,min: 0
+ ,max: num
+ ,msg: '鍙栧�艰寖鍥�0~'+num+'A'
+ });
+
+ // 璁剧疆鏂囨湰鍊�
+ $('#ChargeCurrSetLabel .val-range').text('0~'+num);
+ }else {
+ layer.msg('璁剧疆澶辫触!璇烽噸鏂拌缃�');
+ }
+ }
+
+ });
+ }
+ });
+ });
// 绐楀彛澶у皬鏀瑰彉
$(window).resize(function() {
@@ -4438,7 +4527,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 +4546,7 @@
var county = batt.StationName5;
var home = batt.StationName;
var battid = batt.BattGroupId;
+
// 瀹炵幇璺宠浆
window.open(skipUrl(pageName, province, city, county, home, battid));
});
@@ -4884,6 +4974,86 @@
//console.info(rs);
return rs;
}
+
+ // 璁惧杩涚▼鏄剧ず
+ var threadInfoSearch = {
+ num: gprs.threadinfo,
+ dev_id:910000001
+ };
+
+ // 鐐瑰嚮璁惧杩涚▼鎸夐挳
+ $('#threadInfo').click(function() {
+ console.log(threadInfoSearch);
+ SendDeviceThreadInfo(threadInfoSearch,function(data){
+ searchDeviceThreadInfo({dev_id:910000001});
+ });
+ });
+
+
+
+
+ //缁橤PRS鍙戦�佹寚瀹氱殑鍛戒护锛岃幏鍙朅T杩斿洖鍊�
+ function SendDeviceThreadInfo(param,callback){
+ $.ajax({
+ type:"post",
+ url: "Bts_gprs_stateAction_action_update_bts_task_inf",
+ async:true,
+ dataType:'json',
+ data:'json='+JSON.stringify(param),
+ success: function(data){
+ var model = eval('('+data.result+')');
+ console.info(model);
+ if(callback && typeof callback == 'function'){
+ callback(model);
+ }
+ },error:function(e){
+ var model = {
+ code:0,
+ data:e,
+ msg:'閫氫俊澶辫触'
+ };
+ if(callback && typeof callback == 'function'){
+ callback(model);
+ }
+ }
+ });
+ }
+
+ //鏌ヨ璁惧鐨勮繘绋嬩俊鎭�
+ function searchDeviceThreadInfo(param,callback){
+ $.ajax({
+ type:"post",
+ url: "Bts_gprs_stateAction_action_serchByCondition",
+ async:true,
+ dataType:'json',
+ data:'json='+JSON.stringify(param),
+ success: function(data){
+ var model = eval('('+data.result+')');
+ console.info(model);
+ var btsTaskInf = model.data[0].bts_task_inf;
+ layer.open({
+ title: '璁惧杩涚▼',
+ width: 380,
+ height: 450,
+ content: '<pre>'+btsTaskInf+'</pre>'
+ });
+
+ if(callback && typeof callback == 'function'){
+ callback(model);
+ }
+ },error:function(e){
+ var model = {
+ code:0,
+ data:e,
+ msg:'閫氫俊澶辫触'
+ };
+ if(callback && typeof callback == 'function'){
+ callback(model);
+ }
+ }
+ });
+ }
+
});
// 鏈哄巻鍗℃ā鍧�
@@ -4972,170 +5142,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