From 28dc7fc1a014617c6db614a8801c91e97290cd08 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期二, 04 十二月 2018 09:03:24 +0800
Subject: [PATCH] 添加分页信息对象 用于计算分页数据
---
gx_tieta/WebRoot/index.jsp | 138 +++++++++++++++++++++++++++++----------------
1 files changed, 88 insertions(+), 50 deletions(-)
diff --git a/gx_tieta/WebRoot/index.jsp b/gx_tieta/WebRoot/index.jsp
index c31ca2f..d0fa11c 100644
--- a/gx_tieta/WebRoot/index.jsp
+++ b/gx_tieta/WebRoot/index.jsp
@@ -1250,12 +1250,34 @@
{name:"缁埅涓嶈冻1灏忔椂",val:data[0],color:'#FF0000'}
,{name:"缁埅1~2灏忔椂",val:data[1],color:'#D1D105'}
,{name:"缁埅2~3灏忔椂",val:data[2],color:'#31CB36'}
- ,{name:"缁埅3灏忔椂浠ヤ笂",val:data[3],color:'#800080'}
+ ,{name:"缁埅3灏忔椂浠ヤ笂",val:data[3],color:'#619FA7'}
];
if(!isEcharts) {
//鍒涘缓鐢垫睜鏁呴殰楗肩姸鍥�
createPie(endurPie,endurTle,endurObj);
+
+ // 鐐瑰嚮楗肩姸鍥捐繘琛岃烦杞�
+ endurPie.on('click', function(param) {
+ var str = '';
+ switch(param.dataIndex) {
+ case 0:
+ str = 'timelong=60';
+ break;
+ case 1:
+ str = 'timelong=120';
+ break;
+ case 2:
+ str = 'timelong=180';
+ break;
+ case 3:
+ str = 'is_stand=0';
+ break;
+ }
+
+ window.open('batt-life-manage.jsp?'+str); // 璺宠浆鍒拌惤鍚庡崟浣撴煡璇�
+ });
+
}else {
var opts = getOpt(endurTle, endurObj);
endurPie.setOption(opts);
@@ -1705,6 +1727,30 @@
// 鏅�氭満鎴挎弿杩�
function mapImgDescNormal(iconExplain) {
+ // 鎺夌珯鏈烘埧
+ var iconList = $('<div class="explain-list" style="padding: 4px 6px; border-bottom: 1px slid #ccc; display:block"></div>');
+ var input = $('<input type="checkbox" data-img="item-timeout" checked="checked">');
+ var icon = $('<img src="'+mapImages.timeout+'">');
+ var span = $('<span>鎺夌珯鏈烘埧</span>');
+ var badge = $('<a href="javascript:;" class="layui-badge-rim mrr8 badge-down">0</a>');
+ iconList.append(input);
+ iconList.append(span);
+ iconList.append(icon);
+ iconList.append(badge);
+ iconExplain.append(iconList);
+
+ // 鍋滅數鏈烘埧
+ var iconList = $('<div class="explain-list" style="padding: 4px 6px; border-bottom: 1px slid #ccc; display:block"></div>');
+ var input = $('<input type="checkbox" data-img="item-poff" checked="checked">');
+ var icon = $('<img src="'+mapImages.powercut+'">');
+ var span = $('<span>鍋滅數鏈烘埧</span>');
+ var badge = $('<a href="javascript:;" class="layui-badge-rim mrr8 badge-powercut">0</a>');
+ iconList.append(input);
+ iconList.append(span);
+ iconList.append(icon);
+ iconList.append(badge);
+ iconExplain.append(iconList);
+
// 钀藉悗鏈烘埧
var iconList = $('<div class="explain-list" style="padding: 4px 6px; border-bottom: 1px slid #ccc; display:block"></div>');
var input = $('<input type="checkbox" data-img="item-behind" checked="checked">');
@@ -1730,17 +1776,7 @@
iconList.append('<div class="clear"></div>');
iconExplain.append(iconList);
- // 鎺夌珯鏈烘埧
- var iconList = $('<div class="explain-list" style="padding: 4px 6px; border-bottom: 1px slid #ccc; display:block"></div>');
- var input = $('<input type="checkbox" data-img="item-down" checked="checked">');
- var icon = $('<img src="'+mapImages.timeout+'">');
- var span = $('<span>鎺夌珯鏈烘埧</span>');
- var badge = $('<a href="javascript:;" class="layui-badge-rim mrr8 badge-down">0</a>');
- iconList.append(input);
- iconList.append(span);
- iconList.append(icon);
- iconList.append(badge);
- iconExplain.append(iconList);
+
// 鏈烘埧寤舵椂
var iconList = $('<div class="explain-list" style="padding: 4px 6px; border-bottom: 1px slid #ccc; display:block"></div>');
@@ -1751,18 +1787,6 @@
iconList.append(span);
iconList.append(icon);
//iconExplain.append(iconList);
-
- // 鍋滅數鏈烘埧
- var iconList = $('<div class="explain-list" style="padding: 4px 6px; border-bottom: 1px slid #ccc; display:block"></div>');
- var input = $('<input type="checkbox" data-img="item-poff" checked="checked">');
- var icon = $('<img src="'+mapImages.powercut+'">');
- var span = $('<span>鍋滅數鏈烘埧</span>');
- var badge = $('<a href="javascript:;" class="layui-badge-rim mrr8 badge-powercut">0</a>');
- iconList.append(input);
- iconList.append(span);
- iconList.append(icon);
- iconList.append(badge);
- iconExplain.append(iconList);
// 姝ｅ父鏈烘埧
var iconList = $('<div class="explain-list" style="padding: 4px 6px; border-bottom: 1px slid #ccc; display:block"></div>');
@@ -2543,7 +2567,7 @@
// 鏄剧ず鍖哄煙鐨勫浘鏍�
bmap.setDots(allStation);
bmap.queryInRect(map, createMapDot);
- updateStation(setRect);
+ updateStation();
// 鏇存柊灏忓伐鍏锋悳绱㈡満鎴垮姛鑳�
updateSearchSource(allStation);
@@ -3007,6 +3031,8 @@
//console.info(allStation);
console.info(allStation);
var temp = getStationMap(allStation, mk.point);
+ console.info(temp);
+ temp.StationName = temp.title;
if(confirm("纭浠庡湴鍥句笂鍒犻櫎'"+temp.title+"'鐨勪綅缃俊鎭悧锛�")){
if(temp != undefined){
var json = JSON.stringify(temp);
@@ -3287,6 +3313,7 @@
var rs = new Object();
rs.normal = "User_ChartAction!serchByInfo?json={Chart_file:'"+user_logo+"',Chart_name:chart_normal}"; // 鏅�氭満鎴垮浘鏍�
rs.behind = "User_ChartAction!serchByInfo?json={Chart_file:'"+user_logo+"',Chart_name:chart_behind}"; // 钀藉悗鍥炬爣
+ //rs.diaozhan = "User_ChartAction!serchByInfo?json={Chart_file:'"+user_logo+"',Chart_name:chart_diaozhan}"; // 寤舵椂鏈烘埧鍥炬爣
rs.timeout = "User_ChartAction!serchByInfo?json={Chart_file:'"+user_logo+"',Chart_name:chart_timeout}"; // 寤舵椂鏈烘埧鍥炬爣
rs.warn = "User_ChartAction!serchByInfo?json={Chart_file:'"+user_logo+"',Chart_name:chart_warn}"; // 鍛婅鏈烘埧鍥炬爣
rs.nuclear = "User_ChartAction!serchByInfo?json={Chart_file:'"+user_logo+"',Chart_name:chart_nuclear_cap}"; // 鏍稿鏀剧數
@@ -3494,6 +3521,9 @@
break;
case 'item-behind': // 钀藉悗
rs = imgs.behind;
+ break;
+ case 'item-diaozhan':
+ rs = imgs.timeout; // 鎺夌珯
break;
case 'item-timeout': // 寤舵椂
rs = imgs.timeout;
@@ -3746,35 +3776,43 @@
data:null,
success: function(data){
var model = eval('('+data.result+')');
+ var resData;
if(model.code == 1) {
var result = model.data;
- //console.log(result);
- var formatData = formatPieRsData(result[0]);
- laytpl(pieConfTpl).render(formatData, function(html) {
- layer.open({
- id: 'pie',
- title: '楗肩姸鍥鹃厤缃�',
- maxHeight: 450,
- content: html,
- yes: function(index) {
- var iptList = $('#tplTblOpts .tpl-tbl-opts-header input[type=checkbox]');
- var iptArr = [];
- iptList.each(function() {
- if($(this).is(':checked')) {
- iptArr.push(1);
- }else {
- iptArr.push(0);
- }
- });
-
- var temp = structUpdatePie(iptArr);
- layer.load();
- updateUserBieState(temp);
- }
- });
- });
+ resData = result[0];
+ }else {
+ resData = {
+ echarts1_enable:1,
+ echarts2_enable:1,
+ echarts3_enable:1,
+ echarts4_enable:1
+ };
}
+ // 鏍煎紡鑾峰彇鍒扮殑鏁版嵁
+ var formatData = formatPieRsData(resData);
+ laytpl(pieConfTpl).render(formatData, function(html) {
+ layer.open({
+ id: 'pie',
+ title: '楗肩姸鍥鹃厤缃�',
+ maxHeight: 450,
+ content: html,
+ yes: function(index) {
+ var iptList = $('#tplTblOpts .tpl-tbl-opts-header input[type=checkbox]');
+ var iptArr = [];
+ iptList.each(function() {
+ if($(this).is(':checked')) {
+ iptArr.push(1);
+ }else {
+ iptArr.push(0);
+ }
+ });
+ var temp = structUpdatePie(iptArr);
+ layer.load();
+ updateUserBieState(temp);
+ }
+ });
+ });
}
});
}
--
Gitblit v1.9.1