From b2f21d080425b0ab6e5e6170914ca2c615e5d185 Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期三, 02 一月 2019 10:22:00 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/batch-set-curr.jsp | 223 ++++++++++++++++++++++++++++++++++---------------------
1 files changed, 139 insertions(+), 84 deletions(-)
diff --git a/gx_tieta/WebRoot/batch-set-curr.jsp b/gx_tieta/WebRoot/batch-set-curr.jsp
index 77cd10c..fe2d1bd 100644
--- a/gx_tieta/WebRoot/batch-set-curr.jsp
+++ b/gx_tieta/WebRoot/batch-set-curr.jsp
@@ -15,7 +15,7 @@
<meta http-equiv="expires" content="0">
<meta http-equiv="keywords" content="keyword1,keyword2,keyword3">
<meta http-equiv="description" content="This is my page">
- <title>鎵归噺璁剧疆淇℃伅</title>
+ <title>鎵归噺鏍稿娴嬭瘯</title>
<link rel="stylesheet" type="text/css" href="pages/css/base.css">
<link rel="stylesheet" type="text/css" href="jqueryui/jquery-ui.css">
<link rel="stylesheet" type="text/css" href="src/css/layui.css">
@@ -55,7 +55,7 @@
<div class="layui-page-container">
<!-- 鏉′欢绛涢�� -->
<div class="layui-page-filter">
- <div class="page-filter-header layui-page-filter-fweight">鎵归噺璁剧疆淇℃伅</div>
+ <div class="page-filter-header layui-page-filter-fweight">鎵归噺鏍稿娴嬭瘯</div>
<div class="page-filter-content">
<table>
<tr class="layui-page-filter-tbl-header layui-page-filter-fweight">
@@ -93,7 +93,7 @@
<div class="layui-form" lay-filter="countyFilter">
<div class="layui-form-item">
<div class="layui-input-block">
- <select name="county" id="county" lay-filter="county">
+ <select name="county" id="county" lay-filter="county" lay-search="">
<option value="">璇烽�夋嫨鍖�/鍘�</option>
</select>
</div>
@@ -159,7 +159,6 @@
<button class="layui-btn layui-btn-sm mrl8" id="batchAdd"><i class="fa fa-plus mrr8"></i>娣诲姞鐢垫睜缁�</button>
<button class="layui-btn layui-btn-sm" id="batchSetCurr">鎵归噺璁剧疆鏀剧數鍙傛暟</button>
<button class="layui-btn layui-btn-sm" id="startTest">鎵归噺鍚姩娴嬭瘯</button>
- <button class="layui-btn layui-btn-sm" id="lookSetCurr">鏌ヨ鏀剧數鍙傛暟</button>
</div>
</div>
<!-- 琛ㄦ牸鍐呭 -->
@@ -187,7 +186,7 @@
<td><input id="distime" type="text" value="600"><i class="fa fa-frown-o error-img" title="鏁版嵁鏍煎紡閿欒"></i></td>
</tr>
<tr>
- <th><s:text name="Discharging"/><s:text name="Hourly_rate"/>(0~300%)<!-- 鏀剧數灏忔椂鐜� --></th>
+ <th>鏀剧數鐢垫祦鐧惧垎姣�(0~300%)<!-- 鏀剧數灏忔椂鐜� --></th>
<th>鏀剧數瀹归噺鐧惧垎姣�(0~300%)</th>
</tr>
<tr>
@@ -241,13 +240,37 @@
<!-- 瀛樺偍set-curr.html鐨勪俊鎭� -->
<div id="setCurrIframe"></div>
<div id="setCurrBtn"></div>
+ <!-- 璁惧宸ヤ綔鐘舵�� -->
+ <script type="text/html" id="devStatus">
+ {{# if(d.devStatus) { }}
+ {{d.devStatus}}
+ {{# }else{ }}
+ 鐘舵��:锛燂紵锛�,鍛婅:锛燂紵锛�,缁勭鐢靛帇(V):锛燂紵锛�,鐢垫祦(A):锛燂紵锛�,瀹归噺(AH):锛燂紵锛�
+ {{# } }}
+ </script>
+ <!-- 宸叉祴鏃堕暱 -->
+ <script type="text/html" id="testTime">
+ {{# if(d.testTime) { }}
+ {{d.testTime}}
+ {{# }else{ }}
+ 00:00:00
+ {{# } }}
+ </script>
+ <!-- 閫氫俊璁℃暟signalNum -->
+ <script type="text/html" id="signalNum">
+ {{# if(d.signalNum) { }}
+ {{d.signalNum}}
+ {{# }else{ }}
+ 锛燂紵锛�
+ {{# } }}
+ </script>
<script type="text/html" id="setStatus">
{{# if(d.setCurr == 1){ }}
- <button class="layui-btn layui-btn-sm">璁剧疆鏀剧數鍙傛暟鎴愬姛</button>
+ <button class="layui-btn layui-btn-sm">璁剧疆鎴愬姛</button>
{{# }else if(d.setCurr == 2){ }}
- <button class="layui-btn layui-btn-sm layui-btn-danger">璁剧疆鏀剧數鍙傛暟澶辫触</button>
+ <button class="layui-btn layui-btn-sm layui-btn-danger">璁剧疆澶辫触</button>
{{# }else { }}
- <button class="layui-btn layui-btn-sm layui-btn-normal">鏈缃斁鐢靛弬鏁�</button>
+ <button class="layui-btn layui-btn-sm layui-btn-normal">鏈缃�</button>
{{# } }}
</script>
<script type="text/javascript" src="js/jquery-1.8.3.js"></script>
@@ -510,24 +533,22 @@
,cellMinWidth: 80
,cols: [[
{type:'checkbox',fixed: 'left'}
+ ,{field:'FBSDeviceId', title:'璁惧ID', align:'center', width: 160}
,{field:'StationName', title:'鏈烘埧鍚嶇О', align:'center', width: 470}
- ,{field:'FBSDeviceName', title:'FBS璁惧鍚嶇О', align:'center', width: 160}
- ,{field:'GroupIndexInFBSDevice', title:'FBS璁惧绱㈠紩', align:'center', width: 160}
- ,{field:'StationName9', title:'璁惧鐗堟湰鍙�', align:'center', width: 160}
,{field:'BattGroupId', title:'鐢垫睜缁処D', align:'center', width: 160}
,{field:'BattGroupName', title:'鐢垫睜缁勫悕绉�', align:'center', width: 160}
+ ,{field:'devStatus', title:'璁惧鐘舵��', templet: '#devStatus', align:'center', width: 600}
+ ,{field:'testTime', title:'宸叉祴鏃堕暱', templet: '#testTime', align:'center', width: 140}
+ ,{field:'signalNum', title:'閫氫俊璁℃暟', templet: '#signalNum', align:'center', width: 140}
+ ,{field:'StationName9', title:'璁惧鐗堟湰鍙�', align:'center', width: 160}
,{field:'MonCount', title:'鍗曚綋鏁伴噺', align:'center', width: 100}
,{field:'MonCapStd', title:'鏍囩О瀹归噺', align:'center', width: 100}
,{field:'MonVolStd', title:'鏍囩О鍗曚綋鐢靛帇', align:'center', width: 140}
- ,{field:'MonResStd', title:'鏍囩О鍗曚綋鍐呴樆', align:'center', width: 140}
- ,{field:'MonSerStd', title:'鏍囩О鍗曚綋鐢靛', align:'center', width: 140}
- ,{field:'Load_curr', title:'璐熻浇鐢垫祦', align:'center', width: 140}
- ,{field:'DisCurrMax', title:'鏈�澶ф牳瀹圭數娴�', align:'center', width: 140}
,{field:'doThings', fixed: 'right', title: '璁剧疆鐘舵��', toolbar: '#setStatus', align: 'center', width: 160}
]]
,data:[]
- ,limit: 20
- ,page: true
+ ,limit: 10000
+ ,page: false
,height: 'full-252'
};
@@ -570,10 +591,11 @@
}else {
layer.msg('娌℃湁鍙缃殑鐢垫睜缁�!');
}
-
+ console.log(data);
tOptions.data = data;
// 鐢熸垚琛ㄦ牸鏁版嵁
table.render(tOptions);
+ updateDevStatus();
}
,complete:function() {
layer.close(load);
@@ -659,6 +681,7 @@
// 璇锋眰璁剧疆鍙傛暟
function ajaxSetParam(param) {
+ console.log(param);
var load = layer.load(1);
// 璇锋眰鍚庡彴
$.ajax({
@@ -668,7 +691,6 @@
,data: 'json='+JSON.stringify(param)
,dataType: 'json'
,success: function(res) {
- console.log(res);
var rs = JSON.parse(res.result);
if(rs.code == 1) {
layer.msg('璁剧疆瀹屾垚锛�');
@@ -678,13 +700,20 @@
var rsList = [];
for(var i=0; i<data.length; i++) {
var _data = data[i];
+ rsList.push(_data);
+ }
+
+ var trIndex = getSetCurrIndex(data, tOptions.data);
+ // 琚缃弬鏁扮殑鏈烘埧
+ for(var i=0; i<trIndex.length; i++) {
+ var _data = data[i];
+ var _trIndex = trIndex[i];
var _temp = {'doThings':''};
if(_data.num==1) {
_temp.setCurr = 1;
}else {
_temp.setCurr = 2;
}
- rsList.push(_data);
layuiTbl.updateTr(i, _temp);
}
@@ -702,6 +731,7 @@
// 鏋勯�犳壒閲忚缃斁鐢靛弬鏁扮殑鏂规硶
function getSetCurrParam(data, ratio) {
+ //console.log(data);
var rs = [];
for(var i=0; i<data.length; i++) {
var _data = data[i];
@@ -714,7 +744,7 @@
var temp= {
num: 0
,dev_id: _data.FBSDeviceId // 璁惧id
- ,op_cmd: setParamCmd // 璁剧疆鍙傛暟鍛戒护
+ ,op_cmd: setParamCmd // 璁剧疆鍙傛暟鍛戒护
,TestCmd: ratio.testType // 娴嬭瘯绫诲瀷
,HourRate: ratio.hourrate // 灏忔椂鐜�
,DisCurr: disCurr // 鏀剧數鐢垫祦
@@ -727,7 +757,8 @@
,OnlineLowAction: ratio.OnlineVolLowAction // 鍦ㄧ嚎鐢靛帇浣庡鐞�
,ChargeCurrSet: chargeCurr // 鍏呯數鐢垫祦
,DCVolHighLimit: ratio.DCVolHighLimit // 鍗囧帇涓婇檺
- ,BattGroupNum: _data.MonCount // 鐢垫睜涓暟
+ ,BattGroupNum: _data.GroupIndexInFBSDevice+1 // 鐢垫睜缁勭殑绱㈠紩
+ ,StationName: _data.StationName // 鏈烘埧鍚嶇О
}
rs.push(temp);
@@ -835,24 +866,6 @@
setBTSPopupStatus($(this).attr('id'), $(this).val());
});
- // 鏄剧ず宸茬粡淇敼鐨勫弬鏁�
- $('#lookSetCurr').click(function() {
- var rsList = $('#setCurrIframe').data('setCurr');
-
- if(rsList.length == 0) {
- layer.msg('鏆傛棤鏌ョ湅鍐呭,璇峰厛璁剧疆鏀剧數鍙傛暟!');
- return;
- }
-
- // 鏄剧ず闈㈡澘
- layer.open({
- type: 2
- ,area: ['1200px', '500px']
- ,resize: false
- ,content: 'iframe/setcurr.html'
- });
- });
-
// 鍚姩娴嬭瘯
$('#startTest').click(function() {
var rsList = $('#setCurrIframe').data('setCurr');
@@ -861,53 +874,17 @@
return;
}
- // 鏄惁纭畾鍚姩
- layer.confirm('鏄惁纭畾鍚姩娴嬭瘯', {icon: 3, title: '绯荤粺鎻愮ず'}, function(index) {
- var param = getStartTestParam(rsList);
- // 鍚姩娴嬭瘯
- ajaxStartTest(param);
+ // 鏄剧ず闈㈡澘
+ layer.open({
+ type: 2
+ ,area: ['1200px', '500px']
+ ,resize: false
+ ,maxmin: true
+ ,fixed: true
+ ,content: 'iframe/setcurr.html'
});
});
-
- // 鏋勯�犲惎鍔ㄦ祴璇曠殑鍙傛暟
- function getStartTestParam(param) {
- for(var i=0; i<param.length; i++) {
- param[i].op_cmd = startTest;
- param[i].num = 0;
- }
-
- return param;
- }
-
- // 鍚姩娴嬭瘯璇锋眰
- function ajaxStartTest(param) {
- var load = layer.load(1)
-
- // 璇锋眰鍚庡彴
- $.ajax({
- type: 'post'
- ,async: true
- ,url: 'Fbs9100_setparamAction_action_updatePro_dis'
- ,data: 'json='+JSON.stringify(param)
- ,dataType: 'json'
- ,success: function(res) {
- var rs = JSON.parse(res.result);
- if(rs.code == 1) {
- var data = rs.data;
- console.log(data)
- layer.msg('鍚姩鎴愬姛');
- }else {
- layer.msg('鍚姩澶辫触');
- }
- }
- ,complete: function() {
- layer.close(load);
- }
- });
-
-
- }
// 鍒濆鍖栬缃弬鏁扮殑鎸夐挳
var BTSBtn = {
@@ -965,6 +942,84 @@
BTSBtn.active();
}
}
+
+ // 鑾峰彇璁剧疆鏀剧數鍙傛暟鐨勪笅鏍�
+ function getSetCurrIndex(setData, allData) {
+ var rs = [];
+ // 閬嶅巻setData
+ for(var i=0; i<setData.length; i++) {
+ var _setData = setData[i];
+ var setDevId = _setData.dev_id;
+ // 閬嶅巻allData
+ for(var k=0; k<allData.length; k++) {
+ var _allData = allData[i];
+ var allDevId = _allData.FBSDeviceId;
+ if(setDevId == allDevId) {
+ rs.push(k);
+ }
+ }
+
+ }
+
+ return rs;
+ }
+
+ // 鏇存柊璁惧鐘舵��
+ var BTS9100 = GLOBAL.BTS9100;
+ var workStates = BTS9100.workstates;
+ var alarmStates = BTS9100.alarmstates;
+ function updateDevStatus() {
+ var battlist = tOptions.data;
+ clearInterval(updateDevStatus.timer);
+ if(battlist.length > 0){
+ $.ajax({
+ type: "post",
+ url: "Fbs9100_setparamAction_action_serchByInfo",
+ async:true,
+ dataType:'text',
+ data:"json="+JSON.stringify(battlist),
+ dataType: 'json',
+ success: function(res){
+ var rs = JSON.parse(res.result);
+ if(rs.code == 1) {
+ var data = rs.data;
+ // console.log(data);
+ for(var i=0; i<data.length; i++) {
+ var obj = data[i];
+ if(obj.fstate.num > 0){
+ var str = '';
+ var index = obj.fstate.dev_workstate;
+ // 鍐呴樆娴嬭瘯(宸ヤ綔鐘舵�佷负0, 鍐呴樆娴嬭瘯涓嶄负0)
+ if(obj.fstate.dev_workstate ==0 && obj.fstate.dev_res_test_state != 0) {
+ index = 3;
+ }
+ // 璁剧疆鏂囨湰鍊�
+ str = "鐘舵��:" + workStates[index]+
+ ",鍛婅:"+alarmStates[obj.fstate.dev_alarmstate]+
+ ",缁勭鐢靛帇(V):"+obj.fstate.dev_captest_groupvol+
+ ",鐢垫祦(A):"+obj.fstate.dev_captest_curr+
+ ",瀹归噺(AH):"+obj.fstate.dev_captest_cap;
+ if(index == 3){
+ str = "鐘舵��:"+workStates[index]+
+ ",缁勫彿:"+obj.fstate.dev_testgroupnum+
+ ",褰撳墠鍗曚綋缂栧彿:"+(obj.fstate.dev_restest_monindex+1)+
+ ",琚祴鍗曚綋鎬绘暟:"+obj.fstate.dev_restest_moncount;
+ }
+ var temp = {
+ devStatus: str // 璁惧鐘舵��
+ ,testTime: formatSeconds(obj.fstate.dev_captest_timelong) // 娴嬭瘯鏃堕暱
+ ,signalNum: obj.fstate.dev_commcount
+ }
+ layuiTbl.updateTr(i, temp);
+ }
+ }
+ }
+ updateDevStatus.timer = setTimeout(updateDevStatus, 4000);
+ },
+ });
+ }
+ }
+
});
</script>
</body>
--
Gitblit v1.9.1