-
{{d.sameday}}人
+
{{d.sameday}}
@@ -168,8 +168,8 @@
-
总和 {{d.sum}}人
-
均值 {{d.mean}}人
+
总和 {{d.sum}}
+
均值 {{d.mean}}
diff --git a/web/src/x.min.js b/web/src/x.min.js
index 2a32057..c765d65 100644
--- a/web/src/x.min.js
+++ b/web/src/x.min.js
@@ -452,6 +452,9 @@ var X = window.X || {
var sum = 0;
var mean = 0;
var sameday = 0;
+ var date;
+ var length = data[0]['date_range'].length - 1;
+ date = data[0]['date_range'][length];
for(let i in data){
for(let z in data[i]['values']){
var arr = {
@@ -479,13 +482,11 @@ var X = window.X || {
}
}
-
- for(let i in data){}
-
var dataArr = {
xAxisData:data[0]['date_range'],
legenddata:legenddata,
seriesData:seriesData,
+ date:date,
sum:sum,
mean:mean,
sameday: sameday
@@ -1455,7 +1456,7 @@ var X = window.X || {
"analysis":'total_count',
"filts":[],//过滤项
"condrelation":'and',
- "customEvent":' ',
+ "customEvent":'',
"eventNameDisplay":' '//重命名指标
}
data.events.push(defaultindicator);
@@ -1779,7 +1780,7 @@ var X = window.X || {
"analysis":'total_count',
"filts":[],//过滤项
"condrelation":'and',
- "customEvent":' ',
+ "customEvent":'',
"eventNameDisplay":' '//重命名指标
}
data['events'].push(defaultindicator);
diff --git a/web/srczip/common.js b/web/srczip/common.js
index e54a05d..a59afea 100644
--- a/web/srczip/common.js
+++ b/web/srczip/common.js
@@ -451,6 +451,9 @@ var X = window.X || {
var sum = 0;
var mean = 0;
var sameday = 0;
+ var date;
+ var length = data[0]['date_range'].length - 1;
+ date = data[0]['date_range'][length];
for(let i in data){
for(let z in data[i]['values']){
var arr = {
@@ -478,13 +481,11 @@ var X = window.X || {
}
}
-
- for(let i in data){}
-
var dataArr = {
xAxisData:data[0]['date_range'],
legenddata:legenddata,
seriesData:seriesData,
+ date:date,
sum:sum,
mean:mean,
sameday: sameday
diff --git a/web/srczip/logic/analysis.js b/web/srczip/logic/analysis.js
index aef0a81..60823f3 100644
--- a/web/srczip/logic/analysis.js
+++ b/web/srczip/logic/analysis.js
@@ -85,7 +85,7 @@
"analysis":'total_count',
"filts":[],//过滤项
"condrelation":'and',
- "customEvent":' ',
+ "customEvent":'',
"eventNameDisplay":' '//重命名指标
}
data.events.push(defaultindicator);
@@ -409,7 +409,7 @@
"analysis":'total_count',
"filts":[],//过滤项
"condrelation":'and',
- "customEvent":' ',
+ "customEvent":'',
"eventNameDisplay":' '//重命名指标
}
data['events'].push(defaultindicator);