@@ -50,10 +50,16 @@ limitations under the License. -->
+
@@ -76,6 +82,7 @@ import { ElMessage } from "element-plus";
import type { PropType } from "vue";
import { ServiceListConfig } from "@/types/dashboard";
import Line from "./Line.vue";
+import Card from "./Card.vue";
import { useSelectorStore } from "@/store/modules/selectors";
import { useDashboardStore } from "@/store/modules/dashboard";
import { Service } from "@/types/selector";
@@ -111,13 +118,14 @@ queryServices();
async function queryServices() {
chartLoading.value = true;
- const resp = await selectorStore.fetchServices();
+ const resp = await selectorStore.fetchServices(dashboardStore.layerId);
chartLoading.value = false;
if (resp.errors) {
ElMessage.error(resp.errors);
}
services.value = selectorStore.services.splice(0, pageSize);
+ queryServiceMetrics(services.value);
}
async function queryServiceMetrics(currentServices: Service[]) {
const { metrics } = props.config;
@@ -155,7 +163,9 @@ function searchList() {
watch(
() => [props.config.metricTypes, props.config.metrics],
() => {
- queryServiceMetrics(services.value);
+ if (dashboardStore.showConfig) {
+ queryServiceMetrics(services.value);
+ }
}
);
diff --git a/src/views/dashboard/graphs/index.ts b/src/views/dashboard/graphs/index.ts
index dedb6454..1118b59c 100644
--- a/src/views/dashboard/graphs/index.ts
+++ b/src/views/dashboard/graphs/index.ts
@@ -18,7 +18,7 @@
import Area from "./Area.vue";
import Line from "./Line.vue";
import Bar from "./Bar.vue";
-import Heatmap from "./HeatMap.vue";
+import HeatMap from "./HeatMap.vue";
import TopList from "./TopList.vue";
import Table from "./Table.vue";
import Pie from "./Pie.vue";
@@ -30,7 +30,7 @@ import ServiceList from "./ServiceList.vue";
export default {
Line,
Bar,
- Heatmap,
+ HeatMap,
TopList,
Area,
Table,
diff --git a/src/views/dashboard/panel/Tool.vue b/src/views/dashboard/panel/Tool.vue
index 9ba4f402..1f8584e8 100644
--- a/src/views/dashboard/panel/Tool.vue
+++ b/src/views/dashboard/panel/Tool.vue
@@ -40,7 +40,7 @@ limitations under the License. -->
size="mini"
placeholder="Select a data"
@change="changePods"
- class="selectors"
+ class="selectorPod"
/>
@@ -84,9 +84,10 @@ limitations under the License. -->
diff --git a/src/views/service/Panel.vue b/src/views/service/Panel.vue
index 1febb4c1..bb51cc47 100644
--- a/src/views/service/Panel.vue
+++ b/src/views/service/Panel.vue
@@ -50,7 +50,10 @@ import Endpoints from "./Endpoints.vue";
import Topology from "./Topology.vue";
import Traces from "./Traces.vue";
import Profiles from "./Profiles.vue";
+import { useAppStoreWithOut } from "@/store/modules/app";
+const appStore = useAppStoreWithOut();
+appStore.setPageTitle("General Service");
const route = useRoute();
const { t } = useI18n();
const tabs = ["metrics", "topologies", "endpoints", "traces", "profiles"];
@@ -69,30 +72,36 @@ function handleClick(tab: string) {
.service-detail {
text-align: left;
}
+
.tabs {
padding: 15px 15px 0 15px;
border-bottom: 1px solid var(--el-border-color-light);
}
+
.tab {
display: inline-block;
margin-right: 30px;
font-size: 13px;
font-weight: 400;
height: 30px;
+
&:hover {
color: var(--el-color-primary);
}
+
&.active {
color: var(--el-color-primary);
border-bottom: 1px solid var(--el-color-primary);
}
}
+
.title {
padding: 5px 0 5px 15px;
font-size: 14px;
font-weight: 400;
border-bottom: 1px solid #dfe4e8;
background-color: #c4c8e133;
+
span {
display: inline-block;
margin-right: 10px;