From 3e07e1d0e7a8b975f198a941e22a3ad6ab9d16f7 Mon Sep 17 00:00:00 2001
From: CJJ <Administrator@192.168.10.26>
Date: 星期三, 21 十一月 2018 16:00:47 +0800
Subject: [PATCH] 22222222222
---
gx_tieta/WebRoot/index.jsp | 55 ++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 48 insertions(+), 7 deletions(-)
diff --git a/gx_tieta/WebRoot/index.jsp b/gx_tieta/WebRoot/index.jsp
index 30785bd..0f64896 100644
--- a/gx_tieta/WebRoot/index.jsp
+++ b/gx_tieta/WebRoot/index.jsp
@@ -121,7 +121,7 @@
<div class="map-info-detail">
<div class="layui-collapse" lay-filter="test" lay-accordion="">
<div class="layui-colla-item">
- <h2 class="layui-colla-title">瀹氫綅鏈烘埧</h2>
+ <h2 class="layui-colla-title">鎼滅储鏈烘埧</h2>
<div class="layui-colla-content layui-show">
<table>
<tbody>
@@ -131,6 +131,7 @@
</tr>
<tr>
<td colspan="2" class="alg-r btn-container">
+ <span class="mrr8">宸插畨瑁呰澶囨暟/璁惧鎬绘暟锛�<span id="installnum">12/600</span><i id="installnumbtn" class="fa fa-refresh mrl8 page-link" title="鍒锋柊"></i></span>
<button type="button" value="鎼滅储" id="mapToolSearchBtn" class="mrr8">鎼滅储</button>
</td>
</tr>
@@ -216,12 +217,12 @@
<i class="fa fa-cog"></i>
</a>
</div>
+ <!--鐢垫睜鏁呴殰淇鍥�-->
+ <div class="repair-pie module"></div>
<!-- 鐢垫睜鏁呴殰楗肩姸鍥� -->
<div class="brdn-pie module"></div>
<!-- 鐢垫睜鍛婅楗肩姸鍥� -->
<div class="warn-pie module"></div>
- <!--鐢垫睜鏁呴殰淇鍥�-->
- <div class="repair-pie module"></div>
<!--鐢垫睜鍋ュ悍楗肩姸鍥�-->
<div class="health-pie module"></div>
<!--娓呴櫎娴姩-->
@@ -721,7 +722,7 @@
}
},
{
- text: '鎭㈠姝ｅ父',
+ text: '閫�鍑哄叏灞忔樉绀�',
callback: function(e) {
// console.info(e);
smallMap();
@@ -956,6 +957,8 @@
Almarr.push(/*{
name:"<s:text name='Capacity'/><s:text name='Alarm'/><s:text name='Alarm'/>",val:parseInt(data.BattGroupId) // 瀹归噺鍛婅鍛婅
} ,*/{
+ name:"<s:text name='On-line_voltage'/>",val:parseInt(data.Record_Id), // 鍦ㄧ嚎鐢靛帇
+ },{
name:"<s:text name='Group_voltage'/>",val:parseInt(data.MonNum), // 缁勭鐢靛帇
},{
name:"<s:text name='Charging_current'/>",val:parseInt(data.alm_id), // 鍏呯數鐢垫祦
@@ -1091,10 +1094,12 @@
//console.info(model);
if((model.sum>=0) && (model.newsum>=0) && (model.newsum>=model.sum)){
repairObj=[{name:"<s:text name='Computer_room'/><s:text name='Power_cut'/>",val:model.sum,color:'#FF0000'}, /*宸插仠鐢垫満鎴�*/
- {name:"<s:text name='Computer_room'/><s:text name='Not'/><s:text name='Power_cut'/>",val:model.newsum-model.sum,color:'#31CB36'}]; /* 鏈仠鐢垫満鎴� */
+ {name:"<s:text name='Computer_room'/><s:text name='Not'/><s:text name='Power_cut'/>",val:model.newsum-model.sum,color:'#31CB36'}, /* 鏈仠鐢垫満鎴� */
+ {name:"鏈烘埧鎺夌珯", val: model.code}];
}else{
repairObj=[{name:"<s:text name='Computer_room'/><s:text name='Power_cut'/>",val:0,color:'#FF0000'}, /* 宸插仠鐢垫満鎴� */
- {name:"<s:text name='Computer_room'/><s:text name='Not'/><s:text name='Power_cut'/>",val:model.sum,color:'#31CB36'}]; /* '鏈慨澶�' */
+ {name:"<s:text name='Computer_room'/><s:text name='Not'/><s:text name='Power_cut'/>",val:model.sum,color:'#31CB36'},
+ {name:"鏈烘埧鎺夌珯", val: model.code}]; /* '鏈慨澶�' */
}
var repairTle="<s:text name='Computer_room'/><s:text name='Power_cut'/>"; /* '鏈烘埧鍋滅數' */
if(powercut_isNew){
@@ -1102,7 +1107,7 @@
powercut_isNew = false;
createPie(repairPie,repairTle,repairObj);
repairPie.on('click', function() {
- window.open('powercut.jsp?power_state=0');
+ window.open('batt-state-manage.jsp?power_state=0');
});
}else{
var opt = getOpt(repairTle, repairObj);
@@ -3728,6 +3733,42 @@
return point;
}
+ // 鐐瑰嚮璁惧瀹夎鐘舵�佺殑鍒锋柊鎸夐挳
+ $('#installnumbtn').click(function() {
+ getInstallNum(true);
+ });
+
+ // 缁熻璁惧瀹夎鎯呭喌
+ getInstallNum();
+ // 鑾峰彇褰撳墠宸茬粡瀹夎鐨勮澶囨暟鐩�
+ function getInstallNum(isLoad) {
+ var load;
+ // 鏌ヨ鍚庡彴鏁版嵁
+ $.ajax({
+ type: 'post',
+ async:true,
+ url: 'BattInfAction!serchDevice',
+ data: null,
+ dataType: 'json',
+ beforeSend: function(xhr) {
+ if(isLoad) {
+ load = layer.load(1);
+ }
+
+ },
+ complete: function(xhr) {
+ layer.close(load);
+ },
+ success: function(result) {
+ // 鏍煎紡鍖栨暟鎹�
+ var rs = JSON.parse(result.result);
+ var txt = rs.newsum+'/'+rs.sum;
+
+ // 鏇存柊鏂囨湰鍊�
+ $('#installnum').text(txt);
+ }
+ });
+ };
});
// 鏇存柊鍦板浘宸ュ叿鎼滅储鏈烘埧
--
Gitblit v1.9.1