Jelajahi Sumber

将所有的导航池修改为栏目名称,添加栏目时取消行政区划和职能部门

Jing 1 bulan lalu
induk
melakukan
07e2600514
3 mengubah file dengan 169 tambahan dan 168 penghapusan
  1. 3 3
      src/router/index.js
  2. 158 158
      src/views/website/categoryList.vue
  3. 8 7
      src/views/website/websiteColumn.vue

+ 3 - 3
src/router/index.js

@@ -116,7 +116,7 @@ export const constantRoutes = [
         path: '',
         path: '',
         component: () => import('@/views/website/categoryList'),
         component: () => import('@/views/website/categoryList'),
         meta: {
         meta: {
-          title: '导航池',
+          title: '栏目名称',
           hidden: true,
           hidden: true,
           breadcrumb: true
           breadcrumb: true
         }
         }
@@ -132,7 +132,7 @@ export const constantRoutes = [
         path: '',
         path: '',
         component: () => import('@/views/website/websiteColumn'),
         component: () => import('@/views/website/websiteColumn'),
         meta: {
         meta: {
-          title: '网站导航',
+          title: '栏目分配',
           hidden: true,
           hidden: true,
           breadcrumb: true
           breadcrumb: true
         }
         }
@@ -536,7 +536,7 @@ export const constantRoutes = [
         path: '',
         path: '',
         component: () => import('@/views/website/websiteTag'),
         component: () => import('@/views/website/websiteTag'),
         meta: {
         meta: {
-          title: '站点标识',
+          title: '网站分组',
           hidden: true,
           hidden: true,
           breadcrumb: true
           breadcrumb: true
         }
         }

+ 158 - 158
src/views/website/categoryList.vue

@@ -5,27 +5,27 @@
       <el-row>
       <el-row>
         <el-col :span="8">
         <el-col :span="8">
           <div class="searchBox">
           <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>
           </div>
         </el-col>
         </el-col>
-        <el-col :span="8">
+        <!-- <el-col :span="8">
           <div class="searchBox">
           <div class="searchBox">
             <div class="searchTitle">行政职能部门:</div>
             <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>
           </div>
         </el-col>
         </el-col>
         <el-col :span="8">
         <el-col :span="8">
           <div class="searchBox">
           <div class="searchBox">
             <div class="searchTitle">行政区划:</div>
             <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>
           </div>
-        </el-col>
+        </el-col> -->
       </el-row>
       </el-row>
     </div>
     </div>
     <div class="layerBoxNoBg">
     <div class="layerBoxNoBg">
       <div>
       <div>
-        <el-button type="primary" @click="addCategoryList">添加导航池</el-button>
+        <el-button type="primary" @click="addCategoryList">添加栏目名称</el-button>
       </div>
       </div>
       <div>
       <div>
         <el-button @click="clearSearchList">重置</el-button>
         <el-button @click="clearSearchList">重置</el-button>
@@ -41,9 +41,9 @@
         <template>
         <template>
           <el-table :data="tableData" style="width: 100%">
           <el-table :data="tableData" style="width: 100%">
             <el-table-column fixed prop="id" label="编号" width="50"></el-table-column>
             <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="sort" label="权重"></el-table-column>
             <el-table-column prop="created_at" 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 prop="updated_at" label="修改时间"></el-table-column>
@@ -73,73 +73,73 @@
     <!--表格内容 end------------------------------------------------------------>
     <!--表格内容 end------------------------------------------------------------>
 
 
     <!--弹出框 start------------------------------------------------------------>
     <!--弹出框 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">
       <el-form :model="form" ref="form" :rules="formRules" autocomplete="off" label-position="left">
         <div class="formDiv">
         <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-checkbox v-model="show_url" @change="ifUrl">引用外链</el-checkbox>
           </el-form-item>
           </el-form-item>
           <div v-if="show_url==1">
           <div v-if="show_url==1">
             <el-form-item label="外链地址:" :label-width="formLabelWidth" prop="web_url" class="custom-align-right">
             <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-input v-model="form.web_url" autocomplete="off" placeholder="请输入外链地址"></el-input>
             </el-form-item>
             </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>
-            <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>
-            <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>
             <el-form-item label="排序:" :label-width="formLabelWidth" class="custom-align-right">
             <el-form-item label="排序:" :label-width="formLabelWidth" class="custom-align-right">
               <el-input v-model="form.sort" autocomplete="off" placeholder="请输入排序"></el-input>
               <el-input v-model="form.sort" autocomplete="off" placeholder="请输入排序"></el-input>
             </el-form-item>
             </el-form-item>
           </div>
           </div>
           <div v-if="show_url==0">
           <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" 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-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>
             <el-form-item label="导航标题:" :label-width="formLabelWidth" prop="seo_title" class="custom-align-right">
             <el-form-item label="导航标题:" :label-width="formLabelWidth" prop="seo_title" class="custom-align-right">
               <template #label>
               <template #label>
                 <span class="askBox">
                 <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>
                     <i class="el-icon-question"></i>
                   </el-tooltip>
                   </el-tooltip>
                 </span>
                 </span>
               </template>
               </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>
-            <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>
               <template #label>
                 <span class="askBox">
                 <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>
                     <i class="el-icon-question"></i>
                   </el-tooltip>
                   </el-tooltip>
                 </span>
                 </span>
               </template>
               </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>
-            <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>
               <template #label>
                 <span class="askBox">
                 <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>
                     <i class="el-icon-question"></i>
                   </el-tooltip>
                   </el-tooltip>
                 </span>
                 </span>
               </template>
               </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>
             <el-form-item label="排序:" :label-width="formLabelWidth" class="custom-align-right">
             <el-form-item label="排序:" :label-width="formLabelWidth" class="custom-align-right">
               <el-input v-model="form.sort" autocomplete="off" placeholder="请输入排序"></el-input>
               <el-input v-model="form.sort" autocomplete="off" placeholder="请输入排序"></el-input>
@@ -178,20 +178,20 @@ export default {
         callback()
         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) => {
     const validatePid = (rule,value,callback) => {
       if (value.length === 0) {
       if (value.length === 0) {
           callback(new Error('请选择父级导航!'))
           callback(new Error('请选择父级导航!'))
@@ -203,14 +203,14 @@ export default {
     //0.全局操作 end ------------------------------------------------------------>
     //0.全局操作 end ------------------------------------------------------------>
     return {
     return {
       //1.列表和分页相关 start ------------------------------------------------------------>
       //1.列表和分页相关 start ------------------------------------------------------------>
-      tableDivTitle:"导航池列表",
+      tableDivTitle:"栏目名称列表",
       tableData:[],//内容
       tableData:[],//内容
       allCount:0,//总条数
       allCount:0,//总条数
       editId:0,//要修改的网站id
       editId:0,//要修改的网站id
       getApiData:{
       getApiData:{
         name:"",//导航池名称查询
         name:"",//导航池名称查询
-        department_id:[],//行政职能部门id
-        city_id:[],//行政区划
+        // department_id:[],//行政职能部门id
+        // city_id:[],//行政区划
         page:1,//当前是第几页
         page:1,//当前是第几页
         pageSize:10,//一共多少条
         pageSize:10,//一共多少条
       },
       },
@@ -220,32 +220,32 @@ export default {
       //2.搜索相关 start ------------------------------------------------------------>
       //2.搜索相关 start ------------------------------------------------------------>
       //行政职能部门
       //行政职能部门
       searchDepartmentKey:0, //列表缓存key
       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
       searchCascaderKey:0, //列表缓存key
       searchCityData: {
       searchCityData: {
@@ -289,8 +289,8 @@ export default {
         name: '',//导航池名称
         name: '',//导航池名称
         is_url:0,//是否为外链,0=否 1=是
         is_url:0,//是否为外链,0=否 1=是
         web_url:"",//外链地址
         web_url:"",//外链地址
-        department_arr_id:[],//职能部门
-        city_arr_id:[],//行政区划
+        // department_arr_id:[],//职能部门
+        // city_arr_id:[],//行政区划
         sort:0,//排序
         sort:0,//排序
         //pid:2,
         //pid:2,
         seo_title:"",//标题
         seo_title:"",//标题
@@ -303,9 +303,9 @@ export default {
         //网站名称不能为空
         //网站名称不能为空
         name:[{required:true,trigger:'blur',validator:validateEmpty}],//导航池名称不能为空
         name:[{required:true,trigger:'blur',validator:validateEmpty}],//导航池名称不能为空
         web_url:[{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_title:[{required:true,trigger:'blur',validator:validateEmpty}],//标题不能为空
         seo_keywords:[{required:true,trigger:'blur',validator:validateEmpty}],//关键词不能为空
         seo_keywords:[{required:true,trigger:'blur',validator:validateEmpty}],//关键词不能为空
         seo_description:[{required:true,trigger:'blur',validator:validateEmpty}],//描述不能为空
         seo_description:[{required:true,trigger:'blur',validator:validateEmpty}],//描述不能为空
@@ -340,32 +340,32 @@ export default {
       },
       },
       //获取职能部门
       //获取职能部门
       departmentKey:0,//弹窗用的key
       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,//获取父级导航
       parentKey:0,//获取父级导航
       parentData: {
       parentData: {
         checkStrictly: true,
         checkStrictly: true,
@@ -401,14 +401,14 @@ export default {
     //1.1 开始请求列表信息方法
     //1.1 开始请求列表信息方法
     getData(type){
     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"){
       if(type=="search"){
         this.getApiData.page = 1;
         this.getApiData.page = 1;
@@ -471,8 +471,8 @@ export default {
     clearSearchList(){
     clearSearchList(){
       this.tableData = [];
       this.tableData = [];
       this.getApiData.name = "";
       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.page = 1;
       this.getApiData.pageSize = 10;
       this.getApiData.pageSize = 10;
       this.getData();
       this.getData();
@@ -506,16 +506,16 @@ export default {
     //2.3 清理弹出框
     //2.3 清理弹出框
     clearToServe(type){
     clearToServe(type){
       if(type==1){ //type1 使用了外部链接
       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 = [];
         this.form.pid_arr = [];
       }
       }
       if(type==2){ //type2 全部清理
       if(type==2){ //type2 全部清理
         this.form.name = "";
         this.form.name = "";
         this.form.is_url = 0;
         this.form.is_url = 0;
         this.form.web_url = "";
         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.sort = 0;
         this.form.seo_title = "";
         this.form.seo_title = "";
         this.form.seo_keywords = "";
         this.form.seo_keywords = "";
@@ -601,19 +601,19 @@ export default {
         this.form.web_url = res.data.web_url;
         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.form.pid_arr = JSON.parse(res.data.pid_arr);
         this.parentKey += 1;
         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");
         // this.loadCascaderPath(this.form.department_arr_id,"znbm");
 
 
         //回显导航池标题,描述,关键词
         //回显导航池标题,描述,关键词
@@ -628,35 +628,35 @@ export default {
       this.editBtn = true;//显示编辑按钮
       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(){
     editToServe(){
       //防止提交[1,1]这种重复的数据
       //防止提交[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.form.id = this.editId;
       this.$refs.form.validate(valid => {
       this.$refs.form.validate(valid => {
         if (valid) {
         if (valid) {

+ 8 - 7
src/views/website/websiteColumn.vue

@@ -19,7 +19,7 @@
     </div>
     </div>
     <div class="layerBoxNoBg">
     <div class="layerBoxNoBg">
       <div>
       <div>
-        <el-button type="primary" @click="openWindow">关联导航池</el-button>
+        <el-button type="primary" @click="openWindow">关联栏目名称</el-button>
       </div>
       </div>
       <div>
       <div>
         <el-button @click="clearSearch">重置</el-button>
         <el-button @click="clearSearch">重置</el-button>
@@ -69,12 +69,13 @@
     <!--表格内容 end------------------------------------------------------------>
     <!--表格内容 end------------------------------------------------------------>
 
 
     <!--弹出框 start------------------------------------------------------------>
     <!--弹出框 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">
       <el-form :model="form" ref="form" :rules="formRules" label-position="left">
         <div class="formDiv">
         <div class="formDiv">
           <el-form-item label="关联网站名称:" :label-width="formLabelWidth" prop="webSiteName" class="custom-align-right">
           <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
                 <el-option
                   v-for="item in webSiteList"
                   v-for="item in webSiteList"
                   :key="item.value"
                   :key="item.value"
@@ -83,8 +84,8 @@
                 </el-option>
                 </el-option>
               </el-select>
               </el-select>
           </el-form-item>
           </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">
                 :remote-method="getWebsiteList" :loading="navNamesLoading">
                 <el-option
                 <el-option
                   v-for="item in navList"
                   v-for="item in navList"
@@ -137,7 +138,7 @@ export default {
      //0.全局操作 end ------------------------------------------------------------>
      //0.全局操作 end ------------------------------------------------------------>
     return {
     return {
       //1.列表和分页相关 start ------------------------------------------------------------>
       //1.列表和分页相关 start ------------------------------------------------------------>
-      tableDivTitle:"网站导航列表",
+      tableDivTitle:"网站栏目列表",
       tableData: [],//列表
       tableData: [],//列表
       allCount:0,//总条数
       allCount:0,//总条数
       editId:0,//要修改的网站id
       editId:0,//要修改的网站id