From 1335100e875ffdda19fc16de9afdda920858ca9b Mon Sep 17 00:00:00 2001
From: 杨磊 <505174330@qq.com>
Date: 星期五, 17 五月 2024 22:17:30 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/TCM_CharacterLibrary

---
 src/pages/inherit/index.vue |   25 ++++++++++++++++---------
 1 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/pages/inherit/index.vue b/src/pages/inherit/index.vue
index 762cd6a..44f026c 100644
--- a/src/pages/inherit/index.vue
+++ b/src/pages/inherit/index.vue
@@ -157,18 +157,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 +197,7 @@
           {
             type: "graph",
             layout: "force",
-            symbolSize: 120,
+            symbolSize: 100,
             //鏄惁鍏佽鐢ㄦ埛鎷栧姩鍥剧墖
             roam: true,
             label: {
@@ -240,6 +240,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 +255,8 @@
             id: params.data.identifier,
             name: encodeURIComponent(params.data.name),
           };
+        } else {
+          this.showTool = false;
         }
       });
     },
@@ -421,8 +428,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 +442,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 +463,7 @@
 }
 .filterText {
   margin-left: 10px;
-  font-size: 16px;
+  font-size: 0.16rem;
 }
 .fontColor {
   color: #827e44 !important;

--
Gitblit v1.9.1