diff --git a/src/views/enm_coal/power.vue b/src/views/enm_coal/power.vue
index 9e0b254e..8a24d42d 100644
--- a/src/views/enm_coal/power.vue
+++ b/src/views/enm_coal/power.vue
@@ -1,478 +1,587 @@
 <template>
-    <div class="app-container">
-        <el-header>
-            <div class="left-panel">
-                <el-button
-                    type="primary"
-                    @click="exportExcel()"
-                    :loading = "exportLoading"
-                    >导出xlsx
-                </el-button>
-                <el-button
-                    type="primary"
-                    @click="handlePrint"
-                    >打印
-                </el-button>
-            </div>
-        </el-header>
-        <el-card style="margin-top:5px">
-            <div class="printWrap">
-                <div ref="print" id="myReport" class="printContainer">
-                    <table border="1" width="1035" cellspacing="0" :key="timeStamp" class="myTable" id="myTable">
-                        <thead class="myTableHead">
-                            <tr>
-                                <th colspan="6">煤磨工段主要设备（100KW以上）单位产品电耗数据表</th>
-                            </tr>
-                            <tr>
-                                <th>设备名称</th>
-                                <th>设备编号</th>
-                                <th>单位</th>
-                                <th>上个小时</th>
-                                <th>昨日</th>
-                                <th>本月</th>
-                            </tr>
-                        </thead>
-                        <tbody>
-                            <tr v-for="item in tableDatas" :key="item">
-                                <template v-for="(item1,ind) in item" :key="item1">
-                                    <td  v-if="ind==0||ind==1||ind==2" class="numCell">{{item1}}</td>
-                                    <td v-if="ind==3" class="numCell hoursItem" @click="itemClick('hour_s',item1)">{{item1}}</td>
-                                    <td v-if="ind==4"  class="numCell monthItem" @click="itemClick('day_s',item1)">{{item1}}</td>
-                                    <td v-if="ind==5" class="numCell yearItem" @click="itemClick('month_s',item1)">{{item1}}</td>
-                                </template>
-                            </tr>
-                        </tbody>
-                    </table>
-                    <div class="chartWrap">
-                        <div class="chartTitle">小时生产参数统计图</div>
-                        <scEcharts height="400px" width="1033px" :option="optionHour"></scEcharts>
-                    </div>
-                    <div class="chartWrap">
-                        <div class="chartTitle">本月生产参数统计图</div>
-                        <scEcharts height="400px" width="1033px" :option="optionDay"></scEcharts>
-                    </div>
-                    <div class="chartWrap">
-                        <div class="chartTitle">本年生产参数统计图</div>
-                        <scEcharts height="400px" width="1033px" :option="optionMonth"></scEcharts>
-                    </div>
-                </div>
-            </div>
-            <charts 
-                v-if="asynDialog"
-                :type="type" 
-                :title="title"
-                :cate="cate"
-                :apiObj = "apiObj"
-                :mgroup="query.mgroup"
-                :modelValue="modelValue"
-                :showClose="showClose"
-                :echartType='echartType'
-                @closed="asynDialog = false"
-            ></charts>
-        </el-card>
-    </div>
+	<div class="app-container">
+		<el-header>
+			<div class="left-panel">
+				<el-button
+					type="primary"
+					@click="exportExcel()"
+					:loading="exportLoading"
+					>导出xlsx
+				</el-button>
+				<el-button type="primary" @click="handlePrint">打印 </el-button>
+			</div>
+		</el-header>
+		<el-card style="margin-top: 5px">
+			<div class="printWrap">
+				<div ref="print" id="myReport" class="printContainer">
+					<table
+						border="1"
+						width="1035"
+						cellspacing="0"
+						:key="timeStamp"
+						class="myTable"
+						id="myTable"
+					>
+						<thead class="myTableHead">
+							<tr>
+								<th colspan="6">
+									煤磨工段主要设备（100KW以上）单位产品电耗数据表
+								</th>
+							</tr>
+							<tr>
+								<th>设备名称</th>
+								<th>设备编号</th>
+								<th>单位</th>
+								<th>上个小时</th>
+								<th>昨日</th>
+								<th>本月</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr v-for="item in tableDatas" :key="item">
+								<template
+									v-for="(item1, ind) in item"
+									:key="item1"
+								>
+									<td
+										v-if="ind == 0 || ind == 1 || ind == 2"
+										class="numCell"
+									>
+										{{ item1 }}
+									</td>
+									<td
+										v-if="ind == 3"
+										class="numCell hoursItem"
+										@click="itemClick('hour_s', item1)"
+									>
+										{{ item1 }}
+									</td>
+									<td
+										v-if="ind == 4"
+										class="numCell monthItem"
+										@click="itemClick('day_s', item1)"
+									>
+										{{ item1 }}
+									</td>
+									<td
+										v-if="ind == 5"
+										class="numCell yearItem"
+										@click="itemClick('month_s', item1)"
+									>
+										{{ item1 }}
+									</td>
+								</template>
+							</tr>
+						</tbody>
+					</table>
+					<div class="chartWrap">
+						<div class="chartTitle">小时生产参数统计图</div>
+						<scEcharts
+							height="400px"
+							width="1033px"
+							:option="optionHour"
+						></scEcharts>
+					</div>
+					<div class="chartWrap">
+						<div class="chartTitle">本月生产参数统计图</div>
+						<scEcharts
+							height="400px"
+							width="1033px"
+							:option="optionDay"
+						></scEcharts>
+					</div>
+					<div class="chartWrap">
+						<div class="chartTitle">本年生产参数统计图</div>
+						<scEcharts
+							height="400px"
+							width="1033px"
+							:option="optionMonth"
+						></scEcharts>
+					</div>
+				</div>
+			</div>
+			<charts
+				v-if="asynDialog"
+				:type="type"
+				:title="title"
+				:cate="cate"
+				:apiObj="apiObj"
+				:mgroup="query.mgroup"
+				:modelValue="modelValue"
+				:showClose="showClose"
+				:echartType="echartType"
+				@closed="asynDialog = false"
+			></charts>
+		</el-card>
+	</div>
 </template>
 <script>
