diff --git a/src/views/enm_energy/day_base.vue b/src/views/enm_energy/day_base.vue
index 8965f884..1bc8523a 100644
--- a/src/views/enm_energy/day_base.vue
+++ b/src/views/enm_energy/day_base.vue
@@ -1,354 +1,413 @@
 <!-- 全厂电量统计 -->
 <template>
-    <div class="app-container">
-        <el-header>
-            <div class="left-panel">
-                <el-date-picker
-                    v-model="search_date"
-                    type="month"
-                    value-format="YYYY-MM"
-                    format="YYYY-MM"
-                    placeholder="月"
-                    style="margin-right: 6px;"
-                    @change="dateChange"
-                />
-                <el-button
-                    type="primary"
-                    icon="el-icon-search"
-                    @click="getTableData"
-                ></el-button>
-                <el-button
-                    type="primary"
-                    @click="exportExcel()"
-                    :loading = "exportLoading"
-                    >导出xlsx
-                </el-button>
-                <el-button
-                    type="primary"
-                    @click="handlePrint"
-                    >打印
-                </el-button>
-            </div>
-        </el-header>
-        <el-card style="margin-top:5px">
-            <div class="printWrap">
-                <div ref="print" id="myReport" class="printContainer">
-                    <table border="1"  width="3300" cellspacing="0" :key="timeStamp" id="myTable" class="myTable">
-                        <thead class="myTableHead">
-                            <tr>
-                                <th :colspan="headerLength">全厂电量日统计</th>
-                            </tr>
-                            <tr>
-                                <th>车间</th>
-                                <th>工段</th>
-                                <th>设备</th>
-                                <th v-for="item in days" :key="item">{{ item }}日</th>
-                            </tr>
-                        </thead>
-                        <tr v-for="(item,index) in tableDatas" :key="index">
-                            <td class="numCell" v-if="index==0" rowspan="9">{{item[0]}}</td>
-                            <td class="numCell" v-else-if="index==9" rowspan="18">{{item[0]}}</td>
-                            <td class="numCell" v-else-if="index==27" rowspan="12">{{item[0]}}</td>
-                            <td class="numCell" v-else-if="index==39" rowspan="10" colspan="2">{{item[0]}}</td>
-                            <td class="numCell" v-else-if="index==49" colspan="3">{{item[0]}}</td>
-                            <td class="numCell" v-if="index==8||index==26||index==37||index==38" colspan="2">{{item[1]}}</td>
-                            <td class="numCell" v-else-if="index==0" rowspan="2">{{item[1]}}</td>
-                            <td class="numCell" v-else-if="index==2" rowspan="6">{{item[1]}}</td>
-                            <td class="numCell" v-else-if="index==9" rowspan="14">{{item[1]}}</td>
-                            <td class="numCell" v-else-if="index==23" rowspan="3">{{item[1]}}</td>
-                            <td class="numCell" v-else-if="index==27" rowspan="10">{{item[1]}}</td>
-                            <td class="numCell" v-else>{{item[1]}}</td>
-                            <td class="numCell">{{item[2]}}</td>
-                            <template v-for="day in days" :key="day">
-                                <td class="numCell" v-if="item[day+2]!==null&&item[day+2]!==undefined">{{item[day+2]}}</td>
-                            </template>
-                        </tr>
-                    </table>
-                </div>
-            </div>
-        </el-card>
-    </div>
-  </template>
+	<div class="app-container">
+		<el-header>
+			<div class="left-panel">
+				<el-date-picker
+					v-model="search_date"
+					type="month"
+					value-format="YYYY-MM"
+					format="YYYY-MM"
+					placeholder="月"
+					style="margin-right: 6px"
+					@change="dateChange"
+				/>
+				<el-button
+					type="primary"
+					icon="el-icon-search"
+					@click="getTableData"
+				></el-button>
+				<el-button
+					type="primary"
+					@click="exportExcel()"
+					:loading="exportLoading"
+					>导出xlsx
+				</el-button>
+				<el-button type="primary" @click="handlePrint">打印 </el-button>
+			</div>
+		</el-header>
+		<el-card style="margin-top: 5px">
+			<div class="printWrap">
+				<div ref="print" id="myReport" class="printContainer">
+					<table
+						border="1"
+						:width="tableWidth"
+						cellspacing="0"
+						:key="timeStamp"
+						id="myTable"
+						class="myTable"
+					>
+						<thead class="myTableHead">
+							<tr>
+								<th :colspan="headerLength">电量消耗日报表</th>
+							</tr>
+							<tr>
+								<th>工段</th>
+								<th>设备</th>
+								<th>单位</th>
+								<th v-for="item in this.days" :key="item">
+									{{ item }}日
+								</th>
+								<th>本月合计</th>
+							</tr>
+						</thead>
+						<tr v-for="(item, index) in tableDatas" :key="index">
+							<td class="numCell" v-if="index == 0" rowspan="4">
+								{{ item[0] }}
+							</td>
+							<td
+								class="numCell"
+								v-else-if="index == 4"
+								rowspan="5"
+							>
+								{{ item[0] }}
+							</td>
+							<td
+								class="numCell"
+								v-else-if="index == 9"
+								rowspan="5"
+							>
+								{{ item[0] }}
+							</td>
+							<td
+								class="numCell"
+								v-else-if="index == 14"
+								rowspan="4"
+							>
+								{{ item[0] }}
+							</td>
+							<td
+								class="numCell"
+								v-else-if="index == 18"
+								rowspan="3"
+							>
+								{{ item[0] }}
+							</td>
+							<td
+								class="numCell"
+								v-else-if="index == 21"
+								rowspan="5"
+							>
+								{{ item[0] }}
+							</td>
+							<td
+								class="numCell"
+								v-else-if="
+									index == 26 || index == 27 || index == 28
+								"
+							>
+								{{ item[0] }}
+							</td>
+							<td class="numCell">{{ item[1] }}</td>
+							<td class="numCell">{{ item[2] }}</td>
+
+							<td v-for="day in days" :key="day" class="numCell">
+								{{ item[2 + day] }}
+							</td>
+							<td class="numCell">{{ item[headerLength] }}</td>
+						</tr>
+					</table>
+				</div>
+			</div>
+		</el-card>
+	</div>
+</template>
 <script>
