From 417b98074c5edf042ef2db7145b75b3c5ee39184 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=99=AF=E9=98=B3?= <1656488874@qq.com>
Date: Wed, 16 Oct 2019 15:32:15 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E6=97=A0=E6=B3=95=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E8=8A=82=E7=82=B9=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/Common/CrawlConfirmDialog.vue  | 21 ++++++++++++++++---
 frontend/src/views/spider/SpiderList.vue      |  7 -------
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/frontend/src/components/Common/CrawlConfirmDialog.vue b/frontend/src/components/Common/CrawlConfirmDialog.vue
index 266ef2eb..2286beb2 100644
--- a/frontend/src/components/Common/CrawlConfirmDialog.vue
+++ b/frontend/src/components/Common/CrawlConfirmDialog.vue
@@ -9,9 +9,8 @@
     <el-form label-width="80px">
       <el-form-item :label="$t('Node')">
         <el-select v-model="nodeId">
-          <el-option value="" :label="$t('All Nodes')"/>
           <el-option
-            v-for="op in $store.state.node.nodeList"
+            v-for="op in nodeList"
             :key="op._id"
             :value="op._id"
             :disabled="op.status !== 'online'"
@@ -31,6 +30,7 @@
 </template>
 
 <script>
+import request from '../../api/request'
 export default {
   name: 'CrawlConfirmDialog',
   props: {
@@ -46,7 +46,8 @@ export default {
   data () {
     return {
       nodeId: '',
-      param: ''
+      param: '',
+      nodeList: []
     }
   },
   methods: {
@@ -61,6 +62,20 @@ export default {
       this.$emit('close')
       this.$st.sendEv('爬虫', '运行')
     }
+  },
+  created () {
+    // 节点列表
+    request.get('/nodes', {}).then(response => {
+      this.nodeList = response.data.data.map(d => {
+        d.systemInfo = {
+          os: '',
+          arch: '',
+          num_cpu: '',
+          executables: []
+        }
+        return d
+      })
+    })
   }
 }
 </script>
diff --git a/frontend/src/views/spider/SpiderList.vue b/frontend/src/views/spider/SpiderList.vue
index 8c97339a..eb1e548f 100644
--- a/frontend/src/views/spider/SpiderList.vue
+++ b/frontend/src/views/spider/SpiderList.vue
@@ -429,13 +429,6 @@ export default {
       } else {
         return false
       }
-      // if (this.isCustomized(row)) {
-      //   // customized spider
-      //   return !!row.cmd
-      // } else {
-      //   // configurable spider
-      //   return !!row.fields
-      // }
     },
     isCustomized (row) {
       return row.type === 'customized'