-
-
-
-
diff --git a/frontend/src/i18n/zh.js b/frontend/src/i18n/zh.js
index 852e79be..e739b979 100644
--- a/frontend/src/i18n/zh.js
+++ b/frontend/src/i18n/zh.js
@@ -223,6 +223,9 @@ export default {
'error': '错误',
'Not Found Node': '节点配置错误',
'Not Found Spider': '爬虫配置错误',
+ '[minute] [hour] [day] [month] [day of week]': '[分] [时] [天] [月] [星期几]',
+ 'Enable/Disable': '启用/禁用',
+ 'Cron': 'Cron',
// 网站
'Site': '网站',
@@ -313,6 +316,13 @@ export default {
'Installing language failed': '安装语言失败',
'You have successfully installed a language: ': '您已成功安装语言: ',
'The language installation is unsuccessful: ': '安装语言失败: ',
+ 'Enabling the schedule successful': '启用定时任务成功',
+ 'Disabling the schedule successful': '禁用定时任务成功',
+ 'Enabling the schedule unsuccessful': '启用定时任务失败',
+ 'Disabling the schedule unsuccessful': '禁用定时任务失败',
+ 'The schedule has been removed': '已删除定时任务',
+ 'The schedule has been added': '已添加定时任务',
+ 'The schedule has been saved': '已保存定时任务',
// 登录
'Sign in': '登录',
@@ -347,5 +357,8 @@ export default {
add_cron: '生成Cron',
// Cron Format: [second] [minute] [hour] [day of month] [month] [day of week]
cron_format: 'Cron 格式: [秒] [分] [小时] [日] [月] [周]'
- }
+ },
+
+ // 其他
+ 'Star crawlab-team/crawlab on GitHub': '在 GitHub 上为 Crawlab 加星吧'
}
diff --git a/frontend/src/store/modules/schedule.js b/frontend/src/store/modules/schedule.js
index e71d5f03..9e60169c 100644
--- a/frontend/src/store/modules/schedule.js
+++ b/frontend/src/store/modules/schedule.js
@@ -21,7 +21,14 @@ const actions = {
getScheduleList ({ state, commit }) {
request.get('/schedules')
.then(response => {
- commit('SET_SCHEDULE_LIST', response.data.data)
+ if (response.data.data) {
+ commit('SET_SCHEDULE_LIST', response.data.data.map(d => {
+ const arr = d.cron.split(' ')
+ arr.splice(0, 1)
+ d.cron = arr.join(' ')
+ return d
+ }))
+ }
})
},
addSchedule ({ state }) {
@@ -33,11 +40,11 @@ const actions = {
removeSchedule ({ state }, id) {
request.delete(`/schedules/${id}`)
},
- stopSchedule ({ state, dispatch }, id) {
- return request.post(`/schedules/${id}/stop`)
+ enableSchedule ({ state, dispatch }, id) {
+ return request.post(`/schedules/${id}/enable`)
},
- runSchedule ({ state, dispatch }, id) {
- return request.post(`/schedules/${id}/run`)
+ disableSchedule ({ state, dispatch }, id) {
+ return request.post(`/schedules/${id}/disable`)
}
}
diff --git a/frontend/src/store/modules/spider.js b/frontend/src/store/modules/spider.js
index 0b669a6d..4632483a 100644
--- a/frontend/src/store/modules/spider.js
+++ b/frontend/src/store/modules/spider.js
@@ -180,6 +180,11 @@ const actions = {
async getTemplateList ({ state, commit }) {
const res = await request.get(`/config_spiders_templates`)
commit('SET_TEMPLATE_LIST', res.data.data)
+ },
+ async getScheduleList ({ state, commit }, payload) {
+ const { id } = payload
+ const res = await request.get(`/spiders/${id}/schedules`)
+ commit('schedule/SET_SCHEDULE_LIST', res.data.data, { root: true })
}
}
diff --git a/frontend/src/views/layout/components/Navbar.vue b/frontend/src/views/layout/components/Navbar.vue
index 52960c21..f47380c8 100644
--- a/frontend/src/views/layout/components/Navbar.vue
+++ b/frontend/src/views/layout/components/Navbar.vue
@@ -27,13 +27,23 @@
-
+
+
+
+
+ Star
+
+