diff --git a/nezha-fronted/src/assets/css/components/chart/chart.scss b/nezha-fronted/src/assets/css/components/chart/chart.scss index ca1863341..3d0557f41 100644 --- a/nezha-fronted/src/assets/css/components/chart/chart.scss +++ b/nezha-fronted/src/assets/css/components/chart/chart.scss @@ -158,11 +158,64 @@ .chart-detail { width: 100%; height: 100%; + color: $--color-text-primary; .chart-detail-title { text-align: center; - background-color: $--background-color-empty; - color: $--color-text-primary; - border: 1px solid $--border-color-light; + background-color: transparent; + line-height: 30px; + } + .chart-detail-title:hover { + background-color: $--background-color-base; + } + .basic-info { + font-size: 13px; + height: calc(100% - 51px); + margin: 10px; + .basic-info-title { + background-color: $--background-color-base; + height: 25px; + padding-left: 5px; + line-height: 25px; + } + .basic-info-table { + width: calc(100% - 5px); + height: calc(100% - 25px); + margin-left: 3px; + overflow-y: auto; + .basic-info-table-list { + display: flex; + .basic-info-table-title,.basic-info-table-value { + display: inline-block; + width: 50%; + line-height: 30px; + padding-left: 10px; + border-bottom: 1px solid $--border-color-light; + border-right: 1px solid $--border-color-light; + } + .basic-info-table-value { + border-right: none; + .label-table { + display: flex; + border: 1px solid #409eef; + height: 20px; + font-size: 12px; + line-height: 20px; + border-radius: 4px; + margin: 4px 5px 0 0; + box-sizing: content-box; + .label-table-value { + flex: 1; + padding: 0 4px; + } + .label-table-name { + color: #fff; + background-color: #409eef; + padding: 0 4px; + } + } + } + } + } } } } diff --git a/nezha-fronted/src/components/chart/chart/chartAssetInfo.vue b/nezha-fronted/src/components/chart/chart/chartAssetInfo.vue index 05755132e..203357cc4 100644 --- a/nezha-fronted/src/components/chart/chart/chartAssetInfo.vue +++ b/nezha-fronted/src/components/chart/chart/chartAssetInfo.vue @@ -1,5 +1,5 @@ diff --git a/nezha-fronted/src/components/chart/panelChart.vue b/nezha-fronted/src/components/chart/panelChart.vue index e35d9c22b..8e9a68a59 100644 --- a/nezha-fronted/src/components/chart/panelChart.vue +++ b/nezha-fronted/src/components/chart/panelChart.vue @@ -165,19 +165,26 @@ export default { this.groupInit() this.chartData = [...this.chartInfo.children] } - if (this.chartInfo.type === 'assetInfo') { - this.$get('asset/asset/' + 546).then(res => { - if (res.code === 200) { - this.chartData = res.data - } - }) - } if (this.chartInfo.type === 'carousel') { this.chartData = ['carousel'] } if (this.chartInfo.type === 'map') { this.chartData = ['map'] } + if (this.chartInfo.type === 'assetInfo') { + this.$get('asset/asset/' + 545).then(res => { + if (res.code === 200) { + this.chartData = res.data + } + }) + } + if (this.chartInfo.type === 'endpointInfo') { + this.$get('monitor/endpoint/' + 1).then(res => { + if (res.code === 200) { + this.chartData = res.data + } + }) + } break } } diff --git a/nezha-fronted/src/components/common/login.vue b/nezha-fronted/src/components/common/login.vue index 8f303fd28..930b56f4e 100644 --- a/nezha-fronted/src/components/common/login.vue +++ b/nezha-fronted/src/components/common/login.vue @@ -240,7 +240,7 @@ export default { } }, licenseStat () { - this.$get('/sys/license/state').then(response => { + this.$get('/sys/license/status').then(response => { if (response.code && response.code === 200) { this.license.warnInfo = '' this.license.valid = true