修改bug

src/router/modules/dangyunlong.js

@@ -28,7 +28,7 @@ const dangyunlongRouter= [
         path: '',
         component: () => import('@/views/website/categoryList'),
         meta: {
-          title: '导航池',
+          title: '栏目名称',
           hidden: true,
           breadcrumb: true
         }
@@ -44,7 +44,7 @@ const dangyunlongRouter= [
         path: '',
         component: () => import('@/views/website/websiteColumn'),
         meta: {
-          title: '网站导航',
+          title: '栏目分配',
           hidden: true,
           breadcrumb: true
         }
@@ -60,7 +60,7 @@ const dangyunlongRouter= [
         path: '',
         component: () => import('@/views/website/editNavigation'),
         meta: {
-          title: '导航详情',
+          title: '栏目详情',
           hidden: true,
           breadcrumb: true
         }

src/views/advertise/advertiseList.vue

@@ -46,9 +46,9 @@
                         </el-table-column>
                         <el-table-column prop="order_num" label="工单编号" width="175">
                         </el-table-column>
-                        <el-table-column prop="name" label="广告名称" width="160">
+                        <el-table-column prop="name" label="广告名称" width="130">
                         </el-table-column>
-                        <el-table-column prop="" label="广告位名称" width="160">
+                        <el-table-column prop="adname" label="广告位名称" width="190">
                         </el-table-column>
                         <el-table-column prop="orderStatus" label="订单状态" width="100">
                         </el-table-column>
@@ -319,7 +319,7 @@ export default {
                 getOrderListAdmin(data).then(data => {
                     console.log(data);
                     this.tableData = data.data.rows
-                    this.total = data.data.count
+                    this.total = data.data.count1
                     for (let item of this.tableData) {
                         if (item.status == 1) {
                             item.orderStatus = '已通过'
@@ -344,7 +344,7 @@ export default {
                 getOrderListAdmin(data).then(data => {
                     console.log("getOrderListAdmin", data);
                     this.tableData = data.data.rows
-                    this.total = data.data.count
+                    this.total = data.data.count1
                     for (let item of this.tableData) {
                         if (item.status == 1) {
                             item.orderStatus = '已通过'
@@ -433,7 +433,7 @@ export default {
             getOrderListAdmin(data).then(data => {
                 console.log(data);
                 this.tableData = data.data.rows
-                this.total = data.data.count
+                this.total = data.data.count1
                 for (let item of this.tableData) {
                     if (item.status == 1) {
                         item.orderStatus = '已通过'

src/views/news/creatNews.vue

@@ -172,7 +172,7 @@
                 <el-select v-model="form.status" placeholder="请选择..">
                   <el-option label="已发布" :value="1"></el-option>
                   <el-option label="待发布" :value="0"></el-option>
-                  <el-option label="已拒绝" :value="2"></el-option>
+                  <!-- <el-option label="已拒绝" :value="2"></el-option> -->
                 </el-select>
               </el-form-item>
               <el-form-item label="是否开启投票：" prop="is_survey" class="custom-align-right">

src/views/tabbar/tabbar.vue

@@ -1,5 +1,5 @@
 <template>
-    <!-- 广告位管理 -->
+    <!-- 底部导航 -->
     <div>
         <!-- 头部搜索框部分 -->
         <div class="title">
@@ -59,7 +59,7 @@
                                         <i class="el-icon-edit-outline"></i>
                                         编辑
                                     </div>
-                                    <div class="listLookBtn" @click="goLook(scope.row.id,scope.row)">
+                                    <div class="listLookBtn" @click="goLook(scope.row.id, scope.row)">
                                         <i class="el-icon-view"></i>
                                         查看
                                     </div>
@@ -153,9 +153,9 @@ export default {
 
             value: '',
 
-            
+
             activeid: "",  //活动id 
-            type:"",  //查看时需要传递的类型
+            type: "",  //查看时需要传递的类型
 
             // 分页相关
             page: 1,
@@ -189,14 +189,51 @@ export default {
         //1.列表和分页相关 start ------------------------------------------------------------>
         //1.1 开始请求列表信息方法
         getData() {
-            getFooterCategory({
-                page: this.page,
-                pageSize: this.pageSize
-            }).then(data => {
-                console.log(data);
-                this.tableData = data.data.rows
-                this.total = data.data.count
-            })
+            if (this.webSiteName_name && this.tabbarName) {
+                getFooterCategory({
+                    page: this.page,
+                    pageSize: this.pageSize,
+                    name: this.tabbarName,
+                    website_name: this.webSiteName_name, //网站名称
+                }).then(data => {
+                    console.log(data);
+                    this.tableData = data.data.rows
+                    this.total = data.data.count
+                })
+            } else if (this.webSiteName_name && !this.tabbarName) {
+                getFooterCategory({
+                    page: this.page,
+                    pageSize: this.pageSize,
+                    // name: this.tabbarName,
+                    website_name: this.webSiteName_name, //网站名称
+                }).then(data => {
+                    console.log(data);
+                    this.tableData = data.data.rows
+                    this.total = data.data.count
+                })
+            } else if (!this.webSiteName_name && this.tabbarName) {
+                getFooterCategory({
+                    page: this.page,
+                    pageSize: this.pageSize,
+                    name: this.tabbarName,
+                    // website_name: this.webSiteName_name, //网站名称
+                }).then(data => {
+                    console.log(data);
+                    this.tableData = data.data.rows
+                    this.total = data.data.count
+                })
+            } else {
+                getFooterCategory({
+                    page: this.page,
+                    pageSize: this.pageSize
+                }).then(data => {
+                    console.log(data);
+                    this.tableData = data.data.rows
+                    this.total = data.data.count
+                })
+            }
+
+
         },
 
         //1.2 删除内容
@@ -303,7 +340,7 @@ export default {
             this.dialogName = '编辑'
             this.activeid = id
             this.dialogTableVisible = true
-            this.disabled=true
+            this.disabled = true
             console.log(id, val);
             console.log("状态", val);
 
@@ -319,14 +356,14 @@ export default {
         },
 
         //2.0 查看
-        goLook(id,val) {
+        goLook(id, val) {
             this.activeid = id
-            this.type=val.type
+            this.type = val.type
             this.$router.push({
                 path: '/tabbarDetail',
                 query: {
                     id: this.activeid,
-                    type:this.type
+                    type: this.type
                 }
             })
         },
@@ -335,7 +372,7 @@ export default {
         addWebsite() {
             this.dialogTableVisible = true
             this.dialogName = "添加"
-            this.disabled=false
+            this.disabled = false
 
             //添加时清空回显回来的数据
             this.ruleForm.webName = '' //关联网站名称
@@ -354,7 +391,6 @@ export default {
                     console.log('error submit!!');
                     return false;
                 }
-                
             });
             if (this.dialogName == "添加") {
                 getTemplateClass({

src/views/website/blogroll.vue

@@ -253,23 +253,46 @@ export default {
         //1.列表和分页相关 start ------------------------------------------------------------>
         //1.1 获取网站列表数据
         getData() {
-            getLinkList({
-                page: this.page,
-                pageSize: this.pageSize,
-            }).then(data => {
-                console.log(data);
-                this.tableData = data.data.rows
-                this.total = data.data.count
-                for (let item of this.tableData) {
-                    if (item.type == '1') {
-                        item.type = '图片'
-                    } else if (item.type == '2') {
-                        item.type = '文字'
-                    } else if (item.type == '3') {
-                        item.type = '底部'
+            if (this.siteName || this.webName) {
+                getLinkList({
+                    page: this.page,
+                    pageSize: this.pageSize,
+                    website_id: this.siteName,
+                    title: this.webName
+                }).then(data => {
+                    console.log(data);
+                    this.tableData = data.data.rows
+                    this.total = data.data.count
+                    for (let item of this.tableData) {
+                        if (item.type == '1') {
+                            item.type = '图片'
+                        } else if (item.type == '2') {
+                            item.type = '文字'
+                        } else if (item.type == '3') {
+                            item.type = '底部'
+                        }
                     }
-                }
-            })
+                })
+            } else {
+                getLinkList({
+                    page: this.page,
+                    pageSize: this.pageSize,
+                }).then(data => {
+                    console.log(data);
+                    this.tableData = data.data.rows
+                    this.total = data.data.count
+                    for (let item of this.tableData) {
+                        if (item.type == '1') {
+                            item.type = '图片'
+                        } else if (item.type == '2') {
+                            item.type = '文字'
+                        } else if (item.type == '3') {
+                            item.type = '底部'
+                        }
+                    }
+                })
+            }
+
         },
         //1.2 删除内容
         deleteRow(id, val) {

src/views/website/categoryList.vue

@@ -5,27 +5,27 @@
       <el-row>
         <el-col :span="8">
           <div class="searchBox">
-            <div class="searchTitle">导航池名称：</div>
-            <el-input placeholder="请输入导航池名称" autocomplete="off" v-model="getApiData.name"/>
+            <div class="searchTitle">栏目名称：</div>
+            <el-input placeholder="请输入栏目名称" autocomplete="off" v-model="getApiData.name"/>
           </div>
         </el-col>
-        <el-col :span="8">
+        <!-- <el-col :span="8">
           <div class="searchBox">
             <div class="searchTitle">行政职能部门：</div>
-            <el-cascader :key="searchDepartmentKey" v-model="getApiData.department_id" placeholder="选择导航池所属行政区划" :props="searchDepartmentData" filterable clearable></el-cascader>
+            <el-cascader :key="searchDepartmentKey" v-model="getApiData.department_id" placeholder="选择栏目所属行政区划" :props="searchDepartmentData" filterable clearable></el-cascader>
           </div>
         </el-col>
         <el-col :span="8">
           <div class="searchBox">
             <div class="searchTitle">行政区划：</div>
-            <el-cascader :key="searchCascaderKey" v-model="getApiData.city_id" placeholder="选择导航池所属行政区划" :props="searchCityData" filterable clearable></el-cascader>
+            <el-cascader :key="searchCascaderKey" v-model="getApiData.city_id" placeholder="选择栏目所属行政区划" :props="searchCityData" filterable clearable></el-cascader>
           </div>
-        </el-col>
+        </el-col> -->
       </el-row>
     </div>
     <div class="layerBoxNoBg">
       <div>
-        <el-button type="primary" @click="addCategoryList">添加导航池</el-button>
+        <el-button type="primary" @click="addCategoryList">添加栏目名称</el-button>
       </div>
       <div>
         <el-button @click="clearSearchList">重置</el-button>
@@ -41,9 +41,9 @@
         <template>
           <el-table :data="tableData" style="width: 100%">
             <el-table-column fixed prop="id" label="编号" width="50"></el-table-column>
-            <el-table-column prop="name" label="导航池名称"></el-table-column>
-            <el-table-column prop="department_name" label="行政职能部门"></el-table-column>
-            <el-table-column prop="city_name" label="行政区划"></el-table-column>
+            <el-table-column prop="name" label="栏目名称"></el-table-column>
+            <!-- <el-table-column prop="department_name" label="行政职能部门"></el-table-column>
+            <el-table-column prop="city_name" label="行政区划"></el-table-column> -->
             <el-table-column prop="sort" label="权重"></el-table-column>
             <el-table-column prop="created_at" label="创建时间"></el-table-column>
             <el-table-column prop="updated_at" label="修改时间"></el-table-column>
@@ -73,73 +73,73 @@
     <!--表格内容 end------------------------------------------------------------>
 
     <!--弹出框 start------------------------------------------------------------>
-    <el-dialog :title="editId ? '编辑导航池' : '添加导航池'" :visible.sync="windowStatus" :close-on-click-modal="false" @close="clearToServe(2)">
+    <el-dialog :title="editId ? '编辑栏目名称' : '添加栏目名称'" :visible.sync="windowStatus" :close-on-click-modal="false" @close="clearToServe(2)">
       <el-form :model="form" ref="form" :rules="formRules" autocomplete="off" label-position="left">
         <div class="formDiv">
-          <el-form-item label="导航池名称：" :label-width="formLabelWidth" prop="name" class="custom-align-right">
-            <el-input v-model="form.name" autocomplete="off" placeholder="请输入导航池名称"></el-input>
+          <el-form-item label="栏目名称：" :label-width="formLabelWidth" prop="name" class="custom-align-right">
+            <el-input v-model="form.name" autocomplete="off" placeholder="请输入栏目名称"></el-input>
             <el-checkbox v-model="show_url" @change="ifUrl">引用外链</el-checkbox>
           </el-form-item>
           <div v-if="show_url==1">
             <el-form-item label="外链地址：" :label-width="formLabelWidth" prop="web_url" class="custom-align-right">
               <el-input v-model="form.web_url" autocomplete="off" placeholder="请输入外链地址"></el-input>
             </el-form-item>
-            <el-form-item label="导航标题：" :label-width="formLabelWidth" prop="seo_title" class="custom-align-right">
-              <el-input v-model="form.seo_title" autocomplete="off" placeholder="请输入导航标题"></el-input>
+            <el-form-item label="栏目标题：" :label-width="formLabelWidth" prop="seo_title" class="custom-align-right">
+              <el-input v-model="form.seo_title" autocomplete="off" placeholder="请输入栏目标题"></el-input>
             </el-form-item>
-            <el-form-item label="导航关键词：" :label-width="formLabelWidth" prop="seo_keywords" class="custom-align-right">
-              <el-input v-model="form.seo_keywords" autocomplete="off" placeholder="请输入导航关键词"></el-input>
+            <el-form-item label="栏目关键词：" :label-width="formLabelWidth" prop="seo_keywords" class="custom-align-right">
+              <el-input v-model="form.seo_keywords" autocomplete="off" placeholder="请输入栏目关键词"></el-input>
             </el-form-item>
-            <el-form-item label="导航描述：" :label-width="formLabelWidth" prop="seo_description" class="custom-align-right">
-              <el-input type="textarea" v-model="form.seo_description" placeholder="请输入导航描述"></el-input>
+            <el-form-item label="栏目描述：" :label-width="formLabelWidth" prop="seo_description" class="custom-align-right">
+              <el-input type="textarea" v-model="form.seo_description" placeholder="请输入栏目描述"></el-input>
             </el-form-item>
             <el-form-item label="排序：" :label-width="formLabelWidth" class="custom-align-right">
               <el-input v-model="form.sort" autocomplete="off" placeholder="请输入排序"></el-input>
             </el-form-item>
           </div>
           <div v-if="show_url==0">
-            <el-form-item label="关联职能部门：" :label-width="formLabelWidth" prop="department_arr_id" class="custom-align-right">
+            <!-- <el-form-item label="关联职能部门：" :label-width="formLabelWidth" prop="department_arr_id" class="custom-align-right"> -->
               <!-- <el-cascader :key="departmentKey" v-model="form.department_arr_id" placeholder="选择要绑定的职能部门" :props="departmentData" filterable clearable></el-cascader> -->
-              <el-cascader :key="departmentKey" :props="{value:'id',label:'name',children:'children'}" :options="allDepartment" v-model="form.department_arr_id" :show-all-levels="false" filterable />
-            </el-form-item>
-            <el-form-item label="关联行政区划：" :label-width="formLabelWidth" prop="city_arr_id" class="custom-align-right">
+              <!-- <el-cascader :key="departmentKey" :props="{value:'id',label:'name',children:'children'}" :options="allDepartment" v-model="form.department_arr_id" :show-all-levels="false" filterable />
+            </el-form-item> -->
+            <!-- <el-form-item label="关联行政区划：" :label-width="formLabelWidth" prop="city_arr_id" class="custom-align-right">
               <el-cascader :key="cascaderKey" v-model="form.city_arr_id" placeholder="选择要绑定行政区划" :props="cityData" filterable clearable></el-cascader>
-            </el-form-item>
-            <el-form-item label="父级导航：" :label-width="formLabelWidth" class="custom-align-right">
-              <el-cascader :key="parentKey" v-model="form.pid_arr" placeholder="请选择要绑定的父级导航" :props="parentData" filterable clearable></el-cascader>
+            </el-form-item> -->
+            <el-form-item label="父级栏目：" :label-width="formLabelWidth" class="custom-align-right">
+              <el-cascader :key="parentKey" v-model="form.pid_arr" placeholder="请选择要绑定的父级栏目" :props="parentData" filterable clearable></el-cascader>
             </el-form-item>
             <el-form-item label="导航标题：" :label-width="formLabelWidth" prop="seo_title" class="custom-align-right">
               <template #label>
                 <span class="askBox">
-                  导航池标题：
-                  <el-tooltip class="item" effect="dark" content="导航池标题，如：三农市场网_农资产品商城_网站列表_全国信息一体化网络平台_项目大全。" placement="top">
+                  栏目标题：
+                  <el-tooltip class="item" effect="dark" content="栏目标题，如：三农市场网_农资产品商城_网站列表_全国信息一体化网络平台_项目大全。" placement="top">
                     <i class="el-icon-question"></i>
                   </el-tooltip>
                 </span>
               </template>
-              <el-input v-model="form.seo_title" autocomplete="off" placeholder="请输入导航标题"></el-input>
+              <el-input v-model="form.seo_title" autocomplete="off" placeholder="请输入栏目标题"></el-input>
             </el-form-item>
-            <el-form-item label="导航关键词：" :label-width="formLabelWidth" prop="seo_keywords" class="custom-align-right">
+            <el-form-item label="栏目关键词：" :label-width="formLabelWidth" prop="seo_keywords" class="custom-align-right">
               <template #label>
                 <span class="askBox">
-                  导航池关键词：
-                  <el-tooltip class="item" effect="dark" content="导航池关键词，如：三农市场网、农资产品商城、全国三农、信息一体化。" placement="top">
+                  栏目关键词：
+                  <el-tooltip class="item" effect="dark" content="栏目关键词，如：三农市场网、农资产品商城、全国三农、信息一体化。" placement="top">
                     <i class="el-icon-question"></i>
                   </el-tooltip>
                 </span>
               </template>
-              <el-input v-model="form.seo_keywords" autocomplete="off" placeholder="请输入导航关键词"></el-input>
+              <el-input v-model="form.seo_keywords" autocomplete="off" placeholder="请输入栏目关键词"></el-input>
             </el-form-item>
-            <el-form-item label="导航描述：" :label-width="formLabelWidth" prop="seo_description" class="custom-align-right">
+            <el-form-item label="栏目描述：" :label-width="formLabelWidth" prop="seo_description" class="custom-align-right">
               <template #label>
                 <span class="askBox">
-                  导航池描述：
-                  <el-tooltip class="item" effect="dark" content="导航池描述，如：中国三农市场网，农资产品商城属市场类频道，共有5个栏目。" placement="top">
+                  栏目描述：
+                  <el-tooltip class="item" effect="dark" content="栏目描述，如：中国三农市场网，农资产品商城属市场类频道，共有5个栏目。" placement="top">
                     <i class="el-icon-question"></i>
                   </el-tooltip>
                 </span>
               </template>
-              <el-input type="textarea" v-model="form.seo_description" class="custom-textarea" placeholder="请输入导航描述"></el-input>
+              <el-input type="textarea" v-model="form.seo_description" class="custom-textarea" placeholder="请输入栏目描述"></el-input>
             </el-form-item>
             <el-form-item label="排序：" :label-width="formLabelWidth" class="custom-align-right">
               <el-input v-model="form.sort" autocomplete="off" placeholder="请输入排序"></el-input>
@@ -178,20 +178,20 @@ export default {
         callback()
       }
     }
-    const validateDepartment = (rule,value,callback) => {
-      if (value.length === 0) {
-          callback(new Error('请选择职能部门！'))
-      } else {
-          callback()
-      }
-    }
-    const validateCity = (rule,value,callback) => {
-      if (value.length === 0) {
-          callback(new Error('请选择行政区划！'))
-      } else {
-          callback()
-      }
-    }
+    // const validateDepartment = (rule,value,callback) => {
+    //   if (value.length === 0) {
+    //       callback(new Error('请选择职能部门！'))
+    //   } else {
+    //       callback()
+    //   }
+    // }
+    // const validateCity = (rule,value,callback) => {
+    //   if (value.length === 0) {
+    //       callback(new Error('请选择行政区划！'))
+    //   } else {
+    //       callback()
+    //   }
+    // }
     const validatePid = (rule,value,callback) => {
       if (value.length === 0) {
           callback(new Error('请选择父级导航！'))
@@ -203,14 +203,14 @@ export default {
     //0.全局操作 end ------------------------------------------------------------>
     return {
       //1.列表和分页相关 start ------------------------------------------------------------>
-      tableDivTitle:"导航池列表",
+      tableDivTitle:"栏目名称列表",
       tableData:[],//内容
       allCount:0,//总条数
       editId:0,//要修改的网站id
       getApiData:{
         name:"",//导航池名称查询
-        department_id:[],//行政职能部门id
-        city_id:[],//行政区划
+        // department_id:[],//行政职能部门id
+        // city_id:[],//行政区划
         page:1,//当前是第几页
         pageSize:10,//一共多少条
       },
@@ -220,32 +220,32 @@ export default {
       //2.搜索相关 start ------------------------------------------------------------>
       //行政职能部门
       searchDepartmentKey:0, //列表缓存key
-      searchDepartmentData: {
-        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/getDepartment',parames).then(res=> {
-            if (res.data) {
-              const nodes = res.data.map(item => ({
-                value: item.id,
-                label: item.name,
-                leaf: level >= 3,
-                children: []
-              }))
-              resolve(nodes)
-            }
-          })
-        }
-      },
+      // searchDepartmentData: {
+      //   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/getDepartment',parames).then(res=> {
+      //       if (res.data) {
+      //         const nodes = res.data.map(item => ({
+      //           value: item.id,
+      //           label: item.name,
+      //           leaf: level >= 3,
+      //           children: []
+      //         }))
+      //         resolve(nodes)
+      //       }
+      //     })
+      //   }
+      // },
       //获取城市列表
       searchCascaderKey:0, //列表缓存key
       searchCityData: {
@@ -289,8 +289,8 @@ export default {
         name: '',//导航池名称
         is_url:0,//是否为外链，0=否 1=是
         web_url:"",//外链地址
-        department_arr_id:[],//职能部门
-        city_arr_id:[],//行政区划
+        // department_arr_id:[],//职能部门
+        // city_arr_id:[],//行政区划
         sort:0,//排序
         //pid:2,
         seo_title:"",//标题
@@ -303,9 +303,9 @@ export default {
         //网站名称不能为空
         name:[{required:true,trigger:'blur',validator:validateEmpty}],//导航池名称不能为空
         web_url:[{required:true,trigger:'blur',validator:validateEmpty}],//外链地址不能为空
-        department_arr_id: [{type:'array',required:true,trigger:'change',message:'请选择职能部门！',validator:validateDepartment}],
-        city_arr_id: [{type:'array',required:true,trigger:'change',message:'请选择行政区划！',validator:validateCity}],
-        //pid_arr: [{type:'array',required:true,trigger:'change',message:'请选择父级导航！',validator:validatePid}],
+        // department_arr_id: [{type:'array',required:true,trigger:'change',message:'请选择职能部门！',validator:validateDepartment}],
+        // city_arr_id: [{type:'array',required:true,trigger:'change',message:'请选择行政区划！',validator:validateCity}],
+        // pid_arr: [{type:'array',required:true,trigger:'change',message:'请选择父级导航！',validator:validatePid}],
         seo_title:[{required:true,trigger:'blur',validator:validateEmpty}],//标题不能为空
         seo_keywords:[{required:true,trigger:'blur',validator:validateEmpty}],//关键词不能为空
         seo_description:[{required:true,trigger:'blur',validator:validateEmpty}],//描述不能为空
@@ -340,32 +340,32 @@ export default {
       },
       //获取职能部门
       departmentKey:0,//弹窗用的key
-      departmentData: {
-        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/getDepartment',parames).then(res=> {
-            if (res.data) {
-              const nodes = res.data.map(item => ({
-                value: item.id,
-                label: item.name,
-                leaf: level >= 3,
-                children: []
-              }))
-              resolve(nodes)
-            }
-          })
-        }
-      },
+      // departmentData: {
+      //   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/getDepartment',parames).then(res=> {
+      //       if (res.data) {
+      //         const nodes = res.data.map(item => ({
+      //           value: item.id,
+      //           label: item.name,
+      //           leaf: level >= 3,
+      //           children: []
+      //         }))
+      //         resolve(nodes)
+      //       }
+      //     })
+      //   }
+      // },
       parentKey:0,//获取父级导航
       parentData: {
         checkStrictly: true,
@@ -401,14 +401,14 @@ export default {
     //1.1 开始请求列表信息方法
     getData(type){
       //搜索条件
-      if(this.getApiData.department_id.length>0){
-        //网系只提交最后一个
-        this.getApiData.department_id = this.getApiData.department_id[this.getApiData.department_id.length - 1];
-      }
-      if(this.getApiData.city_id.length>0){
-        //城市id只提交最后一个
-        this.getApiData.city_id = this.getApiData.city_id[this.getApiData.city_id.length - 1];
-      }
+      // if(this.getApiData.department_id.length>0){
+      //   //网系只提交最后一个
+      //   this.getApiData.department_id = this.getApiData.department_id[this.getApiData.department_id.length - 1];
+      // }
+      // if(this.getApiData.city_id.length>0){
+      //   //城市id只提交最后一个
+      //   this.getApiData.city_id = this.getApiData.city_id[this.getApiData.city_id.length - 1];
+      // }
       //如果是搜索，重新加载第一页
       if(type=="search"){
         this.getApiData.page = 1;
@@ -471,8 +471,8 @@ export default {
     clearSearchList(){
       this.tableData = [];
       this.getApiData.name = "";
-      this.getApiData.department_id = [];
-      this.getApiData.city_id = [];
+      // this.getApiData.department_id = [];
+      // this.getApiData.city_id = [];
       this.getApiData.page = 1;
       this.getApiData.pageSize = 10;
       this.getData();
@@ -506,16 +506,16 @@ export default {
     //2.3 清理弹出框
     clearToServe(type){
       if(type==1){ //type1 使用了外部链接
-        this.form.department_arr_id = [];
-        this.form.city_arr_id = [];
+        // this.form.department_arr_id = [];
+        // this.form.city_arr_id = [];
         this.form.pid_arr = [];
       }
       if(type==2){ //type2 全部清理
         this.form.name = "";
         this.form.is_url = 0;
         this.form.web_url = "";
-        this.form.department_arr_id = [];
-        this.form.city_arr_id = [];
+        // this.form.department_arr_id = [];
+        // this.form.city_arr_id = [];
         this.form.sort = 0;
         this.form.seo_title = "";
         this.form.seo_keywords = "";
@@ -601,19 +601,19 @@ export default {
         this.form.web_url = res.data.web_url;
 
         //回显行政区划
-        this.form.city_arr_id = JSON.parse(res.data.city_arr_id);
-        //当cascaderKey的值改变的时候 级联选择器会重置里面的内容
-        this.cascaderKey += 1;
-        this.loadCascaderPath(this.form.city_arr_id,"xzqh");
+        // this.form.city_arr_id = JSON.parse(res.data.city_arr_id);
+        // //当cascaderKey的值改变的时候 级联选择器会重置里面的内容
+        // this.cascaderKey += 1;
+        // this.loadCascaderPath(this.form.city_arr_id,"xzqh");
 
         //回显父级导航
         this.form.pid_arr = JSON.parse(res.data.pid_arr);
         this.parentKey += 1;
-        this.loadCascaderPath(this.form.pid_arr,"fjdh");
+        // this.loadCascaderPath(this.form.pid_arr,"fjdh");
 
         //回显职能部门
-        this.form.department_arr_id = JSON.parse(res.data.department_arr_id);
-        this.departmentKey += 1;
+        // this.form.department_arr_id = JSON.parse(res.data.department_arr_id);
+        // this.departmentKey += 1;
         // this.loadCascaderPath(this.form.department_arr_id,"znbm");
 
         //回显导航池标题，描述，关键词
@@ -628,35 +628,35 @@ export default {
       this.editBtn = true;//显示编辑按钮
     },
     //回显行政区划
-    async loadCascaderPath(path,type) {
-      for (let i = 0; i < path.length; i++) {
-        const parentId = path[i - 1] || 0; // 获取当前层级的父级ID
-        const level = i; // 当前层级的索引
-        await this.$store.dispatch('pool/getcityList', { pid: parentId })
-          .then((res) => {
-            const nodes = res.data.map(item => ({
-              value: item.id,
-              label: item.name,
-              leaf: level >= 3, // 这里假设4层结构，设置叶子节点标记
-            }));
-            // 将数据传递到 resolve，通知 cascader 这一层的数据加载完毕
-            if (level === path.length - 1) {
-              if(type=="xzqh"){this.form.city_arr_id = path;}
-              if(type=="fjdh"){this.form.pid_arr = path;}
-              if(type=="znbm"){this.form.department_arr_id = path;}
-            }
-          });
-      }
-    },
+    // async loadCascaderPath(path,type) {
+    //   for (let i = 0; i < path.length; i++) {
+    //     const parentId = path[i - 1] || 0; // 获取当前层级的父级ID
+    //     const level = i; // 当前层级的索引
+    //     await this.$store.dispatch('pool/getcityList', { pid: parentId })
+    //       .then((res) => {
+    //         const nodes = res.data.map(item => ({
+    //           value: item.id,
+    //           label: item.name,
+    //           leaf: level >= 3, // 这里假设4层结构，设置叶子节点标记
+    //         }));
+    //         // 将数据传递到 resolve，通知 cascader 这一层的数据加载完毕
+    //         if (level === path.length - 1) {
+    //           if(type=="xzqh"){this.form.city_arr_id = path;}
+    //           if(type=="fjdh"){this.form.pid_arr = path;}
+    //           if(type=="znbm"){this.form.department_arr_id = path;}
+    //         }
+    //       });
+    //   }
+    // },
     //修改表单
     editToServe(){
       //防止提交[1,1]这种重复的数据
-      if (this.form.department_arr_id.length > 1) {
-        const lastIndex = this.form.department_arr_id.length - 1;
-        if (this.form.department_arr_id[lastIndex] === this.form.department_arr_id[lastIndex - 1]) {
-          this.form.department_arr_id.pop(); // Remove the last element if it's the same as the previous one
-        }
-      }
+      // if (this.form.department_arr_id.length > 1) {
+      //   const lastIndex = this.form.department_arr_id.length - 1;
+      //   if (this.form.department_arr_id[lastIndex] === this.form.department_arr_id[lastIndex - 1]) {
+      //     this.form.department_arr_id.pop(); // Remove the last element if it's the same as the previous one
+      //   }
+      // }
       this.form.id = this.editId;
       this.$refs.form.validate(valid => {
         if (valid) {

src/views/website/editNavigation.vue

@@ -6,25 +6,25 @@
         <el-row>
           <el-col :span="8">
             <div class="searchBox">
-              <div class="searchTitle">导航池名称：</div>
-              <el-input placeholder="请输入导航池名称" autocomplete="off" v-model="getApiData.alias"/>
+              <div class="searchTitle">展示名称：</div>
+              <el-input placeholder="请输入展示名称" autocomplete="off" v-model="getApiData.alias"/>
             </div>
           </el-col>
           <el-col :span="8">
             <div class="searchBox">
-              <div class="searchTitle">导航名称：</div>
-              <el-input placeholder="请输入导航名称" autocomplete="off" v-model="getApiData.name"/>
+              <div class="searchTitle">栏目名称：</div>
+              <el-input placeholder="请输入栏目名称" autocomplete="off" v-model="getApiData.name"/>
             </div>
           </el-col>
-          <el-col :span="8">
+          <!-- <el-col :span="8">
             <div class="searchBox">
               <div class="searchTitle">行政职能部门：</div>
               <el-cascader :key="searchDepartmentKey" v-model="getApiData.department_id" placeholder="请选择行政职能部门" :props="searchDepartmentData" filterable clearable></el-cascader>
             </div>
-          </el-col>
+          </el-col> -->
         </el-row>
       </div>
-      <div class="layerBoxLineTwo">
+      <!-- <div class="layerBoxLineTwo">
         <el-row>
           <el-col :span="8">
             <div class="searchBox">
@@ -33,7 +33,7 @@
             </div>
           </el-col>
         </el-row>
-      </div>
+      </div> -->
     </div>
     <div class="layerBoxNoBg">
       <div></div>
@@ -51,14 +51,13 @@
         <template>
           <el-table :data="tableData" style="width: 100%">
             <el-table-column fixed prop="id" label="编号" width="50"></el-table-column>
-            <el-table-column prop="name" label="导航池名称"></el-table-column>
-            <el-table-column prop="alias" label="导航名称"></el-table-column>
+            <el-table-column prop="name" label="栏目名称"></el-table-column>
+            <el-table-column prop="alias" label="展示名称"></el-table-column>
             <el-table-column prop="created_at" label="创建时间"></el-table-column>
             <el-table-column prop="updated_at" label="修改时间"></el-table-column>
-            <el-table-column fixed="right" label="操作" width="200" header-align="center">
+            <el-table-column fixed="right" label="操作" width="120" header-align="center">
               <template slot-scope="scope">
                 <div class="listBtnBox">
-                  <div class="listDeleteBtn" @click="deleteRow(scope.row)"><i class="el-icon-edit-outline"></i>删除</div>
                   <div class="listEditBtn" @click="editRow(scope.row.category_id)"><i class="el-icon-edit-outline"></i>编辑</div>
                 </div>
               </template>
@@ -80,32 +79,24 @@
     <!--表格内容 end------------------------------------------------------------>
 
     <!--弹出框start------------------------------------------------------------>
-    <el-dialog title="编辑导航" :visible.sync="windowStatus">
+    <el-dialog title="编辑栏目" :visible.sync="windowStatus">
       <el-form :model="form" ref="form" :rules="formRules" autocomplete="off" label-position="left">
         <div class="formDiv">
-          <el-form-item label="导航名称：" :label-width="formLabelWidth" prop="alias" class="custom-align-right">
+          <el-form-item label="展示名称：" :label-width="formLabelWidth" prop="alias" class="custom-align-right">
             <el-input v-model="form.alias" autocomplete="off"></el-input>
-            <input type="hidden" v-model="form.alias">
-          </el-form-item>
-          <el-form-item label="排序：" :label-width="formLabelWidth" prop="" class="custom-align-right">
-            <el-input v-model="form.sort" autocomplete="off"></el-input>
-            <input type="hidden" v-model="form.sort">
-          </el-form-item>
-          <!-- <el-form-item label="导航标题：" :label-width="formLabelWidth" prop="seo_title" class="custom-align-right">
-            <el-input v-model="form.seo_title" autocomplete="off"></el-input>
             <input type="hidden" v-model="form.seo_title">
-          </el-form-item> -->
-          <!-- <el-form-item label="导航名称：" :label-width="formLabelWidth" prop="seo_title" class="custom-align-right">
+          </el-form-item>
+          <el-form-item label="栏目标题：" :label-width="formLabelWidth" prop="seo_title" class="custom-align-right">
             <div class="formLabelFloatBox">
               <el-input v-model="form.seo_title" autocomplete="off"></el-input>
             </div>
-          </el-form-item> -->
-          <el-form-item label="导航关键词：" :label-width="formLabelWidth" prop="seo_keywords" class="custom-align-right">
+          </el-form-item>
+          <el-form-item label="栏目关键词：" :label-width="formLabelWidth" prop="seo_keywords" class="custom-align-right">
             <div class="formLabelFloatBox">
               <el-input v-model="form.seo_keywords" autocomplete="off"></el-input>
             </div>
           </el-form-item>
-          <el-form-item label="导航描述：" :label-width="formLabelWidth" prop="seo_description" class="custom-align-right">
+          <el-form-item label="栏目描述：" :label-width="formLabelWidth" prop="seo_description" class="custom-align-right">
             <el-input type="textarea" v-model="form.seo_description" class="custom-textarea"></el-input>
           </el-form-item>
         </div>
@@ -128,7 +119,6 @@
 import '@/styles/global.less';
 //表格标题
 import tableTitle from './components/tableTitle';
-import { title } from '@/settings';
 
 export default {
   components: {
@@ -149,7 +139,7 @@ export default {
 
     return {
       //1.列表和分页相关 start ------------------------------------------------------------>
-      tableDivTitle:"导航详情",
+      tableDivTitle:"栏目详情",
       tableData: [],//列表
       allCount:0,//总条数
       editId:0,//要修改的网站id
@@ -236,21 +226,18 @@ export default {
         website_id:0,//网站id
         category_id:0,//导航id
         alias:"",//导航名称
-        sort:0,//排序
         seo_title:"",//导航seo名称
         seo_keywords:"",//导航关键词
-        seo_description:"",//导航描述
-        seo_title:""//导航标题
+        seo_description:""//导航描述
       },
       //3.2表单验证规则
       formRules: {
         //网站名称不能为空
         alias:[{required:true,trigger:'blur',validator:validateEmpty}],
         //网站标题，关键词，描述不能为空
-        //seo_title:[{required:true,trigger:'blur',validator:validateEmpty}],
+        seo_title:[{required:true,trigger:'blur',validator:validateEmpty}],
         seo_keywords:[{required:true,trigger:'blur',validator:validateEmpty}],
         seo_description:[{required:true,trigger:'blur',validator:validateEmpty}],
-        seo_title:[{required:true,trigger:'blur',validator:validateEmpty}],
       },
       //弹出框中的表单设置 end ------------------------------------------------------------>
     }
@@ -287,6 +274,7 @@ export default {
     //1.4 重置按钮
     clearSearchList(){
       this.tableData = [];
+      this.getApiData.alias = "";
       this.getApiData.name = "";
       this.getApiData.department_id = [];
       this.getApiData.city_id = [];
@@ -314,7 +302,6 @@ export default {
       this.form.website_id = 0;
       this.form.category_id = 0;
       this.form.alias = "";
-      this.form.sort = 0;
       this.form.seo_title = "";
       this.form.seo_keywords = "";
       this.form.seo_description = "";
@@ -335,42 +322,15 @@ export default {
         this.form.website_id = this.$route.query.website_id;
         this.form.category_id = id;
         this.form.alias = res.data.alias;
-        this.form.sort = res.data.sort;
         this.form.seo_title = res.data.seo_title;
         this.form.seo_keywords = res.data.seo_keywords;
         this.form.seo_description = res.data.seo_description;
       })
     },
-    //删除数据
-    deleteRow(item){
-      console.log(item)
-      let data = {
-        category_id:item.category_id,
-        website_id:item.website_id,
-      }
-      this.$confirm('删除后，该条信息及其绑定关系全部删除，确定吗?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        this.$store.dispatch('pool/delWebsiteCategory',data).then(res=> {
-          this.$message.success("删除成功！");
-          this.getData();
-        }).catch(() => {
-          this.$message.info("网络错误，请重试！");
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'warning',
-          message: '已取消删除'
-        });
-      });
-      
-    },
     //提交编辑的数据
     addToServe(){
       //把标题的值给与seo_title
-      this.form.seo_title = this.form.alias;
+      // this.form.seo_title = this.form.alias;
       this.$refs.form.validate(valid => {
         if (valid) {
           this.$store.dispatch('pool/upWebsiteCategoryones',this.form).then(res=> {
@@ -381,7 +341,6 @@ export default {
             });
             //清空并退出
             this.closeWindow();
-            this.getData();
           }).catch(() => {
             this.$message({
               type: 'info',

src/views/website/websiteColumn.vue

@@ -19,7 +19,7 @@
     </div>
     <div class="layerBoxNoBg">
       <div>
-        <el-button type="primary" @click="openWindow">关联导航池</el-button>
+        <el-button type="primary" @click="openWindow">关联栏目名称</el-button>
       </div>
       <div>
         <el-button @click="clearSearch">重置</el-button>
@@ -35,9 +35,9 @@
         <template>
           <el-table :data="tableData" style="width: 100%">
             <el-table-column fixed prop="id" label="编号" width="50"></el-table-column>
-            <el-table-column prop="website_category" label="导航池名称"></el-table-column>
+            <el-table-column prop="website_category" label="栏目名称"></el-table-column>
             <el-table-column prop="website_name" label="网站名称"></el-table-column>
-            <el-table-column prop="website_nav" label="导航名称"></el-table-column>
+            <el-table-column prop="website_nav" label="展示名称"></el-table-column>
             <el-table-column prop="created_at" label="创建时间"></el-table-column>
             <el-table-column prop="updated_at" label="修改时间"></el-table-column>
             <el-table-column fixed="right" label="操作" width="280" header-align="center">
@@ -69,12 +69,13 @@
     <!--表格内容 end------------------------------------------------------------>
 
     <!--弹出框 start------------------------------------------------------------>
-    <el-dialog :title="editId ? '关联导航池' : '编辑关联导航池'" :visible.sync="windowStatus" :close-on-click-modal="false">
+    <el-dialog :title="editId ? '关联栏目名称' : '关联栏目名称'" :visible.sync="windowStatus" :close-on-click-modal="false">
       <el-form :model="form" ref="form" :rules="formRules" label-position="left">
         <div class="formDiv">
           <el-form-item label="关联网站名称：" :label-width="formLabelWidth" prop="webSiteName" class="custom-align-right">
-            <el-select v-model="form.webSiteName" :multiple="false" :multiple-limit="1" filterable remote reserve-keyword placeholder="请输入网站关键词"
-                :remote-method="getWebNavList" :loading="webSiteLoading" @change="detectionWebSite">
+            <el-select 
+              v-model="form.webSiteName" :multiple="false" :multiple-limit="1" filterable remote reserve-keyword placeholder="请输入网站关键词"
+              :remote-method="getWebNavList" :loading="webSiteLoading" @change="detectionWebSite">
                 <el-option
                   v-for="item in webSiteList"
                   :key="item.value"
@@ -83,8 +84,8 @@
                 </el-option>
               </el-select>
           </el-form-item>
-          <el-form-item label="导航名称：" :label-width="formLabelWidth" prop="navNames" class="custom-align-right">
-            <el-select v-model="form.navNames" multiple filterable remote reserve-keyword placeholder="请输入导航关键词"
+          <el-form-item label="栏目名称：" :label-width="formLabelWidth" prop="navNames" class="custom-align-right">
+            <el-select v-model="form.navNames" multiple filterable remote reserve-keyword placeholder="请输入栏目关键词"
                 :remote-method="getWebsiteList" :loading="navNamesLoading">
                 <el-option
                   v-for="item in navList"
@@ -137,7 +138,7 @@ export default {
      //0.全局操作 end ------------------------------------------------------------>
     return {
       //1.列表和分页相关 start ------------------------------------------------------------>
-      tableDivTitle:"网站导航列表",
+      tableDivTitle:"网站栏目列表",
       tableData: [],//列表
       allCount:0,//总条数
       editId:0,//要修改的网站id