diff --git a/src/router/index.js b/src/router/index.js index a4c73427a..b4438d81e 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -128,16 +128,6 @@ export const moduleRoutes = { title: "", }, }, - { - path: "fangwu-huaxiang", - props: true, - name: "fangwu-huaxiang", - component: () => import("@/views/modules/portrayal/fangwu/index"), - meta: { - isTab: true, - title: "", - }, - }, { path: "loudong-huaxiang", props: true, diff --git a/src/views/modules/portrayal/fangwu/cpts/leftTop.vue b/src/views/modules/portrayal/fangwu/cpts/leftTop.vue deleted file mode 100644 index 4c9af268c..000000000 --- a/src/views/modules/portrayal/fangwu/cpts/leftTop.vue +++ /dev/null @@ -1,108 +0,0 @@ - - - - - diff --git a/src/views/modules/portrayal/fangwu/cpts/rightBto.vue b/src/views/modules/portrayal/fangwu/cpts/rightBto.vue deleted file mode 100644 index 181af5549..000000000 --- a/src/views/modules/portrayal/fangwu/cpts/rightBto.vue +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/src/views/modules/portrayal/fangwu/index.vue b/src/views/modules/portrayal/fangwu/index.vue deleted file mode 100644 index 3274a35fd..000000000 --- a/src/views/modules/portrayal/fangwu/index.vue +++ /dev/null @@ -1,118 +0,0 @@ - - - - diff --git a/src/views/modules/portrayal/house/cpts/graph.vue b/src/views/modules/portrayal/house/cpts/graph.vue index 69c0eed05..ed5bc882d 100644 --- a/src/views/modules/portrayal/house/cpts/graph.vue +++ b/src/views/modules/portrayal/house/cpts/graph.vue @@ -188,13 +188,15 @@ export default { margin-left: -5px; text-align: center; margin-top: 63px; - line-height: 20px; + // line-height: 20px; position: absolute; width: 96px; - height: 20px; + height: auto; background: #FFFFFF; box-shadow: 0px 4px 6px 0px rgba(211, 213, 214, 0.4); - border-radius: 10px; + border-radius: 15px; + padding: 3px; + box-sizing: border-box; } .rel-node-checked { diff --git a/src/views/modules/portrayal/house/index.vue b/src/views/modules/portrayal/house/index.vue index b6547f601..3fb426b37 100644 --- a/src/views/modules/portrayal/house/index.vue +++ b/src/views/modules/portrayal/house/index.vue @@ -43,9 +43,10 @@
家庭标签:
-
+
{{familyTags() }}
+
--
房主姓名:
diff --git a/src/views/modules/portrayal/jumin/index.vue b/src/views/modules/portrayal/jumin/index.vue index 3f39030aa..908865d82 100644 --- a/src/views/modules/portrayal/jumin/index.vue +++ b/src/views/modules/portrayal/jumin/index.vue @@ -2,7 +2,9 @@
- +
+ +
{{ resiDetailObj.baseInfoDto.name }}({{ resiDetailObj.baseInfoDto.age }}岁) @@ -1174,6 +1176,8 @@ export default { ensure_house: "保障房信息", chronic_disease: "慢病信息", base: "基本信息", + business_record:'业务记录', + update_record:'更新记录' }; this.menuList = Object.entries( res.data.data.integrityData.integrityQtyMap @@ -1484,7 +1488,29 @@ export default { return text; }, }, - computed: {}, + computed: { + familyStatus(){ + console.log(this.resiDetailObj.baseInfoDto.gender); + console.log(this.resiDetailObj.baseInfoDto.age ); + var status = ''; + if(this.resiDetailObj.baseInfoDto){ + if(this.resiDetailObj.baseInfoDto.gender =='1' && this.resiDetailObj.baseInfoDto.age <18){ + status = 'son' + }else if(this.resiDetailObj.baseInfoDto.gender =='1' && this.resiDetailObj.baseInfoDto.age >18 && this.resiDetailObj.baseInfoDto.age <60){ + status = 'father' + }else if(this.resiDetailObj.baseInfoDto.gender =='1' && this.resiDetailObj.baseInfoDto.age >=60){ + status = 'grandpa' + }else if(this.resiDetailObj.baseInfoDto.gender =='2' && this.resiDetailObj.baseInfoDto.age >=60){ + status = 'grandma' + }else if(this.resiDetailObj.baseInfoDto.gender =='2' && ( this.resiDetailObj.baseInfoDto.age >18 && this.resiDetailObj.baseInfoDto.age <60)){ + status = 'mother' + } else if(this.resiDetailObj.baseInfoDto.gender =='2' && this.resiDetailObj.baseInfoDto.age <18){ + status = 'girl' + } + } + return status + } + }, watch: { "$store.state.huaXiang.userInfo.resiId": { handler(newValue, oldValue) {