From 8d34b11ddf7759875d3222315dfa2a36a24996ac Mon Sep 17 00:00:00 2001
From: YM <479443481@qq.com>
Date: 星期六, 18 五月 2024 15:09:45 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/TCM_CharacterLibrary
---
src/pages/inherit/index.vue | 26 ++++++++++++++++----------
1 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/src/pages/inherit/index.vue b/src/pages/inherit/index.vue
index 762cd6a..fcb2093 100644
--- a/src/pages/inherit/index.vue
+++ b/src/pages/inherit/index.vue
@@ -131,7 +131,6 @@
searchType: this.searchType,
path: this.conditionId,
}).then((res) => {
- console.log(res);
for (let i = 0; i < res.object.nodeList.length; i++) {
const node = res.object.nodeList[i];
if (
@@ -157,18 +156,18 @@
//閫氳繃 $ref 杩涜鎸傝浇
let myChart = echarts.init(this.$refs.barChart);
- let FontSize = 12; // 瀛椾綋澶у皬
+ let FontSize = 18; // 瀛椾綋澶у皬
let BorderWidth = 2; // 杈规澶у皬
let SymbolSize = 80; // 灏哄璺濈
let Distance = 10;
// 涓嶅悓灏哄涓嬩慨鏀筫charts鐨勫瓧浣�
if (window.innerWidth > 2560 && window.innerWidth <= 3840) {
- FontSize = 28;
+ FontSize = 20;
BorderWidth = 5;
SymbolSize = 100;
Distance = 33;
} else if (window.innerWidth > 1920 && window.innerWidth <= 2560) {
- FontSize = 28;
+ FontSize = 20;
BorderWidth = 4;
SymbolSize = 90;
Distance = 22;
@@ -197,7 +196,7 @@
{
type: "graph",
layout: "force",
- symbolSize: 120,
+ symbolSize: 100,
//鏄惁鍏佽鐢ㄦ埛鎷栧姩鍥剧墖
roam: true,
label: {
@@ -240,6 +239,11 @@
};
//杩涜娓叉煋
myChart.setOption(option);
+ myChart.getZr().on("click", (params) => {
+ if (!params.target) {
+ this.showTool = false;
+ }
+ });
myChart.on("click", (params) => {
console.log(params.event.offsetX, params.event.offsetY);
if (params.componentType === "series") {
@@ -250,6 +254,8 @@
id: params.data.identifier,
name: encodeURIComponent(params.data.name),
};
+ } else {
+ this.showTool = false;
}
});
},
@@ -421,8 +427,8 @@
box-shadow: 1px 1px 5px #888888;
align-items: center;
justify-content: center;
- width: 1rem;
- height: 0.25rem;
+ width: 1.4rem;
+ height: 0.3rem;
margin-left: 0.2rem;
border-radius: 0.13rem;
float: left;
@@ -435,8 +441,8 @@
box-shadow: 1px 1px 5px #888888;
align-items: center;
justify-content: center;
- width: 1.3rem;
- height: 0.25rem;
+ width: 1.6rem;
+ height: 0.3rem;
float: left;
margin-left: 0.2rem;
border-radius: 0.13rem;
@@ -456,7 +462,7 @@
}
.filterText {
margin-left: 10px;
- font-size: 16px;
+ font-size: 0.16rem;
}
.fontColor {
color: #827e44 !important;
--
Gitblit v1.9.1