Merge remote-tracking branch 'origin/dev' into dev
# Conflicts: # orion-visor-ui/src/api/monitor/monitor-host.ts
This commit is contained in:
@@ -3,4 +3,4 @@ VITE_API_BASE_URL=http://127.0.0.1:9200/orion-visor/api
|
||||
# websocket 路径
|
||||
VITE_WS_BASE_URL=ws://127.0.0.1:9200/orion-visor/keep-alive
|
||||
# 版本号
|
||||
VITE_APP_VERSION=2.5.2
|
||||
VITE_APP_VERSION=2.5.3
|
||||
|
||||
@@ -3,4 +3,4 @@ VITE_API_BASE_URL=/orion-visor/api
|
||||
# websocket 路径
|
||||
VITE_WS_BASE_URL=/orion-visor/keep-alive
|
||||
# 版本号
|
||||
VITE_APP_VERSION=2.5.2
|
||||
VITE_APP_VERSION=2.5.3
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="UTF-8" />
|
||||
<link rel="shortcut icon" type="image/x-icon" href="./favicon.ico">
|
||||
<link rel="shortcut icon" type="image/x-icon" href="/favicon.ico">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||
<title>Orion Visor</title>
|
||||
</head>
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "orion-visor-ui",
|
||||
"description": "Orion Visor UI",
|
||||
"version": "2.5.2",
|
||||
"version": "2.5.3",
|
||||
"private": true,
|
||||
"author": "Jiahang Li",
|
||||
"license": "Apache 2.0",
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
:loading="loading"
|
||||
:bordered="false"
|
||||
:header-style="{ height: '48px', padding: '8px 16px 0 16px', borderBottom: 'none' }"
|
||||
:body-style="{ padding: '0 0 0 16px', height: 'calc(100% - 48px)', position: 'relative' }">
|
||||
:body-style="{ padding: '0 0 0 16px', height: 'calc(100% - 48px)', position: 'relative', display: 'flex', alignItems: 'center', justifyContent: 'center' }">
|
||||
<!-- 标题 -->
|
||||
<template #title>
|
||||
<div class="chart-title">
|
||||
@@ -80,7 +80,7 @@
|
||||
textStyle: {
|
||||
color: 'rgba(0, 0, 0, 0.8)',
|
||||
},
|
||||
formatter: function(params: any) {
|
||||
formatter: function (params: any) {
|
||||
if (!params.length) {
|
||||
return '';
|
||||
}
|
||||
@@ -241,7 +241,6 @@
|
||||
}
|
||||
|
||||
.nodata-chart {
|
||||
padding-top: 76px;
|
||||
font-size: 16px;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
|
||||
Reference in New Issue
Block a user