diff --git a/src/assets/styles/common.scss b/src/assets/styles/common.scss index a34464c..2fd422e 100644 --- a/src/assets/styles/common.scss +++ b/src/assets/styles/common.scss @@ -3,14 +3,18 @@ */ //右侧内容区域 +//父元素 .ems-dashboard-editor-container{ background-color: #F1F5FC; padding: 24px; font-size: 12px; } -.ems-content-conatiner{ +//除去顶部信息(如搜索栏、站点基本信息等)外的 白色背景内容区域 +.ems-content-container{ background-color: #ffffff; + margin-top: 24px; } -ems-content-conatiner-padding{ +//需要设置内padding的白色背景区域 +.ems-content-container-padding{ padding: 24px; } diff --git a/src/router/index.js b/src/router/index.js index 1140df4..8ea2d50 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -69,7 +69,7 @@ export const constantRoutes = [ children: [ { path: 'index', - component: () => import('@/views/index'), + component: () => import('@/views/ems/home/index'), name: 'Index', meta: { title: '首页', icon: 'dashboard', affix: true } } diff --git a/src/views/ems/home/DlzbChart.vue b/src/views/ems/home/DlzbChart.vue new file mode 100644 index 0000000..92e34e5 --- /dev/null +++ b/src/views/ems/home/DlzbChart.vue @@ -0,0 +1,125 @@ + + + + + 电量指标 + 按年 + + + + + + + diff --git a/src/views/ems/home/GjdjfbChart.vue b/src/views/ems/home/GjdjfbChart.vue new file mode 100644 index 0000000..3f41fcb --- /dev/null +++ b/src/views/ems/home/GjdjfbChart.vue @@ -0,0 +1,122 @@ + + + + + 告警等级分布 + + + + + + + diff --git a/src/views/ems/home/GjqsChart.vue b/src/views/ems/home/GjqsChart.vue new file mode 100644 index 0000000..8cc4bc7 --- /dev/null +++ b/src/views/ems/home/GjqsChart.vue @@ -0,0 +1,106 @@ + + + + + 告警趋势 + + + + + + + diff --git a/src/views/ems/home/SbgjzbChart.vue b/src/views/ems/home/SbgjzbChart.vue new file mode 100644 index 0000000..3f76a8e --- /dev/null +++ b/src/views/ems/home/SbgjzbChart.vue @@ -0,0 +1,98 @@ + + + + + 设备告警占比 + + + + + + + diff --git a/src/views/ems/home/XtxlChart.vue b/src/views/ems/home/XtxlChart.vue new file mode 100644 index 0000000..a76cf27 --- /dev/null +++ b/src/views/ems/home/XtxlChart.vue @@ -0,0 +1,105 @@ + + + + + 系统效率 + + + + + + + diff --git a/src/views/ems/home/index.vue b/src/views/ems/home/index.vue new file mode 100644 index 0000000..8035444 --- /dev/null +++ b/src/views/ems/home/index.vue @@ -0,0 +1,71 @@ + + + + + 数据概览 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/ems/zddt/BarChart.vue b/src/views/ems/zddt/BarChart.vue index d24c6ec..9a8c0d1 100644 --- a/src/views/ems/zddt/BarChart.vue +++ b/src/views/ems/zddt/BarChart.vue @@ -39,6 +39,7 @@ export default { tooltip: {}, xAxis: { type: 'category' }, yAxis: { }, + grid:{top:20}, dataset:{ source:[ ['product','充电量','放电量'], diff --git a/src/views/ems/zddt/index.vue b/src/views/ems/zddt/index.vue index fd6629e..d16ec8e 100644 --- a/src/views/ems/zddt/index.vue +++ b/src/views/ems/zddt/index.vue @@ -1,7 +1,7 @@ - + @@ -81,11 +81,10 @@ export default {