路径分析字段修改
This commit is contained in:
parent
5bf5a4d1f5
commit
a7f85c3bac
@ -4,9 +4,9 @@
|
||||
<div class="analysis-overall-situation-list">
|
||||
<div class="analysis-overall-situation-attr" data-index="{{index}}">{{item.columnDesc}}</div>
|
||||
<div class="analysis-overall-situation-fuhao" data-index="{{index}}" data-type="{{item.data_type}}" >{{item.comparator_name}}</div>
|
||||
{{# if(item.comparator != "is null" && item.comparator != "is not null" && item.comparator !="not null" && item.comparator != "range"){ }}
|
||||
{{# if(item.comparator_id != "is null" && item.comparator_id != "is not null" && item.comparator_id !="not null" && item.comparator_id != "range"){ }}
|
||||
{{# if(item.data_type != "datetime" && item.data_type != "user_label"){ }}
|
||||
<div class="analysis-overall-situation-input" data-type="{{item.data_type}}" data-index="{{index}}" data-comparator="{{item.comparator}}">
|
||||
<div class="analysis-overall-situation-input" data-type="{{item.data_type}}" data-index="{{index}}" data-comparator="{{item.comparator_id}}">
|
||||
<input type="text" data-index="{{index}}" placeholder="多个用,隔开" value="{{item.strftv}}" data-type="{{item.data_type}}"/>
|
||||
</div>
|
||||
{{# } else if(item.data_type == "user_label"){ }}
|
||||
@ -18,7 +18,7 @@
|
||||
{{# } }}
|
||||
{{# } }}
|
||||
|
||||
{{# if(item.comparator === "range"){ }}
|
||||
{{# if(item.comparator_id === "range"){ }}
|
||||
<div class="analysis-overall-situation-input2" > <input autocomplete="off" data-index="{{index}}" type="text" value="{{item.section[0]}}" name="start"/> <span>与</span> <input data-index="{{index}}" name="end" type="text" value="{{item.section[1]}}"/> <span>之间</span> </div>
|
||||
{{# } }}
|
||||
<p class="analysis-overall-situation-del" data-index="{{index}}"> <img src="./static/img/cha1.png"> </p>
|
||||
|
10
web/src/x.min.js
vendored
10
web/src/x.min.js
vendored
@ -154,7 +154,7 @@ var X = window.X || {
|
||||
|
||||
(function(){
|
||||
//本地李伟
|
||||
// var ipurl = "http://10.0.0.240:7899/api/v1/";
|
||||
var ipurl = "http://10.0.0.240:7899/api/v1/";
|
||||
//本地李宗振
|
||||
// var ipurl = "http://10.0.0.94:7899/api/v1/";
|
||||
// 线上
|
||||
@ -14628,7 +14628,7 @@ var X = window.X || {
|
||||
"columnDesc":groupitemeventsdata[0]['category'][0]['title'],//事件中文显示
|
||||
"columnName":groupitemeventsdata[0]['category'][0]['id'],//事件id
|
||||
"comparator_name": filter_map[groupitemeventsdata[0]['category'][0]['data_type']][0]['title'],//选择符号中文显示
|
||||
"comparator":filter_map[groupitemeventsdata[0]['category'][0]['data_type']][0]['id'],//符号id
|
||||
"comparator_id":filter_map[groupitemeventsdata[0]['category'][0]['data_type']][0]['id'],//符号id
|
||||
"data_type":groupitemeventsdata[0]['category'][0]['data_type'],
|
||||
"ftv":[],//条件
|
||||
"strftv":'',//字符串显示条件
|
||||
@ -14696,7 +14696,7 @@ var X = window.X || {
|
||||
if(val != undefined){
|
||||
obj.html(val.title);
|
||||
data['events']['source_event']['filts'][indexs]['comparator_name'] = val.title;
|
||||
data['events']['source_event']['filts'][indexs]['comparator'] = val.id;
|
||||
data['events']['source_event']['filts'][indexs]['comparator_id'] = val.id;
|
||||
X.template("userpar","userpar-event",data['events']);
|
||||
}
|
||||
})
|
||||
@ -14718,7 +14718,7 @@ var X = window.X || {
|
||||
"columnName":screentypedata[0]['category'][0]['id'],//事件id
|
||||
'data_type':screentypedata[0]['category'][0]['data_type'],//类型
|
||||
'comparator_name':'等于',//默认等于
|
||||
"comparator":'==',//符号id
|
||||
"comparator_id":'==',//符号id
|
||||
"ftv":[],//条件
|
||||
"strftv":'',//显示条件
|
||||
"section":[-1,1],//区间
|
||||
@ -14761,7 +14761,7 @@ var X = window.X || {
|
||||
if(val != undefined){
|
||||
obj.html(val.title);
|
||||
data['events']['user_filter']['filts'][index]['comparator_name'] = val.title;
|
||||
data['events']['user_filter']['filts'][index]['comparator'] = val.id;
|
||||
data['events']['user_filter']['filts'][index]['comparator_id'] = val.id;
|
||||
if(val.id == "range"){
|
||||
data['events']['user_filter']['filts'][index]['ftv'] = [-1,1];
|
||||
}
|
||||
|
@ -153,7 +153,7 @@ var X = window.X || {
|
||||
|
||||
(function(){
|
||||
//本地李伟
|
||||
// var ipurl = "http://10.0.0.240:7899/api/v1/";
|
||||
var ipurl = "http://10.0.0.240:7899/api/v1/";
|
||||
//本地李宗振
|
||||
// var ipurl = "http://10.0.0.94:7899/api/v1/";
|
||||
// 线上
|
||||
|
@ -253,7 +253,7 @@
|
||||
"columnDesc":groupitemeventsdata[0]['category'][0]['title'],//事件中文显示
|
||||
"columnName":groupitemeventsdata[0]['category'][0]['id'],//事件id
|
||||
"comparator_name": filter_map[groupitemeventsdata[0]['category'][0]['data_type']][0]['title'],//选择符号中文显示
|
||||
"comparator":filter_map[groupitemeventsdata[0]['category'][0]['data_type']][0]['id'],//符号id
|
||||
"comparator_id":filter_map[groupitemeventsdata[0]['category'][0]['data_type']][0]['id'],//符号id
|
||||
"data_type":groupitemeventsdata[0]['category'][0]['data_type'],
|
||||
"ftv":[],//条件
|
||||
"strftv":'',//字符串显示条件
|
||||
@ -321,7 +321,7 @@
|
||||
if(val != undefined){
|
||||
obj.html(val.title);
|
||||
data['events']['source_event']['filts'][indexs]['comparator_name'] = val.title;
|
||||
data['events']['source_event']['filts'][indexs]['comparator'] = val.id;
|
||||
data['events']['source_event']['filts'][indexs]['comparator_id'] = val.id;
|
||||
X.template("userpar","userpar-event",data['events']);
|
||||
}
|
||||
})
|
||||
@ -343,7 +343,7 @@
|
||||
"columnName":screentypedata[0]['category'][0]['id'],//事件id
|
||||
'data_type':screentypedata[0]['category'][0]['data_type'],//类型
|
||||
'comparator_name':'等于',//默认等于
|
||||
"comparator":'==',//符号id
|
||||
"comparator_id":'==',//符号id
|
||||
"ftv":[],//条件
|
||||
"strftv":'',//显示条件
|
||||
"section":[-1,1],//区间
|
||||
@ -386,7 +386,7 @@
|
||||
if(val != undefined){
|
||||
obj.html(val.title);
|
||||
data['events']['user_filter']['filts'][index]['comparator_name'] = val.title;
|
||||
data['events']['user_filter']['filts'][index]['comparator'] = val.id;
|
||||
data['events']['user_filter']['filts'][index]['comparator_id'] = val.id;
|
||||
if(val.id == "range"){
|
||||
data['events']['user_filter']['filts'][index]['ftv'] = [-1,1];
|
||||
}
|
||||
|
BIN
web/static/img/bg_login.png
Normal file
BIN
web/static/img/bg_login.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 24 KiB |
Loading…
Reference in New Issue
Block a user