修改

src/views/accountGroupManagement/components/accountGroupHome.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2022-01-08 09:27:43
- * @LastEditTime: 2022-03-17 09:46:23
+ * @LastEditTime: 2022-03-18 11:37:15
  * @LastEditors: your name
  * @Description: 用户组管理
  * @FilePath: \Foshan4A2.0\src\views\accountGroupManagement\components\home.vue
@@ -441,10 +441,16 @@ export default {
     },
     // 查询
     getSearchData(val) {
+      if (val) {
+        this.$router.replace({ path: '/accountGroup', query: { keyWords: val } })
+      } else if (this.$route.query) {
+        this.$router.replace('/accountGroup')
+      }
       this.$refs.tree.filter(val)
     },
     // 清除查询
     clearSearchData() {
+      this.$router.replace('/accountGroup')
       this.getGroupTree()
     },
     // 节点关闭按钮点击

src/views/authorityManagement/components/authorityHome.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-11-29 09:27:43
- * @LastEditTime: 2022-03-16 21:47:12
+ * @LastEditTime: 2022-03-18 11:29:32
  * @LastEditors: your name
  * @Description: 权限管理
  * @FilePath: \Foshan4A2.0\src\views\authorityManagement\components\home.vue
@@ -269,11 +269,17 @@ export default {
     },
     //查询
     getSearchData (val) {
+      if (val) {
+        this.$router.replace({ path: '/authority', query: { keyWords: val } })
+      } else if (this.$route.query) {
+        this.$router.replace('/authority')
+      }
       this.$refs.tree.filter(val);
       // this.getAuthTree(val)
     },
     //清除查询
     clearSearchData () {
+      this.$router.replace('/authority')
       this.getAuthTree()
     },
     //节点关闭按钮点击

src/views/authorityManagement/components/authorityRoleHome.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: your name
  * @Date: 2021-11-29 14:37:54
- * @LastEditTime: 2022-02-28 16:34:48
- * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2022-03-18 10:41:39
+ * @LastEditors: your name
  * @Description: 角色管理
  * @FilePath: \Foshan4A2.0\src\views\authorityManagement\components\authorityRole.vue
 -->
@@ -19,9 +19,9 @@
       </Search>
     </div>
     <!--列表-->
-    <div class="role-content scrollbar infinite-list-wrapper">
-      <template v-if="arrs.length">
-        <el-row v-infinite-scroll="load" :infinite-scroll-distance="20" infinite-scroll-disabled="disabled" :gutter="24">
+    <template v-if="arrs.length">
+      <div class="role-content scrollbar infinite-list-wrapper"  v-infinite-scroll="load" :infinite-scroll-distance="20" infinite-scroll-disabled="disabled">
+        <el-row :gutter="24">
           <el-col v-for="(item,index) in arrs" class="account-left-content-teams" :lg="{ span:'5-5' }" :key="index">
             <div class="team">
               <div :class="'status'+ item.IsDef" class="bg"></div>
@@ -62,11 +62,11 @@
           <p class="center" v-if="loading">加载中...</p>
           <p class="center" v-if="noMore">没有更多数据了~</p>
         </template>
-      </template>
-      <template v-else>
-        <el-empty description="暂无数据"></el-empty>
-      </template>
-    </div>
+      </div>
+    </template>
+    <template v-else>
+      <el-empty description="暂无数据"></el-empty>
+    </template>
     <!--删除弹框-->
     <Dialog :flag="flag">
       <div class="airportInfoDialog">
