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 @@ - - - - - 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 @@
@@ -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; + }); }, //标记风险