From a4aaccee8d5ee4fc1ea697b47d5239f8ca328e6b Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Fri, 12 Apr 2024 16:05:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=97=E8=A1=A8=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/base/nonIntResi/nonIntResi.vue    |  2 +-
 src/views/modules/base/resi.vue               | 29 +++++++++++++------
 src/views/modules/home/index.vue              | 21 ++++++++++----
 3 files changed, 36 insertions(+), 16 deletions(-)

diff --git a/src/views/modules/base/nonIntResi/nonIntResi.vue b/src/views/modules/base/nonIntResi/nonIntResi.vue
index c5b6082bb..bf5cbcf52 100644
--- a/src/views/modules/base/nonIntResi/nonIntResi.vue
+++ b/src/views/modules/base/nonIntResi/nonIntResi.vue
@@ -497,7 +497,7 @@ export default {
       const { data, code, msg } = await requestGet(url, {
         pageSize,
         pageNo,
-        resultScopeType: "nonIntegrity",
+        resultScopeType: this.$route.query.type || null,
         resiCategory: this.$route.query.resiCategory || null, //首页传参进来
         ...formData,
       });
diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index 263297e0d..88ffec066 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -444,10 +444,10 @@ export default {
         categoryKey: "resi_info",
       },
     });
-    this.handleSearchFrom();
+    // this.handleSearchFrom();
   },
   activated() {
-    this.handleSearchFrom();
+    // this.handleSearchFrom();
   },
   methods: {
     mouseOverNode(event) {
@@ -1179,19 +1179,30 @@ export default {
   watch: {
     $route: {
       handler: function (newVal, oldVal) {
-        // console.log(newVal, oldVal)
         if (newVal.name == "base-resi") {
           this.$nextTick(() => {
-            if (newVal.params.category) {
-              this.$refs.myResiSearch.form.categoryKey = [];
-              this.$refs.myResiSearch.form.categoryKey.push(
+            this.$refs.myResiSearch.form.attentionCrowds = [];
+              this.$refs.myResiSearch.form.healthStatus = [];
+              this.$refs.myResiSearch.form.specialCategoryCodes = [];
+              this.$refs.myResiSearch.form.partyFlag=null;
+            if (newVal.params.category === 'SPECIAL_SUPPORT_FLAG' ||newVal.params.category === 'SUBSISTENCE_ALLOWANCE_FLAG'|| newVal.params.category === 'VETERAN_FLAG'|| newVal.params.category === 'ENSURE_HOUSE_FLAG'|| newVal.params.category === 'OLD_PEOPLE_FLAG') {
+              this.$refs.myResiSearch.form.attentionCrowds.push(
                 newVal.params.category
               );
+            this.handleSearchFrom();
+            } else if(newVal.params.category === 'CHRONIC_DISEASE_FLAG' ||newVal.params.category === 'SERIOUS_ILLNESS_FLAG'||newVal.params.category === 'DISABILITY_FLAG'){
+              this.$refs.myResiSearch.form.healthStatus.push(
+                newVal.params.category
+              );
+            this.handleSearchFrom();
+            }else if(newVal.params.category === 'SPECIAL_CROWD_FLAG'){
+              this.$refs.myResiSearch.form.specialCategoryCodes = ["anzhibangjiao","shequjiaozheng","xidurenyuan","buliangqingshaonian","zhaoshizhaohuojingshenbing","xiejiaorenyuan"];
+            this.handleSearchFrom();
+            }else if(newVal.params.category === 'PARTY_FLAG'){
+              this.$refs.myResiSearch.form.partyFlag =1;
               this.handleSearchFrom();
-            } else {
-              // this.$refs.myResiSearch.form.categoryKey = []
-              // this.handleSearchFrom()
             }
+
           });
         }
       },
diff --git a/src/views/modules/home/index.vue b/src/views/modules/home/index.vue
index 727cf2129..d5f1bb9f1 100644
--- a/src/views/modules/home/index.vue
+++ b/src/views/modules/home/index.vue
@@ -161,17 +161,17 @@
             </el-table-column>
             <el-table-column  label="总人数" width="105"  align="center">
               <template slot-scope="scope">
-                  <span style="color:#006fd6">{{scope.row.total}}</span>
+                  <span style="color:#006fd6" @click="handelClickToResi(scope.row)">{{scope.row.total}}</span>
               </template>
             </el-table-column>
             <el-table-column  label="分类信息不完整数" align="center"  :show-overflow-tooltip="true">
               <template slot-scope="scope">
-                  <span style="color:#ff1200;cursor: pointer;"  @click="handelCLickJump(scope.row)">{{scope.row.nonIntegratedNum}}</span>
+                  <span style="color:#ff1200;cursor: pointer;"  @click="handelCLickJump(scope.row,'nonIntegrity')">{{scope.row.nonIntegratedNum}}</span>
               </template>
             </el-table-column>
             <el-table-column  label="更新负责人" :show-overflow-tooltip="true" align="center" v-if="showAll">
               <template slot-scope="scope">
-                  <span style="color:#ff1200;">{{scope.row.userName}}</span>
+                  <span style="color:#989898;">{{scope.row.userName}}</span>
               </template>
             </el-table-column>
             <el-table-column  label="更新周期" align="center" width="105">
@@ -181,7 +181,7 @@
             </el-table-column>
             <el-table-column label="更新人数" align="center" width="105">
               <template slot-scope="scope">
-                  <span style="color:#006fd6;">{{scope.row.updateResiNum}}</span><span style="color:#989898;">({{scope.row.updatePeriodName?scope.row.updatePeriodName:'--'}})</span>
+                  <span style="color:#006fd6;" @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>
@@ -489,7 +489,7 @@ export default {
       }
       this.getNoticeData()
     },
-
+   
     toNoticePage() {
       this.$router.push({
         path: "/main/home-notice",
@@ -590,11 +590,20 @@ export default {
         this.$message.error(msg);
       }
     },
-    handelCLickJump(e){
+    handelClickToResi(e){
+      this.$router.push({
+        name: "base-resi",
+        params: {
+          category: e.residentCategory,
+        },
+      });
+    },
+    handelCLickJump(e,type){
       this.$router.push({
             path: "/main/base-nonIntResi",
             query: {
               resiCategory: e.residentCategory,
+              type:type
             }
           });
     },