diff --git a/src/layout/components/NavHeader/Organization.vue b/src/layout/components/NavHeader/Organization.vue index eff3f1032..0f3afe277 100644 --- a/src/layout/components/NavHeader/Organization.vue +++ b/src/layout/components/NavHeader/Organization.vue @@ -8,6 +8,7 @@ > > > .el-input__prefix { - left: 8px + &>>> .el-input__prefix { + left: 1px } - & > > > .el-input--prefix .el-input__inner { + &>>> .el-input--prefix .el-input__inner { line-height: 35px !important; height: 35px !important; } - & > > > .fa-sitemap { + &>>> .fa-sitemap { padding-left: 4px; } - & > > > .el-input__icon { + & >>> .el-input__icon { color: #606266; } - & > > > .el-input .el-select__caret { - color: #8d8f93; + & >>> .el-input .el-select__caret { + color: #FFF; } } -.option-group > > > .el-select-group__title { +.option-group >>> .el-select-group__title { color: #909399 !important; padding-left: 15px; font-size: 12px; diff --git a/src/layout/components/NavHeader/index.vue b/src/layout/components/NavHeader/index.vue index 01b0b712e..3aa7c3df6 100644 --- a/src/layout/components/NavHeader/index.vue +++ b/src/layout/components/NavHeader/index.vue @@ -94,7 +94,7 @@ export default { height: $header-height; line-height: $header-height; overflow: hidden; - background: #f3f3f4; + background: var(--color-primary); .navbar-left { float: left; diff --git a/src/layout/components/Page/PageContent.vue b/src/layout/components/Page/PageContent.vue index 0ba1101d5..66bef506f 100644 --- a/src/layout/components/Page/PageContent.vue +++ b/src/layout/components/Page/PageContent.vue @@ -12,7 +12,7 @@ export default { diff --git a/src/views/dashboard/Left.vue b/src/views/dashboard/Left.vue new file mode 100644 index 000000000..9413fb41b --- /dev/null +++ b/src/views/dashboard/Left.vue @@ -0,0 +1,35 @@ + + + + + diff --git a/src/views/dashboard/TrendSummary.vue b/src/views/dashboard/TrendSummary.vue new file mode 100644 index 000000000..9312a4be6 --- /dev/null +++ b/src/views/dashboard/TrendSummary.vue @@ -0,0 +1,36 @@ + + + + + diff --git a/src/views/dashboard/components/ColumnChart.vue b/src/views/dashboard/components/ColumnChart.vue new file mode 100644 index 000000000..b2a2f523a --- /dev/null +++ b/src/views/dashboard/components/ColumnChart.vue @@ -0,0 +1,191 @@ + + + + + diff --git a/src/views/dashboard/components/DataCard.vue b/src/views/dashboard/components/DataCard.vue new file mode 100644 index 000000000..06cade9b6 --- /dev/null +++ b/src/views/dashboard/components/DataCard.vue @@ -0,0 +1,85 @@ + + + + + diff --git a/src/views/dashboard/components/LineChart.vue b/src/views/dashboard/components/LineChart.vue new file mode 100644 index 000000000..11d98ad59 --- /dev/null +++ b/src/views/dashboard/components/LineChart.vue @@ -0,0 +1,232 @@ + + + + + diff --git a/src/views/dashboard/components/RealTimeSummary.vue b/src/views/dashboard/components/RealTimeSummary.vue new file mode 100644 index 000000000..9f3eaa829 --- /dev/null +++ b/src/views/dashboard/components/RealTimeSummary.vue @@ -0,0 +1,116 @@ + + + + + diff --git a/src/views/dashboard/components/RingChart.vue b/src/views/dashboard/components/RingChart.vue new file mode 100644 index 000000000..3eee938e2 --- /dev/null +++ b/src/views/dashboard/components/RingChart.vue @@ -0,0 +1,99 @@ + + + + + diff --git a/src/views/dashboard/components/SummaryCard.vue b/src/views/dashboard/components/SummaryCard.vue new file mode 100644 index 000000000..9ccf643b3 --- /dev/null +++ b/src/views/dashboard/components/SummaryCard.vue @@ -0,0 +1,63 @@ + + + + + diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index 29041b81b..cbb86acfd 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -2,8 +2,17 @@
- - + + + + + + + + + + +
@@ -13,19 +22,21 @@