diff --git a/src/api/tjanalysis/index.ts b/src/api/tjanalysis/index.ts
index adfff23..bd444aa 100644
--- a/src/api/tjanalysis/index.ts
+++ b/src/api/tjanalysis/index.ts
@@ -124,4 +124,9 @@ export const querySizingmillDay = async (params) => {
 // 导出热轧定经机日统计报表
 export const exportSizingmillDay = async (params) => {
   return await request.download({ url: `/tjanalysis/exportSizingmillDay`, params })
+}
+
+// 获取能耗统计报表
+export const queryEnergyConsumption = async (params) => {
+  return await request.get({ url: `/tjanalysis/queryEnergyConsumption`, params })
 }
\ No newline at end of file
diff --git a/src/utils/dict.ts b/src/utils/dict.ts
index f62e7a7..cdd5072 100644
--- a/src/utils/dict.ts
+++ b/src/utils/dict.ts
@@ -203,5 +203,8 @@ export enum DICT_TYPE {
   LAB_USER_TEST_TYPE = 'test_user_type',
   LAB_AUDIT_STATUS   = 'lab_audit_status',
   LAB_ASYNC_BUS_TYPE = 'lab_async_bus_type',
-  LAB_OPR_TYPE = 'lab_opr_type'
+  LAB_OPR_TYPE = 'lab_opr_type',
+
+// ========== 统计报表能耗单位字典 ============
+ENERGY_CONSUMPTION_TYPE = 'energy_consumption_type'
 }
diff --git a/src/views/tjanalysis/energyconsumption/index.vue b/src/views/tjanalysis/energyconsumption/index.vue
new file mode 100644
index 0000000..a609f9b
--- /dev/null
+++ b/src/views/tjanalysis/energyconsumption/index.vue
@@ -0,0 +1,187 @@
+<template>
+  <ContentWrap>
+    <!-- 能耗搜索工作栏 -->
+    <el-form :model="queryParams" ref="queryForm" :inline="true">
+      <el-form-item label="日期" prop="dateRange">
+        <el-date-picker
+          v-model="queryParams.dateRange"
+          style="width: 240px; height: 30px"
+          value-format="YYYY-MM-DD"
+          end-placeholder="结束日期"
+          start-placeholder="开始日期"
+          type="daterange"
+        />
+      </el-form-item>
+      <el-form-item label="位置" prop="flag">
+        <el-select v-model="queryParams.flag" placeholder="请选择">
+          <el-option
+            v-for="item in flagList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button size="mini" @click="resetQuery">重置</el-button>
+        <el-button type="success" @click="exportElecTotal" size="mini">导出</el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-divider content-position="left"><div style="font-size:16px; float: left"><b>{{names}}</b></div></el-divider>
+    <el-table
+      v-loading="loading" :data="dataList" border="true" highlight-current-row="true" 
+      header-row-style="height: 50px; text-align: center" :span-method="arraySpanMethod" 
+      :row-class-name="tableRowClassName" :cell-class-name="tableCellClassName">
+      <el-table-column label="" prop="name" align="right" :show-overflow-tooltip="true" width="150" />
+      <el-table-column label="00:00-08:00" prop="num0008" align="center" :show-overflow-tooltip="true" />
+      <el-table-column label="08:00-16:00" prop="num0816" align="center" :show-overflow-tooltip="true" />
+      <el-table-column label="16:00-24:00" prop="num1624" align="center" :show-overflow-tooltip="true" />
+      <el-table-column label="00:00-12:00" prop="num0012" align="center" :show-overflow-tooltip="true" />
+      <el-table-column label="12:00-24:00" prop="num1224" align="center" :show-overflow-tooltip="true" />
+      <el-table-column label="总(00:00-24:00)" prop="num0024" align="center" :show-overflow-tooltip="true" />
+    </el-table>
+  </ContentWrap>
+
+</template>
+
+<script setup lang="ts">
+import * as TjanalysisApi from '@/api/tjanalysis'
+import { formatDate } from '@/utils/formatTime'
+import * as DictApi from '@/utils/dict'
+
+defineOptions({ name: 'energyconsumption' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const loading = ref(true)
+const dataList = ref([])
+const names = ref('');
+const queryParams = reactive({
+  dateRange: [],
+  flag: '1'
+})
+
+const flagList =ref([])
+const handleQuery = async () => {
+  const ll = flagList.value.find(map=>map.value == queryParams.flag);
+  names.value = ll?.label
+  dataList.value = [];
+  getList()
+}
+
+const resetQuery = async () => {
+  let today = new Date();  
+  
+  // 计算昨天的日期  
+  today.setDate(today.getDate() - 1);  
+    
+  // 格式化日期为 "yyyy-MM-dd"  
+  let year = today.getFullYear();  
+  let month = String(today.getMonth() + 1).padStart(2, '0'); // 月份从0开始，所以需要+1，并确保是两位数  
+  let date = String(today.getDate()).padStart(2, '0'); // 确保日期是两位数  
+    
+  let yesterdayAsString = `${year}-${month}-${date}`;  
+    
+  console.log(yesterdayAsString);  
+
+
+  queryParams.dateRange=[yesterdayAsString,yesterdayAsString]
+  getList()
+}
+
+const getList = async () => {
+  const res = await TjanalysisApi.queryEnergyConsumption(queryParams)
+    dataList.value  = res.dataList
+  loading.value = false
+}
+
+function arraySpanMethod ({ row, column, rowIndex, columnIndex }) {
+  if (rowIndex == 6) {
+    if (columnIndex == 0) {
+      return {
+        rowspan: 1,
+        colspan: 10
+      }
+    } else if (columnIndex == 10) {
+      return {
+        rowspan: 1,
+        colspan: 2
+      }
+    } else {
+      return {
+        rowspan: 0,
+        colspan: 0
+      }
+    }
+  }
+}
+
+function tableRowClassName({row, rowIndex}) {
+  if (rowIndex === 7) {
+    return 'success-row'
+  }
+  return ''
+}
+
+function tableCellClassName({row, column, rowIndex, columnIndex}) {
+  if (columnIndex == 0) {
+    return 'success-cols'
+  }
+}
+
+const exportElecTotal = async () => {
+  const res = await TjanalysisApi.exportHrpuncherDay(queryParams)
+  if (res != null) {
+    let url = window.URL.createObjectURL(new Blob([res]));
+    let link = document.createElement("a");
+    link.style.display = "none";
+    link.href = url;
+    link.setAttribute("download", "热轧穿孔机日统计.xlsx"); 
+    document.body.appendChild(link);
+    link.click();
+  }
+}
+
+/** 初始化 **/
+onMounted(async () => {
+    // 获取当前日期  
+ let today = new Date();  
+  // 计算昨天的日期  
+  today.setDate(today.getDate() - 1);  
+  // 格式化日期为 "yyyy-MM-dd"  
+  let year = today.getFullYear();  
+  let month = String(today.getMonth() + 1).padStart(2, '0'); // 月份从0开始，所以需要+1，并确保是两位数  
+  let date = String(today.getDate()).padStart(2, '0'); // 确保日期是两位数  
+  let yesterdayAsString = `${year}-${month}-${date}`;  
+  console.log(yesterdayAsString);  
+  queryParams.dateRange=[yesterdayAsString,yesterdayAsString]
+  const res =await DictApi.getStrDictOptions(DICT_TYPE.ENERGY_CONSUMPTION_TYPE);
+  if (res != null && res.length>0) {
+    flagList.value  = res
+    queryParams.flag= flagList.value[0].value;
+    const ll = flagList.value.find(map=>map.value == queryParams.flag);
+    names.value = ll?.label
+  } 
+  getList()
+})
+
+</script>
+
+<style>
+  .el-table .success-row {
+    background: #f0f9eb;
+  }
+
+  .el-table .success-cols {
+    font-weight: bold;
+  }
+</style>
+
diff --git a/src/views/tjanalysis/platscale/index.vue b/src/views/tjanalysis/platscale/index.vue
index 9686447..7572518 100644
--- a/src/views/tjanalysis/platscale/index.vue
+++ b/src/views/tjanalysis/platscale/index.vue
@@ -30,7 +30,7 @@
   <!-- 列表 -->
   <ContentWrap>
     <el-table v-loading="loading" :data="dataList.dList" border="true" highlight-current-row="true">
-      <el-table-column label="序号1" type="index" width="80" align="center" />
+      <el-table-column label="序号" type="index" width="80" align="center" />
       <el-table-column label="供货单位(使用单位)" prop="ghdw" align="center" :show-overflow-tooltip="true" />
       <el-table-column label="运输单位" prop="ysdw" align="center" :show-overflow-tooltip="true" />
       <el-table-column label="品种" prop="pz" align="center" :show-overflow-tooltip="true" />
@@ -79,7 +79,11 @@ const resetQuery = async () => {
   getList()
 }
 
-const getList = async () => {
+const getList = async (page) => {
+  if(page){
+    queryParams.pageNo = page.page
+    queryParams.pageSize = page.limit
+  }
   const res = await TjanalysisApi.queryTjPlatScales(queryParams)
   if (res != null && res.list != null) {
     dataList.dList = res.list