diff --git a/nginx-ui-frontend/.env.development b/nginx-ui-frontend/.env.development index c2a88dd5..a879405c 100644 --- a/nginx-ui-frontend/.env.development +++ b/nginx-ui-frontend/.env.development @@ -1 +1,2 @@ VUE_APP_API_ROOT = / +VUE_APP_API_WSS_ROOT = diff --git a/nginx-ui-frontend/.env.production b/nginx-ui-frontend/.env.production index e5279c3b..42ea6cb4 100644 --- a/nginx-ui-frontend/.env.production +++ b/nginx-ui-frontend/.env.production @@ -1 +1,2 @@ VUE_APP_API_ROOT = /api +VUE_APP_API_WSS_ROOT = diff --git a/nginx-ui-frontend/package.json b/nginx-ui-frontend/package.json index 445b2946..80a93016 100644 --- a/nginx-ui-frontend/package.json +++ b/nginx-ui-frontend/package.json @@ -11,6 +11,7 @@ "ant-design-vue": "^1.7.3", "axios": "^0.21.1", "core-js": "^3.9.0", + "viser-vue": "^2.4.8", "vue": "^2.6.11", "vue-itextarea": "^1.0.9", "vue-router": "^3.5.1", diff --git a/nginx-ui-frontend/src/components/Charts/Bar.vue b/nginx-ui-frontend/src/components/Charts/Bar.vue new file mode 100644 index 00000000..44828453 --- /dev/null +++ b/nginx-ui-frontend/src/components/Charts/Bar.vue @@ -0,0 +1,62 @@ + + + diff --git a/nginx-ui-frontend/src/components/Charts/ChartCard.vue b/nginx-ui-frontend/src/components/Charts/ChartCard.vue new file mode 100644 index 00000000..03c26abf --- /dev/null +++ b/nginx-ui-frontend/src/components/Charts/ChartCard.vue @@ -0,0 +1,110 @@ + + + + + diff --git a/nginx-ui-frontend/src/components/Charts/Liquid.vue b/nginx-ui-frontend/src/components/Charts/Liquid.vue new file mode 100644 index 00000000..4019fb18 --- /dev/null +++ b/nginx-ui-frontend/src/components/Charts/Liquid.vue @@ -0,0 +1,67 @@ + + + + + diff --git a/nginx-ui-frontend/src/components/Charts/MiniArea.vue b/nginx-ui-frontend/src/components/Charts/MiniArea.vue new file mode 100644 index 00000000..b7fbb89d --- /dev/null +++ b/nginx-ui-frontend/src/components/Charts/MiniArea.vue @@ -0,0 +1,51 @@ + + + + + diff --git a/nginx-ui-frontend/src/components/Charts/MiniBar.vue b/nginx-ui-frontend/src/components/Charts/MiniBar.vue new file mode 100644 index 00000000..078a0bc0 --- /dev/null +++ b/nginx-ui-frontend/src/components/Charts/MiniBar.vue @@ -0,0 +1,37 @@ + + + + + diff --git a/nginx-ui-frontend/src/components/Charts/MiniProgress.vue b/nginx-ui-frontend/src/components/Charts/MiniProgress.vue new file mode 100644 index 00000000..e6913631 --- /dev/null +++ b/nginx-ui-frontend/src/components/Charts/MiniProgress.vue @@ -0,0 +1,75 @@ + + + + + diff --git a/nginx-ui-frontend/src/components/Charts/MiniSmoothArea.vue b/nginx-ui-frontend/src/components/Charts/MiniSmoothArea.vue new file mode 100644 index 00000000..a00d9bf0 --- /dev/null +++ b/nginx-ui-frontend/src/components/Charts/MiniSmoothArea.vue @@ -0,0 +1,39 @@ + + + + + diff --git a/nginx-ui-frontend/src/components/Charts/Radar.vue b/nginx-ui-frontend/src/components/Charts/Radar.vue new file mode 100644 index 00000000..5ee88ade --- /dev/null +++ b/nginx-ui-frontend/src/components/Charts/Radar.vue @@ -0,0 +1,68 @@ + + + + + diff --git a/nginx-ui-frontend/src/components/Charts/RankList.vue b/nginx-ui-frontend/src/components/Charts/RankList.vue new file mode 100644 index 00000000..afb56a1a --- /dev/null +++ b/nginx-ui-frontend/src/components/Charts/RankList.vue @@ -0,0 +1,77 @@ + + + + + diff --git a/nginx-ui-frontend/src/components/Charts/TagCloud.vue b/nginx-ui-frontend/src/components/Charts/TagCloud.vue new file mode 100644 index 00000000..74d1b3f1 --- /dev/null +++ b/nginx-ui-frontend/src/components/Charts/TagCloud.vue @@ -0,0 +1,113 @@ + + + diff --git a/nginx-ui-frontend/src/components/Charts/TransferBar.vue b/nginx-ui-frontend/src/components/Charts/TransferBar.vue new file mode 100644 index 00000000..7f96f0be --- /dev/null +++ b/nginx-ui-frontend/src/components/Charts/TransferBar.vue @@ -0,0 +1,64 @@ + + + diff --git a/nginx-ui-frontend/src/components/Charts/Trend.vue b/nginx-ui-frontend/src/components/Charts/Trend.vue new file mode 100644 index 00000000..6ca41386 --- /dev/null +++ b/nginx-ui-frontend/src/components/Charts/Trend.vue @@ -0,0 +1,87 @@ + + + + + diff --git a/nginx-ui-frontend/src/components/Charts/chart.less b/nginx-ui-frontend/src/components/Charts/chart.less new file mode 100644 index 00000000..e04fa095 --- /dev/null +++ b/nginx-ui-frontend/src/components/Charts/chart.less @@ -0,0 +1,13 @@ +.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 new file mode 100644 index 00000000..74d6bf45 --- /dev/null +++ b/nginx-ui-frontend/src/components/Charts/index.js @@ -0,0 +1,28 @@ +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 new file mode 100644 index 00000000..189d7931 --- /dev/null +++ b/nginx-ui-frontend/src/components/Charts/smooth.area.less @@ -0,0 +1,4 @@ +.ant-pro-smooth-area { + position: relative; + width: 100%; +} diff --git a/nginx-ui-frontend/src/router/index.js b/nginx-ui-frontend/src/router/index.js index 046090ea..99bcbb46 100644 --- a/nginx-ui-frontend/src/router/index.js +++ b/nginx-ui-frontend/src/router/index.js @@ -11,15 +11,15 @@ export const routes = [ component: () => import('@/layouts/BaseLayout'), redirect: '/domain', children: [ - /*{ + { path: 'dashboard', - //component: () => import('@/views/dashboard/DashBoard'), + component: () => import('@/views/DashBoard'), name: '仪表盘', meta: { //hiddenHeaderContent: true, icon: 'home' } - },*/ + }, { path: 'domain', name: '网站管理', diff --git a/nginx-ui-frontend/src/views/ConfigEdit.vue b/nginx-ui-frontend/src/views/ConfigEdit.vue index d46768dd..35cd34f1 100644 --- a/nginx-ui-frontend/src/views/ConfigEdit.vue +++ b/nginx-ui-frontend/src/views/ConfigEdit.vue @@ -1,6 +1,6 @@