From 0f4392679255e576c606f169922710d47f89874d Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Tue, 31 Oct 2023 18:13:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E5=9C=B0=E5=9B=BE=E5=AE=9A?=
 =?UTF-8?q?=E4=BD=8D=EF=BC=8C=E4=B8=8D=E6=BB=A1=E6=84=8F=E4=BA=BA=E7=BE=A4?=
 =?UTF-8?q?=E6=B8=85=E5=8D=95=E8=B7=B3=E8=BD=AC=E5=B1=85=E6=B0=91=E7=94=BB?=
 =?UTF-8?q?=E5=83=8F=EF=BC=8C=E5=B1=85=E6=B0=91=E7=94=BB=E5=83=8F=E4=B8=BA?=
 =?UTF-8?q?0=E4=B8=8D=E6=98=BE=E7=A4=BA=E5=85=A8=E9=83=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/base/community/communityForm.vue  |  6 ++++-
 .../modules/portrayal/jumin/cpts/rightBto.vue | 26 -------------------
 .../portrayal/jumin/cpts/xiangshoufuwu.vue    |  6 ++---
 src/views/modules/portrayal/jumin/index.vue   |  4 +--
 .../modules/satisfaction/detail/index.vue     | 13 ++++++++--
 5 files changed, 20 insertions(+), 35 deletions(-)
 delete mode 100644 src/views/modules/portrayal/jumin/cpts/rightBto.vue

diff --git a/src/views/modules/base/community/communityForm.vue b/src/views/modules/base/community/communityForm.vue
index 87f73a6c9..64dd16dee 100644
--- a/src/views/modules/base/community/communityForm.vue
+++ b/src/views/modules/base/community/communityForm.vue
@@ -238,16 +238,20 @@ export default {
             let { latitude, longitude } = this.$store.state.user;
             this.formType = type
             if (row) {
-                console.log(row);
                 this.dataForm = JSON.parse(JSON.stringify(row))
                 this.dataForm.neighborHoodId = this.dataForm.id
                 this.neighborHoodId = this.dataForm.neighborHoodId
                 this.quartersType = this.dataForm.quartersType
                 this.propertyId = this.dataForm.propertyId
+                
             } else {
                 this.dataForm.latitude = latitude
                 this.dataForm.longitude = longitude
             }
+            if(!this.dataForm.latitude){
+                this.dataForm.latitude = latitude
+                this.dataForm.longitude = longitude
+            }
             // if (!map) {
             this.initMap(this.dataForm.latitude, this.dataForm.longitude);
             // } else {
diff --git a/src/views/modules/portrayal/jumin/cpts/rightBto.vue b/src/views/modules/portrayal/jumin/cpts/rightBto.vue
deleted file mode 100644
index 9338a3e49..000000000
--- a/src/views/modules/portrayal/jumin/cpts/rightBto.vue
+++ /dev/null
@@ -1,26 +0,0 @@
-<!-- 房屋模块用 -->
-<template>
-<div class=''>
-
-</div>
-</template>
-<!--  -->
-<script>
-export default{
-data(){
-return{};
-},
-//创建前
-created(){},
-//方法
-methods:{},
-//子组件注册
-components:{},
-//计算
-computed:{},
-//监听
-watch:{},
-}
-</script>
-<style lang="less" scoped>
-</style>
diff --git a/src/views/modules/portrayal/jumin/cpts/xiangshoufuwu.vue b/src/views/modules/portrayal/jumin/cpts/xiangshoufuwu.vue
index a157b029f..2f7329fb6 100644
--- a/src/views/modules/portrayal/jumin/cpts/xiangshoufuwu.vue
+++ b/src/views/modules/portrayal/jumin/cpts/xiangshoufuwu.vue
@@ -8,7 +8,7 @@
                   </el-row>
                 <div class="item-progress">
                     <b :style="{
-                        width: item.per + '%',
+                        width: (item.per == 'NaN'?0:item.per) + '%',
                     }"></b>
                 </div>
             </div>
@@ -61,11 +61,9 @@ export default {
                     let total =  res.data.reduce((sum, item) => sum + Number(item.classificationNum), 0);
                     res.data =  res.data.map(item => ({
                         ...item,
-                        per: (Number(item.classificationNum) / total * 100).toFixed(2)  // 保留两位小数
+                        per: (Number(item.classificationNum) / total * 100).toFixed(2)   // 保留两位小数
                     }));
                     this.list = res.data
-                    console.log( res.data);
-                 
                 });
         },
     },
diff --git a/src/views/modules/portrayal/jumin/index.vue b/src/views/modules/portrayal/jumin/index.vue
index bdb3bcbca..a31674cac 100644
--- a/src/views/modules/portrayal/jumin/index.vue
+++ b/src/views/modules/portrayal/jumin/index.vue
@@ -62,7 +62,7 @@ import { requestPost, requestGet } from '@/js/dai/request'
 import leftTop from "./cpts/leftTop";
 import leftBto from "./cpts/leftBto";
 import rightTop from "./cpts/rightTop";
-import rightBto from "./cpts/rightBto";
+// import rightBto from "./cpts/rightBto";
 import resiInfo from "@/views/modules/cpts/resi/info";
 import nextTick from "dai-js/tools/nextTick";
 import pointsRecord from "./cpts/pointsRecord";
@@ -98,7 +98,7 @@ export default {
         },
     },
     //子组件注册
-    components: { leftTop, leftBto, resiInfo, rightTop, pointsRecord, rightBto, xiangshoufuwu },
+    components: { leftTop, leftBto, resiInfo, rightTop, pointsRecord, xiangshoufuwu },
     //计算
     computed: {},
     //监听
diff --git a/src/views/modules/satisfaction/detail/index.vue b/src/views/modules/satisfaction/detail/index.vue
index c50818d19..d859307ca 100644
--- a/src/views/modules/satisfaction/detail/index.vue
+++ b/src/views/modules/satisfaction/detail/index.vue
@@ -323,8 +323,17 @@ export default {
 
         //查看
         async handleWatch(row) {
-            this.resiId = row.resiId;
-            this.showView = true;
+            // this.resiId = row.resiId;
+            // this.showView = true;
+            let { agencyId, gridId, gridName, gender, homeId, homeName, name, resiId } = row
+            this.$store.dispatch('saveData', { agencyId, gridId, gridName, gender, homeId, homeName, name, resiId });
+            this.$router.push({ name: 'jumin-huaxiang' });
+            this.$store.state.contentTabs = this.$store.state.contentTabs.map(item => {
+                if (item.name === "jumin-huaxiang") {
+                    return { ...item, title: name };
+                }
+                return item;
+            });
         },
 
         //标记风险