From 87ebb286373e365b4bb427177b26cf00dda1e2f3 Mon Sep 17 00:00:00 2001
From: yyt <306727702@qq.com>
Date: 星期三, 24 一月 2024 11:17:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
jcdm-ui/src/views/index.vue | 18 +++++++-----------
1 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/jcdm-ui/src/views/index.vue b/jcdm-ui/src/views/index.vue
index 727f870..c0abca2 100644
--- a/jcdm-ui/src/views/index.vue
+++ b/jcdm-ui/src/views/index.vue
@@ -1,23 +1,19 @@
<template>
<div class="dashboard-editor-container">
- <panel-group @handleSetLineChartData="handleSetLineChartData" />
- <el-row style="margin-top: 12px" >
- <el-row style="background:#fff;padding:16px 16px 0;margin-bottom:32px;">
+ <panel-group style="margin-bottom: 10px" @handleSetLineChartData="handleSetLineChartData" />
+
+ <el-row style="background:#fff;padding:16px 16px 0; width: 1292px">
<el-col :xs="24" :sm="12">
- <el-card>
- <pie-chart />
- </el-card>
+ <pie-chart />
</el-col>
<el-col :xs="24" :sm="12">
- <el-card>
- <line-chart :chart-data="lineChartData" />
- </el-card>
+ <line-chart :chart-data="lineChartData" />
</el-col>
</el-row>
- </el-row>
+
</div>
</template>
@@ -73,7 +69,7 @@
<style lang="scss" scoped>
.dashboard-editor-container {
- padding: 32px;
+ padding: 20px;
background-color: rgb(240, 242, 245);
position: relative;
--
Gitblit v1.9.3