red-future/ppgo_job
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化操作流程界面，修改任务列表搜索和排序等

Browse Source
This commit is contained in:
george
2018-11-21 11:10:22 +08:00
parent 26637736ee
commit 1257371fe3
60 changed files with 378 additions and 264 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
controllers/task.go
View File

@@ -28,10 +28,10 @@ func (self *TaskController) List() {
self.Data["pageTitle"] = "任务管理"
self.Data["taskGroup"] = taskGroupLists(self.taskGroups, self.userId)
self.Data["groupId"] = 0
arr := strings.Split(self.Ctx.GetCookie("groupid"), "|")
if len(arr) > 0 {
self.Data["groupId"], _ = strconv.Atoi(arr[0])
}
//arr := strings.Split(self.Ctx.GetCookie("groupid"), "|")
//if len(arr) > 0 {
// self.Data["groupId"], _ = strconv.Atoi(arr[0])
//}
self.display()
}
@@ -498,21 +498,22 @@ func (self *TaskController) Table() {
//0-全部，-1如果存在，n,如果不存在，0
if groupId == -1 {
groupId = 0
arr := strings.Split(self.Ctx.GetCookie("groupid"), "|")
if len(arr) > 0 {
groupId, _ = strconv.Atoi(arr[0])
}
}
//if groupId == -1 {
// groupId = 0
// arr := strings.Split(self.Ctx.GetCookie("groupid"), "|")
// if len(arr) > 0 {
// groupId, _ = strconv.Atoi(arr[0])
// }
//}
if groupId > 0 {
self.Ctx.SetCookie("groupid", strconv.Itoa(groupId)+"|job")
}
//if groupId > 0 {
// self.Ctx.SetCookie("groupid", strconv.Itoa(groupId)+"|job")
//}
status, _ := self.GetInt("status")
taskName := strings.TrimSpace(self.GetString("taskName"))
taskName := strings.TrimSpace(self.GetString("task_name"))
StatusText := []string{
"<font color='red'><i class='fa fa-minus-square'></i></font>",
"<font color='green'><i class='fa fa-check-square'></i></font>",
@@ -552,6 +553,8 @@ func (self *TaskController) Table() {
filters = append(filters, "task_name__icontains", taskName)
}
//fmt.Println(filters, "----------", taskName)
result, count := models.TaskGetList(page, self.pageSize, filters...)
list := make([]map[string]interface{}, len(result))