Explorar o código

修改采集器bug

Jing hai 3 meses
pai
achega
c57f9bcc91

+ 1 - 3
src/views/crawler/webCrawler.vue

@@ -162,9 +162,7 @@ export default {
                 page: this.page,
                 page: this.page,
                 pageSize: this.pageSize,
                 pageSize: this.pageSize,
             }).then(data => {
             }).then(data => {
-                if(data.code==200){
-                    this.loading=false
-                }
+                this.loading=false
                 console.log(data);
                 console.log(data);
                 this.tableData = data.data.rep
                 this.tableData = data.data.rep
                 this.total = data.data.count
                 this.total = data.data.count

+ 2 - 3
src/views/crawler/webCrawlerList.vue

@@ -191,9 +191,8 @@ export default {
                 pageSize: this.pageSize
                 pageSize: this.pageSize
             }).then(data => {
             }).then(data => {
                 console.log(data);
                 console.log(data);
-                if (data.code == 200) {
-                    this.loading = false
-                }
+                this.loading = false
+               
                 this.total = data.data.count
                 this.total = data.data.count
                 this.tableData = data.data.rep
                 this.tableData = data.data.rep
 
 

+ 31 - 17
src/views/crawler/webRule.vue

@@ -401,13 +401,13 @@ export default {
                 callback()
                 callback()
             }
             }
         }
         }
-        const validatparameter = (rule, value, callback) => {
-            if (value.length == 0) {
-                callback(new Error('请输入接口参数'))
-            } else {
-                callback()
-            }
-        }
+        // const validatparameter = (rule, value, callback) => {
+        //     if (value.length == 0) {
+        //         callback(new Error('请输入接口参数'))
+        //     } else {
+        //         callback()
+        //     }
+        // }
         const validatsecondWeb = (rule, value, callback) => {
         const validatsecondWeb = (rule, value, callback) => {
             if (value.length == 0) {
             if (value.length == 0) {
                 callback(new Error('请输入第2页网址'))
                 callback(new Error('请输入第2页网址'))
@@ -476,9 +476,9 @@ export default {
                 ruleName: [{ required: true, trigger: 'blur', validator: validateRuleName }],
                 ruleName: [{ required: true, trigger: 'blur', validator: validateRuleName }],
                 first_url: [{ required: true, trigger: 'blur', validator: validateFirst_url }],
                 first_url: [{ required: true, trigger: 'blur', validator: validateFirst_url }],
                 secondWeb: [{ required: true, trigger: 'blur', validator: validatsecondWeb }],
                 secondWeb: [{ required: true, trigger: 'blur', validator: validatsecondWeb }],
-                // second_start:[{ required: true, trigger: 'blur', validator: validatsecondWeb }],
-                // second_num:[{ required: true, trigger: 'blur', validator: validatsecondWeb }],
-                // second_end:[{ required: true, trigger: 'blur', validator: validatsecondWeb }],
+                second_start:[{ required: true, trigger: 'blur', validator: validatsecondWeb }],
+                second_num:[{ required: true, trigger: 'blur', validator: validatsecondWeb }],
+                second_end:[{ required: true, trigger: 'blur', validator: validatsecondWeb }],
                 second_start: [{ required: true, trigger: 'blur', message: '请输入网址开头' }],
                 second_start: [{ required: true, trigger: 'blur', message: '请输入网址开头' }],
                 second_num: [{ required: true, trigger: 'blur', message: '请输入代码页数' }],
                 second_num: [{ required: true, trigger: 'blur', message: '请输入代码页数' }],
                 second_end: [{ required: true, trigger: 'blur', message: '请输入网址结束字符串' }],
                 second_end: [{ required: true, trigger: 'blur', message: '请输入网址结束字符串' }],
@@ -492,7 +492,7 @@ export default {
                 source: [{ required: true, trigger: 'blur', validator: validatsource }],
                 source: [{ required: true, trigger: 'blur', validator: validatsource }],
                 author: [{ required: true, trigger: 'blur', validator: validatauthor }],
                 author: [{ required: true, trigger: 'blur', validator: validatauthor }],
                 authorName: [{ required: true, trigger: 'blur', validator: validatauthorName }],
                 authorName: [{ required: true, trigger: 'blur', validator: validatauthorName }],
-                parameter: [{ required: true, trigger: 'blur', validator: validatparameter }]
+                parameter: [{ required: true, trigger: 'blur', message: "请输入接口参数" }]
             }
             }
         }
         }
     },
     },
