Merge branch 'pre' of https://gitee.com/zxt_5/admin_home into pre

src/views/crawler/webCrawlerList.vue

@@ -84,6 +84,9 @@
                         :current-page="page" :page-size="pageSize" layout="total, prev, pager, next, jumper"
                         :total="total">
                     </el-pagination>
+                    <!-- <el-pagination @size-change="handleSizeChange" :current-page="getApiData.page"
+                        @current-change="handleCurrentChange" :page-size="10" layout="total, prev, pager, next, jumper"
+                        :total="allCount"></el-pagination> -->
                 </el-col>
             </el-row>
         </div>
@@ -102,9 +105,9 @@
                     </el-form-item> -->
 
                     <el-form-item label="关联导航池:" :label-width="formLabelWidth" class="custom-align-right">
-                            <el-cascader :key="parentKey" v-model="ruleForm.name" placeholder="请选择关联的导航池名称"
-                                :props="parentData" filterable clearable></el-cascader>
-                        </el-form-item>
+                        <el-cascader :key="parentKey" v-model="ruleForm.name" placeholder="请选择关联的导航池名称"
+                            :props="parentData" filterable clearable></el-cascader>
+                    </el-form-item>
                 </div>
                 <div class="dialogBtn">
                     <button class="cancel" @click="cancelForm">取消</button>
@@ -183,7 +186,7 @@ export default {
                     label: '已导入'
                 },
             ],
-            formLabelWidth:'120px',
+            formLabelWidth: '120px',
             parentKey: 0,//获取父级导航
             parentData: {
                 checkStrictly: true,
@@ -224,34 +227,56 @@ export default {
         //1.列表和分页相关 start ------------------------------------------------------------>
         //1.1 开始请求列表信息方法
         getData() {
-            getInfo({
-                // rule_id: 12,
-                rule_id: this.ruleId,
-                page: this.page,
-                pageSize: this.pageSize
-            }).then(data => {
-                console.log('tableData', data.data.rep);
-                this.loading = false
-
-                this.total = data.data.count
-                this.tableData = data.data.rep
+            if (this.message_name == '' && this.message_from == '' && this.message_state == '') {
+                getInfo({
+                    // rule_id: 12,
+                    rule_id: this.ruleId,
+                    page: this.page,
+                    pageSize: this.pageSize
+                }).then(data => {
+                    console.log('tableData', data.data.rep);
+                    this.loading = false
+
+                    this.total = data.data.count
+                    this.tableData = data.data.rep
+
+                    for (let item of this.tableData) {
+                        if (item.state == 1) {
+                            item.state = "已导入"
+                        } else {
+                            item.state = "未导入";
+                            this.listStatus = true;
+                        }
+                    }
+                    console.log(this.listStatus);
+                    if (this.listStatus) {
 
-                for (let item of this.tableData) {
-                    if (item.state == 1) {
-                        item.state = "已导入"
                     } else {
-                        item.state = "未导入";
-                        this.listStatus = true;
+                        this.clearTask()
+                        // this.$message.success("导入成功!")
                     }
-                }
-                console.log(this.listStatus);
-                if (this.listStatus) {
-
-                } else {
-                    this.clearTask()
-                    this.$message.success("导入成功!")
-                }
-            })
+                })
+            } else {
+                getInfo({
+                    rule_id: this.ruleId,
+                    page: this.page,
+                    pageSize: this.pageSize,
+                    title: this.message_name,
+                    source: this.message_from,
+                    state: this.message_state
+                }).then(data => {
+                    console.log(data);
+                    this.total = data.data.count
+                    this.tableData = data.data.rep
+                    for (let item of this.tableData) {
+                        if (item.state == 1) {
+                            item.state = "已导入"
+                        } else {
+                            item.state = "未导入"
+                        }
+                    }
+                })
+            }
         },
         setTask() {
             let that = this;
@@ -295,7 +320,6 @@ export default {
         },
         //1.3 修改网站状态
 
-
         //1.4 列表内容分页
         //直接跳转
         handleSizeChange(val) {
@@ -374,7 +398,7 @@ export default {
 
         //关联导航池的取消按钮
         cancelForm() {
-            this.dialogTableVisible = false
+            this.dialogTableVisible = true
         },
 
 
@@ -628,4 +652,10 @@ export default {
     line-height: 36px;
     font-size: 16px;
 }
+
+::v-deep .el-cascader--medium {
+    width: 100%;
+    font-size: 14px;
+    line-height: 36px;
+}
 </style>

src/views/crawler/webRule.vue

@@ -169,8 +169,9 @@
                             <el-input v-model="ruleForm.title" placeholder="请输入标题字符串"></el-input>
                             <el-tooltip placement="top-start">
                                 <div slot="content">
-                                    如标题代码:&lt;h1 class='news_art'>红枣滞销喂羊 电商帮忙促销&lt;/h1>，标题字符串为 .news_art 填入输入框内<br />
-                                    如标题代码:&lt;h1 id='news at'>红枣滞销喂羊 电商帮忙促销&lt;/h1>，标题字符串为 #news art 填入输入框内
+                                    如标题代码:&lt;div class='news_art'>红枣滞销喂羊 电商帮忙促销&lt;/div>，标题字符串为 .news_art 填入输入框内<br />
+                                    如标题代码:&lt;div id='news at'>红枣滞销喂羊 电商帮忙促销&lt;/div>，标题字符串为 #news art 填入输入框内<br/>
+                                    若是有多个，要保证“news_art"的唯一性，标题字符串更改为:标签名.class名 —— div.news_art 填入输入框内
                                 </div>
                                 <i class="el-icon-warning"></i>
                             </el-tooltip>