From beb5ab73d4e0bcbcbc1bf0497dd4c752a65376c6 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期二, 30 十月 2018 17:13:30 +0800
Subject: [PATCH] 历史添加基站机历卡
---
gx_tieta/WebRoot/charge-test.jsp | 187 ++++++++++++++++++++++++++++++++++++++++++++++
gx_tieta/WebRoot/index.jsp | 4
gx_tieta/WebRoot/css/charge_test_style.css | 9 ++
gx_tieta/WebRoot/pages/js/pages/siderbar.js | 2
gx_tieta/WebRoot/css/common.css | 31 +++++++
5 files changed, 230 insertions(+), 3 deletions(-)
diff --git a/gx_tieta/WebRoot/charge-test.jsp b/gx_tieta/WebRoot/charge-test.jsp
index e5c18e4..9544be3 100644
--- a/gx_tieta/WebRoot/charge-test.jsp
+++ b/gx_tieta/WebRoot/charge-test.jsp
@@ -403,7 +403,13 @@
<!-- 鐢垫睜缁勬満鍘嗗崱璇︾粏淇℃伅-->
<div id="card_infor">
<span class="title-log"><s:text name="The_battery_pack_machine_through_the_card"/></span> <!-- 鐢垫睜缁勬満鍘嗗崱 -->
- <div class="con-list ele-infor con-show">
+ <div id="cardInfoTab" class="whyc-tab-card">
+ <ul class="whyc-tab-title">
+ <li class="whyc-tab-this">鐢垫睜缁勪俊鎭�</li>
+ <li class="">鍩虹珯淇℃伅</li>
+ </ul>
+ </div>
+ <div class="con-list ele-infor con-show" style="height: 400px;overflow-y: auto">
<table>
<tr>
<th id="card_infor_left"><s:text name="Parameter_name"/></th> <!-- 鍙傛暟鍚嶇О -->
@@ -480,6 +486,166 @@
<tr>
<td><s:text name="Head"/></td> <!-- 璐熻矗浜� -->
<td></td>
+ </tr>
+ </table>
+ </div>
+ <div class="con-list ele-infor" style="height: 400px;overflow-y: auto">
+ <table>
+ <tr>
+ <th id="card_infor_left"><s:text name="Parameter_name"/></th> <!-- 鍙傛暟鍚嶇О -->
+ <th><s:text name="Parameter_value"/></th> <!-- 鍙傛暟鍊� -->
+ </tr>
+ <tr>
+ <td>绔欑偣ID</td>
+ <td id="station_stationid_ex"></td>
+ </tr>
+ <tr>
+ <td>绔欑偣鍚嶇О</td>
+ <td id="station_stationname"></td>
+ </tr>
+ <tr>
+ <td>鏈烘埧ID</td>
+ <td id="station_stationid"></td>
+ </tr>
+ <tr>
+ <td>鎵�灞炵粍缁�</td>
+ <td id="station_affiliation"></td>
+ </tr>
+ <tr>
+ <td>鏁版嵁鏉ユ簮</td>
+ <td id="station_dataSources"></td>
+ </tr>
+ <tr>
+ <td>绔欏潃绫诲瀷</td>
+ <td id="station_stationType"></td>
+ </tr>
+ <tr>
+ <td>缁忕含搴�</td>
+ <td id="station_jinweidu"></td>
+ </tr>
+ <tr>
+ <td>鎵�鍦ㄥ湴鍧�</td>
+ <td id="station_stationAddr"></td>
+ </tr>
+ <tr>
+ <td>绔欏潃鐘舵��</td>
+ <td id="station_stationstate"></td>
+ </tr>
+ <tr>
+ <td>缁存姢鍗曚綅</td>
+ <td id="station_maintenanceCompany"></td>
+ </tr>
+ <tr>
+ <td>绔欏潃鍦烘櫙</td>
+ <td id="station_stationscenario"></td>
+ </tr>
+ <tr>
+ <td>绔欏潃浜ф潈</td>
+ <td id="station_stationproperty"></td>
+ </tr>
+ <tr>
+ <td>浣跨敤鍗曚綅</td>
+ <td id="station_useUnit"></td>
+ </tr>
+ <tr>
+ <td>鐗╃悊绔欏潃缂栫爜</td>
+ <td id="station_siteCode"></td>
+ </tr>
+ <tr>
+ <td>鍘嗗彶鐗╃悊绔欏潃缂栫爜</td>
+ <td id="station_historySiteCode"></td>
+ </tr>
+ <tr>
+ <td>绔欏潃鍐呴儴缂栧彿</td>
+ <td id="station_siteInternalNumber"></td>
+ </tr>
+ <tr>
+ <td>绔欏潃鎷奸煶绠�绉�</td>
+ <td id="station_sitePinyinReferred"></td>
+ </tr>
+ <tr>
+ <td>涓枃绠�绉�</td>
+ <td id="station_siteChineseReferred"></td>
+ </tr>
+ <tr>
+ <td>鏄惁寮�閫氫笟鍔�</td>
+ <td id="station_isOpenBusiness"></td>
+ </tr>
+ <tr>
+ <td>褰曞叆浜哄憳</td>
+ <td id="station_schoolPersonnel"></td>
+ </tr>
+ <tr>
+ <td>褰曞叆鏃堕棿</td>
+ <td id="station_entryTime"></td>
+ </tr>
+ <tr>
+ <td>淇敼浜�</td>
+ <td id="station_modifyPeople"></td>
+ </tr>
+ <tr>
+ <td>淇敼鏃堕棿</td>
+ <td id="station_modifyTime"></td>
+ </tr>
+ <tr>
+ <td>澶囨敞</td>
+ <td id="station_note"></td>
+ </tr>
+ <tr>
+ <td>绔欏潃鎺ユ敹鏍囪鍙婃槸鍚︽湁鏁�</td>
+ <td id="station_receiveorvalidity"></td>
+ </tr>
+ <tr>
+ <td>绉诲姩绔欏潃鍚嶇О</td>
+ <td id="station_siteNameCMCC"></td>
+ </tr>
+ <tr>
+ <td>鐢典俊绔欏潃鍚嶇О</td>
+ <td id="station_siteNameCTC"></td>
+ </tr>
+ <tr>
+ <td>鑱旈�氱珯鍧�鍚嶇О</td>
+ <td id="station_siteNameCUCC"></td>
+ </tr>
+ <tr>
+ <td>鍝佺墝</td>
+ <td id="station_producer"></td>
+ </tr>
+ <tr>
+ <td>缁埅娴嬬畻鏃堕暱</td>
+ <td id="station_lastTimeLong"></td>
+ </tr>
+ <tr>
+ <td>缁埅娴嬬畻绫诲埆</td>
+ <td id="station_lastTimeType"></td>
+ </tr>
+ <tr>
+ <td>缁埅鍙戠敓鏃堕棿</td>
+ <td id="station_lastTimeDate"></td>
+ </tr>
+ <tr>
+ <td>鍏变韩鎯呭喌</td>
+ <td id="station_shareInfo"></td>
+ </tr>
+ <tr>
+ <td>杩愯惀鍟嗚喘涔板彂鐢垫湇鍔＄姸鍐�</td>
+ <td id="station_electPower"></td>
+ </tr>
+ <tr>
+ <td>鏄惁鍏峰鍙戠數鏉′欢</td>
+ <td id="station_isCanElectPower"></td>
+ </tr>
+ <tr>
+ <td>涓婄珯璺▼</td>
+ <td id="station_upperStationRoute"></td>
+ </tr>
+ <tr>
+ <td>涓婄珯闅炬槗绋嬪害</td>
+ <td id="station_upperStationDifficult"></td>
+ </tr>
+ <tr>
+ <td>瀹㈡埛闂搴撴湭瀹屾垚钃勭數姹犵淮淇�</td>
+ <td id="station_clienteleErrorService"></td>
</tr>
</table>
</div>
@@ -4729,6 +4895,7 @@
battid: batt.BattGroupId
};
findBattinfByBattGroupId(batt.BattGroupId);
+ findStationInfoByStation(batt);
// 鏍规嵁鏁版嵁瀹氫綅
localSideBar(treeView, treeView.container, tmp);
});
@@ -4801,5 +4968,23 @@
});
}
});
+
+ // 鏈哄巻鍗℃ā鍧�
+ $(function() {
+ // 鑾峰彇閫夐」鍗″垪琛�
+ var tabs = $('#cardInfoTab .whyc-tab-title li');
+ var tabContents = $('#card_infor .con-list');
+ // 鐐瑰嚮tabs瑙﹀彂
+ tabs.click(function() {
+ var index = $(this).index();
+ // 绉婚櫎鐗规晥
+ tabs.removeClass('whyc-tab-this');
+ tabContents.removeClass('con-show');
+
+ // 鏄剧ず鐗规晥
+ $(this).addClass('whyc-tab-this');
+ tabContents.eq(index).addClass('con-show');
+ });
+ });
</script>
</html>
diff --git a/gx_tieta/WebRoot/css/charge_test_style.css b/gx_tieta/WebRoot/css/charge_test_style.css
index 6e01def..269384f 100644
--- a/gx_tieta/WebRoot/css/charge_test_style.css
+++ b/gx_tieta/WebRoot/css/charge_test_style.css
@@ -440,6 +440,7 @@
background:url(../image/cell.png) no-repeat 5px 4px;
}
+
#card_infor .ele-infor table{
width:100%;
font-size:14px;
@@ -495,6 +496,14 @@
}
+/*娣诲姞鏂板唴瀹�*/
+#card_infor .con-list{
+ display:none;
+}
+#card_infor .con-show{
+ display:block;
+}
+
/*涓婁紶'FBO/IDC'鏁版嵁*/
#upload_fbo{
display: none;
diff --git a/gx_tieta/WebRoot/css/common.css b/gx_tieta/WebRoot/css/common.css
index 68b9d85..0a75363 100644
--- a/gx_tieta/WebRoot/css/common.css
+++ b/gx_tieta/WebRoot/css/common.css
@@ -35,6 +35,37 @@
overflow: hidden;
overflow-y: auto;
}
+.whyc-sider-menu::-webkit-scrollbar {/*婊氬姩鏉℃暣浣撴牱寮�*/
+ width: 10px; /*楂樺鍒嗗埆瀵瑰簲妯珫婊氬姩鏉＄殑灏哄*/
+ height: 1px;
+}
+.whyc-sider-menu::-webkit-scrollbar-thumb {/*婊氬姩鏉￠噷闈㈠皬鏂瑰潡*/
+ border-radius: 10px;
+ -webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
+ background: #535353;
+}
+.whyc-sider-menu::-webkit-scrollbar-track {/*婊氬姩鏉￠噷闈㈣建閬�*/
+ -webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
+ border-radius: 10px;
+ background: #EDEDED;
+}
+
+
+.batt-list::-webkit-scrollbar {/*婊氬姩鏉℃暣浣撴牱寮�*/
+ width: 10px; /*楂樺鍒嗗埆瀵瑰簲妯珫婊氬姩鏉＄殑灏哄*/
+ height: 1px;
+}
+.batt-list::-webkit-scrollbar-thumb {/*婊氬姩鏉￠噷闈㈠皬鏂瑰潡*/
+ border-radius: 10px;
+ -webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
+ background: #535353;
+}
+.batt-list::-webkit-scrollbar-track {/*婊氬姩鏉￠噷闈㈣建閬�*/
+ -webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
+ border-radius: 10px;
+ background: #EDEDED;
+}
+
/* first */
.whyc-sider-menu>ul>li>a>i.fa {
margin-left: .5em;
diff --git a/gx_tieta/WebRoot/index.jsp b/gx_tieta/WebRoot/index.jsp
index 6015b53..2ea6ec1 100644
--- a/gx_tieta/WebRoot/index.jsp
+++ b/gx_tieta/WebRoot/index.jsp
@@ -1731,7 +1731,7 @@
magImgStyles.push(imgStyle);
}
});
-
+ magImgStyles.push('');
// 鏍规嵁褰撳墠鍐呭鏇存柊鍦板浘鍥炬爣
searchStation();
}
@@ -2373,7 +2373,7 @@
var rs = JSON.parse(result.result);
if(rs.length != 0) {
var data = rs[0];
- console.info(data);
+ //console.info(data);
var content = '<div style="padding:6px;"><span>钃勭數姹犵粍鍛婅鏁扮洰锛�</span>'+data.code+'<a style="margin-left: 14px" href="javascript:loadToWarnPage();">璇︽儏>></a></div>'+
'<div style="padding:6px;"><span>钃勭數姹犵粍钀藉悗鏁扮洰锛�</span>'+data.sum+'<a style="margin-left: 14px" href="javascript:loadToBehindPage();">璇︽儏>></a></div>'+
'<div style="padding:6px;"><span>钃勭數姹犵粍寤舵椂鏁扮洰锛�</span>'+data.newsum+'<a style="margin-left: 14px" href="javascript:loadToDischargeDelay();">璇︽儏>></a></div>'+
diff --git a/gx_tieta/WebRoot/pages/js/pages/siderbar.js b/gx_tieta/WebRoot/pages/js/pages/siderbar.js
index 930a16f..f836ef5 100644
--- a/gx_tieta/WebRoot/pages/js/pages/siderbar.js
+++ b/gx_tieta/WebRoot/pages/js/pages/siderbar.js
@@ -743,7 +743,9 @@
li.data('attr', list[i]);
ul.append(li);
+
}
+
$('#ele_content .batt-listen .count-num').find('span').eq(0).text(discharge_num);
$('#ele_content .batt-listen .count-num').find('span').eq(1).text(charge_num);
ele.append(ul);
--
Gitblit v1.9.1