diff --git a/src/views/enm_energy/day_base.vue b/src/views/enm_energy/day_base.vue
index 99d9efc2..3a3a2247 100644
--- a/src/views/enm_energy/day_base.vue
+++ b/src/views/enm_energy/day_base.vue
@@ -52,40 +52,40 @@
 							</tr>
 						</thead>
 						<tr v-for="(item, index) in tableDatas" :key="index">
-							<td class="numCell" v-if="index == 0" rowspan="4">
+							<td class="numCell" v-if="index == 0">
 								{{ item[0] }}
 							</td>
 							<td
 								class="numCell"
-								v-else-if="index == 4"
+								v-else-if="index == 1"
 								rowspan="5"
 							>
 								{{ item[0] }}
 							</td>
 							<td
 								class="numCell"
-								v-else-if="index == 9"
+								v-else-if="index == 6"
 								rowspan="5"
 							>
 								{{ item[0] }}
 							</td>
 							<td
 								class="numCell"
-								v-else-if="index == 14"
+								v-else-if="index == 11"
 								rowspan="4"
 							>
 								{{ item[0] }}
 							</td>
 							<td
 								class="numCell"
-								v-else-if="index == 18"
-								rowspan="3"
+								v-else-if="index == 15"
+								rowspan="2"
 							>
 								{{ item[0] }}
 							</td>
 							<td
 								class="numCell"
-								v-else-if="index == 21"
+								v-else-if="index == 17"
 								rowspan="5"
 							>
 								{{ item[0] }}
@@ -93,7 +93,7 @@
 							<td
 								class="numCell"
 								v-else-if="
-									index == 26 || index == 27 || index == 28
+									index == 22 || index == 23 || index == 24
 								"
 							>
 								{{ item[0] }}
@@ -279,7 +279,7 @@ export default {
 					need_display: 1,
 					ordering: "report_sortstr",
 					material__code: "elec",
-					query: { id, name, nickname, mgroup_name, unit },
+					query: "{ id, name, nickname, mgroup_name, unit }",
 				})
 				.then((res) => {
 					let data = res.slice(3);
diff --git a/src/views/enm_energy/hour_base.vue b/src/views/enm_energy/hour_base.vue
index cadf4bc4..d7da7485 100644
--- a/src/views/enm_energy/hour_base.vue
+++ b/src/views/enm_energy/hour_base.vue
@@ -52,40 +52,40 @@
 							</tr>
 						</thead>
 						<tr v-for="(item, index) in tableDatas" :key="index">
-							<td class="numCell" v-if="index == 0" rowspan="4">
+							<td class="numCell" v-if="index == 0">
 								{{ item[0] }}
 							</td>
 							<td
 								class="numCell"
-								v-else-if="index == 4"
+								v-else-if="index == 1"
 								rowspan="5"
 							>
 								{{ item[0] }}
 							</td>
 							<td
 								class="numCell"
-								v-else-if="index == 9"
+								v-else-if="index == 6"
 								rowspan="5"
 							>
 								{{ item[0] }}
 							</td>
 							<td
 								class="numCell"
-								v-else-if="index == 14"
+								v-else-if="index == 11"
 								rowspan="4"
 							>
 								{{ item[0] }}
 							</td>
 							<td
 								class="numCell"
-								v-else-if="index == 18"
-								rowspan="3"
+								v-else-if="index == 15"
+								rowspan="2"
 							>
 								{{ item[0] }}
 							</td>
 							<td
 								class="numCell"
-								v-else-if="index == 21"
+								v-else-if="index == 17"
 								rowspan="5"
 							>
 								{{ item[0] }}
@@ -93,7 +93,7 @@
 							<td
 								class="numCell"
 								v-else-if="
-									index == 26 || index == 27 || index == 28
+									index == 22 || index == 23 || index == 24
 								"
 							>
 								{{ item[0] }}
@@ -328,6 +328,7 @@ export default {
 			// }
 			let nowDate = new Date();
 			that.timeStamp = nowDate.getTime();
+			that.getLengthData();
 			that.dataLoop();
 		},
 		getMPoints() {
@@ -339,7 +340,7 @@ export default {
 					need_display: 1,
 					ordering: "report_sortstr",
 					material__code: "elec",
-					query: { id, name, nickname, mgroup_name, unit },
+					query: "{ id, name, nickname, mgroup_name, unit }",
 				})
 				.then((res) => {
 					let data = res.slice(3);
@@ -347,6 +348,15 @@ export default {
 					that.dataLoop();
 				});
 		},
+		getLengthData() {
+			let that = this;
+			let arrs = [];
+			that.mpointList.forEach((item, index) => {
+				if (arrs.indexOf(item.mgroup_name) == -1) {
+					arrs.push(item.mgroup_name);
+				}
+			});
+		},
 		dataLoop() {
 			let that = this;
 			that.tableDatas = [];
diff --git a/src/views/enm_energy/month_base.vue b/src/views/enm_energy/month_base.vue
index b89419d4..649ed633 100644
--- a/src/views/enm_energy/month_base.vue
+++ b/src/views/enm_energy/month_base.vue
@@ -52,40 +52,40 @@
 							</tr>
 						</thead>
 						<tr v-for="(item, index) in tableDatas" :key="index">
-							<td class="numCell" v-if="index == 0" rowspan="4">
+							<td class="numCell" v-if="index == 0">
 								{{ item[0] }}
 							</td>
 							<td
 								class="numCell"
-								v-else-if="index == 4"
+								v-else-if="index == 1"
 								rowspan="5"
 							>
 								{{ item[0] }}
 							</td>
 							<td
 								class="numCell"
-								v-else-if="index == 9"
+								v-else-if="index == 6"
 								rowspan="5"
 							>
 								{{ item[0] }}
 							</td>
 							<td
 								class="numCell"
-								v-else-if="index == 14"
+								v-else-if="index == 11"
 								rowspan="4"
 							>
 								{{ item[0] }}
 							</td>
 							<td
 								class="numCell"
-								v-else-if="index == 18"
-								rowspan="3"
+								v-else-if="index == 15"
+								rowspan="2"
 							>
 								{{ item[0] }}
 							</td>
 							<td
 								class="numCell"
-								v-else-if="index == 21"
+								v-else-if="index == 17"
 								rowspan="5"
 							>
 								{{ item[0] }}
@@ -93,7 +93,7 @@
 							<td
 								class="numCell"
 								v-else-if="
-									index == 26 || index == 27 || index == 28
+									index == 22 || index == 23 || index == 24
 								"
 							>
 								{{ item[0] }}
@@ -269,7 +269,7 @@ export default {
 					need_display: 1,
 					ordering: "report_sortstr",
 					material__code: "elec",
-					query: { id, name, nickname, mgroup_name, unit },
+					query: "{ id, name, nickname, mgroup_name, unit }",
 				})
 				.then((res) => {
 					let data = res.slice(3);