-    export default {
-        data() {
-            return { 
-                year:'',
-                month:'',
-                days:'',
-                search_date:'',
-                headerLength:33,
-                tableDatas:[
-                    ['原料车间','电石渣','烘干破主电机'],//0
-                    ['原料车间','电石渣合计'],
-                    ['原料车间','原料磨','反击式破碎机'],//2
-                    ['原料车间','立磨主电机'],
-                    ['原料车间','循环风机'],
-                    ['原料车间','废气风机'],//5
-                    ['原料车间','尾排风机'],
-                    ['原料车间','原料磨合计'],
-                    ['原料车间','原料车间合计'],//8
+export default {
+	data() {
+		return {
+			year: "",
+			month: "",
+			days: "",
+			search_date: "",
+			headerLength: 33,
+			tableDatas: [
+				["石灰石破碎", "破碎机", "kw.h"], //0
+				["石灰石破碎", "堆取料机", "kw.h"],
+				["石灰石破碎", "低压变压器柜", "kw.h"],
+				["石灰石破碎", "石灰石破碎合计", "kw.h"],
+				["原料磨", "循环风机", "kw.h"],
+				["原料磨", "辊压机", "kw.h"],
+				["原料磨", "调配变压器", "kw.h"],
+				["原料磨", "低压变压器柜器", "kw.h"],
+				["原料磨", "原料磨系统合计", "kw.h"],
+				["回转窑", "尾排风机", "kw.h"],
+				["回转窑", "高温风机", "kw.h"],
+				["回转窑", "头排风机", "kw.h"],
+				["回转窑", "低压变压器柜", "kw.h"],
+				["回转窑", "回转窑烧成系统合计", "kw.h"],
+				["煤磨", "煤磨主电机", "kw.h"],
+				["煤磨", "煤磨排风机", "kw.h"],
+				["煤磨", "低压变压器柜", "kw.h"],
+				["煤磨", "煤磨系统合计", "kw.h"],
+				["余热发电", "余热发电量", "kw.h"],
+				["余热发电", "余热发电自用电量", "kw.h"],
+				["余热发电", "余热供电量", "kw.h"],
+				["空压机", "1#空压机", "kw.h"],
+				["空压机", "2#空压机", "kw.h"],
+				["空压机", "3#空压机", "kw.h"],
+				["空压机", "4#空压机", "kw.h"],
+				["空压机", "空压机合计", "kw.h"],
+				["富氧燃烧系统", "富氧燃烧耗电设备", "kw.h"],
+				["生产总耗电量", "生产部分总耗电", "kw.h"],
+				["全厂进线", "全厂耗电量", "kw.h"],
+			],
+			timeStamp: null,
+			tableWidth: "3300",
+			tableName: "全厂电量日统计",
+			sourceData: {},
+		};
+	},
+	mounted() {
+		let that = this;
+		var nowDate = new Date();
+		that.year = nowDate.getFullYear();
+		that.month = nowDate.getMonth() + 1;
+		that.days = new Date(that.year, that.month, 0).getDate();
+		that.timeStamp = nowDate.getTime();
+		let month0 = that.month > 9 ? that.month : "0" + that.month;
+		that.search_date = that.year + "-" + month0;
+		that.headerLength = that.days + 4;
+		that.tableWidth = that.headerLength * 100 + "";
+		let tableDatas = that.tableDatas;
+		for (let i = 0; i < tableDatas.length; i++) {
+			for (let j = 0; j < that.days; j++) {
+				let k = 3 + j;
+				that.tableDatas[i][k] = 0;
+				this.$forceUpdate();
+			}
+		}
+		this.getData();
+	},
+	methods: {
+		dateChange(e) {
+			let that = this;
+			let arr = e.split("-");
+			that.year = Number(arr[0]);
+			that.month = Number(arr[1]);
+			for (let i = 0; i < that.tableDatas.length; i++) {
+				for (let j = 0; j < that.days + 1; j++) {
+					let k = 3 + j;
+					that.tableDatas[i][k] = 0;
+					this.$forceUpdate();
+				}
+			}
+			let nowDate = new Date();
+			that.timeStamp = nowDate.getTime();
+			this.getData();
+		},
+		getData() {
+			let that = this;
+			function dataPush(name) {
+				let index = 0;
+				if (name == "破碎机") {
+					index = 0;
+				} else if (name == "堆取料机") {
+					index = 1;
+				} else if (name == "低压变压器柜") {
+					index = 2;
+				} else if (name == "循环风机") {
+					index = 4;
+				} else if (name == "调配变压器") {
+					index = 6;
+				} else if (name == "低压变压器柜器") {
+					index = 7;
+				} else if (name == "尾排风机") {
+					index = 9;
+				} else if (name == "高温风机") {
+					index = 10;
+				} else if (name == "头排风机") {
+					index = 11;
+				} else if (name == "煤磨主电机") {
+					index = 14;
+				} else if (name == "煤磨排风机") {
+					index = 15;
+				} else if (name == "低压变压器柜") {
+					index = 16;
+				} else if (name == "余热发电量") {
+					index = 18;
+				} else if (name == "余热发电自用电量") {
+					index = 19;
+				} else if (name == "1#空压机") {
+					index = 21;
+				} else if (name == "2#空压机") {
+					index = 22;
+				} else if (name == "3#空压机") {
+					index = 23;
+				} else if (name == "4#空压机") {
+					index = 24;
+				} else if (name == "富氧燃烧耗电设备") {
+					index = 26;
+				}
+				return index;
+			}
+			function sumNum(a, b, c, d) {
+				let sum = 0;
+				if (typeof a !== "undefined" && a !== "NaN") {
+					sum = sum + Number(a);
+				}
+				if (typeof b !== "undefined" && a !== "NaN") {
+					sum = sum + Number(b);
+				}
+				if (typeof c !== "undefined" && a !== "NaN") {
+					sum = sum + Number(c);
+				}
+				if (typeof d !== "undefined" && a !== "NaN") {
+					sum = sum + Number(d);
+				}
+				return sum;
+			}
+			let obj = {};
+			obj.type = "day_s";
+			obj.year_s = that.year;
+			obj.month_s = that.month;
+			obj.page = 0;
+			obj.mpoint__ep_monitored__power_kw__gte = 100;
+			this.$API.enm.mpoint.stat
+				.req(obj)
+				.then((res) => {
+					let wrapArr = [],
+						innerArr = [];
+					res.forEach((item) => {
+						let day = item.day_s;
+						if (wrapArr[day]) {
+							wrapArr[day].push(item);
+						} else {
+							wrapArr[day] = [];
+							wrapArr[day].push(item);
+						}
+					});
+					wrapArr.forEach((inner, inde) => {
+						inner.forEach((item) => {
+							let i = dataPush(item.mpoint_name);
+							let k = 0;
+							if (
+								i == 0 ||
+								i == 4 ||
+								i == 9 ||
+								i == 14 ||
+								i == 18 ||
+								i == 21 ||
+								i == 26 ||
+								i == 27 ||
+								i == 28
+							) {
+								k = 3 + inde;
+							} else {
+								k = 2 + inde;
+							}
+							that.tableDatas[i][k] = item.val;
+						});
+					});
+					for (let k = 0; k < that.headerLength; k++) {
+						let m = k + 3;
+						let n = k + 1;
+						//石灰石破碎合计
 
-                    ['烧成车间','回转窑','高温风机'],//9
-                    ['烧成车间','窑主电机'],//10
-                    ['烧成车间','篦冷机一室风机电机'],
-                    ['烧成车间','篦冷机三室风机电机'],
-                    ['烧成车间','篦冷机二室风机电机'],
-                    ['烧成车间','篦冷机一室充气梁风机（左）'],
-                    ['烧成车间','篦冷机一室充气梁风机（右）'],//15
-                    ['烧成车间','窑头排风机主电机'],
-                    ['烧成车间','头煤粉罗茨电机（东、备用）'],
-                    ['烧成车间','尾煤粉罗茨电机（西）'],
-                    ['烧成车间','空压机3301'],
-                    ['烧成车间','空压机3308'],//20
-                    ['烧成车间','空压机3318'],//21
-                    ['烧成车间','回转窑合计'],
-                    ['烧成车间','煤磨','煤磨主电机'],
-                    ['烧成车间','煤磨排风机主电机'],
-                    ['烧成车间','煤磨合计'],//25
-                    ['烧成车间','烧成车间合计'],//26
-
-                    ['水泥车间','水泥磨','循环风机1906'],//27
-                    ['水泥车间','系统风机'],
-                    ['水泥车间','水平涡流选粉机1915'],
-                    ['水泥车间','水泥磨主电机'],//30
-                    ['水泥车间','辊压机动辊电机'],
-                    ['水泥车间','辊压机定辊电机'],
-                    ['水泥车间','新增磨尾风机'],
-                    ['水泥车间','水泥1#空压机'],
-                    ['水泥车间','水泥2#空压机'],//35
-                    ['水泥车间','水泥磨合计计'],
-                    ['水泥车间','水泥包装合计'],//37
-                    ['水泥车间','水泥车间合计'],//38
-
-                    ['生活区','食堂'],//39
-                    ['生活区','单元楼'],//40
-                    ['生活区','单身宿舍'],
-                    ['生活区','办公楼'],
-                    ['生活区','余热锅炉'],
-                    ['生活区','污水站'],
-                    ['生活区','南门办公区'],//45
-                    ['生活区','东门办公区'],
-                    ['生活区','地磅'],
-                    ['生活区','生活区合计'],
-                    ['全厂电量']
-                ],
-                tableName:'全厂电量日统计',
-                sourceData:{}
-            };
-        },
-        mounted() {
-            let that = this;
-            var nowDate = new Date();
-            that.year = nowDate.getFullYear();
-            that.month = nowDate.getMonth()+1;
-            that.days = new Date(that.year,that.month,0).getDate();
-            let month0 = that.month>9?that.month :'0'+that.month ;
-            that.search_date = that.year+'-'+month0;
-            that.headerLength = that.days+3;
-            let tableDatas = that.tableDatas;
-            this.$nextTick(()=>{
-                for (let i = 0; i < tableDatas.length; i++) {
-                    for (let j = 0; j < that.days; j++) {
-                        let k = 0;
-                        if(i==0||i==2||i==9||i==23||i==27){
-                            k = 3+j;
-                        }else{
-                            k = 2+j;
-                        }
-                        that.tableDatas[i].push(0);
-                        this.$forceUpdate();
-                    }    
-                }
-            })
-            // that.$set(that.$data,'tableDatas',tableDatas);
-            this.getData();
-        },
-        methods: {
-            dateChange(e){
-                let that = this;
-                let arr = e.split('-')
-                that.year = Number(arr[0]);
-                that.month = Number(arr[1]);
-            },
-            getData(){
-                let that = this;
-                function dataPush(name,value){
-                    let index=0;
-                    if(name=='烘干破主电机'){
-                        index=0;
-                        that.tableDatas[0][3] = value;
-                    }else if(name=='电石渣合计'){
-                        index=1;
-                        that.tableDatas[1][2] = value;
-                    }else if(name=='反击式破碎机'){
-                        index=2;
-                    }else if(name=='立磨主电机'){
-                        index=3;
-                    }else if(name=='循环风机'){
-                        index=4;
-                    }else if(name=='废气风机'){
-                        index=5;
-                    }else if(name=='尾排风机'){
-                        index=6;
-                    }else if(name=='原料磨合计'){
-                        index=7;
-                    }else if(name=='高温风机'){
-                        index=9;
-                    }else if(name=='窑主电机'){
-                        index=10;
-                    }else if(name=='篦冷机一室风机电机'){
-                        index=11;
-                    }else if(name=='篦冷机三室风机电机'){
-                        index=12;
-                    }else if(name=='篦冷机二室风机电机'){
-                        index=13;
-                    }else if(name=='篦冷机一室充气梁风机（左）'){
-                        index=14;
-                    }else if(name=='篦冷机一室充气梁风机（右）'){
-                        index=15;
-                    }else if(name=='窑头排风机主电机'){
-                        index=16;
-                    }else if(name=='头煤粉罗茨电机（东、备用）'){
-                        index=17;
-                    }else if(name=='尾煤粉罗茨电机（西）'){
-                        index=18;
-                    }else if(name=='空压机3301'){
-                        index=19;
-                    }else if(name=='空压机3308'){
-                        index=20;
-                    }else if(name=='空压机3318'){
-                        index=21;
-                    }else if(name=='回转窑合计'){
-                        index=22;
-                    }else if(name=='煤磨主电机'){
-                        index=23;
-                    }else if(name=='煤磨排风机主电机'){
-                        index=24;
-                    }else if(name=='煤磨合计'){
-                        index=25;
-                    }else if(name=='循环风机1906'){
-                        index=27;
-                    }else if(name=='系统风机'){
-                        index=28;
-                    }else if(name=='水平涡流选粉机1915'){
-                        index=29;
-                    }else if(name=='水泥磨主电机'){
-                        index=30;
-                    }else if(name=='辊压机动辊电机'){
-                        index=31;
-                    }else if(name=='辊压机定辊电机'){
-                        index=32;
-                    }else if(name=='新增磨尾风机'){
-                        index=33;
-                    }else if(name=='水泥1#空压机'){
-                        index=34;
-                    }else if(name=='水泥2#空压机'){
-                        index=35;
-                    }else if(name=='水泥磨合计计'){
-                        index=36;
-                    }else if(name=='水泥包装合计'){
-                        index=37;
-                    }else if(name=='食堂'){
-                        index=39;
-                    }else if(name=='单元楼'){
-                        index=40;
-                    }else if(name=='单身宿舍'){
-                        index=41;
-                    }else if(name=='办公楼'){
-                        index=42;
-                    }else if(name=='余热锅炉'){
-                        index=43;
-                    }else if(name=='污水站'){
-                        index=44;
-                    }else if(name=='南门办公区'){
-                        index=45;
-                    }else if(name=='东门办公区'){
-                        index=46;
-                    }else if(name=='生活区合计'){
-                        index=47;
-                    }else if(name=='地磅'){
-                        index=48;
-                    }
-                    return index;
-                }
-                function sumNum(a,b,c,d){
-                    let sum = 0;
-                    if(a&&Number(a)){sum=sum+Number(a);}
-                    if(b&&Number(b)){sum=sum+Number(b);}
-                    if(c&&Number(c)){sum=sum+Number(c);}
-                    if(d&&Number(d)){sum=sum+Number(d);}
-                    return sum;
-                }
-                let obj = {};
-                obj.type='day_s';
-                obj.year_s = that.year;
-                obj.month_s = that.month;
-                obj.page = 0;
-                obj.mpoint__ep_monitored__power_kw__gte=100;
-                this.$API.enm.mpoint.stat.req(obj).then((res) => {
-                    let wrapArr = [],innerArr=[];
-                    res.forEach(item=>{
-                        let day = item.day_s;
-                        if(wrapArr[day]){
-                            wrapArr[day].push(day)
-                        }else{
-                            wrapArr[day]=[];
-                            wrapArr[day].push(day);
-                        }
-                    })
-                    wrapArr.forEach((inner,inde)=>{
-                        inner.forEach(item=>{
-                            let i = dataPush(item.mpoint_name);
-                            let k = 0;
-                            if(i==0||i==2||i==9||i==23||i==27){
-                                k = 3+inde;
-                            }else{
-                                k = 2+inde;
-                            }
-                            that.tableDatas[i][k] = item.val;
-                        })
-                    })
-                    for(let k = 0;k<that.days;k++){
-                        let m = k+2;
-                        let n = k+1;
-                        that.tableDatas[8][m] = sumNum(that.tableDatas[1][m],that.tableDatas[7][m]);
-                        that.tableDatas[26][m] = sumNum(that.tableDatas[22][m],that.tableDatas[25][m]);
-                        that.tableDatas[38][m] = sumNum(that.tableDatas[36][m],that.tableDatas[37][m]);
-                        that.tableDatas[49][n] = sumNum(that.tableDatas[8][m],that.tableDatas[26][m]+ that.tableDatas[38][m]+ that.tableDatas[48][m]);
-                    }
-               })
-            },
-            getTableData(){
-                for(let i=0;i<this.tableDatas.length;i++){
-                    let k = 0;
-                    if(i==0||i==2||i==9||i==23||i==27){
-                        k = 3;
-                    }else if(i==49){
-                        k = 1;
-                    }else{
-                        k = 2;
-                    }
-                    for (let j = k; j < this.tableDatas[i].length; j++) {
-                        this.tableDatas[i][j]=0;
-                    }
-                }
-                this.getData();
-            },
-            exportExcel() {
-                this.exportLoading = true;
-                this.$XLSX('#myTable', this.tableName)
-                this.exportLoading = false;
-            },
-            handlePrint() {
-                this.$PRINT('#myReport');
-            },
-        }
-    };
+						that.tableDatas[3][m] = sumNum(
+							that.tableDatas[0][m],
+							that.tableDatas[1][m],
+							that.tableDatas[2][m]
+						);
+						//辊压机
+						// that.tableDatas[5][m] = sumNum();
+						//原料磨系统合计
+						that.tableDatas[8][m] =
+							sumNum(
+								that.tableDatas[4][m],
+								// that.tableDatas[5][m],
+								that.tableDatas[6][m],
+								that.tableDatas[7][m]
+							) -
+							sumNum(
+								that.tableDatas[1][m],
+								that.tableDatas[2][m]
+							);
+						//低压变压器柜
+						// that.tableDatas[12][m] = sumNum(
+						// 	that.tableDatas[9][m],
+						// 	that.tableDatas[10][m],
+						// 	that.tableDatas[11][m]
+						// );
+						//回转窑烧成系统合计
+						that.tableDatas[13][m] =
+							typeof that.tableDatas[12][m] !== "undefined"
+								? sumNum(
+										that.tableDatas[9][m],
+										that.tableDatas[10][m],
+										that.tableDatas[11][m],
+										that.tableDatas[12][m]
+								  )
+								: sumNum(
+										that.tableDatas[9][m],
+										that.tableDatas[10][m],
+										that.tableDatas[11][m]
+								  );
+						//煤磨系统合计
+						let sum17 = sumNum(
+							that.tableDatas[14][m],
+							that.tableDatas[15][m],
+							that.tableDatas[16][m]
+						);
+						that.tableDatas[17][m] =
+							typeof that.tableDatas[21][m] !== "undefined"
+								? sum17 - that.tableDatas[21][m]
+								: sum17;
+						//余热供电量
+						that.tableDatas[20][m] =
+							typeof that.tableDatas[19][m] !== "undefined"
+								? that.tableDatas[18][m] -
+								  that.tableDatas[19][m]
+								: that.tableDatas[18][m];
+						//空压机合计
+						that.tableDatas[25][m] = sumNum(
+							that.tableDatas[21][m],
+							that.tableDatas[22][m],
+							that.tableDatas[23][m],
+							that.tableDatas[24][m]
+						);
+						//生产部分总耗电
+						that.tableDatas[27][m] = sumNum(
+							that.tableDatas[3][m],
+							that.tableDatas[8][m],
+							that.tableDatas[13][m],
+							that.tableDatas[17][m],
+							that.tableDatas[18][m],
+							that.tableDatas[25][m],
+							that.tableDatas[26][m]
+						);
+						//全厂耗电量
+						// that.tableDatas[28][m] = sumNum(
+						// 	that.tableDatas[27][m],
+						// 	that.tableDatas[26][m]
+						// );
+					}
+					that.tableDatas.forEach((inner, inde) => {
+						let sumlast = 0;
+						inner.forEach((num, ind) => {
+							if (ind > 2 && ind < that.headerLength) {
+								sumlast = sumlast + Number(num);
+							}
+						});
+						inner[that.headerLength] = sumlast;
+					});
+				})
+				.then(() => {});
+		},
+		exportExcel() {
+			this.exportLoading = true;
+			this.$XLSX("#myTable", this.tableName);
+			this.exportLoading = false;
+		},
+		handlePrint() {
+			this.$PRINT("#myReport");
+		},
+	},
+};
 </script>
 <style scoped>
