diff --git a/web/pages/kanbanadmin.html b/web/pages/kanbanadmin.html index 01a96c3..bdd9c61 100644 --- a/web/pages/kanbanadmin.html +++ b/web/pages/kanbanadmin.html @@ -66,7 +66,8 @@
{{item.name}} - + + ဆ
diff --git a/web/src/x.min.js b/web/src/x.min.js index 0b1bc39..4efe2db 100644 --- a/web/src/x.min.js +++ b/web/src/x.min.js @@ -3079,7 +3079,7 @@ var X = window.X || { }); //筛选 - $(".tab-right-box .tjsx").click(function(){ + $(document).off('click','.tab-right-box .tjsx').on("click",".tab-right-box .tjsx",function(){ X.open({ type: 1, title: false, @@ -3090,7 +3090,7 @@ var X = window.X || { url: "screen", extData : {} }) - }); + }) // 侧边栏搜索 $('.sousuo-txt').bind('input propertychange', function() { @@ -3244,7 +3244,6 @@ var X = window.X || { } } index --; - console.log(eventdata); if(index <= 0){ X.template("modeltable","chart-box",eventdata,function(){ for(let i in eventdata){ @@ -4039,6 +4038,29 @@ var X = window.X || { }; })(); +// srczip/logic/dropdownlist2.js +(function(){ + X.pageLogic['dropdownlist2'] = { + init : function(parms){ + var me = this; + this.parms = parms; + this.callback = parms.callback; + var listdata = parms.extData; + // console.log('aaa',listdata); + + X.laytpldata("#dropdownlist-con-box-dot",listdata,".dropdownlist-con-box"); + + $(document).off('click','.dropdownlist-list').on('click','.dropdownlist-list',function(){ + var index = $(this).attr("data-index"); + var dataArr = listdata[index]; + me.callback && me.callback(dataArr); + layer.closeAll(0); + }) + + } + }; +})(); + // srczip/logic/event.js (function(){ X.pageLogic['event'] = { @@ -5259,6 +5281,32 @@ var X = window.X || { toadddataprocessing(); }) + // 修改报表类型 + $(document).off('click','.to-added-table').on('click','.to-added-table',function(){ + var obj = $(this); + var id = obj.attr("data-id"); + for(let i in submitdata){ + if(submitdata[i]['report_id'] == id){ + submitdata[i]['graph_type'] = 'table'; + layer.msg('修改为表格展示',{time: 1000}); + } + } + }) + + + $(document).off('click','.to-added-chart').on('click','.to-added-chart',function(){ + var obj = $(this); + var id = obj.attr("data-id"); + console.log(id); + for(let i in submitdata){ + if(submitdata[i]['report_id'] == id){ + submitdata[i]['graph_type'] = 'echarts'; + layer.msg('修改为图表展示',{time: 1000}); + } + } + }) + + //渲染已添加报表下拉框 function toadddataprocessing(){ @@ -5267,11 +5315,7 @@ var X = window.X || { if(reportlistdata[i]['added'] == true){ toadddata.push(reportlistdata[i]); } - } - var downmenu = [ - {title:'表格',id:'table'}, - {title:'图形',id:'echarts'} - ] + }; submitdata = []; for(let i in toadddata){ var arr = { @@ -5279,13 +5323,8 @@ var X = window.X || { graph_type:'table', model:toadddata[i]['cat'], name:toadddata[i]['name'], - } + }; submitdata.push(arr); - X.laydropdown('.to-added-more'+i,downmenu,function(d){ - - submitdata[i]['graph_type'] = d.id; - - }) } }; @@ -5293,8 +5332,8 @@ var X = window.X || { var id = $(this).attr('data-id'); X.api('dashboard/del_report','post',{_id:X['DATA']['dashboard_id'],report_id:id},function(){ kanbanupdata(); - }) - }) + }); + }); $(document).off('click','.kanbanadmin-but-yy').on('click','.kanbanadmin-but-yy',function(){ X.api('dashboard/add_report','post',{_id:X['DATA']['dashboard_id'],report_ids:submitdata},function(d){ @@ -5303,8 +5342,8 @@ var X = window.X || { layer.closeAll(); layer.msg('应用成功'); } - }) - }) + }); + }); } }; diff --git a/web/srczip/logic/dashboard.js b/web/srczip/logic/dashboard.js index ace2eb3..66f018b 100644 --- a/web/srczip/logic/dashboard.js +++ b/web/srczip/logic/dashboard.js @@ -101,7 +101,7 @@ }); //筛选 - $(".tab-right-box .tjsx").click(function(){ + $(document).off('click','.tab-right-box .tjsx').on("click",".tab-right-box .tjsx",function(){ X.open({ type: 1, title: false, @@ -112,7 +112,7 @@ url: "screen", extData : {} }) - }); + }) // 侧边栏搜索 $('.sousuo-txt').bind('input propertychange', function() { @@ -266,7 +266,6 @@ } } index --; - console.log(eventdata); if(index <= 0){ X.template("modeltable","chart-box",eventdata,function(){ for(let i in eventdata){ diff --git a/web/srczip/logic/kanbanadmin.js b/web/srczip/logic/kanbanadmin.js index a176cfd..f19cb92 100644 --- a/web/srczip/logic/kanbanadmin.js +++ b/web/srczip/logic/kanbanadmin.js @@ -78,6 +78,32 @@ toadddataprocessing(); }) + // 修改报表类型 + $(document).off('click','.to-added-table').on('click','.to-added-table',function(){ + var obj = $(this); + var id = obj.attr("data-id"); + for(let i in submitdata){ + if(submitdata[i]['report_id'] == id){ + submitdata[i]['graph_type'] = 'table'; + layer.msg('修改为表格展示',{time: 1000}); + } + } + }) + + + $(document).off('click','.to-added-chart').on('click','.to-added-chart',function(){ + var obj = $(this); + var id = obj.attr("data-id"); + console.log(id); + for(let i in submitdata){ + if(submitdata[i]['report_id'] == id){ + submitdata[i]['graph_type'] = 'echarts'; + layer.msg('修改为图表展示',{time: 1000}); + } + } + }) + + //渲染已添加报表下拉框 function toadddataprocessing(){ @@ -86,11 +112,7 @@ if(reportlistdata[i]['added'] == true){ toadddata.push(reportlistdata[i]); } - } - var downmenu = [ - {title:'表格',id:'table'}, - {title:'图形',id:'echarts'} - ] + }; submitdata = []; for(let i in toadddata){ var arr = { @@ -98,13 +120,8 @@ graph_type:'table', model:toadddata[i]['cat'], name:toadddata[i]['name'], - } + }; submitdata.push(arr); - X.laydropdown('.to-added-more'+i,downmenu,function(d){ - - submitdata[i]['graph_type'] = d.id; - - }) } }; @@ -112,8 +129,8 @@ var id = $(this).attr('data-id'); X.api('dashboard/del_report','post',{_id:X['DATA']['dashboard_id'],report_id:id},function(){ kanbanupdata(); - }) - }) + }); + }); $(document).off('click','.kanbanadmin-but-yy').on('click','.kanbanadmin-but-yy',function(){ X.api('dashboard/add_report','post',{_id:X['DATA']['dashboard_id'],report_ids:submitdata},function(d){ @@ -122,8 +139,8 @@ layer.closeAll(); layer.msg('应用成功'); } - }) - }) + }); + }); } };