leguadmin/xfrontend
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

1

Browse Source
This commit is contained in:
罗松柏 2021-08-30 19:52:48 +08:00
parent dc9f179d6d
commit ab6c4e46c2
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
web/src/x.min.js vendored
View File

@ -581,7 +581,8 @@ var X = window.X || {
for(let i in data){ for(let i in data){
if(data[i]['values'].length > 0 ){ if(data[i]['values'].length > 0 ){
titledata= $.extend(true,[],data[0]['date_range']); titledata= $.extend(true,[],data[0]['date_range']);
titledata.unshift('指标','阶段总和'); titledata.unshift('指标');
// ,'阶段总和'
if(data[i]['groups']['length'] != 0){ if(data[i]['groups']['length'] != 0){
for(let j in data[i]['values']){ for(let j in data[i]['values']){
@ -590,19 +591,20 @@ var X = window.X || {
arr.unshift(data[i]['event_name'],data[i]['sum'][j]); arr.unshift(data[i]['event_name'],data[i]['sum'][j]);
condata.push(arr); condata.push(arr);
} }
// condata.push(data[i].values[0]);
// condata[i].unshift(data[i]['event_name'],data[i]['sum']);
// console.log(condata);
}else { }else {
var arr; var arr;
arr = $.extend(true,[],data[i].values[0]) arr = $.extend(true,[],data[i].values[0])
arr.unshift(data[i]['event_name'],data[i]['sum'][0]); arr.unshift(data[i]['event_name']);
// ,data[i]['sum'][0]
condata.push(arr) condata.push(arr)
} }
}else { }else {
layer.msg('查询数据为空'); layer.msg('查询数据为空');
} }
} }
// console.log(condata);
// return;
var dataArr = { var dataArr = {
titledata:titledata, titledata:titledata,
condata:condata condata:condata

12
web/srczip/common.js
View File

@ -580,7 +580,8 @@ var X = window.X || {
for(let i in data){ for(let i in data){
if(data[i]['values'].length > 0 ){ if(data[i]['values'].length > 0 ){
titledata= $.extend(true,[],data[0]['date_range']); titledata= $.extend(true,[],data[0]['date_range']);
titledata.unshift('指标','阶段总和'); titledata.unshift('指标');
// ,'阶段总和'
if(data[i]['groups']['length'] != 0){ if(data[i]['groups']['length'] != 0){
for(let j in data[i]['values']){ for(let j in data[i]['values']){
@ -589,19 +590,20 @@ var X = window.X || {
arr.unshift(data[i]['event_name'],data[i]['sum'][j]); arr.unshift(data[i]['event_name'],data[i]['sum'][j]);
condata.push(arr); condata.push(arr);
} }
// condata.push(data[i].values[0]);
// condata[i].unshift(data[i]['event_name'],data[i]['sum']);
// console.log(condata);
}else { }else {
var arr; var arr;
arr = $.extend(true,[],data[i].values[0]) arr = $.extend(true,[],data[i].values[0])
arr.unshift(data[i]['event_name'],data[i]['sum'][0]); arr.unshift(data[i]['event_name']);
// ,data[i]['sum'][0]
condata.push(arr) condata.push(arr)
} }
}else { }else {
layer.msg('查询数据为空'); layer.msg('查询数据为空');
} }
} }
// console.log(condata);
// return;
var dataArr = { var dataArr = {
titledata:titledata, titledata:titledata,
condata:condata condata:condata