@@ -505,9 +505,8 @@ export default {
                 pageSize: this.pageSize,
                 pageSize: this.pageSize,
                 page: this.page,
                 page: this.page,
             }).then(data => {
             }).then(data => {
-                if (data.code == 200) {
-                    this.loading = false
-                }
+                this.loading = false
+
                 console.log(data.data.rep);
                 console.log(data.data.rep);
                 this.tableData = data.data.rep
                 this.tableData = data.data.rep
                 this.total = data.data.count
                 this.total = data.data.count
@@ -595,6 +594,7 @@ export default {
 
 
         //1.8 设置采集规则
         //1.8 设置采集规则
         addCrawlerRule() {
         addCrawlerRule() {
+            this.dialogBoo = "add"
             if (!this.webType) {
             if (!this.webType) {
                 this.dialogTableVisible = false
                 this.dialogTableVisible = false
                 this.$message({
                 this.$message({
@@ -846,7 +846,7 @@ export default {
             this.$refs[formName].validate((valid) => {
             this.$refs[formName].validate((valid) => {
                 if (valid) {
                 if (valid) {
                     console.log('submit!');
                     console.log('submit!');
-                    this.submitDisabled = true
+                    // this.submitDisabled = true
                 } else {
                 } else {
                     console.log('error submit!!');
                     console.log('error submit!!');
                     return false;
                     return false;
@@ -874,6 +874,7 @@ export default {
                             con_url: this.ruleForm.webSite_start.trim(), //详情页标签
                             con_url: this.ruleForm.webSite_start.trim(), //详情页标签
                             con_start: this.ruleForm.detailPage, //详情页网址前缀
                             con_start: this.ruleForm.detailPage, //详情页网址前缀
                         }).then(data => {
                         }).then(data => {
+                            this.submitDisabled = true
                             this.getData()
                             this.getData()
                             console.log(data);
                             console.log(data);
                             if (data.code == 200) {
                             if (data.code == 200) {
@@ -884,6 +885,13 @@ export default {
                                     type: 'success'
                                     type: 'success'
                                 })
                                 })
                             }
                             }
+                            if (data.code == 0) {
+                                this.submitDisabled = false
+                                this.$message({
+                                    message: data.message,
+                                    type: 'error'
+                                })
+                            }
                         })
                         })
                     } else {
                     } else {
                         addRule({
                         addRule({
@@ -914,6 +922,12 @@ export default {
                                     type: 'success'
                                     type: 'success'
                                 })
                                 })
                             }
                             }
+                            if (data.code == 0) {
+                                this.$message({
+                                    message: data.message,
+                                    type: 'error'
+                                })
+                            }
                         })
                         })
                     }
                     }
 
 
@@ -1015,9 +1029,9 @@ export default {
                         content: this.ruleForm.content.trim(),//规则型1:内容标签类名  接口型2:内容标签
                         content: this.ruleForm.content.trim(),//规则型1:内容标签类名  接口型2:内容标签
                         source: this.ruleForm.source, //规则型1:来源标签类名  接口型2:来源标签
                         source: this.ruleForm.source, //规则型1:来源标签类名  接口型2:来源标签
                         writer_class: this.ruleForm.author,//规则型1:作者标签类名  接口型2:作者标签
                         writer_class: this.ruleForm.author,//规则型1:作者标签类名  接口型2:作者标签
-                        writer: this.ruleForm.authorName.trim(),//规则型1:接口型2:作者默认名称(若未采集到则设置默认作者)
+                        writer: this.ruleForm.authorName,//规则型1:接口型2:作者默认名称(若未采集到则设置默认作者)
                         end_pagenum: this.ruleForm.endPage,//规则型1:列表页结束页码
                         end_pagenum: this.ruleForm.endPage,//规则型1:列表页结束页码
-                        con_url: this.ruleForm.webSite_start.trim(), //详情页标签
+                        con_url: this.ruleForm.webSite_start, //详情页标签
                         con_start: this.ruleForm.detailPage, //详情页网址前缀
                         con_start: this.ruleForm.detailPage, //详情页网址前缀
                     }).then(data => {
                     }).then(data => {
                         this.getData()
                         this.getData()