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

111

Browse Source
This commit is contained in:
罗松柏 2021-09-09 14:44:33 +08:00
parent 28b0e677b8
commit e6688260f8
6 changed files with 297 additions and 158 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
web/pages/dashboard.html
View File

@ -570,15 +570,15 @@
<dl class="layui-nav-child modeify-layui-nav-child" id="sidebar-box">
{{# layui.each(item.children, function(indexs, items){ }}
<!-- {{# if(indexs == 0){ }}
{{# if(items.onclick == 1){ }}
<dd class="layui-left-dd layui-this" data-id="{{items._id}}"><a href="javascript:;" class="fontcolor second category"> <span>{{items.name}}</span>
<img src="./static/img/gengduo.png" alt="" class="nav-action-bar" data-id="{{items._id}}"></a>
</dd>
{{# } else { }} -->
{{# } else { }}
<dd class="layui-left-dd" data-id="{{items._id}}"><a href="javascript:;" class="fontcolor second category"> <span>{{items.name}}</span>
<img src="./static/img/gengduo.png" alt="" class="nav-action-bar" data-id="{{items._id}}"></a>
</dd>
<!-- {{# } }} -->
{{# } }}
<!-- {{# if(items.isFolder === true){ }}
<li class="layui-nav-item">
<a href="javascript:;" class="fontcolor mykanban second category xiangmukongjian" data-id="{{items._id}}"> <i class="layui-icon layui-icon-file-b"></i> {{items.name}}
@ -848,7 +848,7 @@
<div class="tishi model-fuzhi" title="复制" data-id="{{d.report_id}}" >
<img src="./static/img/fuzhi2.png" />
</div>
<div class="tishi model-gengduo" title="更多">
<div class="tishi model-gengduo" title="更多" data-id="{{d.report_id}}" data-cat="{{d.cat}}" data-modelsize="{{d.graph_size}}" data-modeltype="{{d.graph_type}}" data-name="{{d.name}}" data-modelswitch="{{d.modelswitch}}">
<img src="./static/img/gengduo.png" />
</div>
</div>
@ -886,7 +886,7 @@
<div class="tishi model-fuzhi" title="复制" data-id="{{d.report_id}}">
<img src="./static/img/fuzhi2.png" />
</div>
<div class="tishi model-gengduo" title="更多">
<div class="tishi model-gengduo" title="更多" data-id="{{d.report_id}}" data-cat="{{d.cat}}" data-modelsize="{{d.graph_size}}" data-modeltype="{{d.graph_type}}" data-name="{{d.name}}" data-modelswitch="{{d.modelswitch}}" >
<img src="./static/img/gengduo.png" />
</div>
</div>
@ -920,7 +920,7 @@
<div class="tishi model-fuzhi" title="复制" data-id="{{d.report_id}}">
<img src="./static/img/fuzhi2.png" />
</div>
<div class="tishi model-gengduo" title="更多">
<div class="tishi model-gengduo" title="更多" data-id="{{d.report_id}}" data-cat="{{d.cat}}" data-modelsize="{{d.graph_size}}" data-modeltype="{{d.graph_type}}" data-name="{{d.name}}" data-modelswitch="{{d.modelswitch}}">
<img src="./static/img/gengduo.png" />
</div>
</div>

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

@ -119,6 +119,8 @@ var X = window.X || {
// var ipurl = "http://10.0.0.77:7889/api/v1/";
//线上
var ipurl = "http://139.159.159.3:9865/api/v1/";
//线上测试
// var ipurl = "http://139.159.159.3:7889/api/v1/";
//设置或读取登录缓存，需要保存到localStorage，防止刷新时候登录数据丢失
X.loginCache = function(data){
@ -170,13 +172,14 @@ var X = window.X || {
index = layer.load(1);
},
success:function(d){
// console.log(d);
layer.close(index);
if(d.code == 0){
if( JSON.stringify(d.data) != "{}" && JSON.stringify(d.data) != "[]"){
callback && callback(d.data);
}else {
layer.msg('查无数据');
// callback && callback(d);
}
}else {
layer.msg(d.msg);
@ -207,8 +210,9 @@ var X = window.X || {
body: JSON.stringify(params),
method: 'POST',
headers: {
Authorization:token//此处放置请求到的用户token
}
Authorization:token,//此处放置请求到的用户token
'Content-Type':'application/json',
},
}
const response = await fetch(url, request);
@ -3898,6 +3902,7 @@ var X = window.X || {
$(".projecttit").html(d[i]['name']);
}
}
$("#model-box").html("");
me.freshMenu(X.DATA['projectid']);
// X.template("toptab","analysis-zhanwei",d);
});
@ -4321,7 +4326,7 @@ var X = window.X || {
var obj = $(this);
var offset = obj.offset();
var id = obj.attr('data-id');
var modelid = 'model'+id;
var modelid = id;
var modelsize = obj.attr('data-modelsize');
var modeltype = obj.attr('data-modeltype');
var cat = obj.attr('data-cat');
@ -4360,6 +4365,47 @@ var X = window.X || {
X.DATA.oclickarr =arr;
});
//更多按钮配置下拉框
$(document).off('click','.model-gengduo').on('click','.model-gengduo',function(){
var obj = $(this);
var offset = obj.offset();
var id = obj.attr('data-id');
// var modelid = 'model'+id;
var modelsize = obj.attr('data-modelsize');
var modeltype = obj.attr('data-modeltype');
var cat = obj.attr('data-cat');
var name = obj.attr('data-name');
var modelswitch = obj.attr("data-modelswitch");
X.parametersopen(X['DATA']['gengduolist'],'dropdownlist',[offset.top+obj.height(),offset.left-170],function(d){
if(d.id == 'shezhi'){
var data = {
id : id,
modelsize : modelsize,
modeltype : modeltype,
modelswitch: modelswitch
}
X.parametersopen(data,'setupbaobiao',"auto",function(d){
X.pageLogic['dashboard'].gettabledata();
})
}else if(d.id == 'export'){
X.download('ck/'+ cat +'_model_export',{report_id:id},name);
}else {
layer.confirm('确认移除['+ name + ']', {
btn: ['取消','删除 '] //按钮
}, function(){
//取消
layer.close(layer.index);
}, function(){
//删除
X.api('dashboard/del_report','post',{_id:X['DATA']['dashboard_id'],report_id:id},function(){
X.pageLogic['dashboard'].gettabledata();
});
});
}
})
})
},
// X.pageLogic.dashboard.freshMenu();
@ -4368,24 +4414,36 @@ var X = window.X || {
X.api('project/kanban',"post",{"_id":id},function (d){
X.DATA['KanBanData'] = d.kanban;
X.DATA['ProjectData'] = d.spaces;
if(d.spaces[0]['children'].length > 0){
if(X.DATA['dashboard_id'] == undefined || X.DATA['dashboard_id'] == ""){
for(let i in d.spaces){
for(let j in d.spaces[i]['children']){
d.spaces[i]['children'][j]['onclick'] = 0;
if(j == 0){
d.spaces[i]['children'][j]['onclick'] = 1;
}
}
}
$(".tab-tit-box .tab-tit").html(d.spaces[0]['children'][0]['name']);
X.DATA['dashboard_id'] = d.spaces[0]['children'][0]['_id']; //看板id
}else {
for(let i in d.spaces){
for(let j in d.spaces[i]['children']){
d.spaces[i]['children'][j]['onclick'] = 0;
if(d.spaces[i]['children'][j]['_id'] == X.DATA['dashboard_id']){
d.spaces[i]['children'][j]['onclick'] = 1;
$(".tab-tit-box .tab-tit").html(d.spaces[i]['children'][j]['name']);
}
}
}
}
X.laytpldata('#mykanban-dot',d.kanban,'#mykanban');
X.laytpldata('#kongjian-dot',d.spaces,'#kongjian');
$("#model-box").html("");
// 获取报表数据
X.pageLogic['dashboard'].gettabledata();
}
// if(X.DATA['dashboard_id'] == undefined || X.DATA['dashboard_id'] == ""){
// $(".tab-tit-box .tab-tit").html(d.spaces[0]['children'][0]['name']);
// X.DATA['dashboard_id'] = d.spaces[0]['children'][0]['_id']; //看板id
// }else {
// for(let i in d.spaces){
// for(let j in d.spaces[i]['children']){
// if(d.spaces[i]['children'][j]['_id'] == X.DATA['dashboard_id']){
// $(".tab-tit-box .tab-tit").html(d.spaces[i]['children'][j]['name']);
// }
// }
// }
// }
// $("#model-box").html("");
// // 获取报表数据
// X.pageLogic['dashboard'].gettabledata();
// var updateOutput = function(e){
@ -4415,6 +4473,10 @@ var X = window.X || {
//总体逻辑是：根据获取到的看板内容去先渲染放置的框，在根据不同分析模型处理对应的数据进行填充
fillmodeldata:function(d,id,type){
X.api("ck/"+d['model']+"_model","post",{report_id:d['report_id']},function(val){
// console.log(val);
if(val == null ){
$('#model-two-'+d['report_id']).html('<span class="woshujv">查无数据</span>');
}else {
var eventdata = X.pageLogic['dashboard'].modeldata(d,val,type);
var data;
if(eventdata.length > 0){
@ -4439,6 +4501,8 @@ var X = window.X || {
}
}
}
})
},
@ -4608,34 +4672,34 @@ var X = window.X || {
morefeatures:function(eventdata){
//更多按钮配置下拉框
X.laydropdown(".model-gengduo",X['DATA']['gengduolist'],function(d){
if(d.id == 'shezhi'){
var data = {
id : eventdata.id,
modelsize : eventdata.modelsize,
modeltype : eventdata.modeltype,
modelswitch: eventdata.modelswitch
}
X.parametersopen(data,'setupbaobiao',"auto",function(d){
X.pageLogic['dashboard'].gettabledata();
})
}else if(d.id == 'export'){
X.download('ck/'+ eventdata.cat +'_model_export',{report_id:eventdata.id},eventdata.name);
}else {
// X.laydropdown(".model-gengduo",X['DATA']['gengduolist'],function(d){
// if(d.id == 'shezhi'){
// var data = {
// id : eventdata.id,
// modelsize : eventdata.modelsize,
// modeltype : eventdata.modeltype,
// modelswitch: eventdata.modelswitch
// }
// X.parametersopen(data,'setupbaobiao',"auto",function(d){
// X.pageLogic['dashboard'].gettabledata();
// })
// }else if(d.id == 'export'){
// X.download('ck/'+ eventdata.cat +'_model_export',{report_id:eventdata.id},eventdata.name);
// }else {
layer.confirm('确认移除['+ eventdata.name + ']', {
btn: ['取消','删除 '] //按钮
}, function(){
//取消
layer.close(layer.index);
}, function(){
//删除
X.api('dashboard/del_report','post',{_id:X['DATA']['dashboard_id'],report_id:eventdata.id},function(){
X.pageLogic['dashboard'].gettabledata();
});
});
}
});
// layer.confirm('确认移除['+ eventdata.name + ']', {
// btn: ['取消','删除 '] //按钮
// }, function(){
// //取消
// layer.close(layer.index);
// }, function(){
// //删除
// X.api('dashboard/del_report','post',{_id:X['DATA']['dashboard_id'],report_id:eventdata.id},function(){
// X.pageLogic['dashboard'].gettabledata();
// });
// });
// }
// });
//设置时间
X.daterender(".model-times",function(start, end, label){
@ -4791,9 +4855,8 @@ var X = window.X || {
},
//获取表格数据
//渲染外框大小位置
//先渲染外框大小位置和标题
gettabledata:function(){
$("#model-box").html("");//清空表格数据
X.api('dashboard/','post',{id:X.DATA['dashboard_id']},function(d){
X['DATA']['kanbanlist'] = d;
var modellist=[];
@ -4804,16 +4867,24 @@ var X = window.X || {
}
modellist.push(arr);
}
modellist.sort( X.compare("sort") );
var num = 0;
$("#model-box").html("");//清空表格数据
for(let i in modellist){
for(let z in d){
if(modellist[i]['sort'] == d[z]['sort'] && modellist[i]['report_id'] == d[z]['report_id']){
//渲染模板和数据
X.laytpldata("#kanban-model-box-dot",d[z],null,function(html){
$('#model-box').append(html);
X.pageLogic['dashboard'].fillmodeldata(d[z]);
num ++;
// X.pageLogic['dashboard'].fillmodeldata(d[z]);
});
//当外框和标题渲染完在渲染数据
if(num == Object.getOwnPropertyNames(d).length){
for(let q in d){
X.pageLogic['dashboard'].fillmodeldata(d[q]);
}
}
}
}
}
@ -10301,7 +10372,7 @@ var X = window.X || {
this.parms = parms;
this.callback = parms.callback;
var data = parms.extData;
console.log('luo',data);
// console.log('luo',data);
var report_id = [];
report_id.push(data.id);
var postdata;//上传数据
@ -10332,10 +10403,8 @@ var X = window.X || {
$("#setupbaobiao-large").prop("checked",true);
}
//初始化切换
if(data.modelswitch){
if(data.modelswitch && data.modelswitch != "undefined"){
$("#kxyswitch").prop("checked",true);
}else {
$("#gxyswitch").prop("checked",true);
}

10
web/srczip/common.js
View File

@ -118,6 +118,8 @@ var X = window.X || {
// var ipurl = "http://10.0.0.77:7889/api/v1/";
//线上
var ipurl = "http://139.159.159.3:9865/api/v1/";
//线上测试
// var ipurl = "http://139.159.159.3:7889/api/v1/";
//设置或读取登录缓存，需要保存到localStorage，防止刷新时候登录数据丢失
X.loginCache = function(data){
@ -169,13 +171,14 @@ var X = window.X || {
index = layer.load(1);
},
success:function(d){
// console.log(d);
layer.close(index);
if(d.code == 0){
if( JSON.stringify(d.data) != "{}" && JSON.stringify(d.data) != "[]"){
callback && callback(d.data);
}else {
layer.msg('查无数据');
// callback && callback(d);
}
}else {
layer.msg(d.msg);
@ -206,8 +209,9 @@ var X = window.X || {
body: JSON.stringify(params),
method: 'POST',
headers: {
Authorization:token//此处放置请求到的用户token
}
Authorization:token,//此处放置请求到的用户token
'Content-Type':'application/json',
},
}
const response = await fetch(url, request);

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

@ -29,6 +29,7 @@
$(".projecttit").html(d[i]['name']);
}
}
$("#model-box").html("");
me.freshMenu(X.DATA['projectid']);
// X.template("toptab","analysis-zhanwei",d);
});
@ -452,7 +453,7 @@
var obj = $(this);
var offset = obj.offset();
var id = obj.attr('data-id');
var modelid = 'model'+id;
var modelid = id;
var modelsize = obj.attr('data-modelsize');
var modeltype = obj.attr('data-modeltype');
var cat = obj.attr('data-cat');
@ -491,6 +492,47 @@
X.DATA.oclickarr =arr;
});
//更多按钮配置下拉框
$(document).off('click','.model-gengduo').on('click','.model-gengduo',function(){
var obj = $(this);
var offset = obj.offset();
var id = obj.attr('data-id');
// var modelid = 'model'+id;
var modelsize = obj.attr('data-modelsize');
var modeltype = obj.attr('data-modeltype');
var cat = obj.attr('data-cat');
var name = obj.attr('data-name');
var modelswitch = obj.attr("data-modelswitch");
X.parametersopen(X['DATA']['gengduolist'],'dropdownlist',[offset.top+obj.height(),offset.left-170],function(d){
if(d.id == 'shezhi'){
var data = {
id : id,
modelsize : modelsize,
modeltype : modeltype,
modelswitch: modelswitch
}
X.parametersopen(data,'setupbaobiao',"auto",function(d){
X.pageLogic['dashboard'].gettabledata();
})
}else if(d.id == 'export'){
X.download('ck/'+ cat +'_model_export',{report_id:id},name);
}else {
layer.confirm('确认移除['+ name + ']', {
btn: ['取消','删除 '] //按钮
}, function(){
//取消
layer.close(layer.index);
}, function(){
//删除
X.api('dashboard/del_report','post',{_id:X['DATA']['dashboard_id'],report_id:id},function(){
X.pageLogic['dashboard'].gettabledata();
});
});
}
})
})
},
// X.pageLogic.dashboard.freshMenu();
@ -499,24 +541,36 @@
X.api('project/kanban',"post",{"_id":id},function (d){
X.DATA['KanBanData'] = d.kanban;
X.DATA['ProjectData'] = d.spaces;
if(d.spaces[0]['children'].length > 0){
if(X.DATA['dashboard_id'] == undefined || X.DATA['dashboard_id'] == ""){
for(let i in d.spaces){
for(let j in d.spaces[i]['children']){
d.spaces[i]['children'][j]['onclick'] = 0;
if(j == 0){
d.spaces[i]['children'][j]['onclick'] = 1;
}
}
}
$(".tab-tit-box .tab-tit").html(d.spaces[0]['children'][0]['name']);
X.DATA['dashboard_id'] = d.spaces[0]['children'][0]['_id']; //看板id
}else {
for(let i in d.spaces){
for(let j in d.spaces[i]['children']){
d.spaces[i]['children'][j]['onclick'] = 0;
if(d.spaces[i]['children'][j]['_id'] == X.DATA['dashboard_id']){
d.spaces[i]['children'][j]['onclick'] = 1;
$(".tab-tit-box .tab-tit").html(d.spaces[i]['children'][j]['name']);
}
}
}
}
X.laytpldata('#mykanban-dot',d.kanban,'#mykanban');
X.laytpldata('#kongjian-dot',d.spaces,'#kongjian');
$("#model-box").html("");
// 获取报表数据
X.pageLogic['dashboard'].gettabledata();
}
// if(X.DATA['dashboard_id'] == undefined || X.DATA['dashboard_id'] == ""){
// $(".tab-tit-box .tab-tit").html(d.spaces[0]['children'][0]['name']);
// X.DATA['dashboard_id'] = d.spaces[0]['children'][0]['_id']; //看板id
// }else {
// for(let i in d.spaces){
// for(let j in d.spaces[i]['children']){
// if(d.spaces[i]['children'][j]['_id'] == X.DATA['dashboard_id']){
// $(".tab-tit-box .tab-tit").html(d.spaces[i]['children'][j]['name']);
// }
// }
// }
// }
// $("#model-box").html("");
// // 获取报表数据
// X.pageLogic['dashboard'].gettabledata();
// var updateOutput = function(e){
@ -546,6 +600,10 @@
//总体逻辑是：根据获取到的看板内容去先渲染放置的框，在根据不同分析模型处理对应的数据进行填充
fillmodeldata:function(d,id,type){
X.api("ck/"+d['model']+"_model","post",{report_id:d['report_id']},function(val){
// console.log(val);
if(val == null ){
$('#model-two-'+d['report_id']).html('<span class="woshujv">查无数据</span>');
}else {
var eventdata = X.pageLogic['dashboard'].modeldata(d,val,type);
var data;
if(eventdata.length > 0){
@ -570,6 +628,8 @@
}
}
}
})
},
@ -739,34 +799,34 @@
morefeatures:function(eventdata){
//更多按钮配置下拉框
X.laydropdown(".model-gengduo",X['DATA']['gengduolist'],function(d){
if(d.id == 'shezhi'){
var data = {
id : eventdata.id,
modelsize : eventdata.modelsize,
modeltype : eventdata.modeltype,
modelswitch: eventdata.modelswitch
}
X.parametersopen(data,'setupbaobiao',"auto",function(d){
X.pageLogic['dashboard'].gettabledata();
})
}else if(d.id == 'export'){
X.download('ck/'+ eventdata.cat +'_model_export',{report_id:eventdata.id},eventdata.name);
}else {
// X.laydropdown(".model-gengduo",X['DATA']['gengduolist'],function(d){
// if(d.id == 'shezhi'){
// var data = {
// id : eventdata.id,
// modelsize : eventdata.modelsize,
// modeltype : eventdata.modeltype,
// modelswitch: eventdata.modelswitch
// }
// X.parametersopen(data,'setupbaobiao',"auto",function(d){
// X.pageLogic['dashboard'].gettabledata();
// })
// }else if(d.id == 'export'){
// X.download('ck/'+ eventdata.cat +'_model_export',{report_id:eventdata.id},eventdata.name);
// }else {
layer.confirm('确认移除['+ eventdata.name + ']', {
btn: ['取消','删除 '] //按钮
}, function(){
//取消
layer.close(layer.index);
}, function(){
//删除
X.api('dashboard/del_report','post',{_id:X['DATA']['dashboard_id'],report_id:eventdata.id},function(){
X.pageLogic['dashboard'].gettabledata();
});
});
}
});
// layer.confirm('确认移除['+ eventdata.name + ']', {
// btn: ['取消','删除 '] //按钮
// }, function(){
// //取消
// layer.close(layer.index);
// }, function(){
// //删除
// X.api('dashboard/del_report','post',{_id:X['DATA']['dashboard_id'],report_id:eventdata.id},function(){
// X.pageLogic['dashboard'].gettabledata();
// });
// });
// }
// });
//设置时间
X.daterender(".model-times",function(start, end, label){
@ -922,9 +982,8 @@
},
//获取表格数据
//渲染外框大小位置
//先渲染外框大小位置和标题
gettabledata:function(){
$("#model-box").html("");//清空表格数据
X.api('dashboard/','post',{id:X.DATA['dashboard_id']},function(d){
X['DATA']['kanbanlist'] = d;
var modellist=[];
@ -935,16 +994,24 @@
}
modellist.push(arr);
}
modellist.sort( X.compare("sort") );
var num = 0;
$("#model-box").html("");//清空表格数据
for(let i in modellist){
for(let z in d){
if(modellist[i]['sort'] == d[z]['sort'] && modellist[i]['report_id'] == d[z]['report_id']){
//渲染模板和数据
X.laytpldata("#kanban-model-box-dot",d[z],null,function(html){
$('#model-box').append(html);
X.pageLogic['dashboard'].fillmodeldata(d[z]);
num ++;
// X.pageLogic['dashboard'].fillmodeldata(d[z]);
});
//当外框和标题渲染完在渲染数据
if(num == Object.getOwnPropertyNames(d).length){
for(let q in d){
X.pageLogic['dashboard'].fillmodeldata(d[q]);
}
}
}
}
}

6
web/srczip/logic/setupbaobiao.js
View File

@ -5,7 +5,7 @@
this.parms = parms;
this.callback = parms.callback;
var data = parms.extData;
console.log('luo',data);
// console.log('luo',data);
var report_id = [];
report_id.push(data.id);
var postdata;//上传数据
@ -36,10 +36,8 @@
$("#setupbaobiao-large").prop("checked",true);
}
//初始化切换
if(data.modelswitch){
if(data.modelswitch && data.modelswitch != "undefined"){
$("#kxyswitch").prop("checked",true);
}else {
$("#gxyswitch").prop("checked",true);
}

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

@ -112,6 +112,7 @@
.souduo:hover { background-color: #3f4979; color: rgba(255,255,255,1); }
.qvjiantou { left: 250px; }
.qvjiantou span { display: none; }
.woshujv { width: 100%; text-align: center; display: inline-block; position: absolute; top: 0; bottom: 0; margin: auto; height: 20px; }
.sousuo-box { width: 254px; margin: 0px 8px; padding: 15px 0px; display: flex; justify-content: space-between; align-items: center; }
.sousuo { display: flex; align-items: center;}