diff --git a/src/styles/lib.scss b/src/styles/lib.scss index 63310205..d697cfaf 100644 --- a/src/styles/lib.scss +++ b/src/styles/lib.scss @@ -139,3 +139,7 @@ transform: rotate(1turn); } } + +.topology-dialog { + background-color: #333840 !important; +} diff --git a/src/views/Settings.vue b/src/views/Settings.vue index 03313f20..60a75850 100644 --- a/src/views/Settings.vue +++ b/src/views/Settings.vue @@ -22,7 +22,7 @@ limitations under the License. --> {{ t("language") }} @@ -92,8 +92,4 @@ function handleClick(e: any) { height: 100%; overflow-y: auto; } -// .el-overlay-dialog { -// background-color: #333840 !important; -// color: #ddd; -// } diff --git a/src/views/dashboard/related/topology/Graph.vue b/src/views/dashboard/related/topology/Graph.vue index 09271f8b..7f30429a 100644 --- a/src/views/dashboard/related/topology/Graph.vue +++ b/src/views/dashboard/related/topology/Graph.vue @@ -30,6 +30,7 @@ import { Node, Call } from "@/types/topology"; import { useTopologyStore } from "@/store/modules/topology"; import { useDashboardStore } from "@/store/modules/dashboard"; import { EntityType } from "../../data"; +import router from "@/router"; /*global Nullable */ const { t } = useI18n(); @@ -39,7 +40,7 @@ const height = ref(document.body.clientHeight - 90); const width = ref(document.body.clientWidth - 40); const simulation = ref(""); const svg = ref>(null); -const chart = ref(null); +const chart = ref>(null); const tip = ref(null); const graph = ref(null); const node = ref(null); @@ -154,10 +155,12 @@ function handleNodeClick(d: any) { topologyStore.setNode(d); topologyStore.setLink({}); } -function handleLinkClick(event: any, d: any) { +function handleLinkClick(event: any, d: Call) { event.stopPropagation(); topologyStore.setNode({}); topologyStore.setLink(d); + // const path = `/dashboard/${states.selectedLayer}/${states.entity}/${name}`; + // router.push(path); } function update() { // node element @@ -255,8 +258,6 @@ watch( } .micro-topo-chart { - background: #333840; - .topo-svg { display: block; width: 100%; diff --git a/src/views/dashboard/related/topology/utils/linkElement.ts b/src/views/dashboard/related/topology/utils/linkElement.ts index a4c9d327..6e368084 100644 --- a/src/views/dashboard/related/topology/utils/linkElement.ts +++ b/src/views/dashboard/related/topology/utils/linkElement.ts @@ -38,8 +38,8 @@ export const anchorElement = (graph: any, funcs: any, tip: any) => { .on("mouseout", function () { tip.hide(this); }) - .on("click", (d: unknown) => { - funcs.handleLinkClick(d); + .on("click", (event: unknown, d: unknown) => { + funcs.handleLinkClick(event, d); }); return linkEnter; }; diff --git a/src/views/dashboard/related/topology/utils/nodeElement.ts b/src/views/dashboard/related/topology/utils/nodeElement.ts index cabdd942..ec0a14a4 100644 --- a/src/views/dashboard/related/topology/utils/nodeElement.ts +++ b/src/views/dashboard/related/topology/utils/nodeElement.ts @@ -39,6 +39,9 @@ export default ( tip .html(() => { return ` +
${t("name")}: ${ + d.name + }
${t("cpm")}: ${ d.cpm }