From c58d9f94318d9c8c3c3dfdbcfd6b7d0d436de992 Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期四, 10 一月 2019 09:09:15 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/ex-battinfo.jsp | 13
gx_tieta/WebRoot/sys-set-test.jsp | 979 +++++++++++++++++++++++----------------------------
gx_tieta/WebRoot/pages/css/mylayui.css | 20
gx_tieta/WebRoot/mobil/wcheckAccept-index.html | 3
gx_tieta/WebRoot/mobil/wapprovalBatt-index.html | 3
gx_tieta/WebRoot/mobil/batt-approve-index.html | 3
gx_tieta/WebRoot/mobil/hcheckAccpet-index.html | 16
gx_tieta/WebRoot/mobil/batt-unapproved-index.html | 3
gx_tieta/WebRoot/mobil/hcheckAccpet.html | 8
gx_tieta/WebRoot/pages/js/mylayui.js | 64 +++
10 files changed, 558 insertions(+), 554 deletions(-)
diff --git a/gx_tieta/WebRoot/ex-battinfo.jsp b/gx_tieta/WebRoot/ex-battinfo.jsp
index 4eac20f..3f28b68 100644
--- a/gx_tieta/WebRoot/ex-battinfo.jsp
+++ b/gx_tieta/WebRoot/ex-battinfo.jsp
@@ -637,7 +637,7 @@
var resData = [];
if(rs.code == 1) {
var data = rs.data;
- // console.log(data);
+ //console.log(data);
// 閬嶅巻鏁版嵁鐨勫��
for(var i=0; i<data.length; i++) {
var _data = data[i];
@@ -714,7 +714,11 @@
if(isUpdateTbl) {
$('#applyNum').text(Page.all); // 璁剧疆寰界珷
tOptions.data = resData; // 璁剧疆琛ㄦ牸鐨勬暟鎹�
- table.render(tOptions);
+
+ // 褰撳墠閫夐」鍗℃病鏈夋樉绀�
+ if(tabsIndex != 0) {
+ table.render(tOptions);
+ }
}
// console.log(456);
// 瀹炴椂鍥炶皟
@@ -870,7 +874,10 @@
for(var i=0; i<resData.length; i++) {
var _resData = resData[i];
_resData.doThings = '';
- layuiTbl.updateTr(i, _resData);
+ // 褰撳墠閫夐」鍗℃病鏈夋樉绀�
+ if(tabsIndex != 1) {
+ layuiTbl.updateTr(i, _resData);
+ }
}
//console.log(123);
// 瀹炴椂鍥炶皟
diff --git a/gx_tieta/WebRoot/mobil/batt-approve-index.html b/gx_tieta/WebRoot/mobil/batt-approve-index.html
index d3efff4..7b69220 100644
--- a/gx_tieta/WebRoot/mobil/batt-approve-index.html
+++ b/gx_tieta/WebRoot/mobil/batt-approve-index.html
@@ -148,9 +148,10 @@
}
}
console.info(model);
- stationlist=model;
+
// }
}
+ stationlist=model;
if(Page.pageCurr==1){
createUl($('#battList'),model);
}else{
diff --git a/gx_tieta/WebRoot/mobil/batt-unapproved-index.html b/gx_tieta/WebRoot/mobil/batt-unapproved-index.html
index 608540d..4e67438 100644
--- a/gx_tieta/WebRoot/mobil/batt-unapproved-index.html
+++ b/gx_tieta/WebRoot/mobil/batt-unapproved-index.html
@@ -119,8 +119,9 @@
}
}
console.info(model);
- stationlist=model;
+
}
+ stationlist=model;
if(Page.pageCurr==1){
createUl($('#battList'),model);
}else{
diff --git a/gx_tieta/WebRoot/mobil/hcheckAccpet-index.html b/gx_tieta/WebRoot/mobil/hcheckAccpet-index.html
index 091179c..7bffaee 100644
--- a/gx_tieta/WebRoot/mobil/hcheckAccpet-index.html
+++ b/gx_tieta/WebRoot/mobil/hcheckAccpet-index.html
@@ -63,10 +63,13 @@
$('#battList').on('click', 'ul li', function () {
aLi = $(this).index();
console.info(aLi);
+ console.info(stationlist);
station = getbatt(stationlist,aLi);
var arr=setarrbatt(arrdata,station);
console.info(arr);
- window.location.href="hcheckAccpet.html";
+ if(arr){
+ window.location.href="hcheckAccpet.html";
+ }
});
});
@@ -92,6 +95,7 @@
// 鏌ヨ鍐呭
function searchBattLife(){
+ loadshow();
var temp = JSON.stringify(getcreatArr());
console.info(temp);
arrTd = new Array();
@@ -120,17 +124,21 @@
}
}
//console.info(model);
- stationlist=model;
+
}
+ stationlist=model;
//console.info(model);
//if(Page.pageCurr==1){
+ loadclose();
createUl($('#battList'),model);
//}else{
//addteUl($('#battList'),model);
//}
}
}
- });
+
+ });
+ loadclose();
}
function setarrbatt(arrdata,station){
@@ -208,7 +216,7 @@
console.info(arr);
//applyendyanshou(arr);//鐢宠楠屾敹鏂规硶銆�
var json=window.JSON.stringify(arr);
- setCookie("wapproval",json); //杩欓噷setcookie,鑻ユ湁涓婁竴鏉ookie鍒欐竻绌轰笂涓�绗�
+ setCookie("happroval",json); //杩欓噷setcookie,鑻ユ湁涓婁竴鏉ookie鍒欐竻绌轰笂涓�绗�
return arr;
}
function addteUl(ulCon,dataList){
diff --git a/gx_tieta/WebRoot/mobil/hcheckAccpet.html b/gx_tieta/WebRoot/mobil/hcheckAccpet.html
index 40fdd03..75b3131 100644
--- a/gx_tieta/WebRoot/mobil/hcheckAccpet.html
+++ b/gx_tieta/WebRoot/mobil/hcheckAccpet.html
@@ -220,9 +220,9 @@
var startTime = "1980-01-01";
var endTime = new Date().format('yyyy-MM-dd');
var tbl = $('.tbl-container');
- var temp = getCookie("wapproval");
+ var temp = getCookie("happroval");
temp = JSON.parse(temp);
- //console.info(temp);
+ console.info(temp);
createTbl(tbl, arrTh, dataArr);
$(document).ready(function(){
Page.pageCurr=1;
@@ -241,7 +241,7 @@
$("#jizhandata").click(function(){
// 鏌ョ湅鏈烘埧淇℃伅
- var temp = getCookie("wapproval");
+ var temp = getCookie("happroval");
data = JSON.parse(temp);
var lng = data[0].longitude; // 鑾峰彇缁忓害
var lat = data[0].latitude; // 鑾峰彇绾害
@@ -290,7 +290,7 @@
function battnumber(){
var selected=''
- // console.info(temp);
+ console.info(temp);
if(temp.length>0){
for(var i=0;i<temp.length;i++){
selected+= '<option '+'value='+i+'>'+temp[i].binf.BattGroupName+'</option>';
diff --git a/gx_tieta/WebRoot/mobil/wapprovalBatt-index.html b/gx_tieta/WebRoot/mobil/wapprovalBatt-index.html
index 71cd293..5a20fae 100644
--- a/gx_tieta/WebRoot/mobil/wapprovalBatt-index.html
+++ b/gx_tieta/WebRoot/mobil/wapprovalBatt-index.html
@@ -121,9 +121,10 @@
}
}
console.info(model);
- stationlist=model;
+
}
}
+ stationlist=model;
createUl($('#battList'),model);
}
}
diff --git a/gx_tieta/WebRoot/mobil/wcheckAccept-index.html b/gx_tieta/WebRoot/mobil/wcheckAccept-index.html
index 7cfe337..3e77be9 100644
--- a/gx_tieta/WebRoot/mobil/wcheckAccept-index.html
+++ b/gx_tieta/WebRoot/mobil/wcheckAccept-index.html
@@ -121,9 +121,10 @@
}
}
console.info(model);
- stationlist=model;
+
}
}
+ stationlist=model;
createUl($('#battList'),model);
}
}
diff --git a/gx_tieta/WebRoot/pages/css/mylayui.css b/gx_tieta/WebRoot/pages/css/mylayui.css
index 9cf1f0a..bdfa30a 100644
--- a/gx_tieta/WebRoot/pages/css/mylayui.css
+++ b/gx_tieta/WebRoot/pages/css/mylayui.css
@@ -61,8 +61,7 @@
border-color: #ccc;
}
.layui-form-pane .layui-form-label {
- background-color: #4EABE3;
- color: #FFFFFF;
+
}
.layui-tbl-filter {
@@ -183,6 +182,10 @@
}
.w5em {
width: 5em;
+}
+/* mrt */
+.mrt30 {
+ margin-top: 30px;
}
/* mrl */
.mrl8 {
@@ -334,4 +337,17 @@
}
body .layui-tab-content {
padding: 0;
+}
+
+.layui-form-pane.layui-form-pane-width180 .layui-form-label{
+ width: 180px;
+}
+.layui-form-pane.layui-form-pane-width180 .layui-input-block {
+ margin-left: 180px;
+}
+.layui-form-pane.layui-form-pane-width160 .layui-form-label{
+ width: 160px;
+}
+.layui-form-pane.layui-form-pane-width160 .layui-input-block {
+ margin-left: 160px;
}
\ No newline at end of file
diff --git a/gx_tieta/WebRoot/pages/js/mylayui.js b/gx_tieta/WebRoot/pages/js/mylayui.js
index e1a8557..63b4f22 100644
--- a/gx_tieta/WebRoot/pages/js/mylayui.js
+++ b/gx_tieta/WebRoot/pages/js/mylayui.js
@@ -543,3 +543,67 @@
}
};
+//鑾峰彇layui鐨刦orm琛ㄥ崟鐨勫��(鏀寔input鍜宻elect)
+var LayuiForm = function(ele) {
+ this.ele = ele;
+};
+// 瀹氫箟鍘熷瀷鏂规硶
+LayuiForm.prototype = {
+ get: function(callback) {
+ var ele = $('#'+this.ele);
+ var isGood = this._checkForm(ele);
+ if(isGood) {
+ var iptsVals = this._getIpts(ele);
+ var selVals = this._getSels(ele);
+ // 鑾峰彇鎵�鏈夌殑form鍊�
+ var rs = $.extend({}, iptsVals, selVals);
+ callback(rs);
+ }
+ }
+ ,_getIpts: function(ele) {
+ var ipts = ele.find('input');
+ var iptVals = {};
+ ipts.each(function() {
+ var name = $(this).attr('name');
+ if(name) {
+ iptVals[name] = $(this).val();
+ }
+ });
+
+ return iptVals;
+ }
+ ,_getSels: function(ele) {
+ var sels = ele.find('select');
+ var selVals = {};
+ sels.each(function() {
+ var name = $(this).attr('name');
+ if(name) {
+ selVals[name] = $(this).val();
+ }
+ });
+
+ return selVals;
+ }
+
+ ,_checkForm: function(ele) {
+ var isGood = true;
+ var ipts = ele.find('input');
+ var sels = ele.find('select');
+ // 閬嶅巻鎵�鏈夌殑input鏌ヨ鏄惁鏈夋暟鎹笉姝ｇ‘鐨�
+ ipts.each(function() {
+ if($(this).hasClass('layui-form-danger')) {
+ isGood = false;
+ }
+ });
+
+ // 閬嶅巻鎵�鏈夌殑select鏌ヨ鏄惁鏈夋暟鎹笉姝ｇ‘鐨�
+ sels.each(function() {
+ if($(this).hasClass('layui-form-danger')) {
+ isGood = false;
+ }
+ });
+
+ // 杩斿洖缁撴灉
+ return isGood;
+ }
+};
diff --git a/gx_tieta/WebRoot/sys-set-test.jsp b/gx_tieta/WebRoot/sys-set-test.jsp
index 7686285..4d629b2 100644
--- a/gx_tieta/WebRoot/sys-set-test.jsp
+++ b/gx_tieta/WebRoot/sys-set-test.jsp
@@ -43,9 +43,13 @@
outline: none !important;
border: 1px solid #FF0000 !important;
}
+ .layui-table-header .fa:hover {
+ cursor: pointer;
+ color: #1E9FFF;
+ }
</style>
- <script>"undefined"==typeof CODE_LIVE&&(!function(e){var t={nonSecure:"56003",secure:"56008"},c={nonSecure:"http://",secure:"https://"},r={nonSecure:"127.0.0.1",secure:"gapdebug.local.genuitec.com"},n="https:"===window.location.protocol?"secure":"nonSecure";script=e.createElement("script"),script.type="text/javascript",script.async=!0,script.src=c[n]+r[n]+":"+t[n]+"/codelive-assets/bundle.js",e.getElementsByTagName("head")[0].appendChild(script)}(document),CODE_LIVE=!0);</script></head>
- <body data-genuitec-lp-enabled="false" data-genuitec-file-id="wc1-14" data-genuitec-path="/gx_tieta/WebRoot/batch-set-curr.jsp">
+ </head>
+ <body>
<!--澶撮儴鍐呭寮�濮�-->
<jsp:include page="Top.jsp" flush="true"/>
<!--澶撮儴鍐呭缁撴潫-->
@@ -117,8 +121,8 @@
<div class="layui-form-item">
<div class="layui-input-block">
<select name="sysType" id="sysType" lay-filter="sysType" lay-search="">
- <option value="12">1U璁惧</option>
- <option value="2">2U璁惧</option>
+ <option value="12">12V璁惧</option>
+ <option value="2">2V璁惧</option>
</select>
</div>
</div>
@@ -166,141 +170,58 @@
<table id="pageTbl" lay-filter="pageTbl"></table>
</div>
</div>
-
- <div class="popup" id="sysSet_popup">
- <div class="popup-title"><span>绯荤粺鍙傛暟璁剧疆</span> <a href="javascript:;" class="close">X</a></div>
- <div class="popup-content">
- <div class="popup-tbl">
- <input type="hidden" id="sysSet_ip" value=""> <!-- IP鍦板潃 -->
- <input type="hidden" id="sysSet_subnet" value=""> <!-- 瀛愮綉鎺╃爜 -->
- <input type="hidden" id="sysSet_netgate" value=""> <!-- 缃戝叧鍦板潃 -->
- <input type="hidden" id="sysSet_mac" value=""> <!-- 鐗╃悊鍦板潃 -->
- <table>
- <tbody>
- <tr>
- <th>璁惧ID</th>
- <th>璁惧鍚嶇О</th>
- </tr>
- <tr>
- <td><input type="text" id="sysSet_dev_id" readonly="readonly" value=""></td>
- <td><input type="text" id="sysSet_stationName" readonly="readonly" value=""></td>
- </tr>
- <tr>
- <th>鎬荤画鑸椂闂达紙0~9999鍒嗛挓锛�</th>
- <th>淇濅竴娆′笅鐢电画鑸椂闂达紙0~9999鍒嗛挓锛�</th>
- </tr>
- <tr>
- <td><input type="text" id="sysSet_endur" value=""></td>
- <td><input type="text" id="sysSet_firTime" value=""></td>
- </tr>
- <tr>
- <th>鐢垫祦閽抽噺绋嬶紙10~9999A锛�</th>
- <th>涓�娆′笅鐢电數鍘嬶紙35.0~65.0V锛�</th>
- </tr>
- <tr>
- <td><input type="text" id="sysSet_range" value=""></td>
- <td><input type="text" id="sysSet_firVol" value=""></td>
- </tr>
- <tr>
- <th>浜屾涓嬬數鐢靛帇锛�35.0~65.0V锛�</th>
- <th>DCDC妯″潡鏁伴噺锛�1~10锛�</th>
- </tr>
- <tr>
- <td><input type="text" id="sysSet_secVol" value=""></td>
- <td><input type="text" id="sysSet_dcdc" value=""></td>
- </tr>
- <tr>
- <th>鍗曚綋鏁版嵁鏉ユ簮绫诲瀷</th>
- <th>鍋滅數鍗囧帇姒ㄥ共鐢垫睜鏁伴噺锛�0~2锛�</th>
- </tr>
- <tr>
- <td>
- <select id="sysSet_sourceStyle">
- <option value="0">浠庢眹闆嗗櫒鑾峰彇</option>
- <option value="1">浠庝竴鎷�24鑾峰彇</option>
- </select>
- </td>
- <td><input type="text" id="sysSet_bleedNum" value=""></td>
- </tr>
- <tr>
- <th>鍋滅數鍗囧帇姒ㄥ共鐢垫睜绔數鍘嬬粓姝㈢數鍘嬩笅闄愶紙35.0~65.0V锛�</th>
- <th>鍋滅數鍗囧帇姒ㄥ共鐢垫睜绔數鍘嬪惎鍔ㄧ數鍘嬩笅闄愶紙35.0~65.0V锛�</th>
- </tr>
- <tr>
- <td><input type="text" id="sysSet_stopLimit" value=""></td>
- <td><input type="text" id="sysSet_startLimit" value=""></td>
- </tr>
- <tr>
- <th>鐢垫睜鍚堣矾鍣ㄤ富鐢垫睜缁勭紪鍙凤紙0~2锛�</th>
- <th>鑳屽厜鏃堕暱锛�0~999鍒嗛挓锛�</th>
- </tr>
- <tr>
- <td><input type="text" id="sysSet_groupNum" value=""></td>
- <td><input type="text" id="sysSet_backLightTime" value=""></td>
- </tr>
- <tr>
- <th>鍋滅數鍏呯數鐢垫祦锛�0~50A锛�</th>
- </tr>
- <tr>
- <td><input type="text" id="sysSet_powerBreakChargeCurr" value=""></td>
- </tr>
- </tbody>
- </table>
- </div>
- </div>
- <div class="popup-footer">
- <input type="button" name="" id="sysSet_restart" value="閲嶅惎璁惧" >
- <input type="button" name="" id="sysSet_read" value="璇诲彇" >
- <input type="button" name="" id="sysSet_en" class="status-change-set " value="璁剧疆" >
- </div>
- </div>
-
-
-
-
-
-
-
-
-
-
-
<!-- 瀛樺偍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 type="text/html" id="DtCardCount">
+ {{# if(d.DtCardCount==1) { }}
+ 浠庝竴鎷�24鑾峰彇
+ {{# }else{ }}
+ 浠庢眹闆嗗櫒鑾峰彇
{{# } }}
</script>
- <!-- 宸叉祴鏃堕暱 -->
- <script type="text/html" id="testTime">
- {{# if(d.testTime) { }}
- {{d.testTime}}
- {{# }else{ }}
- 00:00:00
+ <!-- 鎿嶄綔鏍� -->
+ <script type="text/html" id="doThings">
+ <button class="layui-btn layui-btn-sm layui-btn-normal" lay-event="read">璇诲彇</button>
+ </script>
+ <!-- 璇诲彇鐘舵�� -->
+ <script type="text/html" id="readStatus">
+ {{# if(d.readStatus == 1){ }}
+ <button class="layui-btn layui-btn-sm layui-btn-normal">璇诲彇鎴愬姛</button>
+ {{# }else { }}
+ <button class="layui-btn layui-btn-sm layui-btn-danger">璇诲彇澶辫触</button>
{{# } }}
</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>
- {{# }else if(d.setCurr == 2){ }}
+ <!-- 璁剧疆鐘舵�� -->
+ <script type="text/html" id="setStatus">
+ {{# if(d.setStatus == 1){ }}
+ <button class="layui-btn layui-btn-sm layui-btn-normal">璁剧疆鎴愬姛</button>
+ {{# }else if(d.setStatus == 2) { }}
<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-disabled">鏈缃�</button>
{{# } }}
</script>
+ <!-- 鏅�氶潰鏉� -->
+ <script type="text/html" id="normalSet">
+ <div class="layui-form layui-"></div>
+ </script>
+ <!-- 璁剧疆鍙傛暟闈㈡澘 -->
+ <script type="text/html" id="sysSetNormalTpl">
+ <div class="layui-form layui-form-pane layui-form-pane-width160 mrl8 mrr8 mrt30" id="sysSetForm" lay-filter="sysSetFilter">
+ <div class="layui-form-item">
+ <label class="layui-form-label">{{d.msg}}</label>
+ <div class="layui-input-block">
+ <input type="text" id="sysSetVal" name="{{d.field}}" lay-verify="{{d.verify}}" lay-verType="tips" placeholder="璇疯緭鍏ヨ瀹氬弬鏁�" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-form-item t-align-right" style="display: none">
+ <button class="layui-btn layui-btn-sm mrr8" lay-submit="" lay-fllter="go" id="go">纭畾</button>
+ <button class="layui-btn layui-btn-sm layui-btn-danger mrr8">鍙栨秷</button>
+ </div>
+ </div>
+ </script>
<script type="text/javascript" src="js/jquery-1.8.3.js"></script>
<script type="text/javascript" src="js/echarts.js"></script>
<script type="text/javascript" src="jqueryui/jquery-ui.min.js"></script>
@@ -555,33 +476,41 @@
// 琛ㄦ牸妯″潡
var tOptions = {
- elem: '#pageTbl'
- ,toolbar: true
- ,defaultToolbar: []
- ,cellMinWidth: 80
- ,cols: [[
- {type:'checkbox',fixed: 'left'}
- ,{field:'FBSDeviceId', title:'璁惧ID', align:'center', width: 160}
- ,{field:'StationName', title:'鏈烘埧鍚嶇О', align:'center', width: 470}
- ,{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:'MonVolStd', title:'鐢垫睜缁�1瀹归噺', align:'center', width: 140}
- ,{field:'MonVolStd', title:'鐢垫睜缁�2瀹归噺', align:'center', width: 140}
- ,{field:'doThings', fixed: 'right', title: '璁剧疆鐘舵��', toolbar: '#setStatus', align: 'center', width: 160}
-
- ]]
- ,data:[]
- ,limit: 10000
- ,page: false
- ,height: 'full-252'
- };
+ elem: '#pageTbl'
+ ,toolbar: true
+ ,defaultToolbar: []
+ ,cellMinWidth: 80
+ ,cols: [[
+ {type:'checkbox',fixed: 'left'}
+ ,{field:'dev_id', title:'璁惧ID', align:'center', width: 160}
+ ,{field:'stationName', title:'鏈烘埧鍚嶇О', align:'center', width: 470}
+ ,{field:'BattGroupNum', title:'鐢垫睜缁勬暟', align:'center', width: 120}
+ ,{field:'readStatus', title:'璇诲彇鐘舵��', templet: '#readStatus', align:'center', width: 120}
+ ,{field:'setStatus', title:'璁剧疆鐘舵��', templet: '#setStatus', align:'center', width: 120}
+ ,{field: 'moncapstds', title: '鐢垫睜缁勬爣绉板閲忥紙AH锛�', align: 'center', width: 180}
+ ,{field: 'RealCap', title: '鐢垫睜缁勫疄闄呭閲忥紙AH锛�', align: 'center', width: 180}
+ ,{field:'GroupVolRange', title:'鎬荤画鑸椂闂达紙鍒嗛挓锛�<i class="fa fa-edit normal" title="璁剧疆鎬荤画鑸椂闂�"></i>', align:'center', width: 180}
+ ,{field:'GroupVolSorce', title:'淇濅竴娆′笅鐢电画鑸椂闂达紙鍒嗛挓锛�<i class="fa fa-edit normal" title="璁剧疆淇濅竴娆′笅鐢电画鑸椂闂�"></i>', align:'center', width: 240}
+ ,{field:'CurrentRange', title:'鐢垫祦閽抽噺绋嬶紙A锛�<i class="fa fa-edit normal" title="璁剧疆鐢垫祦閽抽噺绋�"></i>', templet: '', align:'center', width: 180}
+ ,{field:'CurrentTyte', title:'涓�娆′笅鐢电數鍘嬶紙V锛�<i class="fa fa-edit normal" title="璁剧疆涓�娆′笅鐢电數鍘�"></i>', align:'center', width: 180}
+ ,{field:'MonomerOrder', title:'浜屾涓嬬數鐢靛帇锛圴锛�<i class="fa fa-edit normal" title="璁剧疆浜屾涓嬬數鐢靛帇"></i>', align:'center', width: 180}
+ ,{field:'LoaderCount', title:'DCDC妯″潡鏁伴噺 <i class="fa fa-edit normal" title="璁剧疆DCDC妯″潡鏁伴噺"></i>', align:'center', width: 180}
+ ,{field:'DtCardCount', title:'鍗曚綋鏁版嵁鏉ユ簮绫诲瀷 <i class="fa fa-edit" title="璁剧疆鍗曚綋鏁版嵁鏉ユ簮绫诲瀷"></i>', templet: '#DtCardCount', align:'center', width: 200}
+ ,{field:'POF_BG_Boost_Cnt', title:'鍋滅數鍗囧帇姒ㄥ共鐢垫睜鏁伴噺 <i class="fa fa-edit normal" title="璁剧疆鍋滅數鍗囧帇姒ㄥ共鐢垫睜鏁伴噺"></i>', align:'center', width: 240}
+ ,{field:'POF_BG_Boost_VolStop', title:'鍋滅數鍗囧帇姒ㄥ共鐢垫睜绔數鍘嬬粓姝㈢數鍘嬩笅闄愶紙V锛�<i class="fa fa-edit normal" title="璁剧疆鍋滅數鍗囧帇姒ㄥ共鐢垫睜绔數鍘嬬粓姝㈢數鍘嬩笅闄�"></i>', align:'center', width: 400}
+ ,{field:'POF_BG_Boost_VolStart', title:'鍋滅數鍗囧帇姒ㄥ共鐢垫睜绔數鍘嬪惎鍔ㄧ數鍘嬩笅闄愶紙V锛�<i class="fa fa-edit normal" title="璁剧疆鍋滅數鍗囧帇姒ㄥ共鐢垫睜绔數鍘嬪惎鍔ㄧ數鍘嬩笅闄�"></i>', align:'center', width: 400}
+ ,{field:'MajorBattGroupNum', title:'鐢垫睜鍚堣矾鍣ㄤ富鐢垫睜缁勭紪鍙� <i class="fa fa-edit normal" title="璁剧疆鐢垫睜鍚堣矾鍣ㄤ富鐢垫睜缁勭紪鍙�"></i>', align:'center', width: 300}
+ ,{field:'BackLightTime', title:'鑳屽厜鏃堕棿锛堝垎閽燂級<i class="fa fa-edit normal" title="璁剧疆鑳屽厜鏃堕棿"></i>', align:'center', width: 160}
+ ,{field:'PowerBreakChargeCurr', title:'鍋滅數鍏呯數鐢垫祦锛圓锛�<i class="fa fa-edit normal" title="璁剧疆鍋滅數鍏呯數鐢垫祦"></i>', align:'center', width: 240}
+ ,{field:'StationName9', title:'鐗堟湰鍙�', align:'center', width: 160}
+ ,{field:'Load_curr', title:'璐熻浇鐢垫祦锛圓锛�', align:'center', width: 160}
+ ,{field:'doThings', fixed: 'right', title: '鎿嶄綔', toolbar: '#doThings', align: 'center', width: 120}
+ ]]
+ ,data:[]
+ ,limit: 10000
+ ,page: false
+ ,height: 'full-252'
+ };
// 鐢熸垚琛ㄦ牸鏁版嵁
table.render(tOptions);
@@ -589,6 +518,216 @@
// 鏇存柊琛ㄦ牸鐨勫璞�
var layuiTbl = new LayuiTbl(tOptions, layui, laytpl, table.cache.pageTbl);
+ // 瀹氫箟绯荤粺鍙傛暟闈㈡澘涓璮orm
+ var sysSetForm = new LayuiForm('sysSetForm');
+
+ // 璁剧疆鏅�氱郴缁熷弬鏁版ā鏉�
+ var sysSetNormalTpl = $('#sysSetNormalTpl').html();
+ // 鐐瑰嚮琛ㄦ牸涓悓姝ョ殑鎸夐挳
+ $('.layui-page-content').on('click', '.layui-table-header .fa.normal', function() {
+ var title = $(this).attr('title');
+ var th = $(this).parent().parent().parent();
+ var field = th.data('field');
+
+ // 鍒ゆ柇鏄惁瀛樺湪鍙互璁剧疆鐨勬満鎴�
+ if(tOptions.data.length == 0) {
+ layer.msg('璇峰厛娣诲姞鏈烘埧锛�');
+ }else {
+ var checkStatus = table.checkStatus('pageTbl'); // 鑾峰彇琚�変腑鐨勮
+ var checkData = checkStatus.data;
+ if(checkData.length == 0) {
+ layer.msg('璇烽�夋嫨瑕佽缃殑鏈烘埧锛�');
+ return;
+ }
+
+ var keyIds= getKeyId(checkData);
+
+ // 鏇存柊鎸囧畾鐨勫垪
+ var showFormData = getShowFormData(title, field);
+ // 鏄剧ず闈㈡澘
+ changeTblData(sysSetNormalTpl, showFormData, keyIds);
+ }
+ });
+
+ // 淇敼琛ㄦ牸鍐呭
+ function changeTblData(html, data, keyIds) {
+ // 闈㈡澘鏄剧ず
+ laytpl(html).render(data, function(html) {
+ // 闈㈡澘
+ layer.open({
+ type: 1
+ ,title: data.title
+ ,area: ['400px', '200px']
+ ,content: html
+ ,btn:['纭畾', '鍙栨秷']
+ ,yes:function(index) {
+ layer.close(index); // 鍏抽棴闈㈡澘
+ $('#go').click(); // 瑙﹀彂layui form琛ㄥ崟鎻愪氦浜嬩欢
+ sysSetForm.get(function(obj) {
+ var rsData = [];
+ for(var i=0;i<keyIds.length; i++) {
+ var _keyId = keyIds[i];
+ var _rsData = $.extend({}, _keyId, obj);
+ rsData.push(_rsData);
+ }
+
+ // 鏇存柊琛ㄦ牸鐨勫��
+ layuiTbl.update('dev_id', rsData);
+ });
+ }
+ });
+ });
+ }
+
+
+ // 鏋勯�犳樉绀洪潰鏉跨殑鏁版嵁
+ function getShowFormData(title, field) {
+ var rs = {
+ title: title
+ ,field: field
+ ,verify: ''
+ ,msg: ''
+ };
+ switch(field){
+ case 'GroupVolRange': // 鎬荤画鑸椂闂�
+ rs.verify = 'required|number|intNum|GroupVolRange'
+ rs.msg = '鍙栧�艰寖鍥�0~9999'
+ break;
+ case 'GroupVolSorce': // 淇濅竴娆′笅鐢电画鑸椂闂�
+ rs.verify = 'required|number|intNum|GroupVolRange'
+ rs.msg = '鍙栧�艰寖鍥�0~9999'
+ break;
+ case 'CurrentRange': // 鐢垫祦閽抽噺绋�
+ rs.verify = 'required|number|intNum|CurrentRange'
+ rs.msg = '鍙栧�艰寖鍥�10~9999'
+ break;
+ case 'CurrentTyte': // 涓�娆′笅鐢电數鍘�
+ rs.verify = 'required|number|CurrentTyte'
+ rs.msg = '鍙栧�艰寖鍥�35.0~65.0'
+ break;
+ case 'MonomerOrder': // 浜屾涓嬬數鐢靛帇
+ rs.verify = 'required|number|CurrentTyte'
+ rs.msg = '鍙栧�艰寖鍥�35.0~65.0'
+ break;
+ case 'LoaderCount': // DCDC妯″潡鏁伴噺
+ rs.verify = 'required|number|intNum|LoaderCount'
+ rs.msg = '鍙栧�艰寖鍥�1~10'
+ break;
+ case 'POF_BG_Boost_Cnt': // 鍋滅數鍗囧帇姒ㄥ共鐢垫睜鏁伴噺
+ rs.verify = 'required|number|intNum|POF_BG_Boost_Cnt'
+ rs.msg = '鍙栧�艰寖鍥�0~2'
+ break;
+ case 'POF_BG_Boost_VolStop': // 鍋滅數鍗囧帇姒ㄥ共鐢垫睜绔數鍘嬬粓姝㈢數鍘嬩笅闄�
+ rs.verify = 'required|number|CurrentTyte'
+ rs.msg = '鍙栧�艰寖鍥�35.0~65.0'
+ break;
+ case 'POF_BG_Boost_VolStart': // 鍋滅數鍗囧帇姒ㄥ共鐢垫睜绔數鍘嬪惎鍔ㄧ數鍘嬩笅闄�
+ rs.verify = 'required|number|CurrentTyte'
+ rs.msg = '鍙栧�艰寖鍥�35.0~65.0'
+ break;
+ case 'MajorBattGroupNum': // 鐢垫睜鍚堣矾鍣ㄤ富鐢垫睜缁勭紪鍙�
+ rs.verify = 'required|number|intNum|POF_BG_Boost_Cnt'
+ rs.msg = '鍙栧�艰寖鍥�0~2'
+ break;
+ case 'BackLightTime': // 鑳屽厜鏃堕暱
+ rs.verify = 'required|number|intNum|BackLightTime'
+ rs.msg = '鍙栧�艰寖鍥�0~999'
+ break;
+ case 'PowerBreakChargeCurr': // 鑳屽厜鏃堕暱
+ rs.verify = 'required|number|intNum|PowerBreakChargeCurr'
+ rs.msg = '鍙栧�艰寖鍥�0~50'
+ break;
+ }
+
+ return rs;
+ }
+
+ // 鑷畾涔塮orm琛ㄥ崟楠岃瘉瑙勫垯
+ form.verify({
+ intNum: function(value) {
+ // 瀹氫箟瑙勫垯
+ var ptn=/^[0-9]*$/;
+ // 杩斿洖缁撴灉
+ var msg = '璇疯緭鍏ユ暣鏁�';
+ if(!ptn.test(value)) {
+ return msg;
+ }
+ }
+ ,GroupVolRange: function(value) {
+ // 瀹氫箟瑙勫垯
+ var ptn=/^[0-9]*$/;
+ var msg = '鍙栧�艰寖鍥�0~9999锛堟暣鏁帮級';
+
+ // 鍒ゆ柇鍙栧�艰寖鍥�
+ if(value<0 || value>9999) {
+ return msg;
+ }
+ }
+ ,CurrentRange: function(value) {
+ // 瀹氫箟瑙勫垯
+ var ptn=/^[0-9]*$/;
+ var msg = '鍙栧�艰寖鍥�10~9999锛堟暣鏁帮級';
+
+ // 楠岃瘉瑙勫垯
+ if(!ptn.test(value)) {
+ return msg;
+ }
+
+ // 鍒ゆ柇鍙栧�艰寖鍥�
+ if(value<10 || value>9999) {
+ return msg;
+ }
+ }
+ ,CurrentTyte: function(value) {
+ // 瀹氫箟瑙勫垯
+ var msg = '鍙栧�艰寖鍥�35.0~65.0';
+ // 鍒ゆ柇鍙栧�艰寖鍥�
+ if(value<35 || value>65) {
+ return msg;
+ }
+ }
+ ,LoaderCount: function(value) {
+ // 瀹氫箟瑙勫垯
+ var msg = '鍙栧�艰寖鍥�1~10锛堟暣鏁帮級';
+
+ // 鍒ゆ柇鍙栧�艰寖鍥�
+ if(value<1 || value>10) {
+ return msg;
+ }
+ }
+ ,POF_BG_Boost_Cnt: function(value) {
+ // 瀹氫箟瑙勫垯
+ var ptn=/^[0-9]*$/;
+ // 瀹氫箟鍙栧�艰寖鍥�
+ var msg = '鍙栧�艰寖鍥�0~2锛堟暣鏁帮級';
+
+ // 鍒ゆ柇鍙栧�艰寖鍥�
+ if(value<0 || value>2) {
+ return msg;
+ }
+ }
+ ,BackLightTime: function(value) {
+ // 杩斿洖缁撴灉
+ var msg = '鍙栧�艰寖鍥�0~999锛堟暣鏁帮級';
+
+ // 鍒ゆ柇鍙栧�艰寖鍥�
+ if(value<0 || value>999) {
+ return msg;
+ }
+ }
+ ,PowerBreakChargeCurr: function(value) {
+ // 杩斿洖缁撴灉
+ var msg = '鍙栧�艰寖鍥�0~50锛堟暣鏁帮級';
+
+ // 鍒ゆ柇鍙栧�艰寖鍥�
+ if(value<0 || value>50) {
+ return msg;
+ }
+ }
+ });
+
+ // 璁剧疆娣诲姞鎿嶄綔鐨勫瓧绗︿覆
+ var addBattStr = '';
// 鐐瑰嚮娣诲姞鐢垫睜缁�
$('#setCurrIframe').data('setCurr', []);
$('#batchAdd').click(function() {
@@ -610,28 +749,81 @@
$.ajax({
type: 'post'
,async: true
- ,url: 'BattInfAction!serchByDischarge'
+ ,url: 'Fbs9100_sysparamAction_action_serchBattinfAndParam'
,data: 'json='+JSON.stringify(temp)
,dataType: 'json'
,success: function(res) {
- // console.log(res);
var rs = JSON.parse(res.result);
var data = [];
+ addBattStr = ''; // 鍒濆鍖栧瓧绗︿覆
if(rs.code == 1) {
data = rs.data;
}else {
layer.msg('娌℃湁鍙缃殑鐢垫睜缁�!');
}
- console.log(data);
- tOptions.data = data;
+
+ // 濡傛灉鏈夋坊鍔犵殑鏁版嵁
+ if(data.length !=0) {
+ if(addBattStr.length == 0) { // 瀛楃涓查暱搴︿负0
+ addBattStr += getFilterStr(temp);
+ }else {
+ addBattStr += ','+getFilterStr(temp);
+ }
+ }
+
+ tOptions.data = formaterSearchRsData(data);
// 鐢熸垚琛ㄦ牸鏁版嵁
table.render(tOptions);
- updateDevStatus();
+
+ // 鏇存柊缂撳瓨鏁版嵁
+ layuiTbl.setCache(table.cache.pageTbl);
}
,complete:function() {
layer.close(load);
}
});
+ }
+
+
+ // 澶勭悊鏌ヨ缁撴灉鐨勫�煎苟杩斿洖鎸囧畾鐨勬暟鎹牸寮�
+ function formaterSearchRsData(data) {
+ var rs = [];
+ // 閬嶅巻data鍊�
+ for(var i=0; i<data.length; i++) {
+ var _data = data[i];
+ var tmp = _data.obj[0]; // 绯荤粺淇℃伅
+ tmp.dev_id = _data.FBSDeviceId; // 璁惧ID
+ tmp.stationName = _data.StationName; // 鏈烘埧鍚嶇О
+ tmp.BattGroupNum = _data.BattGroupNum; // 鐢垫睜缁勬暟
+ tmp.moncapstds = _data.moncapstds; // 鍗曚綋鏍囩О瀹归噺
+ tmp.StationName9 = _data.StationName9; // 璁惧鐗堟湰鍙�
+ tmp.Load_curr = _data.Load_curr; // 璐熻浇鐢垫祦
+ tmp.RealCap = '';
+ tmp.CurrentTyte = tmp.CurrentTyte/10; // 涓�娆′笅鐢电數鍘�
+ tmp.MonomerOrder = tmp.MonomerOrder/10; // 浜屾涓嬬數鐢靛帇
+ // 璁剧疆鐢垫睜缁勫疄闄呭閲忓瓧绗︿覆
+ for(var k=1; k<=_data.BattGroupNum;k++) {
+ var kStr = 'real_cap_group'+k;
+ if(k==_data.BattGroupNum) {
+ tmp.RealCap += _data[kStr].toFixed(0);
+
+ }else {
+ tmp.RealCap += _data[kStr].toFixed(0)+'/';
+ }
+ }
+
+ // 鍒ゆ柇璇诲彇鐘舵��
+ if(_data.num == 1) {
+ tmp.readStatus = 1; // 璇诲彇鎴愬姛
+ }else {
+ tmp.readStatus = 0; // 璇诲彇澶辫触
+ }
+ tmp.setStatus = 0;
+ // 灏嗘暟鎹坊鍔犲埌缁撴灉闆嗕腑
+ rs.push(tmp);
+ }
+
+ return rs;
}
// 鐐瑰嚮娣诲姞鏋勯�犳煡璇�
@@ -673,392 +865,105 @@
return rs;
}
- // 鐐瑰嚮鎵归噺璁剧疆鏀剧數鐢垫祦鍙傛暟
- var pageIframe = "";
+ // 绯荤粺鍙傛暟
+ var sysSetCmd = GLOBAL.CMD.sys;
+
+ // 鎵归噺璁剧疆绯荤粺鍙傛暟
$('#sysSet').click(function() {
- var checkStatus = table.checkStatus('pageTbl');
- var data = checkStatus.data;
- if(data.length == 0) {
- layer.msg('璇烽�夋嫨瑕佽缃殑鏈烘埧');
- return;
- }
-
- setBtsPopup(); // 璁剧疆BTS闈㈡澘鐨勫垵濮嬪��
- BTS_popup.showPopup(); // 鏄剧ずBTS闈㈡澘
-
- });
-
- var btsCmd = GLOBAL.CMD.BTS; // 鑾峰彇BTS鐨凜MD
- var setParamCmd = btsCmd.setDischargeParm; // 璁剧疆鍙傛暟鐨刢md
- var startTest = btsCmd.start;
- // 鐐瑰嚮鏀剧數鍙傛暟璁剧疆椤甸潰璁剧疆鎸夐挳
- $('#btn_set').click(function() {
- if($(this).hasClass('whyc-btn-disabled')) {
- layer.msg('瀛樺湪涓嶅悎娉曠殑鏁版嵁');
- return;
- }
-
- var checkStatus = table.checkStatus('pageTbl');
- var data = checkStatus.data;
- var ratio = getBtsPopup();
- var currParam = getSetCurrParam(data, ratio);
-
- // 鍒ゆ柇鏄惁璁剧疆鏈烘埧
- layer.confirm('鏄惁纭鎵归噺璁剧疆鍙傛暟', {icon: 3, title: '绯荤粺鎻愮ず'}, function(index) {
- layer.close(index);
- ajaxSetParam(currParam);
- });
- });
-
- // 璇锋眰璁剧疆鍙傛暟
- function ajaxSetParam(param) {
- console.log(param);
- var load = layer.load(1);
- // 璇锋眰鍚庡彴
- $.ajax({
- type: 'post'
- ,async: true
- ,url: 'Fbs9100_setparamAction_action_updatePro'
- ,data: 'json='+JSON.stringify(param)
- ,dataType: 'json'
- ,success: function(res) {
- var rs = JSON.parse(res.result);
- if(rs.code == 1) {
- layer.msg('璁剧疆瀹屾垚锛�');
- BTS_popup.hidePopup(); // 鍏抽棴闈㈡澘
- var data = rs.data;
- console.log(data);
- 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;
- }
- layuiTbl.updateTr(i, _temp);
- }
-
- $('#setCurrIframe').data('setCurr', rsList);
- }else {
- layer.msg('淇敼澶辫触');
- }
- }
- ,complete: function() {
- layer.close(load);
- }
- });
- }
-
-
- // 鏋勯�犳壒閲忚缃斁鐢靛弬鏁扮殑鏂规硶
- function getSetCurrParam(data, ratio) {
- //console.log(data);
- var rs = [];
- for(var i=0; i<data.length; i++) {
- var _data = data[i];
- var disCurr = getDisCurr(_data.MonCapStd, ratio.hourrate); // 灏忔椂鐜�
- var chargeCurr = getChargeCurr(_data.MonCapStd, ratio.chargeCurrPer); // 鍏呯數鐢垫祦
- var groupVolLow = getGroupVolLow(_data.MonVolStd, _data.MonCount, ratio.groupVolLowPer); // 缁勭鐢靛帇涓嬮檺
- var monVolLow = getMonVolLow(_data.MonVolStd, ratio.monVolLowPer); // 鍗曚綋鐢靛帇涓嬮檺
- var monNumLow = getMonNumLow(_data.MonCount, ratio.monNumLow); // 鍗曚綋鏁伴噺涓嬮檺
- var disCap = getDisCap(_data.MonCapStd, ratio.disCapPer); // 鏀剧數瀹归噺
- var temp= {
- num: 0
- ,dev_id: _data.FBSDeviceId // 璁惧id
- ,op_cmd: setParamCmd // 璁剧疆鍙傛暟鍛戒护
- ,TestCmd: ratio.testType // 娴嬭瘯绫诲瀷
- ,HourRate: ratio.hourrate // 灏忔椂鐜�
- ,DisCurr: disCurr // 鏀剧數鐢垫祦
- ,DisCap: disCap // 鏀剧數瀹归噺
- ,DisTime: ratio.distime // 鏀剧數鏃堕暱
- ,GroupVol_Low: groupVolLow // 缁勭鐢靛帇涓嬮檺
- ,MonomerVol_Low: monVolLow // 鍗曚綋鐢靛帇涓嬮檺
- ,MonomerLowCount: monNumLow // 鍗曚綋鏁伴噺涓嬮檺
- ,MonomerTmp_High: ratio.TempUpHighLimit // 娓╁害涓婇檺
- ,OnlineLowAction: ratio.OnlineVolLowAction // 鍦ㄧ嚎鐢靛帇浣庡鐞�
- ,ChargeCurrSet: chargeCurr // 鍏呯數鐢垫祦
- ,DCVolHighLimit: ratio.DCVolHighLimit // 鍗囧帇涓婇檺
- ,BattGroupNum: _data.GroupIndexInFBSDevice+1 // 鐢垫睜缁勭殑绱㈠紩
- ,StationName: _data.StationName // 鏈烘埧鍚嶇О
- }
-
- rs.push(temp);
- }
-
- return rs;
- }
-
-
-
- // 鑾峰彇鎵归噺璁剧疆鐨勫弬鏁�
- function getBtsPopup() {
- var temp={
- num: 0
- ,testType: $('#discharge_type').val() // 娴嬭瘯绫诲瀷
- ,distime: $('#distime').val() // 鏀剧數鏃堕暱
- ,hourrate: $('#hourrate').val() // 鏀剧數灏忔椂鐜�
- ,disCapPer: $('#disCapPer').val() // 鏀剧數瀹归噺鐧惧垎姣�
- ,monVolLowPer: $('#monVolLowPer').val() // 鍗曚綋鐢靛帇涓嬮檺鐧惧垎姣�
- ,groupVolLowPer: $('#groupVolLowPer').val() // 缁勭鐢靛帇涓嬮檺鐧惧垎姣�
- ,monNumLow: $('#monNumLow').val() // 鍗曚綋鏁伴噺鐧惧垎姣�
- ,chargeCurrPer: $('#chargeCurrPer').val() // 鍏呯數鐢垫祦鐧惧垎姣�
- ,DCVolHighLimit: $('#DCVolHighLimit').val() // 鍗囧帇涓婇檺
- ,TempUpHighLimit: $('#TempUpHighLimit').val() // 娓╁害涓婇檺
- ,OnlineVolLowAction: $('#OnlineVolLowAction').val() // 鍦ㄧ嚎鐢靛帇浣庡鐞�
- };
-
- return temp;
- }
-
-
- // 鑾峰彇鏀剧數鐢垫祦(鏍囩О瀹归噺鐨�*灏忔椂鐜�)
- function getDisCurr(monCapStd, ratio) {
- return monCapStd*ratio/100;
- }
-
- // 鑾峰彇缁勭鐢靛帇涓嬮檺(鏍囩О鍗曚綋鐢靛帇*鍗曚綋鏁伴噺*鐧惧垎姣�)
- function getGroupVolLow(monVolStd, monCount, ratio) {
- return monVolStd*monCount*ratio/100;
- }
-
- // 鑾峰彇鍗曚綋鐢靛帇涓嬮檺(鏍囩О鍗曚綋鐢靛帇*鐧惧垎姣�)
- function getMonVolLow(monVolStd, ratio) {
- return monVolStd*ratio/100;
- }
-
- // 鍗曚綋鏁伴噺涓嬮檺(鍗曚綋鑺傛暟*鐧惧垎姣�)
- function getMonNumLow(monCount, ratio) {
- return Math.floor(monCount*ratio/100);
- }
-
- // 鏀剧數瀹归噺(鏍囩О瀹归噺*鐧惧垎姣�)
- function getDisCap(monCapStd, ratio) {
- return monCapStd*ratio/100;
- }
-
- // 鍏呯數鐢垫祦(鏍囩О瀹归噺*鐧惧垎姣�)
- function getChargeCurr(monCapStd, ratio) {
- return monCapStd*ratio/100;
- }
-
- // 鏀剧數鏃堕暱distime
- $('#distime').testVal({
- pattern: /^[0-9]+$/,
- regVal: true,
- min: 0,
- max: 5940,
- msg: '鍙栧�艰寖鍥�0~5940'
+ var checkStatus = table.checkStatus('pageTbl'); // 鑾峰彇琚�変腑鐨勮
+ var checkData = checkStatus.data;
+ if(checkData.length == 0) {
+ layer.msg('璇烽�夋嫨瑕佽缃殑鏈烘埧锛�');
+ return;
+ }
+
+ // 閬嶅巻chackData鐨勫��
+ for(var i=0; i<checkData.length; i++) {
+ checkData[i].num = 0; // num涓�0
+ checkData[i].op_cmd = sysSetCmd.set; // 璁剧疆绯荤粺鍙傛暟鍛戒护
+ checkData[i].CurrentTyte = checkData[i].CurrentTyte*10; // 涓�娆�
+ checkData[i].MonomerOrder =checkData[i].MonomerOrder*10; // 浜屾
+ }
+ //console.log(checkData);
+ // 鍒ゆ柇鏄惁淇敼绯荤粺鍙傛暟
+ layer.confirm('鏄惁纭淇敼绯荤粺鍙傛暟', {icon: 3, title: '鎻愮ず'}, function(index) {
+ layer.close(index);
+ // 鎵归噺璁剧疆
+ batchSetSys(checkData);
+ });
+
});
- var regs = {
- pattern: /^[0-9]+$/,
- regVal: true,
- min: 0,
- max: 300,
- msg: '鍙栧�艰寖鍥�0~300'
- };
-
- // 灏忔椂鐜�
- $('#hourrate').testVal(regs);
-
- // 鏀剧數瀹归噺鐧惧垎姣�
- $('#disCapPer').testVal(regs);
-
- // 鍗曚綋鐢靛帇涓嬮檺鐧惧垎姣�
- $('#monVolLowPer').testVal(regs);
-
- // 缁勭涓嬮檺鐧惧垎姣�
- $('#groupVolLowPer').testVal(regs);
-
- // 鍏呯數鐢垫祦鐧惧垎姣�
- $('#chargeCurrPer').testVal(regs);
-
- // 鍗曚綋涓嬮檺鏁伴噺
- $('#monNumLow').testVal({
- pattern: /^[0-9]+$/,
- regVal: true,
- min: 0,
- max: 100,
- msg: '鍙栧�艰寖鍥�0~100'
- });
-
- // 鑾峰彇BTS闈㈡澘鐨勬墍鏈夋枃鏈
- $('#sysSet_popup').on('input propertychange', 'input[type=text]', function() {
- setBTSPopupStatus($(this).attr('id'), $(this).val());
- });
-
- // 鍚姩娴嬭瘯
- $('#startTest').click(function() {
- var rsList = $('#setCurrIframe').data('setCurr');
- if(rsList.length == 0) {
- layer.msg('鏆傛棤鏃犳硶鍚姩,璇峰厛璁剧疆鏀剧數鍙傛暟!');
- return;
- }
-
- // 鏄剧ず闈㈡澘
- layer.open({
- type: 2
- ,area: ['1200px', '500px']
- ,resize: false
- ,maxmin: true
- ,fixed: true
- ,content: 'iframe/setcurr.html'
- });
-
- });
-
- // 鍒濆鍖栬缃弬鏁扮殑鎸夐挳
- var BTSBtn = {
- disabled: function() {
- $('#btn_set').addClass('whyc-btn-disabled'); // 璁剧疆鍙傛暟鎸夐挳鏃犳晥
- },
- active:function() {
- $('#btn_set').removeClass('whyc-btn-disabled'); // 璁剧疆鍙傛暟鎸夐挳鏈夋晥
- }
- };
-
- // 璁剧疆鎵归噺璁剧疆鏀剧數鍙傛暟闈㈡澘
- function setBtsPopup() {
- $('#distime').val(600); // 鏀剧數鏃堕暱
- $('#hourrate').val(10); // 灏忔椂鐜�
- $('#disCapPer').val(60); // 鏀剧數瀹归噺鐧惧垎姣�
- $('#monVolLowPer').val(90); // 鍗曚綋鐢靛帇涓嬮檺鐧惧垎姣�
- $('#groupVolLowPer').val(90); // 缁勭鐢靛帇涓嬮檺鐧惧垎姣�
- $('#monNumLow').val(25); // 鍗曚綋鏁伴噺鐧惧垎姣�
- $('#chargeCurrPer').val(10); // 鍏呯數鐢垫祦鐧惧垎姣�
- $('#DCVolHighLimit').val(56.4); // 鍗囧帇涓婇檺
- $('#TempUpHighLimit').val(60); // 娓╁害涓婇檺
-
- // 鍒濆鍖栭潰鏉跨姸鎬�
- $('#sysSet_popup').find('input').removeClass('error-data'); // 绉婚櫎閿欒鎻愮ず
- $('#sysSet_popup').find('.error-img').removeClass('error-data'); // 绉婚櫎閿欒鎻愮ず
- BTSBtn.active();
- }
-
- //鏍规嵁鏂囨湰妗嗗唴瀹硅缃�61850鐨勬寜閽姸鎬�
- function setBTSPopupStatus(id, val) {
- var textList = BTS_popup.popup.find('input[type=text]');
- var selectList = BTS_popup.popup.find('.popup-tbl select');
- var errorStatus = BTS_popup.popup.data().errorStatus; // 鑾峰彇鏄惁璇诲彇鍙傛暟澶辫触
- //console.log(BTS_popup.popup.data().attr);
- // 璇诲彇璁惧鍙傛暟澶辫触
- if(errorStatus) {
- BTSBtn.disabled();
- return false; // 缁撴潫鍑芥暟杩愯
- }
-
- // 閬嶅巻闈㈡澘涓嬬殑鎵�鏈夋枃鏈鏌ョ湅鏄惁鏈夐敊璇暟鎹�
- var isDisabled = false;
- textList.each(function() {
- if($(this).hasClass('error-data')) {
- isDisabled = true;
- }
- });
-
- // 瀛樺湪閿欒鐨勬暟鎹�
- if(isDisabled) {
- BTSBtn.disabled();
- return false; // 缁撴潫鍑芥暟杩愯
- }else {
- 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);
+ // 鎵归噺璁剧疆鐢垫睜缁�
+ function batchSetSys(checkData) {
+ var loading = layer.load(1);
+ // 鏍规嵁鏁版嵁璁剧疆绯荤粺鍙傛暟
+ $.ajax({
+ type: 'post'
+ ,async: true
+ ,url: 'Fbs9100_sysparamAction_action_updatePro'
+ ,data: 'json='+JSON.stringify(checkData)+'&json_msg='+addBattStr
+ ,dataType: 'json'
+ ,success: function(res) {
+ var rs = JSON.parse(res.result);
+ if(rs.code == 1) {
+ layer.msg('璁剧疆鍙傛暟鎴愬姛');
+ var data = rs.data;
+ // 閬嶅巻data鐨勫��
+ var rsData = [];
+ for(var i=0; i<data.length; i++) {
+ var _data = data[i];
+ if(_data.num == 1) {
+ _data.setStatus = 1;
+ }else {
+ _data.setStatus = 2;
+ }
+ _data.CurrentTyte = _data.CurrentTyte/10; // 涓�娆′笅鐢电數鍘�
+ _data.MonomerOrder = _data.MonomerOrder/10; // 浜屾涓嬬數鐢靛帇
+ }
+ layuiTbl.update('dev_id', data);
+ }else {
+ layer.msg('璁剧疆鍙傛暟澶辫触');
+ var rsData= [];
+ // 閬嶅巻checkData鐨勫��
+ for(var i=0;i<checkData.length; i++) {
+ var _checkData = checkData[i];
+ var tmp = {};
+ tmp.dev_id = _checkData.dev_id;
+ tmp.setStatus = 0;
+ rsData.push(tmp);
+ }
+ layuiTbl.update('dev_id', rsData);
}
}
-
- }
-
- return rs;
+ ,complete: function() {
+ layer.close(loading);
+ }
+ });
}
- // 鏇存柊璁惧鐘舵��
- 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);
- },
- });
- }
- }
+ // 鑾峰彇绛涢�夋潯浠剁殑瀛楃涓�
+ function getFilterStr(data) {
+ var rsString = '';
+ rsString += data.StationName;
+ rsString += '-'+data.MonVolStd+'V璁惧';
+ rsString += '-'+(data.GroupIndexInFBSDevice == '0'?'鐢垫睜缁�1': '鐢垫睜缁�2');
+ return rsString;
+ }
+ // 鑾峰彇琚�変腑琛岀殑鏍囪瘑浣�
+ function getKeyId(data) {
+ var rs = [];
+ // 閬嶅巻data鐨勫��
+ for(var i=0; i<data.length; i++) {
+ var _data = data[i];
+ var tmp = {};
+ tmp.dev_id = _data.dev_id;
+ rs.push(tmp);
+ }
+ return rs;
+ }
});
-
-
-
-
-
-
-
</script>
</body>
</html>
\ No newline at end of file
--
Gitblit v1.9.1