报表备注
diff --git a/web/src/x.min.js b/web/src/x.min.js
index 9904974..a07b006 100644
--- a/web/src/x.min.js
+++ b/web/src/x.min.js
@@ -181,7 +181,7 @@ var X = window.X || {
data:data,
async:true,
contentType: contentType,
- beforeSend: function () {
+ beforeSend: function () {
// loading 显示
index = layer.load(1);
},
@@ -193,7 +193,7 @@ var X = window.X || {
callback && callback(d.data);
}else {
layer.msg('查无数据');
- callback && callback(d);
+ callback && callback(d.data);
}
}else {
if(d.code == -5){
@@ -1426,13 +1426,12 @@ var X = window.X || {
var b = n > document.documentElement.scrollWidth-20;
if(b && window.event.clientY < 0 || window.event.altKey){
//页面关闭
- console.log('页面关闭');
+ // console.log('页面关闭');
}else{
//页面刷新
- console.log('页面刷新111');
+ // console.log('页面刷新111');
var query = window.location.href;
var querys = query.split("=");
- console.log(querys[1]);
if(querys[1] != undefined && querys[1] != 'login'){
$("#conetnt").html("");
X.gourl('dashboard');
@@ -1554,10 +1553,8 @@ var X = window.X || {
$('.layui-col').visibleChange(function(isShow){
if(isShow==1){
//被看见了
- console.log(111);
}else{
//看不见了
- console.log(222);
}
});
}
@@ -1618,8 +1615,6 @@ var X = window.X || {
var startmonth = Date.parse(startdate)/1000;
data['eventView']['e_days'] = parseInt((sameday - endmonth)/86400);
data['eventView']['s_days'] = parseInt((sameday - startmonth)/86400);
- console.log(parseInt((sameday - endmonth)/86400));
- console.log(parseInt((sameday - startmonth)/86400));
// calculationdata();
})
@@ -1929,7 +1924,6 @@ var X = window.X || {
var indexs = $(this).attr("data-indexs");
var val = $(this).val();
var valarr = val.split(",");
- console.log(data['events'][index]);
if(data['events'][index]['filts'][indexs]){
data['events'][index]['filts'][indexs]['ftv']=valarr;
data['events'][index]['filts'][indexs]['strftv']=val;
@@ -2038,7 +2032,6 @@ var X = window.X || {
var obj = $(this);
var offset = obj.offset();
var index = obj.attr("data-index");
- console.log(data['events']);
data['events'][index]['customEvent'] = $(this).val();
});
@@ -2171,7 +2164,6 @@ var X = window.X || {
// 全局筛选
var filtsftvdata=[];
$(document).off('click','.analysis-overall-situation-add').on('click','.analysis-overall-situation-add',function(){
- console.log(defaultgroupdata);
var drr={
"columnDesc":defaultgroupdata[0]['category'][0]['title'],//事件中文显示 columnDesc
"columnName":defaultgroupdata[0]['category'][0]['id'],//事件id
@@ -2237,7 +2229,6 @@ var X = window.X || {
$(document).off('click','.analysis-overall-situation-date').on('click','.analysis-overall-situation-date',function(){
var index = $(this).attr('data-index');
render_date_index = index;
- // console.log(index);
});
// 渲染过滤项时间框
@@ -2339,7 +2330,6 @@ var X = window.X || {
var querydata;//查询数据
$(document).on('click','.analtsis-chart-switch-box .analtsis-chart-switch',function(){
- console.log(querydata);
if(querydata){
$('.analtsis-chart-switch-box .analtsis-chart-switch').removeClass('select-chart');
$(this).addClass('select-chart');
@@ -2453,9 +2443,6 @@ var X = window.X || {
seriesData[i]['name'] = xAxisData[i];
}
}
- console.log(xAxisData)
- console.log(seriesData)
- console.log(d[0]['date_range']);
var myChart = echarts.init(document.getElementById('analysis-echarts'));
var option = {
title: {
@@ -2690,13 +2677,12 @@ var X = window.X || {
if(baobiaodata != '' && baobiaodata != undefined && baobiaodata != null){
X.parametersopen(baobiaodata,'savereport','auto');
}else{
- X.parametersopen(data,'savereport','auto');
+ X.parametersopen(data,'savereport','auto');
}
});
// 下载
$(document).off('click','.download-table').on('click','.download-table',function(){
- // console.log(11111);
X.download('ck/event_model_export',data,'事件分析');
});
@@ -2769,7 +2755,7 @@ var X = window.X || {
});
X.api("project/members","get",{},function(d){
- console.log(d)
+ // console.log(d)
// X.laytpldata("#addexistuser-con-user-box-dot",d,".addexistuser-con-user-box");
});
@@ -2844,7 +2830,7 @@ var X = window.X || {
Addeddate.splice(i,1);
}
}
- console.log(Addeddate)
+
X.laytpldata("#addexistuser-table-con-list-dot",Addeddate,".addexistuser-table-con-list");
addlaydropdown();
@@ -2920,7 +2906,7 @@ var X = window.X || {
});
//确定按钮
$(".addexistuser-btn-qd").click(function(){
- console.log(Addeddate);
+
var ylist = [];
for(let i in Addeddate){
var arr = {
@@ -2930,13 +2916,12 @@ var X = window.X || {
}
ylist.push(arr)
}
- console.log(ylist);
+
if(ylist.length == 0){
layer.msg('暂未选择用户');
return;
}
X.api("authz/add_role_domain","post",{data:ylist},function(d){
- console.log(d)
layer.closeAll();
});
});
@@ -2992,7 +2977,7 @@ var X = window.X || {
this.parms = parms;
this.callback = parms.callback; //选择后执行的回调
var data = parms.extData;//获取到上层弹窗传的数据
- console.log(data);
+ // console.log(data);
if(data){
// for(let i in data.ditch){
@@ -3039,7 +3024,6 @@ var X = window.X || {
X.api("project/add_project_name","post",{game:data.game,ditch:data.ditch,name: data.name},function(d){
if(d){
- console.log(d);
layer.msg("编辑成功");
me.callback && me.callback();
layer.closeAll();
@@ -3109,15 +3093,14 @@ var X = window.X || {
if(parms){
this.parms = parms;
var passdata = parms;
- console.log(passdata);
+
X.api("authz/get_permissions_for_user_in_domain","post",{role_id:passdata.id,game:X['DATA']['game']},function(d){
- console.log(d);
+
$('.addrole-tit').val(passdata.title);
var selinput = {}
for(let i in d){
selinput[d[i]['_id']] = true
}
- console.log(selinput);
layui.form.val('addroleexample', selinput)
});
};
@@ -3139,7 +3122,6 @@ var X = window.X || {
for(let i in data){
selinput[data[i]['path']] = true
}
- console.log(selinput);
layui.form.val('addroleexample', selinput)
});
@@ -3184,18 +3166,18 @@ var X = window.X || {
layer.closeAll();
})
- // var projectrolearr,projectrolearrlist=[];
- // X.api("authz/roles","get",{},function(d){
- // projectrolearr = d;
- // for(let i in projectrolearr){
- // var arr={
- // id:projectrolearr[i]['_id'],
- // title:projectrolearr[i]['name'],
- // game:projectrolearr[i]['game']
- // }
- // projectrolearrlist.push(arr);
- // }
- // })
+ var projectrolearr,projectrolearrlist=[];
+ X.api("authz/roles","get",{},function(d){
+ projectrolearr = d;
+ for(let i in projectrolearr){
+ var arr={
+ id:projectrolearr[i]['_id'],
+ title:projectrolearr[i]['name'],
+ game:projectrolearr[i]['game']
+ }
+ projectrolearrlist.push(arr);
+ }
+ })
// var datarightsarr;
// X.api("data_auth/list","get",{},function(d){
// datarightsarr = d;
@@ -3207,8 +3189,10 @@ var X = window.X || {
var titarr = txt.split(",");
for(let i in titarr){
var arr = {
+ "game": X.DATA.game,
"username": titarr[i],
- // "role_name": projectrolearr[0]["name"],
+ "role_name": projectrolearr[0]["name"],
+ "role_id": projectrolearr[0]["_id"]
// "data_authority":datarightsarr[0]["title"],
// "data_auth_id":datarightsarr[0]["id"]
}
@@ -3244,11 +3228,13 @@ var X = window.X || {
// 项目角色修改
// console.log(projectrolearrlist);
- // X.laydropdown(".adduser-role",projectrolearrlist,function(d){
- // cprojectdiv.html(d.title);
+ X.laydropdown(".adduser-role",projectrolearrlist,function(d){
+ cprojectdiv.html(d.title);
- // adduserData[cprojectindex]['role_name'] = d.title;
- // })
+ adduserData[cprojectindex]['role_name'] = d.title;
+ adduserData[cprojectindex]['role_id'] = d.id;
+
+ })
// 数据权限修改
// X.laydropdown(".adduser-attr",datarightsarr,function(d){
// cdatarightsdiv.html(d.title);
@@ -3263,16 +3249,20 @@ var X = window.X || {
});
$(document).off('click','.adduser-but-box .adduser-btn2').on('click','.adduser-but-box .adduser-btn2',function(){
- console.log(adduserData);
var namearr = [];
+
for(let i in adduserData){
namearr.push(adduserData[i]['username']);
}
if(namearr.length > 0){
+ //创建账号
X.api("user/add_account","post",{account_list:namearr},function(d){
- X.pageLogic.useradmin.useradmin();
- layer.closeAll();
- layer.msg("创建成功");
+ //给账号添加项目角色
+ X.api("authz/add_role_domain","post",{data:adduserData},function(d){
+ X.pageLogic.useradmin.useradmin();
+ layer.closeAll();
+ layer.msg("创建成功");
+ });
})
}else {
layer.msg("请先添加账号");
@@ -3313,7 +3303,6 @@ var X = window.X || {
$(".addusergroup-qd").click(function(){
var getData = layui.transfer.getData('addusergroupuserinfo');
var txt = $(".addusergroup-txt").val();
- console.log(getData);
layer.closeAll();
})
@@ -3459,7 +3448,6 @@ var X = window.X || {
$(document).off('click','.adminmykanban-operation-but-yidong').on('click','.adminmykanban-operation-but-yidong',function(){
var mykanban = layui.tree.getChecked('mykanban');
var kongjian = layui.tree.getChecked('kongjian');
- console.log(kongjian);
if(mykanban.length < 1 && kongjian.length < 1){
alert('请先选择需要移动的看板!!!');
return;
@@ -3508,7 +3496,6 @@ var X = window.X || {
$(document).off('click','.adminmykanban-operation-but-copykongjian').on('click','.adminmykanban-operation-but-copykongjian',function(){
var mykanban = layui.tree.getChecked('mykanban');
var kongjian = layui.tree.getChecked('kongjian');
- console.log(kongjian);
if(mykanban.length < 1 && kongjian.length < 1){
alert('请先选择需要移动的看板!!!');
return;
@@ -3579,7 +3566,6 @@ var X = window.X || {
updata:function(id){
X.api("project/kanban","post",{"_id":id},function(d){
- console.log(d);
var kanban = [];
for(let i in d.kanban){
var arr = {};
@@ -3698,8 +3684,6 @@ var X = window.X || {
var startmonth = Date.parse(startdate)/1000;
data['eventView']['e_days'] = parseInt((sameday - endmonth)/86400);
data['eventView']['s_days'] = parseInt((sameday - startmonth)/86400);
- console.log(parseInt((sameday - endmonth)/86400));
- console.log(parseInt((sameday - startmonth)/86400));
// calculationdata();
})
@@ -3748,6 +3732,8 @@ var X = window.X || {
report_idarr.push(X.DATA.eventid);
if(X.DATA.authority != 'rw'){
$('.analysis-savereport').hide();
+ }else {
+ $('.analysis-saveas').show();
}
X.api('report/read_report','post',{project_id:X.DATA.projectid,report_id:report_idarr},function(d){
backfilldata(d[0]);
@@ -3838,7 +3824,6 @@ var X = window.X || {
var oldIndex = evt.oldIndex;
let item = data.events.splice(oldIndex, 1); // arr删除2，把2给item
data.events.splice(newIndex, 0, item[0]);
- console.log(data);
updataindex(data.events);
}
});
@@ -4053,7 +4038,6 @@ var X = window.X || {
if(val != "查无数据"){
X.parametersopen(val['map_'],'dropdownlist',[offset.top+obj.height(),offset.left],function(val){
- console.log(val);
if(indexs != undefined){
data['events'][index]['filts'][indexs]['strftv'] = val.title;
var arr = [];
@@ -4081,7 +4065,6 @@ var X = window.X || {
var indexs = $(this).attr("data-indexs");
var val = $(this).val();
var valarr = val.split(",");
- console.log(data['events'][index]);
if(data['events'][index]['filts'][indexs]){
data['events'][index]['filts'][indexs]['ftv']=valarr;
data['events'][index]['filts'][indexs]['strftv']=val;
@@ -4191,7 +4174,6 @@ var X = window.X || {
var obj = $(this);
var offset = obj.offset();
var index = obj.attr("data-index");
- console.log(data['events']);
data['events'][index]['customEvent'] = $(this).val();
});
@@ -4657,9 +4639,6 @@ var X = window.X || {
seriesData[i]['name'] = xAxisData[i];
}
}
- console.log(xAxisData)
- console.log(seriesData)
- console.log(d[0]['date_range']);
var myChart = echarts.init(document.getElementById('analysis-echarts'));
var option = {
title: {
@@ -4897,12 +4876,20 @@ var X = window.X || {
// 保存报表
$(document).off('click','.analysis-savereport').on('click','.analysis-savereport',function(){
if(baobiaodata != '' && baobiaodata != undefined && baobiaodata != null){
+ baobiaodata['saveas']= 0;
X.parametersopen(baobiaodata,'savereport','auto');
}else{
X.parametersopen(data,'savereport','auto');
}
});
+ //另存为
+ $(document).off('click','.analysis-saveas').on('click','.analysis-saveas',function(){
+ baobiaodata['saveas']= 1;
+ X.parametersopen(baobiaodata,'savereport','auto');
+
+ });
+
// 下载
$(document).off('click','.download-table').on('click','.download-table',function(){
// console.log(11111);
@@ -4983,7 +4970,7 @@ var X = window.X || {
this.parms = parms;
this.callback = parms.callback; //选择后执行的回调
var data = parms.extData;//获取到上层弹窗传的数据
- console.log(data);
+ // console.log(data);
if(data){
$("#path").val(data.path);
$("#name").val(data.name);
@@ -5118,6 +5105,8 @@ var X = window.X || {
report_idarr.push(X.DATA.user_propertyid);
if(X.DATA.authority != 'rw'){
$('.analysis-savereport').hide();
+ }else{
+ $('.analysis-saveas').hide();
}
X.api('report/read_report','post',{project_id:X.DATA.projectid,report_id:report_idarr},function(d){
backfilldata(d[0]);
@@ -5173,7 +5162,6 @@ var X = window.X || {
// 分组项
X.template("grouped","shushi",data['eventView']['groupBy']);
$(document).off('click','.analysis-footadd___2D4YB').on('click','.analysis-footadd___2D4YB',function(){
- console.log(user_data);
var arr = {
"columnDesc": user_data[0]['category'][0]['title'],//事件中文显示
"columnName": user_data[0]['category'][0]['id'],//事件id
@@ -5528,17 +5516,23 @@ var X = window.X || {
// 保存报表
$(document).off('click','.analysis-savereport').on('click','.analysis-savereport',function(){
if(baobiaodata != '' && baobiaodata != undefined && baobiaodata != null){
+ baobiaodata['saveas'] = 0;
X.parametersopen(baobiaodata,'savereport','auto');
}else{
X.parametersopen(data,'savereport','auto');
}
});
+ //另存为
+ $(document).off('click','.analysis-saveas').on('click','.analysis-saveas',function(){
+ baobiaodata['saveas'] = 1;
+ X.parametersopen(baobiaodata,'savereport','auto');
+ });
+
// 反向填充数据
function backfilldata(d){
data = d.query;
baobiaodata = d;
- console.log(data);
$('.ant-dropdown-trigger').html(data['events']['quotaDesc']);
$('.analysis-choicetypename').html(data['events']['analysisDesc']);
X.template("globalfilter","xinwei-whole",data['events']['filts'],function(){
@@ -5659,7 +5653,6 @@ var X = window.X || {
events:data.events
}
X.api('ck/'+ dataArr['eventView']['cksql'] +'_model_sql','post',dataArr,function(d){
- console.log(d);
$(".conditionquery-sqldata").html(d[0]['sql']);
$(".conditionquery-apidata").html(JSON.stringify(dataArr));
})
@@ -5795,7 +5788,6 @@ var X = window.X || {
//叉图标关闭弹窗
$(".yidong-top .yidong-cha").click(function(){
- console.log(layer.index)
parent.layer.closeAll(layer.index);
});
//取消按钮
@@ -5840,12 +5832,10 @@ var X = window.X || {
'project_id': X.DATA.projectid,
'dest_space_id': id
};
- console.log(dataArr);
X.api('dashboard/copy_to_my_space','post',dataArr,function(d){
X.pageLogic.dashboard.freshMenu(X.DATA.projectid);//刷新侧边栏
X.pageLogic.adminkanban.updata(X.DATA.projectid);//刷新数据
- console.log(me.parms.layIndex);
layer.closeAll(0);
})
@@ -5863,7 +5853,7 @@ var X = window.X || {
this.parms = parms;
this.callback = parms.callback; //选择后执行的回调
var data = parms.extData;//获取到上层弹窗传的数据
- console.log(data);
+ // console.log(data);
X.api("project/","get",{},function(d){
X.laytpldata("#project-list-box-dot",d,".project-list-box");
@@ -5871,7 +5861,6 @@ var X = window.X || {
});
var dest_project_id;//項目id
layui.form.on('select(projectlist)', function(data){
- console.log(data);
dest_project_id = data.value;
});
@@ -5883,7 +5872,6 @@ var X = window.X || {
'dest_project_id': dest_project_id,
'report_ids': report_ids
};
- console.log(dataArr);
X.api('report/copy','post',dataArr,function(d){
layer.closeAll(0);
@@ -5906,13 +5894,10 @@ var X = window.X || {
function updataselect_list(){
X.api("data_mana/select_list","get",{},function(res){
-
X.laytpldata('#customname-content-box-dot',res,'.customname-content-box');
})
};
-
-
}
};
})();
@@ -6614,6 +6599,7 @@ var X = window.X || {
var ascending = obj.attr("data-ascending");
var avesumdata = obj.attr("data-avesumdata");
var daydata = obj.attr("data-daydata");
+ var reverseorder = obj.attr("data-reverseorder")
var gengduolist
if(X.DATA.authority == "rw"){
@@ -6631,7 +6617,8 @@ var X = window.X || {
ascending:ascending,
daydata:daydata,
avesumdata:avesumdata,
- cat: cat
+ cat: cat,
+ reverseorder:reverseorder
}
X.parametersopen(data,'setupbaobiao',"auto",function(d){
X.pageLogic['dashboard'].gettabledata();
@@ -6678,12 +6665,15 @@ var X = window.X || {
X.api('project/kanban',"post",{"_id":id},function (d){
X.DATA['KanBanData'] = d.kanban;
X.DATA['ProjectData'] = d.spaces;
- X.DATA.authority = d.spaces[0]['authority'];
- if(d.spaces[0]['authority'] == "rw"){
- $(".baobiao").show();
- }else{
- $(".baobiao").hide();
+ if(d.spaces.length > 0){
+ X.DATA.authority = d.spaces[0]['authority'];
+ if(d.spaces[0]['authority'] == "rw"){
+ $(".baobiao").show();
+ }else{
+ $(".baobiao").hide();
+ }
}
+
for(let i in d.spaces){
if(d.spaces[i]['children'].length > 0){
if(X.DATA['dashboard_id'] == undefined || X.DATA['dashboard_id'] == ""){
@@ -6697,7 +6687,14 @@ var X = window.X || {
}
}
// console.log(d.spaces[i]['children'][0]['_id']);
- setHashParms("menu",d.spaces[i]['children'][0]['_id']);
+ var query = window.location.href;
+ var querys = query.split("=");
+ // debugger;
+ if(querys[2] == d.spaces[i]['children'][0]['_id']){
+ X.DATA['dashboard_id'] = querys[2];
+ }else {
+ setHashParms("menu",d.spaces[i]['children'][0]['_id']);
+ }
// $(".tab-tit-box .tab-tit").html(d.spaces[i]['children'][0]['name']);
// X.DATA['dashboard_id'] = d.spaces[i]['children'][0]['_id']; //看板id
}else {
@@ -6753,6 +6750,8 @@ var X = window.X || {
break;//终止循环
+ }else {
+
}
}
});
@@ -6770,12 +6769,12 @@ var X = window.X || {
helper:'clone',
appendTo:'body',
start : function(event, ui){
- console.log(111,event);
- console.log(111,ui);
+ // console.log(111,event);
+ // console.log(111,ui);
},
stop: function(event, ui){
- console.log(222,event);
- console.log(222,ui);
+ // console.log(222,event);
+ // console.log(222,ui);
},
})
@@ -6862,6 +6861,7 @@ var X = window.X || {
data['modelswitch'] = d['modelswitch'];
data['ascending'] = d['ascending'];
data['desc'] = d['desc'];
+ data['reverseorder']=d['reverseorder'];
eventdata.push(data);
// return;
if(d['modelswitch']){
@@ -6936,6 +6936,7 @@ var X = window.X || {
// data['date'] = startTimearr[0] + ' - ' + endTimearr[0];
data['timeParticleSize'] = granularity;
data['desc'] = d['desc'];
+ data['reverseorder']=d['reverseorder'];
eventdata.push(data);
if(d['ascending']){
@@ -6976,6 +6977,7 @@ var X = window.X || {
// data['date'] = startTimearr[0] + ' - ' + endTimearr[0];
data['timeParticleSize'] = granularity;
data['desc'] = d['desc'];
+ data['reverseorder']=d['reverseorder'];
eventdata.push(data);
if(d['ascending']){
@@ -7013,6 +7015,7 @@ var X = window.X || {
data['cat'] = d['model'];
data['date'] = "";
data['desc'] = d['desc'];
+ data['reverseorder']=d['reverseorder'];
eventdata.push(data);
if(d['ascending']){
var condatalength = eventdata[0]['condata'].length;
@@ -7047,6 +7050,7 @@ var X = window.X || {
data['modelsize'] = d['graph_size'];
data['cat'] = d['model'];
data['desc'] = d['desc'];
+ data['reverseorder']=d['reverseorder'];
eventdata.push(data);
if(d['ascending']){
var condatalength = eventdata[0]['condata'].length;
@@ -7648,7 +7652,6 @@ var X = window.X || {
$(document).off('click','.save-list').on('click','.save-list',function(){
var index = $(this).attr('data-index');
var data = savelist[index];
- console.log(data);
layer.closeAll();
me.callback && me.callback(data);
});
@@ -7896,7 +7899,7 @@ var X = window.X || {
this.parms = parms;
this.callback = parms.callback; //选择后执行的回调
var data = parms.extData;//获取到上层弹窗传的数据
- console.log(data);
+ // console.log(data);
if(data){
$(".datarightsedit-txt-input").html(data.owner_list);
@@ -8076,6 +8079,8 @@ var X = window.X || {
report_idarr.push(X.DATA.scatterid);
if(X.DATA.authority != 'rw'){
$('.analysis-savereport').hide();
+ }else {
+ $('.analysis-saveas').hide();
}
X.api('report/read_report','post',{project_id:X.DATA.projectid,report_id:report_idarr},function(d){
backfilldata(d[0]);
@@ -8328,7 +8333,6 @@ var X = window.X || {
// 时间粒度
X.laydropdown('.analtsis-timeParticleSize',X['DATA']['companylist']['distribution'],function(d){
- console.log(d);
$(".analtsis-timeParticleSize").html(d.title);
data['eventView']['timeParticleSize'] = d.id;
// retaineddata();
@@ -8580,12 +8584,19 @@ var X = window.X || {
$(document).off('click','.analysis-savereport').on('click','.analysis-savereport',function(){
if(baobiaodata != '' && baobiaodata != undefined && baobiaodata != null){
+ baobiaodata['saveas'] = 0;
X.parametersopen(baobiaodata,'savereport','auto');
}else{
X.parametersopen(data,'savereport','auto');
}
});
+ //另存为
+ $(document).off('click','.analysis-saveas').on('click','.analysis-saveas',function(){
+ baobiaodata['saveas'] = 1;
+ X.parametersopen(baobiaodata,'savereport','auto');
+ });
+
// 返回
$(document).off('click','.analysis-fanhui').on('click','.analysis-fanhui',function(){
X.gourl("dashboard");
@@ -8774,7 +8785,7 @@ var X = window.X || {
}else {
var data = []
}
- console.log(data);
+ // console.log(data);
X.laytpldata("#analysis-overall-situation-list-box-dot",data,"#initial-event");
}
};
@@ -8939,7 +8950,7 @@ var X = window.X || {
}else {
var data = []
}
- console.log(data);
+ // console.log(data);
X.laytpldata("#analysis-con-left-screen-list-dot",data,"#funnel-event");
}
@@ -9141,7 +9152,6 @@ var X = window.X || {
var dataevent= data['events'][index];
// console.log(dataevent);
X.querycriteriapop(eventdata,'setgrouping',offset.left,offset.top+obj.height(),function(val){
- console.log(val);
obj.html(val.id);
dataevent['eventName'] = val.name;
dataevent['eventDesc'] = val.id;
@@ -9257,7 +9267,6 @@ var X = window.X || {
var offset = obj.offset();
var index = obj.attr("data-index");
X.querycriteriapop(groupitemeventsdata,'category',offset.left,offset.top+obj.height(),function(val){
- console.log(val);
obj.html(val.title);
data['eventView']['filts'][index]['columnDesc'] = val.title;
data['eventView']['filts'][index]['columnName'] = val.id;
@@ -9365,7 +9374,6 @@ var X = window.X || {
var offset = obj.offset();
var index = obj.attr("data-index");
X.querycriteriapop(groupitemeventsdata,'category',offset.left,offset.top+obj.height(),function(val){
- console.log(val);
var htmlstring = val.title;
obj.html(htmlstring);
data.eventView.groupBy[index]['columnDesc'] = val.title;
@@ -9399,8 +9407,6 @@ var X = window.X || {
// 计算按钮
$(document).off('click','.analysis-calculation').on('click','.analysis-calculation',function(){
- console.log(data);
-
retaineddata()
});
var querydata;
@@ -9662,7 +9668,6 @@ var X = window.X || {
}
tabdata.push(arr);
}
- console.log(tabdata);
X.laytpldata("#table-fenxi-th-dot",xAxisdata,".table-fenxi-th");
X.laytpldata("#table-fenxi-td-dot",tabdata,".table-fenxi-td");
};
@@ -9687,7 +9692,6 @@ var X = window.X || {
$(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){
- console.log(d);
if(d){
data = d.query;
@@ -9762,7 +9766,7 @@ var X = window.X || {
{title:'离散数字',id:'discrete',checked:false},
{title:'自定义区间',id:'user_defined',checked:false},
]
- console.log(data);
+ // console.log(data);
if(data!= ''){
for(let i in arr){
if(data['intervalType'] != ""){
@@ -9781,7 +9785,7 @@ var X = window.X || {
];
if(data['intervalType'] == 'user_defined'){
$(".groupeditemspop-custom-box").show();
- console.log(data['quotaIntervalArr']);
+ // console.log(data['quotaIntervalArr']);
if(data['quotaIntervalArr'].length >= qvjian.length){
var num = data['quotaIntervalArr'].length - qvjian.length;
for(var i = 0; i < num; i ++){
@@ -9866,7 +9870,7 @@ var X = window.X || {
this.parms = parms;
this.callback = parms.callback;
var data = parms.extData;
- console.log(data);
+ // console.log(data);
if(data.default !=''){
for(let i in data.data){
if(data.data[i]['id'] == data.default){
@@ -9881,7 +9885,7 @@ var X = window.X || {
X.laytpldata("#groupitem-sele-box-dot",data.data,".groupitem-sele-box");
$(document).on('change','.groupitem-sele-box',function(){
- console.log($(this).val());
+ // console.log($(this).val());
var valdata = {
'id':$(this).val(),
}
@@ -10006,8 +10010,8 @@ var X = window.X || {
var oldIndex = evt.oldIndex;
let item = submitdata.splice(oldIndex, 1); // arr删除2，把2给item
submitdata.splice(newIndex, 0, item[0]);
- console.log(item);
- console.log(submitdata);
+ // console.log(item);
+ // console.log(submitdata);
for(let i in submitdata){
submitdata[i]['sort'] = parseInt(i) + parseInt(1)
}
@@ -10055,17 +10059,14 @@ var X = window.X || {
$(document).off('click','.kanbanadd').on('click','.kanbanadd',function(){
var index = $(this).attr('data-index');
var id = $(this).attr('data-id');
- console.log(id);
for(let i in reportlistdata){
if(reportlistdata[i]['_id'] == id){
- console.log(reportlistdata[i]['_id']);
reportlistdata[index]['added'] = true;
X.laytpldata('#to-be-added-baobiao-dot',reportlistdata,'.to-be-added-baobiao');
X.laytpldata('#to-added-baobiao-dot',reportlistdata,'.to-added-baobiao');
toadddataprocessing();
}
}
-
});
// 修改报表类型
@@ -10637,6 +10638,8 @@ var X = window.X || {
report_idarr.push(X.DATA.ltvid);
if(X.DATA.authority != 'rw'){
$('.analysis-savereport').hide();
+ }else {
+ $(".analysis-saveas").show();
}
X.api('report/read_report','post',{project_id:X.DATA.projectid,report_id:report_idarr},function(d){
backfilldata(d[0]);
@@ -10904,12 +10907,20 @@ var X = window.X || {
$(document).off('click','.analysis-savereport').on('click','.analysis-savereport',function(){
if(baobiaodata != '' && baobiaodata != undefined && baobiaodata != null){
+ baobiaodata['saveas'] = 0;
X.parametersopen(baobiaodata,'savereport','auto');
}else{
X.parametersopen(data,'savereport','auto');
}
});
+ //另存为
+ $(document).off('click','.analysis-saveas').on('click','.analysis-saveas',function(){
+ baobiaodata['saveas'] = 1;
+ X.parametersopen(baobiaodata,'savereport','auto');
+
+ });
+
// 返回
$(document).off('click','.analysis-fanhui').on('click','.analysis-fanhui',function(){
X.gourl("dashboard");
@@ -10981,10 +10992,15 @@ var X = window.X || {
// }else {
$("#conent-box"+data.id).html(html);
// }
+ console.log(data.reverseorder , data.name);
if(data.modeltype == "table" && data.modelsize != "small"){
var tableMul;
var id = 'dataTableMul'+data['id'];
- tableMul = new FixedTable(id, 2);
+ if(data.reverseorder){
+ tableMul = new FixedTable(id, 2);
+ }else {
+ tableMul = new FixedTable(id, 0);
+ }
}
})
@@ -11828,6 +11844,8 @@ var X = window.X || {
report_idarr.push(X.DATA.retentionid);
if(X.DATA.authority != 'rw'){
$('.analysis-savereport').hide();
+ }else {
+ $(".analysis-saveas").show();
}
X.api('report/read_report','post',{project_id:X.DATA.projectid,report_id:report_idarr},function(d){
backfilldata(d[0]);
@@ -12291,12 +12309,20 @@ var X = window.X || {
$(document).off('click','.analysis-savereport').on('click','.analysis-savereport',function(){
if(baobiaodata != '' && baobiaodata != undefined && baobiaodata != null){
+ baobiaodata['saveas']= 0;
X.parametersopen(baobiaodata,'savereport','auto');
}else{
X.parametersopen(data,'savereport','auto');
}
});
+ //另存为
+ $(document).off('click','.analysis-saveas').on('click','.analysis-saveas',function(){
+ baobiaodata['saveas']= 1;
+ X.parametersopen(baobiaodata,'savereport','auto');
+
+ });
+
$(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){
console.log(d);
@@ -13466,7 +13492,7 @@ var X = window.X || {
return false;
}
- if(data._id){
+ if(data.saveas == 0 ){
data['query']['eventView']['date_type'] = tabval.date_type;
var arr = {
name: tabval['title'],
@@ -13483,7 +13509,7 @@ var X = window.X || {
var arr = {
name: tabval['title'],
desc:tabval['desc'],
- query:data,
+ query:data,
project_id:X.DATA.projectid,
cat: data['eventView']['cksql']
}
@@ -13958,7 +13984,12 @@ var X = window.X || {
}else {
$("#gbreverseorder").prop("checked",true);
}
-
+ // 初始化首行浮动
+ if(data.reverseorder && data.reverseorder != undefined && data.reverseorder == "true"){
+ $('#kqfirstlinefloat').prop('checked',true);
+ }else {
+ $('#gbfirstlinefloat').prop('checked',true);
+ }
if(data.daydata && data.daydata != undefined && data.daydata == "false"){
$('#daydatafalse').prop('checked',true);
}else {
@@ -14018,10 +14049,12 @@ var X = window.X || {
var ascending = $('input:radio[name="reverseorder"]:checked').val();
var avesumdata = $('input:radio[name="avesumdata"]:checked').val();
var daydata = $('input:radio[name="daydata"]:checked').val();
+ var reverseorder = $('input:radio[name="firstlinefloat"]:checked').val();
if(modelswitch == "true"){ modelswitch = true;}else {modelswitch = false;};
if(ascending == 'true'){ ascending = true }else { ascending = false };
if(avesumdata == "true"){ avesumdata = true;}else {avesumdata = false;};
if(daydata == 'true'){ daydata = true }else { daydata = false };
+ if(reverseorder == 'true'){ reverseorder = true } else { reverseorder = false };
var arr = {
_id:X.DATA.dashboard_id,
report:{
@@ -14034,7 +14067,8 @@ var X = window.X || {
modelswitch: modelswitch,
ascending:ascending,
avesumdata:avesumdata,
- daydata:daydata
+ daydata:daydata,
+ reverseorder:reverseorder
}
}
// console.log(arr);
diff --git a/web/srczip/base/ajaxpage.js b/web/srczip/base/ajaxpage.js
index 1e457c6..e9d08ee 100644
--- a/web/srczip/base/ajaxpage.js
+++ b/web/srczip/base/ajaxpage.js
@@ -68,13 +68,12 @@
var b = n > document.documentElement.scrollWidth-20;
if(b && window.event.clientY < 0 || window.event.altKey){
//页面关闭
- console.log('页面关闭');
+ // console.log('页面关闭');
}else{
//页面刷新
- console.log('页面刷新111');
+ // console.log('页面刷新111');
var query = window.location.href;
var querys = query.split("=");
- console.log(querys[1]);
if(querys[1] != undefined && querys[1] != 'login'){
$("#conetnt").html("");
X.gourl('dashboard');
diff --git a/web/srczip/base/visibleChange.js b/web/srczip/base/visibleChange.js
index fc8bdfd..2c7e9df 100644
--- a/web/srczip/base/visibleChange.js
+++ b/web/srczip/base/visibleChange.js
@@ -24,10 +24,8 @@
$('.layui-col').visibleChange(function(isShow){
if(isShow==1){
//被看见了
- console.log(111);
}else{
//看不见了
- console.log(222);
}
});
}
diff --git a/web/srczip/common.js b/web/srczip/common.js
index 5f62210..5f71b8b 100644
--- a/web/srczip/common.js
+++ b/web/srczip/common.js
@@ -180,7 +180,7 @@ var X = window.X || {
data:data,
async:true,
contentType: contentType,
- beforeSend: function () {
+ beforeSend: function () {
// loading 显示
index = layer.load(1);
},
@@ -192,7 +192,7 @@ var X = window.X || {
callback && callback(d.data);
}else {
layer.msg('查无数据');
- callback && callback(d);
+ callback && callback(d.data);
}
}else {
if(d.code == -5){
diff --git a/web/srczip/logic/3rmodel.js b/web/srczip/logic/3rmodel.js
index 9b01be5..d0126be 100644
--- a/web/srczip/logic/3rmodel.js
+++ b/web/srczip/logic/3rmodel.js
@@ -52,8 +52,6 @@
var startmonth = Date.parse(startdate)/1000;
data['eventView']['e_days'] = parseInt((sameday - endmonth)/86400);
data['eventView']['s_days'] = parseInt((sameday - startmonth)/86400);
- console.log(parseInt((sameday - endmonth)/86400));
- console.log(parseInt((sameday - startmonth)/86400));
// calculationdata();
})
@@ -363,7 +361,6 @@
var indexs = $(this).attr("data-indexs");
var val = $(this).val();
var valarr = val.split(",");
- console.log(data['events'][index]);
if(data['events'][index]['filts'][indexs]){
data['events'][index]['filts'][indexs]['ftv']=valarr;
data['events'][index]['filts'][indexs]['strftv']=val;
@@ -472,7 +469,6 @@
var obj = $(this);
var offset = obj.offset();
var index = obj.attr("data-index");
- console.log(data['events']);
data['events'][index]['customEvent'] = $(this).val();
});
@@ -605,7 +601,6 @@
// 全局筛选
var filtsftvdata=[];
$(document).off('click','.analysis-overall-situation-add').on('click','.analysis-overall-situation-add',function(){
- console.log(defaultgroupdata);
var drr={
"columnDesc":defaultgroupdata[0]['category'][0]['title'],//事件中文显示 columnDesc
"columnName":defaultgroupdata[0]['category'][0]['id'],//事件id
@@ -671,7 +666,6 @@
$(document).off('click','.analysis-overall-situation-date').on('click','.analysis-overall-situation-date',function(){
var index = $(this).attr('data-index');
render_date_index = index;
- // console.log(index);
});
// 渲染过滤项时间框
@@ -773,7 +767,6 @@
var querydata;//查询数据
$(document).on('click','.analtsis-chart-switch-box .analtsis-chart-switch',function(){
- console.log(querydata);
if(querydata){
$('.analtsis-chart-switch-box .analtsis-chart-switch').removeClass('select-chart');
$(this).addClass('select-chart');
@@ -887,9 +880,6 @@
seriesData[i]['name'] = xAxisData[i];
}
}
- console.log(xAxisData)
- console.log(seriesData)
- console.log(d[0]['date_range']);
var myChart = echarts.init(document.getElementById('analysis-echarts'));
var option = {
title: {
@@ -1124,13 +1114,12 @@
if(baobiaodata != '' && baobiaodata != undefined && baobiaodata != null){
X.parametersopen(baobiaodata,'savereport','auto');
}else{
- X.parametersopen(data,'savereport','auto');
+ X.parametersopen(data,'savereport','auto');
}
});
// 下载
$(document).off('click','.download-table').on('click','.download-table',function(){
- // console.log(11111);
X.download('ck/event_model_export',data,'事件分析');
});
diff --git a/web/srczip/logic/addexistuser.js b/web/srczip/logic/addexistuser.js
index 65c8aae..294722f 100644
--- a/web/srczip/logic/addexistuser.js
+++ b/web/srczip/logic/addexistuser.js
@@ -20,7 +20,7 @@
});
X.api("project/members","get",{},function(d){
- console.log(d)
+ // console.log(d)
// X.laytpldata("#addexistuser-con-user-box-dot",d,".addexistuser-con-user-box");
});
@@ -95,7 +95,7 @@
Addeddate.splice(i,1);
}
}
- console.log(Addeddate)
+
X.laytpldata("#addexistuser-table-con-list-dot",Addeddate,".addexistuser-table-con-list");
addlaydropdown();
@@ -171,7 +171,7 @@
});
//确定按钮
$(".addexistuser-btn-qd").click(function(){
- console.log(Addeddate);
+
var ylist = [];
for(let i in Addeddate){
var arr = {
@@ -181,13 +181,12 @@
}
ylist.push(arr)
}
- console.log(ylist);
+
if(ylist.length == 0){
layer.msg('暂未选择用户');
return;
}
X.api("authz/add_role_domain","post",{data:ylist},function(d){
- console.log(d)
layer.closeAll();
});
});
diff --git a/web/srczip/logic/addproject_owner_name.js b/web/srczip/logic/addproject_owner_name.js
index d5b4007..95ffafc 100644
--- a/web/srczip/logic/addproject_owner_name.js
+++ b/web/srczip/logic/addproject_owner_name.js
@@ -5,7 +5,7 @@
this.parms = parms;
this.callback = parms.callback; //选择后执行的回调
var data = parms.extData;//获取到上层弹窗传的数据
- console.log(data);
+ // console.log(data);
if(data){
// for(let i in data.ditch){
@@ -52,7 +52,6 @@
X.api("project/add_project_name","post",{game:data.game,ditch:data.ditch,name: data.name},function(d){
if(d){
- console.log(d);
layer.msg("编辑成功");
me.callback && me.callback();
layer.closeAll();
diff --git a/web/srczip/logic/addrole.js b/web/srczip/logic/addrole.js
index 56908dc..2f896b5 100644
--- a/web/srczip/logic/addrole.js
+++ b/web/srczip/logic/addrole.js
@@ -13,15 +13,14 @@
if(parms){
this.parms = parms;
var passdata = parms;
- console.log(passdata);
+
X.api("authz/get_permissions_for_user_in_domain","post",{role_id:passdata.id,game:X['DATA']['game']},function(d){
- console.log(d);
+
$('.addrole-tit').val(passdata.title);
var selinput = {}
for(let i in d){
selinput[d[i]['_id']] = true
}
- console.log(selinput);
layui.form.val('addroleexample', selinput)
});
};
@@ -43,7 +42,6 @@
for(let i in data){
selinput[data[i]['path']] = true
}
- console.log(selinput);
layui.form.val('addroleexample', selinput)
});
diff --git a/web/srczip/logic/adduser.js b/web/srczip/logic/adduser.js
index e69055b..13be1cd 100644
--- a/web/srczip/logic/adduser.js
+++ b/web/srczip/logic/adduser.js
@@ -6,18 +6,18 @@
layer.closeAll();
})
- // var projectrolearr,projectrolearrlist=[];
- // X.api("authz/roles","get",{},function(d){
- // projectrolearr = d;
- // for(let i in projectrolearr){
- // var arr={
- // id:projectrolearr[i]['_id'],
- // title:projectrolearr[i]['name'],
- // game:projectrolearr[i]['game']
- // }
- // projectrolearrlist.push(arr);
- // }
- // })
+ var projectrolearr,projectrolearrlist=[];
+ X.api("authz/roles","get",{},function(d){
+ projectrolearr = d;
+ for(let i in projectrolearr){
+ var arr={
+ id:projectrolearr[i]['_id'],
+ title:projectrolearr[i]['name'],
+ game:projectrolearr[i]['game']
+ }
+ projectrolearrlist.push(arr);
+ }
+ })
// var datarightsarr;
// X.api("data_auth/list","get",{},function(d){
// datarightsarr = d;
@@ -29,8 +29,10 @@
var titarr = txt.split(",");
for(let i in titarr){
var arr = {
+ "game": X.DATA.game,
"username": titarr[i],
- // "role_name": projectrolearr[0]["name"],
+ "role_name": projectrolearr[0]["name"],
+ "role_id": projectrolearr[0]["_id"]
// "data_authority":datarightsarr[0]["title"],
// "data_auth_id":datarightsarr[0]["id"]
}
@@ -66,11 +68,13 @@
// 项目角色修改
// console.log(projectrolearrlist);
- // X.laydropdown(".adduser-role",projectrolearrlist,function(d){
- // cprojectdiv.html(d.title);
+ X.laydropdown(".adduser-role",projectrolearrlist,function(d){
+ cprojectdiv.html(d.title);
- // adduserData[cprojectindex]['role_name'] = d.title;
- // })
+ adduserData[cprojectindex]['role_name'] = d.title;
+ adduserData[cprojectindex]['role_id'] = d.id;
+
+ })
// 数据权限修改
// X.laydropdown(".adduser-attr",datarightsarr,function(d){
// cdatarightsdiv.html(d.title);
@@ -85,16 +89,20 @@
});
$(document).off('click','.adduser-but-box .adduser-btn2').on('click','.adduser-but-box .adduser-btn2',function(){
- console.log(adduserData);
var namearr = [];
+
for(let i in adduserData){
namearr.push(adduserData[i]['username']);
}
if(namearr.length > 0){
+ //创建账号
X.api("user/add_account","post",{account_list:namearr},function(d){
- X.pageLogic.useradmin.useradmin();
- layer.closeAll();
- layer.msg("创建成功");
+ //给账号添加项目角色
+ X.api("authz/add_role_domain","post",{data:adduserData},function(d){
+ X.pageLogic.useradmin.useradmin();
+ layer.closeAll();
+ layer.msg("创建成功");
+ });
})
}else {
layer.msg("请先添加账号");
diff --git a/web/srczip/logic/addusergroup.js b/web/srczip/logic/addusergroup.js
index df6f8bd..0afdce5 100644
--- a/web/srczip/logic/addusergroup.js
+++ b/web/srczip/logic/addusergroup.js
@@ -27,7 +27,6 @@
$(".addusergroup-qd").click(function(){
var getData = layui.transfer.getData('addusergroupuserinfo');
var txt = $(".addusergroup-txt").val();
- console.log(getData);
layer.closeAll();
})
diff --git a/web/srczip/logic/adminkanban.js b/web/srczip/logic/adminkanban.js
index 4ab3d49..5ad6350 100644
--- a/web/srczip/logic/adminkanban.js
+++ b/web/srczip/logic/adminkanban.js
@@ -135,7 +135,6 @@
$(document).off('click','.adminmykanban-operation-but-yidong').on('click','.adminmykanban-operation-but-yidong',function(){
var mykanban = layui.tree.getChecked('mykanban');
var kongjian = layui.tree.getChecked('kongjian');
- console.log(kongjian);
if(mykanban.length < 1 && kongjian.length < 1){
alert('请先选择需要移动的看板!!!');
return;
@@ -184,7 +183,6 @@
$(document).off('click','.adminmykanban-operation-but-copykongjian').on('click','.adminmykanban-operation-but-copykongjian',function(){
var mykanban = layui.tree.getChecked('mykanban');
var kongjian = layui.tree.getChecked('kongjian');
- console.log(kongjian);
if(mykanban.length < 1 && kongjian.length < 1){
alert('请先选择需要移动的看板!!!');
return;
@@ -255,7 +253,6 @@
updata:function(id){
X.api("project/kanban","post",{"_id":id},function(d){
- console.log(d);
var kanban = [];
for(let i in d.kanban){
var arr = {};
diff --git a/web/srczip/logic/analysis.js b/web/srczip/logic/analysis.js
index 43abd74..454ffc6 100644
--- a/web/srczip/logic/analysis.js
+++ b/web/srczip/logic/analysis.js
@@ -50,8 +50,6 @@
var startmonth = Date.parse(startdate)/1000;
data['eventView']['e_days'] = parseInt((sameday - endmonth)/86400);
data['eventView']['s_days'] = parseInt((sameday - startmonth)/86400);
- console.log(parseInt((sameday - endmonth)/86400));
- console.log(parseInt((sameday - startmonth)/86400));
// calculationdata();
})
@@ -100,6 +98,8 @@
report_idarr.push(X.DATA.eventid);
if(X.DATA.authority != 'rw'){
$('.analysis-savereport').hide();
+ }else {
+ $('.analysis-saveas').show();
}
X.api('report/read_report','post',{project_id:X.DATA.projectid,report_id:report_idarr},function(d){
backfilldata(d[0]);
@@ -190,7 +190,6 @@
var oldIndex = evt.oldIndex;
let item = data.events.splice(oldIndex, 1); // arr删除2，把2给item
data.events.splice(newIndex, 0, item[0]);
- console.log(data);
updataindex(data.events);
}
});
@@ -405,7 +404,6 @@
if(val != "查无数据"){
X.parametersopen(val['map_'],'dropdownlist',[offset.top+obj.height(),offset.left],function(val){
- console.log(val);
if(indexs != undefined){
data['events'][index]['filts'][indexs]['strftv'] = val.title;
var arr = [];
@@ -433,7 +431,6 @@
var indexs = $(this).attr("data-indexs");
var val = $(this).val();
var valarr = val.split(",");
- console.log(data['events'][index]);
if(data['events'][index]['filts'][indexs]){
data['events'][index]['filts'][indexs]['ftv']=valarr;
data['events'][index]['filts'][indexs]['strftv']=val;
@@ -543,7 +540,6 @@
var obj = $(this);
var offset = obj.offset();
var index = obj.attr("data-index");
- console.log(data['events']);
data['events'][index]['customEvent'] = $(this).val();
});
@@ -1009,9 +1005,6 @@
seriesData[i]['name'] = xAxisData[i];
}
}
- console.log(xAxisData)
- console.log(seriesData)
- console.log(d[0]['date_range']);
var myChart = echarts.init(document.getElementById('analysis-echarts'));
var option = {
title: {
@@ -1249,12 +1242,20 @@
// 保存报表
$(document).off('click','.analysis-savereport').on('click','.analysis-savereport',function(){
if(baobiaodata != '' && baobiaodata != undefined && baobiaodata != null){
+ baobiaodata['saveas']= 0;
X.parametersopen(baobiaodata,'savereport','auto');
}else{
X.parametersopen(data,'savereport','auto');
}
});
+ //另存为
+ $(document).off('click','.analysis-saveas').on('click','.analysis-saveas',function(){
+ baobiaodata['saveas']= 1;
+ X.parametersopen(baobiaodata,'savereport','auto');
+
+ });
+
// 下载
$(document).off('click','.download-table').on('click','.download-table',function(){
// console.log(11111);
diff --git a/web/srczip/logic/apiadmin_add.js b/web/srczip/logic/apiadmin_add.js
index 9bc1248..7236dce 100644
--- a/web/srczip/logic/apiadmin_add.js
+++ b/web/srczip/logic/apiadmin_add.js
@@ -5,7 +5,7 @@
this.parms = parms;
this.callback = parms.callback; //选择后执行的回调
var data = parms.extData;//获取到上层弹窗传的数据
- console.log(data);
+ // console.log(data);
if(data){
$("#path").val(data.path);
$("#name").val(data.name);
diff --git a/web/srczip/logic/attribute.js b/web/srczip/logic/attribute.js
index f14f9bd..ad39c27 100644
--- a/web/srczip/logic/attribute.js
+++ b/web/srczip/logic/attribute.js
@@ -87,6 +87,8 @@
report_idarr.push(X.DATA.user_propertyid);
if(X.DATA.authority != 'rw'){
$('.analysis-savereport').hide();
+ }else{
+ $('.analysis-saveas').hide();
}
X.api('report/read_report','post',{project_id:X.DATA.projectid,report_id:report_idarr},function(d){
backfilldata(d[0]);
@@ -142,7 +144,6 @@
// 分组项
X.template("grouped","shushi",data['eventView']['groupBy']);
$(document).off('click','.analysis-footadd___2D4YB').on('click','.analysis-footadd___2D4YB',function(){
- console.log(user_data);
var arr = {
"columnDesc": user_data[0]['category'][0]['title'],//事件中文显示
"columnName": user_data[0]['category'][0]['id'],//事件id
@@ -497,17 +498,23 @@
// 保存报表
$(document).off('click','.analysis-savereport').on('click','.analysis-savereport',function(){
if(baobiaodata != '' && baobiaodata != undefined && baobiaodata != null){
+ baobiaodata['saveas'] = 0;
X.parametersopen(baobiaodata,'savereport','auto');
}else{
X.parametersopen(data,'savereport','auto');
}
});
+ //另存为
+ $(document).off('click','.analysis-saveas').on('click','.analysis-saveas',function(){
+ baobiaodata['saveas'] = 1;
+ X.parametersopen(baobiaodata,'savereport','auto');
+ });
+
// 反向填充数据
function backfilldata(d){
data = d.query;
baobiaodata = d;
- console.log(data);
$('.ant-dropdown-trigger').html(data['events']['quotaDesc']);
$('.analysis-choicetypename').html(data['events']['analysisDesc']);
X.template("globalfilter","xinwei-whole",data['events']['filts'],function(){
diff --git a/web/srczip/logic/conditionquery.js b/web/srczip/logic/conditionquery.js
index e81e468..00429cf 100644
--- a/web/srczip/logic/conditionquery.js
+++ b/web/srczip/logic/conditionquery.js
@@ -10,7 +10,6 @@
events:data.events
}
X.api('ck/'+ dataArr['eventView']['cksql'] +'_model_sql','post',dataArr,function(d){
- console.log(d);
$(".conditionquery-sqldata").html(d[0]['sql']);
$(".conditionquery-apidata").html(JSON.stringify(dataArr));
})
diff --git a/web/srczip/logic/copykanban_kongjian.js b/web/srczip/logic/copykanban_kongjian.js
index d38408a..8284b4d 100644
--- a/web/srczip/logic/copykanban_kongjian.js
+++ b/web/srczip/logic/copykanban_kongjian.js
@@ -17,7 +17,6 @@
//叉图标关闭弹窗
$(".yidong-top .yidong-cha").click(function(){
- console.log(layer.index)
parent.layer.closeAll(layer.index);
});
//取消按钮
@@ -62,12 +61,10 @@
'project_id': X.DATA.projectid,
'dest_space_id': id
};
- console.log(dataArr);
X.api('dashboard/copy_to_my_space','post',dataArr,function(d){
X.pageLogic.dashboard.freshMenu(X.DATA.projectid);//刷新侧边栏
X.pageLogic.adminkanban.updata(X.DATA.projectid);//刷新数据
- console.log(me.parms.layIndex);
layer.closeAll(0);
})
diff --git a/web/srczip/logic/copyreport.js b/web/srczip/logic/copyreport.js
index 0545753..b31b762 100644
--- a/web/srczip/logic/copyreport.js
+++ b/web/srczip/logic/copyreport.js
@@ -5,7 +5,7 @@
this.parms = parms;
this.callback = parms.callback; //选择后执行的回调
var data = parms.extData;//获取到上层弹窗传的数据
- console.log(data);
+ // console.log(data);
X.api("project/","get",{},function(d){
X.laytpldata("#project-list-box-dot",d,".project-list-box");
@@ -13,7 +13,6 @@
});
var dest_project_id;//項目id
layui.form.on('select(projectlist)', function(data){
- console.log(data);
dest_project_id = data.value;
});
@@ -25,7 +24,6 @@
'dest_project_id': dest_project_id,
'report_ids': report_ids
};
- console.log(dataArr);
X.api('report/copy','post',dataArr,function(d){
layer.closeAll(0);
diff --git a/web/srczip/logic/customname.js b/web/srczip/logic/customname.js
index b1a4266..b64c5f2 100644
--- a/web/srczip/logic/customname.js
+++ b/web/srczip/logic/customname.js
@@ -10,13 +10,10 @@
function updataselect_list(){
X.api("data_mana/select_list","get",{},function(res){
-
X.laytpldata('#customname-content-box-dot',res,'.customname-content-box');
})
};
-
-
}
};
})();
\ No newline at end of file
diff --git a/web/srczip/logic/dashboard.js b/web/srczip/logic/dashboard.js
index 182ca5c..dc3bea1 100644
--- a/web/srczip/logic/dashboard.js
+++ b/web/srczip/logic/dashboard.js
@@ -695,6 +695,7 @@
var ascending = obj.attr("data-ascending");
var avesumdata = obj.attr("data-avesumdata");
var daydata = obj.attr("data-daydata");
+ var reverseorder = obj.attr("data-reverseorder")
var gengduolist
if(X.DATA.authority == "rw"){
@@ -712,7 +713,8 @@
ascending:ascending,
daydata:daydata,
avesumdata:avesumdata,
- cat: cat
+ cat: cat,
+ reverseorder:reverseorder
}
X.parametersopen(data,'setupbaobiao',"auto",function(d){
X.pageLogic['dashboard'].gettabledata();
@@ -759,12 +761,15 @@
X.api('project/kanban',"post",{"_id":id},function (d){
X.DATA['KanBanData'] = d.kanban;
X.DATA['ProjectData'] = d.spaces;
- X.DATA.authority = d.spaces[0]['authority'];
- if(d.spaces[0]['authority'] == "rw"){
- $(".baobiao").show();
- }else{
- $(".baobiao").hide();
+ if(d.spaces.length > 0){
+ X.DATA.authority = d.spaces[0]['authority'];
+ if(d.spaces[0]['authority'] == "rw"){
+ $(".baobiao").show();
+ }else{
+ $(".baobiao").hide();
+ }
}
+
for(let i in d.spaces){
if(d.spaces[i]['children'].length > 0){
if(X.DATA['dashboard_id'] == undefined || X.DATA['dashboard_id'] == ""){
@@ -778,7 +783,14 @@
}
}
// console.log(d.spaces[i]['children'][0]['_id']);
- setHashParms("menu",d.spaces[i]['children'][0]['_id']);
+ var query = window.location.href;
+ var querys = query.split("=");
+ // debugger;
+ if(querys[2] == d.spaces[i]['children'][0]['_id']){
+ X.DATA['dashboard_id'] = querys[2];
+ }else {
+ setHashParms("menu",d.spaces[i]['children'][0]['_id']);
+ }
// $(".tab-tit-box .tab-tit").html(d.spaces[i]['children'][0]['name']);
// X.DATA['dashboard_id'] = d.spaces[i]['children'][0]['_id']; //看板id
}else {
@@ -834,6 +846,8 @@
break;//终止循环
+ }else {
+
}
}
});
@@ -851,12 +865,12 @@
helper:'clone',
appendTo:'body',
start : function(event, ui){
- console.log(111,event);
- console.log(111,ui);
+ // console.log(111,event);
+ // console.log(111,ui);
},
stop: function(event, ui){
- console.log(222,event);
- console.log(222,ui);
+ // console.log(222,event);
+ // console.log(222,ui);
},
})
@@ -943,6 +957,7 @@
data['modelswitch'] = d['modelswitch'];
data['ascending'] = d['ascending'];
data['desc'] = d['desc'];
+ data['reverseorder']=d['reverseorder'];
eventdata.push(data);
// return;
if(d['modelswitch']){
@@ -1017,6 +1032,7 @@
// data['date'] = startTimearr[0] + ' - ' + endTimearr[0];
data['timeParticleSize'] = granularity;
data['desc'] = d['desc'];
+ data['reverseorder']=d['reverseorder'];
eventdata.push(data);
if(d['ascending']){
@@ -1057,6 +1073,7 @@
// data['date'] = startTimearr[0] + ' - ' + endTimearr[0];
data['timeParticleSize'] = granularity;
data['desc'] = d['desc'];
+ data['reverseorder']=d['reverseorder'];
eventdata.push(data);
if(d['ascending']){
@@ -1094,6 +1111,7 @@
data['cat'] = d['model'];
data['date'] = "";
data['desc'] = d['desc'];
+ data['reverseorder']=d['reverseorder'];
eventdata.push(data);
if(d['ascending']){
var condatalength = eventdata[0]['condata'].length;
@@ -1128,6 +1146,7 @@
data['modelsize'] = d['graph_size'];
data['cat'] = d['model'];
data['desc'] = d['desc'];
+ data['reverseorder']=d['reverseorder'];
eventdata.push(data);
if(d['ascending']){
var condatalength = eventdata[0]['condata'].length;
diff --git a/web/srczip/logic/datacheck_list.js b/web/srczip/logic/datacheck_list.js
index 6f03287..0ad62fa 100644
--- a/web/srczip/logic/datacheck_list.js
+++ b/web/srczip/logic/datacheck_list.js
@@ -19,7 +19,6 @@
$(document).off('click','.save-list').on('click','.save-list',function(){
var index = $(this).attr('data-index');
var data = savelist[index];
- console.log(data);
layer.closeAll();
me.callback && me.callback(data);
});
diff --git a/web/srczip/logic/datarightsedit.js b/web/srczip/logic/datarightsedit.js
index 97af60b..a937fea 100644
--- a/web/srczip/logic/datarightsedit.js
+++ b/web/srczip/logic/datarightsedit.js
@@ -5,7 +5,7 @@
this.parms = parms;
this.callback = parms.callback; //选择后执行的回调
var data = parms.extData;//获取到上层弹窗传的数据
- console.log(data);
+ // console.log(data);
if(data){
$(".datarightsedit-txt-input").html(data.owner_list);
diff --git a/web/srczip/logic/distribution.js b/web/srczip/logic/distribution.js
index ff46651..eff09f1 100644
--- a/web/srczip/logic/distribution.js
+++ b/web/srczip/logic/distribution.js
@@ -123,6 +123,8 @@
report_idarr.push(X.DATA.scatterid);
if(X.DATA.authority != 'rw'){
$('.analysis-savereport').hide();
+ }else {
+ $('.analysis-saveas').hide();
}
X.api('report/read_report','post',{project_id:X.DATA.projectid,report_id:report_idarr},function(d){
backfilldata(d[0]);
@@ -375,7 +377,6 @@
// 时间粒度
X.laydropdown('.analtsis-timeParticleSize',X['DATA']['companylist']['distribution'],function(d){
- console.log(d);
$(".analtsis-timeParticleSize").html(d.title);
data['eventView']['timeParticleSize'] = d.id;
// retaineddata();
@@ -627,12 +628,19 @@
$(document).off('click','.analysis-savereport').on('click','.analysis-savereport',function(){
if(baobiaodata != '' && baobiaodata != undefined && baobiaodata != null){
+ baobiaodata['saveas'] = 0;
X.parametersopen(baobiaodata,'savereport','auto');
}else{
X.parametersopen(data,'savereport','auto');
}
});
+ //另存为
+ $(document).off('click','.analysis-saveas').on('click','.analysis-saveas',function(){
+ baobiaodata['saveas'] = 1;
+ X.parametersopen(baobiaodata,'savereport','auto');
+ });
+
// 返回
$(document).off('click','.analysis-fanhui').on('click','.analysis-fanhui',function(){
X.gourl("dashboard");
diff --git a/web/srczip/logic/event.js b/web/srczip/logic/event.js
index 6d75fbd..3afff5d 100644
--- a/web/srczip/logic/event.js
+++ b/web/srczip/logic/event.js
@@ -8,7 +8,7 @@
}else {
var data = []
}
- console.log(data);
+ // console.log(data);
X.laytpldata("#analysis-overall-situation-list-box-dot",data,"#initial-event");
}
};
diff --git a/web/srczip/logic/funnel.js b/web/srczip/logic/funnel.js
index 535301e..7551951 100644
--- a/web/srczip/logic/funnel.js
+++ b/web/srczip/logic/funnel.js
@@ -8,7 +8,7 @@
}else {
var data = []
}
- console.log(data);
+ // console.log(data);
X.laytpldata("#analysis-con-left-screen-list-dot",data,"#funnel-event");
}
diff --git a/web/srczip/logic/funnelanalysis.js b/web/srczip/logic/funnelanalysis.js
index 73d2af7..873309e 100644
--- a/web/srczip/logic/funnelanalysis.js
+++ b/web/srczip/logic/funnelanalysis.js
@@ -193,7 +193,6 @@
var dataevent= data['events'][index];
// console.log(dataevent);
X.querycriteriapop(eventdata,'setgrouping',offset.left,offset.top+obj.height(),function(val){
- console.log(val);
obj.html(val.id);
dataevent['eventName'] = val.name;
dataevent['eventDesc'] = val.id;
@@ -309,7 +308,6 @@
var offset = obj.offset();
var index = obj.attr("data-index");
X.querycriteriapop(groupitemeventsdata,'category',offset.left,offset.top+obj.height(),function(val){
- console.log(val);
obj.html(val.title);
data['eventView']['filts'][index]['columnDesc'] = val.title;
data['eventView']['filts'][index]['columnName'] = val.id;
@@ -417,7 +415,6 @@
var offset = obj.offset();
var index = obj.attr("data-index");
X.querycriteriapop(groupitemeventsdata,'category',offset.left,offset.top+obj.height(),function(val){
- console.log(val);
var htmlstring = val.title;
obj.html(htmlstring);
data.eventView.groupBy[index]['columnDesc'] = val.title;
@@ -451,8 +448,6 @@
// 计算按钮
$(document).off('click','.analysis-calculation').on('click','.analysis-calculation',function(){
- console.log(data);
-
retaineddata()
});
var querydata;
@@ -714,7 +709,6 @@
}
tabdata.push(arr);
}
- console.log(tabdata);
X.laytpldata("#table-fenxi-th-dot",xAxisdata,".table-fenxi-th");
X.laytpldata("#table-fenxi-td-dot",tabdata,".table-fenxi-td");
};
@@ -739,7 +733,6 @@
$(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){
- console.log(d);
if(d){
data = d.query;
diff --git a/web/srczip/logic/groupeditemspop.js b/web/srczip/logic/groupeditemspop.js
index 26bb96b..42dcdfc 100644
--- a/web/srczip/logic/groupeditemspop.js
+++ b/web/srczip/logic/groupeditemspop.js
@@ -11,7 +11,7 @@
{title:'离散数字',id:'discrete',checked:false},
{title:'自定义区间',id:'user_defined',checked:false},
]
- console.log(data);
+ // console.log(data);
if(data!= ''){
for(let i in arr){
if(data['intervalType'] != ""){
@@ -30,7 +30,7 @@
];
if(data['intervalType'] == 'user_defined'){
$(".groupeditemspop-custom-box").show();
- console.log(data['quotaIntervalArr']);
+ // console.log(data['quotaIntervalArr']);
if(data['quotaIntervalArr'].length >= qvjian.length){
var num = data['quotaIntervalArr'].length - qvjian.length;
for(var i = 0; i < num; i ++){
diff --git a/web/srczip/logic/groupitem.js b/web/srczip/logic/groupitem.js
index c940a28..4c06feb 100644
--- a/web/srczip/logic/groupitem.js
+++ b/web/srczip/logic/groupitem.js
@@ -5,7 +5,7 @@
this.parms = parms;
this.callback = parms.callback;
var data = parms.extData;
- console.log(data);
+ // console.log(data);
if(data.default !=''){
for(let i in data.data){
if(data.data[i]['id'] == data.default){
@@ -20,7 +20,7 @@
X.laytpldata("#groupitem-sele-box-dot",data.data,".groupitem-sele-box");
$(document).on('change','.groupitem-sele-box',function(){
- console.log($(this).val());
+ // console.log($(this).val());
var valdata = {
'id':$(this).val(),
}
diff --git a/web/srczip/logic/kanbanadmin.js b/web/srczip/logic/kanbanadmin.js
index 24ffeac..37e2c07 100644
--- a/web/srczip/logic/kanbanadmin.js
+++ b/web/srczip/logic/kanbanadmin.js
@@ -46,8 +46,8 @@
var oldIndex = evt.oldIndex;
let item = submitdata.splice(oldIndex, 1); // arr删除2，把2给item
submitdata.splice(newIndex, 0, item[0]);
- console.log(item);
- console.log(submitdata);
+ // console.log(item);
+ // console.log(submitdata);
for(let i in submitdata){
submitdata[i]['sort'] = parseInt(i) + parseInt(1)
}
@@ -95,17 +95,14 @@
$(document).off('click','.kanbanadd').on('click','.kanbanadd',function(){
var index = $(this).attr('data-index');
var id = $(this).attr('data-id');
- console.log(id);
for(let i in reportlistdata){
if(reportlistdata[i]['_id'] == id){
- console.log(reportlistdata[i]['_id']);
reportlistdata[index]['added'] = true;
X.laytpldata('#to-be-added-baobiao-dot',reportlistdata,'.to-be-added-baobiao');
X.laytpldata('#to-added-baobiao-dot',reportlistdata,'.to-added-baobiao');
toadddataprocessing();
}
}
-
});
// 修改报表类型
diff --git a/web/srczip/logic/ltvmodel.js b/web/srczip/logic/ltvmodel.js
index 82c676e..25852ad 100644
--- a/web/srczip/logic/ltvmodel.js
+++ b/web/srczip/logic/ltvmodel.js
@@ -62,6 +62,8 @@
report_idarr.push(X.DATA.ltvid);
if(X.DATA.authority != 'rw'){
$('.analysis-savereport').hide();
+ }else {
+ $(".analysis-saveas").show();
}
X.api('report/read_report','post',{project_id:X.DATA.projectid,report_id:report_idarr},function(d){
backfilldata(d[0]);
@@ -329,12 +331,20 @@
$(document).off('click','.analysis-savereport').on('click','.analysis-savereport',function(){
if(baobiaodata != '' && baobiaodata != undefined && baobiaodata != null){
+ baobiaodata['saveas'] = 0;
X.parametersopen(baobiaodata,'savereport','auto');
}else{
X.parametersopen(data,'savereport','auto');
}
});
+ //另存为
+ $(document).off('click','.analysis-saveas').on('click','.analysis-saveas',function(){
+ baobiaodata['saveas'] = 1;
+ X.parametersopen(baobiaodata,'savereport','auto');
+
+ });
+
// 返回
$(document).off('click','.analysis-fanhui').on('click','.analysis-fanhui',function(){
X.gourl("dashboard");
diff --git a/web/srczip/logic/modeltable.js b/web/srczip/logic/modeltable.js
index 22641bc..04aa42f 100644
--- a/web/srczip/logic/modeltable.js
+++ b/web/srczip/logic/modeltable.js
@@ -53,10 +53,15 @@
// }else {
$("#conent-box"+data.id).html(html);
// }
+ console.log(data.reverseorder , data.name);
if(data.modeltype == "table" && data.modelsize != "small"){
var tableMul;
var id = 'dataTableMul'+data['id'];
- tableMul = new FixedTable(id, 2);
+ if(data.reverseorder){
+ tableMul = new FixedTable(id, 2);
+ }else {
+ tableMul = new FixedTable(id, 0);
+ }
}
})
diff --git a/web/srczip/logic/retained.js b/web/srczip/logic/retained.js
index 5ce8b00..b038a3c 100644
--- a/web/srczip/logic/retained.js
+++ b/web/srczip/logic/retained.js
@@ -101,6 +101,8 @@
report_idarr.push(X.DATA.retentionid);
if(X.DATA.authority != 'rw'){
$('.analysis-savereport').hide();
+ }else {
+ $(".analysis-saveas").show();
}
X.api('report/read_report','post',{project_id:X.DATA.projectid,report_id:report_idarr},function(d){
backfilldata(d[0]);
@@ -564,12 +566,20 @@
$(document).off('click','.analysis-savereport').on('click','.analysis-savereport',function(){
if(baobiaodata != '' && baobiaodata != undefined && baobiaodata != null){
+ baobiaodata['saveas']= 0;
X.parametersopen(baobiaodata,'savereport','auto');
}else{
X.parametersopen(data,'savereport','auto');
}
});
+ //另存为
+ $(document).off('click','.analysis-saveas').on('click','.analysis-saveas',function(){
+ baobiaodata['saveas']= 1;
+ X.parametersopen(baobiaodata,'savereport','auto');
+
+ });
+
$(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){
console.log(d);
diff --git a/web/srczip/logic/savereport.js b/web/srczip/logic/savereport.js
index e4464bf..71bbe21 100644
--- a/web/srczip/logic/savereport.js
+++ b/web/srczip/logic/savereport.js
@@ -25,7 +25,7 @@
return false;
}
- if(data._id){
+ if(data.saveas == 0 ){
data['query']['eventView']['date_type'] = tabval.date_type;
var arr = {
name: tabval['title'],
@@ -42,7 +42,7 @@
var arr = {
name: tabval['title'],
desc:tabval['desc'],
- query:data,
+ query:data,
project_id:X.DATA.projectid,
cat: data['eventView']['cksql']
}
diff --git a/web/srczip/logic/setupbaobiao.js b/web/srczip/logic/setupbaobiao.js
index ea2375f..c1119f2 100644
--- a/web/srczip/logic/setupbaobiao.js
+++ b/web/srczip/logic/setupbaobiao.js
@@ -47,7 +47,12 @@
}else {
$("#gbreverseorder").prop("checked",true);
}
-
+ // 初始化首行浮动
+ if(data.reverseorder && data.reverseorder != undefined && data.reverseorder == "true"){
+ $('#kqfirstlinefloat').prop('checked',true);
+ }else {
+ $('#gbfirstlinefloat').prop('checked',true);
+ }
if(data.daydata && data.daydata != undefined && data.daydata == "false"){
$('#daydatafalse').prop('checked',true);
}else {
@@ -107,10 +112,12 @@
var ascending = $('input:radio[name="reverseorder"]:checked').val();
var avesumdata = $('input:radio[name="avesumdata"]:checked').val();
var daydata = $('input:radio[name="daydata"]:checked').val();
+ var reverseorder = $('input:radio[name="firstlinefloat"]:checked').val();
if(modelswitch == "true"){ modelswitch = true;}else {modelswitch = false;};
if(ascending == 'true'){ ascending = true }else { ascending = false };
if(avesumdata == "true"){ avesumdata = true;}else {avesumdata = false;};
if(daydata == 'true'){ daydata = true }else { daydata = false };
+ if(reverseorder == 'true'){ reverseorder = true } else { reverseorder = false };
var arr = {
_id:X.DATA.dashboard_id,
report:{
@@ -123,7 +130,8 @@
modelswitch: modelswitch,
ascending:ascending,
avesumdata:avesumdata,
- daydata:daydata
+ daydata:daydata,
+ reverseorder:reverseorder
}
}
// console.log(arr);
diff --git a/web/static/css/analysis.css b/web/static/css/analysis.css
index 7a6cb12..d95871f 100644
--- a/web/static/css/analysis.css
+++ b/web/static/css/analysis.css
@@ -196,6 +196,7 @@
.analysis-but-box { padding: 12px 16px 12px 0; text-align: right; display: flex; justify-content: flex-end; align-items: center; border-top: 1px solid #f0f2f5; }
.analysis-but-box div { cursor: pointer; margin-left: 10px; height: 32px; padding: 0 16px; font-weight: 400; font-size: 14px; line-height: 30px; border-radius: 2px; }
.analysis-savereport { color: #3d90ff; background-color: #f1f8ff; }
+.analysis-saveas { color: #3d90ff; background-color: #f1f8ff; display: none; }
.analysis-calculation { color: #fff; background-color: #3d90ff; }
.dropdownlist-box { width: 200px; max-height: 350px; background-color: #fff; }
diff --git a/web/static/css/projectadmin.css b/web/static/css/projectadmin.css
index 8d76d48..1ed7427 100644
--- a/web/static/css/projectadmin.css
+++ b/web/static/css/projectadmin.css
@@ -182,12 +182,12 @@
.adduser-subject-add-box div { cursor: pointer; height: 32px; line-height: 30px; padding: 0 16px; font-weight: 400; font-size: 14px; border-radius: 2px; background-color: #4fa1ff; color: #fff; }
.adduser-table-box { height: 320px; margin-top: 26px; }
.adduser-table-title { width: 100%; height: 48px; line-height: 48px; display: flex; background-color: #f7f7f7; border-bottom: 1px solid #f3f3f3; font-size: 12px; color: #202d3f;}
-.adduser-table-title div { width: 600px; text-indent: 12px; }
+.adduser-table-title div { width: 300px; text-indent: 12px; }
.adduser-table-title-cz { width: 65px !important; }
.adduser-table-con-box { height: 271px; overflow-y: auto;}
.adduser-table-con { width: 100%; height: 48px; line-height: 48px; display: flex; border-bottom: 1px solid #f3f3f3; font-size: 12px; color: #42546d; }
-.adduser-table-con div{ width: 600px; text-indent: 12px; }
+.adduser-table-con div{ width: 300px; text-indent: 12px; }
.adduser-table-title-cz img { cursor: pointer; }
.adduser-role { cursor: pointer; }
.adduser-role span { padding: 8px; border: 1px solid #f0f0f0;}
diff --git a/web/static/css/style.css b/web/static/css/style.css
index 7bdc268..e9e44ef 100644
--- a/web/static/css/style.css
+++ b/web/static/css/style.css
@@ -2,7 +2,7 @@
.modify-layui-logo { position: absolute; left: 0; top: 0; height: 100%; line-height: 60px; text-align: center; font-size: 16px; background-color: #404a77; width: 80px !important; height: 60px; color: #fff; text-align: center;}
.modify-layui-side { width: 270px !important; }
.modify-layui-bg-black { background-color: #fff !important; }
-.modify-layui-side-scroll { width: 290px !important; }
+.modify-layui-side-scroll { width: 290px !important; overflow: hidden; }
.modify-layui-body { left: 270px !important; }
.layui-layout-admin .modify-layui-body { background-color: #f0f2f5; }
.modify-layui-nav-tree { width: 270px !important; }
@@ -28,6 +28,7 @@
.layui-laydate .layui-this { background-color: rgba(89, 120, 249, 1) !important; }
.layui-laypage-em { background-color: #3d90ff !important; }
.layui-table-cell { height: auto; }
+.nav-list-box { overflow-y: auto; height: 100%; }
::-webkit-scrollbar {
width:0px;
@@ -576,8 +577,8 @@ label:not(.form-check-label):not(.custom-file-label) { font-weight: 400; }
.screen-del:hover { background:url("../img/del-red.png") no-repeat 100%; background-position: center; }
.zhuanghu_xila_xian { margin: 0 auto; width: 15px; height: 2px; background-color: #94c8ff; }
-.layui-project-box a{ width: 120px; }
-
+.layui-project-box a{ min-width: 120px; }
+
/* 看板类型设置 */
.kanbantypeset-box { width: 500px; height: 300px; background-color: #fff; }
.kanbantypeset-but-box { padding: 14px 32px; text-align: right; display: flex; justify-content: flex-end; }
@@ -588,7 +589,7 @@ label:not(.form-check-label):not(.custom-file-label) { font-weight: 400; }
.funum { color: #ff5d5d !important; }
/* 报表设置 */
-.setupbaobiao-box { width: 880px; height: 460px; }
+.setupbaobiao-box { width: 880px; height: 520px; }
.setupbaobiao-top-box { padding: 0 20px; font-size: 14px; height: 60px; display: flex; align-items: center; justify-content: space-between; background-color: #f0f2f5; }
.setupbaobiao-but-box { display: flex; align-items: center; }
.setupbaobiao-xq{ padding-right: 20px; cursor: pointer; color: #42546d; }
