@@ -34,7 +34,7 @@
{{# layui.each(d.filts, function(indexs, items){ }}
{{items.columnDesc}}
-
{{items.comparator_name}}
+
{{items.comparator_name}}
{{# if(items.comparator != "is null" && items.comparator != "is not null" && items.comparator !="not null" && items.comparator != "range"){ }}
{{# } }}
diff --git a/web/src/x.min.js b/web/src/x.min.js
index ea0be9a..bfd1035 100644
--- a/web/src/x.min.js
+++ b/web/src/x.min.js
@@ -1137,7 +1137,7 @@ var X = window.X || {
})();
// srczip/base/ajaxpage.js
-(function(){
+//(function(){
function getHashParms(){
//获取hash数据，处理为字典，方便拼接多个hash值
var hash = location.hash.replace('#','');
@@ -1235,7 +1235,14 @@ var X = window.X || {
});
-})();
+ window.onhashchange = function(){
+ console.log( getHashParms() );
+ // var urlinfo = getHashParms();
+ // X.DATA['dashboard_id'] = urlinfo.menu;
+ // X.pageLogic['dashboard'].gettabledata();
+ };
+
+//})();
// srczip/base/visibleChange.js
(function(){
X.pageLogic['visibleChange'] = {
@@ -2035,7 +2042,7 @@ var X = window.X || {
"chartSort":"num-desc"
},
"filts":[],//全局筛选
- "relation":1,
+ "relation":'and',
"zone_time":'8'//时区
}
}
@@ -2380,10 +2387,10 @@ var X = window.X || {
var index = $(this).attr("data-index");
if(html == "且"){
$(this).html('或');
- data['events'][index]['condrelation'] = 'or'
+ data['events'][index]['relation'] = 'or'
}else {
$(this).html('且');
- data['events'][index]['condrelation'] = 'and'
+ data['events'][index]['relation'] = 'and'
}
});
@@ -2605,7 +2612,8 @@ var X = window.X || {
// 全局筛选
var filtsftvdata=[];
- $(document).on('click','.analysis-overall-situation-add',function(){
+ $(document).off('click','.analysis-overall-situation-add').on('click','.analysis-overall-situation-add',function(){
+ console.log(defaultgroupdata);
var drr={
"columnDesc":defaultgroupdata[0]['category'][0]['title'],//事件中文显示 columnDesc
"columnName":defaultgroupdata[0]['category'][0]['id'],//事件id
@@ -2663,7 +2671,7 @@ var X = window.X || {
})
});
- $(document).on('click',".analysis-overall-situation-del",function(){
+ $(document).off('click','.analysis-overall-situation-del').on('click',".analysis-overall-situation-del",function(){
var index = $(this).attr("data-index");
data['eventView']['filts'].splice(index,1);
filtsftvdata.splice(index,1);
@@ -2677,6 +2685,18 @@ var X = window.X || {
// analysisdown();
});
+
+ $(document).off('click','.analysis-overall-situation-left-guanxi').on('click','.analysis-overall-situation-left-guanxi',function(){
+ var html = $(this).html(); //condrelation筛选条件的关系
+ if(html == "且"){
+ $(this).html('或');
+ data['eventView']['relation'] = 'or'
+ }else {
+ $(this).html('且');
+ data['eventView']['relation'] = 'and'
+ }
+ });
+
// 全局属性选择
$(document).off('click','.analysis-overall-situation-attr').on('click',".analysis-overall-situation-attr",function(){
var obj = $(this);
@@ -4001,9 +4021,10 @@ var X = window.X || {
// 修改面板名
$(document).off('click','.layui-left-dd').on('click','.layui-left-dd',function(){
$(".tab-tit-box .tab-tit").html($(this).find("span").html());
+ // setHashParms("menu",$(this).attr('data-id'));
X.DATA['dashboard_id'] = $(this).attr('data-id'); //看板id
$("#model-box").html("");
- // 获取报表数据
+ // // 获取报表数据
me.gettabledata();
});
@@ -5170,15 +5191,7 @@ var X = window.X || {
},
"events":[
- ],
- "cachedata":{
- eventdata : [],
- type2data : [],
- type3data : [],
- groupitemeventsdata: [],
- filtersymbols:[],//筛选符号
- screentypearr:[], //筛选项数据
- }
+ ]
};
// sql语句显示
@@ -5209,10 +5222,6 @@ var X = window.X || {
// console.log(d);
if(d){
data = d.query;
- // type2data = data.cachedata.type2data;
- // type3data = data.cachedata.type3data;
- // screentypearr = data.cachedata.screentypearr;
- // filtersymbols = data.cachedata.filtersymbols;
X.template("userpar","userpar-event",data['events']);
X.template("grouped","shushi",data['eventView']['groupBy']);
@@ -5227,13 +5236,11 @@ var X = window.X || {
var eventdata = [];
var type2data = [];
- var type3data = [];
var groupitemeventsdata = [];
- var filtersymbols=[];//筛选符号
var screentypearr=[]; //筛选项数据
var drr = [];
screentypearr.push(drr); //每一个筛选事件按添加次数依次写入
-
+ var quotas_map,filter_map
X.api("data_auth/my_event","get",{},function(d){
eventdata = d;
var arr = [
@@ -5260,8 +5267,16 @@ var X = window.X || {
screentypearr[0] = d.props;
})
X.api("data_auth/load_filter_props","post",{event_name:d[0]['category'][0]['event_name']},function(val){
- groupitemeventsdata[0] = val;
+ groupitemeventsdata = val;
})
+ X.api("data_auth/filter_map","get",{},function(d){
+ filter_map = d;
+ })
+ X.api('data_auth/quotas_map',"get",{},function(d){
+ quotas_map = d;
+
+ })
+
});
@@ -5275,9 +5290,9 @@ var X = window.X || {
obj.html(val.id);
dataevent['eventName'] = val.name;
dataevent['eventDesc'] = val.id;
- X.api("data_auth/load_filter_props","post",{event_name:val.name},function(val){
- groupitemeventsdata[index] = val;
- })
+ // X.api("data_auth/load_filter_props","post",{event_name:val.name},function(val){
+ // groupitemeventsdata= val;
+ // })
})
});
@@ -5290,11 +5305,12 @@ var X = window.X || {
if(type2data.length >0){
X.querycriteriapop(type2data[0],'dropdownlist',offset.left,offset.top+obj.height(),function(val){
if(val != undefined){
+ console.log(val);
$("#analysis-zhibiao-list-type2-"+index).html(val.title);
- type3data[index]=val.category;
data['events'][index]['quotaname'] = val.title;
data['events'][index]['quota'] = val.id;
+ data['events'][index]['data_type'] = val.data_type;
if(val.category && val.category.length > 0){
$("#analysis-zhibiao-list-type3-"+index).show();
$("#analysis-zhibiao-list-type3-"+index).html(val.category[0].title);
@@ -5314,16 +5330,13 @@ var X = window.X || {
$(document).off('click','.analysis-zhibiao-condition').on('click','.analysis-zhibiao-condition',function(){
var obj = $(this);
var offset = obj.offset();
- var index = obj.attr("data-index");
- if(type3data.length>0){
- if(type3data[index].length > 0){
- X.querycriteriapop(type3data[index],'dropdownlist',offset.left,offset.top+obj.height(),function(val){
- $("#analysis-zhibiao-list-type3-"+index).html(val.title);
- data['events'][index]['analysisDesc'] = val.title;
- data['events'][index]['analysis'] = val.id;
- })
- }
- }
+ var index = obj.attr('data-index');
+ var type = obj.attr("data-type");
+ X.querycriteriapop(quotas_map[type],'dropdownlist',offset.left,offset.top+obj.height(),function(val){
+ $("#analysis-zhibiao-list-type3-"+index).html(val.title);
+ data['events'][index]['analysisDesc'] = val.title;
+ data['events'][index]['analysis'] = val.id;
+ })
});
$(document).off('click','.userevent-granularity').on('click','.userevent-granularity',function(){
@@ -5365,22 +5378,22 @@ var X = window.X || {
// 添加筛选项
function addscreen(index){
- X.api('data_auth/load_filter_props',"post",{event_name:data['events'][index]["eventName"]},function(d){
+ // X.api('data_auth/load_filter_props',"post",{event_name:data['events'][index]["eventName"]},function(d){
+ // console.log(d);
var arr = {
- "columnDesc":d[0]['category'][0]['title'],//事件中文显示
- "columnName":d[0]['category'][0]['id'],//事件id
- "comparator_name":d[0]['category'][0]['category'][0]['title'],//选择符号中文显示
- "comparator":d[0]['category'][0]['category'][0]['id'],//符号id
- "data_type":d[0]['category'][0]['data_type'],
+ "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
+ "data_type":groupitemeventsdata[0]['category'][0]['data_type'],
"ftv":[],//条件
"strftv":'',//字符串显示条件
- "tableType": d[0]['id']
+ "tableType": groupitemeventsdata[0]['id']
} //筛选数据
data['events'][index]['filts'].push(arr);
X.template("userpar","userpar-event",data['events']); //更新事件
- screentypearr[index] = d;
- filtersymbols.push(d[0]['category'][0]["category"]);
- })
+
+ // })
};
$(document).off("click",".ta-property-select").on('click','.ta-property-select',function(){
@@ -5388,15 +5401,16 @@ var X = window.X || {
var offset = obj.offset();
var index = obj.attr("data-index");
var indexs = obj.attr("data-indexs");
- X.querycriteriapop(screentypearr[index],'category',offset.left,offset.top+obj.height(),function(val){
+ X.querycriteriapop(groupitemeventsdata,'category',offset.left,offset.top+obj.height(),function(val){
// console.log(val);
var htmlstring = val.title;
obj.html(htmlstring);
- filtersymbols[indexs] = val.category;
+
data['events'][index]['filts'][indexs]['columnDesc'] = htmlstring;
data['events'][index]['filts'][indexs]['columnName'] = val.id;
data['events'][index]['filts'][indexs]['data_type'] = val.type;
data['events'][index]['filts'][indexs]['tableType'] = val.table_type;
+ X.template("userpar","userpar-event",data['events']);
})
});
@@ -5405,7 +5419,8 @@ var X = window.X || {
var offset = obj.offset();
var index = $(this).attr("data-index");
var indexs = $(this).attr("data-indexs");
- X.querycriteriapop(filtersymbols[indexs],'dropdownlist',offset.left,offset.top+obj.height(),function(val){
+ var type = $(this).attr('data-type');
+ X.querycriteriapop(filter_map[type],'dropdownlist',offset.left,offset.top+obj.height(),function(val){
if(val != undefined){
obj.html(val.title);
data['events'][index]['filts'][indexs]['comparator_name'] = val.title;
@@ -5460,7 +5475,7 @@ var X = window.X || {
var obj = $(this);
var offset = obj.offset();
var index = obj.attr("data-index");
- X.querycriteriapop(groupitemeventsdata[0],'category',offset.left,offset.top+obj.height(),function(val){
+ X.querycriteriapop(groupitemeventsdata,'category',offset.left,offset.top+obj.height(),function(val){
var htmlstring = val.title;
obj.html(htmlstring);
data.eventView.groupBy[index]['columnDesc'] = val.title;
@@ -5487,11 +5502,6 @@ var X = window.X || {
var querydata;
function distributiondata(){
- // data['cachedata']['type2data'] = type2data;
- // data['cachedata']['type3data'] = type3data;
- // data['cachedata']['groupitemeventsdata'] = groupitemeventsdata;
- // data['cachedata']['filtersymbols'] = filtersymbols;
- // data['cachedata']['screentypearr'] = screentypearr;
var dataArr = {
eventView: data.eventView,
events: data.events
@@ -10180,13 +10190,18 @@ var X = window.X || {
$(document).off('click','.screen-left-box .screen-left-qei').on('click','.screen-left-box .screen-left-qei',function(){
if($(this).html() == "且"){
$(this).html("或");
+ data['relation'] = 'or';
}else {
$(this).html("且");
+ data['relation'] = 'and';
}
});
//默认开始时有一个数据
- var data = [];
+ var data = {
+ 'filts':[],
+ 'relation':'and'
+ };
function updatascreencon(){
var drr={
@@ -10200,8 +10215,13 @@ var X = window.X || {
"section":[-1,1],//区间
"tableType":load_filter_props[0]['id']
};
- data.push(drr);
- X.laytpldata("#screen-con-box-dot",data,".screen-con-box");
+ data['filts'].push(drr);
+ X.laytpldata("#screen-con-box-dot",data['filts'],".screen-con-box");
+ if(data['filts'].length >= 2){
+ $(".screen-left-qei").show();
+ }else {
+ $(".screen-left-qei").hide();
+ }
};
//条件添加按钮
@@ -10218,11 +10238,11 @@ var X = window.X || {
//点击按钮，数据，向左偏移，向右偏移
X.querycriteriapop(load_filter_props,'category',offset.left,offset.top+obj.height(),function(val){
obj.html(val.title);
- data[index]['columnDesc'] = val.title;
- data[index]['columnName'] = val.id;
- data[index]['data_type'] = val.type;
- data[index]['tableType'] = val.table_type;
- X.laytpldata("#screen-con-box-dot",data,".screen-con-box");
+ data['filts'][index]['columnDesc'] = val.title;
+ data['filts'][index]['columnName'] = val.id;
+ data['filts'][index]['data_type'] = val.type;
+ data['filts'][index]['tableType'] = val.table_type;
+ X.laytpldata("#screen-con-box-dot",data['filts'],".screen-con-box");
});
});
@@ -10235,12 +10255,12 @@ var X = window.X || {
X.parametersopen(filter_map[type],'dropdownlist',[offset.top+obj.height(),offset.left],function(val){
obj.html(val.title);
- data[index]['comparator_name'] = val.title;
- data[index]['comparator'] = val.id;
+ data['filts'][index]['comparator_name'] = val.title;
+ data['filts'][index]['comparator'] = val.id;
if(val.id == "range"){
- data[index]['ftv'] = [-1,1];
+ data['filts'][index]['ftv'] = [-1,1];
}
- X.laytpldata("#screen-con-box-dot",data,".screen-con-box");
+ X.laytpldata("#screen-con-box-dot",data['filts'],".screen-con-box");
})
});
@@ -10249,18 +10269,22 @@ var X = window.X || {
var index = $(this).attr('data-index');
var val = $(this).val();
var valarr = val.split(",");
- data[index]['ftv']=valarr;
- data[index]['strftv']=val;
+ data['filts'][index]['ftv']=valarr;
+ data['filts'][index]['strftv']=val;
});
//删除按钮
$(document).off('click','.screen-con-bg .screen-del').on('click','.screen-con-bg .screen-del',function(){
var index = $(this).attr('data-index');
- if(data.length > 1){
- data.splice(index, 1);
- X.laytpldata("#screen-con-box-dot",data,".screen-con-box");
+ if(data['filts'].length > 1){
+ data['filts'].splice(index, 1);
+ X.laytpldata("#screen-con-box-dot",data['filts'],".screen-con-box");
+ if(data['filts'].length < 2){
+ $(".screen-left-qei").hide();
+ }
}else {
layer.closeAll();
+ $(".screen-left-qei").hide();
}
});
@@ -10571,8 +10595,17 @@ var X = window.X || {
console.log(JSON.stringify(d));
$('.table-sql-box-con').html(JSON.stringify(d));
})
+
- })
+ });
+
+ $(document).off('click','.sqlquery-daochu').on('click','.sqlquery-daochu',function(){
+ var txt = $('.sql-textarea').val();
+
+ X.download('ck/sql_export',{"sql": txt},'sql');
+
+
+ });
// function EncodeURIFilter(str) {
// if(str != null && str != "") {
diff --git a/web/srczip/base/ajaxpage.js b/web/srczip/base/ajaxpage.js
index fb538ac..4c4d7e4 100644
--- a/web/srczip/base/ajaxpage.js
+++ b/web/srczip/base/ajaxpage.js
@@ -1,4 +1,4 @@
-(function(){
+//(function(){
function getHashParms(){
//获取hash数据，处理为字典，方便拼接多个hash值
var hash = location.hash.replace('#','');
@@ -96,4 +96,11 @@
});
-})();
\ No newline at end of file
+ window.onhashchange = function(){
+ console.log( getHashParms() );
+ // var urlinfo = getHashParms();
+ // X.DATA['dashboard_id'] = urlinfo.menu;
+ // X.pageLogic['dashboard'].gettabledata();
+ };
+
+//})();
\ No newline at end of file
diff --git a/web/srczip/logic/analysis.js b/web/srczip/logic/analysis.js
index 241f860..2299a94 100644
--- a/web/srczip/logic/analysis.js
+++ b/web/srczip/logic/analysis.js
@@ -28,7 +28,7 @@
"chartSort":"num-desc"
},
"filts":[],//全局筛选
- "relation":1,
+ "relation":'and',
"zone_time":'8'//时区
}
}
@@ -373,10 +373,10 @@
var index = $(this).attr("data-index");
if(html == "且"){
$(this).html('或');
- data['events'][index]['condrelation'] = 'or'
+ data['events'][index]['relation'] = 'or'
}else {
$(this).html('且');
- data['events'][index]['condrelation'] = 'and'
+ data['events'][index]['relation'] = 'and'
}
});
@@ -598,7 +598,8 @@
// 全局筛选
var filtsftvdata=[];
- $(document).on('click','.analysis-overall-situation-add',function(){
+ $(document).off('click','.analysis-overall-situation-add').on('click','.analysis-overall-situation-add',function(){
+ console.log(defaultgroupdata);
var drr={
"columnDesc":defaultgroupdata[0]['category'][0]['title'],//事件中文显示 columnDesc
"columnName":defaultgroupdata[0]['category'][0]['id'],//事件id
@@ -656,7 +657,7 @@
})
});
- $(document).on('click',".analysis-overall-situation-del",function(){
+ $(document).off('click','.analysis-overall-situation-del').on('click',".analysis-overall-situation-del",function(){
var index = $(this).attr("data-index");
data['eventView']['filts'].splice(index,1);
filtsftvdata.splice(index,1);
@@ -670,6 +671,18 @@
// analysisdown();
});
+
+ $(document).off('click','.analysis-overall-situation-left-guanxi').on('click','.analysis-overall-situation-left-guanxi',function(){
+ var html = $(this).html(); //condrelation筛选条件的关系
+ if(html == "且"){
+ $(this).html('或');
+ data['eventView']['relation'] = 'or'
+ }else {
+ $(this).html('且');
+ data['eventView']['relation'] = 'and'
+ }
+ });
+
// 全局属性选择
$(document).off('click','.analysis-overall-situation-attr').on('click',".analysis-overall-situation-attr",function(){
var obj = $(this);
diff --git a/web/srczip/logic/dashboard.js b/web/srczip/logic/dashboard.js
index a95d8f5..11e30ed 100644
--- a/web/srczip/logic/dashboard.js
+++ b/web/srczip/logic/dashboard.js
@@ -63,9 +63,10 @@
// 修改面板名
$(document).off('click','.layui-left-dd').on('click','.layui-left-dd',function(){
$(".tab-tit-box .tab-tit").html($(this).find("span").html());
+ // setHashParms("menu",$(this).attr('data-id'));
X.DATA['dashboard_id'] = $(this).attr('data-id'); //看板id
$("#model-box").html("");
- // 获取报表数据
+ // // 获取报表数据
me.gettabledata();
});
diff --git a/web/srczip/logic/distribution.js b/web/srczip/logic/distribution.js
index 2dee4b9..77fc37b 100644
--- a/web/srczip/logic/distribution.js
+++ b/web/srczip/logic/distribution.js
@@ -12,15 +12,7 @@
},
"events":[
- ],
- "cachedata":{
- eventdata : [],
- type2data : [],
- type3data : [],
- groupitemeventsdata: [],
- filtersymbols:[],//筛选符号
- screentypearr:[], //筛选项数据
- }
+ ]
};
// sql语句显示
@@ -51,10 +43,6 @@
// console.log(d);
if(d){
data = d.query;
- // type2data = data.cachedata.type2data;
- // type3data = data.cachedata.type3data;
- // screentypearr = data.cachedata.screentypearr;
- // filtersymbols = data.cachedata.filtersymbols;
X.template("userpar","userpar-event",data['events']);
X.template("grouped","shushi",data['eventView']['groupBy']);
@@ -69,13 +57,11 @@
var eventdata = [];
var type2data = [];
- var type3data = [];
var groupitemeventsdata = [];
- var filtersymbols=[];//筛选符号
var screentypearr=[]; //筛选项数据
var drr = [];
screentypearr.push(drr); //每一个筛选事件按添加次数依次写入
-
+ var quotas_map,filter_map
X.api("data_auth/my_event","get",{},function(d){
eventdata = d;
var arr = [
@@ -102,8 +88,16 @@
screentypearr[0] = d.props;
})
X.api("data_auth/load_filter_props","post",{event_name:d[0]['category'][0]['event_name']},function(val){
- groupitemeventsdata[0] = val;
+ groupitemeventsdata = val;
})
+ X.api("data_auth/filter_map","get",{},function(d){
+ filter_map = d;
+ })
+ X.api('data_auth/quotas_map',"get",{},function(d){
+ quotas_map = d;
+
+ })
+
});
@@ -117,9 +111,9 @@
obj.html(val.id);
dataevent['eventName'] = val.name;
dataevent['eventDesc'] = val.id;
- X.api("data_auth/load_filter_props","post",{event_name:val.name},function(val){
- groupitemeventsdata[index] = val;
- })
+ // X.api("data_auth/load_filter_props","post",{event_name:val.name},function(val){
+ // groupitemeventsdata= val;
+ // })
})
});
@@ -132,11 +126,12 @@
if(type2data.length >0){
X.querycriteriapop(type2data[0],'dropdownlist',offset.left,offset.top+obj.height(),function(val){
if(val != undefined){
+ console.log(val);
$("#analysis-zhibiao-list-type2-"+index).html(val.title);
- type3data[index]=val.category;
data['events'][index]['quotaname'] = val.title;
data['events'][index]['quota'] = val.id;
+ data['events'][index]['data_type'] = val.data_type;
if(val.category && val.category.length > 0){
$("#analysis-zhibiao-list-type3-"+index).show();
$("#analysis-zhibiao-list-type3-"+index).html(val.category[0].title);
@@ -156,16 +151,13 @@
$(document).off('click','.analysis-zhibiao-condition').on('click','.analysis-zhibiao-condition',function(){
var obj = $(this);
var offset = obj.offset();
- var index = obj.attr("data-index");
- if(type3data.length>0){
- if(type3data[index].length > 0){
- X.querycriteriapop(type3data[index],'dropdownlist',offset.left,offset.top+obj.height(),function(val){
- $("#analysis-zhibiao-list-type3-"+index).html(val.title);
- data['events'][index]['analysisDesc'] = val.title;
- data['events'][index]['analysis'] = val.id;
- })
- }
- }
+ var index = obj.attr('data-index');
+ var type = obj.attr("data-type");
+ X.querycriteriapop(quotas_map[type],'dropdownlist',offset.left,offset.top+obj.height(),function(val){
+ $("#analysis-zhibiao-list-type3-"+index).html(val.title);
+ data['events'][index]['analysisDesc'] = val.title;
+ data['events'][index]['analysis'] = val.id;
+ })
});
$(document).off('click','.userevent-granularity').on('click','.userevent-granularity',function(){
@@ -207,22 +199,22 @@
// 添加筛选项
function addscreen(index){
- X.api('data_auth/load_filter_props',"post",{event_name:data['events'][index]["eventName"]},function(d){
+ // X.api('data_auth/load_filter_props',"post",{event_name:data['events'][index]["eventName"]},function(d){
+ // console.log(d);
var arr = {
- "columnDesc":d[0]['category'][0]['title'],//事件中文显示
- "columnName":d[0]['category'][0]['id'],//事件id
- "comparator_name":d[0]['category'][0]['category'][0]['title'],//选择符号中文显示
- "comparator":d[0]['category'][0]['category'][0]['id'],//符号id
- "data_type":d[0]['category'][0]['data_type'],
+ "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
+ "data_type":groupitemeventsdata[0]['category'][0]['data_type'],
"ftv":[],//条件
"strftv":'',//字符串显示条件
- "tableType": d[0]['id']
+ "tableType": groupitemeventsdata[0]['id']
} //筛选数据
data['events'][index]['filts'].push(arr);
X.template("userpar","userpar-event",data['events']); //更新事件
- screentypearr[index] = d;
- filtersymbols.push(d[0]['category'][0]["category"]);
- })
+
+ // })
};
$(document).off("click",".ta-property-select").on('click','.ta-property-select',function(){
@@ -230,15 +222,16 @@
var offset = obj.offset();
var index = obj.attr("data-index");
var indexs = obj.attr("data-indexs");
- X.querycriteriapop(screentypearr[index],'category',offset.left,offset.top+obj.height(),function(val){
+ X.querycriteriapop(groupitemeventsdata,'category',offset.left,offset.top+obj.height(),function(val){
// console.log(val);
var htmlstring = val.title;
obj.html(htmlstring);
- filtersymbols[indexs] = val.category;
+
data['events'][index]['filts'][indexs]['columnDesc'] = htmlstring;
data['events'][index]['filts'][indexs]['columnName'] = val.id;
data['events'][index]['filts'][indexs]['data_type'] = val.type;
data['events'][index]['filts'][indexs]['tableType'] = val.table_type;
+ X.template("userpar","userpar-event",data['events']);
})
});
@@ -247,7 +240,8 @@
var offset = obj.offset();
var index = $(this).attr("data-index");
var indexs = $(this).attr("data-indexs");
- X.querycriteriapop(filtersymbols[indexs],'dropdownlist',offset.left,offset.top+obj.height(),function(val){
+ var type = $(this).attr('data-type');
+ X.querycriteriapop(filter_map[type],'dropdownlist',offset.left,offset.top+obj.height(),function(val){
if(val != undefined){
obj.html(val.title);
data['events'][index]['filts'][indexs]['comparator_name'] = val.title;
@@ -302,7 +296,7 @@
var obj = $(this);
var offset = obj.offset();
var index = obj.attr("data-index");
- X.querycriteriapop(groupitemeventsdata[0],'category',offset.left,offset.top+obj.height(),function(val){
+ X.querycriteriapop(groupitemeventsdata,'category',offset.left,offset.top+obj.height(),function(val){
var htmlstring = val.title;
obj.html(htmlstring);
data.eventView.groupBy[index]['columnDesc'] = val.title;
@@ -329,11 +323,6 @@
var querydata;
function distributiondata(){
- // data['cachedata']['type2data'] = type2data;
- // data['cachedata']['type3data'] = type3data;
- // data['cachedata']['groupitemeventsdata'] = groupitemeventsdata;
- // data['cachedata']['filtersymbols'] = filtersymbols;
- // data['cachedata']['screentypearr'] = screentypearr;
var dataArr = {
eventView: data.eventView,
events: data.events
diff --git a/web/srczip/logic/screen.js b/web/srczip/logic/screen.js
index 8fa9e09..69686ab 100644
--- a/web/srczip/logic/screen.js
+++ b/web/srczip/logic/screen.js
@@ -45,13 +45,18 @@
$(document).off('click','.screen-left-box .screen-left-qei').on('click','.screen-left-box .screen-left-qei',function(){
if($(this).html() == "且"){
$(this).html("或");
+ data['relation'] = 'or';
}else {
$(this).html("且");
+ data['relation'] = 'and';
}
});
//默认开始时有一个数据
- var data = [];
+ var data = {
+ 'filts':[],
+ 'relation':'and'
+ };
function updatascreencon(){
var drr={
@@ -65,8 +70,13 @@
"section":[-1,1],//区间
"tableType":load_filter_props[0]['id']
};
- data.push(drr);
- X.laytpldata("#screen-con-box-dot",data,".screen-con-box");
+ data['filts'].push(drr);
+ X.laytpldata("#screen-con-box-dot",data['filts'],".screen-con-box");
+ if(data['filts'].length >= 2){
+ $(".screen-left-qei").show();
+ }else {
+ $(".screen-left-qei").hide();
+ }
};
//条件添加按钮
@@ -83,11 +93,11 @@
//点击按钮，数据，向左偏移，向右偏移
X.querycriteriapop(load_filter_props,'category',offset.left,offset.top+obj.height(),function(val){
obj.html(val.title);
- data[index]['columnDesc'] = val.title;
- data[index]['columnName'] = val.id;
- data[index]['data_type'] = val.type;
- data[index]['tableType'] = val.table_type;
- X.laytpldata("#screen-con-box-dot",data,".screen-con-box");
+ data['filts'][index]['columnDesc'] = val.title;
+ data['filts'][index]['columnName'] = val.id;
+ data['filts'][index]['data_type'] = val.type;
+ data['filts'][index]['tableType'] = val.table_type;
+ X.laytpldata("#screen-con-box-dot",data['filts'],".screen-con-box");
});
});
@@ -100,12 +110,12 @@
X.parametersopen(filter_map[type],'dropdownlist',[offset.top+obj.height(),offset.left],function(val){
obj.html(val.title);
- data[index]['comparator_name'] = val.title;
- data[index]['comparator'] = val.id;
+ data['filts'][index]['comparator_name'] = val.title;
+ data['filts'][index]['comparator'] = val.id;
if(val.id == "range"){
- data[index]['ftv'] = [-1,1];
+ data['filts'][index]['ftv'] = [-1,1];
}
- X.laytpldata("#screen-con-box-dot",data,".screen-con-box");
+ X.laytpldata("#screen-con-box-dot",data['filts'],".screen-con-box");
})
});
@@ -114,18 +124,22 @@
var index = $(this).attr('data-index');
var val = $(this).val();
var valarr = val.split(",");
- data[index]['ftv']=valarr;
- data[index]['strftv']=val;
+ data['filts'][index]['ftv']=valarr;
+ data['filts'][index]['strftv']=val;
});
//删除按钮
$(document).off('click','.screen-con-bg .screen-del').on('click','.screen-con-bg .screen-del',function(){
var index = $(this).attr('data-index');
- if(data.length > 1){
- data.splice(index, 1);
- X.laytpldata("#screen-con-box-dot",data,".screen-con-box");
+ if(data['filts'].length > 1){
+ data['filts'].splice(index, 1);
+ X.laytpldata("#screen-con-box-dot",data['filts'],".screen-con-box");
+ if(data['filts'].length < 2){
+ $(".screen-left-qei").hide();
+ }
}else {
layer.closeAll();
+ $(".screen-left-qei").hide();
}
});
diff --git a/web/srczip/logic/sqlquery.js b/web/srczip/logic/sqlquery.js
index 49f4819..d33eb6c 100644
--- a/web/srczip/logic/sqlquery.js
+++ b/web/srczip/logic/sqlquery.js
@@ -10,8 +10,17 @@
console.log(JSON.stringify(d));
$('.table-sql-box-con').html(JSON.stringify(d));
})
+
- })
+ });
+
+ $(document).off('click','.sqlquery-daochu').on('click','.sqlquery-daochu',function(){
+ var txt = $('.sql-textarea').val();
+
+ X.download('ck/sql_export',{"sql": txt},'sql');
+
+
+ });
// function EncodeURIFilter(str) {
// if(str != null && str != "") {
diff --git a/web/static/css/analysis.css b/web/static/css/analysis.css
index 2f35d5f..be6534b 100644
--- a/web/static/css/analysis.css
+++ b/web/static/css/analysis.css
@@ -289,6 +289,7 @@
.sql-textarea { height: 80px; padding: 16px; margin: 16px; width: calc(100% - 64px); border: 0px; background-color: #e6e6e6; resize:none; font-size: 14px; line-height: 24px; color: #42546d; }
.sqlquery-but-box { display: flex; justify-content: flex-end; align-items: center; padding: 0 16px 16px 16px; }
.sqlquery-but { cursor: pointer; padding: 0 16px; margin-left: 8px; height: 32px; color: #fff; font-weight: 400; font-size: 14px; line-height: 30px; text-shadow: none; background-color: #3d90ff; border-radius: 2px; text-align: center; }
+.sqlquery-daochu { cursor: pointer; padding: 0 16px; margin-left: 8px; height: 32px; color: #42546d; font-weight: 400; font-size: 14px; line-height: 30px; text-shadow: none; background-color: #fff; border-radius: 2px; text-align: center; border: 1px solid #42546d; }
.sqlquery-table-box { background-color: #fff; width: calc(100% - 40px); height: calc(100% - 385px); margin: 0 auto 20px auto; border-radius: 2px; overflow: auto; }
.table-sql-box { padding: 16px; overflow: auto; }
.slq-left { text-align: left; }
diff --git a/web/static/css/style.css b/web/static/css/style.css
index bddf6d6..678a053 100644
--- a/web/static/css/style.css
+++ b/web/static/css/style.css
@@ -138,6 +138,7 @@
.row-tit { display: flex; align-items: center; max-width: calc(100% - 100px)}
.row-tit p { font-size: 16px; font-weight: 500; color: #202d3f; white-space: nowrap; }
.row-tit p a { color: #202d3f; }
+.row-tit p a img { width: 12px; height: 12px; margin-left: 3px; margin-top: -3px; }
.row-tit p a:hover { color: #4fa1ff; }
.tishi { width: 24px; height: 24px; line-height: 24px; text-align: center; margin-left: 6px; transition: all .3s; cursor: pointer; border-radius: 2px; }
.tishi:hover { background-color: #f0f2f5; }
@@ -145,6 +146,7 @@
.condition-box { padding: 0 24px; display: flex; justify-content: space-between; align-items: center;}
.time-cond { display: flex; align-items: center; font-size: 12px; line-height: 24px; color: #67729d;}
.time-cond span { min-width: 20px; height: 24px; line-height: 24px; margin-right: 8px; cursor: pointer }
+.time-cond span img { margin-top: -2px; }
.time-cond div { width: 1px; height: 8px; background-color: #f0f0f0; margin-right: 8px; }
.chart { cursor: pointer; padding: 3px 5px;}
.chart span { font-size: 12px; color: #67729d; margin-left: 4px; }
@@ -530,7 +532,8 @@ label:not(.form-check-label):not(.custom-file-label) { font-weight: 400; }
.screen-top-box { display: flex; padding-top: 14px;}
.screen-left-box { width: 56px; min-height: 44px; margin-left: 16px; }
.xian { margin: 0 auto; width: 1px; height: 100%; background-color: #94c8ff; }
-.screen-left-qei { cursor: pointer; display: none; border-radius: 24px; background-color: #fff; position: absolute; margin: auto; left: 32px; top: 0; bottom: 30px; font-size: 12px; width: 24px; height: 24px; line-height: 24px; border: 1px solid #f0f0f0; color: #42546d; text-align: center; }
+.screen-left-qei { cursor: pointer; display: none; border-radius: 24px; background-color: #fff; position: absolute; margin: auto; left: 32px; top: 0; bottom: 30px; font-size: 12px; width: 24px; height: 24px; line-height: 24px; border: 1px solid #f0f0f0; color: #3d90ff; text-align: center; }
+.screen-left-qei:hover { background-color: #3d90ff; color: #fff; }
.screen-right-box { width: 140px; height: 47px; display: flex; align-items: center; justify-content: space-between; }
.screen-right-box div { cursor: pointer; }
.screen-right-box .qingkong { margin-left: 8px; color: #3d90ff; padding: 0 4px; height: 28px; line-height: 28px; color:#3d90ff; font-weight: 400; font-size: 13px; text-align: center; border-radius: 2px; background-color: #e4f2ff; }
diff --git a/web/static/img/xiajiantou.png b/web/static/img/xiajiantou.png
new file mode 100644
index 0000000000000000000000000000000000000000..8d0adbede7c7183c719c919cc16297e8b599560c
GIT binary patch
literal 219
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|rh2+KhFJI~
zrz{XK2wE{eafj4|K!e+i(KpV_m{7$KE0Zm;MEvaD(+3VLXj%3{j#+u}`!n~JWS@9s
z!81er+<_1EtX+&fJqwMiCtnkI$~0lomqk1G^6>Du3h?&KHU2$GYeOY>y2-O=eo6n2
zp4$7|o|*agntdt8F)vy3tvvMSEkF9_@9)K#mpAR7kjh}VvSi0Hm!v;@!ORS@x=Moc
TLyo8c9mwG6>gTe~DWM4fdyZC{
literal 0
HcmV?d00001
添加条件
+ 
{{# } }}
- {{d.timeParticleSize}}
+ {{d.timeParticleSize}} 
