From 35fefed0792c40cb99b8d15fa5811bbb5992bff9 Mon Sep 17 00:00:00 2001
From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139>
Date: 星期一, 21 一月 2019 10:42:24 +0800
Subject: [PATCH] 修改
---
gx_tieta/WebRoot/equip-stats-change.jsp | 201 ++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 187 insertions(+), 14 deletions(-)
diff --git a/gx_tieta/WebRoot/equip-stats-change.jsp b/gx_tieta/WebRoot/equip-stats-change.jsp
index a3dfc79..fb1685b 100644
--- a/gx_tieta/WebRoot/equip-stats-change.jsp
+++ b/gx_tieta/WebRoot/equip-stats-change.jsp
@@ -10,17 +10,18 @@
<!-- 榛樿浣跨敤鏈�楂樺唴鏍� -->
<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1" >
<base href="<%=basePath%>">
- <title><s:text name="Device_status_records_query"/></title> <!-- 璁惧鐘舵�佽褰曟煡璇� -->
+ <title><s:text name="Device_history_event_query"/></title> <!-- 璁惧鐘舵�佽褰曟煡璇� -->
<link rel="stylesheet" href="css/basic.css">
<link rel="stylesheet" type="text/css" href="css/nocontent.css">
<link rel="stylesheet" type="text/css" href="css/loading.css">
<link rel="stylesheet" type="text/css" href="css/basic-layout.css"/>
<link rel="stylesheet" href="css/common.css">
+ <link rel="stylesheet" type="text/css" href="css/popup-tbl.css">
<link rel="stylesheet" href="src/css/layui.css">
<style>
#lside {
position: absolute;
- top: 0;
+ top: 30px;
left: 0;
bottom: 0;
right: 0;
@@ -36,13 +37,20 @@
<jsp:include page="nav.jsp" flush="true"/>
<div class="page-content">
<div class="content-item side-bar-container">
+ <div class="siderbar-tools">
+ <div class="siderbar-tools-right">
+ <i class="fa fa-file-text-o" title="鏈哄巻鍗�" id="siderbarToolsCard"></i>
+ <i class="fa fa-search" title="鏌ヨ鏈烘埧" id="siderbarToolsSearch"></i>
+ <i class="fa fa-outdent" title="鍏ㄩ儴鏀剁缉" id="siderbarToolsHide"></i>
+ </div>
+ </div>
<div class="lside" id="lside"></div>
</div>
<div class="content-item data-show">
<div class="data-container">
<!-- 绛涢�夋潯浠� -->
<div class="filter-container">
- <div class="filter-title"><a href="javascript:changeFilterStats();"><s:text name="Device_status_records_query"/>--><s:text name="Show/hide_the_query_conditions"/></a></div> <!-- 鏄剧ず鎴栭殣钘忔煡璇㈡潯浠� -->
+ <div class="filter-title"><a href="javascript:changeFilterStats();"><s:text name="Device_history_event_query"/>--><s:text name="Show/hide_the_query_conditions"/></a></div> <!-- 鏄剧ず鎴栭殣钘忔煡璇㈡潯浠� -->
<div class="filter-content">
<table>
<tbody>
@@ -109,12 +117,43 @@
</div>
</div>
</div>
+ <div class="popup"></div>
+ <!-- 瀵艰埅瀹氫綅 -->
+ <div class="popup w500 mr250" id="localNav">
+ <div class="popup-title"><span>鏈烘埧鏌ヨ</span><a href="javascript:;" class="close">X</a></div>
+ <div class="popup-content">
+ <div class="popup-tbl">
+ <table>
+ <tbody>
+ <tr>
+ <th>鏈烘埧鍚嶇О/鏈烘埧id</th>
+ </tr>
+ <tr>
+ <td>
+ <input name="popupHomeName" id="popupHomeName" type="text">
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ </div>
+
+ <div class="popup-footer">
+ <input type="button" name="" id="localNav_en" class="status-change-btn" value="纭畾" > <!-- 纭畾 -->
+ <input type="button" name="" class="close" value="鍙栨秷" > <!-- 鍙栨秷 -->
+ </div>
+ </div>
+
+ <!-- iframe鏁版嵁涓存椂瀛樺偍浣嶇疆 -->
+ <div id="homeInfoIframeData"></div>
+ <script type="text/javascript" src="src/layui.all.js"></script>
<script type="text/javascript" src="jqueryui/jquery-ui.min.js"></script>
<script type="text/javascript" src="js/equip-stats-change.jquery.ui.js"></script>
<script type="text/javascript" src="js/basic-layout.js"></script>
<script type="text/javascript" src="pages/js/pages/siderbar.js"></script>
<script type="text/javascript" src="js/pageUtil.js"></script>
- <script type="text/javascript" src="src/layui.all.js"></script>
+ <script type="text/javascript" src="js/popup.js"></script>
+ <script type="text/javascript" src="pages/js/pages/homeInfo.js"></script>
<script type="text/javascript">
var arrTh = [];
var arrTd = [];
@@ -125,9 +164,20 @@
};
var layerMsg;
+ var localNav = new Popup($('#localNav'));
+ // 鍒濆鍖杔ocalNav寮瑰嚭妗�
+ $('#localNav').find('.close').bind('click', function() {
+ localNav.hidePopup(); // 闅愯棌localNav寮瑰嚭妗嗗拰閬僵灞�
+ });
+
+ // 绐楀彛澶у皬鏀瑰彉
+ $(window).resize(function() {
+ localNav.hidePopup();
+ });
+
// 鐢熸垚椤甸潰涓殑琛ㄦ牸
$(function () {
- arrTh = ['璁惧Id', '鏈烘埧鍚嶇О', '鍙樿縼鍓嶇姸鎬�', '鍙樿縼鍚庣姸鎬�', '鍙樿縼鍘熷洜', '鍙樿縼鏃堕棿'];
+ arrTh = ['璁惧Id', '鏈烘埧鍚嶇О', '浜嬩欢绫诲瀷', '鍙樿縼鍓嶇姸鎬�', '鍙樿縼鍚庣姸鎬�', '鍙樿縼鍘熷洜','妯″潡缂栧彿','鍙樿縼鏃堕棿'];
createFullTbl($('.tbl-header'), $('.tbl-body'), arrTh, arrTd);
var stop_types = [
'鎵嬪姩鍋滄', '鏆傚仠', '姝ｅ湪鏀剧數娴嬭瘯', '姝ｅ湪绛夊緟鏀剧數', '姝ｅ湪闄愭祦鏀剧數',
@@ -183,15 +233,18 @@
success: function(data){
data = eval('('+data+')');
var model = eval('('+data.result+')');
- //console.info(model);
+ console.info(model);
if(model.code == 1){
- for(var i=0;i<model.data.length;i++){
- arrTd.push(model.data[i].dev_id); //璁惧id
- arrTd.push(model.data[i].note); //鏈烘埧鍚嶇О
- arrTd.push(model.data[i].last_stat_name); //鍙樻崲鍓嶇姸鎬�
- arrTd.push(model.data[i].now_stat_name); //鍙樺寲鍚庣姸鎬�
- arrTd.push(model.data[i].state_change_reason_name); //鍙樻崲鍘熷洜
- arrTd.push(model.data[i].rec_time); //鍙樻崲鏃堕棿
+ for(var i=0;i<model.data.length;i++){
+ var _data = model.data[i];
+ arrTd.push(_data.dev_id); //璁惧id
+ arrTd.push(_data.note); //鏈烘埧鍚嶇О
+ arrTd.push(_data.eve_type_name); //鍙樿縼鍓嶄簨浠剁被鍨�
+ arrTd.push(_data.last_stat_name); //鍙樻崲鍓嶇姸鎬�
+ arrTd.push(_data.now_stat_name); //鍙樺寲鍚庣姸鎬�
+ arrTd.push(_data.state_change_reason_name); //鍙樻崲鍘熷洜
+ arrTd.push(_data.module_num); //妯″潡缂栧彿
+ arrTd.push(_data.rec_time); //鍙樻崲鏃堕棿
if(model.data[i].page != undefined){
Page.pageAll = model.data[i].page.pageAll; //鎬昏褰曟潯鏁�
@@ -209,6 +262,28 @@
createFullTbl($('.tbl-header'), $('.tbl-body'), arrTh, arrTd);
}
});
+ }
+
+ // 浜嬩欢绫诲瀷
+ function getTextByVal(num) {
+ var _num = Number(num);
+ var rs = '';
+ switch(_num){
+ case 0:
+ rs = 'BTS宸ヤ綔鐘舵�侊細';
+ break;
+ case 11:
+ rs = 'SD鍗℃晠闅滐細';
+ break;
+ case 12:
+ rs = '鐢垫睜绂荤嚎鐘舵�侊細';
+ break;
+ case 20:
+ rs = 'DCDC妯″潡鍛婅鐘舵�侊細';
+ break;
+ }
+
+ return rs;
}
/**
@@ -318,6 +393,7 @@
var third = GLOBAL.pages.siderbar.third; // 涓夌骇瀵艰埅
var fourth = GLOBAL.pages.siderbar.fourth; // 鍥涚骇瀵艰埅
var fifth = GLOBAL.pages.siderbar.fifth; // 浜旂骇瀵艰埅
+ var localSideBar = GLOBAL.pages.siderbar.localSideBar; // 瀹氫綅鏈烘埧
var treeView = new TreeView($('#lside'));
$('#lside').width($('#ele_content').width());
treeView.setContainer();
@@ -372,10 +448,107 @@
// 鐢垫睜缁�
treeView.ele.on('click', '.eleGroup', function() {
var eleGroup = $(this).data('attr');
-
searchDevHistoryRecord();
});
+
+ // 宸ュ叿鏉�-鍏ㄩ儴鏀剁缉
+ $('#siderbarToolsHide').click(function(){
+ treeView.ele.find('li').removeClass('sider-menu-open');
+ });
+
+ // 宸ュ叿鏉�-鏈哄巻鍗�
+ $('#siderbarToolsCard').click(function(){
+ var batt = getBatt();
+ var tmp = {
+ province: batt.StationName1,
+ city: batt.StationName2,
+ county: batt.StationName5,
+ home: batt.StationName,
+ homeid: batt.StationId,
+ battid: batt.BattGroupId
+ };
+ // 鏄剧ず鍩虹珯鏈哄巻鍗�
+ showHomeInfo(batt.StationId);
+ // 鏍规嵁鏁版嵁瀹氫綅
+ localSideBar(treeView, treeView.container, tmp);
+ });
+
+ // 宸ュ叿鏉�-鏌ヨ
+ $('#siderbarToolsSearch').click(function(){
+ localNav.homeInfo = undefined;
+ $('#popupHomeName').val('');
+ localNav.showPopup();
+ });
+
+ // 鐐瑰嚮闈㈡澘鐨勭‘瀹氭寜閽�
+ $('#localNav_en').click(function() {
+ // 瀹氫綅
+ if(localNav.homeInfo) {
+ localNav.hidePopup();
+ localSideBar(treeView, treeView.container, localNav.homeInfo);
+ }else {
+
+ }
+ });
+
+ // 鏌ヨ鏈烘埧骞舵洿鏂皊ource
+ var homeSource = [];
+ findHome();
+
+ // 瀹氫箟鏈烘埧鏌ヨ淇℃伅
+ $( "#popupHomeName" ).autocomplete({
+ source: homeSource,
+ select: function(event, ui) {
+ localNav.homeInfo = ui.item; // 璁剧疆鏈烘埧淇℃伅鍐呭
+ }
+ });
+
+ // 鏌ヨ鏈烘埧
+ function findHome() {
+ var tmp = {
+ StationName1:'',
+ StationName2: '',
+ StationName5:''
+ };
+
+ // 鏌ヨ灏嗕俊鎭�
+ $.post("BattInfAction!serchStationName3","json="+JSON.stringify(tmp),function(result){
+ var rs = JSON.parse(result.result);
+ if(rs.code==1){
+ homeSource = [];
+ var data = rs.data;
+ for(var i=0; i<data.length; i++) {
+ var _data = data[i];
+ var tmp = {
+ label: _data.StationName+'('+_data.StationId+')',
+ province: _data.StationName1,
+ city: _data.StationName2,
+ county: _data.StationName5,
+ home: _data.StationName,
+ homeid: _data.StationId,
+ battid: undefined
+ };
+
+ // 娣诲姞鍒拌祫婧�
+ homeSource.push(tmp);
+ }
+ $( "#popupHomeName" ).autocomplete('option', 'source', homeSource);
+ }
+ });
+ }
+
});
+
+ //鏍规嵁褰撳墠閫変腑鐨勭數姹犵粍id鑾峰彇褰撳墠鐢垫睜缁勭殑淇℃伅
+ function getBatt(){
+ var activeFile = $('.whyc-sider-menu .sider-menu-file.active');
+ if(activeFile.length == 1) {
+ return activeFile.data('attr');
+ }else {
+ return undefined;
+ }
+
+ }
</script>
</body>
</html>
--
Gitblit v1.9.1