-    .printWrap{
-        width: 100%;
-        overflow-x: scroll;
-    }
-</style>
\ No newline at end of file
+.printWrap {
+	width: 100%;
+	overflow-x: scroll;
+}
+</style>
diff --git a/src/views/enm_energy/hour_base.vue b/src/views/enm_energy/hour_base.vue
index 04a520f5..9a4f21a7 100644
--- a/src/views/enm_energy/hour_base.vue
+++ b/src/views/enm_energy/hour_base.vue
@@ -15,7 +15,7 @@
 				<el-button
 					type="primary"
 					icon="el-icon-search"
-					@click="getTableData"
+					@click="dateChange"
 				></el-button>
 				<el-button
 					type="primary"
@@ -39,7 +39,7 @@
 					>
 						<thead class="myTableHead">
 							<tr>
-								<th colspan="27">全厂电量小时统计</th>
+								<th colspan="28">电量消耗小时报表</th>
 							</tr>
 							<tr>
 								<th>工段</th>
@@ -48,6 +48,7 @@
 								<th v-for="item in 24" :key="item">
 									{{ item }}时
 								</th>
+								<th>本日合计</th>
 							</tr>
 						</thead>
 						<tr v-for="(item, index) in tableDatas" :key="index">
@@ -89,35 +90,24 @@
 							>
 								{{ item[0] }}
 							</td>
