+
-
-
+
+
{{assetKey[key]}}
{{assetKey[key]}}
-
+
{{value == 1 ? $t('asset.createAssetTab.inStock') : $t('asset.createAssetTab.outStock')}}
{{value + ' ' + $t('overall.active')}}
{{value ? value + 'ms' : ''}}
-
+ {{value ? value : " "}}
+
+
+
+
+
+
+
+
{{_item}}
-
{{value ? value : " "}}
+
{{value ? value : " "}}
@@ -140,6 +151,17 @@
{{value ? value : " "}}
+
+
+
+
+
+ {{value ? value : " "}}
+
+
@@ -346,6 +368,7 @@
// 设置数据, filter区分
setData(chartItem, detail, panelId, filter, area, errorMsg) {
//this.resize(chartItem);
+ console.info(chartItem, detail)
if(errorMsg && errorMsg !== ''){
this.isError = true;
this.errorContent = errorMsg;
diff --git a/nezha-fronted/src/components/charts/chart-list.vue b/nezha-fronted/src/components/charts/chart-list.vue
index 25505b6a7..953afe4db 100644
--- a/nezha-fronted/src/components/charts/chart-list.vue
+++ b/nezha-fronted/src/components/charts/chart-list.vue
@@ -537,7 +537,7 @@
buildIn: 1,
elements: [{
id: '',
- expression: `nz_alert_nums{id="${this.detail[0].value}"}`,
+ expression: `nz_alert_nums{id="${this.detail.id}"}`,
type: ''
}]
});
@@ -595,7 +595,10 @@
type: "alertList",
prev: -9,
next: -1,
- buildIn: 1
+ buildIn: 1,
+ draggable: false,
+ resizable: false,
+ editable: false,
});
this.$nextTick(() => {
this.dataList.forEach((item,index) => {
@@ -1248,10 +1251,12 @@
response.data && function() {
response.data.Basic && detail.push({
title: vm.$t('asset.createAssetTab.basicTitle'),
+ type: 'basic',
data: response.data.Basic
});
response.data.Feature && detail.push({
title: vm.$t('asset.createAssetTab.featureTitle'),
+ type: 'feature',
data: response.data.Feature
});
}();
@@ -1261,6 +1266,7 @@
}else {
detail.push({
title: vm.$t('asset.createAssetTab.basicTitle'),
+ type: 'basic',
data: {
sn: 'assetInfo Test',
host: '192.168.40.42',
@@ -1273,6 +1279,7 @@
});
detail.push({
title: vm.$t('asset.createAssetTab.featureTitle'),
+ type: 'feature',
data: {
CPU: "Intel E500",
Memory: "256GB",
diff --git a/nezha-fronted/src/components/charts/chart.scss b/nezha-fronted/src/components/charts/chart.scss
index 8d8ba40c9..14c1022ff 100644
--- a/nezha-fronted/src/components/charts/chart.scss
+++ b/nezha-fronted/src/components/charts/chart.scss
@@ -210,7 +210,7 @@
}
}
}
- .chart-container {
+ .chart-container.chart-detail {
height: 100%;
position: relative;
background-color: white;
@@ -224,7 +224,6 @@
text-align: center;
width: 100%;
line-height: 30px;
- height: 28px;
padding: 1px 3px 0 3px;
box-sizing: border-box;
.nz-chart-top{
@@ -237,10 +236,9 @@
font-size: 12px;
}
.chart-title-text {
- font-weight: bold;
- font-size: 18px;
+ font-size: 16px;
line-height: 26px;
- color: #333;
+ color: #52545c;
display:flex;
justify-content:center;
align-items:center;
@@ -445,9 +443,9 @@
font-size: 12px;
}
.chart-title {
- font-weight: bold;
- font-size: 18px;
+ font-size: 16px;
line-height: 26px;
+ color: #52545c;
color: #333;
display:flex;
justify-content:center;