From dfdc77d9a3de498c62cc00b39c41d35b052c3779 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=98=AF=E5=B0=8F=E7=8E=8B=E5=91=80=5C24601?=
 <819653817@qq.com>
Date: Fri, 19 Apr 2024 16:06:12 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=B1=85=E6=B0=91=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dataBoard/overview/index.vue      |  4 +--
 src/views/modules/portrayal/jumin/index.vue | 36 ++++++++++++++++++---
 2 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/src/views/dataBoard/overview/index.vue b/src/views/dataBoard/overview/index.vue
index ef18bf3d3..a06eb7ed4 100644
--- a/src/views/dataBoard/overview/index.vue
+++ b/src/views/dataBoard/overview/index.vue
@@ -73,8 +73,8 @@
       -- bmysxqk = 不满意事项情况
       -- xqwwcqk = 需求未完成情况
     -->
-    <MapDialog v-if="isShowMapDialog" ref="MapDialog" :currentLevelData="currentLevelData" :type="mapType"
-               @close="isShowMapDialog = false"/>
+    <!-- <MapDialog v-if="isShowMapDialog" ref="MapDialog" :currentLevelData="currentLevelData" :type="mapType"
+               @close="isShowMapDialog = false"/> -->
     <cpt-loading v-show="false"/>
     <MapResourceInfo ref="MapResourceInfo" :currentLevelData="currentLevelData"/>
   </div>
diff --git a/src/views/modules/portrayal/jumin/index.vue b/src/views/modules/portrayal/jumin/index.vue
index f9619d9fa..03da1e86c 100644
--- a/src/views/modules/portrayal/jumin/index.vue
+++ b/src/views/modules/portrayal/jumin/index.vue
@@ -22,6 +22,7 @@
           <div
             :class="{ item: true, active: index == active }"
             v-for="(item, index) in menuList"
+            v-for="(item, index) in menuList" :key="index"
             @click="handelCLickMenu(item.id, index)"
           >
             <span>{{ item.name }}</span
@@ -1161,7 +1162,6 @@ export default {
               business_record:'业务记录',
               update_record:'更新记录'
             };
-          
             const keysWithValueOne = [];
             for (const key in this.resiDetailObj.baseInfoDto.categoryInfo) {
                 if (this.resiDetailObj.baseInfoDto.categoryInfo[key] === 1 && this.incidence[key]) {
@@ -1265,10 +1265,36 @@ export default {
           console.log(err);
         });
     },
-
-    handelClickJumpEdit() {
-      this.checkType = "edit";
-      this.showCheckPassword = true;
+    // async handleSaveTuomin1() {
+    //   const url = `/actual/base/residentBaseInfo/getResiUserInfo/${this.resiId}`;
+    //   let parm = {
+    //     password,
+    //   };
+    //   const { data, code, msg } = await requestPost(url, parm);
+    // },
+   async  handelClickJumpEdit() {
+    console.log(this)
+      const url = `/actual/base/residentCategoryUpdateInfo/isUpdater/${this.resiId}`;
+      const { data, code, msg } = await requestPost(url);
+      console.log(this.form.password)
+      console.log(data, code, msg)
+      if(code==0){
+        
+          if(data==false){
+            this.$router.push({
+            name: "edit-resi",
+            
+          });
+          }
+          else{
+            this.checkType = "edit";
+            this.showCheckPassword = true;
+          }
+      }
+      else{
+        this.$message.error(msg);
+      }
+   
     },
     async getDictName(url, params, value, itemType, opction) {
       try {

From 26d6d9b5ae1256e91e9693287bfbc923a8d0e80c Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Fri, 19 Apr 2024 17:12:36 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=AF=86=E7=A0=81=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/base/resi.vue             | 39 ++++++++++++++-------
 src/views/modules/portrayal/jumin/index.vue | 13 ++-----
 2 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index 763a14985..2130fb430 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -968,16 +968,36 @@ export default {
         }
       );
     },
-    handelCLickShowCheckPassword(row) {
-      this.editUserId = row.resiId;
-      this.showCheckPassword = true;
+    async handelCLickShowCheckPassword(row) {
+      const url = `/actual/base/residentCategoryUpdateInfo/isUpdater/${row.resiId}`;
+      const { data, code, msg } = await requestPost(url);
+      if(code==0){
+          if(data==true){
+            this.editUserId = row.resiId;
+            this.saveCheckPassword()
+          }
+          else{
+            this.editUserId = row.resiId;
+            this.showCheckPassword = true;
+          }
+      }
+      else{
+        this.$message.error(msg);
+      }
     },
     handelClickCheckPassword() {
-      this.$refs.checkPasswordFrom.validate(async (vali) => {
+      this.$refs.checkPasswordFrom.validate((vali) => {
         if (vali) {
-          const url = `/actual/base/residentBaseInfo/getResiUserInfo/${this.editUserId}`;
+          this.saveCheckPassword(this.checkPasswordFrom.password);
+        } else {
+          return false;
+        }
+      });
+    },
+    async saveCheckPassword(password){
+      const url = `/actual/base/residentBaseInfo/getResiUserInfo/${this.editUserId}`;
           let parm = {
-            password: this.checkPasswordFrom.password,
+            password,
           };
           const { data, code, msg } = await requestPost(url, parm);
           if (code === 0) {
@@ -991,12 +1011,7 @@ export default {
           } else {
             this.$message.error(msg);
           }
-        } else {
-          return false;
-        }
-      });
     },
-
      handleAdd() {
       this.$router.push({ name: "add-resi" });
     },
@@ -1177,7 +1192,7 @@ export default {
   watch: {
     $route: {
       handler: function (newVal, oldVal) {
-        if (newVal.name == "base-resi") {
+        if (newVal.name == "base-resi" && oldVal.name!='edit-resi') {
           this.$nextTick(() => {
             this.$refs.myResiSearch.form.attentionCrowds = [];
               this.$refs.myResiSearch.form.healthStatus = [];
diff --git a/src/views/modules/portrayal/jumin/index.vue b/src/views/modules/portrayal/jumin/index.vue
index 03da1e86c..d373b1a77 100644
--- a/src/views/modules/portrayal/jumin/index.vue
+++ b/src/views/modules/portrayal/jumin/index.vue
@@ -21,7 +21,6 @@
         <div class="list">
           <div
             :class="{ item: true, active: index == active }"
-            v-for="(item, index) in menuList"
             v-for="(item, index) in menuList" :key="index"
             @click="handelCLickMenu(item.id, index)"
           >
@@ -1273,18 +1272,11 @@ export default {
     //   const { data, code, msg } = await requestPost(url, parm);
     // },
    async  handelClickJumpEdit() {
-    console.log(this)
       const url = `/actual/base/residentCategoryUpdateInfo/isUpdater/${this.resiId}`;
       const { data, code, msg } = await requestPost(url);
-      console.log(this.form.password)
-      console.log(data, code, msg)
       if(code==0){
-        
-          if(data==false){
-            this.$router.push({
-            name: "edit-resi",
-            
-          });
+          if(data==true){
+            this.handleSaveTuomin()
           }
           else{
             this.checkType = "edit";
@@ -1294,7 +1286,6 @@ export default {
       else{
         this.$message.error(msg);
       }
-   
     },
     async getDictName(url, params, value, itemType, opction) {
       try {