@@ -148,6 +148,11 @@ export default {
     },
     //查询
     getSearchData (val) {
+      if (val) {
+        this.$router.replace({ path: '/role', query: { keyWords: val } })
+      } else if (this.$route.query) {
+        this.$router.replace('/role')
+      }
       this.arrs = []
       this.dataList = []
       this.pageNum = 1
@@ -160,12 +165,10 @@ export default {
     },
     //清除查询
     clearSearchData () {
+      this.$router.replace('/role')
       this.arrs = []
       this.dataList = []
       this.pageNum = 1
-      if (this.keyWords) {
-        this.$router.push({ path: '/role', query: { keyWords: '' } })
-      }
       this.keyWords = ''
       this.gueryRole({
         QueryName: this.keyWords,
@@ -247,6 +250,9 @@ export default {
   height: 72vh;
   overflow-y: auto;
   overflow-x: hidden;
+  > p {
+    margin: 0;
+  }
   .el-col-lg-5-5 {
     width: 20%;
   }

src/views/dashboard/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-10-14 17:17:53
- * @LastEditTime: 2022-03-16 14:50:22
+ * @LastEditTime: 2022-03-18 10:48:14
  * @LastEditors: your name
  * @Description: In User Settings Edit
  * @FilePath: \Foshan4A\src\views\dashboard\index.vue
@@ -140,7 +140,7 @@ export default {
     //搜索-跳转
     searchByLink () {
       const url = this.select
-      this.$router.push({ path: url, query: { keyWords: this.input } });
+      this.input ? this.$router.push({ path: url, query: { keyWords: this.input } }) : this.$router.push(url)
     },
     //获取接入系统信息
     async getOthSystem () {

src/views/organizationManagement/components/organizationHome.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-11-29 09:27:43
- * @LastEditTime: 2022-03-17 15:07:38
+ * @LastEditTime: 2022-03-18 11:36:50
  * @LastEditors: your name
  * @Description: 权限管理
  * @FilePath: \Foshan4A2.0\src\views\authorityManagement\components\home.vue
@@ -319,10 +319,16 @@ export default {
     },
     //查询
     getSearchData (val) {
+      if (val) {
+        this.$router.replace({ path: '/organization', query: { keyWords: val } })
+      } else if (this.$route.query) {
+        this.$router.replace('/organization')
+      }
       this.$refs.tree.filter(val);
     },
     //清除查询
     clearSearchData () {
+      this.$router.replace('/organization')
       this.getOrganTree();
     },
     //节点关闭按钮点击

src/views/staffManagement/compontents/staffHome.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-11-29 14:37:54
- * @LastEditTime: 2022-03-18 09:20:57
+ * @LastEditTime: 2022-03-18 10:27:34
  * @LastEditors: your name
  * @Description: 角色管理
  * @FilePath: \Foshan4A2.0\src\views\authorityManagement\components\authorityRole.vue
@@ -15,58 +15,60 @@
       </Search>
     </div>
     <!--列表-->
-    <div class="role-content">
-      <template v-if="arrs.length">
-        <el-row class="scrollbar" v-infinite-scroll="load" :infinite-scroll-distance="20" infinite-scroll-disabled="disabled" :gutter="24">
-          <el-col :span="6" v-for="(item,index) in arrs" class="account-left-content-teams" :key="index">
-            <div class="team">
-              <div class="list">
-                <div class="flex info">
-                  <div class="info-avoutr">
-                    <div class="msg flex-wrap">
-                      <p :title="item.OfficerName" class="name">{{item.OfficerName}}</p>
-                      <div v-is="['officerlist_btn_edit']" @click="editRole(item)" class="cap cap-edit"></div>
+    <template v-if="arrs.length">
+      <div class="role-content">
+        <div class="scrollbar"  v-infinite-scroll="load" :infinite-scroll-distance="20" infinite-scroll-disabled="disabled">
+          <el-row :gutter="24">
+            <el-col :span="6" v-for="(item,index) in arrs" class="account-left-content-teams" :key="index">
+              <div class="team">
+                <div class="list">
+                  <div class="flex info">
+                    <div class="info-avoutr">
+                      <div class="msg flex-wrap">
+                        <p :title="item.OfficerName" class="name">{{item.OfficerName}}</p>
+                        <div v-is="['officerlist_btn_edit']" @click="editRole(item)" class="cap cap-edit"></div>
+                      </div>
+                    </div>
+                    <div v-is="['officerlist_btn_del_officer']" class="info-close">
+                      <i @click="checkRemove(item,index)" class="icon el-icon-close"></i>
                     </div>
                   </div>
-                  <div v-is="['officerlist_btn_del_officer']" class="info-close">
-                    <i @click="checkRemove(item,index)" class="icon el-icon-close"></i>
+                  <template v-if="doesJobShow">
+                    <div class="flex ip">
+                      <div class="time-info flex1">职务名称：<span :title="item.JobName" class="glr">{{item.JobName ? item.JobName : '暂无'}}</span></div>
+                      <!-- <div class="ip-info flex1">是否有副岗：<span class="glr">{{item.HasDepJob == 1 ? '是':'否'}}</span></div> -->
+                    </div>
+                  </template>
+                  <div class="flex time">
+                    <div class="time-msg flex1">所属组织：<span :title="item.OrganName" class="glr">{{item.OrganName}}</span></div>
                   </div>
-                </div>
-                <template v-if="doesJobShow">
                   <div class="flex ip">
-                    <div class="time-info flex1">职务名称：<span :title="item.JobName" class="glr">{{item.JobName ? item.JobName : '暂无'}}</span></div>
-                    <!-- <div class="ip-info flex1">是否有副岗：<span class="glr">{{item.HasDepJob == 1 ? '是':'否'}}</span></div> -->
+                    <div class="ip-msg flex1">登录名：<span :title="item.LoginName" class="glr">{{item.LoginName}}</span></div>
+                    <div style="margin-right:20px;" class="power">权限：<span class="glr">{{item.AuthCount}}</span></div>
                   </div>
-                </template>
-                <div class="flex time">
-                  <div class="time-msg flex1">所属组织：<span :title="item.OrganName" class="glr">{{item.OrganName}}</span></div>
-                </div>
-                <div class="flex ip">
-                  <div class="ip-msg flex1">登录名：<span :title="item.LoginName" class="glr">{{item.LoginName}}</span></div>
-                  <div style="margin-right:20px;" class="power">权限：<span class="glr">{{item.AuthCount}}</span></div>
-                </div>
-                <div class="flex details">
-                  <div class="details-msg">
-                    状态：<span :class="item.Status == 1 ? 'success' : 'error'">{{item.Status == 1 ? '启用' : '停用'}}</span>
-                  </div>
-                  <div v-is="['officerlist_btn_state_swatch']" class="details-info">
-                    <el-switch v-model="item.isauto" @change="handleChange(item)" active-color="#6F81BC">
-                    </el-switch>
+                  <div class="flex details">
+                    <div class="details-msg">
+                      状态：<span :class="item.Status == 1 ? 'success' : 'error'">{{item.Status == 1 ? '启用' : '停用'}}</span>
+                    </div>
+                    <div v-is="['officerlist_btn_state_swatch']" class="details-info">
+                      <el-switch v-model="item.isauto" @change="handleChange(item)" active-color="#6F81BC">
+                      </el-switch>
+                    </div>
                   </div>
                 </div>
               </div>
-            </div>
-          </el-col>
-        </el-row>
-        <template v-if="total > 1">
-          <p class="center" v-if="loading">加载中...</p>
-          <p class="center" v-if="noMore">没有更多数据了~</p>
-        </template>
-      </template>
-      <template v-else>
-        <el-empty description="暂无数据"></el-empty>
-      </template>
-    </div>
+            </el-col>
+          </el-row>
+          <template v-if="total > 1">
+            <p class="center" v-if="loading">加载中...</p>
+            <p class="center" v-if="noMore">没有更多数据了~</p>
+          </template>
+        </div>
+      </div>
+    </template>
+    <template v-else>
+      <el-empty description="暂无数据"></el-empty>
+    </template>
     <!--删除弹框-->
     <Dialog :flag="flag">
       <div class="airportInfoDialog">
@@ -146,6 +148,7 @@ export default {
             return item
           })
           this.arrs = datas
+          this.pageNum = this.total = Math.ceil(datas.length / this.PageSize)
         } else {
           this.$message.error(res.message)
         }
@@ -174,7 +177,9 @@ export default {
     },
     //查询
     getSearchData (val) {
-      if (this.$route.query) {
+      if (val) {
+        this.$router.replace({ path: '/staff', query: { keyWords: val } })
+      } else if (this.$route.query) {
         this.$router.replace('/staff')
       }
       this.arrs = []
@@ -189,6 +194,7 @@ export default {
     },
     //清除查询
     clearSearchData () {
+      this.$router.replace('/staff')
       this.arrs = []
       this.dataList = []
       this.pageNum = 1
@@ -284,9 +290,9 @@ export default {
     height: 100%;
     overflow-y: auto;
     overflow-x: hidden;
-  }
-  > p {
-    margin: 0;
+    > p {
+      margin: 0;
+    }
   }
   .el-col-lg-5-5 {
     width: 20%;