`;
- str += `
${tip?(tip.alias?tip.alias:tip.name):item.seriesName}
`;
+ str += `
${tip?(tip.alias?tip.alias:tip.name):item.seriesName}
`;
str += `
`;
str += chartDataFormat.getUnit(chartInfo.unit?chartInfo.unit:2).compute(val,null,2);
str += `
`;
@@ -774,9 +784,27 @@ console.log('=======',this.chart);
intervale: 0,
rotate: 0,
formatter: function (value) {
- var t_date = new Date(value);
- return [t_date.getFullYear(), t_date.getMonth() + 1, t_date.getDate()].join('-') + "\n"
- + [t_date.getHours(), t_date.getMinutes()].join(':');
+ value = bus.computeTimezone(value);
+ let t_date = new Date(value);
+ let hour = t_date.getHours();
+ hour=hour>9?hour:"0"+hour; //加0补充为两位数字
+ let minute = t_date.getMinutes();
+ minute=minute>9?minute:"0"+minute; //如果分钟小于10,则在前面加0补充为两位数字
+ if(minTime!==null && maxTime!==null){
+ let diffSec = (maxTime-minTime)/1000;
+ let secOneDay = 24*60*60;//1天的秒数
+ let secOneMonth = secOneDay*30;//30天的秒数
+ if(diffSec<=secOneDay) {//同一天
+ return [hour,minute ].join(':');
+ }else if(diffSec
-->
-
+
+
+
+
+
+
-
+
{{data.title}}
@@ -121,7 +132,7 @@
import bus from '../../libs/bus';
import loading from "../common/loading";
import chartDataFormat from './chartDataFormat'
- //import {randomcolor} from '../common/js/radomcolor/randomcolor.js'
+ import {randomcolor} from '../common/js/radomcolor/randomcolor.js'
export default {
name: 'lineChartBlock',
@@ -158,6 +169,7 @@
seriesItem: [], // 保存信息
seriesItemScreen:[],
images: '',
+ isError:false,
toolbox: false,
items: {
metric_name: [], // 每条数据列名称
@@ -635,8 +647,14 @@
if ( chartInfo.type === 4) {//line,bar
this.chartType = 'line';
}
- //let chartId = '';
-
+ let minTime = null;
+ let maxTime = null
+ if(dataArg.length>0 && dataArg[0].data
+ && dataArg[0].data.length>0 && dataArg[0].data[0].length>0){
+ let len = dataArg[0].data.length-1;
+ minTime = dataArg[0].data[0][0];
+ maxTime = dataArg[0].data[len][0];
+ }
if (chartSite === 'local') {
this.echartStore = echarts.init(ele);
//chartId='lineChartArea';
@@ -748,11 +766,11 @@
params.forEach((item, i) => {
//alert('tooltip====='+JSON.stringify(item))
//let tip=legend.find((element)=>{
- //alert('legend====='+JSON.stringify(element))
- //return element.name == item.seriesName;
+ //alert('legend====='+JSON.stringify(element))
+ //return element.name == item.seriesName;
//});
- let tip=legend[i];
- let color = self.bgColorList[i];
+ let tip=legend[item.seriesIndex];
+ let color = self.bgColorList[item.seriesIndex];
if(i===0){
let value=bus.computeTimezone(item.data[0]);
let t_date = new Date(value);
@@ -865,9 +883,27 @@
rotate: 0,
formatter: function (value) {
value = bus.computeTimezone(value);
- var t_date = new Date(value);
- return [t_date.getFullYear(), t_date.getMonth() + 1, t_date.getDate()].join('-') + "\n"
- + [t_date.getHours(), t_date.getMinutes()].join(':');
+ let t_date = new Date(value);
+ let hour = t_date.getHours();
+ hour=hour>9?hour:"0"+hour; //加0补充为两位数字
+ let minute = t_date.getMinutes();
+ minute=minute>9?minute:"0"+minute; //如果分钟小于10,则在前面加0补充为两位数字
+ if(minTime!==null && maxTime!==null){
+ let diffSec = (maxTime-minTime)/1000;
+ let secOneDay = 24*60*60;//1天的秒数
+ let secOneMonth = secOneDay*30;//30天的秒数
+ if(diffSec<=secOneDay) {//同一天
+ return [hour,minute ].join(':');
+ }else if(diffSec
{{$t('dashboard.panel.chartForm.type')}}
-
+
@@ -128,7 +128,7 @@
-
+
{{$t('dashboard.panel.chartForm.unit')}}
@@ -148,7 +148,7 @@
{{$t('dashboard.panel.chartForm.width')}}
-
+
@@ -162,7 +162,7 @@
{{$t('dashboard.panel.chartForm.high')}}
-
+
@@ -238,7 +238,8 @@
export default {
name: "chartBox",
props: {
- panelData: Array
+ panelData: Array,
+ showPanel:{}
},
data() {
return {
@@ -325,6 +326,7 @@
},
methods: {
show(show) {
+ this.panelName2 = this.showPanel.name;
this.rightBox.show = show;
this.isUrl = false;
},
diff --git a/nezha-fronted/src/components/page/dashboard/panel.vue b/nezha-fronted/src/components/page/dashboard/panel.vue
index 18ee696f4..c2bd99cd3 100644
--- a/nezha-fronted/src/components/page/dashboard/panel.vue
+++ b/nezha-fronted/src/components/page/dashboard/panel.vue
@@ -96,7 +96,7 @@
-
+