From c85c70101b5a5a9c33a9b4ece28cb4289af61081 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Sun, 7 Apr 2024 19:49:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B1=85=E6=B0=91=E5=9B=BE=E8=B0=B1=E5=85=B3?=
 =?UTF-8?q?=E7=B3=BB=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/portrayal/jumin/cpts/graph.vue | 2 +-
 src/views/modules/portrayal/jumin/index.vue      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/portrayal/jumin/cpts/graph.vue b/src/views/modules/portrayal/jumin/cpts/graph.vue
index 8b05a5101..f3aa9760a 100644
--- a/src/views/modules/portrayal/jumin/cpts/graph.vue
+++ b/src/views/modules/portrayal/jumin/cpts/graph.vue
@@ -69,7 +69,7 @@ export default {
                 let familyList = data.map((item, index) => ({
                     'id': `N${index + 1}`,
                     'text': item.name,
-                    'innerHTML': `<div class="c-my-node${index == 0 ? '1' : '2'}  c-my-node-${item.type == 1?'home':index == 0 ? item.gender == 1 ? 'father' : 'mother' : item.houseHolderRel == '配偶' ? item.gender == '1' ? 'mother' : 'father' : item.houseHolderRel == '女儿' ? 'girl' : item.houseHolderRel == '儿子' ? 'gon' : item.houseHolderRel == '父亲' || item.houseHolderRel == '祖父母' ? item.gender == 1 ? 'grandpa' : 'grandma' : item.houseHolderRel == '母亲' ? 'grandma' : 'father'}"><div class="c-node-name${index == 0 ? '1' : '2'}" style="color:#000">${item.type == 1?`${item.name}`:item.name.length === 2 ?
+                    'innerHTML': `<div class="c-my-node${index == 0 ? '1' : '2'}  c-my-node-${item.type == 1?'home':item.gender==='1'?item.age>18&&item.age<60?'father':item.age<18?'son':'grandpa':item.gender === '2'?item.age>18&&item.age<60?'mother':item.age<18?'girl':'grandma':'father'}"><div class="c-node-name${index == 0 ? '1' : '2'}" style="color:#000">${item.type == 1?`${item.name}`:item.name.length === 2 ?
                         item.name.substring(0, 1) + '*' :
                         item.name.substring(0, 1) + '*' + item.name.substring(2)} ${item.age?`（${item.age}）岁`:''}</div></div>`,
                     'data':{id: item.id,type:item.type,name:item.name},
diff --git a/src/views/modules/portrayal/jumin/index.vue b/src/views/modules/portrayal/jumin/index.vue
index d69777d93..645d85409 100644
--- a/src/views/modules/portrayal/jumin/index.vue
+++ b/src/views/modules/portrayal/jumin/index.vue
@@ -3,7 +3,7 @@
     <div class="left">
       <div class="user">
         <div v-if="resiDetailObj.baseInfoDto">
-          <img :src="require(`@/assets/images/index/${familyStatus}.png`)" alt="" v-if="resiDetailObj.baseInfoDto.gender==='1'"/>
+          <img :src="require(`@/assets/images/index/${familyStatus}.png`)" alt="" />
         </div>
         <span v-if="resiDetailObj.baseInfoDto">
           {{ resiDetailObj.baseInfoDto.name }}（{{ resiDetailObj.baseInfoDto.age }}岁）</span