Merge pull request #543 from crawlab-team/develop

Develop

backend/routes/task.go

@@ -100,6 +100,9 @@ func PutTask(c *gin.Context) {
 		return
 	}
 
+	// 任务ID
+	var taskIds []string
+
 	if reqBody.RunType == constants.RunTypeAllNodes {
 		// 所有节点
 		nodes, err := model.GetNodeList(nil)
@@ -115,10 +118,13 @@ func PutTask(c *gin.Context) {
 				UserId:   services.GetCurrentUser(c).Id,
 			}
 
-			if err := services.AddTask(t); err != nil {
+			id, err := services.AddTask(t);
+			if err != nil {
 				HandleError(http.StatusInternalServerError, c, err)
 				return
 			}
+
+			taskIds = append(taskIds, id)
 		}
 	} else if reqBody.RunType == constants.RunTypeRandom {
 		// 随机
@@ -127,10 +133,12 @@ func PutTask(c *gin.Context) {
 			Param:    reqBody.Param,
 			UserId:   services.GetCurrentUser(c).Id,
 		}
-		if err := services.AddTask(t); err != nil {
+		id, err := services.AddTask(t);
+		if err != nil {
 			HandleError(http.StatusInternalServerError, c, err)
 			return
 		}
+		taskIds = append(taskIds, id)
 	} else if reqBody.RunType == constants.RunTypeSelectedNodes {
 		// 指定节点
 		for _, nodeId := range reqBody.NodeIds {
@@ -141,16 +149,19 @@ func PutTask(c *gin.Context) {
 				UserId:   services.GetCurrentUser(c).Id,
 			}
 
-			if err := services.AddTask(t); err != nil {
+			id, err := services.AddTask(t);
+			if err != nil {
 				HandleError(http.StatusInternalServerError, c, err)
 				return
 			}
+			taskIds = append(taskIds, id)
 		}
 	} else {
 		HandleErrorF(http.StatusInternalServerError, c, "invalid run_type")
 		return
 	}
-	HandleSuccess(c)
+
+	HandleSuccessData(c, taskIds)
 }
 
 func DeleteTaskByStatus(c *gin.Context) {

backend/services/schedule.go

@@ -37,7 +37,7 @@ func AddScheduleTask(s model.Schedule) func() {
 					UserId:   s.UserId,
 				}
 
-				if err := AddTask(t); err != nil {
+				if _, err := AddTask(t); err != nil {
 					return
 				}
 			}
@@ -49,7 +49,7 @@ func AddScheduleTask(s model.Schedule) func() {
 				Param:    s.Param,
 				UserId:   s.UserId,
 			}
-			if err := AddTask(t); err != nil {
+			if _, err := AddTask(t); err != nil {
 				log.Errorf(err.Error())
 				debug.PrintStack()
 				return
@@ -65,7 +65,7 @@ func AddScheduleTask(s model.Schedule) func() {
 					UserId:   s.UserId,
 				}
 
-				if err := AddTask(t); err != nil {
+				if _, err := AddTask(t); err != nil {
 					return
 				}
 			}

backend/services/task.go

@@ -666,7 +666,7 @@ func CancelTask(id string) (err error) {
 	return nil
 }
 
-func AddTask(t model.Task) error {
+func AddTask(t model.Task) (string, error) {
 	// 生成任务ID
 	id := uuid.NewV4()
 	t.Id = id.String()
@@ -683,17 +683,17 @@ func AddTask(t model.Task) error {
 	if err := model.AddTask(t); err != nil {
 		log.Errorf(err.Error())
 		debug.PrintStack()
-		return err
+		return t.Id, err
 	}
 
 	// 加入任务队列
 	if err := AssignTask(t); err != nil {
 		log.Errorf(err.Error())
 		debug.PrintStack()
-		return err
+		return t.Id, err
 	}
 
-	return nil
+	return t.Id, nil
 }
 
 func GetTaskEmailMarkdownContent(t model.Task, s model.Spider) string {

frontend/src/components/Common/CrawlConfirmDialog.vue

@@ -30,13 +30,22 @@
         <el-input v-model="form.param" :placeholder="$t('Parameters')"></el-input>
       </el-form-item>
       <el-form-item class="disclaimer-wrapper">
-        <el-checkbox v-model="isAllowDisclaimer"/>
-        <span style="margin-left: 5px">我已阅读并同意 <a href="javascript:" @click="onClickDisclaimer">《免责声明》</a> 所有内容</span>
+        <div>
+          <el-checkbox v-model="isAllowDisclaimer"/>
+          <span style="margin-left: 5px">我已阅读并同意 <a href="javascript:" @click="onClickDisclaimer">《免责声明》</a> 所有内容</span>
+        </div>
+        <div>
+          <el-checkbox v-model="isRedirect"/>
+          <span style="margin-left: 5px">跳转到任务详情页</span>
+        </div>
+      </el-form-item>
+      <el-form-item>
       </el-form-item>
     </el-form>
     <template slot="footer">
       <el-button type="plain" size="small" @click="$emit('close')">{{$t('Cancel')}}</el-button>
-      <el-button type="primary" size="small" @click="onConfirm" :disabled="!isAllowDisclaimer">{{$t('Confirm')}}</el-button>
+      <el-button type="primary" size="small" @click="onConfirm" :disabled="!isAllowDisclaimer">{{$t('Confirm')}}
+      </el-button>
     </template>
   </el-dialog>
 </template>
@@ -64,7 +73,8 @@ export default {
         param: '',
         nodeList: []
       },
-      isAllowDisclaimer: true
+      isAllowDisclaimer: true,
+      isRedirect: true
     }
   },
   methods: {
@@ -72,20 +82,27 @@ export default {
       this.$emit('close')
     },
     onConfirm () {
-      this.$refs['form'].validate(res => {
-        if (!res) return
+      this.$refs['form'].validate(async valid => {
+        if (!valid) return
 
-        this.$store.dispatch('spider/crawlSpider', {
+        const res = await this.$store.dispatch('spider/crawlSpider', {
           spiderId: this.spiderId,
           nodeIds: this.form.nodeIds,
           param: this.form.param,
           runType: this.form.runType
         })
-          .then(() => {
-            this.$message.success(this.$t('A task has been scheduled successfully'))
-          })
+
+        const id = res.data.data[0]
+
+        this.$message.success(this.$t('A task has been scheduled successfully'))
+
         this.$emit('close')
         this.$st.sendEv('爬虫确认', '确认运行', this.form.runType)
+
+        if (this.isRedirect) {
+          this.$router.push('/tasks/' + id)
+          this.$st.sendEv('爬虫确认', '跳转到任务详情')
+        }
       })
     },
     onClickDisclaimer () {

frontend/src/views/node/NodeDetail.vue

@@ -18,7 +18,7 @@
     </div>
 
     <!--tabs-->
-    <el-tabs v-model="activeTabName" @tab-click="onTabClick" type="card">
+    <el-tabs v-model="activeTabName" @tab-click="onTabClick" type="border-card">
       <el-tab-pane :label="$t('Overview')" name="overview">
         <node-overview></node-overview>
       </el-tab-pane>
@@ -136,8 +136,8 @@ export default {
     display: flex;
     align-items: center;
     position: absolute;
-    right: 20px;
-    margin-top: -7px;
+    right: 30px;
+    margin-top: 4px;
     /*float: right;*/
     z-index: 999;
   }
@@ -147,6 +147,8 @@ export default {
   }
 
   .label {
+    color: #909399;
+    font-weight: 100;
     width: 100px;
     text-align: right;
   }

frontend/src/views/task/TaskDetail.vue

@@ -10,14 +10,12 @@
     <!--./tour-->
 
     <!--tabs-->
-    <el-tabs v-model="activeTabName" @tab-click="onTabClick" type="card">
+    <el-tabs v-model="activeTabName" @tab-click="onTabClick" type="border-card">
       <el-tab-pane :label="$t('Overview')" name="overview">
         <task-overview/>
       </el-tab-pane>
       <el-tab-pane :label="$t('Log')" name="log">
-        <el-card>
-          <log-view :data="taskLog"/>
-        </el-card>
+        <log-view :data="taskLog"/>
       </el-tab-pane>
       <el-tab-pane :label="$t('Results')" name="results">
         <div class="button-group">