From dccc90e45125ad6e796d266cf6384abe355d71ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=99=AF=E9=98=B3?= <1656488874@qq.com>
Date: Mon, 9 Dec 2019 10:54:55 +0800
Subject: [PATCH] =?UTF-8?q?feature=20=E8=B0=83=E5=BA=A6=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E6=9A=82=E5=81=9C/=E8=BF=90=E8=A1=8C=20featu?=
 =?UTF-8?q?re=20=E4=BB=BB=E5=8A=A1=E5=88=97=E8=A1=A8=E5=8F=AF=E4=BB=A5?=
 =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/i18n/zh.js                      |  3 ++
 frontend/src/views/schedule/ScheduleList.vue | 30 +++++++-------------
 frontend/src/views/task/TaskList.vue         |  1 +
 3 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/frontend/src/i18n/zh.js b/frontend/src/i18n/zh.js
index c9e24806..d8f1dbe2 100644
--- a/frontend/src/i18n/zh.js
+++ b/frontend/src/i18n/zh.js
@@ -214,6 +214,9 @@ export default {
   'Add Schedule': '添加定时任务',
   'stop': '暂停',
   'running': '运行',
+  'error': '错误',
+  'Not Found Node': '节点配置错误',
+  'Not Found Spider': '爬虫配置错误',
 
   // 网站
   'Site': '网站',
diff --git a/frontend/src/views/schedule/ScheduleList.vue b/frontend/src/views/schedule/ScheduleList.vue
index f07de8f9..c7d5a4ad 100644
--- a/frontend/src/views/schedule/ScheduleList.vue
+++ b/frontend/src/views/schedule/ScheduleList.vue
@@ -110,7 +110,14 @@
                            :align="col.align"
                            :width="col.width">
             <template slot-scope="scope">
-              {{ scope.row[col.name] ? $t(scope.row[col.name]) : $t('NA') }}
+              <el-tooltip v-if="scope.row[col.name] === 'error'" :content="$t(scope.row['message'])" placement="top">
+                <el-tag class="status-tag" type="danger">
+                  {{scope.row[col.name] ? $t(scope.row[col.name]) : $t('NA')}}
+                </el-tag>
+              </el-tooltip>
+              <el-tag class="status-tag" v-else>
+                {{scope.row[col.name] ? $t(scope.row[col.name]) : $t('NA')}}
+              </el-tag>
             </template>
           </el-table-column>
           <el-table-column v-else :key="col.name"
@@ -289,24 +296,6 @@ export default {
             })
         }).catch(() => {})
       }
-    },
-    onCrontabFill (value) {
-      value = value.replace(/[?]/g, '*')
-      this.$set(this.scheduleForm, 'cron', value)
-
-      this.$st.sendEv('定时任务', '提交生成Cron', 'cron', this.scheduleForm.cron)
-    },
-    onShowCronDialog () {
-      this.showCron = true
-      if (this.expression.split(' ').length < 7) {
-        // this.expression = (this.scheduleForm.cron + ' ').replace(/[?]/g, '*')
-        this.expression = this.scheduleForm.cron + ' '
-      } else {
-        // this.expression = this.scheduleForm.cron.replace(/[?]/g, '*')
-        this.expression = this.scheduleForm.cron
-      }
-
-      this.$st.sendEv('定时任务', '点击生成Cron', 'cron', this.scheduleForm.cron)
     }
   },
   created () {
@@ -343,4 +332,7 @@ export default {
     min-height: 360px;
     margin-top: 10px;
   }
+  .status-tag {
+    cursor: pointer;
+  }
 </style>
diff --git a/frontend/src/views/task/TaskList.vue b/frontend/src/views/task/TaskList.vue
index 2c8b73bc..8013c080 100644
--- a/frontend/src/views/task/TaskList.vue
+++ b/frontend/src/views/task/TaskList.vue
@@ -229,6 +229,7 @@ export default {
           type: 'error',
           message: '请选择要删除的任务'
         })
+        return
       }
       this.$confirm('确定删除任务', '提示', {
         confirmButtonText: '确定',