diff --git a/web/src/x.min.js b/web/src/x.min.js index a0b1b97..03b55b9 100644 --- a/web/src/x.min.js +++ b/web/src/x.min.js @@ -197,6 +197,7 @@ var X = window.X || { var url = ipurl+url+"?game="+ X.DATA.game || ""; } } + console.log(11111,data) var index; $.ajax({ headers: { @@ -882,6 +883,13 @@ var X = window.X || { } date = data[0]['start_date'] + " - " + data[0]['end_date']; + if(data[0]['event_name'] === '充值排行'){ + titledata.push('充值总额') + for(let i in data[0]['sum']){ + condata[i].push(data[0]['sum'][i]) + } + } + var dataArr = { titledata:titledata, condata:condata, @@ -934,11 +942,11 @@ var X = window.X || { mean = data[0]['avg'][0]; } - if(legenddata.length > 0){ - for(let i in seriesData){ - seriesData[i]['name'] = legenddata[i]; - } - } + // if(legenddata.length > 0){ + // for(let i in seriesData){ + // seriesData[i]['name'] = legenddata[i]; + // } + // } if(legenddata.length > 5){ for(let i in legenddata){ @@ -965,7 +973,7 @@ var X = window.X || { chain_ratiotype = '-' } } - + // console.log('luosongbai11111',selected) var dataArr = { xAxisData:data[0]['date_range'], legenddata:legenddata, @@ -1034,20 +1042,6 @@ var X = window.X || { pname = 'p_outflow'; } - // if(data['filter_item_type'] != "all" && data['filter_item_type'] != "" && data['filter_item_type']){ - // var filteritem = data['filter_item']; - // if(data['days'].length >= 0){ - // var filterarr = []; - // for(let i in data['days']){ - // for(let j in filteritem){ - // if(data['days'][i] == filteritem[j]){ - // filterarr.push(i); - // } - // } - // } - // } - // } - var tabledata=[]; for(let i in data['summary_values']){ var arr = { @@ -1060,49 +1054,15 @@ var X = window.X || { n:0, p:0 } - // if(data['filter_item_type'] != "all" && data['filter_item_type'] != "" && data['filter_item_type']){ - // for(let a in filterarr){ - // var index = Number(filterarr[a]); - // if(j == index){ - // nrr["n"] = data['summary_values'][i][nname][j]; - // nrr["p"] = data['summary_values'][i][pname][j] - // arr['data'].push(nrr); - // } - // } - // }else { + nrr["n"] = data['summary_values'][i][nname][j]; nrr["p"] = data['summary_values'][i][pname][j] arr['data'].push(nrr); - // } - // nrr["n"] = data['summary_values'][i][nname][j]; - // nrr["p"] = data['summary_values'][i][pname][j] - // arr['data'].push(nrr); + } tabledata.push(arr); } - // var titdata = []; - // for(let i in data['days']){ - // var tit = "第" + i + "日"; - // titdata.push(tit); - // } - // if(data['filter_item_type'] != "all" && data['filter_item_type'] != "" && data['filter_item_type']){ - // var titarr = []; - // for(let j in filterarr){ - // var index = Number(filterarr[j]); - // titarr.push(data['days'][index]); - // } - // for(let i in titarr){ - // var tit = "第" + titarr[i] + "日"; - // titdata.push(tit); - // } - // }else { - // for(let i in data['days']){ - // var tit = "第" + data['days'][i] + "日"; - // titdata.push(tit); - // } - // } - // titdata.unshift("日期",data.title); var date = data['start_date'] + " - " + data['end_date']; var dataArr = { titledata: data.title, @@ -8063,7 +8023,7 @@ var X = window.X || { } }else { - layer.msg('无数据qqq'); + layer.msg('无数据!!!'); } }) }); diff --git a/web/srczip/common.js b/web/srczip/common.js index a4f847b..3824401 100644 --- a/web/srczip/common.js +++ b/web/srczip/common.js @@ -321,11 +321,6 @@ var X = window.X || { var min = date.getMinutes(); var s = date.getSeconds(); var time = y+'年'+(m<10?('0'+m):m)+'月'+(d<10?('0'+d):d)+'日 '+(h<10?('0'+h):h)+':'+(min<10?('0'+min):min)+':'+(s<10?('0'+s):s);//操作时间 - - console.log(name+'在'+time+'修改'+content); - // X.api(function(){ - - // }) }; X.uploadfile=function(url,id,callback){ @@ -881,6 +876,13 @@ var X = window.X || { } date = data[0]['start_date'] + " - " + data[0]['end_date']; + if(data[0]['event_name'] === '充值排行'){ + titledata.push('充值总额') + for(let i in data[0]['sum']){ + condata[i].push(data[0]['sum'][i]) + } + } + var dataArr = { titledata:titledata, condata:condata, @@ -933,11 +935,11 @@ var X = window.X || { mean = data[0]['avg'][0]; } - if(legenddata.length > 0){ - for(let i in seriesData){ - seriesData[i]['name'] = legenddata[i]; - } - } + // if(legenddata.length > 0){ + // for(let i in seriesData){ + // seriesData[i]['name'] = legenddata[i]; + // } + // } if(legenddata.length > 5){ for(let i in legenddata){ @@ -964,7 +966,7 @@ var X = window.X || { chain_ratiotype = '-' } } - + // console.log('luosongbai11111',selected) var dataArr = { xAxisData:data[0]['date_range'], legenddata:legenddata, @@ -982,7 +984,7 @@ var X = window.X || { proid_money: data[0]['proid_money'], proid_name: data[0]['proid_name'] } - console.log(dataArr); + callback && callback(dataArr); }; @@ -1033,20 +1035,6 @@ var X = window.X || { pname = 'p_outflow'; } - // if(data['filter_item_type'] != "all" && data['filter_item_type'] != "" && data['filter_item_type']){ - // var filteritem = data['filter_item']; - // if(data['days'].length >= 0){ - // var filterarr = []; - // for(let i in data['days']){ - // for(let j in filteritem){ - // if(data['days'][i] == filteritem[j]){ - // filterarr.push(i); - // } - // } - // } - // } - // } - var tabledata=[]; for(let i in data['summary_values']){ var arr = { @@ -1059,49 +1047,15 @@ var X = window.X || { n:0, p:0 } - // if(data['filter_item_type'] != "all" && data['filter_item_type'] != "" && data['filter_item_type']){ - // for(let a in filterarr){ - // var index = Number(filterarr[a]); - // if(j == index){ - // nrr["n"] = data['summary_values'][i][nname][j]; - // nrr["p"] = data['summary_values'][i][pname][j] - // arr['data'].push(nrr); - // } - // } - // }else { + nrr["n"] = data['summary_values'][i][nname][j]; nrr["p"] = data['summary_values'][i][pname][j] arr['data'].push(nrr); - // } - // nrr["n"] = data['summary_values'][i][nname][j]; - // nrr["p"] = data['summary_values'][i][pname][j] - // arr['data'].push(nrr); + } tabledata.push(arr); } - // var titdata = []; - // for(let i in data['days']){ - // var tit = "第" + i + "日"; - // titdata.push(tit); - // } - // if(data['filter_item_type'] != "all" && data['filter_item_type'] != "" && data['filter_item_type']){ - // var titarr = []; - // for(let j in filterarr){ - // var index = Number(filterarr[j]); - // titarr.push(data['days'][index]); - // } - // for(let i in titarr){ - // var tit = "第" + titarr[i] + "日"; - // titdata.push(tit); - // } - // }else { - // for(let i in data['days']){ - // var tit = "第" + data['days'][i] + "日"; - // titdata.push(tit); - // } - // } - // titdata.unshift("日期",data.title); var date = data['start_date'] + " - " + data['end_date']; var dataArr = { titledata: data.title, @@ -1359,7 +1313,7 @@ var X = window.X || { var arr = {}; var seriesData = []; var xAxisdata = []; - console.log(544565645,data) + if(data.switch_test){ if(jQuery.isEmptyObject(data.date_data)){ var arr = [] diff --git a/web/srczip/logic/dashboard.js b/web/srczip/logic/dashboard.js index 86f4607..9ae3a66 100644 --- a/web/srczip/logic/dashboard.js +++ b/web/srczip/logic/dashboard.js @@ -1421,7 +1421,7 @@ } }else { - layer.msg('无数据qqq'); + layer.msg('无数据!!!'); } }) }); diff --git a/web/static/img/bg_login.png b/web/static/img/bg_login.png deleted file mode 100644 index 9be38d2..0000000 Binary files a/web/static/img/bg_login.png and /dev/null differ