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

1

Browse Source
This commit is contained in:
罗松柏 2021-09-15 16:54:53 +08:00
parent 3befdd1ebe
commit 663ed1d80b
15 changed files with 241 additions and 171 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
web/pages/analysis.html
View File

@ -285,7 +285,7 @@
</div> </div>
</div> </div>
<div class="analysis-zhibiao-updata-list-box"> <div class="analysis-zhibiao-updata-list-box">
<span class="analysis-zhibiao-updata"> <img src="./static/img/shaix.png" /> 添加条件 </span> <span class="analysis-zhibiao-updata" data-index={{index}}> <img src="./static/img/shaix.png" /> 添加条件 </span>
</div> </div>
</div> </div>
{{# } }} {{# } }}
@ -338,9 +338,9 @@
{{# }); }} {{# }); }}
</div> </div>
</div> </div>
<div class="analysis-zhibiao-updata-list-box"> <!-- <div class="analysis-zhibiao-updata-list-box">
<span class="analysis-zhibiao-updata"> <img src="./static/img/shaix.png" /> 添加条件 </span> <span class="analysis-zhibiao-updata" data-index={{index}}> <img src="./static/img/shaix.png" /> 添加条件 </span>
</div> </div> -->
</div> </div>
{{# } }} {{# } }}

6
web/pages/dashboard.html
View File

@ -609,7 +609,7 @@
<div class="layui-card modify-layui-card-small"> <div class="layui-card modify-layui-card-small">
<div class="row-top controlhover"> <div class="row-top controlhover">
<div class="row-tit"> <div class="row-tit">
<p><a href="javascript:;" class="gobaobiaoinfo" data-id="{{d.report_id}}" data-cat="{{d.cat}}">{{d.name}}</a></p> <p><a href="javascript:;" class="gobaobiaoinfo" data-id="{{d.report_id}}" data-cat="{{d.cat}}">{{d.name}} <img src="./static/img/chongmingming.png"> </a></p>
</div> </div>
<div class="control"> <div class="control">
<div class="action-box" > <div class="action-box" >
@ -650,7 +650,7 @@
<div class="layui-card modify-layui-card"> <div class="layui-card modify-layui-card">
<div class="row-top controlhover"> <div class="row-top controlhover">
<div class="row-tit"> <div class="row-tit">
<p><a href="javascript:;" class="gobaobiaoinfo" data-id="{{d.report_id}}" data-cat="{{d.cat}}">{{d.name}}</a></p> <p><a href="javascript:;" class="gobaobiaoinfo" data-id="{{d.report_id}}" data-cat="{{d.cat}}">{{d.name}} <img src="./static/img/chongmingming.png"> </a></p>
</div> </div>
<div class="control"> <div class="control">
<div class="action-box" > <div class="action-box" >
@ -687,7 +687,7 @@
<div class="layui-card modify-layui-card"> <div class="layui-card modify-layui-card">
<div class="row-top controlhover"> <div class="row-top controlhover">
<div class="row-tit"> <div class="row-tit">
<p><a href="javascript:;" class="gobaobiaoinfo" data-id="{{d.report_id}}" data-cat="{{d.cat}}">{{d.name}}</a></p> <p><a href="javascript:;" class="gobaobiaoinfo" data-id="{{d.report_id}}" data-cat="{{d.cat}}">{{d.name}} <img src="./static/img/chongmingming.png"> </a></p>
</div> </div>
<div class="control"> <div class="control">
<div class="action-box" > <div class="action-box" >

16
web/pages/modeltype.html
View File

@ -13,16 +13,16 @@
<div class="time-cond"> <div class="time-cond">
{{# if(d.cat != "user_property"){ }} {{# if(d.cat != "user_property"){ }}
{{# if(d.date != ""){ }} {{# if(d.date != ""){ }}
<span class="model-times" id="times{{d.id}}" data-id="{{d.id}}" data-cat="{{d.cat}}" data-modelsize="{{d.modelsize}}" data-modeltype="{{d.modeltype}}" data-name="{{d.name}}">{{d.date}}</span> <span class="model-times" id="times{{d.id}}" data-id="{{d.id}}" data-cat="{{d.cat}}" data-modelsize="{{d.modelsize}}" data-modeltype="{{d.modeltype}}" data-name="{{d.name}}">{{d.date}} <img src="./static/img/xiajiantou.png"> </span>
{{# } }} {{# } }}
<div class="xian"></div> <div class="xian"></div>
<span class="model-screenlist" id="screenlist{{d.id}}" data-modelsize="{{d.modelsize}}" data-modeltype="{{d.modeltype}}" data-name="{{d.name}}" data-cat="{{d.cat}}" data-id="{{d.id}}">{{d.timeParticleSize}}</span> <span class="model-screenlist" id="screenlist{{d.id}}" data-modelsize="{{d.modelsize}}" data-modeltype="{{d.modeltype}}" data-name="{{d.name}}" data-cat="{{d.cat}}" data-id="{{d.id}}">{{d.timeParticleSize}} <img src="./static/img/xiajiantou.png"> </span>
{{# if(d.cat === "retention"){ }} {{# if(d.cat === "retention"){ }}
<div class="xian"></div> <div class="xian"></div>
{{# if(d.retentiontype === 0){ }} {{# if(d.retentiontype === 0){ }}
<span class="kanben-retained-type" data-id="{{d.id}}" id="retention{{d.id}}" data-modelsize="{{d.modelsize}}" data-modeltype="{{d.modeltype}}" data-name="{{d.name}}" data-cat="{{d.cat}}">留存</span> <span class="kanben-retained-type" data-id="{{d.id}}" id="retention{{d.id}}" data-modelsize="{{d.modelsize}}" data-modeltype="{{d.modeltype}}" data-name="{{d.name}}" data-cat="{{d.cat}}">留存 <img src="./static/img/xiajiantou.png"> </span>
{{# } else { }} {{# } else { }}
<span class="kanben-retained-type" data-id="{{d.id}}" id="retention{{d.id}}" data-modelsize="{{d.modelsize}}" data-modeltype="{{d.modeltype}}" data-name="{{d.name}}" data-cat="{{d.cat}}">流失</span> <span class="kanben-retained-type" data-id="{{d.id}}" id="retention{{d.id}}" data-modelsize="{{d.modelsize}}" data-modeltype="{{d.modeltype}}" data-name="{{d.name}}" data-cat="{{d.cat}}">流失 <img src="./static/img/xiajiantou.png"> </span>
{{# } }} {{# } }}
{{# } }} {{# } }}
{{# } }} {{# } }}
@ -40,17 +40,17 @@
<div class="condition-box controlhover"> <div class="condition-box controlhover">
<div class="time-cond"> <div class="time-cond">
{{# if(d.cat != "user_property"){ }} {{# if(d.cat != "user_property"){ }}
<span class="model-times" id="times{{d.id}}" data-id="{{d.id}}" data-cat="{{d.cat}}" data-modelsize="{{d.modelsize}}" data-modeltype="{{d.modeltype}}" data-name="{{d.name}}" >{{d.date}}</span> <span class="model-times" id="times{{d.id}}" data-id="{{d.id}}" data-cat="{{d.cat}}" data-modelsize="{{d.modelsize}}" data-modeltype="{{d.modeltype}}" data-name="{{d.name}}" >{{d.date}} <img src="./static/img/xiajiantou.png"> </span>
<div class="xian"></div> <div class="xian"></div>
{{# if(d.date != ""){ }} {{# if(d.date != ""){ }}
<span class="model-screenlist" id="screenlist{{d.id}}" data-modelsize="{{d.modelsize}}" data-modeltype="{{d.modeltype}}" data-name="{{d.name}}" data-cat="{{d.cat}}" data-id="{{d.id}}" >{{d.timeParticleSize}}</span> <span class="model-screenlist" id="screenlist{{d.id}}" data-modelsize="{{d.modelsize}}" data-modeltype="{{d.modeltype}}" data-name="{{d.name}}" data-cat="{{d.cat}}" data-id="{{d.id}}" >{{d.timeParticleSize}} <img src="./static/img/xiajiantou.png"> </span>
{{# } }} {{# } }}
{{# if(d.cat === "retention"){ }} {{# if(d.cat === "retention"){ }}
<div class="xian"></div> <div class="xian"></div>
{{# if(d.retentiontype === 0){ }} {{# if(d.retentiontype === 0){ }}
<span class="kanben-retained-type" data-id="{{d.id}}" id="retention{{d.id}}" data-modelsize="{{d.modelsize}}" data-modeltype="{{d.modeltype}}" data-name="{{d.name}}" data-cat="{{d.cat}}">留存</span> <span class="kanben-retained-type" data-id="{{d.id}}" id="retention{{d.id}}" data-modelsize="{{d.modelsize}}" data-modeltype="{{d.modeltype}}" data-name="{{d.name}}" data-cat="{{d.cat}}">留存 <img src="./static/img/xiajiantou.png"> </span>
{{# } else { }} {{# } else { }}
<span class="kanben-retained-type" data-id="{{d.id}}" id="retention{{d.id}}" data-modelsize="{{d.modelsize}}" data-modeltype="{{d.modeltype}}" data-name="{{d.name}}" data-cat="{{d.cat}}">流失</span> <span class="kanben-retained-type" data-id="{{d.id}}" id="retention{{d.id}}" data-modelsize="{{d.modelsize}}" data-modeltype="{{d.modeltype}}" data-name="{{d.name}}" data-cat="{{d.cat}}">流失 <img src="./static/img/xiajiantou.png"> </span>
{{# } }} {{# } }}
{{# } }} {{# } }}
{{# } }} {{# } }}

2
web/pages/sqlquery.html
View File

@ -19,7 +19,7 @@
<div class="sqlquery-xqltxt-box"> <div class="sqlquery-xqltxt-box">
<textarea class="sql-textarea"></textarea> <textarea class="sql-textarea"></textarea>
<div class="sqlquery-but-box"> <div class="sqlquery-but-box">
<div class="sqlquery-but">计 算</div> <div class="sqlquery-daochu">导出</div> <div class="sqlquery-but">计 算</div>
</div> </div>
</div> </div>

4
web/pages/userpar.html
View File

@ -12,7 +12,7 @@
<span style="margin-left: 6px;">的</span> <span style="margin-left: 6px;">的</span>
<div id="analysis-zhibiao-list-type2-0" class="analysis-zhibiao-list-type2 analysis-background" data-index="0">{{d.quotaname}}</div> <div id="analysis-zhibiao-list-type2-0" class="analysis-zhibiao-list-type2 analysis-background" data-index="0">{{d.quotaname}}</div>
{{# if(d.quota != "*"){ }} {{# if(d.quota != "*"){ }}
<div id="analysis-zhibiao-list-type3-0" class="analysis-zhibiao-list-type3 analysis-background analysis-zhibiao-condition" data-index="0">{{d.analysisDesc}}</div> <div id="analysis-zhibiao-list-type3-0" class="analysis-zhibiao-list-type3 analysis-background analysis-zhibiao-condition" data-index="0" data-type="{{d.data_type}}">{{d.analysisDesc}}</div>
{{# } }} {{# } }}
<div class="analysis-ta-property-range analysis-granularity userevent-granularity" data-index="0" data-type="{{d.data_type}}"> <img src="./static/img/shezhi2.png"> </div> <div class="analysis-ta-property-range analysis-granularity userevent-granularity" data-index="0" data-type="{{d.data_type}}"> <img src="./static/img/shezhi2.png"> </div>
</div> </div>
@ -34,7 +34,7 @@
{{# layui.each(d.filts, function(indexs, items){ }} {{# layui.each(d.filts, function(indexs, items){ }}
<div class="analysis-zhibiao-list analysis-zhibiao-list-mar" id="analysis-zhibiao-list-mar-{{indexs}}"> <div class="analysis-zhibiao-list analysis-zhibiao-list-mar" id="analysis-zhibiao-list-mar-{{indexs}}">
<div id="ta-property-select-{{indexs}}" class="ta-property-select analysis-zhibiao-list-type1 analysis-background" data-index="0" data-indexs="{{indexs}}"> {{items.columnDesc}}</div> <div id="ta-property-select-{{indexs}}" class="ta-property-select analysis-zhibiao-list-type1 analysis-background" data-index="0" data-indexs="{{indexs}}"> {{items.columnDesc}}</div>
<div class="analysis-zhibiao-list-type3 analysis-background analysis-choicetypename" data-index="0" data-indexs="{{indexs}}">{{items.comparator_name}}</div> <div class="analysis-zhibiao-list-type3 analysis-background analysis-choicetypename" data-index="0" data-indexs="{{indexs}}" data-type="{{items.data_type}}">{{items.comparator_name}}</div>
{{# if(items.comparator != "is null" && items.comparator != "is not null" && items.comparator !="not null" && items.comparator != "range"){ }} {{# if(items.comparator != "is null" && items.comparator != "is not null" && items.comparator !="not null" && items.comparator != "range"){ }}
<div class="analysis-zhibiao-list-type4" id="analysis-zhibiao-list-type4-{{indexs}}"> <input type="text" data-index="0" data-indexs="{{indexs}}" placeholder="多个条件用,隔开" value="{{items.strftv}}"> </div> <div class="analysis-zhibiao-list-type4" id="analysis-zhibiao-list-type4-{{indexs}}"> <input type="text" data-index="0" data-indexs="{{indexs}}" placeholder="多个条件用,隔开" value="{{items.strftv}}"> </div>
{{# } }} {{# } }}

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

@ -1137,7 +1137,7 @@ var X = window.X || {
})(); })();
// srczip/base/ajaxpage.js // srczip/base/ajaxpage.js
(function(){ //(function(){
function getHashParms(){ function getHashParms(){
//获取hash数据，处理为字典，方便拼接多个hash值 //获取hash数据，处理为字典，方便拼接多个hash值
var hash = location.hash.replace('#',''); 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 // srczip/base/visibleChange.js
(function(){ (function(){
X.pageLogic['visibleChange'] = { X.pageLogic['visibleChange'] = {
@ -2035,7 +2042,7 @@ var X = window.X || {
"chartSort":"num-desc" "chartSort":"num-desc"
}, },
"filts":[],//全局筛选 "filts":[],//全局筛选
"relation":1, "relation":'and',
"zone_time":'8'//时区 "zone_time":'8'//时区
} }
} }
@ -2380,10 +2387,10 @@ var X = window.X || {
var index = $(this).attr("data-index"); var index = $(this).attr("data-index");
if(html == "且"){ if(html == "且"){
$(this).html('或'); $(this).html('或');
data['events'][index]['condrelation'] = 'or' data['events'][index]['relation'] = 'or'
}else { }else {
$(this).html('且'); $(this).html('且');
data['events'][index]['condrelation'] = 'and' data['events'][index]['relation'] = 'and'
} }
}); });
@ -2605,7 +2612,8 @@ var X = window.X || {
// 全局筛选 // 全局筛选
var filtsftvdata=[]; 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={ var drr={
"columnDesc":defaultgroupdata[0]['category'][0]['title'],//事件中文显示 columnDesc "columnDesc":defaultgroupdata[0]['category'][0]['title'],//事件中文显示 columnDesc
"columnName":defaultgroupdata[0]['category'][0]['id'],//事件id "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"); var index = $(this).attr("data-index");
data['eventView']['filts'].splice(index,1); data['eventView']['filts'].splice(index,1);
filtsftvdata.splice(index,1); filtsftvdata.splice(index,1);
@ -2677,6 +2685,18 @@ var X = window.X || {
// analysisdown(); // 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(){ $(document).off('click','.analysis-overall-situation-attr').on('click',".analysis-overall-situation-attr",function(){
var obj = $(this); var obj = $(this);
@ -4001,9 +4021,10 @@ var X = window.X || {
// 修改面板名 // 修改面板名
$(document).off('click','.layui-left-dd').on('click','.layui-left-dd',function(){ $(document).off('click','.layui-left-dd').on('click','.layui-left-dd',function(){
$(".tab-tit-box .tab-tit").html($(this).find("span").html()); $(".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 X.DATA['dashboard_id'] = $(this).attr('data-id'); //看板id
$("#model-box").html(""); $("#model-box").html("");
// 获取报表数据 // // 获取报表数据
me.gettabledata(); me.gettabledata();
}); });
@ -5170,15 +5191,7 @@ var X = window.X || {
}, },
"events":[ "events":[
], ]
"cachedata":{
eventdata : [],
type2data : [],
type3data : [],
groupitemeventsdata: [],
filtersymbols:[],//筛选符号
screentypearr:[], //筛选项数据
}
}; };
// sql语句显示 // sql语句显示
@ -5209,10 +5222,6 @@ var X = window.X || {
// console.log(d); // console.log(d);
if(d){ if(d){
data = d.query; 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("userpar","userpar-event",data['events']);
X.template("grouped","shushi",data['eventView']['groupBy']); X.template("grouped","shushi",data['eventView']['groupBy']);
@ -5227,13 +5236,11 @@ var X = window.X || {
var eventdata = []; var eventdata = [];
var type2data = []; var type2data = [];
var type3data = [];
var groupitemeventsdata = []; var groupitemeventsdata = [];
var filtersymbols=[];//筛选符号
var screentypearr=[]; //筛选项数据 var screentypearr=[]; //筛选项数据
var drr = []; var drr = [];
screentypearr.push(drr); //每一个筛选事件按添加次数依次写入 screentypearr.push(drr); //每一个筛选事件按添加次数依次写入
var quotas_map,filter_map
X.api("data_auth/my_event","get",{},function(d){ X.api("data_auth/my_event","get",{},function(d){
eventdata = d; eventdata = d;
var arr = [ var arr = [
@ -5260,8 +5267,16 @@ var X = window.X || {
screentypearr[0] = d.props; screentypearr[0] = d.props;
}) })
X.api("data_auth/load_filter_props","post",{event_name:d[0]['category'][0]['event_name']},function(val){ 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); obj.html(val.id);
dataevent['eventName'] = val.name; dataevent['eventName'] = val.name;
dataevent['eventDesc'] = val.id; dataevent['eventDesc'] = val.id;
X.api("data_auth/load_filter_props","post",{event_name:val.name},function(val){ // X.api("data_auth/load_filter_props","post",{event_name:val.name},function(val){
groupitemeventsdata[index] = val; // groupitemeventsdata= val;
}) // })
}) })
}); });
@ -5290,11 +5305,12 @@ var X = window.X || {
if(type2data.length >0){ if(type2data.length >0){
X.querycriteriapop(type2data[0],'dropdownlist',offset.left,offset.top+obj.height(),function(val){ X.querycriteriapop(type2data[0],'dropdownlist',offset.left,offset.top+obj.height(),function(val){
if(val != undefined){ if(val != undefined){
console.log(val);
$("#analysis-zhibiao-list-type2-"+index).html(val.title); $("#analysis-zhibiao-list-type2-"+index).html(val.title);
type3data[index]=val.category;
data['events'][index]['quotaname'] = val.title; data['events'][index]['quotaname'] = val.title;
data['events'][index]['quota'] = val.id; data['events'][index]['quota'] = val.id;
data['events'][index]['data_type'] = val.data_type;
if(val.category && val.category.length > 0){ if(val.category && val.category.length > 0){
$("#analysis-zhibiao-list-type3-"+index).show(); $("#analysis-zhibiao-list-type3-"+index).show();
$("#analysis-zhibiao-list-type3-"+index).html(val.category[0].title); $("#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(){ $(document).off('click','.analysis-zhibiao-condition').on('click','.analysis-zhibiao-condition',function(){
var obj = $(this); var obj = $(this);
var offset = obj.offset(); var offset = obj.offset();
var index = obj.attr("data-index"); var index = obj.attr('data-index');
if(type3data.length>0){ var type = obj.attr("data-type");
if(type3data[index].length > 0){ X.querycriteriapop(quotas_map[type],'dropdownlist',offset.left,offset.top+obj.height(),function(val){
X.querycriteriapop(type3data[index],'dropdownlist',offset.left,offset.top+obj.height(),function(val){ $("#analysis-zhibiao-list-type3-"+index).html(val.title);
$("#analysis-zhibiao-list-type3-"+index).html(val.title); data['events'][index]['analysisDesc'] = val.title;
data['events'][index]['analysisDesc'] = val.title; data['events'][index]['analysis'] = val.id;
data['events'][index]['analysis'] = val.id; })
})
}
}
}); });
$(document).off('click','.userevent-granularity').on('click','.userevent-granularity',function(){ $(document).off('click','.userevent-granularity').on('click','.userevent-granularity',function(){
@ -5365,22 +5378,22 @@ var X = window.X || {
// 添加筛选项 // 添加筛选项
function addscreen(index){ 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 = { var arr = {
"columnDesc":d[0]['category'][0]['title'],//事件中文显示 "columnDesc":groupitemeventsdata[0]['category'][0]['title'],//事件中文显示
"columnName":d[0]['category'][0]['id'],//事件id "columnName":groupitemeventsdata[0]['category'][0]['id'],//事件id
"comparator_name":d[0]['category'][0]['category'][0]['title'],//选择符号中文显示 "comparator_name":filter_map[groupitemeventsdata[0]['category'][0]['data_type']][0]['title'],//选择符号中文显示
"comparator":d[0]['category'][0]['category'][0]['id'],//符号id "comparator":filter_map[groupitemeventsdata[0]['category'][0]['data_type']][0]['id'],//符号id
"data_type":d[0]['category'][0]['data_type'], "data_type":groupitemeventsdata[0]['category'][0]['data_type'],
"ftv":[],//条件 "ftv":[],//条件
"strftv":'',//字符串显示条件 "strftv":'',//字符串显示条件
"tableType": d[0]['id'] "tableType": groupitemeventsdata[0]['id']
} //筛选数据 } //筛选数据
data['events'][index]['filts'].push(arr); data['events'][index]['filts'].push(arr);
X.template("userpar","userpar-event",data['events']); //更新事件 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(){ $(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 offset = obj.offset();
var index = obj.attr("data-index"); var index = obj.attr("data-index");
var indexs = obj.attr("data-indexs"); 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); // console.log(val);
var htmlstring = val.title; var htmlstring = val.title;
obj.html(htmlstring); obj.html(htmlstring);
filtersymbols[indexs] = val.category;
data['events'][index]['filts'][indexs]['columnDesc'] = htmlstring; data['events'][index]['filts'][indexs]['columnDesc'] = htmlstring;
data['events'][index]['filts'][indexs]['columnName'] = val.id; data['events'][index]['filts'][indexs]['columnName'] = val.id;
data['events'][index]['filts'][indexs]['data_type'] = val.type; data['events'][index]['filts'][indexs]['data_type'] = val.type;
data['events'][index]['filts'][indexs]['tableType'] = val.table_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 offset = obj.offset();
var index = $(this).attr("data-index"); var index = $(this).attr("data-index");
var indexs = $(this).attr("data-indexs"); 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){ if(val != undefined){
obj.html(val.title); obj.html(val.title);
data['events'][index]['filts'][indexs]['comparator_name'] = val.title; data['events'][index]['filts'][indexs]['comparator_name'] = val.title;
@ -5460,7 +5475,7 @@ var X = window.X || {
var obj = $(this); var obj = $(this);
var offset = obj.offset(); var offset = obj.offset();
var index = obj.attr("data-index"); 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; var htmlstring = val.title;
obj.html(htmlstring); obj.html(htmlstring);
data.eventView.groupBy[index]['columnDesc'] = val.title; data.eventView.groupBy[index]['columnDesc'] = val.title;
@ -5487,11 +5502,6 @@ var X = window.X || {
var querydata; var querydata;
function distributiondata(){ function distributiondata(){
// data['cachedata']['type2data'] = type2data;
// data['cachedata']['type3data'] = type3data;
// data['cachedata']['groupitemeventsdata'] = groupitemeventsdata;
// data['cachedata']['filtersymbols'] = filtersymbols;
// data['cachedata']['screentypearr'] = screentypearr;
var dataArr = { var dataArr = {
eventView: data.eventView, eventView: data.eventView,
events: data.events 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(){ $(document).off('click','.screen-left-box .screen-left-qei').on('click','.screen-left-box .screen-left-qei',function(){
if($(this).html() == "且"){ if($(this).html() == "且"){
$(this).html("或"); $(this).html("或");
data['relation'] = 'or';
}else { }else {
$(this).html("且"); $(this).html("且");
data['relation'] = 'and';
} }
}); });
//默认开始时有一个数据 //默认开始时有一个数据
var data = []; var data = {
'filts':[],
'relation':'and'
};
function updatascreencon(){ function updatascreencon(){
var drr={ var drr={
@ -10200,8 +10215,13 @@ var X = window.X || {
"section":[-1,1],//区间 "section":[-1,1],//区间
"tableType":load_filter_props[0]['id'] "tableType":load_filter_props[0]['id']
}; };
data.push(drr); data['filts'].push(drr);
X.laytpldata("#screen-con-box-dot",data,".screen-con-box"); 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){ X.querycriteriapop(load_filter_props,'category',offset.left,offset.top+obj.height(),function(val){
obj.html(val.title); obj.html(val.title);
data[index]['columnDesc'] = val.title; data['filts'][index]['columnDesc'] = val.title;
data[index]['columnName'] = val.id; data['filts'][index]['columnName'] = val.id;
data[index]['data_type'] = val.type; data['filts'][index]['data_type'] = val.type;
data[index]['tableType'] = val.table_type; data['filts'][index]['tableType'] = val.table_type;
X.laytpldata("#screen-con-box-dot",data,".screen-con-box"); 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){ X.parametersopen(filter_map[type],'dropdownlist',[offset.top+obj.height(),offset.left],function(val){
obj.html(val.title); obj.html(val.title);
data[index]['comparator_name'] = val.title; data['filts'][index]['comparator_name'] = val.title;
data[index]['comparator'] = val.id; data['filts'][index]['comparator'] = val.id;
if(val.id == "range"){ 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 index = $(this).attr('data-index');
var val = $(this).val(); var val = $(this).val();
var valarr = val.split(","); var valarr = val.split(",");
data[index]['ftv']=valarr; data['filts'][index]['ftv']=valarr;
data[index]['strftv']=val; data['filts'][index]['strftv']=val;
}); });
//删除按钮 //删除按钮
$(document).off('click','.screen-con-bg .screen-del').on('click','.screen-con-bg .screen-del',function(){ $(document).off('click','.screen-con-bg .screen-del').on('click','.screen-con-bg .screen-del',function(){
var index = $(this).attr('data-index'); var index = $(this).attr('data-index');
if(data.length > 1){ if(data['filts'].length > 1){
data.splice(index, 1); data['filts'].splice(index, 1);
X.laytpldata("#screen-con-box-dot",data,".screen-con-box"); X.laytpldata("#screen-con-box-dot",data['filts'],".screen-con-box");
if(data['filts'].length < 2){
$(".screen-left-qei").hide();
}
}else { }else {
layer.closeAll(); layer.closeAll();
$(".screen-left-qei").hide();
} }
}); });
@ -10572,7 +10596,16 @@ var X = window.X || {
$('.table-sql-box-con').html(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) { // function EncodeURIFilter(str) {
// if(str != null && str != "") { // if(str != null && str != "") {

11
web/srczip/base/ajaxpage.js
View File

@ -1,4 +1,4 @@
(function(){ //(function(){
function getHashParms(){ function getHashParms(){
//获取hash数据，处理为字典，方便拼接多个hash值 //获取hash数据，处理为字典，方便拼接多个hash值
var hash = location.hash.replace('#',''); var hash = location.hash.replace('#','');
@ -96,4 +96,11 @@
}); });
})(); window.onhashchange = function(){
console.log( getHashParms() );
// var urlinfo = getHashParms();
// X.DATA['dashboard_id'] = urlinfo.menu;
// X.pageLogic['dashboard'].gettabledata();
};
//})();

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

@ -28,7 +28,7 @@
"chartSort":"num-desc" "chartSort":"num-desc"
}, },
"filts":[],//全局筛选 "filts":[],//全局筛选
"relation":1, "relation":'and',
"zone_time":'8'//时区 "zone_time":'8'//时区
} }
} }
@ -373,10 +373,10 @@
var index = $(this).attr("data-index"); var index = $(this).attr("data-index");
if(html == "且"){ if(html == "且"){
$(this).html('或'); $(this).html('或');
data['events'][index]['condrelation'] = 'or' data['events'][index]['relation'] = 'or'
}else { }else {
$(this).html('且'); $(this).html('且');
data['events'][index]['condrelation'] = 'and' data['events'][index]['relation'] = 'and'
} }
}); });
@ -598,7 +598,8 @@
// 全局筛选 // 全局筛选
var filtsftvdata=[]; 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={ var drr={
"columnDesc":defaultgroupdata[0]['category'][0]['title'],//事件中文显示 columnDesc "columnDesc":defaultgroupdata[0]['category'][0]['title'],//事件中文显示 columnDesc
"columnName":defaultgroupdata[0]['category'][0]['id'],//事件id "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"); var index = $(this).attr("data-index");
data['eventView']['filts'].splice(index,1); data['eventView']['filts'].splice(index,1);
filtsftvdata.splice(index,1); filtsftvdata.splice(index,1);
@ -670,6 +671,18 @@
// analysisdown(); // 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(){ $(document).off('click','.analysis-overall-situation-attr').on('click',".analysis-overall-situation-attr",function(){
var obj = $(this); var obj = $(this);

3
web/srczip/logic/dashboard.js
View File

@ -63,9 +63,10 @@
// 修改面板名 // 修改面板名
$(document).off('click','.layui-left-dd').on('click','.layui-left-dd',function(){ $(document).off('click','.layui-left-dd').on('click','.layui-left-dd',function(){
$(".tab-tit-box .tab-tit").html($(this).find("span").html()); $(".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 X.DATA['dashboard_id'] = $(this).attr('data-id'); //看板id
$("#model-box").html(""); $("#model-box").html("");
// 获取报表数据 // // 获取报表数据
me.gettabledata(); me.gettabledata();
}); });

89
web/srczip/logic/distribution.js
View File

@ -12,15 +12,7 @@
}, },
"events":[ "events":[
], ]
"cachedata":{
eventdata : [],
type2data : [],
type3data : [],
groupitemeventsdata: [],
filtersymbols:[],//筛选符号
screentypearr:[], //筛选项数据
}
}; };
// sql语句显示 // sql语句显示
@ -51,10 +43,6 @@
// console.log(d); // console.log(d);
if(d){ if(d){
data = d.query; 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("userpar","userpar-event",data['events']);
X.template("grouped","shushi",data['eventView']['groupBy']); X.template("grouped","shushi",data['eventView']['groupBy']);
@ -69,13 +57,11 @@
var eventdata = []; var eventdata = [];
var type2data = []; var type2data = [];
var type3data = [];
var groupitemeventsdata = []; var groupitemeventsdata = [];
var filtersymbols=[];//筛选符号
var screentypearr=[]; //筛选项数据 var screentypearr=[]; //筛选项数据
var drr = []; var drr = [];
screentypearr.push(drr); //每一个筛选事件按添加次数依次写入 screentypearr.push(drr); //每一个筛选事件按添加次数依次写入
var quotas_map,filter_map
X.api("data_auth/my_event","get",{},function(d){ X.api("data_auth/my_event","get",{},function(d){
eventdata = d; eventdata = d;
var arr = [ var arr = [
@ -102,8 +88,16 @@
screentypearr[0] = d.props; screentypearr[0] = d.props;
}) })
X.api("data_auth/load_filter_props","post",{event_name:d[0]['category'][0]['event_name']},function(val){ 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); obj.html(val.id);
dataevent['eventName'] = val.name; dataevent['eventName'] = val.name;
dataevent['eventDesc'] = val.id; dataevent['eventDesc'] = val.id;
X.api("data_auth/load_filter_props","post",{event_name:val.name},function(val){ // X.api("data_auth/load_filter_props","post",{event_name:val.name},function(val){
groupitemeventsdata[index] = val; // groupitemeventsdata= val;
}) // })
}) })
}); });
@ -132,11 +126,12 @@
if(type2data.length >0){ if(type2data.length >0){
X.querycriteriapop(type2data[0],'dropdownlist',offset.left,offset.top+obj.height(),function(val){ X.querycriteriapop(type2data[0],'dropdownlist',offset.left,offset.top+obj.height(),function(val){
if(val != undefined){ if(val != undefined){
console.log(val);
$("#analysis-zhibiao-list-type2-"+index).html(val.title); $("#analysis-zhibiao-list-type2-"+index).html(val.title);
type3data[index]=val.category;
data['events'][index]['quotaname'] = val.title; data['events'][index]['quotaname'] = val.title;
data['events'][index]['quota'] = val.id; data['events'][index]['quota'] = val.id;
data['events'][index]['data_type'] = val.data_type;
if(val.category && val.category.length > 0){ if(val.category && val.category.length > 0){
$("#analysis-zhibiao-list-type3-"+index).show(); $("#analysis-zhibiao-list-type3-"+index).show();
$("#analysis-zhibiao-list-type3-"+index).html(val.category[0].title); $("#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(){ $(document).off('click','.analysis-zhibiao-condition').on('click','.analysis-zhibiao-condition',function(){
var obj = $(this); var obj = $(this);
var offset = obj.offset(); var offset = obj.offset();
var index = obj.attr("data-index"); var index = obj.attr('data-index');
if(type3data.length>0){ var type = obj.attr("data-type");
if(type3data[index].length > 0){ X.querycriteriapop(quotas_map[type],'dropdownlist',offset.left,offset.top+obj.height(),function(val){
X.querycriteriapop(type3data[index],'dropdownlist',offset.left,offset.top+obj.height(),function(val){ $("#analysis-zhibiao-list-type3-"+index).html(val.title);
$("#analysis-zhibiao-list-type3-"+index).html(val.title); data['events'][index]['analysisDesc'] = val.title;
data['events'][index]['analysisDesc'] = val.title; data['events'][index]['analysis'] = val.id;
data['events'][index]['analysis'] = val.id; })
})
}
}
}); });
$(document).off('click','.userevent-granularity').on('click','.userevent-granularity',function(){ $(document).off('click','.userevent-granularity').on('click','.userevent-granularity',function(){
@ -207,22 +199,22 @@
// 添加筛选项 // 添加筛选项
function addscreen(index){ 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 = { var arr = {
"columnDesc":d[0]['category'][0]['title'],//事件中文显示 "columnDesc":groupitemeventsdata[0]['category'][0]['title'],//事件中文显示
"columnName":d[0]['category'][0]['id'],//事件id "columnName":groupitemeventsdata[0]['category'][0]['id'],//事件id
"comparator_name":d[0]['category'][0]['category'][0]['title'],//选择符号中文显示 "comparator_name":filter_map[groupitemeventsdata[0]['category'][0]['data_type']][0]['title'],//选择符号中文显示
"comparator":d[0]['category'][0]['category'][0]['id'],//符号id "comparator":filter_map[groupitemeventsdata[0]['category'][0]['data_type']][0]['id'],//符号id
"data_type":d[0]['category'][0]['data_type'], "data_type":groupitemeventsdata[0]['category'][0]['data_type'],
"ftv":[],//条件 "ftv":[],//条件
"strftv":'',//字符串显示条件 "strftv":'',//字符串显示条件
"tableType": d[0]['id'] "tableType": groupitemeventsdata[0]['id']
} //筛选数据 } //筛选数据
data['events'][index]['filts'].push(arr); data['events'][index]['filts'].push(arr);
X.template("userpar","userpar-event",data['events']); //更新事件 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(){ $(document).off("click",".ta-property-select").on('click','.ta-property-select',function(){
@ -230,15 +222,16 @@
var offset = obj.offset(); var offset = obj.offset();
var index = obj.attr("data-index"); var index = obj.attr("data-index");
var indexs = obj.attr("data-indexs"); 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); // console.log(val);
var htmlstring = val.title; var htmlstring = val.title;
obj.html(htmlstring); obj.html(htmlstring);
filtersymbols[indexs] = val.category;
data['events'][index]['filts'][indexs]['columnDesc'] = htmlstring; data['events'][index]['filts'][indexs]['columnDesc'] = htmlstring;
data['events'][index]['filts'][indexs]['columnName'] = val.id; data['events'][index]['filts'][indexs]['columnName'] = val.id;
data['events'][index]['filts'][indexs]['data_type'] = val.type; data['events'][index]['filts'][indexs]['data_type'] = val.type;
data['events'][index]['filts'][indexs]['tableType'] = val.table_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 offset = obj.offset();
var index = $(this).attr("data-index"); var index = $(this).attr("data-index");
var indexs = $(this).attr("data-indexs"); 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){ if(val != undefined){
obj.html(val.title); obj.html(val.title);
data['events'][index]['filts'][indexs]['comparator_name'] = val.title; data['events'][index]['filts'][indexs]['comparator_name'] = val.title;
@ -302,7 +296,7 @@
var obj = $(this); var obj = $(this);
var offset = obj.offset(); var offset = obj.offset();
var index = obj.attr("data-index"); 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; var htmlstring = val.title;
obj.html(htmlstring); obj.html(htmlstring);
data.eventView.groupBy[index]['columnDesc'] = val.title; data.eventView.groupBy[index]['columnDesc'] = val.title;
@ -329,11 +323,6 @@
var querydata; var querydata;
function distributiondata(){ function distributiondata(){
// data['cachedata']['type2data'] = type2data;
// data['cachedata']['type3data'] = type3data;
// data['cachedata']['groupitemeventsdata'] = groupitemeventsdata;
// data['cachedata']['filtersymbols'] = filtersymbols;
// data['cachedata']['screentypearr'] = screentypearr;
var dataArr = { var dataArr = {
eventView: data.eventView, eventView: data.eventView,
events: data.events events: data.events

48
web/srczip/logic/screen.js
View File

@ -45,13 +45,18 @@
$(document).off('click','.screen-left-box .screen-left-qei').on('click','.screen-left-box .screen-left-qei',function(){ $(document).off('click','.screen-left-box .screen-left-qei').on('click','.screen-left-box .screen-left-qei',function(){
if($(this).html() == "且"){ if($(this).html() == "且"){
$(this).html("或"); $(this).html("或");
data['relation'] = 'or';
}else { }else {
$(this).html("且"); $(this).html("且");
data['relation'] = 'and';
} }
}); });
//默认开始时有一个数据 //默认开始时有一个数据
var data = []; var data = {
'filts':[],
'relation':'and'
};
function updatascreencon(){ function updatascreencon(){
var drr={ var drr={
@ -65,8 +70,13 @@
"section":[-1,1],//区间 "section":[-1,1],//区间
"tableType":load_filter_props[0]['id'] "tableType":load_filter_props[0]['id']
}; };
data.push(drr); data['filts'].push(drr);
X.laytpldata("#screen-con-box-dot",data,".screen-con-box"); 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){ X.querycriteriapop(load_filter_props,'category',offset.left,offset.top+obj.height(),function(val){
obj.html(val.title); obj.html(val.title);
data[index]['columnDesc'] = val.title; data['filts'][index]['columnDesc'] = val.title;
data[index]['columnName'] = val.id; data['filts'][index]['columnName'] = val.id;
data[index]['data_type'] = val.type; data['filts'][index]['data_type'] = val.type;
data[index]['tableType'] = val.table_type; data['filts'][index]['tableType'] = val.table_type;
X.laytpldata("#screen-con-box-dot",data,".screen-con-box"); 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){ X.parametersopen(filter_map[type],'dropdownlist',[offset.top+obj.height(),offset.left],function(val){
obj.html(val.title); obj.html(val.title);
data[index]['comparator_name'] = val.title; data['filts'][index]['comparator_name'] = val.title;
data[index]['comparator'] = val.id; data['filts'][index]['comparator'] = val.id;
if(val.id == "range"){ 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 index = $(this).attr('data-index');
var val = $(this).val(); var val = $(this).val();
var valarr = val.split(","); var valarr = val.split(",");
data[index]['ftv']=valarr; data['filts'][index]['ftv']=valarr;
data[index]['strftv']=val; data['filts'][index]['strftv']=val;
}); });
//删除按钮 //删除按钮
$(document).off('click','.screen-con-bg .screen-del').on('click','.screen-con-bg .screen-del',function(){ $(document).off('click','.screen-con-bg .screen-del').on('click','.screen-con-bg .screen-del',function(){
var index = $(this).attr('data-index'); var index = $(this).attr('data-index');
if(data.length > 1){ if(data['filts'].length > 1){
data.splice(index, 1); data['filts'].splice(index, 1);
X.laytpldata("#screen-con-box-dot",data,".screen-con-box"); X.laytpldata("#screen-con-box-dot",data['filts'],".screen-con-box");
if(data['filts'].length < 2){
$(".screen-left-qei").hide();
}
}else { }else {
layer.closeAll(); layer.closeAll();
$(".screen-left-qei").hide();
} }
}); });

11
web/srczip/logic/sqlquery.js
View File

@ -11,7 +11,16 @@
$('.table-sql-box-con').html(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) { // function EncodeURIFilter(str) {
// if(str != null && str != "") { // if(str != null && str != "") {

1
web/static/css/analysis.css
View File

@ -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; } .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-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-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; } .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; } .table-sql-box { padding: 16px; overflow: auto; }
.slq-left { text-align: left; } .slq-left { text-align: left; }

5
web/static/css/style.css
View File

@ -138,6 +138,7 @@
.row-tit { display: flex; align-items: center; max-width: calc(100% - 100px)} .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 { font-size: 16px; font-weight: 500; color: #202d3f; white-space: nowrap; }
.row-tit p a { color: #202d3f; } .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; } .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 { 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; } .tishi:hover { background-color: #f0f2f5; }
@ -145,6 +146,7 @@
.condition-box { padding: 0 24px; display: flex; justify-content: space-between; align-items: center;} .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 { 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 { 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; } .time-cond div { width: 1px; height: 8px; background-color: #f0f0f0; margin-right: 8px; }
.chart { cursor: pointer; padding: 3px 5px;} .chart { cursor: pointer; padding: 3px 5px;}
.chart span { font-size: 12px; color: #67729d; margin-left: 4px; } .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-top-box { display: flex; padding-top: 14px;}
.screen-left-box { width: 56px; min-height: 44px; margin-left: 16px; } .screen-left-box { width: 56px; min-height: 44px; margin-left: 16px; }
.xian { margin: 0 auto; width: 1px; height: 100%; background-color: #94c8ff; } .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 { width: 140px; height: 47px; display: flex; align-items: center; justify-content: space-between; }
.screen-right-box div { cursor: pointer; } .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; } .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; }

BIN
web/static/img/xiajiantou.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 219 B