diff --git a/web/admin/site/site.py b/web/admin/site/site.py
index b0e925977..26ffbd81b 100644
--- a/web/admin/site/site.py
+++ b/web/admin/site/site.py
@@ -34,8 +34,9 @@ def list():
limit = request.form.get('limit', '10')
type_id = request.form.get('type_id', '0').strip()
search = request.form.get('search', '').strip()
+ order = request.form.get('order', '').strip()
- info = thisdb.getSitesList(page=int(p),size=int(limit),type_id=int(type_id), search=search)
+ info = thisdb.getSitesList(page=int(p),size=int(limit),type_id=int(type_id), search=search,order=order)
data = {}
data['data'] = info['list']
diff --git a/web/static/app/site.js b/web/static/app/site.js
index 2993a5b22..ff10cea86 100755
--- a/web/static/app/site.js
+++ b/web/static/app/site.js
@@ -45,56 +45,56 @@ function getDate(a) {
type = '&type_id='+type_id;
}
- var sUrl = '/site/list';
var pdata = 'limit=10&p=' + page + '&search=' + search + order + type;
var loadT = layer.load();
//取回数据
- $.post(sUrl, pdata, function(data) {
+ $.post('/site/list', pdata, function(data) {
layer.close(loadT);
//构造数据列表
var body = '';
$("#webBody").html(body);
- for (var i = 0; i < data.data.length; i++) {
+ var list = data.data;
+ for (var i = 0; i < list.length; i++) {
//当前站点状态
- if (data.data[i].status == '正在运行' || data.data[i].status == '1') {
- var status = "运行中";
+ if (list[i].status == '正在运行' || list[i].status == '1') {
+ var status = "运行中";
} else {
- var status = "已停止";
+ var status = "已停止";
}
//是否有备份
- if (data.data[i].backup_count > 0) {
- var backup = "有备份";
+ if (list[i].backup_count > 0) {
+ var backup = "有备份";
} else {
- var backup = "无备份";
+ var backup = "无备份";
}
//是否设置有效期
- var web_end_time = (data.data[i].edate == "0000-00-00") ? '永久': data.data[i].edate;
+ var web_end_time = (list[i].edate == "0000-00-00") ? '永久': list[i].edate;
//表格主体
- var shortwebname = data.data[i].name;
- var shortpath = data.data[i].path;
- if(data.data[i].name.length > 30) {
- shortwebname = data.data[i].name.substring(0, 30) + "...";
+ var shortwebname = list[i].name;
+ var shortpath = list[i].path;
+ if(list[i].name.length > 30) {
+ shortwebname = list[i].name.substring(0, 30) + "...";
}
- if(data.data[i].path.length > 30){
- shortpath = data.data[i].path.substring(0, 30) + "...";
+ if(list[i].path.length > 30){
+ shortpath = list[i].path.substring(0, 30) + "...";
}
- var idname = data.data[i].name.replace(/\./g,'_');
+ var idname = list[i].name.replace(/\./g,'_');
- body = " | \
- " + shortwebname + " | \
+ body = "
| \
+ " + shortwebname + " | \
" + status + " | \
" + backup + " | \
- " + shortpath + " | \
- " + web_end_time + " | \
- " + data.data[i].ps + " | \
+ " + shortpath + " | \
+ " + web_end_time + " | \
+ " + list[i].ps + " | \
\
- 设置\
- | 删除\
+ 设置\
+ | 删除\
|
"
$("#webBody").append(body);
- $('#webBody').on('click','#site_'+ data.data[i].id,function(){
+ $('#webBody').on('click','#site_'+ list[i].id,function(){
var _this = $(this);
var id = $(this).attr('data-ids');
laydate.render({
@@ -134,7 +134,6 @@ function getDate(a) {
//输出分页
$("#webPage").html(data.page);
- // $("#webPage").html('站点分类:
');
$(".btlinkbed").click(function(){
var dataid = $(this).attr("data-id");
@@ -336,9 +335,7 @@ function webAddPage(type) {
if (len > 20) {
str = str.substring(0, 20);
$(this).val(str);
- layer.msg('不能超出20个字符!', {
- icon: 0
- });
+ layer.msg('不能超出20个字符!', {icon: 0});
}
})
//获取当前时间时间戳，截取后6位
diff --git a/web/templates/default/site.html b/web/templates/default/site.html
index aa91828b4..29e0628c9 100755
--- a/web/templates/default/site.html
+++ b/web/templates/default/site.html
@@ -37,10 +37,12 @@
|
域名 |
- 网站状态 |
+ 网站状态 |
备份 |
网站目录 |
- 到期日期 |
+
+ 到期日期
+ |
备注 |
操作 |
@@ -55,8 +57,10 @@
站点分类:
diff --git a/web/thisdb/sites.py b/web/thisdb/sites.py
index e02daa300..fb2f0a3c4 100644
--- a/web/thisdb/sites.py
+++ b/web/thisdb/sites.py
@@ -74,7 +74,8 @@ def getSitesList(
page:int | None = 1,
size:int | None = 10,
type_id:int | None = 0,
- search: str | None = ''
+ search: str | None = '',
+ order:str | None = None,
):
sql_where = ''
if search != '' :
@@ -94,7 +95,11 @@ def getSitesList(
start = (int(page) - 1) * (int(size))
limit = str(start) + ',' +str(size)
- site_list = dbM.limit(limit).order('id desc').select()
+
+ if order is not None:
+ site_list = dbM.limit(limit).order(order).select()
+ else:
+ site_list = dbM.limit(limit).order('id desc').select()
data = {}