Jing 3 місяців тому
батько
коміт
a33bc6f948
1 змінених файлів з 49 додано та 42 видалено
  1. 49 42
      src/views/crawler/webRule.vue

+ 49 - 42
src/views/crawler/webRule.vue

@@ -298,7 +298,7 @@
                 </div>
                 </div>
 
 
                 <div class="dialogBtn">
                 <div class="dialogBtn">
-                    <el-button class="cancel" @click="saveForm">保存</el-button>
+                    <el-button class="cancel" @click="saveForm">{{ dialogBoo == 'add' ? '保存' : '取消' }}</el-button>
                     <el-button type="primary" class="submit" :loading="submitDisabled"
                     <el-button type="primary" class="submit" :loading="submitDisabled"
                         @click="submitForm('ruleForm')">确定</el-button>
                         @click="submitForm('ruleForm')">确定</el-button>
                 </div>
                 </div>
@@ -387,20 +387,20 @@ export default {
                 callback()
                 callback()
             }
             }
         }
         }
-        const validatauthor = (rule, value, callback) => {
-            if (value.length == 0) {
-                callback(new Error('请输入作者字符串'))
-            } else {
-                callback()
-            }
-        }
-        const validatauthorName = (rule, value, callback) => {
-            if (value.length == 0) {
-                callback(new Error('请输入作者替换名称'))
-            } else {
-                callback()
-            }
-        }
+        // const validatauthor = (rule, value, callback) => {
+        //     if (value.length == 0) {
+        //         callback(new Error('请输入作者字符串'))
+        //     } else {
+        //         callback()
+        //     }
+        // }
+        // const validatauthorName = (rule, value, callback) => {
+        //     if (value.length == 0) {
+        //         callback(new Error('请输入作者替换名称'))
+        //     } else {
+        //         callback()
+        //     }
+        // }
         // const validatparameter = (rule, value, callback) => {
         // const validatparameter = (rule, value, callback) => {
         //     if (value.length == 0) {
         //     if (value.length == 0) {
         //         callback(new Error('请输入接口参数'))
         //         callback(new Error('请输入接口参数'))
@@ -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: '请输入网址结束字符串' }],
@@ -490,8 +490,8 @@ export default {
                 title: [{ required: true, trigger: 'blur', validator: validatTitle }],
                 title: [{ required: true, trigger: 'blur', validator: validatTitle }],
                 content: [{ required: true, trigger: 'blur', validator: validatcontent }],
                 content: [{ required: true, trigger: 'blur', validator: validatcontent }],
                 source: [{ required: true, trigger: 'blur', validator: validatsource }],
                 source: [{ required: true, trigger: 'blur', validator: validatsource }],
-                author: [{ required: true, trigger: 'blur', validator: validatauthor }],
-                authorName: [{ required: true, trigger: 'blur', validator: validatauthorName }],
+                author: [{ required: true, trigger: 'blur', message: "请输入作者字符串" }],
+                authorName: [{ required: true, trigger: 'blur', message: "请输入作者替换名称" }],
                 parameter: [{ required: true, trigger: 'blur', message: "请输入接口参数" }]
                 parameter: [{ required: true, trigger: 'blur', message: "请输入接口参数" }]
             }
             }
         }
         }
@@ -594,6 +594,7 @@ export default {
 
 
         //1.8 设置采集规则
         //1.8 设置采集规则
         addCrawlerRule() {
         addCrawlerRule() {
+            this.dialogName = '设置采集规则'
             this.dialogBoo = "add"
             this.dialogBoo = "add"
             if (!this.webType) {
             if (!this.webType) {
                 this.dialogTableVisible = false
                 this.dialogTableVisible = false
@@ -735,6 +736,9 @@ export default {
         },
         },
         //1.9 编辑采集规则
         //1.9 编辑采集规则
         goEdit(id, val) {
         goEdit(id, val) {
+            this.dialogName = '编辑采集规则'
+            this.dialogBoo = "update"
+
             console.log(id);
             console.log(id);
             this.activeId = id
             this.activeId = id
             console.log(val);
             console.log(val);
@@ -746,7 +750,6 @@ export default {
                 })
                 })
                 return
                 return
             } else if (this.webType == 1) {
             } else if (this.webType == 1) {
-                this.dialogBoo = "update"
                 this.dialogTableVisible = true
                 this.dialogTableVisible = true
                 this.ruleForm.ruleName = val.name
                 this.ruleForm.ruleName = val.name
                 this.ruleForm.first_url = val.first_url
                 this.ruleForm.first_url = val.first_url
@@ -768,7 +771,6 @@ export default {
                 this.ruleForm.detailPage = val.con_start
                 this.ruleForm.detailPage = val.con_start
 
 
             } else if (this.webType == 2) {
             } else if (this.webType == 2) {
-                this.dialogBoo = "update"
                 this.dialogTableVisible = true
                 this.dialogTableVisible = true
                 this.ruleForm.ruleName = val.name
                 this.ruleForm.ruleName = val.name
                 this.ruleForm.first_url = val.first_url
                 this.ruleForm.first_url = val.first_url
@@ -793,7 +795,6 @@ export default {
                     this.ruleForm.authorName = val.writer
                     this.ruleForm.authorName = val.writer
                 }
                 }
             } else if (this.webType == 3) {
             } else if (this.webType == 3) {
-                this.dialogBoo = "update"
                 this.dialogTableVisible = true
                 this.dialogTableVisible = true
                 this.ruleForm.ruleName = val.name
                 this.ruleForm.ruleName = val.name
                 this.ruleForm.diy_rule = val.diy_rule
                 this.ruleForm.diy_rule = val.diy_rule
@@ -1004,6 +1005,7 @@ export default {
                         }
                         }
                     })
                     })
                 }
                 }
