bugfix#任务列表-节点数量只能显示20个

smartfly · Jun 26, 2018 · 8f547b7 · 8f547b7
1 parent 50f08e9
commit 8f547b7
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 4 deletions.
diff --git a/internal/routers/routers.go b/internal/routers/routers.go
@@ -99,6 +99,7 @@ func Register(m *macaron.Macaron) {
 		m.Get("/:id", host.Detail)
 		m.Post("/store", binding.Bind(host.HostForm{}), host.Store)
 		m.Get("", host.Index)
+		m.Get("/all", host.All)
 		m.Get("/ping/:id", host.Ping)
 		m.Post("/remove/:id", host.Remove)
 	})

diff --git a/web/vue/src/api/host.js b/web/vue/src/api/host.js
@@ -6,6 +6,10 @@ export default {
     httpClient.get('/host', query, callback)
   },
 
+  all (query, callback) {
+    httpClient.get('/host/all', {}, callback)
+  },
+
   detail (id, callback) {
     httpClient.get(`/host/${id}`, {}, callback)
   },

diff --git a/web/vue/src/api/task.js b/web/vue/src/api/task.js
@@ -9,7 +9,7 @@ export default {
         params: query
       },
       {
-        uri: '/host'
+        uri: '/host/all'
       }
     ], callback)
   },
@@ -20,7 +20,7 @@ export default {
         uri: `/task/${id}`
       },
       {
-        uri: '/host'
+        uri: '/host/all'
       }
     ], callback)
   },

diff --git a/web/vue/src/pages/task/edit.vue b/web/vue/src/pages/task/edit.vue
@@ -416,7 +416,7 @@ export default {
         this.cancel()
         return
       }
-      this.hosts = hosts.data || []
+      this.hosts = hosts || []
       if (!taskData) {
         return
       }

diff --git a/web/vue/src/pages/task/list.vue b/web/vue/src/pages/task/list.vue
@@ -287,7 +287,7 @@ export default {
       taskService.list(this.searchParams, (tasks, hosts) => {
         this.tasks = tasks.data
         this.taskTotal = tasks.total
-        this.hosts = hosts.data
+        this.hosts = hosts
         if (callback) {
           callback()
         }