From 1bdb14c0d8ed9bc0d39344921fc87e00682c18d9 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Fri, 12 Apr 2024 14:16:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=B1=E7=8A=B6=E5=9B=BE=E6=96=87=E5=AD=97?=
 =?UTF-8?q?=E6=97=8B=E8=BD=AC,=E5=B1=85=E6=B0=91=E7=94=BB=E5=83=8F?=
 =?UTF-8?q?=E5=A7=93=E5=90=8D,=E6=88=BF=E5=B1=8B=E7=94=BB=E5=83=8F?=
 =?UTF-8?q?=E5=A4=B4=E5=83=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/home/index.vue                 | 5 ++++-
 src/views/modules/portrayal/house/cpts/graph.vue | 6 ++----
 src/views/modules/portrayal/jumin/cpts/graph.vue | 4 +---
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/views/modules/home/index.vue b/src/views/modules/home/index.vue
index 562fa9533..3fc55169b 100644
--- a/src/views/modules/home/index.vue
+++ b/src/views/modules/home/index.vue
@@ -689,7 +689,10 @@ export default {
           }],
           xAxis: [{
             type: 'category',
-            data: xData
+            data: xData,
+            axisLabel: {
+                rotate: 50  // 设置旋转角度为45度
+            }
           }],
           series: [{
             name: '分类信息完整数',
diff --git a/src/views/modules/portrayal/house/cpts/graph.vue b/src/views/modules/portrayal/house/cpts/graph.vue
index ffdbb1acc..bae685bd7 100644
--- a/src/views/modules/portrayal/house/cpts/graph.vue
+++ b/src/views/modules/portrayal/house/cpts/graph.vue
@@ -72,9 +72,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' : item.gender == 1 ? 'father' : 'mother' }"><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>`,
+                    '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.name}${item.age?`（${item.age}）岁`:''}</div></div>`,
                     'data':{id: item.id,type:item.type,name:item.name},
 
                 }))
@@ -83,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.type ==1?'未知':data[index].houseHolderRel || '未知',
                     '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'))
diff --git a/src/views/modules/portrayal/jumin/cpts/graph.vue b/src/views/modules/portrayal/jumin/cpts/graph.vue
index f3aa9760a..f8b3d2caf 100644
--- a/src/views/modules/portrayal/jumin/cpts/graph.vue
+++ b/src/views/modules/portrayal/jumin/cpts/graph.vue
@@ -69,9 +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':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>`,
+                    '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.name}${item.age?`（${item.age}）岁`:''}</div></div>`,
                     'data':{id: item.id,type:item.type,name:item.name},
                 }))
                 let lineList = data.map((item, index) => ({