-							<td class="numCell" v-else>
+							<td
+								class="numCell"
+								v-else-if="
+									index == 26 || index == 27 || index == 28
+								"
+							>
 								{{ item[0] }}
 							</td>
 							<td class="numCell">{{ item[1] }}</td>
 							<td class="numCell">{{ item[2] }}</td>
-							<td class="numCell">{{ item[3] }}</td>
-							<td class="numCell">{{ item[4] }}</td>
-							<td class="numCell">{{ 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>
-							<td class="numCell">{{ item[10] }}</td>
-							<td class="numCell">{{ item[11] }}</td>
-							<td class="numCell">{{ item[12] }}</td>
-							<td class="numCell">{{ item[13] }}</td>
-							<td class="numCell">{{ item[14] }}</td>
-							<td class="numCell">{{ item[15] }}</td>
-							<td class="numCell">{{ item[16] }}</td>
-							<td class="numCell">{{ item[17] }}</td>
-							<td class="numCell">{{ item[18] }}</td>
-							<td class="numCell">{{ item[19] }}</td>
-							<td class="numCell">{{ item[20] }}</td>
-							<td class="numCell">{{ item[21] }}</td>
-							<td class="numCell">{{ item[22] }}</td>
-							<td class="numCell">{{ item[23] }}</td>
-							<td class="numCell">{{ item[24] }}</td>
-							<td class="numCell">{{ item[25] }}</td>
-							<td class="numCell">{{ item[26] }}</td>
+
+							<td
+								class="numCell"
+								v-for="hour_item in hours"
+								:key="hour_item"
+							>
+								{{ item[2 + hour_item] }}
+							</td>
 							<td class="numCell">{{ item[27] }}</td>
 						</tr>
 					</table>
@@ -135,828 +125,42 @@ export default {
 			day: "",
 			search_date: "",
 			tableDatas: [
-				[
-					"石灰石破碎",
-					"破碎机",
-					"kw.h",
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-				], //0
-				[
-					"堆取料机",
-					"kw.h",
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-				],
-				[
-					"低压变压器柜",
-					"kw.h",
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-				],
-				[
-					"石灰石破碎合计",
-					"kw.h",
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-				],
-				[
-					"原料磨",
-					"循环风机",
-					"kw.h",
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-				],
-				[
-					"辊压机",
-					"kw.h",
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-				],
-				[
-					"调配变压器",
-					"kw.h",
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-				],
-				[
-					"低压变压器柜器",
-					"kw.h",
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-				],
-				[
-					"原料磨系统合计",
-					"kw.h",
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-				],
-				[
-					"回转窑",
-					"尾排风机",
-					"kw.h",
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-				],
-				[
-					"高温风机",
-					"kw.h",
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-				],
-				[
-					"头排风机",
-					"kw.h",
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-				],
-				[
-					"低压变压器柜",
-					"kw.h",
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-				],
-				[
-					"回转窑烧成系统合计",
-					"kw.h",
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-				],
-				[
-					"煤磨",
-					"煤磨主电机",
-					"kw.h",
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-				],
-				[
-					"煤磨排风机",
-					"kw.h",
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-				],
-				[
-					"低压变压器柜",
-					"kw.h",
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-				],
-				[
-					"煤磨系统合计",
-					"kw.h",
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-				],
-				[
-					"余热发电",
-					"余热发电量",
-					"kw.h",
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-				],
-				[
-					"余热发电自用电量",
-					"kw.h",
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-				],
-				[
-					"余热供电量",
-					"kw.h",
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-				],
-				[
-					"空压机",
-					"1#空压机",
-					"kw.h",
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-				],
-				[
-					"2#空压机",
-					"kw.h",
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-				],
-				[
-					"3#空压机",
-					"kw.h",
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-				],
-				[
-					"4#空压机",
-					"kw.h",
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-				],
-				[
-					"空压机合计",
-					"kw.h",
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-				],
-				[
-					"富氧燃烧系统",
-					"富氧燃烧耗电设备",
-					"kw.h",
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-				],
-				[
-					"生产总耗电量",
-					"生产部分总耗电",
-					"kw.h",
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-				],
-				[
-					"全厂进线",
-					"全厂耗电量",
-					"kw.h",
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-					0,
-				],
+				["石灰石破碎", "破碎机", "kw.h"], //0
+				["石灰石破碎", "堆取料机", "kw.h"],
+				["石灰石破碎", "低压变压器柜", "kw.h"],
+				["石灰石破碎", "石灰石破碎合计", "kw.h"],
+				["原料磨", "循环风机", "kw.h"],
+				["原料磨", "辊压机", "kw.h"],
+				["原料磨", "调配变压器", "kw.h"],
+				["原料磨", "低压变压器柜器", "kw.h"],
+				["原料磨", "原料磨系统合计", "kw.h"],
+				["回转窑", "尾排风机", "kw.h"],
+				["回转窑", "高温风机", "kw.h"],
+				["回转窑", "头排风机", "kw.h"],
+				["回转窑", "低压变压器柜", "kw.h"],
+				["回转窑", "回转窑烧成系统合计", "kw.h"],
+				["煤磨", "煤磨主电机", "kw.h"],
+				["煤磨", "煤磨排风机", "kw.h"],
+				["煤磨", "低压变压器柜", "kw.h"],
+				["煤磨", "煤磨系统合计", "kw.h"],
+				["余热发电", "余热发电量", "kw.h"],
+				["余热发电", "余热发电自用电量", "kw.h"],
+				["余热发电", "余热供电量", "kw.h"],
+				["空压机", "1#空压机", "kw.h"],
+				["空压机", "2#空压机", "kw.h"],
+				["空压机", "3#空压机", "kw.h"],
+				["空压机", "4#空压机", "kw.h"],
+				["空压机", "空压机合计", "kw.h"],
+				["富氧燃烧系统", "富氧燃烧耗电设备", "kw.h"],
+				["生产总耗电量", "生产部分总耗电", "kw.h"],
+				["全厂进线", "全厂耗电量", "kw.h"],
 			],
+			hours: [
+				1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18,
+				19, 20, 21, 22, 23, 24,
+			],
+			timeStamp: null,
+			exportLoading: false,
 			tableName: "全厂电量小时统计",
 			sourceData: {},
 		};
@@ -967,8 +171,16 @@ export default {
 		that.year = nowDate.getFullYear();
 		that.month = nowDate.getMonth() + 1;
 		that.day = nowDate.getDate();
+		that.timeStamp = nowDate.getTime();
 		let month0 = that.month > 9 ? that.month : "0" + that.month;
 		that.search_date = that.year + "-" + month0 + "-" + that.day;
+		for (let i = 0; i < that.tableDatas.length; i++) {
+			for (let j = 0; j < 24; j++) {
+				let k = 3 + j;
+				that.tableDatas[i][k] = 0;
+				this.$forceUpdate();
+			}
+		}
 		this.getData();
 	},
 	methods: {
@@ -978,120 +190,74 @@ export default {
 			that.year = Number(arr[0]);
 			that.month = Number(arr[1]);
 			that.day = Number(arr[2]);
+			for (let i = 0; i < that.tableDatas.length; i++) {
+				for (let j = 0; j < 25; j++) {
+					let k = 3 + j;
+					that.tableDatas[i][k] = 0;
+					this.$forceUpdate();
+				}
+			}
+			let nowDate = new Date();
+			that.timeStamp = nowDate.getTime();
+			this.getData();
 		},
 		getData() {
 			let that = this;
-			function dataPush(name, value) {
+			function dataPush(name) {
 				let index = 0;
-				if (name == "烘干破主电机") {
+				if (name == "破碎机") {
 					index = 0;
-					that.tableDatas[0][3] = value;
-				} else if (name == "电石渣合计") {
+				} else if (name == "堆取料机") {
 					index = 1;
-					that.tableDatas[1][2] = value;
-				} else if (name == "反击式破碎机") {
+				} else if (name == "低压变压器柜") {
 					index = 2;
-				} else if (name == "立磨主电机") {
-					index = 3;
 				} else if (name == "循环风机") {
 					index = 4;
-				} else if (name == "废气风机") {
-					index = 5;
-				} else if (name == "尾排风机") {
+				} else if (name == "调配变压器") {
 					index = 6;
-				} else if (name == "原料磨合计") {
+				} else if (name == "低压变压器柜器") {
 					index = 7;
-				} else if (name == "高温风机") {
+				} else if (name == "尾排风机") {
 					index = 9;
-				} else if (name == "窑主电机") {
+				} else if (name == "高温风机") {
 					index = 10;
-				} else if (name == "篦冷机一室风机电机") {
+				} else if (name == "头排风机") {
 					index = 11;
-				} else if (name == "篦冷机三室风机电机") {
-					index = 12;
-				} else if (name == "篦冷机二室风机电机") {
-					index = 13;
-				} else if (name == "篦冷机一室充气梁风机（左）") {
-					index = 14;
-				} else if (name == "篦冷机一室充气梁风机（右）") {
-					index = 15;
-				} else if (name == "窑头排风机主电机") {
-					index = 16;
-				} else if (name == "头煤粉罗茨电机（东、备用）") {
-					index = 17;
-				} else if (name == "尾煤粉罗茨电机（西）") {
-					index = 18;
-				} else if (name == "空压机3301") {
-					index = 19;
-				} else if (name == "空压机3308") {
-					index = 20;
-				} else if (name == "空压机3318") {
-					index = 21;
-				} else if (name == "回转窑合计") {
-					index = 22;
 				} else if (name == "煤磨主电机") {
+					index = 14;
+				} else if (name == "煤磨排风机") {
+					index = 15;
+				} else if (name == "低压变压器柜") {
+					index = 16;
+				} else if (name == "余热发电量") {
+					index = 18;
+				} else if (name == "余热发电自用电量") {
+					index = 19;
+				} else if (name == "1#空压机") {
+					index = 21;
+				} else if (name == "2#空压机") {
+					index = 22;
+				} else if (name == "3#空压机") {
 					index = 23;
-				} else if (name == "煤磨排风机主电机") {
+				} else if (name == "4#空压机") {
 					index = 24;
-				} else if (name == "煤磨合计") {
-					index = 25;
-				} else if (name == "循环风机1906") {
-					index = 27;
-				} else if (name == "系统风机") {
-					index = 28;
-				} else if (name == "水平涡流选粉机1915") {
-					index = 29;
-				} else if (name == "水泥磨主电机") {
-					index = 30;
-				} else if (name == "辊压机动辊电机") {
-					index = 31;
-				} else if (name == "辊压机定辊电机") {
-					index = 32;
-				} else if (name == "新增磨尾风机") {
-					index = 33;
-				} else if (name == "水泥1#空压机") {
-					index = 34;
-				} else if (name == "水泥2#空压机") {
-					index = 35;
-				} else if (name == "水泥磨合计计") {
-					index = 36;
-				} else if (name == "水泥包装合计") {
-					index = 37;
-				} else if (name == "食堂") {
-					index = 39;
-				} else if (name == "单元楼") {
-					index = 40;
-				} else if (name == "单身宿舍") {
-					index = 41;
-				} else if (name == "办公楼") {
-					index = 42;
-				} else if (name == "余热锅炉") {
-					index = 43;
-				} else if (name == "污水站") {
-					index = 44;
-				} else if (name == "南门办公区") {
-					index = 45;
-				} else if (name == "东门办公区") {
-					index = 46;
-				} else if (name == "生活区合计") {
-					index = 47;
-				} else if (name == "地磅") {
-					index = 48;
+				} else if (name == "富氧燃烧耗电设备") {
+					index = 26;
 				}
 				return index;
 			}
 			function sumNum(a, b, c, d) {
 				let sum = 0;
-				if (a && Number(a)) {
+				if (typeof a !== "undefined" && a !== "NaN") {
 					sum = sum + Number(a);
 				}
-				if (b && Number(b)) {
+				if (typeof b !== "undefined" && a !== "NaN") {
 					sum = sum + Number(b);
 				}
-				if (c && Number(c)) {
+				if (typeof c !== "undefined" && a !== "NaN") {
 					sum = sum + Number(c);
 				}
-				if (d && Number(d)) {
+				if (typeof d !== "undefined" && a !== "NaN") {
 					sum = sum + Number(d);
 				}
 				return sum;
@@ -1106,7 +272,6 @@ export default {
 			this.$API.enm.mpoint.stat
 				.req(obj)
 				.then((res) => {
-					console.log(res);
 					let wrapArr = [],
 						innerArr = [];
 					res.forEach((item) => {
@@ -1118,17 +283,20 @@ export default {
 							wrapArr[hour].push(item);
 						}
 					});
-					console.log(wrapArr); //按时间分组
 					wrapArr.forEach((inner, inde) => {
 						inner.forEach((item) => {
 							let i = dataPush(item.mpoint_name);
 							let k = 0;
 							if (
 								i == 0 ||
-								i == 2 ||
+								i == 4 ||
 								i == 9 ||
-								i == 23 ||
-								i == 27
+								i == 14 ||
+								i == 18 ||
+								i == 21 ||
+								i == 26 ||
+								i == 27 ||
+								i == 28
 							) {
 								k = 3 + inde;
 							} else {
@@ -1138,27 +306,97 @@ export default {
 						});
 					});
 					for (let k = 0; k < 24; k++) {
-						let m = k + 2;
+						let m = k + 3;
 						let n = k + 1;
-						that.tableDatas[8][m] = sumNum(
+						//石灰石破碎合计
+
+						that.tableDatas[3][m] = sumNum(
+							that.tableDatas[0][m],
 							that.tableDatas[1][m],
-							that.tableDatas[7][m]
+							that.tableDatas[2][m]
 						);
-						that.tableDatas[26][m] = sumNum(
+						//辊压机
+						// that.tableDatas[5][m] = sumNum();
+						//原料磨系统合计
+						that.tableDatas[8][m] =
+							sumNum(
+								that.tableDatas[4][m],
+								// that.tableDatas[5][m],
+								that.tableDatas[6][m],
+								that.tableDatas[7][m]
+							) -
+							sumNum(
+								that.tableDatas[1][m],
+								that.tableDatas[2][m]
+							);
+						//低压变压器柜
+						// that.tableDatas[12][m] = sumNum(
+						// 	that.tableDatas[9][m],
+						// 	that.tableDatas[10][m],
+						// 	that.tableDatas[11][m]
+						// );
+						//回转窑烧成系统合计
+						that.tableDatas[13][m] =
+							typeof that.tableDatas[12][m] !== "undefined"
+								? sumNum(
+										that.tableDatas[9][m],
+										that.tableDatas[10][m],
+										that.tableDatas[11][m],
+										that.tableDatas[12][m]
+								  )
+								: sumNum(
+										that.tableDatas[9][m],
+										that.tableDatas[10][m],
+										that.tableDatas[11][m]
+								  );
+						//煤磨系统合计
+						let sum17 = sumNum(
+							that.tableDatas[14][m],
+							that.tableDatas[15][m],
+							that.tableDatas[16][m]
+						);
+						that.tableDatas[17][m] =
+							typeof that.tableDatas[21][m] !== "undefined"
+								? sum17 - that.tableDatas[21][m]
+								: sum17;
+						//余热供电量
+						that.tableDatas[20][m] =
+							typeof that.tableDatas[19][m] !== "undefined"
+								? that.tableDatas[18][m] -
+								  that.tableDatas[19][m]
+								: that.tableDatas[18][m];
+						//空压机合计
+						that.tableDatas[25][m] = sumNum(
+							that.tableDatas[21][m],
 							that.tableDatas[22][m],
-							that.tableDatas[25][m]
+							that.tableDatas[23][m],
+							that.tableDatas[24][m]
 						);
-						that.tableDatas[38][m] = sumNum(
-							that.tableDatas[36][m],
-							that.tableDatas[37][m]
-						);
-						that.tableDatas[49][n] = sumNum(
+						//生产部分总耗电
+						that.tableDatas[27][m] = sumNum(
+							that.tableDatas[3][m],
 							that.tableDatas[8][m],
-							that.tableDatas[26][m] +
-								that.tableDatas[38][m] +
-								that.tableDatas[48][m]
+							that.tableDatas[13][m],
+							that.tableDatas[17][m],
+							that.tableDatas[18][m],
+							that.tableDatas[25][m],
+							that.tableDatas[26][m]
 						);
+						//全厂耗电量
+						// that.tableDatas[28][m] = sumNum(
+						// 	that.tableDatas[27][m],
+						// 	that.tableDatas[26][m]
+						// );
 					}
+					that.tableDatas.forEach((inner, inde) => {
+						let sum27 = 0;
+						inner.forEach((num, ind) => {
+							if (ind > 2 && ind < 27) {
+								sum27 = sum27 + Number(num);
+							}
+						});
+						inner[27] = sum27;
+					});
 				})
 				.then(() => {});
 		},
@@ -1176,7 +414,6 @@ export default {
 					this.tableDatas[i][j] = 0;
 				}
 			}
-			this.getData();
 		},
 		exportExcel() {
 			this.exportLoading = true;
diff --git a/src/views/enm_energy/month_base.vue b/src/views/enm_energy/month_base.vue
index 4a747062..ea1413f3 100644
--- a/src/views/enm_energy/month_base.vue
+++ b/src/views/enm_energy/month_base.vue
@@ -1,339 +1,406 @@
 <!-- 全厂电量统计 -->
 <template>
-    <div class="app-container">
-        <el-header>
-            <div class="left-panel">
-                <el-date-picker
-                    v-model="search_date"
-                    type="year"
-                    value-format="YYYY"
-                    format="YYYY"
-                    placeholder="年"
-                    style="margin-right: 6px;"
-                    @change="dateChange"
-                />
-                <el-button
-                    type="primary"
-                    icon="el-icon-search"
-                    @click="getTableData"
-                ></el-button>
-                <el-button
-                    type="primary"
-                    @click="exportExcel()"
-                    :loading = "exportLoading"
-                    >导出xlsx
-                </el-button>
-                <el-button
-                    type="primary"
-                    @click="handlePrint"
-                    >打印
-                </el-button>
-            </div>
-        </el-header>
-        <el-card style="margin-top:5px">
-            <div class="printWrap">
-                <div ref="print" id="myReport" class="printContainer">
-                    <table border="1" width="1500" cellspacing="0" :key="timeStamp" id="myTable" class="myTable">
-                        <thead class="myTableHead">
-                            <tr>
-                                <th colspan="15">全厂电量月统计</th>
-                            </tr>
-                            <tr>
-                                <th>车间</th>
-                                <th>工段</th>
-                                <th>设备</th>
-                                <th v-for="month in 12" :key="month">{{month}}月</th>
-                            </tr>
-                        </thead>
-                        <tr v-for="(item,index) in tableDatas" :key="index">
-                            <td class="numCell" v-if="index==0" rowspan="9">{{item[0]}}</td>
-                            <td class="numCell" v-else-if="index==9" rowspan="18">{{item[0]}}</td>
-                            <td class="numCell" v-else-if="index==27" rowspan="12">{{item[0]}}</td>
-                            <td class="numCell" v-else-if="index==39" rowspan="10" colspan="2">{{item[0]}}</td>
-                            <td class="numCell" v-else-if="index==49" colspan="3">{{item[0]}}</td>
-                            <td class="numCell" v-if="index==8||index==26||index==37||index==38" colspan="2">{{item[1]}}</td>
-                            <td class="numCell" v-else-if="index==0" rowspan="2">{{item[1]}}</td>
-                            <td class="numCell" v-else-if="index==2" rowspan="6">{{item[1]}}</td>
-                            <td class="numCell" v-else-if="index==9" rowspan="14">{{item[1]}}</td>
-                            <td class="numCell" v-else-if="index==23" rowspan="3">{{item[1]}}</td>
-                            <td class="numCell" v-else-if="index==27" rowspan="10">{{item[1]}}</td>
-                            <td class="numCell" v-else>{{item[1]}}</td>
-                            <td class="numCell">{{item[2]}}</td>
-                            <td class="numCell">{{item[3]}}</td>
-                            <td class="numCell">{{item[4]}}</td>
-                            <td class="numCell">{{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>
-                            <td class="numCell">{{item[10]}}</td>
-                            <td class="numCell">{{item[11]}}</td>
-                            <td class="numCell">{{item[12]}}</td>
-                            <td class="numCell" v-if="item[13]!==null&&item[13]!==undefined">{{item[13]}}</td>
-                            <td class="numCell" v-if="item[14]!==null&&item[14]!==undefined">{{item[14]}}</td>
-                        </tr>
-                    </table>
-                </div>
-            </div>
-        </el-card>
-    </div>
-  </template>
+	<div class="app-container">
+		<el-header>
+			<div class="left-panel">
+				<el-date-picker
+					v-model="search_date"
+					type="year"
+					value-format="YYYY"
+					format="YYYY"
+					placeholder="年"
+					style="margin-right: 6px"
+					@change="dateChange"
+				/>
+				<el-button
+					type="primary"
+					icon="el-icon-search"
+					@click="dateChange"
+				></el-button>
+				<el-button
+					type="primary"
+					@click="exportExcel()"
+					:loading="exportLoading"
+					>导出xlsx
+				</el-button>
+				<el-button type="primary" @click="handlePrint">打印 </el-button>
+			</div>
+		</el-header>
+		<el-card style="margin-top: 5px">
+			<div class="printWrap">
+				<div ref="print" id="myReport" class="printContainer">
+					<table
+						border="1"
+						width="1600"
+						cellspacing="0"
+						:key="timeStamp"
+						id="myTable"
+						class="myTable"
+					>
+						<thead class="myTableHead">
+							<tr>
+								<th colspan="16">电量消耗月报表</th>
+							</tr>
+							<tr>
+								<th>工段</th>
+								<th>设备</th>
+								<th>单位</th>
+								<th v-for="item in 12" :key="item">
+									{{ item }}月
+								</th>
+								<th>本年合计</th>
+							</tr>
+						</thead>
+						<tr v-for="(item, index) in tableDatas" :key="index">
+							<td class="numCell" v-if="index == 0" rowspan="4">
+								{{ item[0] }}
+							</td>
+							<td
+								class="numCell"
+								v-else-if="index == 4"
+								rowspan="5"
+							>
+								{{ item[0] }}
+							</td>
+							<td
+								class="numCell"
+								v-else-if="index == 9"
+								rowspan="5"
+							>
+								{{ item[0] }}
+							</td>
+							<td
+								class="numCell"
+								v-else-if="index == 14"
+								rowspan="4"
+							>
+								{{ item[0] }}
+							</td>
+							<td
+								class="numCell"
+								v-else-if="index == 18"
+								rowspan="3"
+							>
+								{{ item[0] }}
+							</td>
+							<td
+								class="numCell"
+								v-else-if="index == 21"
+								rowspan="5"
+							>
+								{{ item[0] }}
+							</td>
+							<td
+								class="numCell"
+								v-else-if="
+									index == 26 || index == 27 || index == 28
+								"
+							>
+								{{ item[0] }}
+							</td>
+							<td class="numCell">{{ item[1] }}</td>
+							<td class="numCell">{{ item[2] }}</td>
+							<td
+								class="numCell"
+								v-for="month_item in months"
+								:key="month_item"
+							>
+								{{ item[2 + month_item] }}
+							</td>
+							<td class="numCell">{{ item[15] }}</td>
+						</tr>
+					</table>
+				</div>
+			</div>
+		</el-card>
+	</div>
+</template>
 <script>
-    export default {
-        data() {
-            return { 
-                year:'',
-                search_date:'',
-                tableDatas:[
-                    ['原料车间','电石渣','烘干破主电机',0,0,0,0,0,0,0,0,0,0,0,0],//0
-                    ['原料车间','电石渣合计',0,0,0,0,0,0,0,0,0,0,0,0],
-                    ['原料车间','原料磨','反击式破碎机',0,0,0,0,0,0,0,0,0,0,0,0],//2
-                    ['原料车间','立磨主电机',0,0,0,0,0,0,0,0,0,0,0,0],
-                    ['原料车间','循环风机',0,0,0,0,0,0,0,0,0,0,0,0],
-                    ['原料车间','废气风机' ,0,0,0,0,0,0,0,0,0,0,0,0],//5
-                    ['原料车间','尾排风机',0,0,0,0,0,0,0,0,0,0,0,0],
-                    ['原料车间','原料磨合计' ,0,0,0,0,0,0,0,0,0,0,0,0],
-                    ['原料车间','原料车间合计',0,0,0,0,0,0,0,0,0,0,0,0],//8
+export default {
+	data() {
+		return {
+			year: "",
+			month: "",
+			day: "",
+			search_date: "",
+			tableDatas: [
+				["石灰石破碎", "破碎机", "kw.h"], //0
+				["石灰石破碎", "堆取料机", "kw.h"],
+				["石灰石破碎", "低压变压器柜", "kw.h"],
+				["石灰石破碎", "石灰石破碎合计", "kw.h"],
+				["原料磨", "循环风机", "kw.h"],
+				["原料磨", "辊压机", "kw.h"],
+				["原料磨", "调配变压器", "kw.h"],
+				["原料磨", "低压变压器柜器", "kw.h"],
+				["原料磨", "原料磨系统合计", "kw.h"],
+				["回转窑", "尾排风机", "kw.h"],
+				["回转窑", "高温风机", "kw.h"],
+				["回转窑", "头排风机", "kw.h"],
+				["回转窑", "低压变压器柜", "kw.h"],
+				["回转窑", "回转窑烧成系统合计", "kw.h"],
+				["煤磨", "煤磨主电机", "kw.h"],
+				["煤磨", "煤磨排风机", "kw.h"],
+				["煤磨", "低压变压器柜", "kw.h"],
+				["煤磨", "煤磨系统合计", "kw.h"],
+				["余热发电", "余热发电量", "kw.h"],
+				["余热发电", "余热发电自用电量", "kw.h"],
+				["余热发电", "余热供电量", "kw.h"],
+				["空压机", "1#空压机", "kw.h"],
+				["空压机", "2#空压机", "kw.h"],
+				["空压机", "3#空压机", "kw.h"],
+				["空压机", "4#空压机", "kw.h"],
+				["空压机", "空压机合计", "kw.h"],
+				["富氧燃烧系统", "富氧燃烧耗电设备", "kw.h"],
+				["生产总耗电量", "生产部分总耗电", "kw.h"],
+				["全厂进线", "全厂耗电量", "kw.h"],
+			],
+			timeStamp: null,
+			months: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12],
+			tableName: "全厂电量小时统计",
+			sourceData: {},
+		};
+	},
+	mounted() {
+		let that = this;
+		var nowDate = new Date();
+		that.year = nowDate.getFullYear();
+		that.search_date = that.year + "";
+		that.timeStamp = nowDate.getTime();
+		let tableDatas = that.tableDatas;
+		for (let i = 0; i < tableDatas.length; i++) {
+			for (let j = 0; j < 12; j++) {
+				let k = 3 + j;
+				that.tableDatas[i][k] = 0;
+				this.$forceUpdate();
+			}
+		}
+		this.getData();
+	},
+	methods: {
+		dateChange() {
+			let that = this;
+			for (let i = 0; i < that.tableDatas.length; i++) {
+				for (let j = 0; j < 13; j++) {
+					let k = 3 + j;
+					that.tableDatas[i][k] = 0;
+					this.$forceUpdate();
+				}
+			}
+			let nowDate = new Date();
+			that.timeStamp = nowDate.getTime();
+			this.getData();
+		},
+		getData() {
+			let that = this;
+			function dataPush(name) {
+				let index = 0;
+				if (name == "破碎机") {
+					index = 0;
+				} else if (name == "堆取料机") {
+					index = 1;
+				} else if (name == "低压变压器柜") {
+					index = 2;
+				} else if (name == "循环风机") {
+					index = 4;
+				} else if (name == "调配变压器") {
+					index = 6;
+				} else if (name == "低压变压器柜器") {
+					index = 7;
+				} else if (name == "尾排风机") {
+					index = 9;
+				} else if (name == "高温风机") {
+					index = 10;
+				} else if (name == "头排风机") {
+					index = 11;
+				} else if (name == "煤磨主电机") {
+					index = 14;
+				} else if (name == "煤磨排风机") {
+					index = 15;
+				} else if (name == "低压变压器柜") {
+					index = 16;
+				} else if (name == "余热发电量") {
+					index = 18;
+				} else if (name == "余热发电自用电量") {
+					index = 19;
+				} else if (name == "1#空压机") {
+					index = 21;
+				} else if (name == "2#空压机") {
+					index = 22;
+				} else if (name == "3#空压机") {
+					index = 23;
+				} else if (name == "4#空压机") {
+					index = 24;
+				} else if (name == "富氧燃烧耗电设备") {
+					index = 26;
+				}
+				return index;
+			}
+			function sumNum(a, b, c, d) {
+				let sum = 0;
+				if (typeof a !== "undefined" && a !== "NaN") {
+					sum = sum + Number(a);
+				}
+				if (typeof b !== "undefined" && a !== "NaN") {
+					sum = sum + Number(b);
+				}
+				if (typeof c !== "undefined" && a !== "NaN") {
+					sum = sum + Number(c);
+				}
+				if (typeof d !== "undefined" && a !== "NaN") {
+					sum = sum + Number(d);
+				}
+				return sum;
+			}
+			let obj = {};
 
-                    ['烧成车间','回转窑','高温风机',0,0,0,0,0,0,0,0,0,0,0,0],//9
-                    ['烧成车间','窑主电机',0,0,0,0,0,0,0,0,0,0,0,0],//10
-                    ['烧成车间','篦冷机一室风机电机',0,0,0,0,0,0,0,0,0,0,0,0],
-                    ['烧成车间','篦冷机三室风机电机',0,0,0,0,0,0,0,0,0,0,0,0],
-                    ['烧成车间','篦冷机二室风机电机',0,0,0,0,0,0,0,0,0,0,0,0],
-                    ['烧成车间','篦冷机一室充气梁风机（左）',0,0,0,0,0,0,0,0,0,0,0,0],
-                    ['烧成车间','篦冷机一室充气梁风机（右）',0,0,0,0,0,0,0,0,0,0,0,0],//15
-                    ['烧成车间','窑头排风机主电机',0,0,0,0,0,0,0,0,0,0,0,0],
-                    ['烧成车间','头煤粉罗茨电机（东、备用）',0,0,0,0,0,0,0,0,0,0,0,0],
-                    ['烧成车间','尾煤粉罗茨电机（西）',0,0,0,0,0,0,0,0,0,0,0,0],
-                    ['烧成车间','空压机3301',0,0,0,0,0,0,0,0,0,0,0,0],
-                    ['烧成车间','空压机3308',0,0,0,0,0,0,0,0,0,0,0,0],//20
-                    ['烧成车间','空压机3318',0,0,0,0,0,0,0,0,0,0,0,0],//21
-                    ['烧成车间','回转窑合计',0,0,0,0,0,0,0,0,0,0,0,0],
-                    ['烧成车间','煤磨','煤磨主电机',0,0,0,0,0,0,0,0,0,0,0,0],
-                    ['烧成车间','煤磨排风机主电机',0,0,0,0,0,0,0,0,0,0,0,0],
-                    ['烧成车间','煤磨合计',0,0,0,0,0,0,0,0,0,0,0,0],//25
-                    ['烧成车间','烧成车间合计',0,0,0,0,0,0,0,0,0,0,0,0],//26
-
-                    ['水泥车间','水泥磨','循环风机1906',0,0,0,0,0,0,0,0,0,0,0,0],//27
-                    ['水泥车间','系统风机',0,0,0,0,0,0,0,0,0,0,0,0],
-                    ['水泥车间','水平涡流选粉机1915',0,0,0,0,0,0,0,0,0,0,0,0],
-                    ['水泥车间','水泥磨主电机',0,0,0,0,0,0,0,0,0,0,0,0],//30
-                    ['水泥车间','辊压机动辊电机',0,0,0,0,0,0,0,0,0,0,0,0],
-                    ['水泥车间','辊压机定辊电机',0,0,0,0,0,0,0,0,0,0,0,0],
-                    ['水泥车间','新增磨尾风机',0,0,0,0,0,0,0,0,0,0,0,0],
-                    ['水泥车间','水泥1#空压机',0,0,0,0,0,0,0,0,0,0,0,0],
-                    ['水泥车间','水泥2#空压机',0,0,0,0,0,0,0,0,0,0,0,0],//35
-                    ['水泥车间','水泥磨合计计',0,0,0,0,0,0,0,0,0,0,0,0],
-                    ['水泥车间','水泥包装合计',0,0,0,0,0,0,0,0,0,0,0,0],//37
-                    ['水泥车间','水泥车间合计',0,0,0,0,0,0,0,0,0,0,0,0],//38
-
-                    ['生活区','食堂',0,0,0,0,0,0,0,0,0,0,0,0],//39
-                    ['生活区','单元楼',0,0,0,0,0,0,0,0,0,0,0,0],//40
-                    ['生活区','单身宿舍',0,0,0,0,0,0,0,0,0,0,0,0],
-                    ['生活区','办公楼',0,0,0,0,0,0,0,0,0,0,0,0],
-                    ['生活区','余热锅炉',0,0,0,0,0,0,0,0,0,0,0,0],
-                    ['生活区','污水站',0,0,0,0,0,0,0,0,0,0,0,0],
-                    ['生活区','南门办公区',0,0,0,0,0,0,0,0,0,0,0,0],//45
-                    ['生活区','东门办公区',0,0,0,0,0,0,0,0,0,0,0,0],
-                    ['生活区','地磅',0,0,0,0,0,0,0,0,0,0,0,0],
-                    ['生活区','生活区合计',0,0,0,0,0,0,0,0,0,0,0,0],
-                    ['全厂电量',0,0,0,0,0,0,0,0,0,0,0,0]
-                ],
-                tableName:'全厂电量月统计',
-                sourceData:{}
-            };
-        },
-        mounted() {
-            let that = this;
-            var nowDate = new Date();
-            that.year = nowDate.getFullYear();
-            that.search_date = that.year+'';
-            this.getData();
-        },
-        methods: {
-            dateChange(e){
-                let that = this;
-                that.year = Number(e);
-            },
-            getData(){
-                let that = this;
-                function dataPush(name,value){
-                    let index=0;
-                    if(name=='烘干破主电机'){
-                        index=0;
-                        that.tableDatas[0][3] = value;
-                    }else if(name=='电石渣合计'){
-                        index=1;
-                        that.tableDatas[1][2] = value;
-                    }else if(name=='反击式破碎机'){
-                        index=2;
-                    }else if(name=='立磨主电机'){
-                        index=3;
-                    }else if(name=='循环风机'){
-                        index=4;
-                    }else if(name=='废气风机'){
-                        index=5;
-                    }else if(name=='尾排风机'){
-                        index=6;
-                    }else if(name=='原料磨合计'){
-                        index=7;
-                    }else if(name=='高温风机'){
-                        index=9;
-                    }else if(name=='窑主电机'){
-                        index=10;
-                    }else if(name=='篦冷机一室风机电机'){
-                        index=11;
-                    }else if(name=='篦冷机三室风机电机'){
-                        index=12;
-                    }else if(name=='篦冷机二室风机电机'){
-                        index=13;
-                    }else if(name=='篦冷机一室充气梁风机（左）'){
-                        index=14;
-                    }else if(name=='篦冷机一室充气梁风机（右）'){
-                        index=15;
-                    }else if(name=='窑头排风机主电机'){
-                        index=16;
-                    }else if(name=='头煤粉罗茨电机（东、备用）'){
-                        index=17;
-                    }else if(name=='尾煤粉罗茨电机（西）'){
-                        index=18;
-                    }else if(name=='空压机3301'){
-                        index=19;
-                    }else if(name=='空压机3308'){
-                        index=20;
-                    }else if(name=='空压机3318'){
-                        index=21;
-                    }else if(name=='回转窑合计'){
-                        index=22;
-                    }else if(name=='煤磨主电机'){
-                        index=23;
-                    }else if(name=='煤磨排风机主电机'){
-                        index=24;
-                    }else if(name=='煤磨合计'){
-                        index=25;
-                    }else if(name=='循环风机1906'){
-                        index=27;
-                    }else if(name=='系统风机'){
-                        index=28;
-                    }else if(name=='水平涡流选粉机1915'){
-                        index=29;
-                    }else if(name=='水泥磨主电机'){
-                        index=30;
-                    }else if(name=='辊压机动辊电机'){
-                        index=31;
-                    }else if(name=='辊压机定辊电机'){
-                        index=32;
-                    }else if(name=='新增磨尾风机'){
-                        index=33;
-                    }else if(name=='水泥1#空压机'){
-                        index=34;
-                    }else if(name=='水泥2#空压机'){
-                        index=35;
-                    }else if(name=='水泥磨合计计'){
-                        index=36;
-                    }else if(name=='水泥包装合计'){
-                        index=37;
-                    }else if(name=='食堂'){
-                        index=39;
-                    }else if(name=='单元楼'){
-                        index=40;
-                    }else if(name=='单身宿舍'){
-                        index=41;
-                    }else if(name=='办公楼'){
-                        index=42;
-                    }else if(name=='余热锅炉'){
-                        index=43;
-                    }else if(name=='污水站'){
-                        index=44;
-                    }else if(name=='南门办公区'){
-                        index=45;
-                    }else if(name=='东门办公区'){
-                        index=46;
-                    }else if(name=='生活区合计'){
-                        index=47;
-                    }else if(name=='地磅'){
-                        index=48;
-                    }
-                    return index;
-                }
-                function sumNum(a,b,c,d){
-                    let sum = 0;
-                    if(a&&Number(a)){sum=sum+Number(a);}
-                    if(b&&Number(b)){sum=sum+Number(b);}
-                    if(c&&Number(c)){sum=sum+Number(c);}
-                    if(d&&Number(d)){sum=sum+Number(d);}
-                    return sum;
-                }
-                let obj = {};
-                obj.type='month_s';
-                obj.year_s = that.year;
-                obj.page = 0;
-                obj.mpoint__ep_monitored__power_kw__gte=100;
-                this.$API.enm.mpoint.stat.req(obj).then((res) => {
-                    console.log(res)
-                    let wrapArr = [],innerArr=[];
-                    res.forEach(item=>{
-                        let month = item.month_s;
-                        if(wrapArr[month]){
-                            wrapArr[month].push(item)
-                        }else{
-                            wrapArr[month]=[];
-                            wrapArr[month].push(item);
-                        }
-                    })
-                    console.log(wrapArr)//按月分组
-                    wrapArr.forEach((inner,inde)=>{
-                        inner.forEach(item=>{
-                            let i = dataPush(item.mpoint_name);
-                            let k = 0;
-                            if(i==0||i==2||i==9||i==23||i==27){
-                                k = 3+inde;
-                            }else{
-                                k = 2+inde;
-                            }
-                            that.tableDatas[i][k] = item.val;
-                        })
-                    })
-                    for(let k = 0;k<12;k++){
-                        let m = k+2;
-                        let n = k+1;
-                        that.tableDatas[8][m] = sumNum(that.tableDatas[1][m],that.tableDatas[7][m]);
-                        that.tableDatas[26][m] = sumNum(that.tableDatas[22][m],that.tableDatas[25][m]);
-                        that.tableDatas[38][m] = sumNum(that.tableDatas[36][m],that.tableDatas[37][m]);
-                        that.tableDatas[49][n] = sumNum(that.tableDatas[8][m],that.tableDatas[26][m]+ that.tableDatas[38][m]+ that.tableDatas[48][m]);
-                    }
-                })
-            },
-            getTableData(){
-                for(let i=0;i<this.tableDatas.length;i++){
-                    let k = 0;
-                    if(i==0||i==2||i==9||i==23||i==27){
-                        k = 3;
-                    }else if(i==49){
-                        k = 1;
-                    }else{
-                        k = 2;
-                    }
-                    for (let j = k; j < this.tableDatas[i].length; j++) {
-                        this.tableDatas[i][j]=0;
-                    }
-                }
-                this.getData();
-            },
-            exportExcel() {
-                this.exportLoading = true;
-                this.$XLSX('#myTable', this.tableName)
-                this.exportLoading = false;
-            },
-            handlePrint() {
-                this.$PRINT('#myReport');
-            },
-        }
-    };
+			obj.type = "month_s";
+			obj.year_s = that.year;
+			obj.page = 0;
+			obj.mpoint__ep_monitored__power_kw__gte = 100;
+			this.$API.enm.mpoint.stat
+				.req(obj)
+				.then((res) => {
+					let wrapArr = [],
+						innerArr = [];
+					res.forEach((item) => {
+						let month = item.month;
+						if (wrapArr[month]) {
+							wrapArr[month].push(item);
+						} else {
+							wrapArr[month] = [];
+							wrapArr[month].push(item);
+						}
+					});
+					wrapArr.forEach((inner, inde) => {
+						inner.forEach((item) => {
+							let i = dataPush(item.mpoint_name);
+							let k = 0;
+							if (
+								i == 0 ||
+								i == 4 ||
+								i == 9 ||
+								i == 14 ||
+								i == 18 ||
+								i == 21 ||
+								i == 26 ||
+								i == 27 ||
+								i == 28
+							) {
+								k = 3 + inde;
+							} else {
+								k = 2 + inde;
+							}
+							that.tableDatas[i][k] = item.val;
+						});
+					});
+					for (let k = 0; k < 24; k++) {
+						let m = k + 3;
+						let n = k + 1;
+						//石灰石破碎合计
+						that.tableDatas[3][m] = sumNum(
+							that.tableDatas[0][m],
+							that.tableDatas[1][m],
+							that.tableDatas[2][m]
+						);
+						//辊压机
+						// that.tableDatas[5][m] = sumNum();
+						//原料磨系统合计
+						that.tableDatas[8][m] =
+							sumNum(
+								that.tableDatas[4][m],
+								// that.tableDatas[5][m],
+								that.tableDatas[6][m],
+								that.tableDatas[7][m]
+							) -
+							sumNum(
+								that.tableDatas[1][m],
+								that.tableDatas[2][m]
+							);
+						//低压变压器柜
+						// that.tableDatas[12][m] = sumNum(
+						// 	that.tableDatas[9][m],
+						// 	that.tableDatas[10][m],
+						// 	that.tableDatas[11][m]
+						// );
+						//回转窑烧成系统合计
+						that.tableDatas[13][m] =
+							typeof that.tableDatas[12][m] !== "undefined"
+								? sumNum(
+										that.tableDatas[9][m],
+										that.tableDatas[10][m],
+										that.tableDatas[11][m],
+										that.tableDatas[12][m]
+								  )
+								: sumNum(
+										that.tableDatas[9][m],
+										that.tableDatas[10][m],
+										that.tableDatas[11][m]
+								  );
+						//煤磨系统合计
+						let sum17 = sumNum(
+							that.tableDatas[14][m],
+							that.tableDatas[15][m],
+							that.tableDatas[16][m]
+						);
+						that.tableDatas[17][m] =
+							typeof that.tableDatas[21][m] !== "undefined"
+								? sum17 - that.tableDatas[21][m]
+								: sum17;
+						//余热供电量
+						that.tableDatas[20][m] =
+							typeof that.tableDatas[19][m] !== "undefined"
+								? that.tableDatas[18][m] -
+								  that.tableDatas[19][m]
+								: that.tableDatas[18][m];
+						//空压机合计
+						that.tableDatas[25][m] = sumNum(
+							that.tableDatas[21][m],
+							that.tableDatas[22][m],
+							that.tableDatas[23][m],
+							that.tableDatas[24][m]
+						);
+						//生产部分总耗电
+						that.tableDatas[27][m] = sumNum(
+							that.tableDatas[3][m],
+							that.tableDatas[8][m],
+							that.tableDatas[13][m],
+							that.tableDatas[17][m],
+							that.tableDatas[18][m],
+							that.tableDatas[25][m],
+							that.tableDatas[26][m]
+						);
+						//全厂耗电量
+						// that.tableDatas[28][m] = sumNum(
+						// 	that.tableDatas[27][m],
+						// 	that.tableDatas[26][m]
+						// );
+					}
+					that.tableDatas.forEach((inner, inde) => {
+						let sum15 = 0;
+						inner.forEach((num, ind) => {
+							if (ind > 2 && ind < 15) {
+								sum15 = sum15 + Number(num);
+							}
+						});
+						inner[15] = sum15;
+					});
+				})
+				.then(() => {});
+		},
+		exportExcel() {
+			this.exportLoading = true;
+			this.$XLSX("#myTable", this.tableName);
+			this.exportLoading = false;
+		},
+		handlePrint() {
+			this.$PRINT("#myReport");
+		},
+	},
+};
 </script>
 <style scoped>
-     .printWrap{
-        width: 100%;
-        overflow-x: scroll;
-    }
-</style>
\ No newline at end of file
+.printWrap {
+	width: 100%;
+	overflow-x: scroll;
+}
+</style>