From 3350d3b065109830d11321591d135ca318095273 Mon Sep 17 00:00:00 2001
From: marvzhang <tikazyq@163.com>
Date: Sun, 19 Apr 2020 11:57:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=89=8D=E7=AB=AF=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E9=94=99=E8=AF=AF=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/i18n/zh.js              |  1 +
 frontend/src/views/task/TaskList.vue | 22 ++++++++++++++++++++--
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/frontend/src/i18n/zh.js b/frontend/src/i18n/zh.js
index 47af1382..f6f8ef08 100644
--- a/frontend/src/i18n/zh.js
+++ b/frontend/src/i18n/zh.js
@@ -489,6 +489,7 @@ export default {
   'Error Regex Pattern': '异常正则表达式',
   'By default: ': '默认: ',
   'Max Error Logs Display': '最大异常日志展示',
+  'Log Errors': '日志错误',
 
   // 挑战
   'Challenge': '挑战',
diff --git a/frontend/src/views/task/TaskList.vue b/frontend/src/views/task/TaskList.vue
index f1de5bc1..e4a756aa 100644
--- a/frontend/src/views/task/TaskList.vue
+++ b/frontend/src/views/task/TaskList.vue
@@ -21,7 +21,8 @@
               </el-select>
             </el-form-item>
             <el-form-item prop="spider_id" :label="$t('Spider')">
-              <el-select v-model="filter.spider_id" size="small" :placeholder="$t('Spider')" @change="onFilterChange" :disabled="isFilterSpiderDisabled">
+              <el-select v-model="filter.spider_id" size="small" :placeholder="$t('Spider')" @change="onFilterChange"
+                         :disabled="isFilterSpiderDisabled">
                 <el-option value="" :label="$t('All')"/>
                 <el-option v-for="spider in spiderList" :key="spider._id" :value="spider._id" :label="spider.name"/>
               </el-select>
@@ -132,6 +133,19 @@
                            :width="col.width">
             <template slot-scope="scope">
               <status-tag :status="scope.row[col.name]"/>
+              <template
+                v-if="scope.row.error_log_count > 0"
+              >
+                <el-tooltip :content="$t('Log Errors') + ': ' + scope.row.error_log_count" placement="top">
+                  <el-tag
+                    type="danger"
+                    style="margin-left: 10px"
+                  >
+                    <i class="el-icon-warning"></i>
+                    <i class="el-icon-tickets"></i>
+                  </el-tag>
+                </el-tooltip>
+              </template>
             </template>
           </el-table-column>
           <el-table-column v-else
@@ -201,7 +215,7 @@ export default {
       columns: [
         { name: 'node_name', label: 'Node', width: '120' },
         { name: 'spider_name', label: 'Spider', width: '120' },
-        { name: 'status', label: 'Status', width: '120' },
+        { name: 'status', label: 'Status', width: '180' },
         { name: 'param', label: 'Parameters', width: '120' },
         // { name: 'create_ts', label: 'Create Time', width: '100' },
         { name: 'start_ts', label: 'Start Time', width: '100' },
@@ -499,4 +513,8 @@ export default {
   .el-table >>> tr {
     cursor: pointer;
   }
+
+  .el-table >>> .el-badge .el-badge__content {
+    font-size: 7px;
+  }
 </style>