From ef05f1416c204098f003c3f4c3861354d18cd503 Mon Sep 17 00:00:00 2001
From: 张钢 <floatgang@163.com>
Date: 星期六, 24 八月 2024 13:48:35 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_web
---
ruoyi-ui/src/views/components/superMindmap.vue | 56 ++++++++++++++++++++++++++++++++++----------------------
1 files changed, 34 insertions(+), 22 deletions(-)
diff --git a/ruoyi-ui/src/views/components/superMindmap.vue b/ruoyi-ui/src/views/components/superMindmap.vue
index 7675fc7..103ae82 100644
--- a/ruoyi-ui/src/views/components/superMindmap.vue
+++ b/ruoyi-ui/src/views/components/superMindmap.vue
@@ -250,28 +250,39 @@
return 'pointer'
}
})
- // 娣诲姞澶村儚
- groups.append("image")
- .attr("xlink:href", function (d) {
- return d.data.url; // 澶村儚鍥剧墖鐨勮矾寰�
- })
- .attr("x", 12) // 澶村儚鐩稿浜庤妭鐐圭殑姘村钩浣嶇疆
- .attr("y", 3) // 澶村儚鐩稿浜庤妭鐐圭殑鍨傜洿浣嶇疆
- .attr("width", 24) // 澶村儚鐨勫搴�
- .attr("height", 24); // 澶村儚鐨勯珮搴�
- //缁樺埗鏍囨敞(鑺傜偣鍓嶇殑鐭╁舰)
- groups.append("rect")
- .attr("x", 37)
- .attr("y", 3)
- .attr("width",
- function (d) {
- return d.data.link ? (getPXwidth(d.data.link) + 30) : 0
- }
- )
- .attr("height", 26)
- .attr("fill", "#FFFFFF")
- // 娣诲姞鍦嗚
- .attr("rx", 4)
+ // 娣诲姞澶村儚
+ let pu = null
+ let gp = groups.append("image")
+ .attr("xlink:href", function (d) {
+ // console.log(d.data.purl)
+ pu = d.data.purl
+ // console.log(d.data.prop)
+ // console.log(d.data.label==="")
+ if(d.data.label==="")
+ return ""
+ else
+ return d.data.purl; // 澶村儚鍥剧墖鐨勮矾寰�
+ })
+ if (pu!=null){
+ gp.attr("x", 12) // 澶村儚鐩稿浜庤妭鐐圭殑姘村钩浣嶇疆
+ .attr("y", 3) // 澶村儚鐩稿浜庤妭鐐圭殑鍨傜洿浣嶇疆
+ .attr("width", 24) // 澶村儚鐨勫搴�
+ .attr("height", 24); // 澶村儚鐨勯珮搴�
+
+ //缁樺埗鏍囨敞(鑺傜偣鍓嶇殑鐭╁舰)
+ gp.append("rect")
+ .attr("x", 37)
+ .attr("y", 3)
+ .attr("width",
+ function (d) {
+ return d.data.link ? (getPXwidth(d.data.link) + 30) : 0
+ }
+ )
+ .attr("height", 26)
+ .attr("fill", "#FFFFFF")
+ // 娣诲姞鍦嗚
+ .attr("rx", 4)
+ }
//缁樺埗鏂囧瓧
groups.append("text")
.on("click", function (event, node) {
@@ -286,6 +297,7 @@
that.$router.push("/familymodel/jiagenwang/personInfo/" + data.id);
//that.$emit('activeChange', 'map')
+
// return
}
// 鏍囧噯鑺傜偣鈥斺�� 浼犲嚭 prop
--
Gitblit v1.9.1