w

class/core/public.py

@@ -55,7 +55,7 @@ def getPage(args, result='1,2,3,4,5,8'):
     info['uri'] = {}
     info['return_js'] = ''
     if args.has_key('tojs'):
-        info['return_js'] = args.tojs
+        info['return_js'] = args['tojs']
 
     return page.GetPage(info, result)
 

route/task.py

@@ -24,7 +24,7 @@ def count():
 
 @task.route("/list", methods=['GET', 'POST'])
 def list():
-    _list = public.M('tasks').where('', ()).limit(
+    _list = public.M('tasks').where('', ()).field('id,name,type,status,addtime,start,end').limit(
         '0,5').order('id desc').select()
     _ret = {}
     _ret['data'] = _list
@@ -32,6 +32,7 @@ def list():
     count = public.M('tasks').where('', ()).count()
     _page = {}
     _page['count'] = count
+    _page['tojs'] = 'remind'
 
     _ret['page'] = public.getPage(_page)
     return public.getJson(_ret)

static/js/public.js

@@ -693,7 +693,7 @@ function SafeMessage(j, h, g, f) {
 		g();
 	})
 }
-isAction();
+//isAction();
 
 function isAction() {
 	hrefs = window.location.href.split("/");
@@ -907,7 +907,8 @@ function RemoveTask(b) {
 
 function GetTaskList(a) {
 	a = a == undefined ? 1 : a;
-	$.post("/data?action=getData", "tojs=GetTaskList&table=tasks&limit=10&p=" + a, function(g) {
+	$.post("/task/list", "tojs=GetTaskList&table=tasks&limit=10&p=" + a, function(g) {
+		console.log(g);
 		var e = "";
 		var b = "";
 		var c = "";
@@ -1395,7 +1396,7 @@ function execLog(){
 
 function remind(a){
 	a = a == undefined ? 1 : a;
-	$.post("/data?action=getData", "tojs=remind&table=tasks&result=2,4,6,8&limit=8&p=" + a, function(g) {
+	$.post("/task/list", "tojs=remind&table=tasks&result=2,4,6,8&limit=8&p=" + a, function(g) {
 		var e = "";
 		var f = false;
 		var task_count = 0;
@@ -1428,7 +1429,7 @@ function remind(a){
 			}
 		});
 
-	})
+	},'json');
 }
 
 
@@ -1512,7 +1513,7 @@ function tasklist(a){
 	var con='<ul class="cmdlist"></ul><span style="position:  fixed;bottom: 13px;">若任务长时间未执行，请尝试在首页点【重启面板】来重置任务队列</span>';
 	$(".taskcon").html(con);
 	a = a == undefined ? 1 : a;
-	$.post("/data?action=getData", "tojs=GetTaskList&table=tasks&limit=10&p=" + a, function(g) {
+	$.post("/task/list", "tojs=GetTaskList&table=tasks&limit=10&p=" + a, function(g) {
 		var e = "";
 		var b = "";
 		var c = "";
@@ -1541,7 +1542,7 @@ function tasklist(a){
 		$(".cmdlist").html(b + c);
 		GetReloads();
 		return f
-	})
+	},'json')
 }
 
 //检查登陆状态