From ed7f09e0376d542bfddb05268f0081ba89a86868 Mon Sep 17 00:00:00 2001
From: jiang <1354748262@qq.com>
Date: 星期三, 24 一月 2024 15:26:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 jcdm-ui/src/views/index.vue |   14 +++++---------
 1 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/jcdm-ui/src/views/index.vue b/jcdm-ui/src/views/index.vue
index 37ff1f2..c0abca2 100644
--- a/jcdm-ui/src/views/index.vue
+++ b/jcdm-ui/src/views/index.vue
@@ -1,19 +1,15 @@
 <template>
   <div class="dashboard-editor-container">
 
-    <panel-group @handleSetLineChartData="handleSetLineChartData" />
+    <panel-group style="margin-bottom: 10px" @handleSetLineChartData="handleSetLineChartData" />
 
-    <el-row style="background:#fff;padding:16px 16px 0;margin-bottom:32px;">
+    <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>
@@ -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