From 4cdc35b7911554a955a7f5b29f55dbd91d7fd34e Mon Sep 17 00:00:00 2001
From: YM <479443481@qq.com>
Date: 星期五, 17 五月 2024 22:26:23 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/TCM_CharacterLibrary

---
 src/pages/inherit/index.vue |   60 +++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 33 insertions(+), 27 deletions(-)

diff --git a/src/pages/inherit/index.vue b/src/pages/inherit/index.vue
index 8f4c92b..44f026c 100644
--- a/src/pages/inherit/index.vue
+++ b/src/pages/inherit/index.vue
@@ -71,7 +71,7 @@
     </div>
     <div class="contentBox">
       <!-- echarts鍥� -->
-      <div class="barChart" ref="barChart"></div>
+      <div class="barChart" ref="barChart" ></div>
       <div
         class="toolBox"
         v-if="showTool"
@@ -88,7 +88,7 @@
 import * as echarts from "echarts";
 import {
   inheritMedicalSataStatistics,
-  inheritMedicalList
+  inheritMedicalList,
 } from "@/api/index.js";
 export default {
   data() {
@@ -96,41 +96,40 @@
       // 鏍囬椤堕儴鏍忛渶瑕佺殑涓滆タ
       keyword: "",
       idIndex: 0,
-      activeId: "",
+      activeId: 28,
       conditionId: "",
-      searchType: "KEYWORD",
+      searchType: "DYNASTY",
       dynasty: [],
       nodeData: [],
       showTool: false,
       toolTop: 0,
       toolLeft: 0,
-      toolInfo: {}
+      toolInfo: {},
     };
   },
   onLoad(options) {
     this.idIndex = options.id;
     console.log("optionsoptionsoptions", options.id);
-    getDynasty()
   },
   mounted() {
     this.getStatistics();
-    this.getData();
-    this.getDynasty()
-
   },
   methods: {
     getStatistics() {
       inheritMedicalSataStatistics().then((res) => {
         this.dynasty = res.object;
+        this.getData();
       });
     },
     getData() {
       this.nodeData = [];
+      // const defaultDynasty = this.dynasty.find(f.dynasty == "瀹�");
+      // this.activeId = defaultDynasty.dynastyId
       inheritMedicalList({
         keywords: this.keyword,
         dynastyId: this.activeId,
         searchType: this.searchType,
-        path: this.conditionId
+        path: this.conditionId,
       }).then((res) => {
         console.log(res);
         for (let i = 0; i < res.object.nodeList.length; i++) {
@@ -143,8 +142,8 @@
               itemStyle: {
                 color: "#F8E2D7",
                 borderColor: "#F3AA78",
-                borderWidth: "3"
-              }
+                borderWidth: "3",
+              },
             });
           }
         }
@@ -158,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;
@@ -198,7 +197,7 @@
           {
             type: "graph",
             layout: "force",
-            symbolSize: 120,
+            symbolSize: 100,
             //鏄惁鍏佽鐢ㄦ埛鎷栧姩鍥剧墖
             roam: true,
             label: {
@@ -241,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") {
@@ -249,8 +253,10 @@
           this.toolLeft = params.event.offsetX + "px";
           this.toolInfo = {
             id: params.data.identifier,
-            name: encodeURIComponent(params.data.name)
+            name: encodeURIComponent(params.data.name),
           };
+        } else {
+          this.showTool = false;
         }
       });
     },
@@ -258,7 +264,7 @@
       switch (type) {
         case 1:
           uni.navigateTo({
-            url: "/pages/character/detail?id=" + this.toolInfo.id
+            url: "/pages/character/detail?id=" + this.toolInfo.id,
           });
           break;
         case 2:
@@ -269,7 +275,7 @@
               "&id=" +
               this.toolInfo.id +
               "&name=" +
-              this.toolInfo.name
+              this.toolInfo.name,
           });
           break;
         case 3:
@@ -280,7 +286,7 @@
               "&id=" +
               this.toolInfo.id +
               "&name=" +
-              this.toolInfo.name
+              this.toolInfo.name,
           });
           break;
       }
@@ -320,8 +326,8 @@
         this.keyword = "";
       }
       this.getData();
-    }
-  }
+    },
+  },
 };
 </script>
 <style scoped>
@@ -422,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;
@@ -436,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;
@@ -457,7 +463,7 @@
 }
 .filterText {
   margin-left: 10px;
-  font-size: 16px;
+  font-size: 0.16rem;
 }
 .fontColor {
   color: #827e44 !important;

--
Gitblit v1.9.1