diff --git a/plugins/webstats/index.html b/plugins/webstats/index.html index 31b9b1d2f..95449822b 100755 --- a/plugins/webstats/index.html +++ b/plugins/webstats/index.html @@ -17,6 +17,10 @@ color: #fff; } +.form-control{ + border-radius: 0px; +} + .ws_setting .ws_title { display: inline-block; width: 100px; diff --git a/plugins/webstats/index.py b/plugins/webstats/index.py index 80043f41f..91bbf22fc 100755 --- a/plugins/webstats/index.py +++ b/plugins/webstats/index.py @@ -109,6 +109,21 @@ def loadLuaSiteFile(): lua_site_json = lua_dir + "/sites.json" mw.writeFile(lua_site_json, json.dumps(content)) + # 设置默认列表 + default_json = lua_dir + "/default.json" + ddata = {} + dlist = [] + for i in content: + dlist.append(i["name"]) + + dlist.append('unset') + ddata["list"] = dlist + if len(ddata["list"]) < 1: + ddata["default"] = "unset" + else: + ddata["default"] = dlist[0] + mw.writeFile(default_json, json.dumps(ddata)) + lua_site = lua_dir + "/sites.lua" config_sites = LuaMaker.makeLuaTable(content) sites_str = "return " + config_sites @@ -276,6 +291,13 @@ def setGlobalConf(): return mw.returnJson(True, '设置成功') +def getDefaultSite(): + lua_dir = getServerDir() + "/lua" + default_json = lua_dir + "/default.json" + data = mw.readFile(default_json) + return mw.returnJson(True, 'OK', json.loads(data)) + + def getLogsList(): args = getArgs() check = checkArgs(args, ['page', 'page_size', 'site']) @@ -326,6 +348,8 @@ if __name__ == "__main__": print(getGlobalConf()) elif func == 'set_global_conf': print(setGlobalConf()) + elif func == 'get_default_site': + print(getDefaultSite()) elif func == 'get_logs_list': print(getLogsList()) else: diff --git a/plugins/webstats/js/stats.js b/plugins/webstats/js/stats.js index 3a49e2772..7e96e6530 100644 --- a/plugins/webstats/js/stats.js +++ b/plugins/webstats/js/stats.js @@ -222,7 +222,7 @@ function wsSitesErrorLog(){ \ \ \ - \ + \ \ \
\ @@ -264,12 +264,13 @@ function wsSitesErrorLog(){ }); } -function wsSitesLog(){ +function wsTableRequest(page){ var args = {}; - args['page'] = 1; + args['page'] = page; args['page_size'] = 10; + args['site'] = 'unset'; - args['tojs'] = 'wsSitesLog'; + args['tojs'] = 'wsTableRequest'; wsPost('get_logs_list', '' ,args, function(rdata){ var rdata = $.parseJSON(rdata.data); var list = ''; @@ -286,8 +287,7 @@ function wsSitesLog(){ list += '详情'; list += ''; } - var table = '
\ -
\ + var table = '
\ \ \ \ @@ -302,63 +302,108 @@ function wsSitesLog(){ '+ list +'\
时间
\
\ -
\ -
'; +
'; + $('#ws_table').html(table); + $('#wsPage').html(rdata.data.page); + }); +} - var html = '
\ -
\ - 网站: \ - \ - 时间: \ -
\ -
\ - \ - \ - \ - \ -
\ - \ + +function wsSitesLog(){ + + var randstr = getRandomString(10); + + var html = '
\ +
\ + 网站: \ + \ + 时间: \ +
\ +
\ + \ + \ + \ + \
\ + \
\ -
\ - 请求类型: \ - \ - 状态码: \ - \ - 蜘蛛过滤: \ - \ - URL过滤: \ -
\ - \ -
\ - \ -
\ +
\ +
\ + 请求类型: \ + \ + 状态码: \ + \ + 蜘蛛过滤: \ + \ + URL过滤: \ +
\ + \ +
\ + \
\
\ - '+table+'\ -
'; - $(".soft-man-con").html(html); - $('#wsPage').html(rdata.data.page); +
\ +
\ +
'; + $(".soft-man-con").html(html); + + + wsPost('get_default_site','',{},function(rdata){ + $('select[name="site"]').html(''); + + var rdata = $.parseJSON(rdata.data); + var rdata = rdata.data; + var default_site = rdata["demo1.biqu.xyz"]; + var select = ''; + for (var i = 0; i < rdata["list"].length; i++) { + if (default_site == rdata["list"][i]){ + select += ''; + } else{ + select += ''; + } + } + $('select[name="site"]').html(select); + + wsTableRequest(1); + }); + + //日期范围 + laydate.render({ + elem: '#time_choose', + value:'', + range:true, + done:function(value, startDate, endDate){ + if(!value){ + $('#time_choose').remove("cur"); + return false; + } + + var timeA = value.split('-') + var start = $.trim(timeA[0]+'-'+timeA[1]+'-'+timeA[2]) + var end = $.trim(timeA[3]+'-'+timeA[4]+'-'+timeA[5]) + query_txt = toUnixTime(start + " 00:00:00") + "-"+ toUnixTime(end + " 00:00:00") + console.log(query_txt) + $('#time_choose').addClass("cur"); + }, }); }