From 67f23a8ce1da8e96f4620d3714afec70dd1afbae Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期五, 02 十一月 2018 08:53:40 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/equip-stats-change.jsp | 292 +++++++++++++++++++---------------------------------------
1 files changed, 95 insertions(+), 197 deletions(-)
diff --git a/gx_tieta/WebRoot/equip-stats-change.jsp b/gx_tieta/WebRoot/equip-stats-change.jsp
index 4374c63..a3dfc79 100644
--- a/gx_tieta/WebRoot/equip-stats-change.jsp
+++ b/gx_tieta/WebRoot/equip-stats-change.jsp
@@ -15,7 +15,17 @@
<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/sidebar.css" />
+ <link rel="stylesheet" href="css/common.css">
+ <link rel="stylesheet" href="src/css/layui.css">
+ <style>
+ #lside {
+ position: absolute;
+ top: 0;
+ left: 0;
+ bottom: 0;
+ right: 0;
+ }
+ </style>
</head>
<body>
@@ -26,7 +36,7 @@
<jsp:include page="nav.jsp" flush="true"/>
<div class="page-content">
<div class="content-item side-bar-container">
- <div class="lside"></div>
+ <div class="lside" id="lside"></div>
</div>
<div class="content-item data-show">
<div class="data-container">
@@ -102,8 +112,9 @@
<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="js/sidebar.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">
var arrTh = [];
var arrTd = [];
@@ -112,50 +123,7 @@
pageSize:10,
pageAll:0
};
- /* 宸︿晶瀵艰埅鐐瑰嚮浜嬩欢 闇�瑕佸紩鍏idebar.js */
- $(function () {
- //浜岀骇宸﹁彍鍗曠殑鏄剧ず鍜岄殣钘�
- $('.lside').on('click','.fir', function(){
- // 鍒ゆ柇鏄惁鏄涓�娆＄敓鎴愬唴瀹�
- if ($(this).next().length == 0) {
- searchAllStationByProvince($(this).attr('name'));
- //createLsideSec(secObj, $(this).attr('name'));
- }else {
- //淇浜岀骇涓虹┖鏃剁殑bug
- for(var i=0;i<$(this).next().children().length;i++)
- {
- if($(this).next().children().eq(i).children().eq(0).text()=='')
- {
- $(this).next().children().eq(i).children().eq(0).remove();
- $(this).next().children().eq(i).children().eq(0).next().slideToggle();
- }
- }
- $(this).next().slideToggle(function() {
- changeFirImg($(this));
- });
- }
- });
-
- // 涓夌骇鑿滃崟鑳屾櫙鑹叉敼鍙�
- $('.lside').on('click', '.thr', function(){
- $('.lside .thr').removeClass('active');
- $('.lside .fir').removeClass('active');
- $('.lside .sec').removeClass('active');
- $(this).addClass("active");
- // 涓嬫柟娣诲姞鐐瑰嚮涓夌骇鑿滃崟瑙﹀彂浜嬩欢
- searchDevHistoryRecord();
- });
-
- //涓夌骇宸﹁彍鍗曠殑鏄剧ず鍜岄殣钘�
- $('.lside').on('click', '.sec', function(){
- $('.lside .thr').removeClass('active');
- $('.lside .fir').removeClass('active');
- $('.lside .sec').removeClass('active');
- $(this).addClass("active");
- $(this).next().slideToggle();
- });
- });
-
+ var layerMsg;
// 鐢熸垚椤甸潰涓殑琛ㄦ牸
$(function () {
@@ -198,156 +166,12 @@
ele.html($opt);
}
});
-
- // 鐢熸垚宸︿晶瀵艰埅
- $(function(){
- searchAllProvince();
- });
-
- /**
- * 鐢熸垚宸︿晶涓�绾у鑸�
- * @param array mList 涓�绾у鑸殑鏁版嵁鏈烘埧鍚嶇О锛屾満鎴縄D
- * [{StationName:string,StationId:string}...]
- */
- function createLsideFir(contain,mList){
- // 娓呴櫎contain鐨勫唴瀹�
- contain.text('');
- var _ul = $('<ul></ul>');
- // 閬嶅巻mList鏍规嵁鍏舵暟鎹敓鎴愰〉闈腑鐨勫唴瀹�
- for (var i = 0; i < mList.length; i++) {
- var _li = $('<li></li>');
- var _a = $('<a href="javascript:;" class="fir" name="'+mList[i].StationName1+'"><strong class="arrow down"></strong><span></span>'+mList[i].StationName1+'</a>');
- _li.append(_a);
- _ul.append(_li);
- }
-
- contain.append(_ul);
- }
-
- /**
- * 鐢熸垚宸︿晶浜岀骇瀵艰埅
- * @param array mList 涓�绾у鑸殑鏁版嵁鏈烘埧鍚嶇О锛屾満鎴縄D
- * [{StationName:string,StationId:string,BattGroupId:string,BattGroupName:string}...]
- */
- function createLsideSec(mList, stationName){
- // 鏍规嵁_stationId鐨勫�肩‘瀹氳鐢熸垚浜岀骇瀵艰埅鐨勪綅缃�
- var _fir = $('.lside .fir');
-
- _fir.each(function() {
- if($(this).attr('name') == stationName) {
- $(this).next('ul').remove();
- $(this).children('strong.arrow').removeClass('down').addClass('up');
-
- var _ul = $('<ul style="display:block"></ul>');
- var _li = $('<li></li>');
- var _a = $('<a href="javascript:;" class="sec" id="'+mList[0].FBSDeviceId+'" value="'+mList[0].StationName+'" style="display:none"></a>');
- _li.append(_a);
- var __ul = $('<ul style="display: block"></ul>');
- var tagStr = "";
- // 閬嶅巻mList鐢熸垚绗簩绾у唴瀹�
- for(var _i = 0; _i < mList.length; _i++) {
- tagStr += '<li><a href="javascript:;" class="thr" id="'+mList[_i].FBSDeviceId+'">'+mList[_i].StationName+'</a></li>';
- }
- var __li = $(tagStr);
- __ul.append(__li);
- _li.append(__ul);
- _ul.append(_li);
- $(this).after(_ul);
- }
- });
- }
-
- /**
- * 灞曞紑宸﹁竟瀵艰埅鐨勭涓�涓�
- */
- function slideFirstSideBar(mList, stationname) {
- createLsideSec(mList, stationname);
- $('.lside').find('.fir').eq(0).next().find('.thr').eq(0).addClass('active');
- }
-
- //鏌ヨ鎵�鏈夌殑缁存姢鍖�
- function searchAllProvince(){
- $.ajax({
- type:"post",
- //url: "BattInfAction!serchByStation", //鏌ヨ鎵�鏈夌殑缁存姢鍖�
- url: "User_battgroup_baojigroup_battgroupAction!serchStationName1InGroup", //鏌ヨ褰撳墠鐢ㄦ埛绠＄悊鐨勭淮鎶ゅ尯
- async:true,
- dataType:'text',
- data:null,
- success: function(data){
- data = eval('('+data+')');
- var model = eval('('+data.result+')');
- if(model.code == 1){
- //console.info('****');
- //console.info(model);
- var arr = new Array();
- for(var i=0;i<model.data.length;i++){
- arr.push({
- StationName1:model.data[i]
- });
- }
- createLsideFir($('.lside'), arr);
- searchAllStationByProvinceFir(arr[0].StationName1);
- }else{
- noContent.showNoContent("鏆傛棤绠＄悊鐨勭淮鎶ゅ尯");
- }
- }
- });
- }
-
- //鏍规嵁缁存姢鍖烘煡璇㈡墍鏈夌殑鏈烘埧
- function searchAllStationByProvince(stationname){
- addLoadingToMenu(stationname);
- $.ajax({
- type:"post",
- //url: "BattInfAction!serchByStationName",
- url: "User_battgroup_baojigroup_battgroupAction!serchStationInfoByStationName1",
- async:true,
- dataType:'text',
- //data:"bif.StationName1="+stationname,
- data:"json="+JSON.stringify({UNote:stationname}),
- success: function(data){
- data = eval('('+data+')');
- var model = eval('('+data.result+')');
- //console.info(model);
- removeLoadingMenu(stationname); // 绉婚櫎鏁版嵁鍔犺浇绛夊緟
- if(model.code == 1){
- createLsideSec(model.data, stationname);
- }else{
-
- }
- }
- });
- }
-
- // 绗竴娆＄敓鎴愬乏渚у鑸�
- function searchAllStationByProvinceFir(stationname) {
- addLoadingToMenu(stationname);
- $.ajax({
- type:"post",
- //url: "BattInfAction!serchByStationName",
- url: "User_battgroup_baojigroup_battgroupAction!serchStationInfoByStationName1",
- async:true,
- dataType:'text',
- //data:"bif.StationName1="+stationname,
- data:"json="+JSON.stringify({UNote:stationname}),
- success: function(data){
- data = eval('('+data+')');
- var model = eval('('+data.result+')');
- removeLoadingMenu(stationname); // 绉婚櫎鏁版嵁鍔犺浇绛夊緟
- if(model.code == 1){
- //console.info(model.data);
- slideFirstSideBar(model.data, stationname);
- searchDevHistoryRecord();
- }else{
-
- }
- }
- });
- }
//鏍规嵁缁存姢鍖烘煡璇㈡墍鏈夌殑鏈烘埧
function searchDevHistoryRecord(){
+ // 鍏抽棴msg
+ layer.close(layerMsg);
+ // 鐢熸垚鍐呭
arrTd = new Array();
loading.showLoading($('.tbl-body'));
$.ajax({
@@ -374,7 +198,7 @@
}
}
}else{
- noContent.showNoContent("鏈煡璇㈠埌鐘舵�佸彉鎹㈣褰�");
+ layerMsg = layer.msg("鏈煡璇㈠埌鐘舵�佸彉鎹㈣褰�");
Page.pageAll = 0;
}
$('#total').text(Page.pageAll);
@@ -398,9 +222,16 @@
rec_time1:$('#record_end_time').val()+" 23:59:59", //璁惧id
page:Page,
};
- temp.dev_id = $('.lside .thr.active').attr('id');
+ var battGroupInfo = getBatt();
+ temp.dev_id = battGroupInfo.FBSDeviceId;
temp.state_change_reason = $('#statsList').val();
return temp;
+ }
+
+ // 鑾峰彇琚�変腑鐢垫睜缁勭殑淇℃伅
+ function getBatt() {
+ var rs = $('#lside .sider-menu-file.active').data('attr');
+ return rs;
}
$(function(){
@@ -459,7 +290,7 @@
console.info($('#tbHead .tbFixed thead th').length);
exprotTable($('.tbl-body th'),$('.tbl-body tbody td'),$('#export_excel'),$('#table_th_arr'),$('#table_td_arr'));
});
-
+ // 瀵煎嚭鍐呭
function exprotTable(eleTh,eleTd,eleform,eleTh_Text,eleTd_Text){
//alert("瀵煎嚭");
var ArrTh=new Array();
@@ -478,6 +309,73 @@
//console.info(ArrTd);
eleform.submit();
}
+
+ // siderbar妯″潡
+ $(function() {
+ var TreeView = GLOBAL.pages.TreeView;
+ var first = GLOBAL.pages.siderbar.first; // 涓�绾у鑸�
+ var second = GLOBAL.pages.siderbar.second; // 浜岀骇瀵艰埅
+ var third = GLOBAL.pages.siderbar.third; // 涓夌骇瀵艰埅
+ var fourth = GLOBAL.pages.siderbar.fourth; // 鍥涚骇瀵艰埅
+ var fifth = GLOBAL.pages.siderbar.fifth; // 浜旂骇瀵艰埅
+ var treeView = new TreeView($('#lside'));
+ $('#lside').width($('#ele_content').width());
+ treeView.setContainer();
+ // 璁剧疆椤甸潰鐨勫乏渚у彲浠ュ乏鍙崇缉鏀�
+ $('.page-content .content-item.side-bar-container').resizable({
+ handles: 'e',
+ maxWidth: 520,
+ minWidth: 200,
+ //alsoResize: $('#lside'),
+ resize:function() {
+ treeView.setContainer();
+ }
+ });
+
+ // 鐢熸垚涓�绾у鑸�-鐪�
+ first(treeView, treeView.container);
+
+ // 鐪�->甯�
+ treeView.ele.on('click', '.province', function() {
+ var province = $(this).data('attr');
+ second(treeView, $(this).parent(), province);
+ });
+
+ // 甯�->鍖�/鍘�
+ treeView.ele.on('click', '.city', function() {
+ var city = $(this).data('attr');
+ third(treeView, $(this).parent(), city);
+ });
+
+ // 甯�->鏈烘埧
+ treeView.ele.on('click', '.county', function() {
+ var city = $(this).data('attr');
+ fourth(treeView, $(this).parent(), city);
+ });
+
+
+
+ battinlist = [];
+ // 鏈烘埧->鐢垫睜缁�
+ treeView.ele.on('click', '.home', function() {
+ var home = $(this).data('attr');
+ var tmp = {
+ StationName1: home.StationName1,
+ StationName2: home.StationName2,
+ StationName5: home.StationName5,
+ StationName: home.StationName,
+ StationId: home.StationId
+ };
+ fifth(treeView, $(this).parent(), tmp);
+ });
+
+ // 鐢垫睜缁�
+ treeView.ele.on('click', '.eleGroup', function() {
+ var eleGroup = $(this).data('attr');
+
+ searchDevHistoryRecord();
+ });
+ });
</script>
</body>
</html>
--
Gitblit v1.9.1