From 4469428bfec368ea9c735303ff9ad4ed25f5b762 Mon Sep 17 00:00:00 2001
From: 杨磊 <505174330@qq.com>
Date: 星期四, 16 五月 2024 11:44:35 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/TCM_CharacterLibrary
---
src/pages/character/index.vue | 52 ++++++++++++++++++++++++++--------------------------
1 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/src/pages/character/index.vue b/src/pages/character/index.vue
index 3ac07c9..b2ce438 100644
--- a/src/pages/character/index.vue
+++ b/src/pages/character/index.vue
@@ -9,6 +9,7 @@
:from="From"
placehold="璇疯緭鍏ュ叧閿瓧"
:keyword="searchKey"
+ :advancedSearchBack="advancedSearchBack"
/>
</view>
<!-- 鐑棬鎼滅储 -->
@@ -369,10 +370,8 @@
padding: [3, 8],
borderRadius: 30,
position: "middle", // 璁剧疆鏍囩鏂囨湰鍦ㄧ嚎鐨勪腑闂翠綅缃笂灞呬腑鏄剧ず
- // bottom: -(FontSize+10),
- z: 10, // 璁剧疆鏍囩鐨剒杞撮珮搴︼紝浣垮叾姣旇繛鎺ョ嚎鏇撮珮
- // offset: [0, 15] ,// 寰�涓嬬Щ鍔� 10 鍍忕礌
- distance: -(Distance + 1) // 灏嗘爣绛炬斁缃湪杩炴帴绾夸笂
+ // z: -1, // 璁剧疆鏍囩鐨剒杞撮珮搴︼紝浣垮叾姣旇繛鎺ョ嚎鏇撮珮
+ distance: -10 // 灏嗘爣绛炬斁缃湪杩炴帴绾夸笂
}
});
}
@@ -383,8 +382,6 @@
return {
name: node.name,
id: node.id,
- x: Math.random() * 2000, // 璁剧疆闅忔満x鍧愭爣浣嶇疆
- y: Math.random() * 600, // 璁剧疆闅忔満y鍧愭爣浣嶇疆
itemStyle: {
color: "#eae0eb", // 鍙互鏍规嵁绱㈠紩璁剧疆涓嶅悓鐨勯鑹�
borderWidth: BorderWidth,
@@ -392,20 +389,7 @@
}
};
});
- // 璁剧疆棰滆壊
- function getColorByIndex() {
- // 鐢熸垚闅忔満鐨� R銆丟銆丅 鍒嗛噺鍊硷紝闄愬埗鍦ㄦ洿楂樼殑鑼冨洿鍐�
- var r = Math.floor(Math.random() * 106) + 150; // 150 鍒� 255 涔嬮棿鐨勯殢鏈烘暟
- var g = Math.floor(Math.random() * 106) + 150; // 150 鍒� 255 涔嬮棿鐨勯殢鏈烘暟
- var b = Math.floor(Math.random() * 106) + 150; // 150 鍒� 255 涔嬮棿鐨勯殢鏈烘暟
- // 灏� R銆丟銆丅 鍒嗛噺鍊艰浆鎹负鍗佸叚杩涘埗锛屽苟纭繚姣忎釜鍒嗛噺鍊奸兘鏄袱浣嶆暟
- var hexR = r.toString(16).padStart(2, "0"); // 浣跨敤 padStart 鏂规硶纭繚鐢熸垚鐨勫崄鍏繘鍒舵暟涓轰袱浣�
- var hexG = g.toString(16).padStart(2, "0");
- var hexB = b.toString(16).padStart(2, "0");
- // 鎷兼帴鍗佸叚杩涘埗棰滆壊鍊�
- var color = "#" + hexR + hexG + hexB;
- return color;
- }
+
var option;
option = {
title: {
@@ -434,7 +418,7 @@
series: [
{
type: "graph",
- layout: "none",
+ layout: "force",
roam: true,
symbolSize: SymbolSize, // 璋冩暣鑺傜偣澶у皬
label: {
@@ -442,7 +426,7 @@
color: "black", // 璁剧疆鑺傜偣鏂囧瓧棰滆壊涓洪粦鑹�
fontSize: FontSize // 璁剧疆鏂囧瓧澶у皬
},
- edgeSymbol: ["circle"],
+ edgeSymbol: ["circle", "arrow"],
edgeSymbolSize: [4, 10],
data: nodeData,
links: links,
@@ -456,6 +440,12 @@
lineStyle: {
width: 10
}
+ },
+ force: {
+ initLayout: null,
+ // gravity: 0
+ repulsion: 800,
+ edgeLength: 400
}
}
]
@@ -463,9 +453,10 @@
// 灏嗙敓鎴愮殑杩炴帴绾挎坊鍔犲埌echarts鍥捐〃鐨刼ption涓�
option.series[0].links = links;
// 璁剧疆鐐瑰嚮浜嬩欢鐩戝惉
+ myChart.off("click");
myChart.on("click", (params) => {
- // menuNav2 = !menuNav1
- if (params.componentType === "series") {
+ console.log(params);
+ if (params.dataType === "node") {
this.spaceTimeArr(params.data.id);
}
});
@@ -478,8 +469,17 @@
},
// 楂樼骇鎼滅储
onSubmit(val) {
- getAdvanceSearch(val).then((res) => {
- console.log(res, "鎺ュ彛璋冪敤鎴愬姛");
+ getAdvanceSearch({
+ ...val,
+ page: 1,
+ pageSize: 100
+ }).then((res) => {
+ console.log(res, "res");
+ });
+ },
+ advancedSearchBack() {
+ uni.navigateTo({
+ url: "/pages/knowledgeBase/knowledgeBase"
});
},
// 鐐瑰嚮涓嬮潰鐨勬湞浠ｆ寜閽�
--
Gitblit v1.9.1