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

提交

Browse Source
This commit is contained in:
罗松柏 2021-07-26 21:28:58 +08:00
parent f0879c4fcb
commit 93cff61aeb
5 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
web/pages/analysis.html
View File

@ -224,7 +224,7 @@
<div class="analysis-con-left-screen-list">
<!-- 指标选择 -->
{{# if(item.customEvent != " " && item.customEvent != undefined){ }}
{{# if(item.customEvent != "" && item.customEvent != undefined){ }}
<div class="analysis-con-left-screen-list-left-box" id="analysis-con-left-screen-list-left-box-{{index}}" style="display: none;">
{{# } else { }}
<div class="analysis-con-left-screen-list-left-box" id="analysis-con-left-screen-list-left-box-{{index}}">
@ -285,7 +285,7 @@
{{# } }}
</div>
<!-- 公式 -->
{{# if(item.customEvent != " " && item.customEvent != undefined){ }}
{{# if(item.customEvent != "" && item.customEvent != undefined){ }}
<div class="analysis-custom-box" id="analysis-custom-box-{{index}}" style="display: block;">
{{# } else { }}
<div class="analysis-custom-box" id="analysis-custom-box-{{index}}">

8
web/pages/modeltable.html
View File

@ -156,10 +156,10 @@
<img src="./static/img/qvshitu.png" /> <span>趋势图</span>
</div>
</div>
<p class="dqtime">2021-03-23(二)</p>
<p class="dqtime">{{d.date}}</p>
<div class="data-box">
<div style="display: flex; align-items: center;">
<div class="data-num">{{d.sameday}}<span>人</span></div>
<div class="data-num">{{d.sameday}}<span></span></div>
<div class="proportion">
<!-- <div class="proportion-data">较环比 <div class="sanjiao"></div><span>5.4%</span></div>
<div class="proportion-data">较同比 <div class="sanjiao"></div><span>5.4%</span></div> -->
@ -168,8 +168,8 @@
<div class="thesum">
<div class="thesum-box">
<div class="thesum-data">总和 <span>{{d.sum}}</span>人</div>
<div class="thesum-data">均值 <span>{{d.mean}}</span>人</div>
<div class="thesum-data">总和 <span>{{d.sum}}</span></div>
<div class="thesum-data">均值 <span>{{d.mean}}</span></div>
</div>
</div>
</div>

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

@ -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);

7
web/srczip/common.js
View File

@ -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

4
web/srczip/logic/analysis.js
View File

@ -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);