From b8e64e9ac514d86d8e6c6bbfe39cd04b01b5cf7f Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.16>
Date: 星期二, 11 十二月 2018 17:22:37 +0800
Subject: [PATCH] 设备告警修改
---
gx_tieta/WebRoot/js/charge.js | 30 +++++++++++++++++++++++++++---
1 files changed, 27 insertions(+), 3 deletions(-)
diff --git a/gx_tieta/WebRoot/js/charge.js b/gx_tieta/WebRoot/js/charge.js
index e16d474..7693bdb 100644
--- a/gx_tieta/WebRoot/js/charge.js
+++ b/gx_tieta/WebRoot/js/charge.js
@@ -193,7 +193,18 @@
myLineChartTop.group = 'group1';
var option={
tooltip:{
- trigger: 'axis'
+ trigger: 'axis',
+ formatter:function(params){
+ var data = "";
+ var str = '';
+ str+=params[0].name+'</br>';
+ for(var i=0;i<params.length;i++){
+ var marker = '<span style="display:inline-block;margin-right:5px;border-radius:10px;width:9px;height:9px;background-color:'+params[i].color+';"></span>';
+ str+=marker+params[i].seriesName+': '+params[i].data+'V</br>';
+ data = params[i].data == undefined?marker+params[i].seriesName+":-":str;
+ }
+ return data;
+ }
},
toolbox: {
show : true
@@ -410,18 +421,31 @@
//鍒涘缓鍙充笅鎶樼嚎鍥�
var myLineChart; //灏忓彸涓嬫姌绾垮浘
var mybigLineChart; //澶у彸涓嬫姌绾垮浘
-function CreateLineEchart(echartObj,ele,lname,xdata,sdata,ymax,ymin,tname){
+function CreateLineEchart(echartObj,ele,lname,xdata,sdata,ymax,ymin,tname,unit){
if(echartObj=='myLineChart'){
myLineChart=echarts.init(ele);
myLineChart.clear();
}else if(echartObj='mybigLineChart'){
mybigLineChart=echarts.init(ele);
}
+ // 鍒ゆ柇鏄惁unit鐨勫��
+ unit = unit?unit:'';
myLineChart.group = 'group1';
//console.info("ymax :"+ymax+"ymin:"+ymin);
var option={
tooltip:{
- trigger:'axis'
+ trigger:'axis',
+ formatter:function(params){
+ var data = "";
+ var str = '';
+ str+=params[0].name+'</br>';
+ for(var i=0;i<params.length;i++){
+ var marker = '<span style="display:inline-block;margin-right:5px;border-radius:10px;width:9px;height:9px;background-color:'+params[i].color+';"></span>';
+ str+=marker+params[i].seriesName+': '+params[i].data+unit+'</br>';
+ data = params[i].data == undefined?marker+params[i].seriesName+":-":str;
+ }
+ return data;
+ }
},
title : {
text: "鍗曚綋鐢靛帇鎶樼嚎鍥�",
--
Gitblit v1.9.1