diff --git a/public/index.html b/public/index.html index 5fa8013a..b078fff2 100644 --- a/public/index.html +++ b/public/index.html @@ -171,6 +171,8 @@ \ No newline at end of file diff --git a/public/template/component/schedule.html b/public/template/component/schedule.html index 6dabc1ea..5ec367b2 100644 --- a/public/template/component/schedule.html +++ b/public/template/component/schedule.html @@ -6,7 +6,7 @@
-
+
新建计划任务项目
@@ -35,7 +35,7 @@ - [ 配置 ] + [ 配置 ]    [ 删除 ] @@ -67,18 +67,26 @@ \ No newline at end of file diff --git a/route/websocket/schedule.js b/route/websocket/schedule.js index 14d9e171..9a1820b1 100644 --- a/route/websocket/schedule.js +++ b/route/websocket/schedule.js @@ -18,6 +18,7 @@ let e = { function CreateScheduleJob(obj) { let id = tools.randomString(6) + "_" + new Date().getTime(); + let thisServer = serverModel.ServerManager().getServer(servername); if (obj.count <= 0) { schedulejob.createScheduleJob(id, obj.timestr, () => { @@ -45,15 +46,15 @@ WebSocketObserver().listener('schedule/list', (data) => { time: "5 * * * * *", commande: "__restart__", }, { - id: "test_123456", + id: "test_123457", count: 0, - time: "5 * * * * *", - commande: "__restart__", + time: "*/6 * * * * *", + commande: "kill xxxx", }, { - id: "test_123456", + id: "test_123458", count: 0, time: "5 * * * * *", - commande: "__restart__", + commande: "stop", }] }); } else {