diff --git a/src/views/enm_energy/day_base.vue b/src/views/enm_energy/day_base.vue
index 3a3a2247..f21e30dc 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">
+							<td class="numCell" v-if="index == 0" rowspan="4">
 								{{ item[0] }}
 							</td>
 							<td
 								class="numCell"
-								v-else-if="index == 1"
+								v-else-if="index == 4"
 								rowspan="5"
 							>
 								{{ item[0] }}
 							</td>
 							<td
 								class="numCell"
-								v-else-if="index == 6"
+								v-else-if="index == 9"
 								rowspan="5"
 							>
 								{{ item[0] }}
 							</td>
 							<td
 								class="numCell"
-								v-else-if="index == 11"
+								v-else-if="index == 14"
 								rowspan="4"
 							>
 								{{ item[0] }}
 							</td>
 							<td
 								class="numCell"
-								v-else-if="index == 15"
-								rowspan="2"
+								v-else-if="index == 18"
+								rowspan="3"
 							>
 								{{ item[0] }}
 							</td>
 							<td
 								class="numCell"
-								v-else-if="index == 17"
+								v-else-if="index == 21"
 								rowspan="5"
 							>
 								{{ item[0] }}
@@ -93,7 +93,7 @@
 							<td
 								class="numCell"
 								v-else-if="
-									index == 22 || index == 23 || index == 24
+									index == 26 || index == 27 || index == 28
 								"
 							>
 								{{ item[0] }}
@@ -278,11 +278,11 @@ export default {
 					enabled: 1,
 					need_display: 1,
 					ordering: "report_sortstr",
-					material__code: "elec",
+					material__code__in: "elec,elec_0",
 					query: "{ id, name, nickname, mgroup_name, unit }",
 				})
 				.then((res) => {
-					let data = res.slice(3);
+					// let data = res.slice(3);
 					that.mpointList = data;
 					that.dataLoop();
 				});
diff --git a/src/views/enm_energy/hour_base.vue b/src/views/enm_energy/hour_base.vue
index d7da7485..01d75cef 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">
+							<td class="numCell" v-if="index == 0" rowspan="4">
 								{{ item[0] }}
 							</td>
 							<td
 								class="numCell"
-								v-else-if="index == 1"
+								v-else-if="index == 4"
 								rowspan="5"
 							>
 								{{ item[0] }}
 							</td>
 							<td
 								class="numCell"
-								v-else-if="index == 6"
+								v-else-if="index == 9"
 								rowspan="5"
 							>
 								{{ item[0] }}
 							</td>
 							<td
 								class="numCell"
-								v-else-if="index == 11"
+								v-else-if="index == 14"
 								rowspan="4"
 							>
 								{{ item[0] }}
 							</td>
 							<td
 								class="numCell"
-								v-else-if="index == 15"
-								rowspan="2"
+								v-else-if="index == 18"
+								rowspan="3"
 							>
 								{{ item[0] }}
 							</td>
 							<td
 								class="numCell"
-								v-else-if="index == 17"
+								v-else-if="index == 21"
 								rowspan="5"
 							>
 								{{ item[0] }}
@@ -93,7 +93,7 @@
 							<td
 								class="numCell"
 								v-else-if="
-									index == 22 || index == 23 || index == 24
+									index == 26 || index == 27 || index == 28
 								"
 							>
 								{{ item[0] }}
@@ -339,12 +339,12 @@ export default {
 					enabled: 1,
 					need_display: 1,
 					ordering: "report_sortstr",
-					material__code: "elec",
+					material__code__in: "elec,elec_0",
 					query: "{ id, name, nickname, mgroup_name, unit }",
 				})
 				.then((res) => {
-					let data = res.slice(3);
-					that.mpointList = data;
+					// let data = res.slice(3);
+					that.mpointList = res;
 					that.dataLoop();
 				});
 		},
diff --git a/src/views/enm_energy/month_base.vue b/src/views/enm_energy/month_base.vue
index 649ed633..dbfb1910 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">
+							<td class="numCell" v-if="index == 0" rowspan="4">
 								{{ item[0] }}
 							</td>
 							<td
 								class="numCell"
-								v-else-if="index == 1"
+								v-else-if="index == 4"
 								rowspan="5"
 							>
 								{{ item[0] }}
 							</td>
 							<td
 								class="numCell"
-								v-else-if="index == 6"
+								v-else-if="index == 9"
 								rowspan="5"
 							>
 								{{ item[0] }}
 							</td>
 							<td
 								class="numCell"
-								v-else-if="index == 11"
+								v-else-if="index == 14"
 								rowspan="4"
 							>
 								{{ item[0] }}
 							</td>
 							<td
 								class="numCell"
-								v-else-if="index == 15"
-								rowspan="2"
+								v-else-if="index == 18"
+								rowspan="3"
 							>
 								{{ item[0] }}
 							</td>
 							<td
 								class="numCell"
-								v-else-if="index == 17"
+								v-else-if="index == 21"
 								rowspan="5"
 							>
 								{{ item[0] }}
@@ -93,7 +93,7 @@
 							<td
 								class="numCell"
 								v-else-if="
-									index == 22 || index == 23 || index == 24
+									index == 26 || index == 27 || index == 28
 								"
 							>
 								{{ item[0] }}
@@ -268,11 +268,11 @@ export default {
 					enabled: 1,
 					need_display: 1,
 					ordering: "report_sortstr",
-					material__code: "elec",
+					material__code__in: "elec,elec_0",
 					query: "{ id, name, nickname, mgroup_name, unit }",
 				})
 				.then((res) => {
-					let data = res.slice(3);
+					// let data = res.slice(3);
 					that.mpointList = data;
 					that.dataLoop();
 				});