Merge branch '2024_2_25_cgq_admin_home' into dev

package.json

@@ -36,6 +36,7 @@
     "js-cookie": "2.2.0",
     "jsonlint": "1.6.3",
     "jszip": "3.2.1",
+    "lodash": "^4.17.21",
     "normalize.css": "7.0.0",
     "nprogress": "0.2.0",
     "path-to-regexp": "2.4.0",

src/views/news/creatNews.vue

@@ -32,15 +32,15 @@
 
 
           <div>
-            <div  v-if="creatNews_user_type==10000">
-            <el-form-item label="站点名称:" prop="cat_arr_id" class="custom-align-right">
+            <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-cascader :key="parentKey_2" v-model="form.cat_arr_id" placeholder="请选择要绑定的父级导航" :props="parentData_2" filterable clearable></el-cascader>
                   </el-form-item>  
                   
             </div>
@@ -427,6 +427,8 @@ export default {
         lazy: true,
         async lazyLoad (node, resolve) {
           const { level, data } = node;
+             
+
           if (data && data.children && data.children.length !== 0) {
             return resolve(node)
           }

src/views/role/components/userEnterprise.vue

@@ -4,7 +4,7 @@
       <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="所属角色2：" :label-width="formLabelWidth" prop="role_id" class="custom-align-right">
+          <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
@@ -159,7 +159,7 @@
           <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-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"
@@ -168,7 +168,7 @@
                 :value="item.value">
               </el-option>
             </el-select>
-          </el-form-item>
+          </el-form-item> -->
         </div>
       </el-form>
     </div>  

src/views/website/websiteTag.vue

@@ -232,7 +232,10 @@
     import tableTitle from './components/tableTitle';
     //引入公用样式
     import '@/styles/global.less';
-    
+
+//     vue防抖点击事件发送请求
+    import { debounce } from 'lodash';
+
     export default {
       components: {
         CityCascader, //城市级联选择器
@@ -747,10 +750,12 @@
           })
         },
 
+        //vue防抖点击事件发送请求
 
-
-
-
+        debouncedClick() {
+                  this.addToServe(); // 调用实际的点击处理函数
+        },
+ 
  
         //3.8 检测网站名称是否存在
         checkWebsiteName(name){
@@ -1003,9 +1008,22 @@
         //本地转换id为文字
         //console.log(getLocationNameById("110000"))
 
-      //   console.log("this.website_column_arr==",this.website_column_arr)
+       
+               
+
+      },
+
+      created(){
+
+            this.addToServe = debounce(this.addToServe, 200);
+
       }
+
     }
+
+
+
+
     </script>
     
     <style scoped lang="less">