diff --git a/web/pages/analysis.html b/web/pages/analysis.html
index 2166933..f8e57d4 100644
--- a/web/pages/analysis.html
+++ b/web/pages/analysis.html
@@ -306,8 +306,12 @@
触发用户数
+ {{# if(item.formatname == undefined){ }}
+ 两位小数
+ {{# } else { }}
+ {{item.formatname}}
+ {{# } }}
-
diff --git a/web/src/x.min.js b/web/src/x.min.js
index 53e8da5..6394b8c 100644
--- a/web/src/x.min.js
+++ b/web/src/x.min.js
@@ -1608,7 +1608,9 @@ var X = window.X || {
"filts":[],//过滤项
"condrelation":'and',
"customEvent":'',
- "eventNameDisplay":''//重命名指标
+ "eventNameDisplay":'',//重命名指标
+ "format":'float',
+ "formatname":'两位小数'
}
data.events.push(defaultindicator);
X.laytpldata("#analysis-con-left-screen-list-dot",data.events,".analysis-con-left-screen-list-box");
@@ -1939,7 +1941,9 @@ var X = window.X || {
"filts":[],//过滤项
"condrelation":'and',
"customEvent":'',
- "eventNameDisplay":''//重命名指标
+ "eventNameDisplay":'',//重命名指标
+ "format":'float',
+ "formatname":'两位小数'
}
data['events'].push(defaultindicator);
@@ -2004,6 +2008,25 @@ var X = window.X || {
data['events'][index]['eventNameDisplay'] = $(this).val();
});
+ $(document).off('click','.ant-select-selector').on('click','.ant-select-selector',function(){
+ var obj = $(this);
+ var offset = obj.offset();
+ var index = $(this).attr("data-index");
+ var downlist = [
+ {title:'两位小数',id:'float'},
+ {title:'百分比',id:'percent'},
+ {title:'取整',id:'integer'},
+ ];
+ X.querycriteriapop(downlist,'dropdownlist',offset.left,offset.top+obj.height(),function(val){
+ if(val != undefined){
+ obj.html(val.title);
+ data['events'][index]['format'] = val.id;
+ data['events'][index]['formatname'] = val.title;
+ }
+ })
+
+ });
+
//分组项
var cat = "event";
$(document).off('click','.analysis-footadd___2D4YB').on('click','.analysis-footadd___2D4YB',function(){
diff --git a/web/srczip/logic/analysis.js b/web/srczip/logic/analysis.js
index df6f9c9..4c598d2 100644
--- a/web/srczip/logic/analysis.js
+++ b/web/srczip/logic/analysis.js
@@ -84,7 +84,9 @@
"filts":[],//过滤项
"condrelation":'and',
"customEvent":'',
- "eventNameDisplay":''//重命名指标
+ "eventNameDisplay":'',//重命名指标
+ "format":'float',
+ "formatname":'两位小数'
}
data.events.push(defaultindicator);
X.laytpldata("#analysis-con-left-screen-list-dot",data.events,".analysis-con-left-screen-list-box");
@@ -415,7 +417,9 @@
"filts":[],//过滤项
"condrelation":'and',
"customEvent":'',
- "eventNameDisplay":''//重命名指标
+ "eventNameDisplay":'',//重命名指标
+ "format":'float',
+ "formatname":'两位小数'
}
data['events'].push(defaultindicator);
@@ -480,6 +484,25 @@
data['events'][index]['eventNameDisplay'] = $(this).val();
});
+ $(document).off('click','.ant-select-selector').on('click','.ant-select-selector',function(){
+ var obj = $(this);
+ var offset = obj.offset();
+ var index = $(this).attr("data-index");
+ var downlist = [
+ {title:'两位小数',id:'float'},
+ {title:'百分比',id:'percent'},
+ {title:'取整',id:'integer'},
+ ];
+ X.querycriteriapop(downlist,'dropdownlist',offset.left,offset.top+obj.height(),function(val){
+ if(val != undefined){
+ obj.html(val.title);
+ data['events'][index]['format'] = val.id;
+ data['events'][index]['formatname'] = val.title;
+ }
+ })
+
+ });
+
//分组项
var cat = "event";
$(document).off('click','.analysis-footadd___2D4YB').on('click','.analysis-footadd___2D4YB',function(){