+                sessionStorage.clear();
             }
             }
             //编辑
             //编辑
             if (this.dialogBoo == 'update') {
             if (this.dialogBoo == 'update') {
@@ -1121,25 +1123,30 @@ export default {
         },
         },
         //保存
         //保存
         saveForm() {
         saveForm() {
-            this.dialogTableVisible = false
-            sessionStorage.setItem('ruleName', this.ruleForm.ruleName); //任务规则名
-            sessionStorage.setItem('first_url', this.ruleForm.first_url); //第一页网址 
-            sessionStorage.setItem('collect', this.ruleForm.collect); //接口类 采集地址
-            sessionStorage.setItem('second_start', this.ruleForm.second_start); //第2页网址开头
-            sessionStorage.setItem('second_num', this.ruleForm.second_num); //第2页代码页数
-            sessionStorage.setItem('second_end', this.ruleForm.second_end);//第2页网址结束字符串
-            sessionStorage.setItem('startCode', this.ruleForm.startCode);  //起始代码
-            sessionStorage.setItem('startLabel', this.ruleForm.startLabel); //列表开始标签
-            sessionStorage.setItem('endPage', this.ruleForm.endPage); //结束页数
-            sessionStorage.setItem('title', this.ruleForm.title); //标题字符串
-            sessionStorage.setItem('content', this.ruleForm.content); //内容字符串
-            sessionStorage.setItem('detailPage', this.ruleForm.detailPage); //详情页标签
-            sessionStorage.setItem('webSite_start', this.ruleForm.webSite_start); //详情页网址前缀
-            sessionStorage.setItem('source', this.ruleForm.source); // 来源字符串
-            sessionStorage.setItem('author', this.ruleForm.author); // 作者字符串
-            sessionStorage.setItem('authorName', this.ruleForm.authorName); // 作者替换名称
-            sessionStorage.setItem('parameter', this.ruleForm.parameter); //接口类2 接口参数
-            sessionStorage.setItem('diy_rule', this.ruleForm.diy_rule); //自定义类
+            if (this.dialogBoo == 'add') {
+                this.dialogTableVisible = false
+                sessionStorage.setItem('ruleName', this.ruleForm.ruleName); //任务规则名
+                sessionStorage.setItem('first_url', this.ruleForm.first_url); //第一页网址 
+                sessionStorage.setItem('collect', this.ruleForm.collect); //接口类 采集地址
+                sessionStorage.setItem('second_start', this.ruleForm.second_start); //第2页网址开头
+                sessionStorage.setItem('second_num', this.ruleForm.second_num); //第2页代码页数
+                sessionStorage.setItem('second_end', this.ruleForm.second_end);//第2页网址结束字符串
+                sessionStorage.setItem('startCode', this.ruleForm.startCode);  //起始代码
+                sessionStorage.setItem('startLabel', this.ruleForm.startLabel); //列表开始标签
+                sessionStorage.setItem('endPage', this.ruleForm.endPage); //结束页数
+                sessionStorage.setItem('title', this.ruleForm.title); //标题字符串
+                sessionStorage.setItem('content', this.ruleForm.content); //内容字符串
+                sessionStorage.setItem('detailPage', this.ruleForm.detailPage); //详情页标签
+                sessionStorage.setItem('webSite_start', this.ruleForm.webSite_start); //详情页网址前缀
+                sessionStorage.setItem('source', this.ruleForm.source); // 来源字符串
+                sessionStorage.setItem('author', this.ruleForm.author); // 作者字符串
+                sessionStorage.setItem('authorName', this.ruleForm.authorName); // 作者替换名称
+                sessionStorage.setItem('parameter', this.ruleForm.parameter); //接口类2 接口参数
+                sessionStorage.setItem('diy_rule', this.ruleForm.diy_rule); //自定义类
+            }
+            if (this.dialogBoo == 'update') {
+                this.dialogTableVisible = false
+            }
         },
         },
         // 查看
         // 查看
         goLook(id, val) {
         goLook(id, val) {