曹大哥

src/api/pool.js

@@ -1,5 +1,98 @@
 import request from '@/utils/request'
 
+
+
+//标识=获取网站详情==编辑弹出框要显示出这1条数据的内容
+export function detail_website_tag_api(params) {
+      return request({
+        url: '/website/getWebsiteGroupInfo',
+        method: 'post',
+        params
+      })
+    }
+ 
+
+
+//creatNews导航池
+export function get_creatNews_nav_api(params) {
+      return request({
+        url: '/website/getWebsiteList',
+        method: 'GET',
+        params
+      })
+    }
+
+
+
+//creatNews导航池子级
+ export function get_creatNews_nav_son_api(data) {
+      // console.log("params==",data)
+      return request({
+        url: '/website/getWebsiteNavList',
+        method: 'post',
+        data
+      })
+    }
+
+//编辑其中1条数据 
+export function edit_website_tag_api(params) {
+      // console.log("paramsparams",params)
+      return request({
+        url: '/website/updateWebsiteGroup',
+               
+        method: 'post',
+        params
+      })
+    }
+    
+
+//1.2 删除网站
+export function del_website_tag_arr_api(data) {
+      
+      return request({
+        url: '/website/deleteWebsiteGroup',
+        method: 'post',
+        data
+      })
+    }
+
+//添加标识
+ 
+export function add_website_tag_api(data) {
+      return request({
+        url: '/website/addWebsiteGroup',
+        method: 'post',
+        data
+      })
+    }
+
+
+
+//1.3 查询所有网系==下拉
+export function drop_website_tag_api(params) {
+      // console.log("params==",params)
+      return request({
+        url: '/website/getWebsiteList',
+        method: 'get',
+        params
+      })
+    }
+
+// 站点标识
+export function get_website_tag_arr_api(params) {
+
+      // console.log("params",params)
+
+  return request({
+    url: '/website/getWebsiteGroupList',
+    
+//     get_website_tag_arr_actions
+    method: 'post',
+    params
+  })
+}
+
+
 //1.网站管理 start ------------------------------------->
 //1.1 获取网站管理列表 //注意，post请求使用data get请求使用params
 export function getWebList(params) {

src/router/index.js

@@ -190,6 +190,26 @@ export const constantRoutes = [
       }
     ]
   },
