Merge branch 'bug_mk' into dev

src/views/modules/portrayal/house/cpts/graph.vue

@@ -81,7 +81,7 @@ export default {
                 let lineList = data.map((item, index) => ({
                     'from': 'N1',
                     'to': `N${index + 1}`,
-                    'text':item.type ==1?'未知':data[index].houseHolderRel || '未知',
+                    'text':item.resiHouseRel ===null?'未知':item.resiHouseRel ==='0'?'自住':item.resiHouseRel === '1'?'出租':'未知',
                     'isHideArrow': true,
                     'color': item.houseHolderRel === '父亲' ? '#3876f2' : (item.houseHolderRel === '母亲' || item.houseHolderRel === '祖父母' ? '#ff9696' : (item.houseHolderRel === '女儿' ? '#ffd5d5' : '#3876f2')),
                     'fontColor': item.houseHolderRel === '父亲' ? '#3876f2' : (item.houseHolderRel === '母亲' || item.houseHolderRel === '祖父母' ? '#ff9696' : (item.houseHolderRel === '女儿' ? '#ffd5d5' : '#3876f2'))