diff --git a/web/pages/dashboard.html b/web/pages/dashboard.html index 8a8e2cc..233342b 100644 --- a/web/pages/dashboard.html +++ b/web/pages/dashboard.html @@ -64,7 +64,7 @@
个人设置
项目管理
系统管理
-
退出登录
+
退出登录
diff --git a/web/src/x.min.js b/web/src/x.min.js index c97a365..c207981 100644 --- a/web/src/x.min.js +++ b/web/src/x.min.js @@ -3962,6 +3962,10 @@ var X = window.X || { return; } + $(document).off('click','.sifnoutlogin').on('click','.sifnoutlogin',function(){ + X.gourl("login"); + }); + // 项目列表 // http://10.0.0.7:6789/ X.api("project/","get",{},function(d){ @@ -4486,37 +4490,39 @@ 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']); + for(let i in d.spaces){ + if(d.spaces[i]['children'].length > 0){ + if(X.DATA['dashboard_id'] == undefined || X.DATA['dashboard_id'] == ""){ + for(let q in d.spaces){ + for(let j in d.spaces[q]['children']){ + d.spaces[q]['children'][j]['onclick'] = 0; + if(j == 0){ + d.spaces[q]['children'][j]['onclick'] = 1; + } + } + } + $(".tab-tit-box .tab-tit").html(d.spaces[i]['children'][0]['name']); + X.DATA['dashboard_id'] = d.spaces[i]['children'][0]['_id']; //看板id + }else { + for(let q in d.spaces){ + for(let j in d.spaces[q]['children']){ + d.spaces[q]['children'][j]['onclick'] = 0; + if(d.spaces[q]['children'][j]['_id'] == X.DATA['dashboard_id']){ + d.spaces[q]['children'][j]['onclick'] = 1; + $(".tab-tit-box .tab-tit").html(d.spaces[q]['children'][j]['name']); + } } } } + X.laytpldata('#mykanban-dot',d.kanban,'#mykanban'); + X.laytpldata('#kongjian-dot',d.spaces,'#kongjian'); + $("#model-box").html(""); + // 获取报表数据 + X.pageLogic['dashboard'].gettabledata(); + break;//终止循环 } - X.laytpldata('#mykanban-dot',d.kanban,'#mykanban'); - X.laytpldata('#kongjian-dot',d.spaces,'#kongjian'); - $("#model-box").html(""); - // 获取报表数据 - X.pageLogic['dashboard'].gettabledata(); } - // var updateOutput = function(e){ // var list = e.length ? e : $(e.target), diff --git a/web/srczip/logic/dashboard.js b/web/srczip/logic/dashboard.js index fbfe317..ad6e5e7 100644 --- a/web/srczip/logic/dashboard.js +++ b/web/srczip/logic/dashboard.js @@ -17,6 +17,11 @@ return; } + // 退出登录 + $(document).off('click','.sifnoutlogin').on('click','.sifnoutlogin',function(){ + X.gourl("login"); + }); + // 项目列表 // http://10.0.0.7:6789/ X.api("project/","get",{},function(d){ @@ -541,37 +546,39 @@ 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']); + for(let i in d.spaces){ + if(d.spaces[i]['children'].length > 0){ + if(X.DATA['dashboard_id'] == undefined || X.DATA['dashboard_id'] == ""){ + for(let q in d.spaces){ + for(let j in d.spaces[q]['children']){ + d.spaces[q]['children'][j]['onclick'] = 0; + if(j == 0){ + d.spaces[q]['children'][j]['onclick'] = 1; + } + } + } + $(".tab-tit-box .tab-tit").html(d.spaces[i]['children'][0]['name']); + X.DATA['dashboard_id'] = d.spaces[i]['children'][0]['_id']; //看板id + }else { + for(let q in d.spaces){ + for(let j in d.spaces[q]['children']){ + d.spaces[q]['children'][j]['onclick'] = 0; + if(d.spaces[q]['children'][j]['_id'] == X.DATA['dashboard_id']){ + d.spaces[q]['children'][j]['onclick'] = 1; + $(".tab-tit-box .tab-tit").html(d.spaces[q]['children'][j]['name']); + } } } } + X.laytpldata('#mykanban-dot',d.kanban,'#mykanban'); + X.laytpldata('#kongjian-dot',d.spaces,'#kongjian'); + $("#model-box").html(""); + // 获取报表数据 + X.pageLogic['dashboard'].gettabledata(); + break;//终止循环 } - X.laytpldata('#mykanban-dot',d.kanban,'#mykanban'); - X.laytpldata('#kongjian-dot',d.spaces,'#kongjian'); - $("#model-box").html(""); - // 获取报表数据 - X.pageLogic['dashboard'].gettabledata(); } - // var updateOutput = function(e){ // var list = e.length ? e : $(e.target),