+
+
+  {//站点标识
+      path: '/websiteTag',
+      component: Layout,
+      children: [
+        {
+          name: '',
+          path: '',
+          component: () => import('@/views/website/websiteTag'),
+          meta: {
+            title: '站点标识',
+            hidden: true,
+            breadcrumb: true
+          }
+        }
+      ]
+    },
+  
+
   {
     path: '/blogroll',
     component: Layout,

src/store/modules/pool.js

@@ -5,7 +5,18 @@ getCategoryInfo,categoryList,addCategory,updateCategory,
 getNavWebList,addWebsiteCategory,getWebsiteCategoryList,
 getAdminWebsiteCategory,upWebsiteCategory,delWebsiteCategory,
 getWebsiteAllCategory,getWebsiteCategoryOnes,upWebsiteCategoryones,
-checkWebsiteUrl,checkWebsiteName} from '@/api/pool'
+checkWebsiteUrl,checkWebsiteName,
+
+
+get_website_tag_arr_api,del_website_tag_arr_api,edit_website_tag_api,add_website_tag_api,drop_website_tag_api,
+detail_website_tag_api,
+
+get_creatNews_nav_api,get_creatNews_nav_son_api
+
+
+
+
+} from '@/api/pool'
 
 const state = {
 
@@ -16,6 +27,121 @@ const mutations = {
 }
 
 const actions = {
+      
+      
+//标识=获取网站详情==编辑弹出框要显示出这1条数据的内容
+detail_website_tag_actions({commit},data) {
+      // console.log("data==",data)
+    return new Promise((resolve, reject) => {
+      detail_website_tag_api(data).then(response => {
+        resolve(response)
+      }).catch(error => {
+        reject(error)
+      })
+    })
+  },
+  
+
+//creatNews导航池
+get_creatNews_nav_actions({commit},data) {
+      return new Promise((resolve, reject) => {
+      get_creatNews_nav_api(data).then(response => {
+    resolve(response)
+  }).catch(error => {
+    reject(error)
+  })
+})
+},
+
+
+//creatNews导航池子级
+get_creatNews_nav_son_actions({commit},data) {
+      return new Promise((resolve, reject) => {
+            
+            // console.log("vuex=====",data)
+            get_creatNews_nav_son_api(data).then(response => {
+
+                  // console.log("vuex==response==",response)
+
+
+                  resolve(response)
+            }).catch(error => {
+                  reject(error)
+            })
+      })
+},
+
+ 
+//标识==修改网站
+
+edit_website_tag({commit},data) {
+      return new Promise((resolve, reject) => {
+       edit_website_tag_api(data).then(response => {
+            resolve(response)
+                }).catch(error => {
+            reject(error)
+                  })
+            })
+      },
+
+
+      // 站点标识
+//删除=站点标识列表
+del_website_tag_arr_actions({commit},data) {
+      return new Promise((resolve, reject) => {
+            del_website_tag_arr_api(data).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
+    
+
+
+//添加网站
+add_website_tag_actions({commit},data) {
+      return new Promise((resolve, reject) => {
+            add_website_tag_api(data).then(response => {
+      resolve(response)
+      }).catch(error => {
+      reject(error)
+      })
+      })
+},
+
+
+//获得所有——标识-下拉
+
+drop_website_tag_actions({commit},data) {
+      // console.log("data==",data)
+      return new Promise((resolve, reject) => {
+            drop_website_tag_api(data).then(response => {
+
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
+
+      // 站点标识
+//获取站点标识列表
+get_website_tag_arr_actions({commit},data) {
+      //     console.log("data==",data)  
+          return new Promise((resolve, reject) => {
+            get_website_tag_arr_api(data).then(response => {
+               
+              resolve(response)
+            }).catch(error => {
+              reject(error)
+            })
+          })
+        },
+      
+
+
+
   //1.网站列表 end ---------------------------------------->
   //获取网站管理列表
   getWebList({commit},data) {

src/store/modules/public.js

@@ -6,13 +6,19 @@ import {getDepartmentList,delDepartment,getDepartmentMain,
 import {login,logoutapi} from '@/api/unifiedLogin'
 
 const state = {
-
+      vuex_user_type:"????"
 }
 
+
 const mutations = {
+      get_vuex_user_type_mutations(state,recive_obj){
+            // console.log("get_vuex_user_type_mutations==",recive_obj)
+            state.vuex_user_type=recive_obj
+            // console.log("vuex====",state.vuex_user_type)
 
-}
+      }
 
+}
 const actions = {
   //单点登录 start ---------------------------------------->
   login({commit},data) {
@@ -53,6 +59,10 @@ const actions = {
   getInfo({commit},data) {
     return new Promise((resolve, reject) => {
       getInfo(data).then(response => {
+            commit("get_vuex_user_type_mutations",response.data.type_id)
+            // console.log("ajax==",response.data.type_id)
+
+
         resolve(response)
       }).catch(error => {
         reject(error)

src/store/modules/user.js

@@ -1,5 +1,5 @@
 import { login, logout, getInfo, getMenu ,getImgCode,updateUserAvatarNickname } from '@/api/user'
-import { getToken, setToken, setUserUrl, removeToken ,removUserUrl,getUserUrl,getUseType,removUseType,setUseType,getExp,setExp,removeExp } from '@/utils/auth'
+import { getToken, setToken, setUserUrl, removeToken ,removUserUrl,getUserUrl,getUseType,removUseType,setUseType,setWebSiteId,getExp,setExp,removeExp } from '@/utils/auth'
 import router, { resetRouter } from '@/router'
 import axios from 'axios'
 
@@ -144,6 +144,7 @@ const actions = {
         //设置用户等级
         commit('SET_USE_TYPE',data.type_id)
         setUseType(data.type_id,state.exp)
+        setWebSiteId(data.sszq,state.exp)
         console.log(data.type_id)
         console.log(state.exp)
 

src/utils/auth.js

@@ -4,6 +4,7 @@ const TokenKey = 'Admin-Token'
 const useUrl = 'Back-Url'
 const useType = 'use-Type'
 const expTime = 'exp-time'
+const webStieId = 'web-siteid'
 
 //1.设置token
 export function getToken() {
@@ -39,10 +40,19 @@ export function setUseType(url,exp) {
   return Cookies.set(useType, url, { expires: expdays })
 }
 
+export function setWebSiteId(siteid,exp) {
+      const expdays = convertSecondsToDays(exp)
+      return Cookies.set(webStieId, siteid, { expires: expdays })
+}
+
 export function getUseType() {
   return Cookies.get(useType)
 }
 
+export function getWebSiteId() {
+      return Cookies.get(webStieId)
+}
+    
 export function removUseType() {
   return Cookies.remove(useType)
 }

src/utils/baseUrl.js

@@ -4,12 +4,12 @@ const URL = {
   baseUrl: 'http://admindev.bjzxtw.org.cn:9501',//测试域名环境
   // baseUrl: 'http://192.168.1.201:9501',//刘佳伟本地环境
   // baseUrl:'http://192.168.1.115:9501',//冯蕊的本地环境
-  //baseUrl: 'http://192.168.1.127:9501',//刘剑的本地环境
+//   baseUrl: 'http://192.168.1.127:9501',//刘剑的本地环境
   //WebsocketUrl: 'ws://192.168.1.201:9506',//刘佳伟websocket地址
   //WebsocketUrl: 'ws://192.168.1.127:9506'//刘剑websocket地址
   //WebsocketUrl: 'ws://admin.bjzxtw.org.cn:9506'//正式环境websocket地址
   //WebsocketUrl: 'ws://183.131.25.186:9506'//测试服务器websocket地址
-  //WebsocketUrl: 'ws://admindev.bjzxtw.org.cn:9506'//测试域名服务器websocket地址
+  WebsocketUrl: 'ws://admindev.bjzxtw.org.cn:9506'//测试域名服务器websocket地址
 }
 
 export default URL;

src/views/news/creatNews.vue

@@ -16,7 +16,8 @@
             <el-input v-model="form.title" autocomplete="off" placeholder="请输入资讯标题"></el-input>
             <el-checkbox v-model="form.islink">是否使用外链</el-checkbox>
           </el-form-item>
-          <div v-if="form.islink==true"> 
+
+          <div v-if="creatNews_user_type!=10000"> 
             <el-form-item label="导航池名称：" prop="cat_arr_id" class="custom-align-right">
               <el-cascader :key="parentKey" v-model="form.cat_arr_id" placeholder="请选择要绑定的导航池名称" :props="parentData" filterable clearable></el-cascader>
             </el-form-item>
@@ -27,10 +28,23 @@
               <el-input v-model="form.author" autocomplete="off" placeholder="请输入作者"></el-input>
             </el-form-item>
           </div>
-          <div v-if="form.islink==false">
-            <el-form-item label="导航池名称：" prop="cat_arr_id" class="custom-align-right">
-              <el-cascader :key="parentKey" v-model="form.cat_arr_id" placeholder="请选择要绑定的导航池名称" :props="parentData" filterable clearable></el-cascader>
-            </el-form-item>  
+
+
+
+          <div>
+            <div  v-if="creatNews_user_type==10000">
+            <el-form-item label="站点名称:" prop="cat_arr_id" class="custom-align-right">
+                        <el-cascader :key="parentKey" v-model="form.web_site_id" placeholder="请选择站点名称" :options="creatNews_nav_pool_arr" @change="creatNews_nav_pool_change_fun(form.web_site_id)" filterable clearable></el-cascader>
+                  </el-form-item>  
+
+                   
+                   <el-form-item label="导航池名称：" prop="cat_arr_id" class="custom-align-right">
+                        <el-cascader :key="parentKey_2" v-model="form.cat_arr_id" placeholder="请选择要绑定的父级导航2" :props="parentData_2" filterable clearable></el-cascader>
+                    
+                  </el-form-item>  
+                  
+            </div>
+
             <el-form-item label="推荐等级：" class="custom-align-right" >
               <el-select v-model="form.level" clearable placeholder="请选择推荐等级..">
                 <el-option label="头条" :value="1"></el-option>
@@ -168,6 +182,7 @@
 </template>
 
 <script>
+import { getWebSiteId,getUseType} from '@/utils/auth'
 //表格标题
 import tableTitle from './components/tableTitle';
 //引入公用样式
@@ -210,12 +225,31 @@ export default {
     let self = this;
     //0.全局操作 end ------------------------------------------------------------>
     return {
+      websiteid:0,
+      creatNews_pid_num:"0",//请求子导航用的pid
+      creatNews_nav_pool_arr:[],//
+      creatNews_add_nav_pool_arr:[],//
+      creatNews_son_website_id_num:"",
+
+
+
+
+
       //1.表单项 start ------------------------------------------------------------>
       editStatus:false,
       tableDivTitle:"添加资讯",
       disclaimer:true,//免责声明
       //提交表单
+
+      creatNews_user_type:0,//判断用户类型'
+
       form: {
+
+            user_type:"??",//判断用户类型'
+            cat_arr_id:0,//导航池名称
+            nav_add_pool_id:[],//导航池子级
+
+
         //1.1使用了外链
         title: '',//资讯标题
         islink:0,//是否使用外链 0非 1是
@@ -232,10 +266,19 @@ export default {
         is_original:0,//是否为原创 0非 1是
         copyfrom:"",//来源名称
         fromurl:"",//来源地址
-        status:0//状态 0待发布 1已发布 404已删除
+        status:0,//状态 0待发布 1已发布 404已删除
+
+        web_site_id: 0
       },
       //1.2 表单验证规则
       formRules: {
+
+
+
+            //导航池名称不能为空
+            cat_arr_id:[{required:true,trigger:'blur',validator:validateArray}],
+            
+
         //资讯名称不能为空
         title:[{required:true,trigger:'blur',validator:validateEmpty}],
         //如果使用了外链，外链地址不能为空
@@ -307,6 +350,7 @@ export default {
       imgUrl:"",//在页面上显示缩略图
       //获取父级导航池
       parentKey:0,//获取父级导航
+
       parentData: {
         checkStrictly: true,
         lazy: true,
@@ -333,10 +377,55 @@ export default {
           })
         }
       },
+
+      parentKey_2:0,//获取父级导航 
+      parentData_2: {
+            
+        checkStrictly: true,
+        lazy: true,
+        async lazyLoad (node, resolve) {
+          const { level, data } = node;
+          if (data && data.children && data.children.length !== 0) {
+            return resolve(node)
+          }
+         
+          let parentId;
+         
+          if(data!=undefined){
+            parentId = data.value;
+          }else{ 
+            parentId = self.creatNews_pid_num.toString();
+          }
+          
+          let parames = {
+            'website_id':self.form.web_site_id ?self.form.web_site_id :self.websiteid,
+            'pid':parentId
+            
+          }
+           
+          self.$store.dispatch('pool/get_creatNews_nav_son_actions',parames).then(res=> {
+             
+            if (res.data) {
+              const nodes = res.data.map(item => ({
+                value: item.category_id,
+                label: item.name,
+                leaf: level >= 3,
+                children: []
+              }))
+              resolve(nodes)
+            }
+          })
+        }
+      },
+
       //表单项 end ------------------------------------------------------------>
     };
+ 
   },
+
+
   methods: {
+      
     //1.提交表单 start ------------------------------------------------------------>
     //1.1 直接上传图片
     beforeAvatarUpload(file) {
@@ -488,17 +577,19 @@ export default {
           this.form.copyfrom = res.data.copyfrom;
           this.form.linkurl = res.data.linkurl;
         }
-        
-        // 回显导航池
+
+
+
+
+
+        this.form.web_site_id=res.data.web_site_id    //站点名称
+ 
         this.form.cat_arr_id = Array.isArray(res.data.cat_arr_id) ? res.data.cat_arr_id : JSON.parse(res.data.cat_arr_id);
+         
         this.parentKey += 1; // 触发级联选择器重新加载
         this.loadCascaderPath(this.form.cat_arr_id); // 加载路径数据
-        //回显推荐等级
-        if(res.data.level==0){
-          this.form.level = "";
-        }else{
-          this.form.level = res.data.level;
-        }
+
+        this.form.level = res.data.level;
         this.form.imgurl = res.data.imgurl;
         this.imgUrl = res.data.imgurl;
         this.form.keyword = res.data.keyword;
@@ -507,9 +598,12 @@ export default {
         this.form.author = res.data.author;
         this.form.hits = res.data.hits;
         this.form.is_original = res.data.is_original;
-        //this.form.copyfrom = res.data.copyfrom;
+        this.form.copyfrom = res.data.copyfrom;
         this.form.fromurl = res.data.fromurl;
         this.form.status = res.data.status;
+
+
+
       }).catch(() => {
         this.$message({
           type: 'info',
@@ -691,11 +785,112 @@ export default {
           }
         });
       }
-    }
+    },
     //富文本编辑器 end ------------------------------------------------------------>
 
+
+    get_creatNews_form_id_fun(){//判断用户类型ajax
+             
+             this.$store.dispatch('public/getInfo').then(res=> {
+                   //     console.log("res======",res)
+                   this.form.user_type = res.data.type_id;
+              
+                   }).catch(() => {
+                         this.$message({
+                               type: 'info',
+                               message: '网络错误，请重试！'
+                         });
+                   })
+             
+        
+                   // console.log("this.form.user_type==",this.form);
+                   // console.log("this.form.user_type==2",this.form.user_type);
+          
+       },
+ 
+
+
+       get_creatNews_nav_pool_arr_fun(){//xx
+            this.$store.dispatch('pool/get_creatNews_nav_actions',{page:1,pageSize:666666}).then(res=> {
+                   
+                   
+                  res.data.rows.forEach(( per_obj ) => { 
+
+                        let new_per = {
+                              label: per_obj.website_name,
+                              value: per_obj.id,
+                        }
+
+                        this.creatNews_nav_pool_arr.push( new_per )
+
+                  })
+
+                  
+            }).catch(() => {
+              this.$message({
+                type: 'info',
+                message: '网络错误，请重试！'
+              });
+            })
+
+      },
+
+
+      creatNews_nav_pool_change_fun(){  
+            
+            //xx  导航池级
+            let that = this;
+               
+            this.form.web_site_id = this.form.web_site_id[0]
+             
+            that.parentKey_2 += 1;
+
+
+            this.$store.dispatch('pool/get_creatNews_nav_son_actions',{pid:String(this.creatNews_pid_num),website_id:String(this.form.web_site_id)}).then(res=> {
+              
+                   
+                  if(res.data.length==0){//没有导航池子级
+                        // alert("没有导航池子级");
+                        return
+                  }
+
+                  this.creatNews_add_nav_pool_arr=res.data;
+ 
+                  this.creatNews_add_nav_pool_arr.forEach(( per_obj ) => { 
+                    per_obj.label=per_obj.name, 
+                    per_obj.value=per_obj.id,
+                     
+                    this.creatNews_pid_num=per_obj.category_id      
+                  })
+ 
+
+            }).catch(() => {
+              this.$message({
+                type: 'info',
+                message: '网络错误，请重试！'
+              });
+            })
+
+
+      },
+ 
+
+
+
+
+
+
   },
+
   mounted(){
+      this.creatNews_user_type = getUseType()
+      this.websiteid= getWebSiteId()
+
+      this.get_creatNews_form_id_fun()//
+      this.get_creatNews_nav_pool_arr_fun()//
+ 
+
+
     //1.判断是新建还是回显
     if(this.$route.query.id!=undefined){
       this.editId = this.$route.query.id;
@@ -742,6 +937,7 @@ export default {
 
     });
     //复制富文本 end ------------------------------------------------------------>
+
   },
 };
 </script>

src/views/role/components/userDefault.vue

@@ -129,6 +129,11 @@
             </el-date-picker>
             <el-checkbox v-model="form.long_time" :true-label="1" :false-label="0" class="longTimeCheckbox">无限期</el-checkbox>
           </el-form-item>
+
+
+
+
+
           <div class="timeBox" v-else>
             <div class="timeTitle"><span>*</span>有效期：</div>
             <el-date-picker
@@ -141,6 +146,18 @@
             </el-date-picker>
             <el-checkbox v-model="form.long_time" :true-label="1" :false-label="0" class="longTimeCheckbox">无限期</el-checkbox>
           </div>
+
+
+            
+            <el-form-item label="站点标识：" :label-width="formLabelWidth" prop="websiteTag_arr_id" class="custom-align-right">
+             
+            <el-cascader v-model="form.websiteTag_arr_id" :options="options_arr" filterable clearable></el-cascader>
+ 
+          </el-form-item>
+
+
+
+          
           <el-form-item label="籍贯：" :label-width="formLabelWidth" prop="" class="custom-align-right">
             <CityCascader v-model="form.native_place_arr_id" @update-city-id="update_native_place_arr_id"></CityCascader>
           </el-form-item>
@@ -269,11 +286,39 @@ export default {
       }
     }
     return {
+
+      options_arr:[],
+
       formLabelWidth:"120px",
       editId:"",
       uploadFileUrl:URL.testUrl+"/public/uploadFile",//获得上传地址
       headers: {},
+
+
+
+
+      website_tag_params:{//xx
+            keyword:"",//网站名称查询
+            website_column_id:[],//使用网系id查询
+            city_id:[],//使用城市id查询
+
+            page:1,//当前是第几页
+            pageSize:666666,//一共多少条
+            name:"",
+       },
+
+
+
       form:{
+
+                
+        websiteTag_arr_id:[],    //站点标识下拉id only
+        websiteTag_reg:"",    
+        sszq:"", //站点标识下拉id
+        
+
+
+
         type_id:1,//个人会员
         role_id:"",//角色id 
         user_name:"",//登录账号
@@ -313,6 +358,11 @@ export default {
       passwordType2: 'password',
       //配置from表单验证规则
       loginRules: { 
+
+      //   站点标识xx
+      websiteTag_arr_id: [{ type:'array',required: true, trigger: 'blur', validator: validateArray }],
+
+
         //1.角色id
         role_id: [{ required: true, trigger: 'blur', validator: validateArray }],
         //2.登录账号
@@ -682,8 +732,37 @@ export default {
       let birthDateTime = `${year}-${month}-${day} 00:00:00`;
       this.form.birthday = birthDateTime;
     },
+
+    get_website_tag_arr_fun(){ //得到站点标识所有内容xx
+             
+             this.$store.dispatch('pool/get_website_tag_arr_actions',this.website_tag_params).then(res=> {
+                   console.log("res.data.listres.data.list",res.data.list)
+                   res.data.list.forEach(( per_obj ) => { 
+ 
+                         let new_per = {
+                               label: per_obj.name,
+                               value: per_obj.id,
+                         }
+ 
+                         this.options_arr.push( new_per )
+                   
+                   })
+                   // console.log("get_website_tag_arr_funget_website_tag_arr_fun")
+                   // console.log("get_website_tag_arr_funget_website_tag_arr_fun",this.options_arr)
+             })
+ 
+      },
+ 
+
+
   },
+
+
   mounted(){
+
+      this.get_website_tag_arr_fun()//得到站点标识所有内容xx
+
+
     this.getRoleList();
     //判断是新建还是回显
     if(this.$route.query.id!=undefined){

src/views/role/components/userEnterprise.vue

@@ -108,6 +108,25 @@
             </el-date-picker>
             <el-checkbox v-model="form.long_time" :true-label="1" :false-label="0" class="longTimeCheckbox">无限期</el-checkbox>
           </el-form-item>
+
+
+
+
+           <!-- <el-form-item label="站点标识：" :label-width="formLabelWidth" prop="city_arr_id" class="custom-align-right"> -->
+            <el-form-item label="站点标识：" :label-width="formLabelWidth" prop="websiteTag_arr_id" class="custom-align-right">
+            <!-- 级联选择器 xx-->
+            <!-- websiteTag_ -->
+            <!-- <el-cascader v-model="form.website_column_arr_id" :props="props_1" :options="website_column_arr" filterable clearable ></el-cascader> -->
+            
+            <el-cascader v-model="form.websiteTag_arr_id" :options="options_arr" filterable clearable></el-cascader>
+ 
+          </el-form-item>
+
+
+
+
+
+          
           <el-form-item label="传真：" :label-width="formLabelWidth" prop="fax" class="custom-align-right">
             <el-input v-model="form.fax" autocomplete="off" placeholder="请输入传真号码.."></el-input>
           </el-form-item>
@@ -225,7 +244,29 @@ export default {
       editId:"",
       uploadFileUrl:URL.testUrl+"/public/uploadFile",//获得上传地址
       headers: {},
+
+      options_arr:[],
+
+
+      website_tag_params:{//xx
+            keyword:"",//网站名称查询
+            website_column_id:[],//使用网系id查询
+            city_id:[],//使用城市id查询
+
+            page:1,//当前是第几页
+            pageSize:666666,//一共多少条
+            name:"",
+       },
+
+
+
       form:{
+
+            websiteTag_arr_id:[],    //站点标识下拉id only
+        websiteTag_reg:"",    
+        sszq:"", //站点标识下拉id
+           
+
         type_id:3,//企业会员
         role_id:"",//角色id 
         user_name:"",//登录账号
@@ -264,6 +305,13 @@ export default {
       passwordType2: 'password',
       //配置from表单验证规则
       loginRules: { 
+
+      //   站点标识xx
+      websiteTag_arr_id: [{ type:'array',required: true, trigger: 'blur', validator: validateArray }],
+
+
+
+
         //1.角色id
         role_id: [{ required: true, trigger: 'blur', validator: validateArray }],
         //2.登录账号
@@ -593,8 +641,38 @@ export default {
         path: '/userList',
       });
     },
+
+
+  
+  get_website_tag_arr_fun(){ //得到站点标识所有内容xx
+             
+            this.$store.dispatch('pool/get_website_tag_arr_actions',this.website_tag_params).then(res=> {
+                  console.log("res.data.listres.data.list",res.data.list)
+                  res.data.list.forEach(( per_obj ) => { 
+
+                        let new_per = {
+                              label: per_obj.name,
+                              value: per_obj.id,
+                        }
+
+                        this.options_arr.push( new_per )
+                  
+                  })
+                  // console.log("get_website_tag_arr_funget_website_tag_arr_fun")
+                  // console.log("get_website_tag_arr_funget_website_tag_arr_fun",this.options_arr)
+            })
+
+     },
+
+
+
   },
+
   mounted(){
+
+
+      this.get_website_tag_arr_fun()//得到站点标识所有内容xx
+
     this.getRoleList();
     //判断是新建还是回显
     if(this.$route.query.id!=undefined){

src/views/role/components/userInvestigate.vue

@@ -127,6 +127,18 @@
             <el-cascader :options="options" :show-all-levels="false" disabled v-else></el-cascader>
             <el-checkbox v-model="isNational" :true-label="1" :false-label="0" class="longTimeCheckbox">全国</el-checkbox>
           </el-form-item>
+
+
+  
+            <el-form-item label="站点标识：" :label-width="formLabelWidth" prop="websiteTag_arr_id" class="custom-align-right">
+            <!-- 级联选择器 xx-->
+             
+            <el-cascader v-model="form.websiteTag_arr_id" :options="options_arr" filterable clearable></el-cascader>
+ 
+          </el-form-item>
+
+
+
           <el-form-item label="有效期：" :label-width="formLabelWidth" prop="timeList" class="custom-align-right">
             <el-date-picker
               v-model="timeList"
@@ -278,11 +290,37 @@ export default {
       }
     }
     return {
+
+      options_arr:[],
+
+      props_1: { multiple: true },//下拉多选
+
+
       formLabelWidth:"120px",
       editId:"",
       uploadFileUrl:URL.testUrl+"/public/uploadFile",//获得上传地址
       headers: {},
+
+
+      website_tag_params:{//xx
+            keyword:"",//网站名称查询
+            website_column_id:[],//使用网系id查询
+            city_id:[],//使用城市id查询
+
+            page:1,//当前是第几页
+            pageSize:666666,//一共多少条
+            name:"",
+       },
+
+
       form:{
+
+            websiteTag_arr_id:[],    //站点标识下拉id only
+        websiteTag_reg:"",    
+        sszq:"", //站点标识下拉id
+        
+
+
         type_id:4,//调研员
         role_id:"",//角色id 
         user_name:"",//登录账号
@@ -325,6 +363,14 @@ export default {
       passwordType2: 'password',
       //配置from表单验证规则
       loginRules: { 
+
+
+                  //   站点标识xx
+      websiteTag_arr_id: [{ type:'array',required: true, trigger: 'blur', validator: validateArray }],
+
+
+
+
         //1.角色id
         role_id: [{ required: true, trigger: 'blur', validator: validateArray }],
         //2.登录账号
@@ -738,8 +784,41 @@ export default {
       let birthDateTime = `${year}-${month}-${day} 00:00:00`;
       this.form.birthday = birthDateTime;
     },
+
+
+    
+    get_website_tag_arr_fun(){ //得到站点标识所有内容xx
+            this.$store.dispatch('pool/get_website_tag_arr_actions',this.website_tag_params).then(res=> {
+                  // console.log("res.data.listres.data.list",res.data.list)
+                 
+                  res.data.list.forEach(( per_obj ) => { 
+
+                        let new_per = {
+                              label: per_obj.name,
+                              value: per_obj.id,
+                        }
+
+                        this.options_arr.push( new_per )
+                  
+                  })
+                  // console.log("get_website_tag_arr_funget_website_tag_arr_fun")
+                  // console.log("get_website_tag_arr_funget_website_tag_arr_fun",this.options_arr)
+            })
+
+     },
+
+
   },
+
+
+
+
+
   mounted(){
+
+      this.get_website_tag_arr_fun()//得到站点标识所有内容xx
+
+
     this.getRoleList();
     //判断是新建还是回显
     if(this.$route.query.id!=undefined){

src/views/role/components/userPolitician.vue

@@ -1,644 +1,649 @@
 <template>
-  <div class="mainBox">
-    <div class="layerBox">
-      <el-form ref="form" :model="form" :rules="loginRules" class="login-form" autocomplete="on" label-position="left" label-width="120px">
-        <div class="formDiv">
-          <!--选择角色 start------------------------------------------>
-          <el-form-item label="所属角色：" :label-width="formLabelWidth" prop="role_id" class="custom-align-right">
-            <div class="formLabelFloatBox">
-              <el-select v-model="form.role_id" placeholder="请选择..">
-                <el-option
-                  v-for="item in role_idArr"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value">
-                </el-option>
-              </el-select>
-            </div>
-          </el-form-item>
-          <!--选择角色 end------------------------------------------>
-          <el-form-item label="登录账号：" :label-width="formLabelWidth" prop="user_name" class="custom-align-right">
-            <el-input v-model="form.user_name" autocomplete="off" placeholder="请输入登录账号.."></el-input>
-          </el-form-item>
-          <div v-if="editId==''">
-            <!--新密码 start------------------------------------------>
-            <div class="PasswordBox">
-              <el-form-item prop="password" label="登录密码："  class="custom-align-right">
-                <div class="PasswordBody">
-                  <el-input
-                    :key="passwordType1"
-                    ref="password1"
-                    v-model="form.password"
-                    :type="passwordType1"
-                    placeholder="请输入密码"
-                    name="password"
-                    tabindex="2"
-                    autocomplete="off"
-                    @blur="capsTooltip2 = false"
-                  />
-                  <span class="show-pwd" @click="showPwd(1)">
-                    <svg-icon :icon-class="passwordType1 === 'password' ? 'eye' : 'eye-open'" />
-                  </span>
+      <div class="mainBox">
+          <!-- 政务会员 -->
+        <div class="layerBox">
+          <el-form ref="form" :model="form" :rules="loginRules" class="login-form" autocomplete="on" label-position="left" label-width="120px">
+            <div class="formDiv">
+              <!--选择角色 start------------------------------------------>
+              <el-form-item label="所属角色：" :label-width="formLabelWidth" prop="role_id" class="custom-align-right">
+                <div class="formLabelFloatBox">
+                  <el-select v-model="form.role_id" placeholder="请选择..">
+                    <el-option
+                      v-for="item in role_idArr"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value">
+                    </el-option>
+                  </el-select>
                 </div>
               </el-form-item>
-            </div>
-            <!--新密码 end------------------------------------------>
-            <!--新密码 start------------------------------------------>
-            <div class="PasswordBox">
-              <el-form-item prop="confirm_password" label="确认密码："  class="custom-align-right">
-                <div class="PasswordBody">
-                  <el-input
-                    :key="passwordType2"
-                    ref="password2"
-                    v-model="form.confirm_password"
-                    :type="passwordType2"
-                    placeholder="请输入密码"
-                    name="password"
-                    tabindex="2"
-                    autocomplete="off"
-                    @blur="capsTooltip2 = false"
-                  />
-                  <span class="show-pwd" @click="showPwd(2)">
-                    <svg-icon :icon-class="passwordType2 === 'password' ? 'eye' : 'eye-open'" />
-                  </span>
+              <!--选择角色 end------------------------------------------>
+              <el-form-item label="登录账号：" :label-width="formLabelWidth" prop="user_name" class="custom-align-right">
+                <el-input v-model="form.user_name" autocomplete="off" placeholder="请输入登录账号.."></el-input>
+              </el-form-item>
+              <div v-if="editId==''">
+                <!--新密码 start------------------------------------------>
+                <div class="PasswordBox">
+                  <el-form-item prop="password" label="登录密码："  class="custom-align-right">
+                    <div class="PasswordBody">
+                      <el-input
+                        :key="passwordType1"
+                        ref="password1"
+                        v-model="form.password"
+                        :type="passwordType1"
+                        placeholder="请输入密码"
+                        name="password"
+                        tabindex="2"
+                        autocomplete="off"
+                        @blur="capsTooltip2 = false"
+                      />
+                      <span class="show-pwd" @click="showPwd(1)">
+                        <svg-icon :icon-class="passwordType1 === 'password' ? 'eye' : 'eye-open'" />
+                      </span>
+                    </div>
+                  </el-form-item>
                 </div>
+                <!--新密码 end------------------------------------------>
+                <!--新密码 start------------------------------------------>
+                <div class="PasswordBox">
+                  <el-form-item prop="confirm_password" label="确认密码："  class="custom-align-right">
+                    <div class="PasswordBody">
+                      <el-input
+                        :key="passwordType2"
+                        ref="password2"
+                        v-model="form.confirm_password"
+                        :type="passwordType2"
+                        placeholder="请输入密码"
+                        name="password"
+                        tabindex="2"
+                        autocomplete="off"
+                        @blur="capsTooltip2 = false"
+                      />
+                      <span class="show-pwd" @click="showPwd(2)">
+                        <svg-icon :icon-class="passwordType2 === 'password' ? 'eye' : 'eye-open'" />
+                      </span>
+                    </div>
+                  </el-form-item>
+                </div>
+                <!--新密码 end------------------------------------------>
+              </div>
+              <el-form-item label="行政级别：" :label-width="formLabelWidth" prop="" class="custom-align-right">
+                <el-input autocomplete="off" placeholder="请输入企业名称.."></el-input>
+              </el-form-item>
+              <el-form-item label="单位名称：" :label-width="formLabelWidth" prop="business_name" class="custom-align-right">
+                <el-input v-model="form.business_name" autocomplete="off" placeholder="请输入单位名称.."></el-input>
+              </el-form-item>
+              <el-form-item label="详细地址：" :label-width="formLabelWidth" prop="" class="custom-align-right">
+                <CityCascader v-model="form.address_arr_id" @update-city-id="update_address_arr_id"></CityCascader>
+              </el-form-item>
+              <el-form-item label="" :label-width="formLabelWidth" prop="" class="custom-align-right">
+                <el-input v-model="form.address" autocomplete="off" placeholder="请输入门牌号.."></el-input>
+              </el-form-item>
+              <el-form-item label="负责人：" :label-width="formLabelWidth" prop="real_name" class="custom-align-right">
+                <el-input v-model="form.real_name" autocomplete="off" placeholder="请输入负责人姓名.."></el-input>
+              </el-form-item>
+              <el-form-item label="负责人职务：" :label-width="formLabelWidth" prop="position" class="custom-align-right">
+                <el-input v-model="form.position" autocomplete="off" placeholder="请输入负责人职务.."></el-input>
+              </el-form-item>
+              <el-form-item label="负责人电话：" :label-width="formLabelWidth" prop="mobile" class="custom-align-right">
+                <el-input v-model="form.mobile" autocomplete="off" placeholder="请输入负责人联系电话.."></el-input>
+              </el-form-item>
+              <el-form-item label="负责人身份证：" :label-width="formLabelWidth" prop="id_card" class="custom-align-right">
+                <el-input v-model="form.id_card" autocomplete="off" placeholder="请输入负责人身份证号.."></el-input>
+              </el-form-item>
+              <el-form-item label="法人：" :label-width="formLabelWidth" prop="legal_person_real_name" class="custom-align-right">
+                <el-input v-model="form.legal_person_real_name" autocomplete="off" placeholder="请输入法人姓名.."></el-input>
+              </el-form-item>
+              <el-form-item label="法人电话：" :label-width="formLabelWidth" prop="legal_person_mobile" class="custom-align-right">
+                <el-input v-model="form.legal_person_mobile" autocomplete="off" placeholder="请输入法人联系电话.."></el-input>
+              </el-form-item>
+    
+              <el-form-item label="法人身份证：" :label-width="formLabelWidth" prop="legal_person_id_card" class="custom-align-right">
+                <el-input v-model="form.legal_person_id_card" autocomplete="off" placeholder="请输入法人身份证号.."></el-input>
+              </el-form-item>
+    
+              <el-form-item label="有效期：" :label-width="formLabelWidth" prop="" class="custom-align-right">
+                <el-date-picker
+                  v-model="timeList"
+                  type="daterange"
+                  :disabled="form.long_time === 1"
+                  range-separator="至"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期"
+                  :picker-options="pickerOptions">
+                </el-date-picker>
+                <el-checkbox v-model="form.long_time" :true-label="1" :false-label="0" class="longTimeCheckbox">无限期</el-checkbox>
+              </el-form-item>
+    
+     
+    
+              <!-- <el-form-item label="站点标识：" :label-width="formLabelWidth" prop="city_arr_id" class="custom-align-right"> -->
+                <el-form-item label="站点标识：" :label-width="formLabelWidth" prop="websiteTag_arr_id" class="custom-align-right">
+                <!-- 级联选择器 xx-->
+                <!-- websiteTag_ -->
+                <!-- <el-cascader v-model="form.website_column_arr_id" :props="props_1" :options="website_column_arr" filterable clearable ></el-cascader> -->
+                
+                <el-cascader v-model="form.websiteTag_arr_id" :options="options_arr" filterable clearable></el-cascader>
+     
+              </el-form-item>
+    
+    
+    
+              <el-form-item label="传真：" :label-width="formLabelWidth" prop="fax" class="custom-align-right">
+                <el-input v-model="form.fax" autocomplete="off" placeholder="请输入传真号码.."></el-input>
+              </el-form-item>
+              <el-form-item label="邮编：" :label-width="formLabelWidth" prop="" class="custom-align-right">
+                <el-input v-model="form.zip_code" autocomplete="off" placeholder="请输入邮编.."></el-input>
+              </el-form-item>
+              <el-form-item label="QQ：" :label-width="formLabelWidth" prop="" class="custom-align-right">
+                <el-input v-model="form.qq" autocomplete="off" placeholder="请输入QQ号.."></el-input>
+              </el-form-item>
+              <el-form-item label="电子邮箱：" :label-width="formLabelWidth" prop="" class="custom-align-right">
+                <el-input v-model="form.email" autocomplete="off" placeholder="请输入电子邮箱.."></el-input>
+              </el-form-item>
+              <el-form-item label="相关资料：" :label-width="formLabelWidth" prop="" class="custom-align-right">
+                <el-upload
+                  class="upload-demo"
+                  :action="uploadFileUrl"
+                  :headers="headers"
+                  :on-preview="handlePreview"
+                  :on-remove="handleRemove"
+                  :before-remove="beforeRemove"
+                  :on-success="handleUploadSuccess"
+                  multiple
+                  :limit="30"
+                  :on-exceed="handleExceed"
+                  :file-list="otherList">
+                  <el-button size="small" type="primary">点击上传</el-button>
+                  <div slot="tip" class="el-upload__tip">每张图片最大1MB，最多上传30张图片。</div>
+                </el-upload>
+              </el-form-item>
+              <el-form-item label="提示词：" :label-width="formLabelWidth" prop="" class="custom-align-right">
+                <el-input type="textarea" v-model="form.remark" class="custom-textarea" placeholder="请输入提示词"></el-input>
               </el-form-item>
             </div>
-            <!--新密码 end------------------------------------------>
-          </div>
-          <el-form-item label="行政级别：" :label-width="formLabelWidth" prop="administrative_unit_arr_id" class="custom-align-right">
-            <el-input autocomplete="off" placeholder="请输入行政级别.."></el-input>
-          </el-form-item>
-          <el-form-item label="单位名称：" :label-width="formLabelWidth" prop="business_name" class="custom-align-right">
-            <el-input v-model="form.business_name" autocomplete="off" placeholder="请输入单位名称.."></el-input>
-          </el-form-item>
-          <el-form-item label="详细地址：" :label-width="formLabelWidth" prop="address_arr_id" class="custom-align-right">
-            <CityCascader v-model="form.address_arr_id" @update-city-id="update_address_arr_id"></CityCascader>
-          </el-form-item>
-          <el-form-item label="" :label-width="formLabelWidth" prop="" class="custom-align-right">
-            <el-input v-model="form.address" autocomplete="off" placeholder="请输入门牌号.."></el-input>
-          </el-form-item>
-          <el-form-item label="负责人：" :label-width="formLabelWidth" prop="real_name" class="custom-align-right">
-            <el-input v-model="form.real_name" autocomplete="off" placeholder="请输入负责人姓名.."></el-input>
-          </el-form-item>
-          <el-form-item label="负责人职务：" :label-width="formLabelWidth" prop="position" class="custom-align-right">
-            <el-input v-model="form.position" autocomplete="off" placeholder="请输入负责人职务.."></el-input>
-          </el-form-item>
-          <el-form-item label="负责人电话：" :label-width="formLabelWidth" prop="mobile" class="custom-align-right">
-            <el-input v-model="form.mobile" autocomplete="off" placeholder="请输入负责人联系电话.."></el-input>
-          </el-form-item>
-          <el-form-item label="负责人身份证：" :label-width="formLabelWidth" prop="id_card" class="custom-align-right">
-            <el-input v-model="form.id_card" autocomplete="off" placeholder="请输入负责人身份证号.."></el-input>
-          </el-form-item>
-          <el-form-item label="法人：" :label-width="formLabelWidth" prop="legal_person_real_name" class="custom-align-right">
-            <el-input v-model="form.legal_person_real_name" autocomplete="off" placeholder="请输入法人姓名.."></el-input>
-          </el-form-item>
-          <el-form-item label="法人电话：" :label-width="formLabelWidth" prop="legal_person_mobile" class="custom-align-right">
-            <el-input v-model="form.legal_person_mobile" autocomplete="off" placeholder="请输入法人联系电话.."></el-input>
-          </el-form-item>
-          <el-form-item label="法人身份证：" :label-width="formLabelWidth" prop="legal_person_id_card" class="custom-align-right">
-            <el-input v-model="form.legal_person_id_card" autocomplete="off" placeholder="请输入法人身份证号.."></el-input>
-          </el-form-item>
-          <el-form-item label="有效期：" :label-width="formLabelWidth" prop="timeList" class="custom-align-right">
-            <el-date-picker
-              v-model="timeList"
-              type="daterange"
-              :disabled="form.long_time === 1"
-              range-separator="至"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              :picker-options="pickerOptions">
-            </el-date-picker>
-            <el-checkbox v-model="form.long_time" :true-label="1" :false-label="0" class="longTimeCheckbox">无限期</el-checkbox>
-          </el-form-item>
-          <el-form-item label="传真：" :label-width="formLabelWidth" prop="fax" class="custom-align-right">
-            <el-input v-model="form.fax" autocomplete="off" placeholder="请输入传真号码.."></el-input>
-          </el-form-item>
-          <el-form-item label="邮编：" :label-width="formLabelWidth" prop="" class="custom-align-right">
-            <el-input v-model="form.zip_code" autocomplete="off" placeholder="请输入邮编.."></el-input>
-          </el-form-item>
-          <el-form-item label="QQ：" :label-width="formLabelWidth" prop="" class="custom-align-right">
-            <el-input v-model="form.qq" autocomplete="off" placeholder="请输入QQ号.."></el-input>
-          </el-form-item>
-          <el-form-item label="电子邮箱：" :label-width="formLabelWidth" prop="" class="custom-align-right">
-            <el-input v-model="form.email" autocomplete="off" placeholder="请输入电子邮箱.."></el-input>
-          </el-form-item>
-          <el-form-item label="相关资料：" :label-width="formLabelWidth" prop="" class="custom-align-right">
-            <el-upload
-              class="upload-demo"
-              :action="uploadFileUrl"
-              :headers="headers"
-              :on-preview="handlePreview"
-              :on-remove="handleRemove"
-              :before-remove="beforeRemove"
-              :on-success="handleUploadSuccess"
-              multiple
-              :limit="30"
-              :on-exceed="handleExceed"
-              :file-list="otherList">
-              <el-button size="small" type="primary">点击上传</el-button>
-              <div slot="tip" class="el-upload__tip">每张图片最大1MB，最多上传30张图片。</div>
-            </el-upload>
-          </el-form-item>
-          <el-form-item label="提示词：" :label-width="formLabelWidth" prop="" class="custom-align-right">
-            <el-input type="textarea" v-model="form.remark" class="custom-textarea" placeholder="请输入提示词"></el-input>
-          </el-form-item>
-          <el-form-item label="网站选择" :label-width="formLabelWidth" prop="sszq" class="custom-align-right">
-            <el-select v-model="form.sszq" multiple filterable placeholder="请选择">
-              <el-option
-                v-for="item in webSiteList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value">
-              </el-option>
-            </el-select>
-          </el-form-item>
+          </el-form>
+        </div>  
+        <div class="bottomBtnBox">
+          <el-button type="info" @click="goList">返回</el-button>
+          <el-button type="primary" @click="addData" v-if="editId==''">提交</el-button>
+          <el-button type="primary" @click="editData" v-else>修改</el-button>
         </div>
-      </el-form>
-    </div>  
-    <div class="bottomBtnBox">
-      <el-button type="info" @click="goList">返回</el-button>
-      <el-button type="primary" @click="addData" v-if="editId==''">提交</el-button>
-      <el-button type="primary" @click="editData" v-if="editId!=''">修改</el-button>
-      <el-button type="warning" @click="resetPassword" v-if="editId!=''">重置密码</el-button>
-    </div>
-  </div>
-</template>
-
-<script>
-// 引入公用样式
-import '@/styles/global.less';
-// 引入baseUrl
-import URL from '@/utils/baseUrl';
-//城市级联选择器
-import CityCascader from './CityCascader';
-//格式化时间
-import { formatLocalDate } from '@/utils/public';
-
-
-export default {
-  components: {
-    CityCascader, //城市级联选择器
-  },
-  data() {
-    let self = this;
-    // 配置验证规则：用于表单验证
-    const validatePassword = (rule, value, callback) => {
-      if (value.length < 6) {
-        callback(new Error('密码不能低于6位！'))
-      } else {
-        callback()
-      }
-    }
-    const validateEmpty = (rule,value,callback) => {
-      if (!value || value.trim() === "") {
-        callback(new Error('该项不能为空！'));
-      } else {
-        callback();
-      }
-    }
-    const validateArray = (rule,value,callback) => {
-      if (value.length == 0) {
-        callback(new Error('该项不能为空！'))
-      } else {
-        callback()
-      }
-    }
-    const validateTimeTo = (rule,value,callback) => {
-      if(value==undefined&&self.form.long_time==0){
-        callback(new Error('该项不能为空！'))
-      }else{
-        callback()
-      }
-    }
-    return {
-      formLabelWidth:"120px",
-      editId:"",
-      uploadFileUrl:URL.testUrl+"/public/uploadFile",//获得上传地址
-      headers: {},
-      form:{
-        type_id:2,//政务会员
-        role_id:"",//角色id 
-        user_name:"",//登录账号
-        password:"",//密码
-        confirm_password:"",//确认密码
-        real_name:"",//真实姓名
-        id_card:"",//身份证号
-        mobile:"",//手机号
-        address_arr_id:"",//详细地址
-        city_arr_id:"",//工作区域
-        from_time:"",//有效期开始时间
-        to_time:"",//有效期结束时间
-        long_time:0,//是否为长期 //长期1：长期 0：非长期
-        qq:"",//QQ
-        email:"",//电子邮箱
-        other:[],//相关资料
-        remark:"",//提示词
-        administrative_unit_arr_id:[],//行政级别
-        //企业相关字段
-        fax:"",//传真
-        business_name:"",//企业名称
-        position:"",//负责人职务
-        legal_person_real_name:"",//法人姓名
-        legal_person_mobile:"",//法人手机号
-        legal_person_id_card:"",//法人身份证号
-        sszq:[]//网站选择
+      </div>
+    </template>
+    
+    <script>
+    // 引入公用样式
+    import '@/styles/global.less';
+    // 引入baseUrl
+    import URL from '@/utils/baseUrl';
+    //城市级联选择器
+    import CityCascader from './CityCascader';
+    //格式化时间
+    import { formatLocalDate } from '@/utils/public';
+    
+    
+    export default {
+      components: {
+        CityCascader, //城市级联选择器
       },
-      timeList:[],//时间段
-      otherList:[],//相关资料列表
-      role_idArr:[],//角色id池
-      //网站列表
-      webSiteList: [],
-      //密码验证
-      capsTooltip1: false,
-      capsTooltip2: false,
-      passwordType1: 'password',
-      passwordType2: 'password',
-      //配置from表单验证规则
-      loginRules: { 
-        //1.角色id
-        role_id: [{ required: true, trigger: 'blur', validator: validateArray }],
-        //2.登录账号
-        user_name: [{ required: true, trigger: 'blur', validator: validateEmpty }],
-        //3.密码和确认密码
-        password: [{ required: true, trigger: 'blur', validator: validatePassword }],
-        confirm_password: [{ required: true, trigger: 'blur', validator: validatePassword }],
-        //4.调研员编号
-        number: [{ required: true, trigger: 'blur', validator: validateEmpty }],
-        //5.真实姓名
-        real_name: [{ required: true, trigger: 'blur', validator: validateEmpty }],
-        //6.手机号
-        mobile: [{ required: true, trigger: 'blur', validator: validateEmpty }],
-        //7.身份证号
-        id_card: [{ required: true, trigger: 'blur', validator: validateEmpty }],
-        //8.性别
-        gender: [{ required: true, trigger: 'blur', validator: validateEmpty }],
-        //9.手机号
-        mobile: [{ required: true, trigger: 'blur', validator: validateEmpty }],
-        //10.工作区域
-        address_arr_id: [{ required: true, trigger: 'blur', validator: validateArray }],
-        //11.企业名称
-        business_name: [{ required: true, trigger: 'blur', validator: validateEmpty }],
-        //12.负责人职务
-        position: [{ required: true, trigger: 'blur', validator: validateEmpty }],
-        //12.法人姓名
-        legal_person_real_name: [{ required: true, trigger: 'blur', validator: validateEmpty }],
-        //13.法人电话
-        legal_person_mobile: [{ required: true, trigger: 'blur', validator: validateEmpty }],
-        //14.法人身份证号
-        legal_person_id_card: [{ required: true, trigger: 'blur', validator: validateEmpty }],
-        //15.行政级别
-        administrative_unit_arr_id: [{ required: true, trigger: 'blur', validator: validateEmpty }],
-        //16.详细地址
-        address_arr_id: [{ required: true, trigger: 'blur', validator: validateArray }],
-        //17.有效期
-        timeList: [{ required: true, trigger: 'blur', validator: validateTimeTo }],
-        //18.网站选择
-        sszq: [{ required: true, trigger: 'blur', validator: validateArray }]
-      },
-      //时间跨度
-      pickerOptions: {
-        selectableRange: '1900-01-01 to 2100-12-31', // 允许选择的日期范围
-        // disabledDate(time) {
-        //   return time.getTime() < Date.now() - 86400000; // 禁用今天之前的日期
-        // },
-      },
-    };
-  },
-  methods: {
-    //1.表单收集 start ------------------------------------------------------------>
-    //1.1切换密码框的显示与隐藏
-    showPwd(num) {
-      const passwordTypeKey = 'passwordType' + num; //动态生成 passwordType 的键
-      const passwordRefKey = 'password' + num; //动态生成 password 的引用
-      // 切换密码类型
-      if (this[passwordTypeKey] === 'password') {
-        this[passwordTypeKey] = ''; //显示密码
-      } else {
-        this[passwordTypeKey] = 'password'; //隐藏密码
-      }
-      // 使用 $nextTick 聚焦到对应的密码输入框
-      this.$nextTick(() => {
-        this.$refs[passwordRefKey].focus(); //聚焦到对应的密码输入框
-      });
-    },
-    //1.2获得角色列表池
-    getRoleList(){
-      let data = {
-        page:1,
-        pageSize:100
-      }
-      this.$store.dispatch('userRole/roleList',data).then(res=>{
-        this.role_idArr = res.data.rows.map(item => ({
-          value: item.id,
-          label: item.role_name 
-        }));
-      }).catch(error=>{
-        this.$message({
-          type: 'warning',
-          message: '网络错误，请重试！'
-        });
-      })
-    },
-    //1.3更新详细地址
-    update_address_arr_id(value){
-      console.log("工作区域ID已更新:", value);
-      this.form.address_arr_id = value;
-    },
-    //1.5重置表单
-    clearData(){
-      
-    },
-    //表单收集 end ------------------------------------------------------------>
-    //2.提交表单 start ------------------------------------------------------------>
-    //2.3 多文件上传
-    handleRemove(file, fileList) {
-      console.log(file, fileList);
-    },
-    handlePreview(file) {
-      console.log(file);
-    },
-    handleExceed(files, fileList) {
-      this.$message.warning(`当前限制选择 30 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`);
-    },
-    beforeRemove(file, fileList) {
-      return this.$confirm(`确定移除 ${ file.name }？`);
-    },
-    //获取token
-    getTokenFromCookie() {
-      const name = "Admin-Token=";
-      const decodedCookie = decodeURIComponent(document.cookie);
-      const cookieArray = decodedCookie.split(';');
-      for (let i = 0; i < cookieArray.length; i++) {
-        let cookie = cookieArray[i].trim();
-        if (cookie.indexOf(name) === 0) {
-          return cookie.substring(name.length, cookie.length); // 返回 token
+      data() {
+        // 配置验证规则：用于表单验证
+        const validatePassword = (rule, value, callback) => {
+          if (value.length < 6) {
+            callback(new Error('密码不能低于6位！'))
+          } else {
+            callback()
+          }
         }
-      }
-      return ""; // 如果没有找到 token，返回空字符串
-    },
-    //设置token
-    setHeaders() {
-      this.token = this.getTokenFromCookie(); // 从 cookie 中获取 token
-      this.headers = { token: this.token }; // 设置 headers
-      console.log(this.headers); // 打印 headers
-    },
-    //上传成功以后
-    handleUploadSuccess(response) {
-      this.form.other.push(response.data.imgUrl)
-      console.log('上传成功:', response);
-      console.log(this.form.other);
-    },
-    //提交表单
-    addData(){
-      //1.格式化时间戳
-      if(this.form.long_time==0){
-        this.form.from_time = formatLocalDate(this.timeList[0]);
-        this.form.to_time = formatLocalDate(this.timeList[1]);
-      }else{
-        this.form.from_time = "";
-        this.form.to_time = "";
-        delete this.form.from_time;
-        delete this.form.to_time;
-      }
-      //2.开始验证
-      this.$refs.form.validate(valid => {
-        if (valid) {
-          //3.验证用户是否已经存在
-          this.$store.dispatch('userMember/verifyUserInfo',{user_name:this.form.user_name}).then(res=>{
-            if(res.code==0){
-              //如果code为0表示用户不存在，提交表单
-              this.$store.dispatch('userMember/createUser',this.form).then(res=>{
-                if(res.code==200){
-                  console.log(res);
-                  this.$message({
-                    type: 'success',
-                    message: '用户添加成功！'
-                  });
-                  this.goList();
-                }else{
-                  this.$message({
-                    type: 'warning',
-                    message: res.message
-                  });
-                }
-              })
-            }else if(res.code==200){
-              //如果code==200 表示用户存在，阻止进一步提交
-              this.$message({
-                type: 'warning',
-                message: '该账号已被注册，请更换其他账号！'
-              });
-            }
+        const validateEmpty = (rule,value,callback) => {
+          if (!value || value.trim() === "") {
+            callback(new Error('该项不能为空！'));
+          } else {
+            callback();
+          }
+        }
+        const validateArray = (rule,value,callback) => {
+          if (value.length == 0) {
+            callback(new Error('该项不能为空！'))
+          } else {
+            callback()
+          }
+        }
+        return {
+          //xx
+          // options_arr:[ { "label": "农网", "value": 1, "pid": 0, "sort": 1, "remark": "农网栏目信息", "column_arr_id": null, "updated_at": "2024-06-19 23:58:52", "created_at": "2024-06-06 09:28:19", "children": [ { "label": "核心网站(行星)", "value": 3, "pid": 1, "sort": 1, "remark": "核心网站", "column_arr_id": null, "updated_at": "2024-06-19 23:58:52", "created_at": "2024-06-06 01:31:26" }, { "label": "重点网系(卫星)", "value": 4, "pid": 1, "sort": 1, "remark": "重点网系", "column_arr_id": null, "updated_at": "2024-06-19 23:58:52", "created_at": "2024-06-06 01:32:06" }, { "label": "垂直网系(卫星)", "value": 5, "pid": 1, "sort": 1, "remark": "垂直网系", "column_arr_id": null, "updated_at": "2024-06-19 23:58:52", "created_at": "2024-06-06 01:32:43" }, { "label": "频道网系(卫星)", "value": 6, "pid": 1, "sort": 1, "remark": "频道网系", "column_arr_id": null, "updated_at": "2024-06-19 23:58:52", "created_at": "2024-06-06 01:33:19" }, { "label": "地方网系(卫星)", "value": 7, "pid": 1, "sort": 1, "remark": "地方网系", "column_arr_id": null, "updated_at": "2024-06-19 23:58:52", "created_at": "2024-06-06 01:33:44" } ] } ],
+          options_arr:[],
+    
+          formLabelWidth:"120px",
+          editId:"",
+          uploadFileUrl:URL.testUrl+"/public/uploadFile",//获得上传地址
+          headers: {},
+    
+    
+          website_tag_params:{//xx
+                keyword:"",//网站名称查询
+                website_column_id:[],//使用网系id查询
+                city_id:[],//使用城市id查询
+    
+                page:1,//当前是第几页
+                pageSize:666666,//一共多少条
+                name:"",
+           },
+    
+    
+    
+          form:{
+            type_id:2,//政务会员
+            role_id:"",//角色id 
+            user_name:"",//登录账号
+            password:"",//密码
+            confirm_password:"",//确认密码
+            real_name:"",//真实姓名
+            id_card:"",//身份证号
+            mobile:"",//手机号
+            address_arr_id:"",//详细地址
+            city_arr_id:"",//工作区域
+            from_time:"",//有效期开始时间
+            to_time:"",//有效期结束时间
+            long_time:0,//是否为长期 //长期1：长期 0：非长期
+            qq:"",//QQ
+            email:"",//电子邮箱
+            other:[],//相关资料
+            remark:"",//提示词
+            administrative_unit_arr_id:[0],//行政级别
+            //企业相关字段
+            fax:"",//传真
+            business_name:"",//企业名称
+            position:"",//负责人职务
+            legal_person_real_name:"",//法人姓名
+            legal_person_mobile:"",//法人手机号
+            legal_person_id_card:"",//法人身份证号
+          },
+          timeList:[],//时间段
+          otherList:[],//相关资料列表
+          role_idArr:[],//角色id池
+          //密码验证
+          capsTooltip1: false,
+          capsTooltip2: false,
+          passwordType1: 'password',
+          passwordType2: 'password',
+          //配置from表单验证规则
+          loginRules: { 
+    
+                      //   站点标识xx
+                websiteTag_arr_id: [{ type:'array',required: true, trigger: 'blur', validator: validateArray }],
+    
+    
+            //1.角色id
+            role_id: [{ required: true, trigger: 'blur', validator: validateArray }],
+            //2.登录账号
+            user_name: [{ required: true, trigger: 'blur', validator: validateEmpty }],
+            //3.密码和确认密码
+            password: [{ required: true, trigger: 'blur', validator: validatePassword }],
+            confirm_password: [{ required: true, trigger: 'blur', validator: validatePassword }],
+            //4.调研员编号
+            number: [{ required: true, trigger: 'blur', validator: validateEmpty }],
+            //5.真实姓名
+            real_name: [{ required: true, trigger: 'blur', validator: validateEmpty }],
+            //6.手机号
+            mobile: [{ required: true, trigger: 'blur', validator: validateEmpty }],
+            //7.身份证号
+            id_card: [{ required: true, trigger: 'blur', validator: validateEmpty }],
+            //8.性别
+            gender: [{ required: true, trigger: 'blur', validator: validateEmpty }],
+            //9.手机号
+            mobile: [{ required: true, trigger: 'blur', validator: validateEmpty }],
+            //10.工作区域
+            address_arr_id: [{ required: true, trigger: 'blur', validator: validateArray }],
+            //11.企业名称
+            business_name: [{ required: true, trigger: 'blur', validator: validateEmpty }],
+            //12.负责人职务
+            position: [{ required: true, trigger: 'blur', validator: validateEmpty }],
+            //12.法人姓名
+            legal_person_real_name: [{ required: true, trigger: 'blur', validator: validateEmpty }],
+            //13.法人电话
+            legal_person_mobile: [{ required: true, trigger: 'blur', validator: validateEmpty }],
+            //14.法人身份证号
+            legal_person_id_card: [{ required: true, trigger: 'blur', validator: validateEmpty }],
+            //15.行政级别
+            administrative_unit_arr_id: [{ required: true, trigger: 'blur', validator: validateEmpty }],
+          },
+          //时间跨度
+          pickerOptions: {
+            selectableRange: '1900-01-01 to 2100-12-31', // 允许选择的日期范围
+            disabledDate(time) {
+              return time.getTime() < Date.now() - 86400000; // 禁用今天之前的日期
+            },
+          },
+        };
+      },
+      methods: {
+        //1.表单收集 start ------------------------------------------------------------>
+        //1.1切换密码框的显示与隐藏
+        showPwd(num) {
+          const passwordTypeKey = 'passwordType' + num; //动态生成 passwordType 的键
+          const passwordRefKey = 'password' + num; //动态生成 password 的引用
+          // 切换密码类型
+          if (this[passwordTypeKey] === 'password') {
+            this[passwordTypeKey] = ''; //显示密码
+          } else {
+            this[passwordTypeKey] = 'password'; //隐藏密码
+          }
+          // 使用 $nextTick 聚焦到对应的密码输入框
+          this.$nextTick(() => {
+            this.$refs[passwordRefKey].focus(); //聚焦到对应的密码输入框
+          });
+        },
+        //1.2获得角色列表池
+        getRoleList(){
+          let data = {
+            page:1,
+            pageSize:100
+          }
+          this.$store.dispatch('userRole/roleList',data).then(res=>{
+            this.role_idArr = res.data.rows.map(item => ({
+              value: item.id,
+              label: item.role_name 
+            }));
           }).catch(error=>{
             this.$message({
               type: 'warning',
               message: '网络错误，请重试！'
             });
           })
-        }
-      })
-    },
-    //提交表单 start ------------------------------------------------------------>
-    //3.编辑表单 start ------------------------------------------------------------>
-    //获得网站列表
-    getWebsiteList(){
-      this.$store.dispatch('pool/getWebList',{page:1,pageSize:1000}).then(res=>{
-        if(res.code!=200){
-          this.$message.error(res.message)
-        }else{
-          for(let item of res.data.rows){
-            let data = {
-              value:item.id,
-              label:item.website_name
+        },
+        //1.3更新详细地址
+        update_address_arr_id(value){
+          console.log("工作区域ID已更新:", value);
+          this.form.address_arr_id = value;
+        },
+        //1.5重置表单
+        clearData(){
+          
+        },
+        //表单收集 end ------------------------------------------------------------>
+        //2.提交表单 start ------------------------------------------------------------>
+        //2.3 多文件上传
+        handleRemove(file, fileList) {
+          console.log(file, fileList);
+        },
+        handlePreview(file) {
+          console.log(file);
+        },
+        handleExceed(files, fileList) {
+          this.$message.warning(`当前限制选择 30 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`);
+        },
+        beforeRemove(file, fileList) {
+          return this.$confirm(`确定移除 ${ file.name }？`);
+        },
+        //获取token
+        getTokenFromCookie() {
+          const name = "Admin-Token=";
+          const decodedCookie = decodeURIComponent(document.cookie);
+          const cookieArray = decodedCookie.split(';');
+          for (let i = 0; i < cookieArray.length; i++) {
+            let cookie = cookieArray[i].trim();
+            if (cookie.indexOf(name) === 0) {
+              return cookie.substring(name.length, cookie.length); // 返回 token
             }
-            this.webSiteList.push(data)
           }
-        }
-      })
-    },
-    //获得用户信息
-    getUserInfo(){
-      this.$store.dispatch('userMember/getUser',{id:this.editId}).then(res=>{
-        console.log(res);
-        //回显数据
-        this.form.type_id = res.data.type_id;
-        this.form.user_name = res.data.user_name;
-        this.form.role_id = res.data.role_id;
-        this.form.real_name = res.data.real_name;
-        this.form.mobile = res.data.mobile;
-        this.form.number = res.data.number;
-        this.form.avatar = res.data.avatar;
-        this.form.id_card = res.data.id_card;
-        this.form.fax = res.data.fax;
-        this.form.legal_person_id_card = res.data.legal_person_id_card;
-        this.form.legal_person_mobile = res.data.legal_person_mobile;
-        this.form.legal_person_real_name = res.data.legal_person_real_name;
-        this.form.position = res.data.position;
-        this.form.business_name = res.data.business_name;
-        //还原有效期
-        if(res.data.long_time==0){
-          this.timeList = [
-            res.data.from_time,
-            res.data.to_time
-          ]
-          this.form.from_time = res.data.from_time;
-          this.form.to_time = res.data.to_time;
-          this.form.long_time = 0;
-        }else{
-          this.form.from_time = "";
-          this.form.to_time = "";
-          this.form.long_time = 1;
-        }
-        this.form.qq = res.data.qq;
-        this.form.email = res.data.email;
-        this.form.zip_code = res.data.zip_code;
-        this.form.remark = res.data.remark;
-        this.form.address_arr_id = res.data.address_arr_id;
-        
-        // 处理文件列表
-        const fileArrayString = res.data.other; // 假设这是一个字符串格式的数组
-        const fileArray = JSON.parse(fileArrayString); // 解析为数组
-        this.form.other.push(...fileArray); // 将解析出来的值 push 到 this.form.other
-        // 将文件列表赋值给 otherList，生成默认文件名
-        this.otherList = fileArray.map((url, index) => ({
-          name: `文件${index + 1}`, // 生成文件名
-          url: url,                // 文件的 URL
-          status: 'success'        // 设置状态为 success
-        }));
-      }).catch(error=>{
-        this.$message({
-          type: 'warning',
-          message: '网络错误，请重试！'
-        });
-      })
-    },
-    //修改用户
-    editData(){
-      //1.格式化时间戳
-      if(this.form.long_time==0){
-        this.form.from_time = formatLocalDate(this.timeList[0]);
-        this.form.to_time = formatLocalDate(this.timeList[1]);
-      }else{
-        this.form.from_time = "";
-        this.form.to_time = "";
-      }
-      //2.提交修改的数据
-      this.$refs.form.validate(valid => {
-        if (valid) {
-          //1.验证用户是否存在
-          this.$store.dispatch('userMember/verifyUserInfo',{id:this.editId,user_name:this.form.user_name}).then(res=>{
-            if(res.code==0){
-              console.log(this.form);
-              this.form.address_arr_id = JSON.parse(this.form.address_arr_id);
-              //2.设置修改的用户id
-              this.form.id = this.editId;
-              //3.提交用户修改
-              //如果code为0表示用户不存在，提交表单
-              this.$store.dispatch('userMember/updateUser',this.form).then(res=>{
-                console.log(res);
+          return ""; // 如果没有找到 token，返回空字符串
+        },
+        //设置token
+        setHeaders() {
+          this.token = this.getTokenFromCookie(); // 从 cookie 中获取 token
+          this.headers = { token: this.token }; // 设置 headers
+          console.log(this.headers); // 打印 headers
+        },
+        //上传成功以后
+        handleUploadSuccess(response) {
+          this.form.other.push(response.data.imgUrl)
+          console.log('上传成功:', response);
+          console.log(this.form.other);
+        },
+        //提交表单
+        addData(){
+          //1.格式化时间戳
+          if(this.form.long_time==0){
+            this.form.from_time = formatLocalDate(this.timeList[0]);
+            this.form.to_time = formatLocalDate(this.timeList[1]);
+          }else{
+            this.form.from_time = "";
+            this.form.to_time = "";
+            delete this.form.from_time;
+            delete this.form.to_time;
+          }
+          //2.开始验证
+          this.$refs.form.validate(valid => {
+            if (valid) {
+              //3.验证用户是否已经存在
+              this.$store.dispatch('userMember/verifyUserInfo',{user_name:this.form.user_name}).then(res=>{
+                if(res.code==0){
+                  //如果code为0表示用户不存在，提交表单
+                  this.$store.dispatch('userMember/createUser',this.form).then(res=>{
+                    if(res.code==200){
+                      console.log(res);
+                      this.$message({
+                        type: 'success',
+                        message: '用户添加成功！'
+                      });
+                      this.goList();
+                    }else{
+                      this.$message({
+                        type: 'warning',
+                        message: res.message
+                      });
+                    }
+                  })
+                }else if(res.code==200){
+                  //如果code==200 表示用户存在，阻止进一步提交
+                  this.$message({
+                    type: 'warning',
+                    message: '该账号已被注册，请更换其他账号！'
+                  });
+                }
+              }).catch(error=>{
                 this.$message({
-                  type: 'success',
-                  message: '用户添加成功！'
+                  type: 'warning',
+                  message: '网络错误，请重试！'
                 });
-                this.goList();
               })
-            }else if(res.code==200){
-              //如果code==200 表示用户存在，阻止进一步提交
-              this.$message({
-                type: 'warning',
-                message: '该账号已被注册，请更换其他账号！'
-              });
             }
+          })
+        },
+        //提交表单 start ------------------------------------------------------------>
+        //3.编辑表单 start ------------------------------------------------------------>
+        //获得用户信息
+        getUserInfo(){
+          this.$store.dispatch('userMember/getUser',{id:this.editId}).then(res=>{
+            console.log(res);
+            //回显数据
+            this.form.type_id = res.data.type_id;
+            this.form.user_name = res.data.user_name;
+            this.form.role_id = res.data.role_id;
+            this.form.real_name = res.data.real_name;
+            this.form.mobile = res.data.mobile;
+            this.form.number = res.data.number;
+            this.form.avatar = res.data.avatar;
+            this.form.id_card = res.data.id_card;
+            this.form.fax = res.data.fax;
+            this.form.legal_person_id_card = res.data.legal_person_id_card;
+            this.form.legal_person_mobile = res.data.legal_person_mobile;
+            this.form.legal_person_real_name = res.data.legal_person_real_name;
+            this.form.position = res.data.position;
+            this.form.business_name = res.data.business_name;
+            //还原有效期
+            if(res.data.long_time==0){
+              this.timeList = [
+                res.data.from_time,
+                res.data.to_time
+              ]
+              this.form.from_time = res.data.from_time;
+              this.form.to_time = res.data.to_time;
+              this.form.long_time = 0;
+            }else{
+              this.form.from_time = "";
+              this.form.to_time = "";
+              this.form.long_time = 1;
+            }
+            this.form.qq = res.data.qq;
+            this.form.email = res.data.email;
+            this.form.zip_code = res.data.zip_code;
+            this.form.remark = res.data.remark;
+            this.form.address_arr_id = res.data.address_arr_id;
+            
+            // 处理文件列表
+            const fileArrayString = res.data.other; // 假设这是一个字符串格式的数组
+            const fileArray = JSON.parse(fileArrayString); // 解析为数组
+            this.form.other.push(...fileArray); // 将解析出来的值 push 到 this.form.other
+            // 将文件列表赋值给 otherList，生成默认文件名
+            this.otherList = fileArray.map((url, index) => ({
+              name: `文件${index + 1}`, // 生成文件名
+              url: url,                // 文件的 URL
+              status: 'success'        // 设置状态为 success
+            }));
           }).catch(error=>{
             this.$message({
               type: 'warning',
               message: '网络错误，请重试！'
             });
           })
-        }
-      })
-    },
-    //重置密码
-    resetPassword(){
-      let password = Math.random().toString(36).slice(-6); // 随机生成6个字母的组合
-
-      this.$store.dispatch('userMember/resetPassword',{id:this.editId,password:password}).then(res=> {
-        if(res.code==200){
-          this.$message({
-            type: 'success',
-            message: '密码重置为：' + password
+        },
+        //修改用户
+        editData(){
+          //1.格式化时间戳
+          if(this.form.long_time==0){
+            this.form.from_time = formatLocalDate(this.timeList[0]);
+            this.form.to_time = formatLocalDate(this.timeList[1]);
+          }else{
+            this.form.from_time = "";
+            this.form.to_time = "";
+          }
+          //2.提交修改的数据
+          this.$refs.form.validate(valid => {
+            if (valid) {
+              //1.验证用户是否存在
+              this.$store.dispatch('userMember/verifyUserInfo',{id:this.editId,user_name:this.form.user_name}).then(res=>{
+                if(res.code==0){
+                  console.log(this.form);
+                  this.form.address_arr_id = JSON.parse(this.form.address_arr_id);
+                  //2.设置修改的用户id
+                  this.form.id = this.editId;
+                  //3.提交用户修改
+                  //如果code为0表示用户不存在，提交表单
+                  this.$store.dispatch('userMember/updateUser',this.form).then(res=>{
+                    console.log(res);
+                    this.$message({
+                      type: 'success',
+                      message: '用户添加成功！'
+                    });
+                    this.goList();
+                  })
+                }else if(res.code==200){
+                  //如果code==200 表示用户存在，阻止进一步提交
+                  this.$message({
+                    type: 'warning',
+                    message: '该账号已被注册，请更换其他账号！'
+                  });
+                }
+              }).catch(error=>{
+                this.$message({
+                  type: 'warning',
+                  message: '网络错误，请重试！'
+                });
+              })
+            }
+          })
+        },
+        //编辑表单 end ------------------------------------------------------------>
+        goList(){
+          this.$router.push({
+            path: '/userList',
           });
+        },
+    
+        
+        get_website_tag_arr_fun(){ //得到站点标识所有内容xx
+                this.$store.dispatch('pool/get_website_tag_arr_actions',this.website_tag_params).then(res=> {
+                      console.log("res.data.listres.data.list",res.data.list)
+                      res.data.list.forEach(( per_obj ) => { 
+    
+                            let new_per = {
+                                  label: per_obj.name,
+                                  value: per_obj.id,
+                            }
+    
+                            this.options_arr.push( new_per )
+                      
+                      })
+                      // console.log("get_website_tag_arr_funget_website_tag_arr_fun")
+                      // console.log("get_website_tag_arr_funget_website_tag_arr_fun",this.options_arr)
+                })
+    
+         },
+    
+    
+    
+    
+    
+      },
+      mounted(){
+          this.get_website_tag_arr_fun()//得到站点标识所有内容xx 
+    
+        this.getRoleList();
+        //判断是新建还是回显
+        if(this.$route.query.id!=undefined){
+          this.editId = this.$route.query.id;
+          console.log("编辑用户！")
+          this.getUserInfo();
+        }else{
+          console.log("添加用户！")
+        }
+        //设置token
+        this.setHeaders(); // 在组件挂载时设置 headers
+      }
+    };
+    </script>
+    
+    <style scoped lang="less">
+      .PasswordBox {
+        display: flex;
+        align-items: center;
+        .el-form-item {
+          flex: 1;
+        }
+        .PasswordTitle {
+          width:120px;
+          text-align: right;
+          margin-right: 10px;
+          margin-bottom:22px;
         }
-      }).catch(() => {
-        this.$message({
-          type: 'warning',
-          message: '网络错误，请重试！'
-        });
-      })
-    },
-    //编辑表单 end ------------------------------------------------------------>
-    goList(){
-      this.$router.push({
-        path: '/userList',
-      });
-    },
-  },
-  mounted(){
-    this.getRoleList();
-    //判断是新建还是回显
-    if(this.$route.query.id!=undefined){
-      this.editId = this.$route.query.id;
-      console.log("编辑用户！")
-      this.getUserInfo();
-    }else{
-      console.log("添加用户！")
-    }
-    //设置token
-    this.setHeaders(); // 在组件挂载时设置 headers
-    //获取所有网站列表
-    this.getWebsiteList();
-  }
-};
-</script>
-
-<style scoped lang="less">
-  .PasswordBox {
-    display: flex;
-    align-items: center;
-    .el-form-item {
-      flex: 1;
-    }
-    .PasswordTitle {
-      width:120px;
-      text-align: right;
-      margin-right: 10px;
-      margin-bottom:22px;
-    }
-    .PasswordBody {
-      flex: 1;
-      display: flex;
-      align-items: center;
-    }
-    .show-pwd {
-      margin-left: 10px;
-    }
-  }
-  .longTimeCheckbox {
-    margin-left: 10px;
-  }
-  //执行v-deep穿透scope选择器 start------------------------------------------------------------>*/
-  ::v-deep .custom-form-item > .el-form-item__label {
-    line-height: 140px !important;
-  }
-  ::v-deep .custom-textarea .el-textarea__inner {
-    resize: none; /* 禁止用户拖拽调整大小 */
-  }
-  ::v-deep .custom-align-right .el-form-item__label {
-    text-align: right; /* 设置标签文字右对齐 */
-  }
-  ::v-deep .el-select {
-    width: 100%; /* 禁止用户拖拽调整大小 */
-  }
-  //执行v-deep穿透scope选择器 end------------------------------------------------------------>*/
-</style>
+        .PasswordBody {
+          flex: 1;
+          display: flex;
+          align-items: center;
+        }
+        .show-pwd {
+          margin-left: 10px;
+        }
+      }
+      .longTimeCheckbox {
+        margin-left: 10px;
+      }
+      //执行v-deep穿透scope选择器 start------------------------------------------------------------>*/
+      ::v-deep .custom-form-item > .el-form-item__label {
+        line-height: 140px !important;
+      }
+      ::v-deep .custom-textarea .el-textarea__inner {
+        resize: none; /* 禁止用户拖拽调整大小 */
+      }
+      ::v-deep .custom-align-right .el-form-item__label {
+        text-align: right; /* 设置标签文字右对齐 */
+      }
+      ::v-deep .el-select {
+        width: 100%; /* 禁止用户拖拽调整大小 */
+      }
+      //执行v-deep穿透scope选择器 end------------------------------------------------------------>*/
+    </style>
+    

src/views/role/creatUser - 副本.vue

@@ -0,0 +1,82 @@
+<template>
+  <div class="mainBox">
+    <div class="layerBox">
+      <tableTitle :name="tableDivTitle"/>
+      <div>
+        <el-radio-group v-model="userType">
+          <el-radio v-for="option in radioOptions" 
+                     :key="option.label" 
+                     :label="option.value" 
+                     :disabled="isDisabled(option.value)">
+            {{ option.label }}
+          </el-radio>
+        </el-radio-group>
+      </div>
+    </div>
+    <!-- 根据 userType 的值动态显示组件 -->
+    <user-admin v-if="userType === '10000'" />
+    <user-investigate v-if="userType === '4'" />
+    <user-default v-if="userType === '1'" />
+    <user-enterprise v-if="userType === '3'" />
+    <user-politician v-if="userType === '2'" />
+  </div>
+</template>
+
+<script>
+// 引入组件
+import tableTitle from './components/tableTitle';
+import userAdmin from './components/userAdmin'; // 引入管理员组件
+import userInvestigate from './components/userInvestigate'; // 引入调研员组件
+import userDefault from './components/userDefault'; // 引入个人会员组件
+import userEnterprise from './components/userEnterprise'; // 引入企业会员组件
+import userPolitician from './components/userPolitician'; // 引入政务会员组件
+// 引入公用样式
+import '@/styles/global.less';
+
+export default {
+  components: {
+    tableTitle,
+    userAdmin, // 注册管理员组件
+    userInvestigate, // 注册调研员组件
+    userDefault, // 注册个人会员组件
+    userEnterprise, // 注册企业会员组件
+    userPolitician // 注册政务会员组件
+  },
+  data() {
+    return {
+      tableDivTitle: "选择用户类型",
+      userType: "10000", // 用户类型
+      radioOptions: [
+        { label: '管理员', value: '10000' },
+        { label: '调研员', value: '4' },
+        { label: '个人会员', value: '1' },
+        { label: '企业会员', value: '3' },
+        { label: '政务会员', value: '2' }
+      ]
+    };
+  },
+  methods: {
+    isDisabled(value) {
+      // 如果 type_id 存在，则禁用与 userType 不对应的选项
+      if (this.$route.query.type_id) {
+        return value !== this.userType;
+      }
+      // 如果 type_id 不存在，则允许所有选项
+      return false;
+    }
+  },
+  mounted() {
+    // 其他逻辑
+    if (this.$route.query.type_id != undefined) {
+      this.userType = String(this.$route.query.type_id);
+      console.log("编辑用户！");
+    } else {
+      console.log("添加用户！");
+    }
+  },
+};
+</script>
+
+<style scoped lang="less">
+  
+</style>

src/views/website/websiteTag.vue

@@ -0,0 +1,1151 @@
+<template>
+      <div class="mainBox">
+        <!--搜索功能 start------------------------------------------------------------>
+        <!-- WebsiteList.vue -->
+        <div class="layerBox_search">
+          <div class="layerBoxLine">
+
+            <el-row>
+                        
+                  <el-col :span="8">
+                        <div class="searchBox">
+                              <div class="searchTitle">标识组名称：</div>
+                              <el-input placeholder="请输入网站名称" autocomplete="off" v-model="getApiData.keyword"/>
+                        </div>
+                  </el-col>
+  
+                  <el-col :span="15">
+                        <div class="tag_webSite_head_btn_box">
+
+                              <div class="searchTitle">标识组名称：</div>
+
+                              
+                              <el-button type="info" @click="clearSearchList">重置</el-button>
+                              <el-button type="primary" @click="getData('search')">搜索</el-button>
+                        </div>
+                  </el-col>
+  
+
+                
+
+             </el-row>
+
+
+          </div>
+        </div>
+
+        <div class="layerBoxNoBg">
+          <div>
+            <el-button type="primary" @click="addData">添加标识组</el-button>
+          </div>
+          
+        </div>
+
+
+        <!--搜索功能 end------------------------------------------------------------>
+        <!--表格内容 start------------------------------------------------------------>
+        <div class="layerBox">
+          <tableTitle :name="tableDivTitle"/>
+          <el-row>
+            <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="website_names1" label="网站名称" ></el-table-column>
+
+                      <!-- console.log("webslte_names==",item.name)     
+                         console.log("webslte_names==",item.website_names1)      -->
+
+                 
+                <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="240" header-align="center">
+                  <template slot-scope="scope">
+                    <div class="listBtnBox">
+                      <div class="listDeleteBtn" @click="deleteData(scope.row.id, tableData)"><i class="el-icon-delete"></i>移除</div>
+                      <div class="listEditBtn" @click="getDataMain(scope.row.id,scope.row, tableData)"><i class="el-icon-edit-outline"></i>编辑</div>
+                      <!-- <div class="listMainBtn" @click="creatWebsite(scope.row.id)"><i class="el-icon-brush"></i>搭建</div> -->
+                    </div>
+                    <!-- <div class="listMainBtn"><i class="el-icon-view"></i>详情</div> -->
+                    <!-- <el-button @click.native.prevent="deleteData(scope.row.id, tableData)" type="text" size="small">移除</el-button>
+                    <el-button @click.native.prevent="getDataMain(scope.row.id, tableData)" type="text" size="small">编辑</el-button> -->
+                  </template>
+                </el-table-column>
+              </el-table>
+            </template>
+          </el-row>
+        </div>
+        <div class="alignBox">
+          <el-row>
+            <el-col :span="24">
+              <el-pagination :current-page="getApiData.page" @size-change="handleSizeChange" @current-change="handleCurrentChange" :page-size="10" layout="total, prev, pager, next, jumper" :total="allCount"></el-pagination>
+            </el-col>
+          </el-row>
+        </div>
+        <!--表格内容 end------------------------------------------------------------>
+
+
+ 
+
+
+        <!--弹出框1：外部表单弹出框  start------------------------------------------------------------>
+        <el-dialog :title="editId ? '编辑标识' : '添加标识'" :visible.sync="windowStatus" :close-on-click-modal="false">
+          <!--弹出框2：内部模板弹出框 start------------------------------------------------------------>
+          <el-dialog width="39%" title="皮肤库" :visible.sync="innerVisible" append-to-body>
+            <div class="templateBox">
+              <div class="templateListClass">
+                <div class="templateListClassItem">简约现代</div>
+                <div class="templateListClassItem">复古风格</div>
+                <div class="templateListClassItem">扁平化</div>
+              </div>
+              <div class="templateListBox">
+                <div v-for="item in TemplateList" class="templateList" @click="useThatTemplate(item.id,item.template_name,item.template_img)">
+                  <img :src="item.template_img" class="templateImg">
+                  <div>1{{item.template_name}}</div>
+                </div>
+              </div>
+            </div>
+            <div class="pageNumBox">
+              <el-pagination @size-change="handleTemplateSize" @current-change="handleChangeCurrent" :page-size="10" layout="total, prev, pager, next, jumper" :total="TemplateallCount">
+
+              </el-pagination>
+            </div>
+            <div class="webSiteBtn">
+              <el-button type="primary" @click="innerVisible = false">确 定</el-button>
+            </div>
+          </el-dialog>
+
+
+          <!--弹出框2：内部模板弹出框 end------------------------------------------------------------> 
+
+          <el-form :model="form" ref="form" :rules="formRules" autocomplete="off" label-position="left">
+
+            <div class="formDiv">
+
+              <el-form-item label="标识组名称：" :label-width="formLabelWidth" prop="website_name" class="custom-align-right">
+                  <el-input v-model="form.website_name" autocomplete="off" @blur="checkWebsiteName(form.website_name)" placeholder="请输入名称">
+                        
+                  </el-input>
+              </el-form-item>
+ 
+              <el-form-item label="网站地址2：" :label-width="formLabelWidth" v-if="form.website_url[1].show==true" class="custom-align-right">
+                <div class="formLabelFloatBox">
+                  <el-input v-model="form.website_url[1].url" autocomplete="off" @blur="checkWebsiteUrl(form.website_url[1].url,1)"  placeholder="请输入网站地址2"></el-input>
+                  <el-button type="info" icon="el-icon-plus" circle size="mini" @click="addUrlInput(2)" class="formLabeladdIcon"></el-button>
+                  <el-button type="info" icon="el-icon-delete" circle size="mini" @click="deleteUrlInput(1)" class="formLabelDelIcon"></el-button>
+                </div>
+              </el-form-item>
+
+              <el-form-item label="网站地址3：" :label-width="formLabelWidth" v-if="form.website_url[2].show==true" class="custom-align-right">
+                <div class="formLabelFloatBox">
+                  <el-input v-model="form.website_url[2].url" autocomplete="off" @blur="checkWebsiteUrl(form.website_url[2].url,2)"  placeholder="请输入网站地址3"></el-input>
+                  <el-button type="info" icon="el-icon-plus" circle size="mini" @click="addUrlInput(3)" class="formLabeladdIcon"></el-button>
+                  <el-button type="info" icon="el-icon-delete" circle size="mini" @click="deleteUrlInput(2)" class="formLabelDelIcon"></el-button>
+                </div>
+              </el-form-item>
+              <el-form-item label="网站地址4：" :label-width="formLabelWidth" v-if="form.website_url[3].show==true" class="custom-align-right">
+                <div class="formLabelFloatBox">
+                  <el-input v-model="form.website_url[3].url" autocomplete="off" @blur="checkWebsiteUrl(form.website_url[3].url,3)"  placeholder="请输入网站地址4"></el-input>
+                  <el-button type="info" icon="el-icon-plus" circle size="mini" @click="addUrlInput(4)" class="formLabeladdIcon"></el-button>
+                  <el-button type="info" icon="el-icon-delete" circle size="mini" @click="deleteUrlInput(3)" class="formLabelDelIcon"></el-button>
+                </div>
+              </el-form-item>
+              <el-form-item label="网站地址5：" :label-width="formLabelWidth" v-if="form.website_url[4].show==true" class="custom-align-right">
+                <div class="formLabelFloatBox">
+                  <el-input v-model="form.website_url[4].url" autocomplete="off" @blur="checkWebsiteUrl(form.website_url[4].url,4)"  placeholder="请输入网站地址5"></el-input>
+                  <el-button type="info" icon="el-icon-plus" circle size="mini" @click="" class="formLabeladdIcon" disabled></el-button>
+                  <el-button type="info" icon="el-icon-delete" circle size="mini" @click="deleteUrlInput(4)" class="formLabelDelIcon"></el-button>
+                </div>
+              </el-form-item>
+
+
+
+ 
+  
+              <el-form-item label="设置标识组：" :label-width="formLabelWidth" prop="website_column_arr_id" class="custom-align-right">
+                <!-- <el-cascader v-model="form.website_column_arr_id" :props="{checkStrictly:true}" :options="website_column_arr"> -->
+
+                <el-cascader v-model="form.website_column_arr_id" :props="props_1" :options="website_column_arr" filterable clearable >
+
+                </el-cascader>
+
+
+                <!-- <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"
+                  :label="item.label"
+                  :value="item.value">
+                </el-option>
+              </el-select> -->
+              
+
+
+                <!-- <el-select v-model="form.web_ids" :multiple="true">
+                <el-option
+                  v-for="item in website_column_arr"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value">
+                </el-option>
+              </el-select> -->
+
+                <!-- props.multiple = true -->
+                <!--  filterable 搜索 -->
+                <!--  clearable 清空 -->
+                  
+
+              </el-form-item>
+ 
+    
+                
+            </div>
+          </el-form>
+
+
+          <div slot="footer" class="dialog-footer">
+            <div class="footerBtnbox">
+              <el-button @click="closeWindow" type="info">取 消</el-button>
+              <el-button type="primary" @click="editToServe" v-if="editBtn==true">确定</el-button>
+              <el-button type="primary" @click="addToServe" v-else>提交</el-button>
+                   
+               
+            </div>
+          </div>
+        </el-dialog>
+        <!--弹出框2：外部表单弹出框 end------------------------------------------------------------>
+      </div>
+    </template>
+    
+    <script>
+    //本地编译城市代码
+    //import getLocationNameById from '@/utils/citytocode';
+    //城市级联选择器
+    import CityCascader from './components/CityCascader';
+    //表格标题
+    import tableTitle from './components/tableTitle';
+    //引入公用样式
+    import '@/styles/global.less';
+    
+    export default {
+      components: {
+        CityCascader, //城市级联选择器
+        tableTitle,//表格标题
+      },
+      data() {
+  
+
+        //0.全局操作 start ------------------------------------------------------------>
+        //表单验证
+        const validateEmpty = (rule,value,callback) => {
+          if (value.length == 0) {
+            callback(new Error('该项不能为空！'))
+          } else {
+            callback()
+          }
+        }
+        const validateWebsiteUrl = (rule,value,callback) => {
+          if (!value || value.trim() === "") {
+            callback(new Error('至少要填写一个网站地址！'));
+          } else {
+            callback();
+          }
+        }
+        const validateColumn = (rule,value,callback) => {
+          if (value.length === 0) {
+              callback(new Error('必须选择一个上级网系！'))
+          } else {
+              callback()
+          }
+        }
+        let self = this;
+        //0.全局操�� end ------------------------------------------------------------>
+        return {
+ 
+
+
+          //1.列表和分页相关 start ------------------------------------------------------------>
+          tableDivTitle:"站点标识列表",
+          tableData:[],//内容
+          editId:0,//要修改的网站id
+
+          getApiData:{
+            keyword:"",//网站名称查询
+            website_column_id:[],//使用网系id查询
+            city_id:[],//使用城市id查询
+
+            page:1,//当前是第几页
+            pageSize:10,//一共多少条
+            name:"",
+          },
+          allCount:0,//总条数
+          //分页相关 end ------------------------------------------------------------>
+    
+          //2.弹出框设置 start ------------------------------------------------------------>
+          windowStatus:false, //显示第一层弹窗
+          innerVisible:false, //显示第二层弹窗
+          formLabelWidth: '120px',//表单的长度
+          editBtn:false,//当显示编辑按钮的时候，就不显示提交
+          //弹出框设置 start ------------------------------------------------------------>
+    
+          //3.弹出框中的表单设置 start ------------------------------------------------------------>
+
+          tag_dorp_all_id_str:"",//下拉所有ID
+
+          //3.1 表单收集的数据
+          form: {
+            website_name: '',//需要提交的网站名称
+            website_url:[//需要绑定的网站���址
+              {url:"",show:true},
+              {url:"",show:false},
+              {url:"",show:false},
+              {url:"",show:false},
+              {url:"",show:false}
+            ],
+            
+            website_column_arr_id:[],//需要提交的上级网系 数组
+            city_arr_id:[0],//需要提交的城市id
+            logo:"",//logo地址 提交文件换取地址
+            title:"",//需要提交的网站标题
+            keywords:"",//需要提交的网站标题
+            description:"",//需要提交的网站描述
+            template_id:"",//选择的网站皮肤
+            web_ids:""//
+          },
+          //3.2 表单验证规则
+          formRules: {
+            //网站名称不能为空
+            website_name:[{required:true,trigger:'blur',validator:validateEmpty}],
+            //网站地址不能为空
+            'website_url[0].url': [
+              {required: true, message:'至少要填写一个网站地址！',trigger:'blur'},
+              {validator: this.validateWebsiteUrl,trigger:'blur'}
+            ],
+            //网系不能为空 注意，因为是select框，只有提交的时候才会验证
+            website_column_arr_id: [{type:'array',required:true,trigger:'change',message:'必须选择一个网系！',validator:validateColumn}],
+            //网站标题，关键词，描述不能为空
+            title:[{required:true,trigger:'blur',validator:validateEmpty}],
+            keywords:[{required:true,trigger:'blur',validator:validateEmpty}],
+            description:[{required:true,trigger:'blur',validator:validateEmpty}],
+            logoUrl:[{required:true,trigger:'blur',validator:validateEmpty}],
+            template_id:[{required:true,trigger:'blur',validator:validateEmpty}],
+          },
+          //3.3 通过api获的的数据 弹窗
+          website_column_arr:[],//api获得的网系列表
+          props_1: { multiple: true },//下拉多选
+           
+
+          //3.4 上传logo图片
+          logoUrl:'',
+          hovering: false, // 鼠标悬浮状态 悬浮时显示删除
+          //3.5 模板列表
+          TemplateList:[],
+          getTemplateData:{
+            template_class_id:1,//模板类型，暂时为1
+            page:1,//当前是第几页
+            pageSize:9,//请求多少条
+          },
+          TemplateallCount:0,//总条数
+          TemplateName:"未选择模板..",//选择的模板名称
+          TemplateImg:"",//选择的模板图片
+          //弹出框中的表单设置 end ------------------------------------------------------------>
+        }
+      },
+
+      methods: {
+        //1.列表和分页相关 start ------------------------------------------------------------>
+        //1.1 开始请求列表信息方法
+
+        getData(type){
+          //搜索条件 - 网系和城市id只提交最后一个
+          if(this.getApiData.website_column_id.length>0){
+            this.getApiData.website_column_id = this.getApiData.website_column_id[this.getApiData.website_column_id.length - 1];
+          }
+          if(this.getApiData.city_id.length>0){
+            this.getApiData.city_id = this.getApiData.city_id[this.getApiData.city_id.length - 1];
+          }
+          //如果是搜索，重新加载第一页==搜索
+          if(type=="search"){
+            this.getApiData.page = 1;
+            this.getApiData.name = this.getApiData.keyword;
+
+ 
+          }
+ 
+
+      //     console.log("this.getApiData==",this.getApiData)
+          //console.log(this.getApiData)
+      //     console.log("getApiDatagetApiData",this.getApiData)
+          this.$store.dispatch('pool/get_website_tag_arr_actions',this.getApiData).then(res=> {
+            // console.log("resres",res)
+
+            let newData = [];
+             
+            // console.log("newData",newData)
+             
+            for(let item of res.data.list){
+             
+                
+                  //如果有3个以上的名字就保留2个并加上省略号
+                  const the_arr = item.website_names1.split(",")
+                  const the_leng = the_arr.length 
+                  if(the_leng>=3){
+                        item.website_names1=the_arr[0] +","+the_arr[1]+"..." 
+                  } 
+
+
+                  newData.push(item)
+            }
+            
+            //格式化网站地址
+
+            // res.data.rows.forEach(item => {
+            //   item.website_url = item.website_url.join(', ');
+            // });
+            
+            this.tableData = newData; //给与内容
+            
+
+            this.allCount = res.data.count; //给与总条数
+          }).catch(() => {
+            this.$message({
+              type: 'info',
+              message: '网络错误，请重试！'
+            });
+          })
+        },
+
+
+
+
+        //1.2 删除内容
+        deleteData(id){
+          this.$confirm('此操作将永久删除该条数据, 是否继续?', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+            console.log("当前删除：" + id)
+            this.$store.dispatch('pool/del_website_tag_arr_actions',{id:id}).then(res=> {
+              this.getData();
+ 
+                if(res.message=="有用户在使用该网站标识，不能删除"){
+                         
+                        this.$message({
+                              type: 'warning',
+                              message: '有用户在使用该网站标识，不能删除'
+                        });
+                        return
+                }  
+
+              this.$message({
+                type: 'success',
+                message: '删除成功!'
+              });
+            }).catch(() => {
+              this.$message({
+                type: 'warning',
+                message: '网络错误，请重试！'
+              });
+            })
+          }).catch(() => {
+            this.$message({
+              type: 'warning',
+              message: '已取消删除'
+            });
+          });
+        },
+
+
+
+        //1.3 列表内容分页
+        //直接跳转
+        handleSizeChange(val) {
+          this.getApiData.page = val;
+          this.getData();
+        },
+        //1.4 点击分页
+        handleCurrentChange(val) {
+          this.getApiData.page = val;
+          this.getData();
+        },
+        //1.6 重置按钮
+        clearSearchList(){
+          this.tableData = [];
+          this.getApiData.keyword = "";
+          this.getApiData.name = "";
+          this.getApiData.website_column_id = [];
+          this.getApiData.city_id = [];
+          this.getApiData.city_arr_id = [];
+          this.getApiData.page = 1;
+          this.getApiData.pageSize = 10;
+          this.getData();
+        },
+        //1.7搜索栏的城市选择器
+        updateCityId(value) {
+          // 这里可以处理选择后的回调逻辑
+          console.log("城市ID已更新:", value);
+          // 可以在此处执行额外逻辑
+          this.getApiData.city_id = value;
+        },
+        //列表和分页相关 end ------------------------------------------------------------>
+    
+        //2.弹出框设置 start ------------------------------------------------------------>
+        //2.1 打开弹出框
+        openWindow() {
+          this.clearToServe();
+          this.windowStatus = true;
+        },
+        //2.2 关闭弹出框
+        closeWindow(){
+          this.windowStatus = false;
+          this.clearToServe();
+        },
+        //2.3 重置窗口内容
+        clearToServe(){
+          //还原表单
+          this.form.website_name = "";
+          this.form.website_column_arr_id = "";
+          this.form.website_url = [
+            {url:"",show:true},
+            {url:"",show:false},
+            {url:"",show:false},
+            {url:"",show:false},
+            {url:"",show:false}
+          ];
+          this.form.city_arr_id = [0];
+          this.form.logo = "";
+          this.form.title = "";
+          this.form.keywords = "";
+          this.form.description = "";
+          this.form.template_id = "";
+          //还原logo缩略图
+          this.logoUrl = "";
+          //还原模板
+          this.TemplateList = [];
+          this.getTemplateData.page = 1;
+          this.TemplateImg = "";
+          this.TemplateallCount = 0;
+        },
+        //弹出框设置 end ------------------------------------------------------------>
+    
+        //3.添加新网站 start ------------------------------------------------------------>
+        //3.1 获得所有网系
+
+
+        getwebsiteColumn(){//下拉
+ 
+
+          let that = this;
+          this.$store.dispatch('pool/drop_website_tag_actions',{page:1,pageSize:999}).then(res=> {
+            // console.log("res==",res.data)
+
+            let arrData = this.transformData(res.data.rows)
+            // console.log("newItem==",arrData)
+            this.website_column_arr = arrData;
+
+            // console.log("website_column_arr==",this.website_column_arr)
+          })
+        },
+
+        transformData(arrData) {
+ 
+            let that = this;
+          return arrData.map(item => {//格式化=要按element-ui的下拉格式cascader
+            // 创建一个新的对象，替换键名
+            // console.log("item.column_name==",item.column_name)
+
+
+                  let newItem = {
+                        label: item.website_name,
+                        value: item.id,
+
+                        // 保留其他不需要改动的字段
+                        //   pid: item.pid,
+                        // //   sort: item.sort,
+
+
+                        //   remark: item.remark,
+                        //   column_arr_id: item.column_arr_id,
+                        //   updated_at: item.updated_at,
+                        //   created_at: item.created_at,
+                  };
+
+
+
+            // 如果有 children，则递归处理 children 数组
+            // if (item.children && item.children.length > 0) {
+            //   newItem.children = that.transformData(item.children);
+            // }
+    
+            return newItem;
+          });
+
+          
+        },
+        //3.2 开始添加内容
+        addData(){
+             
+
+
+            this.editId = false;  //弹出框标题
+
+            //先获取所有网系
+            this.getwebsiteColumn()
+            //显示网系到弹出窗口
+            this.openWindow()
+            //显示提交按钮
+            this.editBtn = false;
+            //清除错误状态
+            this.$refs.form.clearValidate();
+        },
+
+
+
+        //3.3 添加一条网站地址
+        addUrlInput(key){
+          this.form.website_url[key].show=true;
+        },
+        //3.4 删除一条网站地址
+        deleteUrlInput(key){
+          this.form.website_url[key].show=false;
+          this.form.website_url[key].url="";
+        },
+        //3.5 弹出框的城市选择器
+        updateFormCityId(value){
+          console.log("城市ID已更新:", value);
+          this.form.city_arr_id = value;
+        },
+        //3.6 上传图片操作
+        beforeAvatarUpload(file) {
+          const isJPG = file.type === 'image/jpeg';
+          const isPNG = file.type === 'image/png';
+          const isLt2M = file.size / 1024 / 1024 < 2;
+    
+          if (!isJPG && !isPNG) {
+            this.$message.error('上传头像图片只能是 JPG 或 PNG 格式!');
+            return false;
+          }
+          if (!isLt2M) {
+            this.$message.error('上传头像图片大小不能超过 2MB!');
+            return false;
+          }
+    
+          const formData = new FormData();
+          formData.append('file', file);
+    
+          this.$store.dispatch('pool/uploadFile',formData).then(res=> {
+            this.logoUrl = res.data.imgUrl;//显示缩略图
+            this.form.logo = res.data.imgUrl;//提供表单地址
+            console.log(res.data.imgUrl)
+          }).catch(() => {
+            this.$message({
+              type: 'info',
+              message: '网络错误，请重试！'
+            });
+          })
+    
+          // 阻止默认的上传行为
+          return false;
+        },
+        handleDelete() {
+          // 删除图片
+          this.logoUrl = ''; // 清空图片 URL
+        },
+
+
+
+        tag_dorp_all_id_fun(){//下拉所有ID
+            
+            this.tag_dorp_all_id_str=[]//临时转数组
+
+            // console.log("this.tag_dorp_all_id_str",this.tag_dorp_all_id_str)
+            this.form.website_column_arr_id.forEach(( per_obj ) => { 
+                   
+                  this.tag_dorp_all_id_str.push(String(per_obj[0]))
+    
+
+              })
+              this.tag_dorp_all_id_str="["+this.tag_dorp_all_id_str.join(",")+"]"
+
+            //   console.log("this.tag_dorp_all_id_str==",this.tag_dorp_all_id_str)
+
+        },
+
+        //3.7 提交表单
+        addToServe(){//添加 
+             
+      //     console.log(this.form)
+          //先进行验证
+          this.$refs.form.validate(valid => {
+
+            if (valid) {
+              //提交之前把域名列表转换成数组
+              let webSiteArray = [];
+              for(let item of this.form.website_url){
+                if(item.url!=""){
+                  webSiteArray.push(item.url)
+                }
+              }
+
+              //循环完毕 重置提交的url
+              this.form.website_url = webSiteArray;
+               
+               this.tag_dorp_all_id_fun()//下拉所有ID
+
+              this.$store.dispatch('pool/add_website_tag_actions',{name:this.form.website_name,web_ids:this.tag_dorp_all_id_str}).then(res=> {
+
+                   
+                  console.log("res========",res)
+                   
+                if(res.code==200){
+                  //汇报结果
+                  this.$message({
+                    type: 'success',
+                    message: '已成功添加网站！'
+                  });
+                  //重新获取表单
+                  this.getData();
+                  //清空并退出
+                  this.closeWindow();
+                }else{
+                  
+                      if(res.message=="网站标识重复"){
+
+                              this.$message({
+                                    type: 'warning',
+                                    message: '网站标识名字重复'
+                              });
+
+
+                        }else{
+
+                              this.$message({
+                                    type: 'warning',
+                                    message: '添加失败！请检查网络！'
+                              });
+                        }  
+                        
+                  //清空并退出
+                  this.closeWindow();
+
+                }
+                
+              }).catch(() => {
+                this.$message({
+                  type: 'info',
+                  message: '网络错误，请重试！'
+                });
+              })
+            }
+          })
+        },
+
+
+
+
+
+ 
+        //3.8 检测网站名称是否存在
+        checkWebsiteName(name){
+
+          let data = {
+            website_name:name
+          }
+          if(this.editId!=""){
+            data.id = this.editId;
+          }
+          this.$store.dispatch('pool/checkWebsiteName',data).then(res=> {
+            if(res.code==200){
+              this.form.website_name = "";
+              this.$message({
+                type: 'warning',
+                message: '网站名称已存在！请重新输入！'
+              });
+            }
+          })
+        },
+        //3.9 检测网站url是否存在
+        checkWebsiteUrl(url,num){
+          let data = {
+            website_url:url
+          }
+          if(this.editId!=""){
+            data.id = this.editId;
+          }
+          this.$store.dispatch('pool/checkWebsiteUrl',data).then(res=> {
+            if(res.code==200){
+              if(num==0){this.form.website_url[0].url=""}
+              if(num==1){this.form.website_url[1].url=""}
+              if(num==2){this.form.website_url[2].url=""}
+              if(num==3){this.form.website_url[3].url=""}
+              if(num==4){this.form.website_url[4].url=""}
+              this.$message({
+                type: 'warning',
+                message: '当前网站已经被占用，请重新输入！'
+              });
+            }
+          })
+        },
+        //添加新网站 end ------------------------------------------------------------>
+    
+        //4.选择模板 start ------------------------------------------------------------>
+        //4.1 获取模板列表
+        getTemplateList(){
+          //先打开弹出框
+          this.innerVisible = true;
+          //获取模板列表
+          this.$store.dispatch('pool/getTemplate',this.getTemplateData).then(res=> {
+            //直接给与数据
+            //this.TemplateList = res.data.rows;
+            //格式化 目前缩略图给了两张，我只展示其中一张
+            let data = res.data.rows;
+            for(let item of data){
+              //item.template_img
+              let imgSrc = item.template_img;
+              item.template_img = imgSrc[0];
+            }
+            this.TemplateList = data;
+            //给与总条数
+            this.TemplateallCount = res.data.count;
+          }).catch(() => {
+            this.$message({
+              type: 'warning',
+              message: '网络错误，请重试！'
+            });
+          })
+        },
+        //4.2 选择一个模板
+        useThatTemplate(id, template_name, template_img) {
+            console.log(template_name);
+            console.log(template_img);
+            // 关闭弹出框
+            this.innerVisible = false;
+            // 显示用户选择的名称
+            this.TemplateName = template_name;
+            // 确保这里设置了 TemplateImg
+            this.TemplateImg = template_img; // 确保 template_img 是有效的路径
+            // 记录选择的模板id
+            this.form.template_id = id;
+        },
+        //4.1 模板列表分页
+        //直接跳转
+        handleTemplateSize(val) {
+          this.getTemplateData.page = val;
+          this.getTemplateList();
+        },
+        //4.2 点击分页
+        handleChangeCurrent(val) {
+          this.getTemplateData.page = val;
+          this.getTemplateList();
+        },
+        //选择模板 end ------------------------------------------------------------>
+    
+        //5.编辑网站 start ------------------------------------------------------------>
+        //5.1获取详情
+        getDataMain(id){//修改=编辑
+            // console.log("recive_1==",recive_1.name,recive_1.web_ids)
+            
+            //点击编辑在form中显示编辑btn
+            this.editBtn = true;//显示编辑按钮
+            
+            
+            
+            //先清空窗口
+            this.clearToServe()
+            //打开输入窗口
+            this.openWindow();
+            //添加修改id
+            this.editId = id;
+            
+            //清除错误状态
+            // this.$refs.form.clearValidate();
+            
+            
+            // console.log("this.form.website_name==",this.form.website_name)
+            //获取网站详情=编辑弹出框要显示出这1条数据的内容
+            this.$store.dispatch('pool/detail_website_tag_actions',{id:id}).then(res=> {
+                  // console.log("res==",res)//
+                  
+                  this.form.website_name=res.data.name      //标识组名称
+                  // console.log("res.data.nameres.data.name",typeof(res.data.name))
+                  
+                  // console.log("res.data.web_ids===",typeof(res.data.web_ids),res.data.web_ids)
+                  const new_web_ids_str = res.data.web_ids.replace('[', '').replace(']', '')//
+                  const new_web_ids_arr = new_web_ids_str.split(",")  
+                  this.form.website_column_arr_id= new_web_ids_arr      //设置标识组
+                  
+                  // console.log("res.data.web_ids===",this.form.web_ids)
+                  
+                  
+                  //清除错误状态
+                  this.$refs.form.clearValidate();
+
+            return
+            //清除错误状态
+            console.log(res)
+            //回显网站名称
+            this.form.website_name = res.data.website_name;
+            //回显星系
+            this.form.website_column_arr_id = res.data.website_column_arr_id;
+            //回显logo
+            this.form.logo = res.data.logo;
+            this.logoUrl = res.data.logo;
+            //回显url
+            let that = this;
+            if(res.data.website_url==null){
+              //为null什么都不执行
+            }else{
+              for(let index in res.data.website_url){
+                this.form.website_url[index].url = res.data.website_url[index];
+                this.form.website_url[index].show = true;
+              }
+            }
+            //回显id
+            //存放城市id
+            this.form.city_arr_id = res.data.city_arr_id;
+            //当cascaderKey的值改变的时候 级联选择器会重置里面的内容
+            //this.cascaderKey += 1;
+            //回显网站标题，描述，关键词
+            // console.log(res.data.title,res.data.keywords,res.data.description)
+            this.form.title = res.data.title;
+            this.form.keywords = res.data.keywords;
+            this.form.description = res.data.description;
+            //回显模板信息
+            this.form.template_id = res.data.template_id;
+            this.TemplateName = res.data.template_name;
+            this.TemplateImg = JSON.parse(res.data.template_img)[0];
+          })
+    
+          this.editBtn = true;//显示编辑按钮
+        },
+
+
+        //5.2修改表单=== 编辑
+        editToServe(){//
+          //执行验证
+          this.$refs.form.validate(valid => {
+            if (valid) {
+              //提交之前把域名列表转换成数组
+              let webSiteArray = [];
+              for(let item of this.form.website_url){
+                if(item.url!=""){
+                  webSiteArray.push(item.url)
+                }
+              }
+              //循环完毕 重置提交的url
+              this.form.website_url = webSiteArray;
+              this.form.id = this.editId;
+              //提交表单
+              
+              this.tag_dorp_all_id_fun()//下拉所有ID
+              
+              
+              this.$store.dispatch('pool/edit_website_tag',{id:this.editId,name:this.form.website_name,web_ids:this.tag_dorp_all_id_str}).then(res=> {//updateWebsite  
+                        console.log("res==",res)
+                        console.log("res==",res.code)
+
+                   if(res.code !== 200){
+ 
+                              if(res.message == "网站标识重复"){
+                                          this.$message({
+                                                type: 'warning',
+                                                message: '网站名字已有不能重复！'
+                                          });
+                              }
+
+
+                        }else{
+                              
+                              //汇报结果
+                                    this.$message({
+                                          type: 'success',
+                                          message: '已成功修改网站信息！'
+                                    });
+                   }
+
+
+                //清空并退出
+                  this.closeWindow();
+                  //重新请求列表
+                  this.getData();
+              }).catch(() => {
+                this.$message({
+                  type: 'warning',
+                  message: '网络错误，请重试！'
+                });
+              })
+            }
+          }) 
+        },
+        //编辑旧网站 end ------------------------------------------------------------>
+    
+        //6.搭建网站 start ------------------------------------------------------------>
+        creatWebsite(id){
+          this.$router.push({ 
+            path: '/creatWebsite', 
+            query: {id:id} 
+          });
+        } 
+        //编辑旧网站 end ------------------------------------------------------------>
+      },
+      mounted(){
+        //1.获得初始数据
+        this.getData();
+        //2.获取所有网系
+        this.getwebsiteColumn();
+        //本地转换id为文字
+        //console.log(getLocationNameById("110000"))
+
+      //   console.log("this.website_column_arr==",this.website_column_arr)
+      }
+    }
+    </script>
+    
+    <style scoped lang="less">
+      /*表单特殊样式 start------------------------------------------------------------>*/
+      //1.1 模板表单
+      .webSite {
+        background:#f0f2f5;
+        width:200px;
+        height:300px;
+        line-height: 300px;
+        text-align: center;
+        margin:0 auto;
+      }
+      .webSiteTemplate {
+        display:flex;
+        .webSiteTitle {
+          width:120px;
+          line-height: 140px;
+          text-align: right;
+          padding-right:12px;
+          font-weight: bold;
+        }
+      }
+      .webSiteBtn {
+        padding:50px 0 0 0;
+        text-align:center;
+      }
+      .formLabelFloatBox {
+        position: relative;
+        .formLabeladdIcon {
+          position: absolute;
+          right:45px;
+          top:5px;
+          width:38px;
+          height:24px;
+        }
+        .formLabelDelIcon {
+          position: absolute;
+          right:5px;
+          top:5px;
+          width:38px;
+          height:24px;
+        }
+      }
+      .templateBox {
+        display: flex;
+        .templateListClass {
+          margin-right:20px;
+          .templateListClassItem {
+            width: 120px;
+            height: 38px;
+            text-align: center; 
+            line-height: 38px;
+            border:1px solid #E3E8FA;
+            background: #F5F7FB;
+            margin-bottom: 10px;
+            border-radius: 8px;
+            cursor: pointer;
+          }
+        }
+        .templateListBox {
+          box-sizing: border-box;
+          width: 100%;
+          display:flex;
+          flex-wrap:wrap;
+          .templateList {
+            margin-right:10px;
+            text-align: center;
+            font-size:12px;
+            margin-bottom: 10px;
+            border:1px solid #fff;
+            padding: 5px;
+            .templateImg {
+              width: 129px;
+              height:157px;
+              border-radius: 8px;
+              cursor: pointer;
+            }
+          }
+        }
+      }
+      
+      //1.1 模板分页
+      .pageNumBox {
+        text-align: center;
+        padding-top:20px;
+      }
+      .webSiteTemplateName {
+        margin-left: 10px;
+        line-height: 36px;
+      }
+      //1.2 模板缩略图
+      .webSiteTemplateImg {
+        width: 140px;
+        height: 140px;
+        cursor: pointer;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        border-radius: 12px;
+        border: 1px solid #E1E2E9;
+        .selectWebSiteTemplateImg {
+          width: 140px;
+          height: 140px;
+          border-radius: 12px;
+          display: block;
+          cursor: pointer;
+        }
+        .webSiteTemplateText {
+          color: #5570F1;
+          height: 36px;
+          line-height: 36px;
+          text-align: center;
+        }
+        img {
+          display: block;
+        }
+      }
+      /*表单样式 end------------------------------------------------------------>*/
+    
+      //执行v-deep穿透scope选择器 start------------------------------------------------------------>*/
+      ::v-deep .custom-form-item > .el-form-item__label {
+        line-height: 140px !important;
+      }
+      ::v-deep .custom-textarea .el-textarea__inner {
+        resize: none; /* 禁止用户拖拽调整大小 */
+      }
+      ::v-deep .custom-align-right .el-form-item__label {
+        text-align: right; /* 设置标签文字右对齐 */
+      }
+      //执行v-deep穿透scope选择器 end------------------------------------------------------------>*/
+
+ 
+       .tag_webSite_head_btn_box{overflow:hidden;}
+                  .tag_webSite_head_btn_box .searchTitle{opacity:0;}
+                  .tag_webSite_head_btn_box button{float:right; }
+                  .tag_webSite_head_btn_box button:nth-of-type(1){margin-left:10px; } 
+
+
+
+    </style>  
+    
+