-const colors =['#647bfe','#8698fe','#a9b6fe','#cbd3fe','#91CC75','#EE6666'];
-    let tooltip= {
-        show: true, 
-        trigger: 'axis',
-        axisPointer: {
-            type: 'cross'
-        },
-        confine:false, 
-        showContent: true, 
-        triggerOn:"mousemove", 
-        // alwaysShowContent:true,  
-    };
-    let grid={
-        right: '3%',
-        left:'7%',
-        top:'15%'
-    };
-    let toolbox={
-        right:'5%',
-        feature: {
-            dataView: { show: true, readOnly: false },
-            // restore: { show: true },
-            saveAsImage: { show: true }
-        }
-    };
-    let legend= {
-        top:'2%',
-        data:['煤磨排风机主电机', '煤磨主电机']
-    };
-    let yAxis= {
-        type: 'value',
-        name: '分布电耗(KW.h/t)',
-        alignTicks: true,
-        axisLine: {
-            show: true,
-            lineStyle: {
-            color: colors[3]
-            }
-        },
-        axisLabel: {
-            formatter: '{value}'
-        }
-    };
-    import scEcharts from "@/components/scEcharts";
-	import { defineAsyncComponent } from 'vue'
-    export default {
-        components: {
-            scEcharts,
-            charts: defineAsyncComponent(() => import("@/components/scEnm/lineChartsdialog.vue")),
-        },
-        data() {
-            return {
-                chartShow: false,
-                myOption: null,
-                optionHour:{},
-                optionDay:{},
-                optionMonth:{},
-                year:2023,
-                month:1,
-                days:1,
-                hours:1,
-                query: {
-                    mgroup:'3347217512021835776',
-                },
-                tableName:'主要设备（100KW以上）单位产品电耗数据表',
-                tableDatas:[
-                    ['煤磨排风机主电机','','KW·h/t','','',''],
-                    ['煤磨主电机','','KW·h/t','','',''],
-                ],
-                modelValue:true,
-                type:'hour_s',
-                title:'煤磨工段',
-                cate:'',
-                apiObj:this.$API.enm.mpoint.stat,
-                showClose:true,
-                echartType:'line',
-                asynDialog:false,
-                allValHour:0,
-                allValDays:0,
-                allValMonth:0,
-                option1:{
-                    color: colors,
-                    tooltip:tooltip,
-                    grid: grid,
-                    toolbox: toolbox,
-                    legend:legend,
-                    xAxis: {
-                        axisTick: {
-                            show: true,
-                            length: 5,
-                            inside: true,
-                        },
-                        data: []
-                    },
-                    yAxis:yAxis,
-                    series:[
-                        {
-                        name: '煤磨排风机主电机',
-                        type: 'bar',
-                        data:[]
-                        },
-                        {
-                        name: '煤磨主电机',
-                        type: 'bar',
-                        data: []
-                        },
-                    ]
-                },
-                option2:{
-                    color: colors,
-                    tooltip:tooltip,
-                    grid: grid,
-                    toolbox: toolbox,
-                    legend: legend,
-                    xAxis: {
-                        axisTick: {
-                            show: true,
-                            length: 5,
-                            inside: true,
-                        },
-                        data: []
-                    },
-                    yAxis: yAxis,
-                    series:[
-                        {
-                        name: '煤磨排风机主电机',
-                        type: 'bar',
-                        data:[]
-                        },
-                        {
-                        name: '煤磨主电机',
-                        type: 'bar',
-                        data: []
-                        },
-                    ]
-                },
-                option3:{
-                    color: colors,
-                    tooltip:tooltip,
-                    grid: grid,
-                    toolbox: toolbox,
-                    legend: legend,
-                    xAxis: {
-                            axisTick: {
-                                show: true,
-                                length: 5,
-                                inside: true,
-                            },
-                            data: ['一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '十一月', '十二月']
-                        },
-                    yAxis: yAxis,
-                    series:[
-                        {
-                        name: '煤磨排风机主电机',
-                        type: 'bar',
-                        data:[]
-                        },
-                        {
-                        name: '煤磨主电机',
-                        type: 'bar',
-                        data: []
-                        },
-                    ]
-                }
-            };
-        },
-        mounted() {
-            let that = this;
-            var myDate = new Date();
-            let year = myDate.getFullYear();
-            let month = myDate.getMonth()+1;
-            let days = myDate.getDate();
-            let hours = myDate.getHours();
-            let timeDate = myDate.getTime();
-            let dayTime = 24 * 60 * 60 * 1000;
-            //昨天的计算
-            let year_d = year,month_d = month,days_d = days;
-            if(hours<21){//21点前，查找昨日数据为前一天数据
-                let newDate = timeDate- dayTime;
-                let lastDate = new Date(newDate);
-                year_d = lastDate.getFullYear();
-                month_d = lastDate.getMonth()+1;
-                days_d = lastDate.getDate();
-            }
-            //上一小时的计算
-            let hourTime = timeDate - 3600000;
-            let hourDate =  new Date(hourTime);
-            let year_h = hourDate.getFullYear();
-            let month_h = hourDate.getMonth()+1;
-            let days_h = hourDate.getDate();
-            let hours_h = hourDate.getHours();
-            //本月
-            let params2 = {};
-            params2.page = 0;
-            params2.year_s = year;
-            params2.month_s = month;
-            params2.type = 'month_s';
-            params2.mgroup = this.query.mgroup;
-            this.$API.enm.enstat.req(params2).then((res2) => {
-                if(res2.length>0){
-                    let hourProduct=that.allValMonth = res2[0].total_production;//当前条件下的总产量
-                    params2.mpoint__ep_monitored__power_kw__gte = 100;
-                    this.$API.enm.mpoint.stat.req(params2).then((res) => {
-                        let data2 = res;
-                        for (let i = 0; i < data2.length; i++) {
-                            that.tableDatas[i]=[];
-                            that.tableDatas[i][0]=data2[i].ep_monitored_name;
-                            that.tableDatas[i][1]=data2[i].ep_monitored_number;
-                            that.tableDatas[i][2]='KW·h/t';
-                            let val = hourProduct==0?'/':(data2[i].val/hourProduct).toFixed(2);
-                            that.tableDatas[i][5]=val;
-                        }
-                    }) 
-                }    
-            }).then(res2=>{
-                //昨日
-                let params3 = {};
-                params3.page = 0;
-                params3.year_s = year_d;
-                params3.month_s = month_d;
-                params3.day_s = days_d;
-                params3.type = 'day_s';
-                params3.mgroup = this.query.mgroup;
-                this.$API.enm.enstat.req(params3).then((res3) => {
-                    if(res3.length>0){
-                        let hourProduct=that.allValDays = res3[0].total_production;
-                        params3.mpoint__ep_monitored__power_kw__gte = 100;
-                        this.$API.enm.mpoint.stat.req(params3).then((res) => {
-                            let data3 = res3;
-                            for (let j = 0; j < data3.length; j++) {
-                                let val = hourProduct==0?'/':(data3[j].val/hourProduct).toFixed(2);
-                                that.tableDatas[j][4]=val;   
-                            }
-                        })
-                    }
-                })
-                //上小时
-                let params4 = {};
-                params4.page = 0;
-                params4.year = year_h;
-                params4.month = month_h;
-                params4.day = days_h;
-                params4.hour = hours_h;
-                params4.type = 'hour_s';
-                params4.mgroup = this.query.mgroup;
-                this.$API.enm.enstat.req(params4).then((res4) => {
-                    if(res4.length>0){
-                        let hourProduct=that.allValHour = res4[0].total_production;
-                        params4.mpoint__ep_monitored__power_kw__gte = 100;
-                        this.$API.enm.mpoint.stat.req(params4).then((res) => {
-                            let data4 = res4;
-                            for (let k = 0; k < data4.length; k++) {
-                                let val = hourProduct==0?'/':(data4[k].val/hourProduct).toFixed(2);
-                                that.tableDatas[k][3]=val;   
-                            }
-                        })
-                    }    
-                })
-            })
-            that.getHourData();
-            that.getDayData();
-            that.getMonthData();
-        },
-        methods: {
-            //获取小时数据
-            getHourData(){
-                let that = this;
-                let query = {};
-                query.page = 0;
-                query.year_s = that.year;
-                query.month_s = that.month;
-                query.day_s = that.days;
-                query.type = 'hour_s';
-                query.mgroup = that.query.mgroup;
-                query.mpoint__ep_monitored__power_kw__gte = 100;
-                this.$API.enm.mpoint.stat.req(query).then((response) => {
-                    let seriesData0 = [],seriesData1 = [];
-                    let data = response;
-                    data.forEach(item => {
-                        let ind = item.hour;
-                        let val=0;
-                        if(that.allValHour==0){
-                            val = ''
-                        }else{
-                            val = (item.val/that.allValHour).toFixed(2); 
-                        }
-                        if(item.equip_name=='煤磨排风机主电机'){
-                            seriesData0[ind] = val;
-                        }else if(item.equip_name=='煤磨主电机'){
-                            seriesData1[ind] = val;
-                        }
-                    });
-                    let options = {...that.option1};
-                    options.series[0].data=seriesData0;
-                    options.series[1].data=seriesData1;
-                    let hourXAxis = [];
-                    for (let i = 1; i <= that.hours; i++) {
-                        let item = i+'时'
-                        hourXAxis.push(item)
-                    }
-                    options.xAxis.data = hourXAxis;
-                    that.optionHour = options;
-                })
-            },
-            //获取天数据
-            getDayData(){
-                let that = this;
-                let query1 = {};
-                query1.page = 0;
-                query1.year_s = that.year;
-                query1.month_s = that.month;
-                query1.type = 'day_s';
-                query1.mgroup = this.query.mgroup;
-                query1.mpoint__ep_monitored__power_kw__gte = 100;
-                this.$API.enm.enstat.req(query1).then((response) => {
-                    let seriesData0 = [],seriesData1 = [];
-                    let data = response;
-                    data.forEach(item => {
-                        // debugger;
-                        let ind = item.day_s;
-                        let val=0;
-                        if(that.allValDays==0){
-                            val = ''
-                        }else{
-                            val = (item.val/that.allValDays).toFixed(2); 
-                        }
-                        if(item.equip_name=='煤磨排风机主电机'){
-                            seriesData0[ind] = val;
-                        }else if(item.equip_name=='煤磨主电机'){
-                            seriesData1[ind] = val;
-                        }
-                    });
-                    let options = {...that.option2};
-                    options.series[0].data=seriesData0;
-                    options.series[1].data=seriesData1;
-                    let dayXAxis = [];
-                    for (let i = 1; i <= that.days; i++) {
-                        let item = i+'日'
-                        dayXAxis.push(item)
-                    }
-                    options.xAxis.data = dayXAxis;
-                    that.optionDay = options; 
-                })
-            },
-            //获取月数据
-            getMonthData(){
-                let that = this;
-                let query2 = {};
-                query2.page = 0;
-                query2.year_s = that.year;
-                query2.type = 'month_s';
-                query2.mgroup = that.query.mgroup;
-                query2.mpoint__ep_monitored__power_kw__gte = 100;
-                this.$API.enm.enstat.req(query2).then((response) => {
-                    let seriesData0 = [],seriesData1 = [];
-                    let data = response;
-                    data.forEach(item => {
-                        let ind = item.month_s;
-                        let val=0;
-                        if(that.allValMonth==0){
-                            val = ''
-                        }else{
-                            val = (item.val/that.allValMonth).toFixed(2); 
-                        }
-                        if(item.equip_name=='煤磨排风机主电机'){
-                            seriesData0[ind] = val;
-                        }else if(item.equip_name=='煤磨主电机'){
-                            seriesData1[ind] = val;
-                        }
-                    });
-                    let options = {...that.option3};
-                    options.series[0].data=seriesData0;
-                    options.series[1].data=seriesData1;
-                    let monthXAxis = [];
-                    for (let i = 1; i <= that.month; i++) {
-                        let item = i+'月'
-                        monthXAxis.push(item)
-                    }
-                    options.xAxis.data = monthXAxis;
-                    that.optionMonth = options; 
-                })
-            },
-            itemClick(type,item){
-                this.type=type;
-                this.cate = item[0];
-                this.asynDialog = true;
-            },
-            handlePrint() {
-                this.$PRINT('#myReport');
-            },
-            exportExcel() {
-                this.exportLoading = true;
-                this.$XLSX('#myTable', this.tableName)
-                this.exportLoading = false;
-            },
-        }
-    };
+const colors = [
+	"#647bfe",
+	"#8698fe",
+	"#a9b6fe",
+	"#cbd3fe",
+	"#91CC75",
+	"#EE6666",
+];
+let tooltip = {
+	show: true,
+	trigger: "axis",
+	axisPointer: {
+		type: "cross",
+	},
+	confine: false,
+	showContent: true,
+	triggerOn: "mousemove",
+	// alwaysShowContent:true,
+};
+let grid = {
+	right: "3%",
+	left: "7%",
+	top: "15%",
+};
+let toolbox = {
+	right: "5%",
+	feature: {
+		dataView: { show: true, readOnly: false },
+		// restore: { show: true },
+		saveAsImage: { show: true },
+	},
+};
+let legend = {
+	top: "2%",
+	data: ["煤磨排风机主电机", "煤磨主电机"],
+};
+let yAxis = {
+	type: "value",
+	name: "分布电耗(KW.h/t)",
+	alignTicks: true,
+	axisLine: {
+		show: true,
+		lineStyle: {
+			color: colors[3],
+		},
+	},
+	axisLabel: {
+		formatter: "{value}",
+	},
+};
+import scEcharts from "@/components/scEcharts";
+import { defineAsyncComponent } from "vue";
+export default {
+	components: {
+		scEcharts,
+		charts: defineAsyncComponent(() =>
+			import("@/components/scEnm/lineChartsdialog.vue")
+		),
+	},
+	data() {
+		return {
+			chartShow: false,
+			myOption: null,
+			optionHour: {},
+			optionDay: {},
+			optionMonth: {},
+			year: 2023,
+			month: 1,
+			days: 1,
+			hours: 1,
+			query: {
+				mgroup: "",
+			},
+			tableName: "主要设备（100KW以上）单位产品电耗数据表",
+			tableDatas: [
+				["煤磨排风机主电机", "", "KW·h/t", "", "", ""],
+				["煤磨主电机", "", "KW·h/t", "", "", ""],
+			],
+			modelValue: true,
+			type: "hour_s",
+			title: "煤磨工段",
+			cate: "",
+			apiObj: this.$API.enm.mpoint.stat,
+			showClose: true,
+			echartType: "line",
+			asynDialog: false,
+			allValHour: 0,
+			allValDays: 0,
+			allValMonth: 0,
+			option1: {
+				color: colors,
+				tooltip: tooltip,
+				grid: grid,
+				toolbox: toolbox,
+				legend: legend,
+				xAxis: {
+					axisTick: {
+						show: true,
+						length: 5,
+						inside: true,
+					},
+					data: [],
+				},
+				yAxis: yAxis,
+				series: [
+					{
+						name: "煤磨排风机主电机",
+						type: "bar",
+						data: [],
+					},
+					{
+						name: "煤磨主电机",
+						type: "bar",
+						data: [],
+					},
+				],
+			},
+			option2: {
+				color: colors,
+				tooltip: tooltip,
+				grid: grid,
+				toolbox: toolbox,
+				legend: legend,
+				xAxis: {
+					axisTick: {
+						show: true,
+						length: 5,
+						inside: true,
+					},
+					data: [],
+				},
+				yAxis: yAxis,
+				series: [
+					{
+						name: "煤磨排风机主电机",
+						type: "bar",
+						data: [],
+					},
+					{
+						name: "煤磨主电机",
+						type: "bar",
+						data: [],
+					},
+				],
+			},
+			option3: {
+				color: colors,
+				tooltip: tooltip,
+				grid: grid,
+				toolbox: toolbox,
+				legend: legend,
+				xAxis: {
+					axisTick: {
+						show: true,
+						length: 5,
+						inside: true,
+					},
+					data: [
+						"一月",
+						"二月",
+						"三月",
+						"四月",
+						"五月",
+						"六月",
+						"七月",
+						"八月",
+						"九月",
+						"十月",
+						"十一月",
+						"十二月",
+					],
+				},
+				yAxis: yAxis,
+				series: [
+					{
+						name: "煤磨排风机主电机",
+						type: "bar",
+						data: [],
+					},
+					{
+						name: "煤磨主电机",
+						type: "bar",
+						data: [],
+					},
+				],
+			},
+		};
+	},
+	mounted() {
+		let that = this;
+		var myDate = new Date();
+		let year = myDate.getFullYear();
+		let month = myDate.getMonth() + 1;
+		let days = myDate.getDate();
+		let hours = myDate.getHours();
+		let timeDate = myDate.getTime();
+		let dayTime = 24 * 60 * 60 * 1000;
+		//昨天的计算
+		let year_d = year,
+			month_d = month,
+			days_d = days;
+		if (hours < 21) {
+			//21点前，查找昨日数据为前一天数据
+			let newDate = timeDate - dayTime;
+			let lastDate = new Date(newDate);
+			year_d = lastDate.getFullYear();
+			month_d = lastDate.getMonth() + 1;
+			days_d = lastDate.getDate();
+		}
+		//上一小时的计算
+		let hourTime = timeDate - 3600000;
+		let hourDate = new Date(hourTime);
+		let year_h = hourDate.getFullYear();
+		let month_h = hourDate.getMonth() + 1;
+		let days_h = hourDate.getDate();
+		let hours_h = hourDate.getHours();
+		this.$API.mtm.mgroup.list
+			.req({ page: 0, search: "煤磨" })
+			.then((res) => {
+				console.log("煤磨", res);
+				that.query.mgroup = res[0].id;
+				//本月
+				let params2 = {};
+				params2.page = 0;
+				params2.year_s = year;
+				params2.month_s = month;
+				params2.type = "month_s";
+				params2.mgroup = that.query.mgroup;
+				that.$API.enm.enstat
+					.req(params2)
+					.then((res2) => {
+						if (res2.length > 0) {
+							let hourProduct = (that.allValMonth =
+								res2[0].total_production); //当前条件下的总产量
+							params2.mpoint__ep_monitored__power_kw__gte = 100;
+							that.$API.enm.mpoint.stat
+								.req(params2)
+								.then((res) => {
+									let data2 = res;
+									for (let i = 0; i < data2.length; i++) {
+										that.tableDatas[i] = [];
+										that.tableDatas[i][0] =
+											data2[i].ep_monitored_name;
+										that.tableDatas[i][1] =
+											data2[i].ep_monitored_number;
+										that.tableDatas[i][2] = "KW·h/t";
+										let val =
+											hourProduct == 0
+												? "/"
+												: (
+														data2[i].val /
+														hourProduct
+												  ).toFixed(2);
+										that.tableDatas[i][5] = val;
+									}
+								});
+						}
+					})
+					.then((res2) => {
+						//昨日
+						let params3 = {};
+						params3.page = 0;
+						params3.year_s = year_d;
+						params3.month_s = month_d;
+						params3.day_s = days_d;
+						params3.type = "day_s";
+						params3.mgroup = that.query.mgroup;
+						that.$API.enm.enstat.req(params3).then((res3) => {
+							if (res3.length > 0) {
+								let hourProduct = (that.allValDays =
+									res3[0].total_production);
+								params3.mpoint__ep_monitored__power_kw__gte = 100;
+								that.$API.enm.mpoint.stat
+									.req(params3)
+									.then((res) => {
+										let data3 = res3;
+										for (let j = 0; j < data3.length; j++) {
+											let val =
+												hourProduct == 0
+													? "/"
+													: (
+															data3[j].val /
+															hourProduct
+													  ).toFixed(2);
+											that.tableDatas[j][4] = val;
+										}
+									});
+							}
+						});
+						//上小时
+						let params4 = {};
+						params4.page = 0;
+						params4.year = year_h;
+						params4.month = month_h;
+						params4.day = days_h;
+						params4.hour = hours_h;
+						params4.type = "hour_s";
+						params4.mgroup = that.query.mgroup;
+						that.$API.enm.enstat.req(params4).then((res4) => {
+							if (res4.length > 0) {
+								let hourProduct = (that.allValHour =
+									res4[0].total_production);
+								params4.mpoint__ep_monitored__power_kw__gte = 100;
+								that.$API.enm.mpoint.stat
+									.req(params4)
+									.then((res) => {
+										let data4 = res4;
+										for (let k = 0; k < data4.length; k++) {
+											let val =
+												hourProduct == 0
+													? "/"
+													: (
+															data4[k].val /
+															hourProduct
+													  ).toFixed(2);
+											that.tableDatas[k][3] = val;
+										}
+									});
+							}
+						});
+					});
+				that.getHourData();
+				that.getDayData();
+				that.getMonthData();
+			});
+	},
+	methods: {
+		//获取小时数据
+		getHourData() {
+			let that = this;
+			let query = {};
+			query.page = 0;
+			query.year_s = that.year;
+			query.month_s = that.month;
+			query.day_s = that.days;
+			query.type = "hour_s";
+			query.mgroup = that.query.mgroup;
+			query.mpoint__ep_monitored__power_kw__gte = 100;
+			this.$API.enm.mpoint.stat.req(query).then((response) => {
+				let seriesData0 = [],
+					seriesData1 = [];
+				let data = response;
+				data.forEach((item) => {
+					let ind = item.hour;
+					let val = 0;
+					if (that.allValHour == 0) {
+						val = "";
+					} else {
+						val = (item.val / that.allValHour).toFixed(2);
+					}
+					if (item.equip_name == "煤磨排风机主电机") {
+						seriesData0[ind] = val;
+					} else if (item.equip_name == "煤磨主电机") {
+						seriesData1[ind] = val;
+					}
+				});
+				let options = { ...that.option1 };
+				options.series[0].data = seriesData0;
+				options.series[1].data = seriesData1;
+				let hourXAxis = [];
+				for (let i = 1; i <= that.hours; i++) {
+					let item = i + "时";
+					hourXAxis.push(item);
+				}
+				options.xAxis.data = hourXAxis;
+				that.optionHour = options;
+			});
+		},
+		//获取天数据
+		getDayData() {
+			let that = this;
+			let query1 = {};
+			query1.page = 0;
+			query1.year_s = that.year;
+			query1.month_s = that.month;
+			query1.type = "day_s";
+			query1.mgroup = this.query.mgroup;
+			query1.mpoint__ep_monitored__power_kw__gte = 100;
+			this.$API.enm.enstat.req(query1).then((response) => {
+				let seriesData0 = [],
+					seriesData1 = [];
+				let data = response;
+				data.forEach((item) => {
+					// debugger;
+					let ind = item.day_s;
+					let val = 0;
+					if (that.allValDays == 0) {
+						val = "";
+					} else {
+						val = (item.val / that.allValDays).toFixed(2);
+					}
+					if (item.equip_name == "煤磨排风机主电机") {
+						seriesData0[ind] = val;
+					} else if (item.equip_name == "煤磨主电机") {
+						seriesData1[ind] = val;
+					}
+				});
+				let options = { ...that.option2 };
+				options.series[0].data = seriesData0;
+				options.series[1].data = seriesData1;
+				let dayXAxis = [];
+				for (let i = 1; i <= that.days; i++) {
+					let item = i + "日";
+					dayXAxis.push(item);
+				}
+				options.xAxis.data = dayXAxis;
+				that.optionDay = options;
+			});
+		},
+		//获取月数据
+		getMonthData() {
+			let that = this;
+			let query2 = {};
+			query2.page = 0;
+			query2.year_s = that.year;
+			query2.type = "month_s";
+			query2.mgroup = that.query.mgroup;
+			query2.mpoint__ep_monitored__power_kw__gte = 100;
+			this.$API.enm.enstat.req(query2).then((response) => {
+				let seriesData0 = [],
+					seriesData1 = [];
+				let data = response;
+				data.forEach((item) => {
+					let ind = item.month_s;
+					let val = 0;
+					if (that.allValMonth == 0) {
+						val = "";
+					} else {
+						val = (item.val / that.allValMonth).toFixed(2);
+					}
+					if (item.equip_name == "煤磨排风机主电机") {
+						seriesData0[ind] = val;
+					} else if (item.equip_name == "煤磨主电机") {
+						seriesData1[ind] = val;
+					}
+				});
+				let options = { ...that.option3 };
+				options.series[0].data = seriesData0;
+				options.series[1].data = seriesData1;
+				let monthXAxis = [];
+				for (let i = 1; i <= that.month; i++) {
+					let item = i + "月";
+					monthXAxis.push(item);
+				}
+				options.xAxis.data = monthXAxis;
+				that.optionMonth = options;
+			});
+		},
+		itemClick(type, item) {
+			this.type = type;
+			this.cate = item[0];
+			this.asynDialog = true;
+		},
+		handlePrint() {
+			this.$PRINT("#myReport");
+		},
+		exportExcel() {
+			this.exportLoading = true;
+			this.$XLSX("#myTable", this.tableName);
+			this.exportLoading = false;
+		},
+	},
+};
 </script>
 <style scoped>
-.printContainer{
-    padding-left: 20px;
+.printContainer {
+	padding-left: 20px;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/enm_coal/report.vue b/src/views/enm_coal/report.vue
index 06dd6cb2..438b08b0 100644
--- a/src/views/enm_coal/report.vue
+++ b/src/views/enm_coal/report.vue
@@ -1,607 +1,737 @@
 <template>
-    <div class="app-container">
-        <el-header>
-            <div class="left-panel">
-                <el-button
-                    type="primary"
-                    @click="exportExcel()"
-                    :loading = "exportLoading"
-                    >导出xlsx
-                </el-button>
-                <el-button
-                    type="primary"
-                    @click="handlePrint"
-                    >打印
-                </el-button>
-            </div>
-        </el-header>
-    <el-card style="margin-top:5px">
-        <div class="printWrap">
-            <div ref="print" id="myReport" class="printContainer">
-                <table border="1" width="1035" cellspacing="0" :key="timeStamp" id="myTable" class="myTable">
-                    <thead class="myTableHead">
-                        <tr>
-                            <th colspan="10">煤磨工段生产报告</th>
-                        </tr>
-                        <tr>
-                            <th colspan="2">参数</th>
-                            <th>上个小时</th>
-                            <th>昨日</th>
-                            <th>本月</th>
-                            <th>本年</th>
-                            <th>月目标值</th>
-                            <th>月完成度</th>
-                            <th>年目标值</th>
-                            <th>年完成度</th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        <tr v-for="(item,index) in tableDatas" :key="item">
-                            <td class="numCell" v-if="index==0||index==2" rowspan="2">{{item[0]}}</td>
-                            <td class="numCell" v-else-if="index==4">{{item[0]}}</td>
-                            <td class="numCell">{{item[1]}}</td>
-                            <td class="numCell hoursItem" @click="itemClick('hour_s',item)">{{item[2]}}</td>
-                            <td class="numCell daysItem" @click="itemClick('day_s',item)">{{item[3]}}</td>
-                            <td class="numCell monthItem" @click="itemClick('month_s',item)">{{item[4]}}</td>
-                            <td class="numCell yearItem" @click="itemClick('year_s',item)">{{item[5]}}</td>
-                            <td class="numCell">{{item[6]}}</td>
-                            <td class="numCell">{{item[7]}}</td>
-                            <td class="numCell">{{item[8]}}</td>
-                            <td class="numCell">{{item[9]}}</td>
-                        </tr>
-                    </tbody>
-                </table>
-                <div class="chartWrap">
-                    <div class="chartTitle">小时生产参数统计图</div>
-                    <scEcharts height="400px" width="1033px" :option="optionHour"></scEcharts>
-                </div>
-                <div class="chartWrap">
-                    <div class="chartTitle">本月生产参数统计图</div>
-                    <scEcharts height="400px" width="1033px" :option="optionDay"></scEcharts>
-                </div>
-                <div class="chartWrap">
-                    <div class="chartTitle">本年生产参数统计图</div>
-                    <scEcharts height="400px" width="1033px" :option="optionMonth"></scEcharts>
-                </div>
-            </div>
-        </div>
-        <charts 
-            v-if="asynDialog"
-            :type="type" 
-            :title="title"
-            :cate="cate"
-            :apiObj = "apiObj"
-            :mgroup="query.mgroup"
-            :modelValue="modelValue"
-            :showClose="showClose"
-            :echartType='echartType'
-            @closed="asynDialog = false"
-        ></charts>
-      </el-card>
-    </div>
-  </template>
+	<div class="app-container">
+		<el-header>
+			<div class="left-panel">
+				<el-button
+					type="primary"
+					@click="exportExcel()"
+					:loading="exportLoading"
+					>导出xlsx
+				</el-button>
+				<el-button type="primary" @click="handlePrint">打印 </el-button>
+			</div>
+		</el-header>
+		<el-card style="margin-top: 5px">
+			<div class="printWrap">
+				<div ref="print" id="myReport" class="printContainer">
+					<table
+						border="1"
+						width="1035"
+						cellspacing="0"
+						:key="timeStamp"
+						id="myTable"
+						class="myTable"
+					>
+						<thead class="myTableHead">
+							<tr>
+								<th colspan="10">煤磨工段生产报告</th>
+							</tr>
+							<tr>
+								<th colspan="2">参数</th>
+								<th>上个小时</th>
+								<th>昨日</th>
+								<th>本月</th>
+								<th>本年</th>
+								<th>月目标值</th>
+								<th>月完成度</th>
+								<th>年目标值</th>
+								<th>年完成度</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr v-for="(item, index) in tableDatas" :key="item">
+								<td
+									class="numCell"
+									v-if="index == 0 || index == 2"
+									rowspan="2"
+								>
+									{{ item[0] }}
+								</td>
+								<td class="numCell" v-else-if="index == 4">
+									{{ item[0] }}
+								</td>
+								<td class="numCell">{{ item[1] }}</td>
+								<td
+									class="numCell hoursItem"
+									@click="itemClick('hour_s', item)"
+								>
+									{{ item[2] }}
+								</td>
+								<td
+									class="numCell daysItem"
+									@click="itemClick('day_s', item)"
+								>
+									{{ item[3] }}
+								</td>
+								<td
+									class="numCell monthItem"
+									@click="itemClick('month_s', item)"
+								>
+									{{ item[4] }}
+								</td>
+								<td
+									class="numCell yearItem"
+									@click="itemClick('year_s', item)"
+								>
+									{{ item[5] }}
+								</td>
+								<td class="numCell">{{ item[6] }}</td>
+								<td class="numCell">{{ item[7] }}</td>
+								<td class="numCell">{{ item[8] }}</td>
+								<td class="numCell">{{ item[9] }}</td>
+							</tr>
+						</tbody>
+					</table>
+					<div class="chartWrap">
+						<div class="chartTitle">小时生产参数统计图</div>
+						<scEcharts
+							height="400px"
+							width="1033px"
+							:option="optionHour"
+						></scEcharts>
+					</div>
+					<div class="chartWrap">
+						<div class="chartTitle">本月生产参数统计图</div>
+						<scEcharts
+							height="400px"
+							width="1033px"
+							:option="optionDay"
+						></scEcharts>
+					</div>
+					<div class="chartWrap">
+						<div class="chartTitle">本年生产参数统计图</div>
+						<scEcharts
+							height="400px"
+							width="1033px"
+							:option="optionMonth"
+						></scEcharts>
+					</div>
+				</div>
+			</div>
+			<charts
+				v-if="asynDialog"
+				:type="type"
+				:title="title"
+				:cate="cate"
+				:apiObj="apiObj"
+				:mgroup="query.mgroup"
+				:modelValue="modelValue"
+				:showClose="showClose"
+				:echartType="echartType"
+				@closed="asynDialog = false"
+			></charts>
+		</el-card>
+	</div>
+</template>
 <script>
-const colors =['#647bfe','#8698fe','#a9b6fe','#91CC75','#EE6666'];
-    let tooltip= {
-        show: true, 
-        trigger: 'axis',
-        axisPointer: {
-            type: 'cross'
-        },
-        confine:false, 
-        showContent: true, 
-        triggerOn:"mousemove", 
-    };
-    let grid={
-        right: '8%',
-        left:'4%',
-        top:'15%'
-    };
-    let toolbox={
-        right:'2%',
-        feature: {
-            dataView: { show: true, readOnly: false },
-            // restore: { show: true },
-            saveAsImage: { show: true }
-        }
-    };
-    let legend= {
-        top:'2%',
-        data:['总产量', '台时产量', '运转率', '分布电耗']
-    };
-    let yAxis= [{
-            type: 'value',
-            name: '产量 (t)',
-            position: 'left',
-            alignTicks: true,
-            axisLine: {
-                show: true,
-                lineStyle: {
-                color: colors[0]
-                }
-            },
-            axisLabel: {
-                formatter: '{value}'
-            }
-        },
-        {
-            type: 'value',
-            name: '运转率 (%)',
-            position: 'right',
-            alignTicks: true,
-            offset: 80,
-            axisLine: {
-                show: true,
-                lineStyle: {
-                color: colors[2]
-                }
-            },
-            axisLabel: {
-                formatter: '{value}'
-            }
-        },
-        {
-            type: 'value',
-            name: '分布电耗(KW.h)',
-            position: 'right',
-            alignTicks: true,
-            axisLine: {
-                show: true,
-                lineStyle: {
-                color: colors[3]
-                }
-            },
-            axisLabel: {
-                formatter: '{value}'
-            }
-        }
-    ];
-    import scEcharts from "@/components/scEcharts";
-	import { defineAsyncComponent } from 'vue'
-    export default {
-        components: {
-            scEcharts,
-            charts: defineAsyncComponent(() => import("@/components/scEnm/lineChartsdialog.vue")),
-        },
-        data() {
-            return {
-                chartShow: false,
-                myOption: null,
-                optionHour:{},
-                optionDay:{},
-                optionMonth:{},
-                year:2023,
-                month:1,
-                days:1,
-                hours:1,
-                query: {
-                    mgroup:'3347217512021835776',
-                },
-                tableDatas:[
-                    ['产量','总产量（t）',0,0,0,0,0,0,0,0],
-                    ['产量','台时产量（t/h）','/',0,0,0,0,0,0,0],
-                    ['运转时间','运转时间（h）','/',0,0,0,0,0,0,0],
-                    ['运转时间','运转率（%）','/',0,0,0,0,0,0,0],
-                    ['能耗','煤磨分布电耗（KW·h/t）',0,0,0,0,0,0,0,0],
-                ],
-                tableName:'生产报告',
-                modelValue:true,
-                type:'hour_s',
-                title:'煤磨工段',
-                cate:'',
-                apiObj:this.$API.enm.enstat,
-                showClose:true,
-                echartType:'line',
-                asynDialog:false,
-                option1:{
-                    color: colors,
-                    tooltip:tooltip,
-                    grid: grid,
-                    toolbox: toolbox,
-                    legend:legend,
-                    xAxis: {
-                        axisTick: {
-                            show: true,
-                            length: 5,
-                            inside: true,
-                            // alignWithLabel: true
-                        },
-                        data: ['一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '十一月', '十二月']
-                    },
-                    yAxis:yAxis,
-                    series:[
-                        {
-                        name: '总产量',
-                        type: 'bar',
-                        yAxisIndex:0,
-                        data:[]
-                        },
-                        {
-                        name: '台时产量',
-                        type: 'bar',
-                        yAxisIndex:0,
-                        data: []
-                        },
-                        {
-                        name: '运转率',
-                        type: 'line',
-                        yAxisIndex: 1,
-                        data: []
-                        },
-                        {
-                        name: '分布电耗',
-                        type: 'bar',
-                        yAxisIndex: 2,
-                        data: []
-                        },
-                    ]
-                },
-                option2:{
-                    color: colors,
-                    tooltip:tooltip,
-                    grid: grid,
-                    toolbox: toolbox,
-                    legend: legend,
-                    xAxis: {
-                        axisTick: {
-                            show: true,
-                            length: 5,
-                            inside: true,
-                            // alignWithLabel: true
-                        },
-                        data: []
-                    },
-                    yAxis: yAxis,
-                    series:[
-                        {
-                        name: '总产量',
-                        type: 'bar',
-                        yAxisIndex:0,
-                        data:[]
-                        },
-                        {
-                        name: '台时产量',
-                        type: 'bar',
-                        yAxisIndex:0,
-                        data: []
-                        },
-                        {
-                        name: '运转率',
-                        type: 'line',
-                        yAxisIndex: 1,
-                        data: []
-                        },
-                        {
-                        name: '分布电耗',
-                        type: 'bar',
-                        yAxisIndex: 2,
-                        data: []
-                        },
-                    ]
-                },
-                option3:{
-                    color: colors,
-                    tooltip:tooltip,
-                    grid: grid,
-                    toolbox: toolbox,
-                    legend: legend,
-                    xAxis: {
-                            axisTick: {
-                                show: true,
-                                length: 5,
-                                inside: true,
-                            },
-                            data: ['一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '十一月', '十二月']
-                        },
-                    yAxis: yAxis,
-                    series: [
-                        {
-                        name: '总产量',
-                        type: 'bar',
-                        yAxisIndex:0,
-                        data: []
-                        },
-                        {
-                        name: '台时产量',
-                        type: 'bar',
-                        yAxisIndex:0,
-                        data: []
-                        },
-                        {
-                        name: '运转率',
-                        type: 'line',
-                        yAxisIndex: 1,
-                        data: []
-                        },
-                        {
-                        name: '分布电耗',
-                        type: 'bar',
-                        yAxisIndex: 2,
-                        data: []
-                        },
-                    ]
-                }
-            };
-        },
-        mounted() {
-            function precen(a,b){
-                if(b!==0&&b!==null&&a!==null){
-                    let precen = (a/b).toFixed(2)
-                    return precen*100+'%'
-                }else{
-                    return '/'
-                }
-            }
-            let that = this;
-            var myDate = new Date();
-            let year =that.year = myDate.getFullYear();
-            let month = that.month = myDate.getMonth()+1;
-            let days = that.days = myDate.getDate();
-            let hours = that.hours = myDate.getHours();
-            let timeDate = myDate.getTime();
-            let dayTime = 24 * 60 * 60 * 1000;
-            //昨天的计算
-            let year_d = year,month_d = month,days_d = days;
-            if(hours<21){//21点前，查找昨日数据为前一天数据
-                let newDate = timeDate- dayTime;
-                let lastDate = new Date(newDate);
-                year_d = lastDate.getFullYear();
-                month_d = lastDate.getMonth()+1;
-                days_d = lastDate.getDate();
-            }
-            //上一小时的计算
-            let hourTime = timeDate - 3600000;
-            let hourDate =  new Date(hourTime);
-            let year_h = hourDate.getFullYear();
-            let month_h = hourDate.getMonth()+1;
-            let days_h = hourDate.getDate();
-            let hours_h = hourDate.getHours();
-           
-            //昨日
-            let params3 = {};
-            params3.page = 0;
-            params3.year_s = year_d;
-            params3.month_s = month_d;
-            params3.day_s = days_d;
-            params3.type = 'day_s';
-            params3.mgroup = this.query.mgroup;
-            this.$API.enm.enstat.req(params3).then((res3) => {
-                if(res3.length>0){
-                    let data3 = res3[0];
-                    that.tableDatas[0][3]=data3.total_production;
-                    that.tableDatas[1][3]=data3.production_hour;
-                    that.tableDatas[2][3]=data3.run_hour;
-                    that.tableDatas[3][3]=data3.run_rate;
-                    that.tableDatas[4][3]=data3.elec_consume_unit;
-                }
-            })
-            //上小时
-            let params4 = {};
-            params4.page = 0;
-            params4.year = year_h;
-            params4.month = month_h;
-            params4.day = days_h;
-            params4.hour = hours_h;
-            params4.type = 'hour_st';
-            params4.mgroup = this.query.mgroup;
-            this.$API.enm.enstat.req(params4).then((res4) => {
-                if(res4.length>0){
-                    let data4 = res4[0];
-                    that.tableDatas[0][2]=data4.total_production;
-                    that.tableDatas[4][2]=data4.elec_consume_unit;
-                }    
-            })
-            //月目标
-            let params5 = {};
-                params5.page=0;
-                params5.mgroup='3346520558031773696';
-                this.$API.mtm.goal.list.req(params5).then((res5) => {
-                    if(res5.length>0){
-                        let data5 = res5;
-                        data5.forEach(item5=>{
-                            let str = 'goal_val_'+that.month;
-                            if(item5.goal_cate_name=='总产量（t）'){
-                                that.tableDatas[0][6]=item5[str];
-                                that.tableDatas[0][8]=item5.goal_val;
-                            }else if(item5.goal_cate_name=='台时产量（t/h）'){
-                                that.tableDatas[1][6]=item5[str];
-                                that.tableDatas[1][8]=item5.goal_val;
-                            }else if(item5.goal_cate_name=='运转时间（h）'){
-                                that.tableDatas[2][6]=item5[str];
-                                that.tableDatas[2][8]=item5.goal_val;
-                            }else if(item5.goal_cate_name=='运转率（%）'){
-                                that.tableDatas[3][6]=item5[str];
-                                that.tableDatas[3][8]=item5.goal_val;
-                            }else if(item5.goal_cate_name=='单位产品分布电耗（KW·h/t）'){
-                                that.tableDatas[4][6]=item5[str];
-                                that.tableDatas[4][8]=item5.goal_val;
-                            }
-                        }) 
-                    }    
-                }).then(res=>{
-                    //年
-                    let params1 = {};
-                    params1.page = 0;
-                    params1.year_s = year;
-                    params1.type = 'year_s';
-                    params1.mgroup = this.query.mgroup;
-                    this.$API.enm.enstat.req(params1).then((res1) => {
-                        if(res1.length>0){
-                            let data1 = res1[0];
-                            that.tableDatas[0][5]=data1.total_production;
-                            that.tableDatas[0][9]=precen(that.tableDatas[0][5],that.tableDatas[0][8])
-                            that.tableDatas[1][5]=data1.production_hour;
-                            that.tableDatas[1][9]=precen(that.tableDatas[1][5],that.tableDatas[1][8])
-                            that.tableDatas[2][5]=data1.run_hour;
-                            that.tableDatas[2][9]=precen(that.tableDatas[2][5],that.tableDatas[2][8])
-                            that.tableDatas[3][5]=data1.run_rate;
-                            that.tableDatas[3][9]=precen(that.tableDatas[3][5],that.tableDatas[3][8])
-                            that.tableDatas[4][5]=data1.elec_consume_unit;
-                            that.tableDatas[4][9]=precen(that.tableDatas[4][5],that.tableDatas[4][8])
-                        }else{}   
-                    })
-                    //月
-                    let params2 = {};
-                    params2.page = 0;
-                    params2.year_s = year;
-                    params2.month_s = month;
-                    params2.type = 'month_s';
-                    params2.mgroup = this.query.mgroup;
-                    this.$API.enm.enstat.req(params2).then((res2) => {
-                        if(res2.length>0){
-                            let data2 = res2[0];
-                            that.tableDatas[0][4]=data2.total_production;
-                            that.tableDatas[0][7]=precen(that.tableDatas[0][4],that.tableDatas[0][6])
-                            that.tableDatas[1][4]=data2.production_hour;
-                            that.tableDatas[1][7]=precen(that.tableDatas[1][4],that.tableDatas[1][6])
-                            that.tableDatas[2][4]=data2.run_hour;
-                            that.tableDatas[2][7]=precen(that.tableDatas[2][4],that.tableDatas[2][6])
-                            that.tableDatas[3][4]=data2.run_rate;
-                            that.tableDatas[3][7]=precen(that.tableDatas[3][4],that.tableDatas[3][6])
-                            that.tableDatas[4][4]=data2.elec_consume_unit;
-                            that.tableDatas[4][7]=precen(that.tableDatas[4][4],that.tableDatas[4][6])
-                        }    
-                    })
-                })
-                that.getHourData();
-                that.getDayData();
-                that.getMonthData();
-        },
-        methods: {
-             //获取小时数据
-             getHourData(){
-                let that = this;
-                let query = {};
-                query.page = 0;
-                query.year_s = that.year;
-                query.month_s = that.month;
-                query.day_s = that.days;
-                query.type = 'hour_s';
-                query.mgroup = that.query.mgroup;
-                this.$API.enm.enstat.req(query).then((response) => {
-                    // debugger;
-                    let seriesData0 = [],seriesData1 = [], seriesData2 = [],seriesData3 = [];
-                    let data = response;
-                    data.forEach(item => {
-                        let ind = item.hour;
-                        seriesData0[ind] = item.total_production;//总产量
-                        seriesData1[ind] = item.production_hour;//台时产量
-                        seriesData2[ind] = item.run_rate;//运转率
-                        seriesData3[ind] = item.elec_consume_unit;//分布电耗
-                    });
-                    let options = {...that.option1};
-                    options.series[0].data=seriesData0;
-                    options.series[1].data=seriesData1;
-                    options.series[2].data=seriesData2;
-                    options.series[3].data=seriesData3;
-                    let hourXAxis = [];
-                    for (let i = 1; i <= that.hours; i++) {
-                        let item = i+'时'
-                        hourXAxis.push(item)
-                    }
-                    options.xAxis.data = hourXAxis;
-                    that.optionHour = options;
-                })
-            },
-            //获取天数据
-            getDayData(){
-                let that = this;
-                let query1 = {};
-                query1.page = 0;
-                query1.year_s = that.year;
-                query1.month_s = that.month;
-                query1.type = 'day_s';
-                query1.mgroup = this.query.mgroup;
-                this.$API.enm.enstat.req(query1).then((response) => {
-                    let seriesData0 = [],seriesData1 = [], seriesData2 = [],seriesData3 = [];
-                    // debugger;
-                    console.log(response)
-                    let data = response;
-                    data.forEach(item => {
-                        // debugger;
-                        let ind = item.day_s;
-                        seriesData0[ind] = item.total_production;
-                        seriesData1[ind] = item.production_hour;
-                        seriesData2[ind] = item.run_rate;
-                        seriesData3[ind] = item.elec_consume_unit;
-                    });
-                    let options = {...that.option2};
-                    options.series[0].data=seriesData0;
-                    options.series[1].data=seriesData1;
-                    options.series[2].data=seriesData2;
-                    options.series[3].data=seriesData3;
-                    let dayXAxis = [];
-                    for (let i = 1; i <= that.days; i++) {
-                        let item = i+'日'
-                        dayXAxis.push(item)
-                    }
-                    options.xAxis.data = dayXAxis;
-                    that.optionDay = options; 
-                })
-            },
-            //获取月数据
-            getMonthData(){
-                let that = this;
-                let query2 = {};
-                query2.page = 0;
-                query2.year_s = that.year;
-                query2.type = 'month_s';
-                query2.mgroup = that.query.mgroup;
-                this.$API.enm.enstat.req(query2).then((response) => {
-                    // debugger;
-                    let seriesData0 = [],seriesData1 = [], seriesData2 = [],seriesData3 = [];
-                    console.log(response)
-                    let data = response;
-                    data.forEach(item => {
-                        let ind = item.month_s;
-                        seriesData0[ind] = item.total_production;
-                        seriesData1[ind] = item.production_hour;
-                        seriesData2[ind] = item.run_rate;
-                        seriesData3[ind] = item.elec_consume_unit;
-                    });
-                    let options = {...that.option3};
-                    options.series[0].data=seriesData0;
-                    options.series[1].data=seriesData1;
-                    options.series[2].data=seriesData2;
-                    options.series[3].data=seriesData3;
-                    let monthXAxis = [];
-                    for (let i = 1; i <= that.month; i++) {
-                        let item = i+'月'
-                        monthXAxis.push(item)
-                    }
-                    options.xAxis.data = monthXAxis;
-                    that.optionMonth = options; 
-                })
-            },
-            itemClick(type,item){
-                this.type=type;
-                this.cate=item[1];
-                this.asynDialog = true;
-            },
-            itemClick1(type,item){
-                this.chartShow = false;
-                this.$API.bi.dataset.exec
-                .req('3322567213885833216')
-                .then((res) => {
-                this.myOption = JSON.parse(res.echart_options);
-                debugger;
-                console.log(this.myOption)
-                this.chartShow = true;
-                });
-            },
-            handlePrint() {
-                this.$PRINT('#myReport');
-            },
-            exportExcel() {
-                this.exportLoading = true;
-                this.$XLSX('#myTable', this.tableName)
-                this.exportLoading = false;
-            },
-        }
-    };
+const colors = ["#647bfe", "#8698fe", "#a9b6fe", "#91CC75", "#EE6666"];
+let tooltip = {
+	show: true,
+	trigger: "axis",
+	axisPointer: {
+		type: "cross",
+	},
+	confine: false,
+	showContent: true,
+	triggerOn: "mousemove",
+};
+let grid = {
+	right: "8%",
+	left: "4%",
+	top: "15%",
+};
+let toolbox = {
+	right: "2%",
+	feature: {
+		dataView: { show: true, readOnly: false },
+		// restore: { show: true },
+		saveAsImage: { show: true },
+	},
+};
+let legend = {
+	top: "2%",
+	data: ["总产量", "台时产量", "运转率", "分布电耗"],
+};
+let yAxis = [
+	{
+		type: "value",
+		name: "产量 (t)",
+		position: "left",
+		alignTicks: true,
+		axisLine: {
+			show: true,
+			lineStyle: {
+				color: colors[0],
+			},
+		},
+		axisLabel: {
+			formatter: "{value}",
+		},
+	},
+	{
+		type: "value",
+		name: "运转率 (%)",
+		position: "right",
+		alignTicks: true,
+		offset: 80,
+		axisLine: {
+			show: true,
+			lineStyle: {
+				color: colors[2],
+			},
+		},
+		axisLabel: {
+			formatter: "{value}",
+		},
+	},
+	{
+		type: "value",
+		name: "分布电耗(KW.h)",
+		position: "right",
+		alignTicks: true,
+		axisLine: {
+			show: true,
+			lineStyle: {
+				color: colors[3],
+			},
+		},
+		axisLabel: {
+			formatter: "{value}",
+		},
+	},
+];
+import scEcharts from "@/components/scEcharts";
+import { defineAsyncComponent } from "vue";
+export default {
+	components: {
+		scEcharts,
+		charts: defineAsyncComponent(() =>
+			import("@/components/scEnm/lineChartsdialog.vue")
+		),
+	},
+	data() {
+		return {
+			chartShow: false,
+			myOption: null,
+			optionHour: {},
+			optionDay: {},
+			optionMonth: {},
+			year: 2023,
+			month: 1,
+			days: 1,
+			hours: 1,
+			query: {
+				mgroup: "",
+			},
+			tableDatas: [
+				["产量", "总产量（t）", 0, 0, 0, 0, 0, 0, 0, 0],
+				["产量", "台时产量（t/h）", "/", 0, 0, 0, 0, 0, 0, 0],
+				["运转时间", "运转时间（h）", "/", 0, 0, 0, 0, 0, 0, 0],
+				["运转时间", "运转率（%）", "/", 0, 0, 0, 0, 0, 0, 0],
+				["能耗", "煤磨分布电耗（KW·h/t）", 0, 0, 0, 0, 0, 0, 0, 0],
+			],
+			tableName: "生产报告",
+			modelValue: true,
+			type: "hour_s",
+			title: "煤磨工段",
+			cate: "",
+			apiObj: this.$API.enm.enstat,
+			showClose: true,
+			echartType: "line",
+			asynDialog: false,
+			option1: {
+				color: colors,
+				tooltip: tooltip,
+				grid: grid,
+				toolbox: toolbox,
+				legend: legend,
+				xAxis: {
+					axisTick: {
+						show: true,
+						length: 5,
+						inside: true,
+						// alignWithLabel: true
+					},
+					data: [
+						"一月",
+						"二月",
+						"三月",
+						"四月",
+						"五月",
+						"六月",
+						"七月",
+						"八月",
+						"九月",
+						"十月",
+						"十一月",
+						"十二月",
+					],
+				},
+				yAxis: yAxis,
+				series: [
+					{
+						name: "总产量",
+						type: "bar",
+						yAxisIndex: 0,
+						data: [],
+					},
+					{
+						name: "台时产量",
+						type: "bar",
+						yAxisIndex: 0,
+						data: [],
+					},
+					{
+						name: "运转率",
+						type: "line",
+						yAxisIndex: 1,
+						data: [],
+					},
+					{
+						name: "分布电耗",
+						type: "bar",
+						yAxisIndex: 2,
+						data: [],
+					},
+				],
+			},
+			option2: {
+				color: colors,
+				tooltip: tooltip,
+				grid: grid,
+				toolbox: toolbox,
+				legend: legend,
+				xAxis: {
+					axisTick: {
+						show: true,
+						length: 5,
+						inside: true,
+						// alignWithLabel: true
+					},
+					data: [],
+				},
+				yAxis: yAxis,
+				series: [
+					{
+						name: "总产量",
+						type: "bar",
+						yAxisIndex: 0,
+						data: [],
+					},
+					{
+						name: "台时产量",
+						type: "bar",
+						yAxisIndex: 0,
+						data: [],
+					},
+					{
+						name: "运转率",
+						type: "line",
+						yAxisIndex: 1,
+						data: [],
+					},
+					{
+						name: "分布电耗",
+						type: "bar",
+						yAxisIndex: 2,
+						data: [],
+					},
+				],
+			},
+			option3: {
+				color: colors,
+				tooltip: tooltip,
+				grid: grid,
+				toolbox: toolbox,
+				legend: legend,
+				xAxis: {
+					axisTick: {
+						show: true,
+						length: 5,
+						inside: true,
+					},
+					data: [
+						"一月",
+						"二月",
+						"三月",
+						"四月",
+						"五月",
+						"六月",
+						"七月",
+						"八月",
+						"九月",
+						"十月",
+						"十一月",
+						"十二月",
+					],
+				},
+				yAxis: yAxis,
+				series: [
+					{
+						name: "总产量",
+						type: "bar",
+						yAxisIndex: 0,
+						data: [],
+					},
+					{
+						name: "台时产量",
+						type: "bar",
+						yAxisIndex: 0,
+						data: [],
+					},
+					{
+						name: "运转率",
+						type: "line",
+						yAxisIndex: 1,
+						data: [],
+					},
+					{
+						name: "分布电耗",
+						type: "bar",
+						yAxisIndex: 2,
+						data: [],
+					},
+				],
+			},
+		};
+	},
+	mounted() {
+		function precen(a, b) {
+			if (b !== 0 && b !== null && a !== null) {
+				let precen = (a / b).toFixed(2);
+				return precen * 100 + "%";
+			} else {
+				return "/";
+			}
+		}
+		let that = this;
+		var myDate = new Date();
+		let year = (that.year = myDate.getFullYear());
+		let month = (that.month = myDate.getMonth() + 1);
+		let days = (that.days = myDate.getDate());
+		let hours = (that.hours = myDate.getHours());
+		let timeDate = myDate.getTime();
+		let dayTime = 24 * 60 * 60 * 1000;
+		//昨天的计算
+		let year_d = year,
+			month_d = month,
+			days_d = days;
+		if (hours < 21) {
+			//21点前，查找昨日数据为前一天数据
+			let newDate = timeDate - dayTime;
+			let lastDate = new Date(newDate);
+			year_d = lastDate.getFullYear();
+			month_d = lastDate.getMonth() + 1;
+			days_d = lastDate.getDate();
+		}
+		//上一小时的计算
+		let hourTime = timeDate - 3600000;
+		let hourDate = new Date(hourTime);
+		let year_h = hourDate.getFullYear();
+		let month_h = hourDate.getMonth() + 1;
+		let days_h = hourDate.getDate();
+		let hours_h = hourDate.getHours();
+		this.$API.mtm.mgroup.list
+			.req({ page: 0, search: "煤磨" })
+			.then((res) => {
+				console.log("煤磨", res);
+				that.query.mgroup = res[0].id;
+				//昨日
+				let params3 = {};
+				params3.page = 0;
+				params3.year_s = year_d;
+				params3.month_s = month_d;
+				params3.day_s = days_d;
+				params3.type = "day_s";
+				params3.mgroup = that.query.mgroup;
+				that.$API.enm.enstat.req(params3).then((res3) => {
+					if (res3.length > 0) {
+						let data3 = res3[0];
+						that.tableDatas[0][3] = data3.total_production;
+						that.tableDatas[1][3] = data3.production_hour;
+						that.tableDatas[2][3] = data3.run_hour;
+						that.tableDatas[3][3] = data3.run_rate;
+						that.tableDatas[4][3] = data3.elec_consume_unit;
+					}
+				});
+				//上小时
+				let params4 = {};
+				params4.page = 0;
+				params4.year = year_h;
+				params4.month = month_h;
+				params4.day = days_h;
+				params4.hour = hours_h;
+				params4.type = "hour_st";
+				params4.mgroup = that.query.mgroup;
+				that.$API.enm.enstat.req(params4).then((res4) => {
+					if (res4.length > 0) {
+						let data4 = res4[0];
+						that.tableDatas[0][2] = data4.total_production;
+						that.tableDatas[4][2] = data4.elec_consume_unit;
+					}
+				});
+				//月目标
+				let params5 = {};
+				params5.page = 0;
+				params5.mgroup = that.query.mgroup;
+				this.$API.mtm.goal.list
+					.req(params5)
+					.then((res5) => {
+						if (res5.length > 0) {
+							let data5 = res5;
+							data5.forEach((item5) => {
+								let str = "goal_val_" + that.month;
+								if (item5.goal_cate_name == "总产量（t）") {
+									that.tableDatas[0][6] = item5[str];
+									that.tableDatas[0][8] = item5.goal_val;
+								} else if (
+									item5.goal_cate_name == "台时产量（t/h）"
+								) {
+									that.tableDatas[1][6] = item5[str];
+									that.tableDatas[1][8] = item5.goal_val;
+								} else if (
+									item5.goal_cate_name == "运转时间（h）"
+								) {
+									that.tableDatas[2][6] = item5[str];
+									that.tableDatas[2][8] = item5.goal_val;
+								} else if (
+									item5.goal_cate_name == "运转率（%）"
+								) {
+									that.tableDatas[3][6] = item5[str];
+									that.tableDatas[3][8] = item5.goal_val;
+								} else if (
+									item5.goal_cate_name ==
+									"单位产品分布电耗（KW·h/t）"
+								) {
+									that.tableDatas[4][6] = item5[str];
+									that.tableDatas[4][8] = item5.goal_val;
+								}
+							});
+						}
+					})
+					.then((res) => {
+						//年
+						let params1 = {};
+						params1.page = 0;
+						params1.year_s = year;
+						params1.type = "year_s";
+						params1.mgroup = that.query.mgroup;
+						that.$API.enm.enstat.req(params1).then((res1) => {
+							if (res1.length > 0) {
+								let data1 = res1[0];
+								that.tableDatas[0][5] = data1.total_production;
+								that.tableDatas[0][9] = precen(
+									that.tableDatas[0][5],
+									that.tableDatas[0][8]
+								);
+								that.tableDatas[1][5] = data1.production_hour;
+								that.tableDatas[1][9] = precen(
+									that.tableDatas[1][5],
+									that.tableDatas[1][8]
+								);
+								that.tableDatas[2][5] = data1.run_hour;
+								that.tableDatas[2][9] = precen(
+									that.tableDatas[2][5],
+									that.tableDatas[2][8]
+								);
+								that.tableDatas[3][5] = data1.run_rate;
+								that.tableDatas[3][9] = precen(
+									that.tableDatas[3][5],
+									that.tableDatas[3][8]
+								);
+								that.tableDatas[4][5] = data1.elec_consume_unit;
+								that.tableDatas[4][9] = precen(
+									that.tableDatas[4][5],
+									that.tableDatas[4][8]
+								);
+							} else {
+							}
+						});
+						//月
+						let params2 = {};
+						params2.page = 0;
+						params2.year_s = year;
+						params2.month_s = month;
+						params2.type = "month_s";
+						params2.mgroup = that.query.mgroup;
+						that.$API.enm.enstat.req(params2).then((res2) => {
+							if (res2.length > 0) {
+								let data2 = res2[0];
+								that.tableDatas[0][4] = data2.total_production;
+								that.tableDatas[0][7] = precen(
+									that.tableDatas[0][4],
+									that.tableDatas[0][6]
+								);
+								that.tableDatas[1][4] = data2.production_hour;
+								that.tableDatas[1][7] = precen(
+									that.tableDatas[1][4],
+									that.tableDatas[1][6]
+								);
+								that.tableDatas[2][4] = data2.run_hour;
+								that.tableDatas[2][7] = precen(
+									that.tableDatas[2][4],
+									that.tableDatas[2][6]
+								);
+								that.tableDatas[3][4] = data2.run_rate;
+								that.tableDatas[3][7] = precen(
+									that.tableDatas[3][4],
+									that.tableDatas[3][6]
+								);
+								that.tableDatas[4][4] = data2.elec_consume_unit;
+								that.tableDatas[4][7] = precen(
+									that.tableDatas[4][4],
+									that.tableDatas[4][6]
+								);
+							}
+						});
+					});
+				that.getHourData();
+				that.getDayData();
+				that.getMonthData();
+			});
+	},
+	methods: {
+		//获取小时数据
+		getHourData() {
+			let that = this;
+			let query = {};
+			query.page = 0;
+			query.year_s = that.year;
+			query.month_s = that.month;
+			query.day_s = that.days;
+			query.type = "hour_s";
+			query.mgroup = that.query.mgroup;
+			this.$API.enm.enstat.req(query).then((response) => {
+				// debugger;
+				let seriesData0 = [],
+					seriesData1 = [],
+					seriesData2 = [],
+					seriesData3 = [];
+				let data = response;
+				data.forEach((item) => {
+					let ind = item.hour;
+					seriesData0[ind] = item.total_production; //总产量
+					seriesData1[ind] = item.production_hour; //台时产量
+					seriesData2[ind] = item.run_rate; //运转率
+					seriesData3[ind] = item.elec_consume_unit; //分布电耗
+				});
+				let options = { ...that.option1 };
+				options.series[0].data = seriesData0;
+				options.series[1].data = seriesData1;
+				options.series[2].data = seriesData2;
+				options.series[3].data = seriesData3;
+				let hourXAxis = [];
+				for (let i = 1; i <= that.hours; i++) {
+					let item = i + "时";
+					hourXAxis.push(item);
+				}
+				options.xAxis.data = hourXAxis;
+				that.optionHour = options;
+			});
+		},
+		//获取天数据
+		getDayData() {
+			let that = this;
+			let query1 = {};
+			query1.page = 0;
+			query1.year_s = that.year;
+			query1.month_s = that.month;
+			query1.type = "day_s";
+			query1.mgroup = this.query.mgroup;
+			this.$API.enm.enstat.req(query1).then((response) => {
+				let seriesData0 = [],
+					seriesData1 = [],
+					seriesData2 = [],
+					seriesData3 = [];
+				// debugger;
+				console.log(response);
+				let data = response;
+				data.forEach((item) => {
+					// debugger;
+					let ind = item.day_s;
+					seriesData0[ind] = item.total_production;
+					seriesData1[ind] = item.production_hour;
+					seriesData2[ind] = item.run_rate;
+					seriesData3[ind] = item.elec_consume_unit;
+				});
+				let options = { ...that.option2 };
+				options.series[0].data = seriesData0;
+				options.series[1].data = seriesData1;
+				options.series[2].data = seriesData2;
+				options.series[3].data = seriesData3;
+				let dayXAxis = [];
+				for (let i = 1; i <= that.days; i++) {
+					let item = i + "日";
+					dayXAxis.push(item);
+				}
+				options.xAxis.data = dayXAxis;
+				that.optionDay = options;
+			});
+		},
+		//获取月数据
+		getMonthData() {
+			let that = this;
+			let query2 = {};
+			query2.page = 0;
+			query2.year_s = that.year;
+			query2.type = "month_s";
+			query2.mgroup = that.query.mgroup;
+			this.$API.enm.enstat.req(query2).then((response) => {
+				// debugger;
+				let seriesData0 = [],
+					seriesData1 = [],
+					seriesData2 = [],
+					seriesData3 = [];
+				console.log(response);
+				let data = response;
+				data.forEach((item) => {
+					let ind = item.month_s;
+					seriesData0[ind] = item.total_production;
+					seriesData1[ind] = item.production_hour;
+					seriesData2[ind] = item.run_rate;
+					seriesData3[ind] = item.elec_consume_unit;
+				});
+				let options = { ...that.option3 };
+				options.series[0].data = seriesData0;
+				options.series[1].data = seriesData1;
+				options.series[2].data = seriesData2;
+				options.series[3].data = seriesData3;
+				let monthXAxis = [];
+				for (let i = 1; i <= that.month; i++) {
+					let item = i + "月";
+					monthXAxis.push(item);
+				}
+				options.xAxis.data = monthXAxis;
+				that.optionMonth = options;
+			});
+		},
+		itemClick(type, item) {
+			this.type = type;
+			this.cate = item[1];
+			this.asynDialog = true;
+		},
+		itemClick1(type, item) {
+			this.chartShow = false;
+			this.$API.bi.dataset.exec.req("3322567213885833216").then((res) => {
+				this.myOption = JSON.parse(res.echart_options);
+				debugger;
+				console.log(this.myOption);
+				this.chartShow = true;
+			});
+		},
+		handlePrint() {
+			this.$PRINT("#myReport");
+		},
+		exportExcel() {
+			this.exportLoading = true;
+			this.$XLSX("#myTable", this.tableName);
+			this.exportLoading = false;
+		},
+	},
+};
 </script>
 <style scoped>
-.printContainer{
-    padding-left: 20px;
+.printContainer {
+	padding-left: 20px;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/enm_coalbase/power.vue b/src/views/enm_coalbase/power.vue
index 9e0b254e..8a24d42d 100644
--- a/src/views/enm_coalbase/power.vue
+++ b/src/views/enm_coalbase/power.vue
@@ -1,478 +1,587 @@
 <template>
-    <div class="app-container">
-        <el-header>
-            <div class="left-panel">
-                <el-button
-                    type="primary"
-                    @click="exportExcel()"
-                    :loading = "exportLoading"
-                    >导出xlsx
-                </el-button>
-                <el-button
-                    type="primary"
-                    @click="handlePrint"
-                    >打印
-                </el-button>
-            </div>
-        </el-header>
-        <el-card style="margin-top:5px">
-            <div class="printWrap">
-                <div ref="print" id="myReport" class="printContainer">
-                    <table border="1" width="1035" cellspacing="0" :key="timeStamp" class="myTable" id="myTable">
-                        <thead class="myTableHead">
-                            <tr>
-                                <th colspan="6">煤磨工段主要设备（100KW以上）单位产品电耗数据表</th>
-                            </tr>
-                            <tr>
-                                <th>设备名称</th>
-                                <th>设备编号</th>
-                                <th>单位</th>
-                                <th>上个小时</th>
-                                <th>昨日</th>
-                                <th>本月</th>
-                            </tr>
-                        </thead>
-                        <tbody>
-                            <tr v-for="item in tableDatas" :key="item">
-                                <template v-for="(item1,ind) in item" :key="item1">
-                                    <td  v-if="ind==0||ind==1||ind==2" class="numCell">{{item1}}</td>
-                                    <td v-if="ind==3" class="numCell hoursItem" @click="itemClick('hour_s',item1)">{{item1}}</td>
-                                    <td v-if="ind==4"  class="numCell monthItem" @click="itemClick('day_s',item1)">{{item1}}</td>
-                                    <td v-if="ind==5" class="numCell yearItem" @click="itemClick('month_s',item1)">{{item1}}</td>
-                                </template>
-                            </tr>
-                        </tbody>
-                    </table>
-                    <div class="chartWrap">
-                        <div class="chartTitle">小时生产参数统计图</div>
-                        <scEcharts height="400px" width="1033px" :option="optionHour"></scEcharts>
-                    </div>
-                    <div class="chartWrap">
-                        <div class="chartTitle">本月生产参数统计图</div>
-                        <scEcharts height="400px" width="1033px" :option="optionDay"></scEcharts>
-                    </div>
-                    <div class="chartWrap">
-                        <div class="chartTitle">本年生产参数统计图</div>
-                        <scEcharts height="400px" width="1033px" :option="optionMonth"></scEcharts>
-                    </div>
-                </div>
-            </div>
-            <charts 
-                v-if="asynDialog"
-                :type="type" 
-                :title="title"
-                :cate="cate"
-                :apiObj = "apiObj"
-                :mgroup="query.mgroup"
-                :modelValue="modelValue"
-                :showClose="showClose"
-                :echartType='echartType'
-                @closed="asynDialog = false"
-            ></charts>
-        </el-card>
-    </div>
+	<div class="app-container">
+		<el-header>
+			<div class="left-panel">
+				<el-button
+					type="primary"
+					@click="exportExcel()"
+					:loading="exportLoading"
+					>导出xlsx
+				</el-button>
+				<el-button type="primary" @click="handlePrint">打印 </el-button>
+			</div>
+		</el-header>
+		<el-card style="margin-top: 5px">
+			<div class="printWrap">
+				<div ref="print" id="myReport" class="printContainer">
+					<table
+						border="1"
+						width="1035"
+						cellspacing="0"
+						:key="timeStamp"
+						class="myTable"
+						id="myTable"
+					>
+						<thead class="myTableHead">
+							<tr>
+								<th colspan="6">
+									煤磨工段主要设备（100KW以上）单位产品电耗数据表
+								</th>
+							</tr>
+							<tr>
+								<th>设备名称</th>
+								<th>设备编号</th>
+								<th>单位</th>
+								<th>上个小时</th>
+								<th>昨日</th>
+								<th>本月</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr v-for="item in tableDatas" :key="item">
+								<template
+									v-for="(item1, ind) in item"
+									:key="item1"
+								>
+									<td
+										v-if="ind == 0 || ind == 1 || ind == 2"
+										class="numCell"
+									>
+										{{ item1 }}
+									</td>
+									<td
+										v-if="ind == 3"
+										class="numCell hoursItem"
+										@click="itemClick('hour_s', item1)"
+									>
+										{{ item1 }}
+									</td>
+									<td
+										v-if="ind == 4"
+										class="numCell monthItem"
+										@click="itemClick('day_s', item1)"
+									>
+										{{ item1 }}
+									</td>
+									<td
+										v-if="ind == 5"
+										class="numCell yearItem"
+										@click="itemClick('month_s', item1)"
+									>
+										{{ item1 }}
+									</td>
+								</template>
+							</tr>
+						</tbody>
+					</table>
+					<div class="chartWrap">
+						<div class="chartTitle">小时生产参数统计图</div>
+						<scEcharts
+							height="400px"
+							width="1033px"
+							:option="optionHour"
+						></scEcharts>
+					</div>
+					<div class="chartWrap">
+						<div class="chartTitle">本月生产参数统计图</div>
+						<scEcharts
+							height="400px"
+							width="1033px"
+							:option="optionDay"
+						></scEcharts>
+					</div>
+					<div class="chartWrap">
+						<div class="chartTitle">本年生产参数统计图</div>
+						<scEcharts
+							height="400px"
+							width="1033px"
+							:option="optionMonth"
+						></scEcharts>
+					</div>
+				</div>
+			</div>
+			<charts
+				v-if="asynDialog"
+				:type="type"
+				:title="title"
+				:cate="cate"
+				:apiObj="apiObj"
+				:mgroup="query.mgroup"
+				:modelValue="modelValue"
+				:showClose="showClose"
+				:echartType="echartType"
+				@closed="asynDialog = false"
+			></charts>
+		</el-card>
+	</div>
 </template>
 <script>
-const colors =['#647bfe','#8698fe','#a9b6fe','#cbd3fe','#91CC75','#EE6666'];
-    let tooltip= {
-        show: true, 
-        trigger: 'axis',
-        axisPointer: {
-            type: 'cross'
-        },
-        confine:false, 
-        showContent: true, 
-        triggerOn:"mousemove", 
-        // alwaysShowContent:true,  
-    };
-    let grid={
-        right: '3%',
-        left:'7%',
-        top:'15%'
-    };
-    let toolbox={
-        right:'5%',
-        feature: {
-            dataView: { show: true, readOnly: false },
-            // restore: { show: true },
-            saveAsImage: { show: true }
-        }
-    };
-    let legend= {
-        top:'2%',
-        data:['煤磨排风机主电机', '煤磨主电机']
-    };
-    let yAxis= {
-        type: 'value',
-        name: '分布电耗(KW.h/t)',
-        alignTicks: true,
-        axisLine: {
-            show: true,
-            lineStyle: {
-            color: colors[3]
-            }
-        },
-        axisLabel: {
-            formatter: '{value}'
-        }
-    };
-    import scEcharts from "@/components/scEcharts";
-	import { defineAsyncComponent } from 'vue'
-    export default {
-        components: {
-            scEcharts,
-            charts: defineAsyncComponent(() => import("@/components/scEnm/lineChartsdialog.vue")),
-        },
-        data() {
-            return {
-                chartShow: false,
-                myOption: null,
-                optionHour:{},
-                optionDay:{},
-                optionMonth:{},
-                year:2023,
-                month:1,
-                days:1,
-                hours:1,
-                query: {
-                    mgroup:'3347217512021835776',
-                },
-                tableName:'主要设备（100KW以上）单位产品电耗数据表',
-                tableDatas:[
-                    ['煤磨排风机主电机','','KW·h/t','','',''],
-                    ['煤磨主电机','','KW·h/t','','',''],
-                ],
-                modelValue:true,
-                type:'hour_s',
-                title:'煤磨工段',
-                cate:'',
-                apiObj:this.$API.enm.mpoint.stat,
-                showClose:true,
-                echartType:'line',
-                asynDialog:false,
-                allValHour:0,
-                allValDays:0,
-                allValMonth:0,
-                option1:{
-                    color: colors,
-                    tooltip:tooltip,
-                    grid: grid,
-                    toolbox: toolbox,
-                    legend:legend,
-                    xAxis: {
-                        axisTick: {
-                            show: true,
-                            length: 5,
-                            inside: true,
-                        },
-                        data: []
-                    },
-                    yAxis:yAxis,
-                    series:[
-                        {
-                        name: '煤磨排风机主电机',
-                        type: 'bar',
-                        data:[]
-                        },
-                        {
-                        name: '煤磨主电机',
-                        type: 'bar',
-                        data: []
-                        },
-                    ]
-                },
-                option2:{
-                    color: colors,
-                    tooltip:tooltip,
-                    grid: grid,
-                    toolbox: toolbox,
-                    legend: legend,
-                    xAxis: {
-                        axisTick: {
-                            show: true,
-                            length: 5,
-                            inside: true,
-                        },
-                        data: []
-                    },
-                    yAxis: yAxis,
-                    series:[
-                        {
-                        name: '煤磨排风机主电机',
-                        type: 'bar',
-                        data:[]
-                        },
-                        {
-                        name: '煤磨主电机',
-                        type: 'bar',
-                        data: []
-                        },
-                    ]
-                },
-                option3:{
-                    color: colors,
-                    tooltip:tooltip,
-                    grid: grid,
-                    toolbox: toolbox,
-                    legend: legend,
-                    xAxis: {
-                            axisTick: {
-                                show: true,
-                                length: 5,
-                                inside: true,
-                            },
-                            data: ['一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '十一月', '十二月']
-                        },
-                    yAxis: yAxis,
-                    series:[
-                        {
-                        name: '煤磨排风机主电机',
-                        type: 'bar',
-                        data:[]
-                        },
-                        {
-                        name: '煤磨主电机',
-                        type: 'bar',
-                        data: []
-                        },
-                    ]
-                }
-            };
-        },
-        mounted() {
-            let that = this;
-            var myDate = new Date();
-            let year = myDate.getFullYear();
-            let month = myDate.getMonth()+1;
-            let days = myDate.getDate();
-            let hours = myDate.getHours();
-            let timeDate = myDate.getTime();
-            let dayTime = 24 * 60 * 60 * 1000;
-            //昨天的计算
-            let year_d = year,month_d = month,days_d = days;
-            if(hours<21){//21点前，查找昨日数据为前一天数据
-                let newDate = timeDate- dayTime;
-                let lastDate = new Date(newDate);
-                year_d = lastDate.getFullYear();
-                month_d = lastDate.getMonth()+1;
-                days_d = lastDate.getDate();
-            }
-            //上一小时的计算
-            let hourTime = timeDate - 3600000;
-            let hourDate =  new Date(hourTime);
-            let year_h = hourDate.getFullYear();
-            let month_h = hourDate.getMonth()+1;
-            let days_h = hourDate.getDate();
-            let hours_h = hourDate.getHours();
-            //本月
-            let params2 = {};
-            params2.page = 0;
-            params2.year_s = year;
-            params2.month_s = month;
-            params2.type = 'month_s';
-            params2.mgroup = this.query.mgroup;
-            this.$API.enm.enstat.req(params2).then((res2) => {
-                if(res2.length>0){
-                    let hourProduct=that.allValMonth = res2[0].total_production;//当前条件下的总产量
-                    params2.mpoint__ep_monitored__power_kw__gte = 100;
-                    this.$API.enm.mpoint.stat.req(params2).then((res) => {
-                        let data2 = res;
-                        for (let i = 0; i < data2.length; i++) {
-                            that.tableDatas[i]=[];
-                            that.tableDatas[i][0]=data2[i].ep_monitored_name;
-                            that.tableDatas[i][1]=data2[i].ep_monitored_number;
-                            that.tableDatas[i][2]='KW·h/t';
-                            let val = hourProduct==0?'/':(data2[i].val/hourProduct).toFixed(2);
-                            that.tableDatas[i][5]=val;
-                        }
-                    }) 
-                }    
-            }).then(res2=>{
-                //昨日
-                let params3 = {};
-                params3.page = 0;
-                params3.year_s = year_d;
-                params3.month_s = month_d;
-                params3.day_s = days_d;
-                params3.type = 'day_s';
-                params3.mgroup = this.query.mgroup;
-                this.$API.enm.enstat.req(params3).then((res3) => {
-                    if(res3.length>0){
-                        let hourProduct=that.allValDays = res3[0].total_production;
-                        params3.mpoint__ep_monitored__power_kw__gte = 100;
-                        this.$API.enm.mpoint.stat.req(params3).then((res) => {
-                            let data3 = res3;
-                            for (let j = 0; j < data3.length; j++) {
-                                let val = hourProduct==0?'/':(data3[j].val/hourProduct).toFixed(2);
-                                that.tableDatas[j][4]=val;   
-                            }
-                        })
-                    }
-                })
-                //上小时
-                let params4 = {};
-                params4.page = 0;
-                params4.year = year_h;
-                params4.month = month_h;
-                params4.day = days_h;
-                params4.hour = hours_h;
-                params4.type = 'hour_s';
-                params4.mgroup = this.query.mgroup;
-                this.$API.enm.enstat.req(params4).then((res4) => {
-                    if(res4.length>0){
-                        let hourProduct=that.allValHour = res4[0].total_production;
-                        params4.mpoint__ep_monitored__power_kw__gte = 100;
-                        this.$API.enm.mpoint.stat.req(params4).then((res) => {
-                            let data4 = res4;
-                            for (let k = 0; k < data4.length; k++) {
-                                let val = hourProduct==0?'/':(data4[k].val/hourProduct).toFixed(2);
-                                that.tableDatas[k][3]=val;   
-                            }
-                        })
-                    }    
-                })
-            })
-            that.getHourData();
-            that.getDayData();
-            that.getMonthData();
-        },
-        methods: {
-            //获取小时数据
-            getHourData(){
-                let that = this;
-                let query = {};
-                query.page = 0;
-                query.year_s = that.year;
-                query.month_s = that.month;
-                query.day_s = that.days;
-                query.type = 'hour_s';
-                query.mgroup = that.query.mgroup;
-                query.mpoint__ep_monitored__power_kw__gte = 100;
-                this.$API.enm.mpoint.stat.req(query).then((response) => {
-                    let seriesData0 = [],seriesData1 = [];
-                    let data = response;
-                    data.forEach(item => {
-                        let ind = item.hour;
-                        let val=0;
-                        if(that.allValHour==0){
-                            val = ''
-                        }else{
-                            val = (item.val/that.allValHour).toFixed(2); 
-                        }
-                        if(item.equip_name=='煤磨排风机主电机'){
-                            seriesData0[ind] = val;
-                        }else if(item.equip_name=='煤磨主电机'){
-                            seriesData1[ind] = val;
-                        }
-                    });
-                    let options = {...that.option1};
-                    options.series[0].data=seriesData0;
-                    options.series[1].data=seriesData1;
-                    let hourXAxis = [];
-                    for (let i = 1; i <= that.hours; i++) {
-                        let item = i+'时'
-                        hourXAxis.push(item)
-                    }
-                    options.xAxis.data = hourXAxis;
-                    that.optionHour = options;
-                })
-            },
-            //获取天数据
-            getDayData(){
-                let that = this;
-                let query1 = {};
-                query1.page = 0;
-                query1.year_s = that.year;
-                query1.month_s = that.month;
-                query1.type = 'day_s';
-                query1.mgroup = this.query.mgroup;
-                query1.mpoint__ep_monitored__power_kw__gte = 100;
-                this.$API.enm.enstat.req(query1).then((response) => {
-                    let seriesData0 = [],seriesData1 = [];
-                    let data = response;
-                    data.forEach(item => {
-                        // debugger;
-                        let ind = item.day_s;
-                        let val=0;
-                        if(that.allValDays==0){
-                            val = ''
-                        }else{
-                            val = (item.val/that.allValDays).toFixed(2); 
-                        }
-                        if(item.equip_name=='煤磨排风机主电机'){
-                            seriesData0[ind] = val;
-                        }else if(item.equip_name=='煤磨主电机'){
-                            seriesData1[ind] = val;
-                        }
-                    });
-                    let options = {...that.option2};
-                    options.series[0].data=seriesData0;
-                    options.series[1].data=seriesData1;
-                    let dayXAxis = [];
-                    for (let i = 1; i <= that.days; i++) {
-                        let item = i+'日'
-                        dayXAxis.push(item)
-                    }
-                    options.xAxis.data = dayXAxis;
-                    that.optionDay = options; 
-                })
-            },
-            //获取月数据
-            getMonthData(){
-                let that = this;
-                let query2 = {};
-                query2.page = 0;
-                query2.year_s = that.year;
-                query2.type = 'month_s';
-                query2.mgroup = that.query.mgroup;
-                query2.mpoint__ep_monitored__power_kw__gte = 100;
-                this.$API.enm.enstat.req(query2).then((response) => {
-                    let seriesData0 = [],seriesData1 = [];
-                    let data = response;
-                    data.forEach(item => {
-                        let ind = item.month_s;
-                        let val=0;
-                        if(that.allValMonth==0){
-                            val = ''
-                        }else{
-                            val = (item.val/that.allValMonth).toFixed(2); 
-                        }
-                        if(item.equip_name=='煤磨排风机主电机'){
-                            seriesData0[ind] = val;
-                        }else if(item.equip_name=='煤磨主电机'){
-                            seriesData1[ind] = val;
-                        }
-                    });
-                    let options = {...that.option3};
-                    options.series[0].data=seriesData0;
-                    options.series[1].data=seriesData1;
-                    let monthXAxis = [];
-                    for (let i = 1; i <= that.month; i++) {
-                        let item = i+'月'
-                        monthXAxis.push(item)
-                    }
-                    options.xAxis.data = monthXAxis;
-                    that.optionMonth = options; 
-                })
-            },
-            itemClick(type,item){
-                this.type=type;
-                this.cate = item[0];
-                this.asynDialog = true;
-            },
-            handlePrint() {
-                this.$PRINT('#myReport');
-            },
-            exportExcel() {
-                this.exportLoading = true;
-                this.$XLSX('#myTable', this.tableName)
-                this.exportLoading = false;
-            },
-        }
-    };
+const colors = [
+	"#647bfe",
+	"#8698fe",
+	"#a9b6fe",
+	"#cbd3fe",
+	"#91CC75",
+	"#EE6666",
+];
+let tooltip = {
+	show: true,
+	trigger: "axis",
+	axisPointer: {
+		type: "cross",
+	},
+	confine: false,
+	showContent: true,
+	triggerOn: "mousemove",
+	// alwaysShowContent:true,
+};
+let grid = {
+	right: "3%",
+	left: "7%",
+	top: "15%",
+};
+let toolbox = {
+	right: "5%",
+	feature: {
+		dataView: { show: true, readOnly: false },
+		// restore: { show: true },
+		saveAsImage: { show: true },
+	},
+};
+let legend = {
+	top: "2%",
+	data: ["煤磨排风机主电机", "煤磨主电机"],
+};
+let yAxis = {
+	type: "value",
+	name: "分布电耗(KW.h/t)",
+	alignTicks: true,
+	axisLine: {
+		show: true,
+		lineStyle: {
+			color: colors[3],
+		},
+	},
+	axisLabel: {
+		formatter: "{value}",
+	},
+};
+import scEcharts from "@/components/scEcharts";
+import { defineAsyncComponent } from "vue";
+export default {
+	components: {
+		scEcharts,
+		charts: defineAsyncComponent(() =>
+			import("@/components/scEnm/lineChartsdialog.vue")
+		),
+	},
+	data() {
+		return {
+			chartShow: false,
+			myOption: null,
+			optionHour: {},
+			optionDay: {},
+			optionMonth: {},
+			year: 2023,
+			month: 1,
+			days: 1,
+			hours: 1,
+			query: {
+				mgroup: "",
+			},
+			tableName: "主要设备（100KW以上）单位产品电耗数据表",
+			tableDatas: [
+				["煤磨排风机主电机", "", "KW·h/t", "", "", ""],
+				["煤磨主电机", "", "KW·h/t", "", "", ""],
+			],
+			modelValue: true,
+			type: "hour_s",
+			title: "煤磨工段",
+			cate: "",
+			apiObj: this.$API.enm.mpoint.stat,
+			showClose: true,
+			echartType: "line",
+			asynDialog: false,
+			allValHour: 0,
+			allValDays: 0,
+			allValMonth: 0,
+			option1: {
+				color: colors,
+				tooltip: tooltip,
+				grid: grid,
+				toolbox: toolbox,
+				legend: legend,
+				xAxis: {
+					axisTick: {
+						show: true,
+						length: 5,
+						inside: true,
+					},
+					data: [],
+				},
+				yAxis: yAxis,
+				series: [
+					{
+						name: "煤磨排风机主电机",
+						type: "bar",
+						data: [],
+					},
+					{
+						name: "煤磨主电机",
+						type: "bar",
+						data: [],
+					},
+				],
+			},
+			option2: {
+				color: colors,
+				tooltip: tooltip,
+				grid: grid,
+				toolbox: toolbox,
+				legend: legend,
+				xAxis: {
+					axisTick: {
+						show: true,
+						length: 5,
+						inside: true,
+					},
+					data: [],
+				},
+				yAxis: yAxis,
+				series: [
+					{
+						name: "煤磨排风机主电机",
+						type: "bar",
+						data: [],
+					},
+					{
+						name: "煤磨主电机",
+						type: "bar",
+						data: [],
+					},
+				],
+			},
+			option3: {
+				color: colors,
+				tooltip: tooltip,
+				grid: grid,
+				toolbox: toolbox,
+				legend: legend,
+				xAxis: {
+					axisTick: {
+						show: true,
+						length: 5,
+						inside: true,
+					},
+					data: [
+						"一月",
+						"二月",
+						"三月",
+						"四月",
+						"五月",
+						"六月",
+						"七月",
+						"八月",
+						"九月",
+						"十月",
+						"十一月",
+						"十二月",
+					],
+				},
+				yAxis: yAxis,
+				series: [
+					{
+						name: "煤磨排风机主电机",
+						type: "bar",
+						data: [],
+					},
+					{
+						name: "煤磨主电机",
+						type: "bar",
+						data: [],
+					},
+				],
+			},
+		};
+	},
+	mounted() {
+		let that = this;
+		var myDate = new Date();
+		let year = myDate.getFullYear();
+		let month = myDate.getMonth() + 1;
+		let days = myDate.getDate();
+		let hours = myDate.getHours();
+		let timeDate = myDate.getTime();
+		let dayTime = 24 * 60 * 60 * 1000;
+		//昨天的计算
+		let year_d = year,
+			month_d = month,
+			days_d = days;
+		if (hours < 21) {
+			//21点前，查找昨日数据为前一天数据
+			let newDate = timeDate - dayTime;
+			let lastDate = new Date(newDate);
+			year_d = lastDate.getFullYear();
+			month_d = lastDate.getMonth() + 1;
+			days_d = lastDate.getDate();
+		}
+		//上一小时的计算
+		let hourTime = timeDate - 3600000;
+		let hourDate = new Date(hourTime);
+		let year_h = hourDate.getFullYear();
+		let month_h = hourDate.getMonth() + 1;
+		let days_h = hourDate.getDate();
+		let hours_h = hourDate.getHours();
+		this.$API.mtm.mgroup.list
+			.req({ page: 0, search: "煤磨" })
+			.then((res) => {
+				console.log("煤磨", res);
+				that.query.mgroup = res[0].id;
+				//本月
+				let params2 = {};
+				params2.page = 0;
+				params2.year_s = year;
+				params2.month_s = month;
+				params2.type = "month_s";
+				params2.mgroup = that.query.mgroup;
+				that.$API.enm.enstat
+					.req(params2)
+					.then((res2) => {
+						if (res2.length > 0) {
+							let hourProduct = (that.allValMonth =
+								res2[0].total_production); //当前条件下的总产量
+							params2.mpoint__ep_monitored__power_kw__gte = 100;
+							that.$API.enm.mpoint.stat
+								.req(params2)
+								.then((res) => {
+									let data2 = res;
+									for (let i = 0; i < data2.length; i++) {
+										that.tableDatas[i] = [];
+										that.tableDatas[i][0] =
+											data2[i].ep_monitored_name;
+										that.tableDatas[i][1] =
+											data2[i].ep_monitored_number;
+										that.tableDatas[i][2] = "KW·h/t";
+										let val =
+											hourProduct == 0
+												? "/"
+												: (
+														data2[i].val /
+														hourProduct
+												  ).toFixed(2);
+										that.tableDatas[i][5] = val;
+									}
+								});
+						}
+					})
+					.then((res2) => {
+						//昨日
+						let params3 = {};
+						params3.page = 0;
+						params3.year_s = year_d;
+						params3.month_s = month_d;
+						params3.day_s = days_d;
+						params3.type = "day_s";
+						params3.mgroup = that.query.mgroup;
+						that.$API.enm.enstat.req(params3).then((res3) => {
+							if (res3.length > 0) {
+								let hourProduct = (that.allValDays =
+									res3[0].total_production);
+								params3.mpoint__ep_monitored__power_kw__gte = 100;
+								that.$API.enm.mpoint.stat
+									.req(params3)
+									.then((res) => {
+										let data3 = res3;
+										for (let j = 0; j < data3.length; j++) {
+											let val =
+												hourProduct == 0
+													? "/"
+													: (
+															data3[j].val /
+															hourProduct
+													  ).toFixed(2);
+											that.tableDatas[j][4] = val;
+										}
+									});
+							}
+						});
+						//上小时
+						let params4 = {};
+						params4.page = 0;
+						params4.year = year_h;
+						params4.month = month_h;
+						params4.day = days_h;
+						params4.hour = hours_h;
+						params4.type = "hour_s";
+						params4.mgroup = that.query.mgroup;
+						that.$API.enm.enstat.req(params4).then((res4) => {
+							if (res4.length > 0) {
+								let hourProduct = (that.allValHour =
+									res4[0].total_production);
+								params4.mpoint__ep_monitored__power_kw__gte = 100;
+								that.$API.enm.mpoint.stat
+									.req(params4)
+									.then((res) => {
+										let data4 = res4;
+										for (let k = 0; k < data4.length; k++) {
+											let val =
+												hourProduct == 0
+													? "/"
+													: (
+															data4[k].val /
+															hourProduct
+													  ).toFixed(2);
+											that.tableDatas[k][3] = val;
+										}
+									});
+							}
+						});
+					});
+				that.getHourData();
+				that.getDayData();
+				that.getMonthData();
+			});
+	},
+	methods: {
+		//获取小时数据
+		getHourData() {
+			let that = this;
+			let query = {};
+			query.page = 0;
+			query.year_s = that.year;
+			query.month_s = that.month;
+			query.day_s = that.days;
+			query.type = "hour_s";
+			query.mgroup = that.query.mgroup;
+			query.mpoint__ep_monitored__power_kw__gte = 100;
+			this.$API.enm.mpoint.stat.req(query).then((response) => {
+				let seriesData0 = [],
+					seriesData1 = [];
+				let data = response;
+				data.forEach((item) => {
+					let ind = item.hour;
+					let val = 0;
+					if (that.allValHour == 0) {
+						val = "";
+					} else {
+						val = (item.val / that.allValHour).toFixed(2);
+					}
+					if (item.equip_name == "煤磨排风机主电机") {
+						seriesData0[ind] = val;
+					} else if (item.equip_name == "煤磨主电机") {
+						seriesData1[ind] = val;
+					}
+				});
+				let options = { ...that.option1 };
+				options.series[0].data = seriesData0;
+				options.series[1].data = seriesData1;
+				let hourXAxis = [];
+				for (let i = 1; i <= that.hours; i++) {
+					let item = i + "时";
+					hourXAxis.push(item);
+				}
+				options.xAxis.data = hourXAxis;
+				that.optionHour = options;
+			});
+		},
+		//获取天数据
+		getDayData() {
+			let that = this;
+			let query1 = {};
+			query1.page = 0;
+			query1.year_s = that.year;
+			query1.month_s = that.month;
+			query1.type = "day_s";
+			query1.mgroup = this.query.mgroup;
+			query1.mpoint__ep_monitored__power_kw__gte = 100;
+			this.$API.enm.enstat.req(query1).then((response) => {
+				let seriesData0 = [],
+					seriesData1 = [];
+				let data = response;
+				data.forEach((item) => {
+					// debugger;
+					let ind = item.day_s;
+					let val = 0;
+					if (that.allValDays == 0) {
+						val = "";
+					} else {
+						val = (item.val / that.allValDays).toFixed(2);
+					}
+					if (item.equip_name == "煤磨排风机主电机") {
+						seriesData0[ind] = val;
+					} else if (item.equip_name == "煤磨主电机") {
+						seriesData1[ind] = val;
+					}
+				});
+				let options = { ...that.option2 };
+				options.series[0].data = seriesData0;
+				options.series[1].data = seriesData1;
+				let dayXAxis = [];
+				for (let i = 1; i <= that.days; i++) {
+					let item = i + "日";
+					dayXAxis.push(item);
+				}
+				options.xAxis.data = dayXAxis;
+				that.optionDay = options;
+			});
+		},
+		//获取月数据
+		getMonthData() {
+			let that = this;
+			let query2 = {};
+			query2.page = 0;
+			query2.year_s = that.year;
+			query2.type = "month_s";
+			query2.mgroup = that.query.mgroup;
+			query2.mpoint__ep_monitored__power_kw__gte = 100;
+			this.$API.enm.enstat.req(query2).then((response) => {
+				let seriesData0 = [],
+					seriesData1 = [];
+				let data = response;
+				data.forEach((item) => {
+					let ind = item.month_s;
+					let val = 0;
+					if (that.allValMonth == 0) {
+						val = "";
+					} else {
+						val = (item.val / that.allValMonth).toFixed(2);
+					}
+					if (item.equip_name == "煤磨排风机主电机") {
+						seriesData0[ind] = val;
+					} else if (item.equip_name == "煤磨主电机") {
+						seriesData1[ind] = val;
+					}
+				});
+				let options = { ...that.option3 };
+				options.series[0].data = seriesData0;
+				options.series[1].data = seriesData1;
+				let monthXAxis = [];
+				for (let i = 1; i <= that.month; i++) {
+					let item = i + "月";
+					monthXAxis.push(item);
+				}
+				options.xAxis.data = monthXAxis;
+				that.optionMonth = options;
+			});
+		},
+		itemClick(type, item) {
+			this.type = type;
+			this.cate = item[0];
+			this.asynDialog = true;
+		},
+		handlePrint() {
+			this.$PRINT("#myReport");
+		},
+		exportExcel() {
+			this.exportLoading = true;
+			this.$XLSX("#myTable", this.tableName);
+			this.exportLoading = false;
+		},
+	},
+};
 </script>
 <style scoped>
-.printContainer{
-    padding-left: 20px;
+.printContainer {
+	padding-left: 20px;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/enm_coalbase/report.vue b/src/views/enm_coalbase/report.vue
index 06dd6cb2..127e3102 100644
--- a/src/views/enm_coalbase/report.vue
+++ b/src/views/enm_coalbase/report.vue
@@ -1,607 +1,737 @@
 <template>
-    <div class="app-container">
-        <el-header>
-            <div class="left-panel">
-                <el-button
-                    type="primary"
-                    @click="exportExcel()"
-                    :loading = "exportLoading"
-                    >导出xlsx
-                </el-button>
-                <el-button
-                    type="primary"
-                    @click="handlePrint"
-                    >打印
-                </el-button>
-            </div>
-        </el-header>
-    <el-card style="margin-top:5px">
-        <div class="printWrap">
-            <div ref="print" id="myReport" class="printContainer">
-                <table border="1" width="1035" cellspacing="0" :key="timeStamp" id="myTable" class="myTable">
-                    <thead class="myTableHead">
-                        <tr>
-                            <th colspan="10">煤磨工段生产报告</th>
-                        </tr>
-                        <tr>
-                            <th colspan="2">参数</th>
-                            <th>上个小时</th>
-                            <th>昨日</th>
-                            <th>本月</th>
-                            <th>本年</th>
-                            <th>月目标值</th>
-                            <th>月完成度</th>
-                            <th>年目标值</th>
-                            <th>年完成度</th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        <tr v-for="(item,index) in tableDatas" :key="item">
-                            <td class="numCell" v-if="index==0||index==2" rowspan="2">{{item[0]}}</td>
-                            <td class="numCell" v-else-if="index==4">{{item[0]}}</td>
-                            <td class="numCell">{{item[1]}}</td>
-                            <td class="numCell hoursItem" @click="itemClick('hour_s',item)">{{item[2]}}</td>
-                            <td class="numCell daysItem" @click="itemClick('day_s',item)">{{item[3]}}</td>
-                            <td class="numCell monthItem" @click="itemClick('month_s',item)">{{item[4]}}</td>
-                            <td class="numCell yearItem" @click="itemClick('year_s',item)">{{item[5]}}</td>
-                            <td class="numCell">{{item[6]}}</td>
-                            <td class="numCell">{{item[7]}}</td>
-                            <td class="numCell">{{item[8]}}</td>
-                            <td class="numCell">{{item[9]}}</td>
-                        </tr>
-                    </tbody>
-                </table>
-                <div class="chartWrap">
-                    <div class="chartTitle">小时生产参数统计图</div>
-                    <scEcharts height="400px" width="1033px" :option="optionHour"></scEcharts>
-                </div>
-                <div class="chartWrap">
-                    <div class="chartTitle">本月生产参数统计图</div>
-                    <scEcharts height="400px" width="1033px" :option="optionDay"></scEcharts>
-                </div>
-                <div class="chartWrap">
-                    <div class="chartTitle">本年生产参数统计图</div>
-                    <scEcharts height="400px" width="1033px" :option="optionMonth"></scEcharts>
-                </div>
-            </div>
-        </div>
-        <charts 
-            v-if="asynDialog"
-            :type="type" 
-            :title="title"
-            :cate="cate"
-            :apiObj = "apiObj"
-            :mgroup="query.mgroup"
-            :modelValue="modelValue"
-            :showClose="showClose"
-            :echartType='echartType'
-            @closed="asynDialog = false"
-        ></charts>
-      </el-card>
-    </div>
-  </template>
+	<div class="app-container">
+		<el-header>
+			<div class="left-panel">
+				<el-button
+					type="primary"
+					@click="exportExcel()"
+					:loading="exportLoading"
+					>导出xlsx
+				</el-button>
+				<el-button type="primary" @click="handlePrint">打印 </el-button>
+			</div>
+		</el-header>
+		<el-card style="margin-top: 5px">
+			<div class="printWrap">
+				<div ref="print" id="myReport" class="printContainer">
+					<table
+						border="1"
+						width="1035"
+						cellspacing="0"
+						:key="timeStamp"
+						id="myTable"
+						class="myTable"
+					>
+						<thead class="myTableHead">
+							<tr>
+								<th colspan="10">煤磨工段生产报告</th>
+							</tr>
+							<tr>
+								<th colspan="2">参数</th>
+								<th>上个小时</th>
+								<th>昨日</th>
+								<th>本月</th>
+								<th>本年</th>
+								<th>月目标值</th>
+								<th>月完成度</th>
+								<th>年目标值</th>
+								<th>年完成度</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr v-for="(item, index) in tableDatas" :key="item">
+								<td
+									class="numCell"
+									v-if="index == 0 || index == 2"
+									rowspan="2"
+								>
+									{{ item[0] }}
+								</td>
+								<td class="numCell" v-else-if="index == 4">
+									{{ item[0] }}
+								</td>
+								<td class="numCell">{{ item[1] }}</td>
+								<td
+									class="numCell hoursItem"
+									@click="itemClick('hour_s', item)"
+								>
+									{{ item[2] }}
+								</td>
+								<td
+									class="numCell daysItem"
+									@click="itemClick('day_s', item)"
+								>
+									{{ item[3] }}
+								</td>
+								<td
+									class="numCell monthItem"
+									@click="itemClick('month_s', item)"
+								>
+									{{ item[4] }}
+								</td>
+								<td
+									class="numCell yearItem"
+									@click="itemClick('year_s', item)"
+								>
+									{{ item[5] }}
+								</td>
+								<td class="numCell">{{ item[6] }}</td>
+								<td class="numCell">{{ item[7] }}</td>
+								<td class="numCell">{{ item[8] }}</td>
+								<td class="numCell">{{ item[9] }}</td>
+							</tr>
+						</tbody>
+					</table>
+					<div class="chartWrap">
+						<div class="chartTitle">小时生产参数统计图</div>
+						<scEcharts
+							height="400px"
+							width="1033px"
+							:option="optionHour"
+						></scEcharts>
+					</div>
+					<div class="chartWrap">
+						<div class="chartTitle">本月生产参数统计图</div>
+						<scEcharts
+							height="400px"
+							width="1033px"
+							:option="optionDay"
+						></scEcharts>
+					</div>
+					<div class="chartWrap">
+						<div class="chartTitle">本年生产参数统计图</div>
+						<scEcharts
+							height="400px"
+							width="1033px"
+							:option="optionMonth"
+						></scEcharts>
+					</div>
+				</div>
+			</div>
+			<charts
+				v-if="asynDialog"
+				:type="type"
+				:title="title"
+				:cate="cate"
+				:apiObj="apiObj"
+				:mgroup="query.mgroup"
+				:modelValue="modelValue"
+				:showClose="showClose"
+				:echartType="echartType"
+				@closed="asynDialog = false"
+			></charts>
+		</el-card>
+	</div>
+</template>
 <script>
-const colors =['#647bfe','#8698fe','#a9b6fe','#91CC75','#EE6666'];
-    let tooltip= {
-        show: true, 
-        trigger: 'axis',
-        axisPointer: {
-            type: 'cross'
-        },
-        confine:false, 
-        showContent: true, 
-        triggerOn:"mousemove", 
-    };
-    let grid={
-        right: '8%',
-        left:'4%',
-        top:'15%'
-    };
-    let toolbox={
-        right:'2%',
-        feature: {
-            dataView: { show: true, readOnly: false },
-            // restore: { show: true },
-            saveAsImage: { show: true }
-        }
-    };
-    let legend= {
-        top:'2%',
-        data:['总产量', '台时产量', '运转率', '分布电耗']
-    };
-    let yAxis= [{
-            type: 'value',
-            name: '产量 (t)',
-            position: 'left',
-            alignTicks: true,
-            axisLine: {
-                show: true,
-                lineStyle: {
-                color: colors[0]
-                }
-            },
-            axisLabel: {
-                formatter: '{value}'
-            }
-        },
-        {
-            type: 'value',
-            name: '运转率 (%)',
-            position: 'right',
-            alignTicks: true,
-            offset: 80,
-            axisLine: {
-                show: true,
-                lineStyle: {
-                color: colors[2]
-                }
-            },
-            axisLabel: {
-                formatter: '{value}'
-            }
-        },
-        {
-            type: 'value',
-            name: '分布电耗(KW.h)',
-            position: 'right',
-            alignTicks: true,
-            axisLine: {
-                show: true,
-                lineStyle: {
-                color: colors[3]
-                }
-            },
-            axisLabel: {
-                formatter: '{value}'
-            }
-        }
-    ];
-    import scEcharts from "@/components/scEcharts";
-	import { defineAsyncComponent } from 'vue'
-    export default {
-        components: {
-            scEcharts,
-            charts: defineAsyncComponent(() => import("@/components/scEnm/lineChartsdialog.vue")),
-        },
-        data() {
-            return {
-                chartShow: false,
-                myOption: null,
-                optionHour:{},
-                optionDay:{},
-                optionMonth:{},
-                year:2023,
-                month:1,
-                days:1,
-                hours:1,
-                query: {
-                    mgroup:'3347217512021835776',
-                },
-                tableDatas:[
-                    ['产量','总产量（t）',0,0,0,0,0,0,0,0],
-                    ['产量','台时产量（t/h）','/',0,0,0,0,0,0,0],
-                    ['运转时间','运转时间（h）','/',0,0,0,0,0,0,0],
-                    ['运转时间','运转率（%）','/',0,0,0,0,0,0,0],
-                    ['能耗','煤磨分布电耗（KW·h/t）',0,0,0,0,0,0,0,0],
-                ],
-                tableName:'生产报告',
-                modelValue:true,
-                type:'hour_s',
-                title:'煤磨工段',
-                cate:'',
-                apiObj:this.$API.enm.enstat,
-                showClose:true,
-                echartType:'line',
-                asynDialog:false,
-                option1:{
-                    color: colors,
-                    tooltip:tooltip,
-                    grid: grid,
-                    toolbox: toolbox,
-                    legend:legend,
-                    xAxis: {
-                        axisTick: {
-                            show: true,
-                            length: 5,
-                            inside: true,
-                            // alignWithLabel: true
-                        },
-                        data: ['一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '十一月', '十二月']
-                    },
-                    yAxis:yAxis,
-                    series:[
-                        {
-                        name: '总产量',
-                        type: 'bar',
-                        yAxisIndex:0,
-                        data:[]
-                        },
-                        {
-                        name: '台时产量',
-                        type: 'bar',
-                        yAxisIndex:0,
-                        data: []
-                        },
-                        {
-                        name: '运转率',
-                        type: 'line',
-                        yAxisIndex: 1,
-                        data: []
-                        },
-                        {
-                        name: '分布电耗',
-                        type: 'bar',
-                        yAxisIndex: 2,
-                        data: []
-                        },
-                    ]
-                },
-                option2:{
-                    color: colors,
-                    tooltip:tooltip,
-                    grid: grid,
-                    toolbox: toolbox,
-                    legend: legend,
-                    xAxis: {
-                        axisTick: {
-                            show: true,
-                            length: 5,
-                            inside: true,
-                            // alignWithLabel: true
-                        },
-                        data: []
-                    },
-                    yAxis: yAxis,
-                    series:[
-                        {
-                        name: '总产量',
-                        type: 'bar',
-                        yAxisIndex:0,
-                        data:[]
-                        },
-                        {
-                        name: '台时产量',
-                        type: 'bar',
-                        yAxisIndex:0,
-                        data: []
-                        },
-                        {
-                        name: '运转率',
-                        type: 'line',
-                        yAxisIndex: 1,
-                        data: []
-                        },
-                        {
-                        name: '分布电耗',
-                        type: 'bar',
-                        yAxisIndex: 2,
-                        data: []
-                        },
-                    ]
-                },
-                option3:{
-                    color: colors,
-                    tooltip:tooltip,
-                    grid: grid,
-                    toolbox: toolbox,
-                    legend: legend,
-                    xAxis: {
-                            axisTick: {
-                                show: true,
-                                length: 5,
-                                inside: true,
-                            },
-                            data: ['一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '十一月', '十二月']
-                        },
-                    yAxis: yAxis,
-                    series: [
-                        {
-                        name: '总产量',
-                        type: 'bar',
-                        yAxisIndex:0,
-                        data: []
-                        },
-                        {
-                        name: '台时产量',
-                        type: 'bar',
-                        yAxisIndex:0,
-                        data: []
-                        },
-                        {
-                        name: '运转率',
-                        type: 'line',
-                        yAxisIndex: 1,
-                        data: []
-                        },
-                        {
-                        name: '分布电耗',
-                        type: 'bar',
-                        yAxisIndex: 2,
-                        data: []
-                        },
-                    ]
-                }
-            };
-        },
-        mounted() {
-            function precen(a,b){
-                if(b!==0&&b!==null&&a!==null){
-                    let precen = (a/b).toFixed(2)
-                    return precen*100+'%'
-                }else{
-                    return '/'
-                }
-            }
-            let that = this;
-            var myDate = new Date();
-            let year =that.year = myDate.getFullYear();
-            let month = that.month = myDate.getMonth()+1;
-            let days = that.days = myDate.getDate();
-            let hours = that.hours = myDate.getHours();
-            let timeDate = myDate.getTime();
-            let dayTime = 24 * 60 * 60 * 1000;
-            //昨天的计算
-            let year_d = year,month_d = month,days_d = days;
-            if(hours<21){//21点前，查找昨日数据为前一天数据
-                let newDate = timeDate- dayTime;
-                let lastDate = new Date(newDate);
-                year_d = lastDate.getFullYear();
-                month_d = lastDate.getMonth()+1;
-                days_d = lastDate.getDate();
-            }
-            //上一小时的计算
-            let hourTime = timeDate - 3600000;
-            let hourDate =  new Date(hourTime);
-            let year_h = hourDate.getFullYear();
-            let month_h = hourDate.getMonth()+1;
-            let days_h = hourDate.getDate();
-            let hours_h = hourDate.getHours();
-           
-            //昨日
-            let params3 = {};
-            params3.page = 0;
-            params3.year_s = year_d;
-            params3.month_s = month_d;
-            params3.day_s = days_d;
-            params3.type = 'day_s';
-            params3.mgroup = this.query.mgroup;
-            this.$API.enm.enstat.req(params3).then((res3) => {
-                if(res3.length>0){
-                    let data3 = res3[0];
-                    that.tableDatas[0][3]=data3.total_production;
-                    that.tableDatas[1][3]=data3.production_hour;
-                    that.tableDatas[2][3]=data3.run_hour;
-                    that.tableDatas[3][3]=data3.run_rate;
-                    that.tableDatas[4][3]=data3.elec_consume_unit;
-                }
-            })
-            //上小时
-            let params4 = {};
-            params4.page = 0;
-            params4.year = year_h;
-            params4.month = month_h;
-            params4.day = days_h;
-            params4.hour = hours_h;
-            params4.type = 'hour_st';
-            params4.mgroup = this.query.mgroup;
-            this.$API.enm.enstat.req(params4).then((res4) => {
-                if(res4.length>0){
-                    let data4 = res4[0];
-                    that.tableDatas[0][2]=data4.total_production;
-                    that.tableDatas[4][2]=data4.elec_consume_unit;
-                }    
-            })
-            //月目标
-            let params5 = {};
-                params5.page=0;
-                params5.mgroup='3346520558031773696';
-                this.$API.mtm.goal.list.req(params5).then((res5) => {
-                    if(res5.length>0){
-                        let data5 = res5;
-                        data5.forEach(item5=>{
-                            let str = 'goal_val_'+that.month;
-                            if(item5.goal_cate_name=='总产量（t）'){
-                                that.tableDatas[0][6]=item5[str];
-                                that.tableDatas[0][8]=item5.goal_val;
-                            }else if(item5.goal_cate_name=='台时产量（t/h）'){
-                                that.tableDatas[1][6]=item5[str];
-                                that.tableDatas[1][8]=item5.goal_val;
-                            }else if(item5.goal_cate_name=='运转时间（h）'){
-                                that.tableDatas[2][6]=item5[str];
-                                that.tableDatas[2][8]=item5.goal_val;
-                            }else if(item5.goal_cate_name=='运转率（%）'){
-                                that.tableDatas[3][6]=item5[str];
-                                that.tableDatas[3][8]=item5.goal_val;
-                            }else if(item5.goal_cate_name=='单位产品分布电耗（KW·h/t）'){
-                                that.tableDatas[4][6]=item5[str];
-                                that.tableDatas[4][8]=item5.goal_val;
-                            }
-                        }) 
-                    }    
-                }).then(res=>{
-                    //年
-                    let params1 = {};
-                    params1.page = 0;
-                    params1.year_s = year;
-                    params1.type = 'year_s';
-                    params1.mgroup = this.query.mgroup;
-                    this.$API.enm.enstat.req(params1).then((res1) => {
-                        if(res1.length>0){
-                            let data1 = res1[0];
-                            that.tableDatas[0][5]=data1.total_production;
-                            that.tableDatas[0][9]=precen(that.tableDatas[0][5],that.tableDatas[0][8])
-                            that.tableDatas[1][5]=data1.production_hour;
-                            that.tableDatas[1][9]=precen(that.tableDatas[1][5],that.tableDatas[1][8])
-                            that.tableDatas[2][5]=data1.run_hour;
-                            that.tableDatas[2][9]=precen(that.tableDatas[2][5],that.tableDatas[2][8])
-                            that.tableDatas[3][5]=data1.run_rate;
-                            that.tableDatas[3][9]=precen(that.tableDatas[3][5],that.tableDatas[3][8])
-                            that.tableDatas[4][5]=data1.elec_consume_unit;
-                            that.tableDatas[4][9]=precen(that.tableDatas[4][5],that.tableDatas[4][8])
-                        }else{}   
-                    })
-                    //月
-                    let params2 = {};
-                    params2.page = 0;
-                    params2.year_s = year;
-                    params2.month_s = month;
-                    params2.type = 'month_s';
-                    params2.mgroup = this.query.mgroup;
-                    this.$API.enm.enstat.req(params2).then((res2) => {
-                        if(res2.length>0){
-                            let data2 = res2[0];
-                            that.tableDatas[0][4]=data2.total_production;
-                            that.tableDatas[0][7]=precen(that.tableDatas[0][4],that.tableDatas[0][6])
-                            that.tableDatas[1][4]=data2.production_hour;
-                            that.tableDatas[1][7]=precen(that.tableDatas[1][4],that.tableDatas[1][6])
-                            that.tableDatas[2][4]=data2.run_hour;
-                            that.tableDatas[2][7]=precen(that.tableDatas[2][4],that.tableDatas[2][6])
-                            that.tableDatas[3][4]=data2.run_rate;
-                            that.tableDatas[3][7]=precen(that.tableDatas[3][4],that.tableDatas[3][6])
-                            that.tableDatas[4][4]=data2.elec_consume_unit;
-                            that.tableDatas[4][7]=precen(that.tableDatas[4][4],that.tableDatas[4][6])
-                        }    
-                    })
-                })
-                that.getHourData();
-                that.getDayData();
-                that.getMonthData();
-        },
-        methods: {
-             //获取小时数据
-             getHourData(){
-                let that = this;
-                let query = {};
-                query.page = 0;
-                query.year_s = that.year;
-                query.month_s = that.month;
-                query.day_s = that.days;
-                query.type = 'hour_s';
-                query.mgroup = that.query.mgroup;
-                this.$API.enm.enstat.req(query).then((response) => {
-                    // debugger;
-                    let seriesData0 = [],seriesData1 = [], seriesData2 = [],seriesData3 = [];
-                    let data = response;
-                    data.forEach(item => {
-                        let ind = item.hour;
-                        seriesData0[ind] = item.total_production;//总产量
-                        seriesData1[ind] = item.production_hour;//台时产量
-                        seriesData2[ind] = item.run_rate;//运转率
-                        seriesData3[ind] = item.elec_consume_unit;//分布电耗
-                    });
-                    let options = {...that.option1};
-                    options.series[0].data=seriesData0;
-                    options.series[1].data=seriesData1;
-                    options.series[2].data=seriesData2;
-                    options.series[3].data=seriesData3;
-                    let hourXAxis = [];
-                    for (let i = 1; i <= that.hours; i++) {
-                        let item = i+'时'
-                        hourXAxis.push(item)
-                    }
-                    options.xAxis.data = hourXAxis;
-                    that.optionHour = options;
-                })
-            },
-            //获取天数据
-            getDayData(){
-                let that = this;
-                let query1 = {};
-                query1.page = 0;
-                query1.year_s = that.year;
-                query1.month_s = that.month;
-                query1.type = 'day_s';
-                query1.mgroup = this.query.mgroup;
-                this.$API.enm.enstat.req(query1).then((response) => {
-                    let seriesData0 = [],seriesData1 = [], seriesData2 = [],seriesData3 = [];
-                    // debugger;
-                    console.log(response)
-                    let data = response;
-                    data.forEach(item => {
-                        // debugger;
-                        let ind = item.day_s;
-                        seriesData0[ind] = item.total_production;
-                        seriesData1[ind] = item.production_hour;
-                        seriesData2[ind] = item.run_rate;
-                        seriesData3[ind] = item.elec_consume_unit;
-                    });
-                    let options = {...that.option2};
-                    options.series[0].data=seriesData0;
-                    options.series[1].data=seriesData1;
-                    options.series[2].data=seriesData2;
-                    options.series[3].data=seriesData3;
-                    let dayXAxis = [];
-                    for (let i = 1; i <= that.days; i++) {
-                        let item = i+'日'
-                        dayXAxis.push(item)
-                    }
-                    options.xAxis.data = dayXAxis;
-                    that.optionDay = options; 
-                })
-            },
-            //获取月数据
-            getMonthData(){
-                let that = this;
-                let query2 = {};
-                query2.page = 0;
-                query2.year_s = that.year;
-                query2.type = 'month_s';
-                query2.mgroup = that.query.mgroup;
-                this.$API.enm.enstat.req(query2).then((response) => {
-                    // debugger;
-                    let seriesData0 = [],seriesData1 = [], seriesData2 = [],seriesData3 = [];
-                    console.log(response)
-                    let data = response;
-                    data.forEach(item => {
-                        let ind = item.month_s;
-                        seriesData0[ind] = item.total_production;
-                        seriesData1[ind] = item.production_hour;
-                        seriesData2[ind] = item.run_rate;
-                        seriesData3[ind] = item.elec_consume_unit;
-                    });
-                    let options = {...that.option3};
-                    options.series[0].data=seriesData0;
-                    options.series[1].data=seriesData1;
-                    options.series[2].data=seriesData2;
-                    options.series[3].data=seriesData3;
-                    let monthXAxis = [];
-                    for (let i = 1; i <= that.month; i++) {
-                        let item = i+'月'
-                        monthXAxis.push(item)
-                    }
-                    options.xAxis.data = monthXAxis;
-                    that.optionMonth = options; 
-                })
-            },
-            itemClick(type,item){
-                this.type=type;
-                this.cate=item[1];
-                this.asynDialog = true;
-            },
-            itemClick1(type,item){
-                this.chartShow = false;
-                this.$API.bi.dataset.exec
-                .req('3322567213885833216')
-                .then((res) => {
-                this.myOption = JSON.parse(res.echart_options);
-                debugger;
-                console.log(this.myOption)
-                this.chartShow = true;
-                });
-            },
-            handlePrint() {
-                this.$PRINT('#myReport');
-            },
-            exportExcel() {
-                this.exportLoading = true;
-                this.$XLSX('#myTable', this.tableName)
-                this.exportLoading = false;
-            },
-        }
-    };
+const colors = ["#647bfe", "#8698fe", "#a9b6fe", "#91CC75", "#EE6666"];
+let tooltip = {
+	show: true,
+	trigger: "axis",
+	axisPointer: {
+		type: "cross",
+	},
+	confine: false,
+	showContent: true,
+	triggerOn: "mousemove",
+};
+let grid = {
+	right: "8%",
+	left: "4%",
+	top: "15%",
+};
+let toolbox = {
+	right: "2%",
+	feature: {
+		dataView: { show: true, readOnly: false },
+		// restore: { show: true },
+		saveAsImage: { show: true },
+	},
+};
+let legend = {
+	top: "2%",
+	data: ["总产量", "台时产量", "运转率", "分布电耗"],
+};
+let yAxis = [
+	{
+		type: "value",
+		name: "产量 (t)",
+		position: "left",
+		alignTicks: true,
+		axisLine: {
+			show: true,
+			lineStyle: {
+				color: colors[0],
+			},
+		},
+		axisLabel: {
+			formatter: "{value}",
+		},
+	},
+	{
+		type: "value",
+		name: "运转率 (%)",
+		position: "right",
+		alignTicks: true,
+		offset: 80,
+		axisLine: {
+			show: true,
+			lineStyle: {
+				color: colors[2],
+			},
+		},
+		axisLabel: {
+			formatter: "{value}",
+		},
+	},
+	{
+		type: "value",
+		name: "分布电耗(KW.h)",
+		position: "right",
+		alignTicks: true,
+		axisLine: {
+			show: true,
+			lineStyle: {
+				color: colors[3],
+			},
+		},
+		axisLabel: {
+			formatter: "{value}",
+		},
+	},
+];
+import scEcharts from "@/components/scEcharts";
+import { defineAsyncComponent } from "vue";
+export default {
+	components: {
+		scEcharts,
+		charts: defineAsyncComponent(() =>
+			import("@/components/scEnm/lineChartsdialog.vue")
+		),
+	},
+	data() {
+		return {
+			chartShow: false,
+			myOption: null,
+			optionHour: {},
+			optionDay: {},
+			optionMonth: {},
+			year: 2023,
+			month: 1,
+			days: 1,
+			hours: 1,
+			query: {
+				mgroup: "",
+			},
+			tableDatas: [
+				["产量", "总产量（t）", 0, 0, 0, 0, 0, 0, 0, 0],
+				["产量", "台时产量（t/h）", "/", 0, 0, 0, 0, 0, 0, 0],
+				["运转时间", "运转时间（h）", "/", 0, 0, 0, 0, 0, 0, 0],
+				["运转时间", "运转率（%）", "/", 0, 0, 0, 0, 0, 0, 0],
+				["能耗", "煤磨分布电耗（KW·h/t）", 0, 0, 0, 0, 0, 0, 0, 0],
+			],
+			tableName: "生产报告",
+			modelValue: true,
+			type: "hour_s",
+			title: "煤磨工段",
+			cate: "",
+			apiObj: this.$API.enm.enstat,
+			showClose: true,
+			echartType: "line",
+			asynDialog: false,
+			option1: {
+				color: colors,
+				tooltip: tooltip,
+				grid: grid,
+				toolbox: toolbox,
+				legend: legend,
+				xAxis: {
+					axisTick: {
+						show: true,
+						length: 5,
+						inside: true,
+						// alignWithLabel: true
+					},
+					data: [
+						"一月",
+						"二月",
+						"三月",
+						"四月",
+						"五月",
+						"六月",
+						"七月",
+						"八月",
+						"九月",
+						"十月",
+						"十一月",
+						"十二月",
+					],
+				},
+				yAxis: yAxis,
+				series: [
+					{
+						name: "总产量",
+						type: "bar",
+						yAxisIndex: 0,
+						data: [],
+					},
+					{
+						name: "台时产量",
+						type: "bar",
+						yAxisIndex: 0,
+						data: [],
+					},
+					{
+						name: "运转率",
+						type: "line",
+						yAxisIndex: 1,
+						data: [],
+					},
+					{
+						name: "分布电耗",
+						type: "bar",
+						yAxisIndex: 2,
+						data: [],
+					},
+				],
+			},
+			option2: {
+				color: colors,
+				tooltip: tooltip,
+				grid: grid,
+				toolbox: toolbox,
+				legend: legend,
+				xAxis: {
+					axisTick: {
+						show: true,
+						length: 5,
+						inside: true,
+						// alignWithLabel: true
+					},
+					data: [],
+				},
+				yAxis: yAxis,
+				series: [
+					{
+						name: "总产量",
+						type: "bar",
+						yAxisIndex: 0,
+						data: [],
+					},
+					{
+						name: "台时产量",
+						type: "bar",
+						yAxisIndex: 0,
+						data: [],
+					},
+					{
+						name: "运转率",
+						type: "line",
+						yAxisIndex: 1,
+						data: [],
+					},
+					{
+						name: "分布电耗",
+						type: "bar",
+						yAxisIndex: 2,
+						data: [],
+					},
+				],
+			},
+			option3: {
+				color: colors,
+				tooltip: tooltip,
+				grid: grid,
+				toolbox: toolbox,
+				legend: legend,
+				xAxis: {
+					axisTick: {
+						show: true,
+						length: 5,
+						inside: true,
+					},
+					data: [
+						"一月",
+						"二月",
+						"三月",
+						"四月",
+						"五月",
+						"六月",
+						"七月",
+						"八月",
+						"九月",
+						"十月",
+						"十一月",
+						"十二月",
+					],
+				},
+				yAxis: yAxis,
+				series: [
+					{
+						name: "总产量",
+						type: "bar",
+						yAxisIndex: 0,
+						data: [],
+					},
+					{
+						name: "台时产量",
+						type: "bar",
+						yAxisIndex: 0,
+						data: [],
+					},
+					{
+						name: "运转率",
+						type: "line",
+						yAxisIndex: 1,
+						data: [],
+					},
+					{
+						name: "分布电耗",
+						type: "bar",
+						yAxisIndex: 2,
+						data: [],
+					},
+				],
+			},
+		};
+	},
+	mounted() {
+		function precen(a, b) {
+			if (b !== 0 && b !== null && a !== null) {
+				let precen = (a / b).toFixed(2);
+				return precen * 100 + "%";
+			} else {
+				return "/";
+			}
+		}
+		let that = this;
+		var myDate = new Date();
+		let year = (that.year = myDate.getFullYear());
+		let month = (that.month = myDate.getMonth() + 1);
+		let days = (that.days = myDate.getDate());
+		let hours = (that.hours = myDate.getHours());
+		let timeDate = myDate.getTime();
+		let dayTime = 24 * 60 * 60 * 1000;
+		//昨天的计算
+		let year_d = year,
+			month_d = month,
+			days_d = days;
+		if (hours < 21) {
+			//21点前，查找昨日数据为前一天数据
+			let newDate = timeDate - dayTime;
+			let lastDate = new Date(newDate);
+			year_d = lastDate.getFullYear();
+			month_d = lastDate.getMonth() + 1;
+			days_d = lastDate.getDate();
+		}
+		//上一小时的计算
+		let hourTime = timeDate - 3600000;
+		let hourDate = new Date(hourTime);
+		let year_h = hourDate.getFullYear();
+		let month_h = hourDate.getMonth() + 1;
+		let days_h = hourDate.getDate();
+		let hours_h = hourDate.getHours();
+		this.$API.mtm.mgroup.list
+			.req({ page: 0, search: "煤磨" })
+			.then((res) => {
+				console.log("煤磨", res);
+				that.query.mgroup = res[0].id;
+				//昨日
+				let params3 = {};
+				params3.page = 0;
+				params3.year_s = year_d;
+				params3.month_s = month_d;
+				params3.day_s = days_d;
+				params3.type = "day_s";
+				params3.mgroup = that.query.mgroup;
+				that.$API.enm.enstat.req(params3).then((res3) => {
+					if (res3.length > 0) {
+						let data3 = res3[0];
+						that.tableDatas[0][3] = data3.total_production;
+						that.tableDatas[1][3] = data3.production_hour;
+						that.tableDatas[2][3] = data3.run_hour;
+						that.tableDatas[3][3] = data3.run_rate;
+						that.tableDatas[4][3] = data3.elec_consume_unit;
+					}
+				});
+				//上小时
+				let params4 = {};
+				params4.page = 0;
+				params4.year = year_h;
+				params4.month = month_h;
+				params4.day = days_h;
+				params4.hour = hours_h;
+				params4.type = "hour_st";
+				params4.mgroup = that.query.mgroup;
+				that.$API.enm.enstat.req(params4).then((res4) => {
+					if (res4.length > 0) {
+						let data4 = res4[0];
+						that.tableDatas[0][2] = data4.total_production;
+						that.tableDatas[4][2] = data4.elec_consume_unit;
+					}
+				});
+				//月目标
+				let params5 = {};
+				params5.page = 0;
+				params5.mgroup = that.query.mgroup;
+				that.$API.mtm.goal.list
+					.req(params5)
+					.then((res5) => {
+						if (res5.length > 0) {
+							let data5 = res5;
+							data5.forEach((item5) => {
+								let str = "goal_val_" + that.month;
+								if (item5.goal_cate_name == "总产量（t）") {
+									that.tableDatas[0][6] = item5[str];
+									that.tableDatas[0][8] = item5.goal_val;
+								} else if (
+									item5.goal_cate_name == "台时产量（t/h）"
+								) {
+									that.tableDatas[1][6] = item5[str];
+									that.tableDatas[1][8] = item5.goal_val;
+								} else if (
+									item5.goal_cate_name == "运转时间（h）"
+								) {
+									that.tableDatas[2][6] = item5[str];
+									that.tableDatas[2][8] = item5.goal_val;
+								} else if (
+									item5.goal_cate_name == "运转率（%）"
+								) {
+									that.tableDatas[3][6] = item5[str];
+									that.tableDatas[3][8] = item5.goal_val;
+								} else if (
+									item5.goal_cate_name ==
+									"单位产品分布电耗（KW·h/t）"
+								) {
+									that.tableDatas[4][6] = item5[str];
+									that.tableDatas[4][8] = item5.goal_val;
+								}
+							});
+						}
+					})
+					.then((res) => {
+						//年
+						let params1 = {};
+						params1.page = 0;
+						params1.year_s = year;
+						params1.type = "year_s";
+						params1.mgroup = that.query.mgroup;
+						that.$API.enm.enstat.req(params1).then((res1) => {
+							if (res1.length > 0) {
+								let data1 = res1[0];
+								that.tableDatas[0][5] = data1.total_production;
+								that.tableDatas[0][9] = precen(
+									that.tableDatas[0][5],
+									that.tableDatas[0][8]
+								);
+								that.tableDatas[1][5] = data1.production_hour;
+								that.tableDatas[1][9] = precen(
+									that.tableDatas[1][5],
+									that.tableDatas[1][8]
+								);
+								that.tableDatas[2][5] = data1.run_hour;
+								that.tableDatas[2][9] = precen(
+									that.tableDatas[2][5],
+									that.tableDatas[2][8]
+								);
+								that.tableDatas[3][5] = data1.run_rate;
+								that.tableDatas[3][9] = precen(
+									that.tableDatas[3][5],
+									that.tableDatas[3][8]
+								);
+								that.tableDatas[4][5] = data1.elec_consume_unit;
+								that.tableDatas[4][9] = precen(
+									that.tableDatas[4][5],
+									that.tableDatas[4][8]
+								);
+							} else {
+							}
+						});
+						//月
+						let params2 = {};
+						params2.page = 0;
+						params2.year_s = year;
+						params2.month_s = month;
+						params2.type = "month_s";
+						params2.mgroup = that.query.mgroup;
+						that.$API.enm.enstat.req(params2).then((res2) => {
+							if (res2.length > 0) {
+								let data2 = res2[0];
+								that.tableDatas[0][4] = data2.total_production;
+								that.tableDatas[0][7] = precen(
+									that.tableDatas[0][4],
+									that.tableDatas[0][6]
+								);
+								that.tableDatas[1][4] = data2.production_hour;
+								that.tableDatas[1][7] = precen(
+									that.tableDatas[1][4],
+									that.tableDatas[1][6]
+								);
+								that.tableDatas[2][4] = data2.run_hour;
+								that.tableDatas[2][7] = precen(
+									that.tableDatas[2][4],
+									that.tableDatas[2][6]
+								);
+								that.tableDatas[3][4] = data2.run_rate;
+								that.tableDatas[3][7] = precen(
+									that.tableDatas[3][4],
+									that.tableDatas[3][6]
+								);
+								that.tableDatas[4][4] = data2.elec_consume_unit;
+								that.tableDatas[4][7] = precen(
+									that.tableDatas[4][4],
+									that.tableDatas[4][6]
+								);
+							}
+						});
+					});
+				that.getHourData();
+				that.getDayData();
+				that.getMonthData();
+			});
+	},
+	methods: {
+		//获取小时数据
+		getHourData() {
+			let that = this;
+			let query = {};
+			query.page = 0;
+			query.year_s = that.year;
+			query.month_s = that.month;
+			query.day_s = that.days;
+			query.type = "hour_s";
+			query.mgroup = that.query.mgroup;
+			this.$API.enm.enstat.req(query).then((response) => {
+				// debugger;
+				let seriesData0 = [],
+					seriesData1 = [],
+					seriesData2 = [],
+					seriesData3 = [];
+				let data = response;
+				data.forEach((item) => {
+					let ind = item.hour;
+					seriesData0[ind] = item.total_production; //总产量
+					seriesData1[ind] = item.production_hour; //台时产量
+					seriesData2[ind] = item.run_rate; //运转率
+					seriesData3[ind] = item.elec_consume_unit; //分布电耗
+				});
+				let options = { ...that.option1 };
+				options.series[0].data = seriesData0;
+				options.series[1].data = seriesData1;
+				options.series[2].data = seriesData2;
+				options.series[3].data = seriesData3;
+				let hourXAxis = [];
+				for (let i = 1; i <= that.hours; i++) {
+					let item = i + "时";
+					hourXAxis.push(item);
+				}
+				options.xAxis.data = hourXAxis;
+				that.optionHour = options;
+			});
+		},
+		//获取天数据
+		getDayData() {
+			let that = this;
+			let query1 = {};
+			query1.page = 0;
+			query1.year_s = that.year;
+			query1.month_s = that.month;
+			query1.type = "day_s";
+			query1.mgroup = this.query.mgroup;
+			this.$API.enm.enstat.req(query1).then((response) => {
+				let seriesData0 = [],
+					seriesData1 = [],
+					seriesData2 = [],
+					seriesData3 = [];
+				// debugger;
+				console.log(response);
+				let data = response;
+				data.forEach((item) => {
+					// debugger;
+					let ind = item.day_s;
+					seriesData0[ind] = item.total_production;
+					seriesData1[ind] = item.production_hour;
+					seriesData2[ind] = item.run_rate;
+					seriesData3[ind] = item.elec_consume_unit;
+				});
+				let options = { ...that.option2 };
+				options.series[0].data = seriesData0;
+				options.series[1].data = seriesData1;
+				options.series[2].data = seriesData2;
+				options.series[3].data = seriesData3;
+				let dayXAxis = [];
+				for (let i = 1; i <= that.days; i++) {
+					let item = i + "日";
+					dayXAxis.push(item);
+				}
+				options.xAxis.data = dayXAxis;
+				that.optionDay = options;
+			});
+		},
+		//获取月数据
+		getMonthData() {
+			let that = this;
+			let query2 = {};
+			query2.page = 0;
+			query2.year_s = that.year;
+			query2.type = "month_s";
+			query2.mgroup = that.query.mgroup;
+			this.$API.enm.enstat.req(query2).then((response) => {
+				// debugger;
+				let seriesData0 = [],
+					seriesData1 = [],
+					seriesData2 = [],
+					seriesData3 = [];
+				console.log(response);
+				let data = response;
+				data.forEach((item) => {
+					let ind = item.month_s;
+					seriesData0[ind] = item.total_production;
+					seriesData1[ind] = item.production_hour;
+					seriesData2[ind] = item.run_rate;
+					seriesData3[ind] = item.elec_consume_unit;
+				});
+				let options = { ...that.option3 };
+				options.series[0].data = seriesData0;
+				options.series[1].data = seriesData1;
+				options.series[2].data = seriesData2;
+				options.series[3].data = seriesData3;
+				let monthXAxis = [];
+				for (let i = 1; i <= that.month; i++) {
+					let item = i + "月";
+					monthXAxis.push(item);
+				}
+				options.xAxis.data = monthXAxis;
+				that.optionMonth = options;
+			});
+		},
+		itemClick(type, item) {
+			this.type = type;
+			this.cate = item[1];
+			this.asynDialog = true;
+		},
+		itemClick1(type, item) {
+			this.chartShow = false;
+			this.$API.bi.dataset.exec.req("3322567213885833216").then((res) => {
+				this.myOption = JSON.parse(res.echart_options);
+				debugger;
+				console.log(this.myOption);
+				this.chartShow = true;
+			});
+		},
+		handlePrint() {
+			this.$PRINT("#myReport");
+		},
+		exportExcel() {
+			this.exportLoading = true;
+			this.$XLSX("#myTable", this.tableName);
+			this.exportLoading = false;
+		},
+	},
+};
 </script>
 <style scoped>
-.printContainer{
-    padding-left: 20px;
+.printContainer {
+	padding-left: 20px;
 }
-</style>
\ No newline at end of file
+</style>