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

111

Browse Source
This commit is contained in:
罗松柏 2021-08-23 11:54:52 +08:00
parent 42e09aed3e
commit eda44a2618
8 changed files with 227 additions and 209 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/pages/projectadmin.html
View File

@ -94,7 +94,7 @@
{{# if(item.is_authz === true){ }} {{# if(item.is_authz === true){ }}
<div class="projectadmin-del" data-index="{{index}}" data-path="{{item.path}}" data-id="{{item._id}}" >删除</div> <div class="projectadmin-del" data-index="{{index}}" data-path="{{item.path}}" data-id="{{item._id}}" >删除</div>
{{# } else { }} {{# } else { }}
<div class="projectadmin-edit" data-index="{{index}}" data-id="{{item._id}}" >编辑</div> <div class="projectadmin-edit" data-index="{{index}}" data-id="{{item._id}}" >添加</div>
{{# } }} {{# } }}
</div> </div>
</div> </div>

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

@ -427,6 +427,21 @@ var X = window.X || {
}); });
}; };
//定义一个比较器--升序排列
X.compare=function(propertyName) {
return function(object1, object2) {
var value1 = object1[propertyName];
var value2 = object2[propertyName];
if(value2 < value1) {
return 1;
} else if(value2 > value1) {
return -1;
} else {
return 0;
}
}
};
X.eventtable=function(data,callback){ X.eventtable=function(data,callback){
var titledata,condata = []; var titledata,condata = [];
for(let i in data){ for(let i in data){
@ -796,36 +811,45 @@ var X = window.X || {
var hash = getHashParms(); var hash = getHashParms();
setContentByUrl(hash.page || 'login'); setContentByUrl(hash.page || 'login');
$(document).keydown(function (event) { var n = window.event.screenX - window.screenLeft;
if (event.keyCode == 116) { var b = n > document.documentElement.scrollWidth-20;
event.preventDefault(); //阻止默认刷新 if(b && window.event.clientY < 0 || window.event.altKey){
console.log('刷新'); //页面关闭
console.log('页面关闭');
}else{
//页面刷新
console.log('页面刷新111');
var query = window.location.href; var query = window.location.href;
var querys = query.split("="); var querys = query.split("=");
if(querys[1]){ console.log(querys[1]);
if(querys[1] != undefined && querys[1] != 'login'){
$("#conetnt").html(""); $("#conetnt").html("");
var gourl = querys[1]; X.gourl('dashboard');
X.gourl(gourl,'conetnt');
} }
return false;
} }
});
// $(document).keydown(function (event) {
// if (event.keyCode == 116) {
// event.preventDefault(); //阻止默认刷新
// console.log('刷新');
// var query = window.location.href;
// var querys = query.split("=");
// if(querys[1]){
// $("#conetnt").html("");
// var gourl = querys[1];
// X.gourl(gourl,'conetnt');
// }
// return false;
// }
// });
}); });
})(); })();
// srczip/base/visibleChange.js // srczip/base/visibleChange.js
(function(){ (function(){
X.pageLogic['visibleChange'] = {
// $('.table').visibleChange(function(isShow){ init : function(parms){
// if(isShow==1){
// //被看见了
// }else{
// //看不见了
// }
// });
var observer = new IntersectionObserver(function(changes){ var observer = new IntersectionObserver(function(changes){
changes.forEach(function(item,index){ changes.forEach(function(item,index){
var callback = $(item.target).data('_visibleChangeCall'); var callback = $(item.target).data('_visibleChangeCall');
@ -845,6 +869,18 @@ var X = window.X || {
}); });
return this; return this;
}; };
$('.layui-col').visibleChange(function(isShow){
if(isShow==1){
//被看见了
console.log(111);
}else{
//看不见了
console.log(222);
}
});
}
};
})(); })();
// srczip/logic/addexistuser.js // srczip/logic/addexistuser.js
(function(){ (function(){
@ -3692,7 +3728,7 @@ var X = window.X || {
//更新报表 //更新报表
$(document).off('click','.model-gengx').on('click','.model-gengx',function(){ $(document).off('click','.model-gengx').on('click','.model-gengx',function(){
var id = $(this).attr('data-id'); var id = $(this).attr('data-id');
console.log(id); // console.log(id);
X.api('dashboard/','post',{id:X.DATA['dashboard_id']},function(d){ X.api('dashboard/','post',{id:X.DATA['dashboard_id']},function(d){
return; return;
X.pageLogic['dashboard'].fillmodeldata(d[id]); X.pageLogic['dashboard'].fillmodeldata(d[id]);
@ -3904,18 +3940,6 @@ var X = window.X || {
//画统计图和添加移入移出事件 //画统计图和添加移入移出事件
morefeatures:function(eventdata){ morefeatures:function(eventdata){
// $(".layui-card").mouseenter(function () {
// var classname = $(this).attr('class');
// if(classname.indexOf("tool-show") == -1){
// $(this).addClass('tool-show');
// }
// });
// $(".layui-card").mouseleave(function () {
// var classname = $(this).attr('class');
// if(classname.indexOf("tool-show") != -1){
// $(this).removeClass('tool-show');
// }
// });
var dropdownlist = [ var dropdownlist = [
{title:'表格',id:'table'}, {title:'表格',id:'table'},
{title:'图形',id:'echarts'} {title:'图形',id:'echarts'}
@ -3990,11 +4014,11 @@ var X = window.X || {
}; };
myChart.setOption(option,true); myChart.setOption(option,true);
} }
}, },
// 获取表格数据 // 获取表格数据
gettabledata:function(){ gettabledata:function(){
$("#model-box").html("");//清空表格数据 $("#model-box").html("");//清空表格数据
X.api('dashboard/','post',{id:X.DATA['dashboard_id']},function(d){ X.api('dashboard/','post',{id:X.DATA['dashboard_id']},function(d){
var modellist=[]; var modellist=[];
@ -4006,12 +4030,11 @@ var X = window.X || {
modellist.push(arr); modellist.push(arr);
} }
modellist.sort( X.pageLogic['dashboard'].compare("sort")); modellist.sort( X.compare("sort") );
for(let i in modellist){ for(let i in modellist){
for(let z in d){ for(let z in d){
if(modellist[i]['sort'] == d[z]['sort'] && modellist[i]['report_id'] == d[z]['report_id']){ if(modellist[i]['sort'] == d[z]['sort'] && modellist[i]['report_id'] == d[z]['report_id']){
//渲染模板和数据 //渲染模板和数据
console.log(d[z]);
X.laytpldata("#kanban-model-box-dot",d[z],null,function(html){ X.laytpldata("#kanban-model-box-dot",d[z],null,function(html){
$('#model-box').append(html); $('#model-box').append(html);
X.pageLogic['dashboard'].fillmodeldata(d[z]); X.pageLogic['dashboard'].fillmodeldata(d[z]);
@ -4023,22 +4046,6 @@ var X = window.X || {
}) })
}, },
//定义一个比较器--升序排列
compare:function(propertyName) {
// console.log(propertyName)
return function(object1, object2) {
var value1 = object1[propertyName];
var value2 = object2[propertyName];
if(value2 < value1) {
return 1;
} else if(value2 > value1) {
return -1;
} else {
return 0;
}
}
}
}; };
})(); })();
@ -4220,7 +4227,7 @@ var X = window.X || {
$(document).off('click','.analysis-navigation-bar-right-img-baobiao').on('click','.analysis-navigation-bar-right-img-baobiao',function(){ $(document).off('click','.analysis-navigation-bar-right-img-baobiao').on('click','.analysis-navigation-bar-right-img-baobiao',function(){
X.parametersopen(data['eventView']['cksql'],'savedbaobiao','rt',function(d){ X.parametersopen(data['eventView']['cksql'],'savedbaobiao','rt',function(d){
console.log(d); // console.log(d);
if(d){ if(d){
data = d.query; data = d.query;
type2data = data.cachedata.type2data; type2data = data.cachedata.type2data;
@ -4302,7 +4309,8 @@ var X = window.X || {
var offset = obj.offset(); var offset = obj.offset();
var index = obj.attr("data-index"); var index = obj.attr("data-index");
if(type2data.length >0){ if(type2data.length >0){
X.querycriteriapop(type2data[index],'dropdownlist',offset.left,offset.top+obj.height(),function(val){ // console.log(type2data);
X.querycriteriapop(type2data[0],'dropdownlist',offset.left,offset.top+obj.height(),function(val){
if(val != undefined){ if(val != undefined){
$("#analysis-zhibiao-list-type2-"+index).html(val.title); $("#analysis-zhibiao-list-type2-"+index).html(val.title);
@ -4403,7 +4411,7 @@ var X = window.X || {
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(screentypearr[index],'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; filtersymbols[indexs] = val.category;
@ -4482,8 +4490,7 @@ var X = window.X || {
data.eventView.groupBy[index]['column_id'] = val.id; data.eventView.groupBy[index]['column_id'] = val.id;
data.eventView.groupBy[index]['data_type'] = val.type; data.eventView.groupBy[index]['data_type'] = val.type;
data.eventView.groupBy[index]['table_type'] = val.table_type; data.eventView.groupBy[index]['table_type'] = val.table_type;
}) });
}) })
// 时间粒度 // 时间粒度
@ -4495,7 +4502,7 @@ var X = window.X || {
{'title':'30日','id':'30'}, {'title':'30日','id':'30'},
] ]
X.laydropdown('.analtsis-timeParticleSize',timeParticleSizearr,function(d){ X.laydropdown('.analtsis-timeParticleSize',timeParticleSizearr,function(d){
console.log(d); // console.log(d);
$(".analtsis-timeParticleSize").html(d.title); $(".analtsis-timeParticleSize").html(d.title);
data['eventView']['unitNum'] = parseInt(d.id); data['eventView']['unitNum'] = parseInt(d.id);
retaineddata(); retaineddata();
@ -6020,28 +6027,28 @@ var X = window.X || {
}); });
// 修改报表类型 // 修改报表类型
$(document).off('click','.to-added-table').on('click','.to-added-table',function(){ // $(document).off('click','.to-added-table').on('click','.to-added-table',function(){
var obj = $(this); // var obj = $(this);
var id = obj.attr("data-id"); // var id = obj.attr("data-id");
for(let i in submitdata){ // for(let i in submitdata){
if(submitdata[i]['report_id'] == id){ // if(submitdata[i]['report_id'] == id){
submitdata[i]['graph_type'] = 'table'; // submitdata[i]['graph_type'] = 'table';
layer.msg('修改为表格展示',{time: 1000}); // layer.msg('修改为表格展示',{time: 1000});
} // }
} // }
}); // });
$(document).off('click','.to-added-chart').on('click','.to-added-chart',function(){ // $(document).off('click','.to-added-chart').on('click','.to-added-chart',function(){
var obj = $(this); // var obj = $(this);
var id = obj.attr("data-id"); // var id = obj.attr("data-id");
console.log(id); // console.log(id);
for(let i in submitdata){ // for(let i in submitdata){
if(submitdata[i]['report_id'] == id){ // if(submitdata[i]['report_id'] == id){
submitdata[i]['graph_type'] = 'echarts'; // submitdata[i]['graph_type'] = 'echarts';
layer.msg('修改为图表展示',{time: 1000}); // layer.msg('修改为图表展示',{time: 1000});
} // }
} // }
}); // });
$(document).off('click','.kanbanadmin-menu').on('click','.kanbanadmin-menu',function(){ $(document).off('click','.kanbanadmin-menu').on('click','.kanbanadmin-menu',function(){
var obj = $(this); var obj = $(this);
@ -6084,6 +6091,8 @@ var X = window.X || {
}; };
submitdata.push(arr); submitdata.push(arr);
} }
submitdata.sort( X.compare("sort") );
console.log(submitdata);
}; };
$(document).off('click','.to-added-del').on('click','.to-added-del',function(){ $(document).off('click','.to-added-del').on('click','.to-added-del',function(){

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

@ -62,21 +62,37 @@
var hash = getHashParms(); var hash = getHashParms();
setContentByUrl(hash.page || 'login'); setContentByUrl(hash.page || 'login');
$(document).keydown(function (event) { var n = window.event.screenX - window.screenLeft;
if (event.keyCode == 116) { var b = n > document.documentElement.scrollWidth-20;
event.preventDefault(); //阻止默认刷新 if(b && window.event.clientY < 0 || window.event.altKey){
console.log('刷新'); //页面关闭
console.log('页面关闭');
}else{
//页面刷新
console.log('页面刷新111');
var query = window.location.href; var query = window.location.href;
var querys = query.split("="); var querys = query.split("=");
if(querys[1]){ console.log(querys[1]);
if(querys[1] != undefined && querys[1] != 'login'){
$("#conetnt").html(""); $("#conetnt").html("");
var gourl = querys[1]; X.gourl('dashboard');
X.gourl(gourl,'conetnt');
} }
return false;
} }
});
// $(document).keydown(function (event) {
// if (event.keyCode == 116) {
// event.preventDefault(); //阻止默认刷新
// console.log('刷新');
// var query = window.location.href;
// var querys = query.split("=");
// if(querys[1]){
// $("#conetnt").html("");
// var gourl = querys[1];
// X.gourl(gourl,'conetnt');
// }
// return false;
// }
// });
}); });

23
web/srczip/base/visibleChange.js
View File

@ -1,13 +1,6 @@
(function(){ (function(){
X.pageLogic['visibleChange'] = {
// $('.table').visibleChange(function(isShow){ init : function(parms){
// if(isShow==1){
// //被看见了
// }else{
// //看不见了
// }
// });
var observer = new IntersectionObserver(function(changes){ var observer = new IntersectionObserver(function(changes){
changes.forEach(function(item,index){ changes.forEach(function(item,index){
var callback = $(item.target).data('_visibleChangeCall'); var callback = $(item.target).data('_visibleChangeCall');
@ -27,4 +20,16 @@
}); });
return this; return this;
}; };
$('.layui-col').visibleChange(function(isShow){
if(isShow==1){
//被看见了
console.log(111);
}else{
//看不见了
console.log(222);
}
});
}
};
})(); })();

15
web/srczip/common.js
View File

@ -426,6 +426,21 @@ var X = window.X || {
}); });
}; };
//定义一个比较器--升序排列
X.compare=function(propertyName) {
return function(object1, object2) {
var value1 = object1[propertyName];
var value2 = object2[propertyName];
if(value2 < value1) {
return 1;
} else if(value2 > value1) {
return -1;
} else {
return 0;
}
}
};
X.eventtable=function(data,callback){ X.eventtable=function(data,callback){
var titledata,condata = []; var titledata,condata = [];
for(let i in data){ for(let i in data){

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

@ -243,7 +243,7 @@
//更新报表 //更新报表
$(document).off('click','.model-gengx').on('click','.model-gengx',function(){ $(document).off('click','.model-gengx').on('click','.model-gengx',function(){
var id = $(this).attr('data-id'); var id = $(this).attr('data-id');
console.log(id); // console.log(id);
X.api('dashboard/','post',{id:X.DATA['dashboard_id']},function(d){ X.api('dashboard/','post',{id:X.DATA['dashboard_id']},function(d){
return; return;
X.pageLogic['dashboard'].fillmodeldata(d[id]); X.pageLogic['dashboard'].fillmodeldata(d[id]);
@ -455,18 +455,6 @@
//画统计图和添加移入移出事件 //画统计图和添加移入移出事件
morefeatures:function(eventdata){ morefeatures:function(eventdata){
// $(".layui-card").mouseenter(function () {
// var classname = $(this).attr('class');
// if(classname.indexOf("tool-show") == -1){
// $(this).addClass('tool-show');
// }
// });
// $(".layui-card").mouseleave(function () {
// var classname = $(this).attr('class');
// if(classname.indexOf("tool-show") != -1){
// $(this).removeClass('tool-show');
// }
// });
var dropdownlist = [ var dropdownlist = [
{title:'表格',id:'table'}, {title:'表格',id:'table'},
{title:'图形',id:'echarts'} {title:'图形',id:'echarts'}
@ -541,11 +529,11 @@
}; };
myChart.setOption(option,true); myChart.setOption(option,true);
} }
}, },
// 获取表格数据 // 获取表格数据
gettabledata:function(){ gettabledata:function(){
$("#model-box").html("");//清空表格数据 $("#model-box").html("");//清空表格数据
X.api('dashboard/','post',{id:X.DATA['dashboard_id']},function(d){ X.api('dashboard/','post',{id:X.DATA['dashboard_id']},function(d){
var modellist=[]; var modellist=[];
@ -557,12 +545,11 @@
modellist.push(arr); modellist.push(arr);
} }
modellist.sort( X.pageLogic['dashboard'].compare("sort")); modellist.sort( X.compare("sort") );
for(let i in modellist){ for(let i in modellist){
for(let z in d){ for(let z in d){
if(modellist[i]['sort'] == d[z]['sort'] && modellist[i]['report_id'] == d[z]['report_id']){ if(modellist[i]['sort'] == d[z]['sort'] && modellist[i]['report_id'] == d[z]['report_id']){
//渲染模板和数据 //渲染模板和数据
console.log(d[z]);
X.laytpldata("#kanban-model-box-dot",d[z],null,function(html){ X.laytpldata("#kanban-model-box-dot",d[z],null,function(html){
$('#model-box').append(html); $('#model-box').append(html);
X.pageLogic['dashboard'].fillmodeldata(d[z]); X.pageLogic['dashboard'].fillmodeldata(d[z]);
@ -574,21 +561,5 @@
}) })
}, },
//定义一个比较器--升序排列
compare:function(propertyName) {
// console.log(propertyName)
return function(object1, object2) {
var value1 = object1[propertyName];
var value2 = object2[propertyName];
if(value2 < value1) {
return 1;
} else if(value2 > value1) {
return -1;
} else {
return 0;
}
}
}
}; };
})(); })();

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

@ -49,7 +49,7 @@
$(document).off('click','.analysis-navigation-bar-right-img-baobiao').on('click','.analysis-navigation-bar-right-img-baobiao',function(){ $(document).off('click','.analysis-navigation-bar-right-img-baobiao').on('click','.analysis-navigation-bar-right-img-baobiao',function(){
X.parametersopen(data['eventView']['cksql'],'savedbaobiao','rt',function(d){ X.parametersopen(data['eventView']['cksql'],'savedbaobiao','rt',function(d){
console.log(d); // console.log(d);
if(d){ if(d){
data = d.query; data = d.query;
type2data = data.cachedata.type2data; type2data = data.cachedata.type2data;
@ -131,7 +131,8 @@
var offset = obj.offset(); var offset = obj.offset();
var index = obj.attr("data-index"); var index = obj.attr("data-index");
if(type2data.length >0){ if(type2data.length >0){
X.querycriteriapop(type2data[index],'dropdownlist',offset.left,offset.top+obj.height(),function(val){ // console.log(type2data);
X.querycriteriapop(type2data[0],'dropdownlist',offset.left,offset.top+obj.height(),function(val){
if(val != undefined){ if(val != undefined){
$("#analysis-zhibiao-list-type2-"+index).html(val.title); $("#analysis-zhibiao-list-type2-"+index).html(val.title);
@ -232,7 +233,7 @@
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(screentypearr[index],'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; filtersymbols[indexs] = val.category;
@ -311,8 +312,7 @@
data.eventView.groupBy[index]['column_id'] = val.id; data.eventView.groupBy[index]['column_id'] = val.id;
data.eventView.groupBy[index]['data_type'] = val.type; data.eventView.groupBy[index]['data_type'] = val.type;
data.eventView.groupBy[index]['table_type'] = val.table_type; data.eventView.groupBy[index]['table_type'] = val.table_type;
}) });
}) })
// 时间粒度 // 时间粒度
@ -324,7 +324,7 @@
{'title':'30日','id':'30'}, {'title':'30日','id':'30'},
] ]
X.laydropdown('.analtsis-timeParticleSize',timeParticleSizearr,function(d){ X.laydropdown('.analtsis-timeParticleSize',timeParticleSizearr,function(d){
console.log(d); // console.log(d);
$(".analtsis-timeParticleSize").html(d.title); $(".analtsis-timeParticleSize").html(d.title);
data['eventView']['unitNum'] = parseInt(d.id); data['eventView']['unitNum'] = parseInt(d.id);
retaineddata(); retaineddata();

44
web/srczip/logic/kanbanadmin.js
View File

@ -79,28 +79,28 @@
}); });
// 修改报表类型 // 修改报表类型
$(document).off('click','.to-added-table').on('click','.to-added-table',function(){ // $(document).off('click','.to-added-table').on('click','.to-added-table',function(){
var obj = $(this); // var obj = $(this);
var id = obj.attr("data-id"); // var id = obj.attr("data-id");
for(let i in submitdata){ // for(let i in submitdata){
if(submitdata[i]['report_id'] == id){ // if(submitdata[i]['report_id'] == id){
submitdata[i]['graph_type'] = 'table'; // submitdata[i]['graph_type'] = 'table';
layer.msg('修改为表格展示',{time: 1000}); // layer.msg('修改为表格展示',{time: 1000});
} // }
} // }
}); // });
$(document).off('click','.to-added-chart').on('click','.to-added-chart',function(){ // $(document).off('click','.to-added-chart').on('click','.to-added-chart',function(){
var obj = $(this); // var obj = $(this);
var id = obj.attr("data-id"); // var id = obj.attr("data-id");
console.log(id); // console.log(id);
for(let i in submitdata){ // for(let i in submitdata){
if(submitdata[i]['report_id'] == id){ // if(submitdata[i]['report_id'] == id){
submitdata[i]['graph_type'] = 'echarts'; // submitdata[i]['graph_type'] = 'echarts';
layer.msg('修改为图表展示',{time: 1000}); // layer.msg('修改为图表展示',{time: 1000});
} // }
} // }
}); // });
$(document).off('click','.kanbanadmin-menu').on('click','.kanbanadmin-menu',function(){ $(document).off('click','.kanbanadmin-menu').on('click','.kanbanadmin-menu',function(){
var obj = $(this); var obj = $(this);
@ -143,6 +143,8 @@
}; };
submitdata.push(arr); submitdata.push(arr);
} }
submitdata.sort( X.compare("sort") );
console.log(submitdata);
}; };
$(document).off('click','.to-added-del').on('click','.to-added-del',function(){ $(document).off('click','.to-added-del').on('click','.to-added-del',function(){