diff --git a/src/config/route.js b/src/config/route.js
index 37869059..e4c30e0f 100644
--- a/src/config/route.js
+++ b/src/config/route.js
@@ -945,6 +945,16 @@ const routes = [
 					perms: ["enm_energy"],
 				},
 				children: [
+					{
+						name: "energyFactory",
+						path: "/enm_energy/energyFactory",
+						meta: {
+							title: "能源监察报表",
+							// icon: "el-icon-grid",
+							perms: ["enm_energy_energy"],
+						},
+						component: "enm_energy/energyFactory",
+					},
 					{
 						name: "energy",
 						path: "/enm_energy/energy",
diff --git a/src/views/enm_energy/energyFactory.vue b/src/views/enm_energy/energyFactory.vue
new file mode 100644
index 00000000..998e930e
--- /dev/null
+++ b/src/views/enm_energy/energyFactory.vue
@@ -0,0 +1,170 @@
+<template>
+    <el-container>
+        <el-header>
+            <div class="left-panel">
+                <el-select
+                    v-model="query.type"
+                    placeholder="查询类型"
+                    clearable
+                    class="headerSearch"
+                    @change="typeCange"
+                >
+                    <el-option
+                    v-for="item in options"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.id"
+                    ></el-option>
+                </el-select>
+                <el-date-picker
+                    v-model="query.month"
+                    type="month"
+                    value-format="YYYY-MM"
+                    format="YYYY-MM"
+                    placeholder="查询月份"
+                    v-if="query.type==0"
+                    class="headerSearch"
+                />
+                <el-date-picker
+                    v-model="query.year"
+                    type="year"
+                    value-format="YYYY"
+                    format="YYYY"
+                    placeholder="查询年份"
+                    v-if="query.type==1"
+                    class="headerSearch"
+                />
+                <el-date-picker
+                    v-model="query.yearStart"
+                    type="year"
+                    value-format="YYYY"
+                    format="YYYY"
+                    placeholder="起始年份"
+                    v-if="query.type==2"
+                    class="headerSearch"
+                />
+                <el-button
+                type="primary"
+                icon="el-icon-search"
+                @click="getTableData"
+                ></el-button>
+                <el-button
+                    type="primary"
+                    @click="exportExcel()"
+                    :loading = "exportLoading"
+                    >导出xlsx
+                </el-button>
+                <el-button
+                    type="primary"
+                    @click="handlePrint"
+                    >打印
+                </el-button>
+            </div>
+        </el-header>
+        <el-main>
+			<el-card shadow="never" style="width: 100%;height: 100%;">
+				<div ref="print" id="myReport" class="printContainer">
+                    <el-table
+                        id="hourBaseTable"
+                        :data="tableDatas"
+                        border
+                    >
+                        <el-table-column label="能源监察报表" align="center">
+                            <el-table-column label="序号" prop="index" width="60">
+                            </el-table-column>
+                            <el-table-column label="指标名称" prop="name" min-width="100">
+                            </el-table-column>
+                            <el-table-column label="能耗" prop="value" min-width="80">
+                            </el-table-column>
+                            <el-table-column label="备注" prop="note" min-width="60">
+                            </el-table-column>
+                        </el-table-column>
+                    </el-table>
+                </div>
+			</el-card>
+		</el-main>
+    </el-container>
+  </template>
+<script>
+    export default {
+        data() {
+            return { 
+                query:{
+                    type:0,
+                    year:'',
+                    month:'',
+                    yearStart:'',
+                },
+                tableName:'能源监察日报表',
+                options:[
+                    {id:0,name:'日统计'},
+                    {id:1,name:'月统计'},
+                    {id:2,name:'年统计'},
+                ],
+                tableDatas:[
+                    {index:1,name:'水泥单位产品综合能耗(kgce/t)',value:0,note:''},
+                    {index:1,name:'熟料单位产品综合能耗(kgce/t)',value:0,note:''},
+                    {index:1,name:'熟料单位产品综合电耗(kw.h/t)',value:0,note:''},
+                    {index:1,name:'熟料单位产品综合煤耗(kgce/t)',value:0,note:''},
+                    {index:1,name:'水泥单位产品综合电耗(kw.h/t)',value:0,note:''},
+                ],
+
+            };
+        },
+        mounted() {
+            var myDate = new Date();
+            let month = myDate.getMonth()+1;
+            if(month<10){
+                month = '0'+month;
+            } 
+            this.query.month = myDate.getFullYear()+'-'+month;
+            this.getData();
+        },
+        methods: {
+            typeCange(value){
+                if(value==1){
+                    this.tableName = '能源监察日报表'
+                }else if(value==1){
+                    this.tableName = '能源监察月报表'
+                }else{
+                    this.tableName = '能源监察年报表'
+                }
+            },
+            getData(){
+                let that = this;
+                let params = {page:0};
+                let arr = [];
+                if(that.query.type==0){//日
+                    params.type='day_s';
+                    arr = that.query.month.split('-');
+                    params.year_s = Number(arr[0]);
+                    params.month_s = Number(arr[1]);
+                }else if(that.query.type==1){//月
+                    params.type='month_s';
+                    params.year_s = Number(that.query.year);
+                }else if (that.query.type==2){
+                    params.type='year_s';
+                    params.year_s = Number(that.query.yearStart);
+                }
+                params.mgroup__belong_dept = that.query.belong_dept;
+                this.$API.enm.enstat.req(params).then((res) => {
+
+                });
+            },
+            getTableData(){
+                this.getData();
+            },
+            
+            handlePrint() {
+                this.$PRINT('#myReport');
+            },
+            exportExcel() {
+                this.exportLoading = true;
+                this.$XLSX('#hourBaseTable', this.tableName)
+                this.exportLoading = false;
+            },
+        }
+    };
+</script>
+<style>
+</style>
\ No newline at end of file
diff --git a/src/views/enm_energy/energyPicture.vue b/src/views/enm_energy/energyPicture.vue
index 1b0e4880..8a44cd47 100644
--- a/src/views/enm_energy/energyPicture.vue
+++ b/src/views/enm_energy/energyPicture.vue
@@ -2,23 +2,53 @@
     <el-container>
         <el-main style="background: #fff;">
             <div class="pictureContainer">
-                 <img src="/media/elec_flow.png" class="flowImg" >
-                <!-- <img src="/img/energy.png" class="flowImg" /> -->
-                <div class="energyNumber" style="top: 80px;">{{ dataObj.烘干破碎机_电 }}</div>
-                <div class="energyNumber" style="top: 132px;">{{ dataObj.辅材立磨_电 }}</div>
-                <div class="energyNumber" style="top: 178px;">{{ dataObj.生粉制备_循环风机_电 }}</div>
-                <div class="energyNumber" style="top: 222px;">{{ dataObj.生粉制备_选粉机_电 }}</div>
-                <div class="energyNumber" style="top: 270px;">{{ dataObj.高温风机_电 }}</div>
-                <div class="energyNumber" style="top: 326px;">{{ dataObj.尾排风机_电 }}</div>
-                <div class="energyNumber" style="top: 379px;">{{ dataObj.回转窑_电 }}</div>
-                <div class="energyNumber" style="top: 430px;">{{ dataObj.煤立磨_电 }}</div>
-                <div class="energyNumber" style="top: 487px;">{{ dataObj.煤磨排风机_电 }}</div>
-                <div class="energyNumber" style="top: 536px;">{{ dataObj.窑头排风机_电 }}</div>
-                <div class="energyNumber" style="top: 607px;">{{ dataObj.水泥磨_电 }}</div>
-                <div class="energyNumber" style="top: 663px;">{{ (Number(dataObj.辊压机动_电) + Number(dataObj.辊压机定_电)).toFixed(2) }}</div>
-                <div class="energyNumber" style="top: 719px;">{{ dataObj.系统风机_电 }}</div>
-                <div class="energyNumber" style="top: 773px;">{{ dataObj.水泥磨_选粉机_电 }}</div>
-                <div class="energyNumber" style="top: 830px;">{{ dataObj.水泥磨_循环风机_电 }}</div>
+                 <!-- <img src="/media/elec_flow.png" class="flowImg" > -->
+                <img src="/img/energy.png" class="flowImg" />
+                <div class="energyNumber" style="top: 80px;">
+                    <img v-if="dataObj.烘干破碎机_电" class="iconImg" src="img/elec.png"> {{ dataObj.烘干破碎机_电 }}
+                </div>
+                <div class="energyNumber" style="top: 132px;">
+                    <img v-if="dataObj.辅材立磨_电" class="iconImg" src="img/elec.png">{{ dataObj.辅材立磨_电 }}
+                </div>
+                <div class="energyNumber" style="top: 178px;">
+                    <img v-if="dataObj.生粉制备_循环风机_电" class="iconImg" src="img/elec.png">{{ dataObj.生粉制备_循环风机_电 }}
+                </div>
+                <div class="energyNumber" style="top: 222px;">
+                    <img v-if="dataObj.生粉制备_选粉机_电" class="iconImg" src="img/elec.png">{{ dataObj.生粉制备_选粉机_电 }}
+                </div>
+                <div class="energyNumber" style="top: 270px;">
+                    <img v-if="dataObj.高温风机_电" class="iconImg" src="img/elec.png">{{ dataObj.高温风机_电 }}
+                </div>
+                <div class="energyNumber" style="top: 326px;">
+                    <img v-if="dataObj.尾排风机_电" class="iconImg" src="img/elec.png">{{ dataObj.尾排风机_电 }}
+                </div>
+                <div class="energyNumber" style="top: 379px;">
+                    <img v-if="dataObj.回转窑_电" class="iconImg" src="img/elec.png">{{ dataObj.回转窑_电 }}
+                </div>
+                <div class="energyNumber" style="top: 430px;">
+                    <img v-if="dataObj.煤立磨_电" class="iconImg" src="img/elec.png">{{ dataObj.煤立磨_电 }}
+                </div>
+                <div class="energyNumber" style="top: 487px;">
+                    <img v-if="dataObj.煤磨排风机_电" class="iconImg" src="img/elec.png">{{ dataObj.煤磨排风机_电 }}
+                </div>
+                <div class="energyNumber" style="top: 536px;">
+                    <img v-if="dataObj.窑头排风机_电" class="iconImg" src="img/elec.png">{{ dataObj.窑头排风机_电 }}
+                </div>
+                <div class="energyNumber" style="top: 607px;">
+                    <img v-if="dataObj.水泥磨_电" class="iconImg" src="img/elec.png">{{ dataObj.水泥磨_电 }}
+                </div>
+                <div class="energyNumber" style="top: 663px;">
+                    <img v-if="dataObj.辊压机动_电||dataObj.辊压机定_电" class="iconImg" src="img/elec.png">{{ (Number(dataObj.辊压机动_电) + Number(dataObj.辊压机定_电)).toFixed(2) }}
+                </div>
+                <div class="energyNumber" style="top: 719px;">
+                    <img v-if="dataObj.系统风机_电" class="iconImg" src="img/elec.png">{{ dataObj.系统风机_电 }}
+                </div>
+                <div class="energyNumber" style="top: 773px;">
+                    <img v-if="dataObj.水泥磨_选粉机_电" class="iconImg" src="img/elec.png">{{ dataObj.水泥磨_选粉机_电 }}
+                </div>
+                <div class="energyNumber" style="top: 830px;">
+                    <img v-if="dataObj.水泥磨_循环风机_电" class="iconImg" src="img/elec.png">{{ dataObj.水泥磨_循环风机_电 }}
+                </div>
             </div> 
         </el-main>
     </el-container>
@@ -87,10 +117,16 @@
         width: 1200px;
         height: 900px;
     }
+    .iconImg{
+        width: 18px;
+        height: 18px;
+        vertical-align: bottom;
+    }
     .energyNumber{
         position: absolute;
-        right: 160px;
-        color: #536dfe;
+        right: 35px;
+        /* color: #536dfe; */
+        color: rgb(223, 213, 22);
         font-size: 15px;
         font-weight: bold;
     }