diff --git a/web/pages/globalfilter.html b/web/pages/globalfilter.html index eba5590..9fafe10 100644 --- a/web/pages/globalfilter.html +++ b/web/pages/globalfilter.html @@ -4,9 +4,9 @@
{{item.columnDesc}}
{{item.comparator_name}}
- {{# 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"){ }} -
+
{{# } else if(item.data_type == "user_label"){ }} @@ -18,7 +18,7 @@ {{# } }} {{# } }} - {{# if(item.comparator === "range"){ }} + {{# if(item.comparator_id === "range"){ }}
之间
{{# } }}

diff --git a/web/src/x.min.js b/web/src/x.min.js index f0c1a6e..296dcb9 100644 --- a/web/src/x.min.js +++ b/web/src/x.min.js @@ -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]; } diff --git a/web/srczip/common.js b/web/srczip/common.js index 3824401..d478276 100644 --- a/web/srczip/common.js +++ b/web/srczip/common.js @@ -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/"; // 线上 diff --git a/web/srczip/logic/routeanalysis.js b/web/srczip/logic/routeanalysis.js index f93b746..a9dff88 100644 --- a/web/srczip/logic/routeanalysis.js +++ b/web/srczip/logic/routeanalysis.js @@ -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]; } diff --git a/web/static/img/bg_login.png b/web/static/img/bg_login.png new file mode 100644 index 0000000..9be38d2 Binary files /dev/null and b/web/static/img/bg_login.png differ