Merge branch '1206' into dev

src/views/dataBoard/renfang/index.vue

@@ -592,8 +592,14 @@ export default {
 
     handleClickDotBtn(type, info) {
       if (type == "watch-resi") {
-        this.displayedResiId = info.user_id;
-        this.popupShow = true
+        this.$router.push({
+          path: "/dataBoard/renfang/resident",
+          query: {
+            user_id: info.user_id,
+          },
+        });
+        // this.displayedResiId = info.user_id;
+        // this.popupShow = true
       } else if (type == "watch-house") {
         this.displayedHouseId = info.house_id;
       }