From edc412a8e5a495a0259db4823fa46cd23e4323c7 Mon Sep 17 00:00:00 2001 From: Jacky Date: Mon, 22 Mar 2021 11:19:00 +0800 Subject: [PATCH] dashboard --- .gitignore | 2 + nginx-ui-frontend/package.json | 3 +- nginx-ui-frontend/public/favicon.ico | Bin 4286 -> 15406 bytes nginx-ui-frontend/src/assets/img/logo.png | Bin 6849 -> 0 bytes .../src/components/Chart/LineChart.vue | 36 ++++++ .../src/components/Charts/Bar.vue | 62 --------- .../src/components/Charts/ChartCard.vue | 110 ---------------- .../src/components/Charts/Liquid.vue | 67 ---------- .../src/components/Charts/MiniArea.vue | 51 -------- .../src/components/Charts/MiniBar.vue | 37 ------ .../src/components/Charts/MiniProgress.vue | 75 ----------- .../src/components/Charts/MiniSmoothArea.vue | 39 ------ .../src/components/Charts/Radar.vue | 68 ---------- .../src/components/Charts/RankList.vue | 77 ------------ .../src/components/Charts/TagCloud.vue | 113 ----------------- .../src/components/Charts/TransferBar.vue | 64 ---------- .../src/components/Charts/Trend.vue | 87 ------------- .../src/components/Charts/chart.less | 13 -- .../src/components/Charts/index.js | 28 ----- .../src/components/Charts/smooth.area.less | 4 - .../src/components/Logo/Logo.vue | 16 +-- nginx-ui-frontend/src/lib/http/index.js | 8 -- nginx-ui-frontend/src/router/index.js | 2 +- nginx-ui-frontend/src/views/About.vue | 6 +- nginx-ui-frontend/src/views/DashBoard.vue | 119 +++++++++++++----- nginx-ui-frontend/vue.config.js | 2 +- nginx-ui-frontend/yarn.lock | 46 ++++++- server/api/analytic.go | 6 + 28 files changed, 187 insertions(+), 954 deletions(-) delete mode 100644 nginx-ui-frontend/src/assets/img/logo.png create mode 100644 nginx-ui-frontend/src/components/Chart/LineChart.vue delete mode 100644 nginx-ui-frontend/src/components/Charts/Bar.vue delete mode 100644 nginx-ui-frontend/src/components/Charts/ChartCard.vue delete mode 100644 nginx-ui-frontend/src/components/Charts/Liquid.vue delete mode 100644 nginx-ui-frontend/src/components/Charts/MiniArea.vue delete mode 100644 nginx-ui-frontend/src/components/Charts/MiniBar.vue delete mode 100644 nginx-ui-frontend/src/components/Charts/MiniProgress.vue delete mode 100644 nginx-ui-frontend/src/components/Charts/MiniSmoothArea.vue delete mode 100644 nginx-ui-frontend/src/components/Charts/Radar.vue delete mode 100644 nginx-ui-frontend/src/components/Charts/RankList.vue delete mode 100644 nginx-ui-frontend/src/components/Charts/TagCloud.vue delete mode 100644 nginx-ui-frontend/src/components/Charts/TransferBar.vue delete mode 100644 nginx-ui-frontend/src/components/Charts/Trend.vue delete mode 100644 nginx-ui-frontend/src/components/Charts/chart.less delete mode 100644 nginx-ui-frontend/src/components/Charts/index.js delete mode 100644 nginx-ui-frontend/src/components/Charts/smooth.area.less diff --git a/.gitignore b/.gitignore index a55ceda5..385fd9fe 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,5 @@ database.db server/tmp/main node_modules dist +nginx-ui-frontend/.env.development +nginx-ui-frontend/.env.production diff --git a/nginx-ui-frontend/package.json b/nginx-ui-frontend/package.json index 80a93016..3b668c19 100644 --- a/nginx-ui-frontend/package.json +++ b/nginx-ui-frontend/package.json @@ -10,9 +10,10 @@ "dependencies": { "ant-design-vue": "^1.7.3", "axios": "^0.21.1", + "chart.js": "^2.9.4", "core-js": "^3.9.0", - "viser-vue": "^2.4.8", "vue": "^2.6.11", + "vue-chartjs": "^3.5.1", "vue-itextarea": "^1.0.9", "vue-router": "^3.5.1", "vuex": "^3.6.2", diff --git a/nginx-ui-frontend/public/favicon.ico b/nginx-ui-frontend/public/favicon.ico index df36fcfb72584e00488330b560ebcf34a41c64c2..c509adfeacf0a61787540cee6f2c158b5112a0d2 100644 GIT binary patch literal 15406 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 diff --git a/nginx-ui-frontend/src/assets/img/logo.png b/nginx-ui-frontend/src/assets/img/logo.png deleted file mode 100644 index f3d2503fc2a44b5053b0837ebea6e87a2d339a43..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6849 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 +import { Line, mixins } from 'vue-chartjs' +const { reactiveProp } = mixins + +export default { + name: "LineChart", + extends: Line, + mixins: [reactiveProp], + props: ['options'], + data() { + return { + updating: false + } + }, + mounted () { + this.renderChart(this.chartData, this.options) + }, + watch: { + chartData: { + deep: true, + handler () { + if (!this.updating && this.$data && this.$data._chart) { + // Update the chart + this.updating = true + this.$data._chart.update() + this.$nextTick(() => this.updating = false) + } + } + } + } +} + + + diff --git a/nginx-ui-frontend/src/components/Charts/Bar.vue b/nginx-ui-frontend/src/components/Charts/Bar.vue deleted file mode 100644 index 44828453..00000000 --- a/nginx-ui-frontend/src/components/Charts/Bar.vue +++ /dev/null @@ -1,62 +0,0 @@ - - - diff --git a/nginx-ui-frontend/src/components/Charts/ChartCard.vue b/nginx-ui-frontend/src/components/Charts/ChartCard.vue deleted file mode 100644 index 03c26abf..00000000 --- a/nginx-ui-frontend/src/components/Charts/ChartCard.vue +++ /dev/null @@ -1,110 +0,0 @@ - - - - - diff --git a/nginx-ui-frontend/src/components/Charts/Liquid.vue b/nginx-ui-frontend/src/components/Charts/Liquid.vue deleted file mode 100644 index 4019fb18..00000000 --- a/nginx-ui-frontend/src/components/Charts/Liquid.vue +++ /dev/null @@ -1,67 +0,0 @@ - - - - - diff --git a/nginx-ui-frontend/src/components/Charts/MiniArea.vue b/nginx-ui-frontend/src/components/Charts/MiniArea.vue deleted file mode 100644 index b7fbb89d..00000000 --- a/nginx-ui-frontend/src/components/Charts/MiniArea.vue +++ /dev/null @@ -1,51 +0,0 @@ - - - - - diff --git a/nginx-ui-frontend/src/components/Charts/MiniBar.vue b/nginx-ui-frontend/src/components/Charts/MiniBar.vue deleted file mode 100644 index 078a0bc0..00000000 --- a/nginx-ui-frontend/src/components/Charts/MiniBar.vue +++ /dev/null @@ -1,37 +0,0 @@ - - - - - diff --git a/nginx-ui-frontend/src/components/Charts/MiniProgress.vue b/nginx-ui-frontend/src/components/Charts/MiniProgress.vue deleted file mode 100644 index e6913631..00000000 --- a/nginx-ui-frontend/src/components/Charts/MiniProgress.vue +++ /dev/null @@ -1,75 +0,0 @@ - - - - - diff --git a/nginx-ui-frontend/src/components/Charts/MiniSmoothArea.vue b/nginx-ui-frontend/src/components/Charts/MiniSmoothArea.vue deleted file mode 100644 index a00d9bf0..00000000 --- a/nginx-ui-frontend/src/components/Charts/MiniSmoothArea.vue +++ /dev/null @@ -1,39 +0,0 @@ - - - - - diff --git a/nginx-ui-frontend/src/components/Charts/Radar.vue b/nginx-ui-frontend/src/components/Charts/Radar.vue deleted file mode 100644 index 5ee88ade..00000000 --- a/nginx-ui-frontend/src/components/Charts/Radar.vue +++ /dev/null @@ -1,68 +0,0 @@ - - - - - diff --git a/nginx-ui-frontend/src/components/Charts/RankList.vue b/nginx-ui-frontend/src/components/Charts/RankList.vue deleted file mode 100644 index afb56a1a..00000000 --- a/nginx-ui-frontend/src/components/Charts/RankList.vue +++ /dev/null @@ -1,77 +0,0 @@ - - - - - diff --git a/nginx-ui-frontend/src/components/Charts/TagCloud.vue b/nginx-ui-frontend/src/components/Charts/TagCloud.vue deleted file mode 100644 index 74d1b3f1..00000000 --- a/nginx-ui-frontend/src/components/Charts/TagCloud.vue +++ /dev/null @@ -1,113 +0,0 @@ - - - diff --git a/nginx-ui-frontend/src/components/Charts/TransferBar.vue b/nginx-ui-frontend/src/components/Charts/TransferBar.vue deleted file mode 100644 index 7f96f0be..00000000 --- a/nginx-ui-frontend/src/components/Charts/TransferBar.vue +++ /dev/null @@ -1,64 +0,0 @@ - - - diff --git a/nginx-ui-frontend/src/components/Charts/Trend.vue b/nginx-ui-frontend/src/components/Charts/Trend.vue deleted file mode 100644 index 6ca41386..00000000 --- a/nginx-ui-frontend/src/components/Charts/Trend.vue +++ /dev/null @@ -1,87 +0,0 @@ - - - - - diff --git a/nginx-ui-frontend/src/components/Charts/chart.less b/nginx-ui-frontend/src/components/Charts/chart.less deleted file mode 100644 index e04fa095..00000000 --- a/nginx-ui-frontend/src/components/Charts/chart.less +++ /dev/null @@ -1,13 +0,0 @@ -.antv-chart-mini { - position: relative; - width: 100%; - - .chart-wrapper { - position: absolute; - bottom: -28px; - width: 100%; - -/* margin: 0 -5px; - overflow: hidden;*/ - } -} \ No newline at end of file diff --git a/nginx-ui-frontend/src/components/Charts/index.js b/nginx-ui-frontend/src/components/Charts/index.js deleted file mode 100644 index 74d6bf45..00000000 --- a/nginx-ui-frontend/src/components/Charts/index.js +++ /dev/null @@ -1,28 +0,0 @@ -import Bar from './Bar' -import ChartCard from './ChartCard' -import Liquid from './Liquid' -import MiniArea from './MiniArea' -import MiniBar from './MiniBar' -import MiniProgress from './MiniProgress' -import MiniSelect from 'ant-design-vue/lib/pagination/MiniSelect' -import MiniSmoothArea from './MiniSmoothArea' -import Radar from './Radar' -import RankList from './RankList' -import TransferBar from './TransferBar' -import Trend from './Trend' - - -export { - Bar, - ChartCard, - Liquid, - MiniSmoothArea, - MiniSelect, - MiniProgress, - MiniArea, - MiniBar, - Radar, - RankList, - TransferBar, - Trend -} diff --git a/nginx-ui-frontend/src/components/Charts/smooth.area.less b/nginx-ui-frontend/src/components/Charts/smooth.area.less deleted file mode 100644 index 189d7931..00000000 --- a/nginx-ui-frontend/src/components/Charts/smooth.area.less +++ /dev/null @@ -1,4 +0,0 @@ -.ant-pro-smooth-area { - position: relative; - width: 100%; -} diff --git a/nginx-ui-frontend/src/components/Logo/Logo.vue b/nginx-ui-frontend/src/components/Logo/Logo.vue index c6a4bd6c..4978f889 100644 --- a/nginx-ui-frontend/src/components/Logo/Logo.vue +++ b/nginx-ui-frontend/src/components/Logo/Logo.vue @@ -1,19 +1,13 @@ @@ -33,13 +27,11 @@ export default { } .text { - float: left; font-weight: 300; - font-size: 22px; + font-size: 23px; line-height: 48px; height: 48px; - display: inline-block; - margin-left: 13px; + text-align: center; } } diff --git a/nginx-ui-frontend/src/lib/http/index.js b/nginx-ui-frontend/src/lib/http/index.js index 1b7ccf92..9d5ecb43 100644 --- a/nginx-ui-frontend/src/lib/http/index.js +++ b/nginx-ui-frontend/src/lib/http/index.js @@ -1,5 +1,4 @@ import axios from 'axios' -import store from '../store' /* 创建 axios 实例 */ let http = axios.create({ @@ -33,13 +32,6 @@ http.interceptors.response.use( }, async error => { console.log(error) - switch (error.response.status) { - case 401: - case 403: - // 无权访问时，直接登出 - await store.dispatch('logout') - break - } return Promise.reject(error.response.data) } ) diff --git a/nginx-ui-frontend/src/router/index.js b/nginx-ui-frontend/src/router/index.js index 99bcbb46..53dddb5c 100644 --- a/nginx-ui-frontend/src/router/index.js +++ b/nginx-ui-frontend/src/router/index.js @@ -9,7 +9,7 @@ export const routes = [ path: '/', name: '首页', component: () => import('@/layouts/BaseLayout'), - redirect: '/domain', + redirect: '/dashboard', children: [ { path: 'dashboard', diff --git a/nginx-ui-frontend/src/views/About.vue b/nginx-ui-frontend/src/views/About.vue index d61f152d..c65862b0 100644 --- a/nginx-ui-frontend/src/views/About.vue +++ b/nginx-ui-frontend/src/views/About.vue @@ -4,13 +4,13 @@

Yet another WebUI for Nginx

Version: {{ version }}-{{ build_id }}

项目组

-

前端：0xJacky

-

后端：0xJacky

+

Designer：@0xJacky

技术栈

Go

Gin

Vue

- +

开源协议

+

GNU General Public License v2.0

Copyright © 2020 - {{ this_year }} 0xJacky

diff --git a/nginx-ui-frontend/src/views/DashBoard.vue b/nginx-ui-frontend/src/views/DashBoard.vue index 518f763d..464dd928 100644 --- a/nginx-ui-frontend/src/views/DashBoard.vue +++ b/nginx-ui-frontend/src/views/DashBoard.vue @@ -2,7 +2,7 @@
- + @@ -10,23 +10,27 @@ % - +

运行时间 {{ uptime }}

+

系统负载 1min:{{ loadavg.Loadavg1 }} 5min:{{ loadavg.Loadavg5 }} + 15min:{{ loadavg.Loadavg15 }}

+ - - 实际内存占用 +
- + :title="'已使用: '+ memory_used + ' 缓存: ' + memory_cached + ' 空闲:' + memory_free + + ' 物理内存: ' + memory_total"> + +

实际内存占用
- - 存储空间 +
- + +

存储空间
@@ -38,16 +42,12 @@