Merge remote-tracking branch 'origin/develop' into develop

# Conflicts: # frontend/src/views/spider/SpiderList.vue
crawlab-team · May 26, 2019 · 8d3d7b3 · 8d3d7b3
2 parents 113be05 + a0acd6d
commit 8d3d7b3
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/crawlab/.gitignore b/crawlab/.gitignore
@@ -110,3 +110,5 @@ node_modules/
 
 # egg-info
 *.egg-info
+
+tmp/
diff --git a/crawlab/bin/run_worker.py b/crawlab/bin/run_worker.py
@@ -13,7 +13,7 @@
 import tasks.deploy
 
 if __name__ == '__main__':
-    if sys.platform == 'windows':
+    if 'win' in sys.platform:
         celery_app.start(argv=['tasks', 'worker', '-P', 'eventlet', '-E', '-l', 'INFO'])
     else:
         celery_app.start(argv=['tasks', 'worker', '-E', '-l', 'INFO'])
diff --git a/frontend/src/views/spider/SpiderList.vue b/frontend/src/views/spider/SpiderList.vue
@@ -175,7 +175,7 @@
                          :width="col.width">
         </el-table-column>
       </template>
-      <el-table-column :label="$t('Action')" align="left" width="200">
+      <el-table-column :label="$t('Action')" align="left" width="auto" fixed="right">
         <template slot-scope="scope">
           <el-tooltip :content="$t('View')" placement="top">
             <el-button type="primary" icon="el-icon-search" size="mini" @click="onView(scope.row)"></el-button>
@@ -234,8 +234,8 @@ export default {
       },
       // tableData,
       columns: [
-        { name: 'name', label: 'Name', width: 'auto' },
-        { name: 'site_name', label: 'Site', width: '120' },
+        { name: 'name', label: 'Name', width: '180', align: 'left' },
+        { name: 'site_name', label: 'Site', width: '140', align: 'left' },
         { name: 'type', label: 'Spider Type', width: '120' },
         { name: 'lang', label: 'Language', width: '120', sortable: true },
         { name: 'task_ts', label: 'Last Run', width: '160' },

diff --git a/frontend/src/views/task/TaskList.vue b/frontend/src/views/task/TaskList.vue
@@ -68,7 +68,7 @@
                          :width="col.width">
         </el-table-column>
       </template>
-      <el-table-column :label="$t('Action')" align="center" width="auto">
+      <el-table-column :label="$t('Action')" align="left" width="auto" fixed="right">
         <template slot-scope="scope">
           <el-tooltip :content="$t('View')" placement="top">
             <el-button type="primary" icon="el-icon-search" size="mini" @click="onView(scope.row)"></el-button>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -110,3 +110,5 @@ node_modules/

		# egg-info
		*.egg-info

		tmp/