diff --git a/src/views/components/resiSearch.vue b/src/views/components/resiSearch.vue
index 384bd702a..c5508e8c0 100644
--- a/src/views/components/resiSearch.vue
+++ b/src/views/components/resiSearch.vue
@@ -601,7 +601,7 @@ export default {
       form: {
         name: '',
         mobile: '',
-        // careerStatus:'',
+        updateCategory:'',
         satisfactionNum:null,
         idNum: '',
         birthdayStart: '',
diff --git a/src/views/components/selectStaff.vue b/src/views/components/selectStaff.vue
index 09747b596..95b6dd06e 100644
--- a/src/views/components/selectStaff.vue
+++ b/src/views/components/selectStaff.vue
@@ -655,7 +655,7 @@ export default {
       } else {
         let succ = false;
         dItem.gridStaffList.forEach((item) => {
-          if (item.roleName == "网格长") {
+          if (item.roleName == "网格员") {
             item.selected = true;
             succ = true;
           } else {
@@ -663,7 +663,7 @@ export default {
           }
         });
         if (!succ) {
-          return this.$message.error(dItem.gridName + "下无【网格长】");
+          return this.$message.error(dItem.gridName + "下无【网格员】");
         } else {
           dItem.selected = true;
         }
diff --git a/src/views/dataBoard/organizational/jwTree/index.vue b/src/views/dataBoard/organizational/jwTree/index.vue
index 9d89ecbf6..2dcec8ce8 100644
--- a/src/views/dataBoard/organizational/jwTree/index.vue
+++ b/src/views/dataBoard/organizational/jwTree/index.vue
@@ -138,7 +138,7 @@ export default {
         ["district", "区委"],
         ["street", "乡(镇、街道)"],
         ["community", "社区"],
-        ["grid_manager", "网格长"],
+        ["grid_manager", "网格员"],
         ["building_chief", "楼组长"],
         ["unit_chief", "单元长"],
         ["public_welfare_post", "志愿者"],
diff --git a/src/views/modules/base/classification/index.vue b/src/views/modules/base/classification/index.vue
index 7f869d03e..f55b29908 100644
--- a/src/views/modules/base/classification/index.vue
+++ b/src/views/modules/base/classification/index.vue
@@ -314,7 +314,7 @@
                                     <div class="item_row1"  @click="handelClickToResi('LBC_FLAG')">
                                         <div class="row_left">留守儿童</div>
                                         <div class="row_right">
-                                            <div class="text">{{ categoryList.lbcFlagCount || '--' }}</div>
+                                            <div class="text">{{ categoryList.lbcFlagCount || 0 }}</div>
                                             <img src="@/assets/images/category/Enter.png" class="img" />
                                         </div>
 
@@ -322,7 +322,7 @@
                                     <div class="item_row2"  @click="handelClickTovirtualResi('LBC_FLAG')">
                                         <div class="row_left">留守儿童(虚拟网格)</div>
                                         <div class="row_right">
-                                            <div class="text">{{ categoryList.lbcFlagVirtualCount || '--' }}</div>
+                                            <div class="text">{{ categoryList.lbcFlagVirtualCount || 0 }}</div>
                                             <img src="@/assets/images/category/Enter.png" class="img" />
                                         </div>
                                     </div>
@@ -337,7 +337,7 @@
                                     <div class="item_row1"  @click="handelClickToResi('AIDS_FLAG')">
                                         <div class="row_left">艾滋病人员</div>
                                         <div class="row_right">
-                                            <div class="text">{{ categoryList.aidsFlagCount || '--' }}</div>
+                                            <div class="text">{{ categoryList.aidsFlagCount || 0 }}</div>
                                             <img src="@/assets/images/category/Enter.png" class="img" />
                                         </div>
 
@@ -345,7 +345,7 @@
                                     <div class="item_row2"  @click="handelClickTovirtualResi('AIDS_FLAG')">
                                         <div class="row_left">艾滋病人员(虚拟网格)</div>
                                         <div class="row_right">
-                                            <div class="text">{{ categoryList.aidsFlagVirtualCount || '--' }}</div>
+                                            <div class="text">{{ categoryList.aidsFlagVirtualCount || 0 }}</div>
                                             <img src="@/assets/images/category/Enter.png" class="img" />
                                         </div>
                                     </div>
@@ -405,7 +405,7 @@
                                     <div class="item_row1"  @click="handelClickToResi('NEG_FLAG')">
                                         <div class="row_left">新就业群体</div>
                                         <div class="row_right">
-                                            <div class="text">{{ categoryList.negFlagCount || '--' }}</div>
+                                            <div class="text">{{ categoryList.negFlagCount || 0 }}</div>
                                             <img src="@/assets/images/category/Enter.png" class="img" />
                                         </div>
 
@@ -413,7 +413,7 @@
                                     <div class="item_row2"  @click="handelClickTovirtualResi('NEG_FLAG')">
                                         <div class="row_left">新就业群体(虚拟网格)</div>
                                         <div class="row_right">
-                                            <div class="text">{{ categoryList.negFlagVirtualCount || '--' }}</div>
+                                            <div class="text">{{ categoryList.negFlagVirtualCount || 0 }}</div>
                                             <img src="@/assets/images/category/Enter.png" class="img" />
                                         </div>
                                     </div>
@@ -632,17 +632,17 @@
                                 <img src="@/assets/images/category/GRID_MANAGER_FLAG.png" alt />
                                 <div class="item_content">
                                     <div class="item_row1"  @click="handelClickToResi('GRID_MANAGER_FLAG')">
-                                        <div class="row_left">网格长</div>
+                                        <div class="row_left">网格员</div>
                                         <div class="row_right">
-                                            <div class="text">{{ categoryList.gridManagerFlagCount || '--' }}</div>
+                                            <div class="text">{{ categoryList.gridManagerFlagCount || 0 }}</div>
                                             <img src="@/assets/images/category/Enter.png" class="img" />
                                         </div>
 
                                     </div>
                                     <div class="item_row2"  @click="handelClickTovirtualResi('GRID_MANAGER_FLAG')">
-                                        <div class="row_left">网格长(虚拟网格)</div>
+                                        <div class="row_left">网格员(虚拟网格)</div>
                                         <div class="row_right">
-                                            <div class="text">{{ categoryList.gridManagerFlagVirtualCount || '--' }}</div>
+                                            <div class="text">{{ categoryList.gridManagerFlagVirtualCount || 0 }}</div>
                                             <img src="@/assets/images/category/Enter.png" class="img" />
                                         </div>
                                     </div>
diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index bbbcd3254..a4e97e3c2 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -1227,7 +1227,16 @@ export default {
   watch: {
     $route: {
       handler: function (newVal, oldVal) {
-        if (newVal.name == "base-resi" && (!oldVal ||oldVal.name === 'home'||oldVal.name === 'base-classification'||oldVal.name === 'home-notice')) {
+        if((newVal.name == "base-resi" || oldVal.name === 'home') && newVal.query.type){
+          this.$nextTick(()=>{
+            this.$refs.myResiSearch.form.updateCategory = newVal.query.category;
+            this.handleSearchFrom();
+          })
+          return
+        }else{
+          this.$refs.myResiSearch.form.updateCategory ='';
+        }
+        if (newVal.name == "base-resi" && (oldVal.name === 'home'||oldVal.name === 'base-classification'||oldVal.name === 'home-notice')) {
           this.$nextTick(() => {
               this.$refs.myResiSearch.form.attentionCrowds = [];
               this.$refs.myResiSearch.form.healthStatus = [];
diff --git a/src/views/modules/home/index.vue b/src/views/modules/home/index.vue
index 7d633ea8f..34142f844 100644
--- a/src/views/modules/home/index.vue
+++ b/src/views/modules/home/index.vue
@@ -179,7 +179,7 @@
             </el-table-column>
             <el-table-column label="更新人数" align="center" width="105">
               <template slot-scope="scope">
-                  <span style="color:#006fd6;" @click="handelCLickJump(scope.row,'updateResiList')">{{scope.row.updateResiNum}}</span><span style="color:#989898;">({{scope.row.updatePeriodName?scope.row.updatePeriodName:'--'}})</span>
+                  <span style="color:#006fd6;cursor: pointer;" @click="handelCLickJump(scope.row,'updateResiList')">{{scope.row.updateResiNum}}</span><span style="color:#989898;">({{scope.row.updatePeriodName?scope.row.updatePeriodName:'--'}})</span>
               </template>
             </el-table-column>
           </el-table>
@@ -628,10 +628,10 @@ export default {
     },
     handelCLickJump(e,type){
       this.$router.push({
-            path: "/main/base-nonIntResi",
+            path: "base-resi",
             query: {
-              resiCategory: e.residentCategory,
-              type:type
+              category: e.residentCategory,
+              type:'updateResi'
             }
           });
     },
diff --git a/src/views/modules/productConfig/autoTest/autoTestList copy.vue b/src/views/modules/productConfig/autoTest/autoTestList copy.vue
index afabe834b..b8b563bc8 100644
--- a/src/views/modules/productConfig/autoTest/autoTestList copy.vue	
+++ b/src/views/modules/productConfig/autoTest/autoTestList copy.vue	
@@ -29,7 +29,7 @@
                              header-align="center"
                              min-width="130"></el-table-column>
             <el-table-column prop="dangjian"
-                             label="工作人员（党建+管理员+网格长）"
+                             label="工作人员（党建+管理员+网格员）"
                              header-align="center"
                              align="center"
                              min-width="110">
diff --git a/src/views/modules/productConfig/autoTest/autoTestList.vue b/src/views/modules/productConfig/autoTest/autoTestList.vue
index f7d0fd7ff..bf7c01fef 100644
--- a/src/views/modules/productConfig/autoTest/autoTestList.vue
+++ b/src/views/modules/productConfig/autoTest/autoTestList.vue
@@ -20,7 +20,7 @@
                          header-align="center"
                          min-width="140"></el-table-column>
         <el-table-column prop="dangjian"
-                         label="工作人员（党建+管理员+网格长）"
+                         label="工作人员（党建+管理员+网格员）"
                          header-align="center"
                          align="center"
                          min-width="120">
@@ -326,7 +326,7 @@ export default {
                       "type": "grid",
                       "staffList": [
                         {
-                          "name": "W1网格长",
+                          "name": "W1网格员",
                           "mobile": "13000000005"
                         }
                       ],
@@ -360,7 +360,7 @@ export default {
                       "type": "grid",
                       "staffList": [
                         {
-                          "name": "W2网格长",
+                          "name": "W2网格员",
                           "mobile": "13000000005"
                         }
                       ],
diff --git a/src/views/modules/productConfig/topicConfig/TopicConfig copy.vue b/src/views/modules/productConfig/topicConfig/TopicConfig copy.vue
index 03b47f542..2821c750d 100644
--- a/src/views/modules/productConfig/topicConfig/TopicConfig copy.vue	
+++ b/src/views/modules/productConfig/topicConfig/TopicConfig copy.vue	
@@ -191,7 +191,7 @@ export default {
           "projectList": [
             {
               "personId": "J1-S1-W1",
-              "personName": "J1-S1-W1网格长",
+              "personName": "J1-S1-W1网格员",
               "answer": "此问题的确存在，会尽快解决",
               "reply": "希望工作人员可以帮助解决"
             },
diff --git a/src/views/modules/productConfig/topicConfig/TopicConfig.vue b/src/views/modules/productConfig/topicConfig/TopicConfig.vue
index b840a7d6c..ea72f1045 100644
--- a/src/views/modules/productConfig/topicConfig/TopicConfig.vue
+++ b/src/views/modules/productConfig/topicConfig/TopicConfig.vue
@@ -338,7 +338,7 @@ export default {
         "isToProject": "1",
         "localLevel": {
           "staffId": "J1-S1-W1",
-          "staffName": "J1-S1-W1网格长",
+          "staffName": "J1-S1-W1网格员",
           "answer": "此问题的确存在，会尽快解决",
           "reply": "希望工作人员可以帮助解决"
         },