diff --git a/nezha-fronted/src/components/common/language/en.js b/nezha-fronted/src/components/common/language/en.js
index fc4e5e3de..0f62c603f 100644
--- a/nezha-fronted/src/components/common/language/en.js
+++ b/nezha-fronted/src/components/common/language/en.js
@@ -178,7 +178,11 @@ const en = {
refresh:'Refresh',//'刷新'
edit:'Edit',//'编辑'
delete:'Delete',//'删除'
- screen:'Full screen'//'全屏'
+ screen:'Full screen',//'全屏',
+ overview:{
+ title:'Overview',
+ contentTitle:'Nezha Management System',
+ }
},
validate: { //校验规则
required: 'Required',//'必填项'
diff --git a/nezha-fronted/src/components/common/pagination.vue b/nezha-fronted/src/components/common/pagination.vue
index 7074d0f16..b066fd525 100644
--- a/nezha-fronted/src/components/common/pagination.vue
+++ b/nezha-fronted/src/components/common/pagination.vue
@@ -87,7 +87,6 @@ export default {
this.resetPageSizes();
}else{
let pageSize = localStorage.getItem('nz-pageSize-' + localStorage.getItem('nz-username') + '-' + this.tableId);
- console.log(typeof pageSize)
if(pageSize != 'undefined' && pageSize != null){
this.pageSize=parseInt(pageSize);
}
diff --git a/nezha-fronted/src/components/page/dashboard/metricPreview.vue b/nezha-fronted/src/components/page/dashboard/metricPreview.vue
index d718da04c..9d8b34360 100644
--- a/nezha-fronted/src/components/page/dashboard/metricPreview.vue
+++ b/nezha-fronted/src/components/page/dashboard/metricPreview.vue
@@ -6,6 +6,7 @@
diff --git a/nezha-fronted/src/components/page/dashboard/overview/chart.vue b/nezha-fronted/src/components/page/dashboard/overview/chart.vue
new file mode 100644
index 000000000..0efbae7ec
--- /dev/null
+++ b/nezha-fronted/src/components/page/dashboard/overview/chart.vue
@@ -0,0 +1,43 @@
+
+
+
+
+
+
+
diff --git a/nezha-fronted/src/components/page/dashboard/overview/chartConfig.vue b/nezha-fronted/src/components/page/dashboard/overview/chartConfig.vue
new file mode 100644
index 000000000..276511270
--- /dev/null
+++ b/nezha-fronted/src/components/page/dashboard/overview/chartConfig.vue
@@ -0,0 +1,82 @@
+
diff --git a/nezha-fronted/src/components/page/dashboard/overview/overview.scss b/nezha-fronted/src/components/page/dashboard/overview/overview.scss
new file mode 100644
index 000000000..067753ebb
--- /dev/null
+++ b/nezha-fronted/src/components/page/dashboard/overview/overview.scss
@@ -0,0 +1,80 @@
+.overview{
+ height: 100%;
+}
+
+.overview-content-header{
+ display: flex;
+ padding-top: 10px;
+}
+.overview-content-header .header-title{
+ flex:13;
+ height: 35px;
+ line-height: 35px;
+ font-size: 24px !important;
+ font-weight: 700;
+ margin-left: 15px;
+}
+.overview-content-header .header-tool{
+ flex: 2;
+ height: 35px;
+}
+.header-tool .tool-container{
+ display: flex;
+ text-align: center;
+}
+.tool-container .time{
+ flex: 4;
+ font-size: 24px !important;
+ font-weight: 700;
+ display: inline-block;
+ height: 35px;
+ line-height: 35px;
+ vertical-align: middle;
+}
+.tool-container .date{
+ flex: 4;
+ height: 35px;
+}
+.date .week{
+ font-size: 18px;
+ font-weight: bold;
+}
+.date .sys-date{
+ padding-top: 5px;
+ font-size: 12px;
+}
+.tool-container .operation{
+ flex: 2;
+ display: inline-block;
+ line-height: 35px;
+}
+.operation .nz-icon-maxview{
+ font-size: 30px !important;
+}
+.overview-content{
+ height: 100%;
+ width: 100%;
+}
+/*100份*/
+.overview-content .content-row-box{
+ margin: 15px 15px 15px 15px;
+ width: 99%;
+}
+.content-row-box .content-col-box{
+ border: 1px solid lightgrey;
+ padding: 15px;
+ display: inline-block;
+}
+.box-height-250{
+ height: 250px;
+}
+.box-height-350{
+ height: 350px;
+}
+.box-height-400{
+ height: 400px;
+}
+.box-height-500{
+ height: 500px;
+}
+
diff --git a/nezha-fronted/src/components/page/dashboard/overview/overview.vue b/nezha-fronted/src/components/page/dashboard/overview/overview.vue
new file mode 100644
index 000000000..bded6c4c7
--- /dev/null
+++ b/nezha-fronted/src/components/page/dashboard/overview/overview.vue
@@ -0,0 +1,137 @@
+
+
+
+
+
+
+
+
diff --git a/nezha-fronted/src/components/page/dashboard/panel.vue b/nezha-fronted/src/components/page/dashboard/panel.vue
index a28eedd4c..9807a3953 100644
--- a/nezha-fronted/src/components/page/dashboard/panel.vue
+++ b/nezha-fronted/src/components/page/dashboard/panel.vue
@@ -3,6 +3,7 @@
diff --git a/nezha-fronted/src/router/index.js b/nezha-fronted/src/router/index.js
index f8ab47e5e..ab6f4fbca 100644
--- a/nezha-fronted/src/router/index.js
+++ b/nezha-fronted/src/router/index.js
@@ -40,6 +40,10 @@ export default new Router({
path: '/metricPreview',
component: resolve => require(['../components/page/dashboard/metricPreview.vue'], resolve),
},
+ {
+ path: 'overview',
+ component: resolve => require(['../components/page/dashboard/overview/overview.vue'],resolve)
+ },
{
path: '/project',
component: resolve => require(['../components/page/project/project.vue'], resolve),