修改bug

src/views/advertise/adPlaceList.vue

@@ -416,6 +416,7 @@ export default {
             this.website_id = val.website_id
             this.ruleForm.webName = val.website_name //网站名称
             this.ruleForm.adName = val.name //广告位名称
+            this.ruleForm.adTag = val.ad_tag //广告位标识
             this.ruleForm.adDesc = val.introduce //广告位介绍
             this.logoUrl = val.thumb //广告示例图
             this.ruleForm.adPhoto = val.thumb //广告示例图

src/views/crawler/webCrawlerList.vue

@@ -6,19 +6,19 @@
                 <el-col :span="6" class="left">
                     <div class="searchBox">
                         <div class="searchTitle">资讯题目</div>
-                        <el-input v-model="message_name" placeholder="请输入资讯名称"></el-input>
+                        <el-input v-model="message_name" placeholder="请输入资讯名称" clearable></el-input>
                     </div>
                 </el-col>
                 <el-col :span="6" class="left">
                     <div class="searchBox">
                         <div class="searchTitle">来源</div>
-                        <el-input v-model="message_from" placeholder="请输入来源"></el-input>
+                        <el-input v-model="message_from" placeholder="请输入来源" clearable></el-input>
                     </div>
                 </el-col>
                 <el-col :span="6" class="left">
                     <div class="searchBox">
                         <div class="searchTitle">导入状态</div>
-                        <el-select v-model="message_state" placeholder="请选择导入状态">
+                        <el-select v-model="message_state" clearable placeholder="请选择导入状态">
                             <el-option v-for="item in statusOptions" :key="item.value" :label="item.label"
                                 :value="item.value">
                             </el-option>
@@ -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>
@@ -94,11 +97,16 @@
         <el-dialog title="关联导航池" :visible.sync="dialogTableVisible" width="50%" :close-on-click-modal="false">
             <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="120px" class="demo-ruleForm">
                 <div class="dialogText">
-                    <el-form-item label="关联导航池:" prop="name">
+                    <!-- <el-form-item label="关联导航池:" prop="name">
                         <el-select v-model="ruleForm.name" placeholder="请选择关联的导航池名称">
                             <el-option v-for="item in options" :key="item.id" :label="item.name" :value="item.id">
                             </el-option>
                         </el-select>
+                    </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>
                 </div>
                 <div class="dialogBtn">
@@ -124,6 +132,7 @@ export default {
         tableTitle,//表格标题
     },
     data() {
+        let self = this;
         return {
             tableDivTitle: "任务规则列表",//表格标题
             // searchWebName: "", //搜索网站名称
@@ -145,6 +154,12 @@ export default {
             pageSize: 10,
             total: 20,
 
+            //查询状态
+            setTime: '',
+            listStatus: false,
+
+            navigationPoolBoo: false, //是否关联导航池
+
             tableData: [], //表格内数据
             // currentPage: 4,
             dialogTableVisible: false,
@@ -170,7 +185,35 @@ export default {
                     value: '1',
                     label: '已导入'
                 },
-            ]
+            ],
+            formLabelWidth: '120px',
+            parentKey: 0,//获取父级导航
+            parentData: {
+                checkStrictly: true,
+                lazy: true,
+                async lazyLoad(node, resolve) {
+                    const { level, data } = node;
+                    if (data && data.children && data.children.length !== 0) {
+                        return resolve(node)
+                    }
+                    console.log(level)
+                    let parentId = level == 0 ? 0 : data.value
+                    let parames = {
+                        'pid': parentId
+                    }
+                    self.$store.dispatch('pool/categoryList', parames).then(res => {
+                        if (res.data) {
+                            const nodes = res.data.map(item => ({
+                                value: item.id,
+                                label: item.name,
+                                leaf: level >= 3,
+                                children: []
+                            }))
+                            resolve(nodes)
+                        }
+                    })
+                }
+            },
         }
     },
     mounted() {
@@ -184,29 +227,65 @@ 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(data);
-                if (data.code == 200) {
+            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.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) {
 
-            })
+                    } 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;
+            this.setTime = setInterval(() => {
+                that.getData();
+            }, 5000)
+        },
+        clearTask() {
+            clearInterval(this.setTime)
         },
         //1.2 删除内容
         deleteRow(id, val) {
@@ -265,13 +344,22 @@ export default {
                 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 = "未导入"
+                    }
+                }
             })
         },
         //1.7 重置按钮
         goReset() {
-            this.message_name = '',
-                this.message_from = '',
-                this.message_state = ''
+            this.message_name = ''
+            this.message_from = ''
+            this.message_state = ''
+            this.page = 1
+            this.pageSize = 10
             this.getData()
         },
         //列表和分页相关 end ------------------------------------------------------------>
@@ -295,7 +383,7 @@ export default {
             addCatid({
                 rule_id: this.ruleId,
             }).then(data => {
-                console.log(data);
+                console.log('关联导航池', data);
                 if (data.code == 200) {
                     this.dialogTableVisible = true
                     this.options = data.data
@@ -312,15 +400,16 @@ export default {
 
         //关联导航池的取消按钮
         cancelForm() {
-            this.dialogTableVisible = false
+            this.dialogTableVisible = true
         },
 
 
         //关联导航池的提交按钮
         submitForm() {
+            //console.log(this.ruleForm.name);
             addCatid({
                 rule_id: this.ruleId,//任务规则id
-                cat_arr_id: this.ruleForm.name,//导航池栏目id
+                cat_arr_id: this.ruleForm.name,//导航池栏目id 
             }).then(data => {
                 console.log(this.ruleForm.name);
                 console.log(data);
@@ -565,4 +654,10 @@ export default {
     line-height: 36px;
     font-size: 16px;
 }
+
+::v-deep .el-cascader--medium {
+    width: 100%;
+    font-size: 14px;
+    line-height: 36px;
+}
 </style>