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

111

Browse Source
This commit is contained in:
罗松柏 2021-07-30 15:26:19 +08:00
parent 8685ceab6d
commit da40ebbe48
2 changed files with 2 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3529,46 +3529,7 @@ var X = window.X || {
X.DATA[cat+'id'] = id; X.DATA[cat+'id'] = id;
}); });
//切换模板
// $(document).off('click','.chart').on('click','.chart',function(){
// var id = $(this).attr('data-id');
// var modelid = 'model'+id;
// var modelsize = $(this).attr('data-modelsize');
// var modeltype = $(this).attr('data-modeltype');
// var cat = $(this).attr('data-cat');
// var name = $(this).attr('data-name');
// var configdata = {
// graph_size:modelsize,
// graph_type:modeltype,
// model:cat,
// name:name,
// report_id:id
// }
// var obj = $(this);
// var offset = obj.offset();
// var dropdownlist = [
// {title:'表格',id:'table'},
// {title:'图形',id:'echarts'}
// ]
// X.querycriteriapop(dropdownlist,'dropdownlist',offset.left,offset.top+obj.height(),function(val){
// console.log(val);
// X.api('dashboard/','post',{id:X.DATA['dashboard_id']},function(d){
// me.fillmodeldata(d[0],modelid);
// })
// })
// });
//侧边栏更多控制按钮
// taboperation = function(e,type,id,name){
// console.log(X.DATA.taboperationdata[type])
// X.laydropdown('.kanbanwenjianimg',X.DATA.taboperationdata[type]);
// }
// 渲染下拉框 // 渲染下拉框
$(document).off('click','.nav-action-bar').on('click','.nav-action-bar',function(e){ $(document).off('click','.nav-action-bar').on('click','.nav-action-bar',function(e){
e.stopPropagation(); e.stopPropagation();
console.log('更多操作按钮'); console.log('更多操作按钮');
@ -3665,7 +3626,7 @@ var X = window.X || {
eventdata.push(data); eventdata.push(data);
}) })
}else { }else {
X.ltvchart(val,function(data){ X.ltvtable(val,function(data){
data['name'] = d['name']; data['name'] = d['name'];
data['modeltype'] = d['graph_type']; data['modeltype'] = d['graph_type'];
data['id'] = d['report_id']; data['id'] = d['report_id'];

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

@ -266,46 +266,7 @@
X.DATA[cat+'id'] = id; X.DATA[cat+'id'] = id;
}); });
//切换模板
// $(document).off('click','.chart').on('click','.chart',function(){
// var id = $(this).attr('data-id');
// var modelid = 'model'+id;
// var modelsize = $(this).attr('data-modelsize');
// var modeltype = $(this).attr('data-modeltype');
// var cat = $(this).attr('data-cat');
// var name = $(this).attr('data-name');
// var configdata = {
// graph_size:modelsize,
// graph_type:modeltype,
// model:cat,
// name:name,
// report_id:id
// }
// var obj = $(this);
// var offset = obj.offset();
// var dropdownlist = [
// {title:'表格',id:'table'},
// {title:'图形',id:'echarts'}
// ]
// X.querycriteriapop(dropdownlist,'dropdownlist',offset.left,offset.top+obj.height(),function(val){
// console.log(val);
// X.api('dashboard/','post',{id:X.DATA['dashboard_id']},function(d){
// me.fillmodeldata(d[0],modelid);
// })
// })
// });
//侧边栏更多控制按钮
// taboperation = function(e,type,id,name){
// console.log(X.DATA.taboperationdata[type])
// X.laydropdown('.kanbanwenjianimg',X.DATA.taboperationdata[type]);
// }
// 渲染下拉框 // 渲染下拉框
$(document).off('click','.nav-action-bar').on('click','.nav-action-bar',function(e){ $(document).off('click','.nav-action-bar').on('click','.nav-action-bar',function(e){
e.stopPropagation(); e.stopPropagation();
console.log('更多操作按钮'); console.log('更多操作按钮');
@ -402,7 +363,7 @@
eventdata.push(data); eventdata.push(data);
}) })
}else { }else {
X.ltvchart(val,function(data){ X.ltvtable(val,function(data){
data['name'] = d['name']; data['name'] = d['name'];
data['modeltype'] = d['graph_type']; data['modeltype'] = d['graph_type'];
data['id'] = d['report_id']; data['id'] = d['report_id'];