From bf581b872d5d8534c650d7124ca90269296e4063 Mon Sep 17 00:00:00 2001
From: zty <zty18395607196@163.com>
Date: Fri, 6 Dec 2024 15:06:38 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E5=B3=B0=E8=B0=B7?=
 =?UTF-8?q?=E5=B9=B3=E7=9A=84=E6=8A=A5=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/enm_energy/electric_peak.vue | 27 ++++++++------------------
 1 file changed, 8 insertions(+), 19 deletions(-)

diff --git a/src/views/enm_energy/electric_peak.vue b/src/views/enm_energy/electric_peak.vue
index abc5302f..7d9d6dd1 100644
--- a/src/views/enm_energy/electric_peak.vue
+++ b/src/views/enm_energy/electric_peak.vue
@@ -58,24 +58,6 @@
 			</div>
 		</el-header>
         <el-card style="margin-top:5px">
-            <!-- <div ref="print" id="myReport" class="printContainer">
-                <h3 style="text-align: center;">{{ tableName }}</h3>
-                <el-table
-                    :data="tableData"
-                    style="width: 100%"
-                    border
-                    :height="tableHeight"
-                    :span-method="objectSpanMethod">
-                    <el-table-column
-                        v-for="item in tableData[0]"
-                        :key="item"
-                        :prop="item"
-                        :label="item"
-                        width="100">
-                    </el-table-column>
-                </el-table>
-
-             </div>  -->
              <div>
                 <table id="myTable" class="myTable" border="1"  cellspacing="0" style="width: 100%; text-align: center;">
                 <thead class="myTableHead">
@@ -86,7 +68,14 @@
                 </thead>
                 <tbody>
                     <tr v-for="(row, rowIndex) in tableData" :key="rowIndex">
-                        <td v-for="(cell, cellIndex) in row" :key="cellIndex"
+                        <td 
+                            v-if="rowIndex === 0 || rowIndex === 2 || rowIndex === 4"
+                            :rowspan="rowIndex === 0 || rowIndex === 2 ? 2 : 1"
+                        >
+                            {{ row[0] }}
+                        </td>
+                        <td>{{ row[1] }}</td>
+                        <td v-for="(cell, cellIndex) in row.slice(2)" :key="cellIndex"
                         >{{ cell }}</td>
                     </tr>
                 </tbody>